diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css
index 04da60b0..f58072fd 100644
--- a/resources/css/ext.uls.css
+++ b/resources/css/ext.uls.css
@@ -22,7 +22,7 @@ div#settings-block {
 .uls-ui-languages button {
 	width: 23%;
 	text-overflow: ellipsis;
-	margin-right: 15px;
+	margin-right: 4%;
 }
 
 .uls-ui-languages button#uls-more-languages {
diff --git a/resources/css/ext.uls.inputsettings.css b/resources/css/ext.uls.inputsettings.css
index 300d0fce..7e489301 100644
--- a/resources/css/ext.uls.inputsettings.css
+++ b/resources/css/ext.uls.inputsettings.css
@@ -55,4 +55,30 @@ div.input-settings-block {
 	padding-top: 10px;
 	padding-bottom: 15px;
 	font-size: 11pt;
+}
+
+.down+.uls-input-settings-caret {
+	display: inline-block;
+	width: 0;
+	height: 0;
+	border-top: none;
+	border-right: 8px solid transparent;
+	border-left: 8px solid transparent;
+	border-bottom: 8px solid #f0f0f0;
+	content: "";
+	position: relative;
+	vertical-align: bottom;
+	top: 12px;
+	left: -16%;
+	margin: 0 -8px;
+}
+
+.uls-input-settings-toggle {
+	padding-top: 10px;
+}
+
+.uls-input-settings-inputmethods-list {
+	margin: 12px 0;
+	padding: 6px 10px;
+	background: #f0f0f0;
 }
\ No newline at end of file
diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js
index bf2ba41e..404de18d 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -97,7 +97,7 @@
 				this.$template.find( 'div.uls-input-settings-languages-title' ).hide();
 				this.$template.find( 'div.uls-ui-languages' ).hide();
 
-				//  Hide input methods
+				// Hide input methods
 				this.$template.find( 'div.uls-input-settings-inputmethods-list' ).hide();
 			}
 			this.prepareToggleButton();
@@ -121,6 +121,7 @@
 
 			if ( !imes ) {
 				$imeListTitle.text( '' );
+				$imeListContainer.hide();
 				return;
 			}
 
@@ -188,7 +189,7 @@
 		prepareLanguages: function () {
 			var inputSettings = this,
 				languagesForButtons, $languages, suggestedLanguages,
-				SUGGESTED_LANGUAGES_NUMBER, lang, i, language, $button;
+				SUGGESTED_LANGUAGES_NUMBER, lang, i, language, $button, $caret;
 
 			SUGGESTED_LANGUAGES_NUMBER = 3;
 			$languages = this.$template.find( 'div.uls-ui-languages' );
@@ -254,6 +255,12 @@
 
 				$button.data( 'language', language );
 				$languages.append( $button );
+
+				if ( $.ime.languages[language] && $.ime.languages[language].inputmethods ) {
+					$caret = $( '<span>' ).addClass( 'uls-input-settings-caret' );
+					$languages.append( $caret );
+				}
+
 				$button.on( 'click', buttonHandler( $button ) );
 			}