diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs
index 8ac1725..dba13b2 100644
--- a/views/layouts/layout.hbs
+++ b/views/layouts/layout.hbs
@@ -99,9 +99,9 @@
                 <ul class="navbar-nav ml-auto">
                     {{#unless admin}}
                     {{#ifCond @root.config.enableLanguages "!=" false}}
-                    <div class="dropdown">
+                    <div class="dropdown d-none d-sm-block">
                         <button class="btn btn-outline-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            {{ @root.__ "Languages" }}
+                            <i class="fas fa-globe-americas"></i>
                         </button>
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                             {{#availableLanguages}}
diff --git a/views/themes/Cloth/front-menu.hbs b/views/themes/Cloth/front-menu.hbs
index 9c2e579..b3075ea 100644
--- a/views/themes/Cloth/front-menu.hbs
+++ b/views/themes/Cloth/front-menu.hbs
@@ -1,5 +1,5 @@
-<nav id="navbarMenu" class="navbar navbar-expand-lg navbar-light bg-light navbarMenuWrapper col-sm-12">
-    <div class="col-sm-8 offset-md-2 collapsed navbar-collapse" id="navbarMenu">
+<nav id="navbarMenu" class="navbar-expand-lg navbar navbar-light bg-light navbarMenuWrapper col-sm-12">
+    <div class="col-sm-8 offset-md-2 collapse navbar-collapse" id="navbarMenu">
         <ul class="navbar-nav mr-auto">
             <li class="nav-item {{#unless searchTerm}}active{{/unless}}"><a class="nav-link" href="/">Home</a></li>
             {{#each menu.items}}
@@ -11,8 +11,12 @@
             {{/each}}
         </ul>
         <form class="form-inline ml-auto">
-            <input class="form-control mr-sm-2" name="frm_search" id="frm_search" type="search" placeholder="{{ @root.__ "Search shop" }}" aria-label="Search">
-            <button class="btn btn-outline-success my-2 my-sm-0" id="btn_search" type="submit">{{ @root.__ "Search" }}</button>
+            <div class="input-group">
+                <input class="form-control" name="frm_search" id="frm_search" type="search" placeholder="{{ @root.__ "Search shop" }}" aria-label="Search">
+                <div class="input-group-append">
+                    <button class="btn btn-outline-success" id="btn_search" type="submit">{{ @root.__ "Search" }}</button>
+                </div>
+            </div>
         </form>
     </div>
 </nav>
\ No newline at end of file