diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 484e367f2d..28dc7e5c1f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -34,7 +34,7 @@
 
         var compositionTool = {
           "name": "Compositions",
-          "icon": "merge",
+          "icon": "icon-merge",
           "action": function() {
             scope.openCompositionsDialog();
           }
@@ -42,7 +42,7 @@
 
         var sortingTool = {
           "name": "Reorder",
-          "icon": "navigation",
+          "icon": "icon-navigation",
           "action": function() {
             scope.toggleSortingMode();
           }
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 e66cb510d2..4e000dbb0f 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="icon-{{tool.icon}}"></i> {{ tool.name }}
+        <i class="{{tool.icon}}"></i> {{ tool.name }}
     </div>
-</div>
\ No newline at end of file
+</div>