diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 691d008ce..81a8934da 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -69,6 +69,7 @@
 
 // Apps, these colors are used for customizing the toolbar for the apps.
 @colortheme_pad-toolbar-bg: #eeeeee;
+@colortheme_toolbar-warn: @colortheme_alertify-red;
 
 @colortheme_pad-bg: #256ad5;
 @colortheme_pad-color: #fff;
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 32af1cf3b..2b01419bd 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -604,10 +604,7 @@
         }
 
         .cp-toolbar-limit {
-            text-shadow: -1px 0 @toolbar-color, 0 1px @toolbar-color, 1px 0 @toolbar-color, 0 -1px @toolbar-color;
-            text-shadow: -1px 0 var(--toolbar-color), 0 1px var(--toolbar-color), 1px 0 var(--toolbar-color), 0 -1px var(--toolbar-color);
-            color: @toolbar-warn-color;
-            color: var(--toolbar-warn-color);
+            color: @colortheme_toolbar-warn;
         }
         .cp-dropdown-content.cp-dropdown-left a {
             color: black;
@@ -633,8 +630,7 @@
             padding: 0;
             margin: 0 5px;
             font-size: @colortheme_app-font-size;
-            color: @toolbar-warn-color;
-            color: var(--toolbar-warn-color);
+            color: @colortheme_toolbar-warn;
             .cp-pnp-msg {
                 padding-left: 5px;
                 font-family: @colortheme_font;
@@ -643,8 +639,7 @@
                     font-size: @colortheme_app-font-size;
                     font-family: @colortheme_font;
                     font-weight: bold;
-                    color: @toolbar-warn-color;
-                    color: var(--toolbar-warn-color);
+                    color: @colortheme_toolbar-warn;
                     &:hover {
                         text-decoration: underline;
                     }
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index e3a7e793b..f914a5d89 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -306,7 +306,6 @@ define([
             var dropdownConfig = {
                 text: Messages.languageButton, // Button initial text
                 options: options, // Entries displayed in the menu
-                left: true, // Open to the left of the button
                 isSelect: true,
                 feedback: 'CODE_LANGUAGE',
                 common: Common