diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 2bf8bd441..260b68b27 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -152,6 +152,7 @@
         box-sizing: border-box;
         display: inline-flex;
         align-items: center;
+        justify-content: center;
         line-height: 20px;
         padding: 8px 6px;
         white-space: nowrap;
@@ -163,10 +164,6 @@
         border-radius: @variables_radius;
         transition: none;
 
-        &:not(.fa):not(.cptools) {
-            font-family: inherit;
-        }
-
         i, .fa, .cptools {
             &:not(.nomargin) {
                 margin-right: 5px;
diff --git a/www/form/app-form.less b/www/form/app-form.less
index c549ccade..d3f2239a8 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -347,7 +347,7 @@
                     &.editable {
                         cursor: pointer;
                     }
-                    .fa-caret-down {
+                    .lucide-chevron-down {
                         margin-left: 5px;
                     }
                 }
@@ -496,11 +496,10 @@
                                 }
                             }
                             button {
-                                border: 0px;
-                                //padding-bottom: 3px;
+                                border: 0;
                                 svg {
-                                    font-size: 35px;
-                                    line-height: 35px;
+                                    height: 2rem;
+                                    width: 2rem;
                                 }
                             }
                             &:first-child {
@@ -1071,13 +1070,11 @@
             }
         }
         .cp-form-block-type {
-            //float: right;
             padding: 5px;
-            //margin-top: -10px;
-            //margin-right: -10px;
             border-radius: 0px @variables_radius 0px 0px;
-            svg { margin-right: 5px; }
             background: fade(@cryptpad_text_col, 10%);
+            display: inline-flex;
+            align-items: center;
         }
     }