diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index bf725b499..01c8d7f9d 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -98,6 +98,7 @@
 
             &.cp-dropdown-submenu {
                 left: 250px;
+                top: 100px;
             }
 
             &:hover {
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index df54611d4..a7638c04c 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -298,6 +298,7 @@ define([
                 name = name ? Messages.languageButton + ' ('+name+')' : Messages.languageButton;
                 exp.$language.setValue(mode, name);
                 exp.$language.find('span.cp-language-text').text(name);
+                exp.$language.find('span.cp-language-text').prepend('<i class="fa fa-chevron-right"></i>');
             }
 
                 if (mode === "orgmode") {
@@ -343,6 +344,7 @@ define([
                     name = name ? Messages.themeButton + ' ('+theme+')' : Messages.themeButton;
                     $select.setValue(theme, name);
                     $select.find('span.cp-theme-text').text(name);
+                    $select.find('span.cp-theme-text').prepend('<i class="fa fa-chevron-right"></i>');
                 }
             };
         }());
@@ -374,6 +376,7 @@ define([
             var $block = exp.$language = UIElements.createDropdown(dropdownConfig);
             $block.find('button').attr('title', Messages.languageButtonTitle).hide();
             $block.prepend(h('span.cp-language-text', Messages.languageButton));
+            $block.find('span.cp-language-text').prepend('<i class="fa fa-chevron-right"></i>');
 
             var isHovering = false;
             var $aLanguages = $block.$menu.find('li');