diff --git a/skins/elastic/styles/widgets/editor.less b/skins/elastic/styles/widgets/editor.less
index 3a1e9d17c..96b9b80a2 100644
--- a/skins/elastic/styles/widgets/editor.less
+++ b/skins/elastic/styles/widgets/editor.less
@@ -35,6 +35,12 @@
     box-shadow: none !important;
 }
 
+.mce-btn {
+    &.mce-active {
+        background: @color-btn-secondary-background !important;
+    }
+}
+
 .mce-window {
     &.mce-container {
         border: 0;
@@ -140,6 +146,28 @@
             }
         }
 
+        .mce-btn {
+            .btn-secondary;
+            border-radius: .3rem;
+            border-color: transparent;
+
+            &:focus {
+                border-color: transparent !important;
+                color: @color-btn-secondary;
+                background: @color-btn-secondary-background;
+            }
+
+            &.mce-primary {
+                .btn-primary;
+            }
+
+            button:hover,
+            button {
+                color: @color-btn-secondary;
+                padding: .5rem .75rem;
+            }
+        }
+
         .mce-btn:last-child button:before {
             content: @fa-var-times;
         }
@@ -408,6 +436,10 @@
                 border-bottom-color: transparent;
                 border-bottom: 0;
             }
+
+            &:focus {
+                outline: unset !important;
+            }
         }
     }
 
@@ -417,33 +449,6 @@
     }
 }
 
-.mce-btn {
-    &.mce-active {
-        background: @color-btn-secondary-background !important;
-    }
-
-    .mce-window .mce-foot & {
-        .btn-secondary;
-        border-radius: .3rem;
-        border-color: transparent;
-
-        &:focus {
-            border-color: transparent !important;
-            color: @color-btn-secondary;
-            background: @color-btn-secondary-background;
-        }
-
-        &.mce-primary {
-            .btn-primary;
-        }
-
-        button:hover,
-        button {
-            color: @color-btn-secondary;
-            padding: .5rem .75rem;
-        }
-    }
-}
 
 // Menus and popovers, e.g. color selector, emoticons selector, font selector
 .mce-menu,
@@ -508,6 +513,10 @@
                         background: transparent;
                     }
 
+                    &:last-child {
+                        margin: 0;
+                    }
+
                     button {
                         color: @color-font;
                         padding: .45rem;