diff --git a/customize.dist/src/less2/include/contextmenu.less b/customize.dist/src/less2/include/contextmenu.less
index 534ffa0e0..530ab81ee 100644
--- a/customize.dist/src/less2/include/contextmenu.less
+++ b/customize.dist/src/less2/include/contextmenu.less
@@ -68,16 +68,6 @@
                     background-color: @cp_context-bg-active;
                     color: @cp_context-fg;
                 }
-                .fa, .cptools {
-                    &:first-child {
-                        margin-right: 10px;
-                    }
-                    &.cptools:not(:first-child) {
-                        vertical-align: middle;
-                    }
-                    color: @cp_context-icon;
-                    width: 16px;
-                }
                 &.cp-app-disabled {
                     cursor: not-allowed !important;
                     opacity: 0.5;
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 544d9a08a..7ab06f77a 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -435,6 +435,11 @@
                 margin: 0;
                 background: transparent;
             }
+            svg {
+                height: 1em;
+                width: 1em;
+                margin-right: 0.5rem;
+            }
         }
 
         button {