diff --git a/themes/DeepThought/sass/deep-thought.sass b/themes/DeepThought/sass/deep-thought.sass
index b09eb02..4c2070c 100644
--- a/themes/DeepThought/sass/deep-thought.sass
+++ b/themes/DeepThought/sass/deep-thought.sass
@@ -582,21 +582,22 @@ a
 .menu-list a.is-active
   background-color: #AE3B8B
 
-li.lang-switcher
+.lang-switcher
   list-style: none
   cursor: pointer
+  padding: .5rem .75rem
 
 .lang-switcher .lang-switcher-icon
-  width: 1.25rem
-  height: 1.25rem
-  margin-top: 0.5rem
 
 .dropdown
-  padding: 0
+  padding: .5rem .75rem
 
 .nav
   padding: .5rem .75rem
 
+.nav-left
+  margin-left: 0 !important
+
 .dropdown .dropdown-content
   text-align: center
 
@@ -606,6 +607,7 @@ li.lang-switcher
   display: flex
   flex-direction: row
   right: 0
+  top: 100%
 
 .dropdown-lang
   background-color: #f5f5f5
diff --git a/themes/DeepThought/templates/base.html b/themes/DeepThought/templates/base.html
index 0ce125e..629f544 100644
--- a/themes/DeepThought/templates/base.html
+++ b/themes/DeepThought/templates/base.html
@@ -57,7 +57,7 @@
         </a>
       </div>
       <div class="navbar-menu" id="navMenu">
-        <div class="navbar-end has-text-centered">
+        <div class="navbar-end nav-left has-text-left">
           {% for item in config.extra.navbar_items %}
           {% if lang == item.code %}
           {% for nav in item.nav_items %}
@@ -67,6 +67,8 @@
           {% endfor %}
           {% endif %}
           {% endfor %}
+        </div>
+        <div class="navbar-end has-text-centered">
       	  {% if lang == 'en' %}
 	  <a class="navbar-item" id="nav-search" title="{{ trans(key="search", lang=lang) }}" href="/search" target="_blank" rel="noopener noreferrer">
           {% endif %}
diff --git a/themes/DeepThought/templates/partials/language_switcher.html b/themes/DeepThought/templates/partials/language_switcher.html
index a546c81..5dfc7d0 100644
--- a/themes/DeepThought/templates/partials/language_switcher.html
+++ b/themes/DeepThought/templates/partials/language_switcher.html
@@ -1,7 +1,7 @@
 <details class="dropdown lang-switcher navbar-item navbar-link is-arrowless has-text-weight-semibold">
         <summary class="nav" role="button" aria-haspopup="true" title="{{ trans(key="language_selection", lang=lang) }}" aria-label="{{ trans(key="language_selection", lang=lang) }}">
-	  <span class="lang-switcher-icon icon is-small">
-	      <img src="/images/globe.png">
+	  <span class="lang-switcher-icon">
+            {{ trans(key="language_selection", lang=lang) }}
 	  </span>
         </summary>
         <div class="dropdown-content" role="menu">