diff --git a/theme/site/globals/site.variables b/theme/site/globals/site.variables
index 333ddf6e..4569a6db 100644
--- a/theme/site/globals/site.variables
+++ b/theme/site/globals/site.variables
@@ -159,6 +159,7 @@
 @blocklyToolboxColor: #FFF; /*#FAC80A;*/
 @trashIconColor: #FAC80A; /*white*/
 
+@editorToggleColor: @primaryColor;
 
 /*-------------------
    Blockly
diff --git a/theme/style.less b/theme/style.less
index 1030f2d9..4432bee9 100644
--- a/theme/style.less
+++ b/theme/style.less
@@ -58,7 +58,7 @@
 }
 
 /* Menu bar colors */
-.menubar .ui.item {
+.ui.menu .ui.item {
     color: #4A4A4A;
 }
 .fullscreensim .menubar .ui.menu {
@@ -73,18 +73,15 @@
 
 /* Editor menu toggle */
 .menubar .ui.menu.fixed .item.editor-menuitem .ui.grid {
-    background: @blue !important;
+    background: fade(@blue, 10%) !important;
+    border: 1px solid #888888;
     border-radius: 0px !important;
-    border: 2px solid @blue;
-}
-.menubar .ui.menu.fixed .ui.item.editor-menuitem .item:not(.active) {
-    color: white;
 }
 .menubar .ui.menu.fixed .ui.item.editor-menuitem .item {
     border-radius: 0px !important;
 }
 .menubar .ui.menu.fixed .ui.item.editor-menuitem .item.active {
-    color: @blue;
+    color: white;
 }
 
 .menubar .ui.item.editor-menuitem .item.toggle {