diff --git a/assets/webconfig/css/hyperion.css b/assets/webconfig/css/hyperion.css
index 8c67b12d..04fcf721 100644
--- a/assets/webconfig/css/hyperion.css
+++ b/assets/webconfig/css/hyperion.css
@@ -169,7 +169,6 @@ table label{margin:0}
 }
 
 .btn-lang-select {
-  color: #337ab7;
   background-color: transparent;
   border-style: none;
 }
diff --git a/assets/webconfig/index.html b/assets/webconfig/index.html
index a5baaa38..3217de4c 100644
--- a/assets/webconfig/index.html
+++ b/assets/webconfig/index.html
@@ -172,10 +172,21 @@
 						<i class="fa fa-wrench fa-fw"></i>  <i class="fa fa-caret-down"></i>
 					</a>
 					<ul class="dropdown-menu dropdown-alerts">
+
+						<!-- /.language selector -->
+						<li id="btn_setlang">
+							<a>
+								<div>
+									<i class="fa fa-globe"></i>
+									<select id="language-select" class="selectpicker" data-width="fit" data-style="btn-lang-select" > </select>
+								</div>
+							</a>
+						</li>
+						<li class="divider"></li>
 						<li id="btn_setaccess">
 							<a>
 								<div>
-									<i class="fa fa-key fa-fw"></i>
+									<i class="fa fa-wrench fa-fw"></i>
 									<span data-i18n="InfoDialog_access_title"></span>
 								</div>
 							</a>
@@ -191,10 +202,6 @@
 						</li>
 					</ul>
 				</li>
-				<!-- /.language selector -->
-        			<li>
-			     		<select id="language-select" class="selectpicker" data-width="fit" data-style="btn-lang-select" > </select>
-		        	</li>
 
 				<!-- /.lock-ui -->
 				<li class="dropdown" id="btn_lock_ui" style="display:none">
diff --git a/assets/webconfig/js/content_index.js b/assets/webconfig/js/content_index.js
index bc51a130..bd84f93c 100644
--- a/assets/webconfig/js/content_index.js
+++ b/assets/webconfig/js/content_index.js
@@ -57,17 +57,33 @@ $(document).ready(function () {
 	}); // end cmd-serverinfo
 
 	// Update language
-	$('.selectpicker').on('changed.bs.select',function (e, clickedIndex, isSelected, previousValue){
-
-    	    var newLang = availLang[clickedIndex];
+	$("#language-select").on('changed.bs.select',function (e, clickedIndex, isSelected, previousValue){
+   	    var newLang = availLang[clickedIndex-1];
 	    if (newLang !== storedLang)
 	    {
 	    	setStorage("langcode", newLang);
-		reload();
+			reload();
 	    }
 
 	});
 
+	$("#language-select").selectpicker(
+	{
+		container: 'body', title: availLangText[availLang.indexOf(getStorage("langcode"))]
+	});
+
+	$(".bootstrap-select").click(function () {
+		$(this).addClass("open");
+	});
+
+	$(document).click(function(){
+		$(".bootstrap-select").removeClass("open");
+	});
+
+	$(".bootstrap-select").click(function(e){
+		e.stopPropagation();
+	});
+
 	$(window.hyperion).on("cmd-sessions-update", function (event) {
 		window.serverInfo.sessions = event.response.data;
 		updateSessions();