diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-toolbar.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-toolbar.less
index f2b6995f49..a4f3c902ed 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-toolbar.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-toolbar.less
@@ -5,7 +5,14 @@
   height: 25px;
 }
 
-.umb-editor-toolbar-tool {
+.umb-editor-toolbar__tool {
   margin-left: 20px;
   cursor: pointer;
-}
\ No newline at end of file
+  display: flex;
+  align-items: center;
+}
+
+.umb-editor-toolbar__tool-icon {
+   font-size: 20px;
+   margin-right: 5px;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-toolbar.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-toolbar.html
index 4e000dbb0f..3dc4bfa2e7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-toolbar.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-toolbar.html
@@ -1,5 +1,5 @@
 <div class="umb-editor-toolbar">
-    <div class="umb-editor-toolbar-tool" ng-repeat="tool in tools" ng-click="tool.action(tool)">
-        <i class="{{tool.icon}}"></i> {{ tool.name }}
+    <div class="umb-editor-toolbar__tool" ng-repeat="tool in tools" ng-click="tool.action(tool)">
+        <i class="umb-editor-toolbar__tool-icon {{tool.icon}}"></i> {{ tool.name }}
     </div>
 </div>