diff --git a/config.toml b/config.toml
index bafdc0e..0cc3dd0 100644
--- a/config.toml
+++ b/config.toml
@@ -20,6 +20,7 @@ internal_level = "error"
 [translations]
 language_name = "en"
 language_selection = "Language"
+search = "Search"
 published = "Published on"
 edited = "Last edited on"
 letter = "Letter booklet"
@@ -53,6 +54,7 @@ title = "AnarSec"
 [languages.fr.translations]
 language_name = "fr"
 language_selection = "Langue"
+search = "Recherche"
 published = "Publié le"
 edited = "Modifié le"
 letter = "Brochure Letter"
diff --git a/themes/DeepThought/sass/deep-thought.sass b/themes/DeepThought/sass/deep-thought.sass
index 91e9f70..724cb8c 100644
--- a/themes/DeepThought/sass/deep-thought.sass
+++ b/themes/DeepThought/sass/deep-thought.sass
@@ -529,7 +529,6 @@ section
   max-height: calc(100vh - 48px)
   overflow-y: scroll
 
-
 div.column.is-2.is-hidden-mobile
   padding-right: 0px !important
 
@@ -586,12 +585,21 @@ a
 li.lang-switcher
   list-style: none
 
+.lang-switcher .lang-switcher-icon
+  width: 1.25rem
+  height: 1.25rem
+  margin-top: 0.35rem
+
+.dropdown .dropdown-content
+  padding-inline-start:.5rem
+  padding-inline-end:.5rem
+  text-align: center
+  left:50%
+  transform: translatex(-50%) !important
+
 .dropdown-content
   position: absolute !important
 
-summary
-  list-style: none
-
 code
   color: #AE3B8B
 
@@ -608,10 +616,13 @@ code
 .icon-text
   align-items: center
 
-summary
+summary:not(.nav)
   cursor: pointer
   margin-top: 0.5em
 
+summary.nav
+  list-style: none
+
 summary > p
   display: inline
 
diff --git a/themes/DeepThought/templates/base.html b/themes/DeepThought/templates/base.html
index 4652c9b..6e088f2 100644
--- a/themes/DeepThought/templates/base.html
+++ b/themes/DeepThought/templates/base.html
@@ -62,7 +62,7 @@
           {% endfor %}
           {% endif %}
           {% endfor %}
-          <a class="navbar-item" id="nav-search" title="Search" href="/search" target="_blank" rel="noopener noreferrer">
+	  <a class="navbar-item" id="nav-search" title="{{ trans(key="search", lang=lang) }}" href="/search" target="_blank" rel="noopener noreferrer">
             <span class="icon is-small">
 	      <img src="/images/search.png">
             </span>
diff --git a/themes/DeepThought/templates/partials/language_switcher.html b/themes/DeepThought/templates/partials/language_switcher.html
index 06119e6..a53d3f6 100644
--- a/themes/DeepThought/templates/partials/language_switcher.html
+++ b/themes/DeepThought/templates/partials/language_switcher.html
@@ -1,7 +1,7 @@
-<li class="lang-switcher">
+<li class="lang-switcher navbar-item">
     <details class="dropdown">
-        <summary role="button" aria-haspopup="true" title="{{ trans(key="language_selection", lang=lang) }}" aria-label="{{ trans(key="language_selection", lang=lang) }}">
-	  <span class="icon is-small">
+        <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>
         </summary>
@@ -10,6 +10,7 @@
             {{ trans(key="language_name", lang=lang) | upper }}
             {#- Loop through all the available languages in the config -#}
             {%- for lcode, ldetails in config.languages -%}
+		<div>
                 {#- Skip the current language to avoid linking to the current page -#}
                 {%- if lang == lcode -%}
                     {%- continue -%}
@@ -30,6 +31,7 @@
                     {#- If it's not, replace the current language code in the URL with the new one -#}
                     <a role="menuitem" lang="{{ lcode }}" aria-label="{{ language_name }}" href="{{ current_url | replace(from='/' ~ lang ~ '/', to='/' ~ lcode ~ '/') }}">{{ lcode | upper }}</a>
                 {%- endif -%}
+		</div>
             {%- endfor -%}
         </div>
     </details>