diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 04d6ad8b1..f2c4af2fe 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -125,16 +125,15 @@
                     margin-left: 1em;
                     font-size: 16px;
                     color: inherit;
-
-                    svg {
-                        margin: 0;
-                    }
                 }
                 a:focus-visible {
                     border-radius: 50%;
                     outline: @variables_focus_style;
                 }
             }
+            svg {
+                margin: 0;
+            }
         }
         .cp-creation-early {
             max-width: 80%;
diff --git a/customize.dist/src/less2/include/messenger.less b/customize.dist/src/less2/include/messenger.less
index be0b78195..0d67b5398 100644
--- a/customize.dist/src/less2/include/messenger.less
+++ b/customize.dist/src/less2/include/messenger.less
@@ -261,6 +261,7 @@
             }
 
             .hover () {
+                cursor: pointer;
                 height: 100%;
                 line-height: 30px;
                 padding: 10px;
@@ -310,6 +311,7 @@
                 position: absolute;
                 top: 2px;
                 right: 2px;
+                margin: 0;
             }
         }
         .cp-app-contacts-chat {
@@ -395,6 +397,10 @@
                 &[disabled="true"] {
                     .tools_placeholder-color();
                 }
+                &:focus-visible {
+                    outline: @variables_focus_style;
+                    border-radius: @variables_radius;
+                }
             }
             button {
                 height: 54px !important;
@@ -407,6 +413,13 @@
                     background-color: @msg-bg-color-dark;
                     background-color: var(--msg-bg-color-dark);
                 }
+                &:focus-visible {
+                    outline: @variables_focus_style;
+                    border-radius: @variables_radius;
+                }
+                svg {
+                    margin: 0;
+                }
             }
         }
     }
diff --git a/www/form/app-form.less b/www/form/app-form.less
index cd9f78fdf..19c6a3c59 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -992,6 +992,10 @@
                     }
                 }
             }
+            a:focus-visible {
+                outline: @variables_focus_style;
+                border-radius: @variables_radius;
+            }
         }
         div.cp-form-creator-results {
             display: flex;