diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 50ec4b8d84..a2eb211266 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -36,6 +36,7 @@ module.exports = {
             preview: { files: "./src/less/canvas-designer.less", watch: "./src/less/**/*.less", out: "canvasdesigner.min.css" },
             umbraco: { files: "./src/less/belle.less", watch: "./src/**/*.less", out: "umbraco.min.css" },
             rteContent: { files: "./src/less/rte-content.less", watch: "./src/less/**/*.less", out: "rte-content.css" },
+            icons: { files: "./src/less/icons.less", watch: "./src/less/**/*.less", out: "icons.css" },
             blockgridui: { files: "./src/views/propertyeditors/blockgrid/blockgridui.less", watch: "./src/views/propertyeditors/blockgrid/blockgridui.less", out: "blockgridui.css" }
         },
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index c01b99d710..95a207b01a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -73,7 +73,7 @@
 @import "modals.less";
 @import "panel.less";
 @import "sections.less";
-@import "helveticons.less";
+@import "icons.less";
 @import "main.less";
 @import "listview.less";
 @import "gridview.less";
@@ -150,7 +150,6 @@
 @import "components/umb-color-swatches.less";
 @import "components/check-circle.less";
 @import "components/umb-file-icon.less";
-@import "components/umb-icon.less";
 @import "components/umb-iconpicker.less";
 @import "components/umb-insert-code-box.less";
 @import "components/umb-packages.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/icons.less b/src/Umbraco.Web.UI.Client/src/less/icons.less
new file mode 100644
index 0000000000..1bb3cea19e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/icons.less
@@ -0,0 +1,2 @@
+@import "helveticons.less";
+@import "components/umb-icon.less";
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html
index bceef66e37..938ae384db 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html
@@ -1,18 +1,5 @@
 <style>
-
-    .umb-icon {
-        display: inline-block;
-        width: 1em;
-        height: 1em;
-        flex-shrink: 0;
-    }
-
-    .umb-icon svg {
-        width: 100%;
-        height: 100%;
-        fill: currentColor;
-        animation: inherit;
-    }
+    @import 'assets/css/icons.css';
 
     .blockelement-gridblock-editor {
         position: relative;
@@ -83,4 +70,4 @@
 
     <umb-block-grid-render-area-slots ng-if="block.layout.areas.length > 0"></umb-block-grid-render-area-slots>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html
index 71c4da4178..85f8ef0450 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html
@@ -1,19 +1,5 @@
 <style>
-
-
-    .umb-icon {
-        display: inline-block;
-        width: 1em;
-        height: 1em;
-        flex-shrink: 0;
-    }
-
-    .umb-icon svg {
-        width: 100%;
-        height: 100%;
-        fill: currentColor;
-        animation: inherit;
-    }
+    @import 'assets/css/icons.css';
 
     .blockelement-gridinlineblock-editor {
         position: relative;
@@ -106,4 +92,4 @@
 
     <umb-block-grid-render-area-slots ng-if="block.layout.areas.length > 0"></umb-block-grid-render-area-slots>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html
index bd6eebfac6..80e42cfbfb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html
@@ -1,25 +1,15 @@
 <style>
+    @import 'assets/css/icons.css';
+
     @keyframes umb-icon-jump {
         0%, 100% { transform: rotate(6deg); }
         50% { transform: rotate(-6deg); }
     }
 
     .umb-icon {
-        display: inline-block;
-        width: 1em;
-        height: 1em;
-        flex-shrink: 0;
-
         animation: umb-icon-jump 1s infinite ease-in-out;
     }
 
-    .umb-icon svg {
-        width: 100%;
-        height: 100%;
-        fill: currentColor;
-        animation: inherit;
-    }
-
     .blockelement-gridsortblock-editor {
         position: relative;
         border-radius: 3px;
@@ -89,4 +79,4 @@
 
     <umb-block-grid-render-area-slots ng-if="block.layout.areas.length > 0"></umb-block-grid-render-area-slots>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html
index 0925b39680..788fe1f363 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html
@@ -1,19 +1,5 @@
 <style>
-
-
-    .umb-icon {
-        display: inline-block;
-        width: 1em;
-        height: 1em;
-        flex-shrink: 0;
-    }
-
-    .umb-icon svg {
-        width: 100%;
-        height: 100%;
-        fill: currentColor;
-        animation: inherit;
-    }
+    @import 'assets/css/icons.css';
 
     .blockelement-unsupportedblock-editor {
         position: relative;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
index edfe60de3c..8fb8221d74 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
@@ -1,5 +1,6 @@
 @import "../../../less/variables.less";
 @import "../../../less/mixins.less";
+@import "../../../less/helveticons.less";
 @import "../../../less/buttons.less";
 @import "../../../less/accessibility/sr-only.less";
 @import "../../../less/components/umb-icon.less";