diff --git a/customize.dist/src/less2/include/loading.less b/customize.dist/src/less2/include/loading.less
index 953c7cb3b..bd32f0cd7 100644
--- a/customize.dist/src/less2/include/loading.less
+++ b/customize.dist/src/less2/include/loading.less
@@ -145,6 +145,9 @@
         p:last-child {
             margin-bottom: 0;
         }
+        svg {
+            margin: 0;
+        }
     }
     #cp-loading-status {
         display: flex;
diff --git a/customize.dist/src/less2/include/notifications.less b/customize.dist/src/less2/include/notifications.less
index 2443e7e11..38d698a32 100644
--- a/customize.dist/src/less2/include/notifications.less
+++ b/customize.dist/src/less2/include/notifications.less
@@ -31,10 +31,10 @@
             display: flex;
             align-items: center;
             svg {
-                margin: 0;
+                margin: @variables_icon_margin;
             }
             .cp-broadcast {
-                margin: 0.5rem;
+                margin: @variables_icon_margin;
                 width: var(--avatar-width);
                 height: var(--avatar-width);
                 color: @cp_dropdown-fg;
diff --git a/www/form/app-form.less b/www/form/app-form.less
index 831b1f3bf..24245361b 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -248,6 +248,8 @@
                     border-radius: @variables_radius 0px 0px @variables_radius;
                     background-color: @cp_form-bg1;
                     color: @cryptpad_text_col;
+                    display: inline-flex;
+                    align-items: center;
                     &:focus-visible {
                         outline: @variables_focus_style;
                     }
@@ -255,6 +257,9 @@
                         color: @cp_form-bg1;
                         background-color: @cryptpad_text_col;
                     }
+                    svg {
+                        margin: 0;
+                    }
                 }
                 #cp-toggle-drag-on {
                     border-radius: 0px @variables_radius @variables_radius 0px !important;
@@ -494,6 +499,8 @@
                     margin-bottom: 20px;
                     button {
                         width: 50px;
+                        height: 36px;
+                        margin-right: 0.5rem;
                         svg {
                             margin-right: 0;
                         }