diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index d8df0332ec..b3e729dfdd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -637,8 +637,7 @@
 }
 
 .umb-grid .mce-toolbar {
-    border-bottom: 1px solid @gray-8;
-    background-color: rgba(250, 250, 250, 1);
+    border-bottom: 1px solid @gray-7;
     display: none;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index 01af7c3936..f33617d03f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -56,14 +56,15 @@
 }
 */
 
-.mce-ico {
+.umb-rte .mce-ico {
+    text-align: center;
     font-size: 12px !important;
     /*color: @gray-1 !important;*/
 }
 
 /* Special case to support helviticons for the tiny mce button controls */
-.mce-ico.mce-i-custom[class^="icon-"],
-.mce-ico.mce-i-custom[class*=" icon-"] {
+.umb-rte .mce-ico.mce-i-custom[class^="icon-"],
+.umb-rte .mce-ico.mce-i-custom[class*=" icon-"] {
     font-family: icomoon;
     font-size: 16px !important;
 }
@@ -81,6 +82,84 @@
     }
 }
 
-.mce-fullscreen {
+.umb-rte .mce-fullscreen {
     position:absolute;
 }
+
+.umb-rte .mce-toolbar .mce-btn-group {
+    padding: 0;
+}
+
+.umb-rte .mce-btn {
+    color: @ui-action-type;
+    border-radius: 3px;
+}
+
+.umb-rte .mce-btn-group .mce-btn {
+    margin-top:2px;
+    margin-bottom:2px;
+}
+
+.umb-rte .mce-btn {
+    button:hover {
+        .mce-caret {
+            border-top-color: @ui-action-type-hover;
+        }
+    }
+}
+
+.umb-rte .mce-btn:hover, .umb-rte .mce-btn:active {
+    background: @ui-action-hover;
+    border-color: transparent;
+    button {
+        color: @ui-action-type-hover;
+        .mce-ico {
+            color: @ui-action-type-hover;
+        }
+    }
+}
+
+.umb-rte .mce-btn.mce-active, .umb-rte .mce-btn.mce-active:active, 
+.umb-rte .mce-btn.mce-active:hover, .umb-rte .mce-btn.mce-active:focus {
+    background: @gray-9;
+    border-color: transparent;
+    button {
+        color: @ui-action-type-hover;
+        .mce-ico {
+            color: @ui-action-type-hover;
+        }
+        .mce-caret {
+            border-top-color: @ui-action-type-hover;
+        }
+    }
+}
+
+
+.mce-menu {
+    border-radius: 3px;
+}
+
+.mce-menu-item.mce-menu-item-normal.mce-stack-layout-item {
+    .mce-text, .mce-ico {
+        color: @ui-action-type;
+    }
+    &:hover {
+        background: @ui-action-hover;
+        .mce-text, .mce-ico {
+            color: @ui-action-type-hover;
+        }
+    }
+}
+
+.mce-menu-item.mce-menu-item-normal.mce-stack-layout-item.mce-active {
+    &, &:hover {
+        background: @gray-9;
+    }
+    .mce-text, .mce-ico {
+        color: @ui-action-type-hover;
+    }
+}
+
+.umb-grid .umb-rte {
+    border: 1px solid #d8d7d9;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
index 7bfc6d125e..fb6f3b2a4b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html
@@ -1,4 +1,4 @@
-<div ng-controller="Umbraco.PropertyEditors.Grid.RichTextEditorController as vm">
+<div ng-controller="Umbraco.PropertyEditors.Grid.RichTextEditorController as vm" class="umb-rte">
 
 	<grid-rte
 		configuration="model.config.rte"