diff --git a/assets/css/_partial/_header.scss b/assets/css/_partial/_header.scss
index 1859de10..3abafc65 100644
--- a/assets/css/_partial/_header.scss
+++ b/assets/css/_partial/_header.scss
@@ -34,7 +34,8 @@ header {
   .logo {
     min-height: 1.5em;
     height: 1.5em;
-    vertical-align: text-bottom;
+    top: 10px;
+    position: relative;
   }
 
   .header-title-text {
@@ -178,6 +179,10 @@ header {
     position: static;
   }
 
+  nav {
+    overflow: hidden;
+  }
+
   .header-wrapper {
     padding: 0 2rem 0 10vh;
     height: 100%;
@@ -192,6 +197,7 @@ header {
       display: flex;
       flex-direction: row;
       flex-wrap: nowrap;
+      float: right;
 
       >.menu-item:hover {
         & .sub-menu {
@@ -328,7 +334,7 @@ header {
       background: $header-background-color;
       border-top: 2px solid $global-border-color;
       display: none;
-      padding: 0.5rem 1rem 0;
+      padding: 0.5rem 0 0;
       @include box-shadow(0 0.125rem 0.25rem rgba(0, 0, 0, 0.1));
 
       .search-wrapper {
@@ -336,7 +342,7 @@ header {
         justify-content: space-between;
         align-items: center;
         box-sizing: border-box;
-        padding: ($header-height - 2.5rem) / 2 0;
+        padding: ($header-height - 2.5rem) / 2 1rem;
         line-height: 2.5rem;
       }
 
@@ -349,6 +355,11 @@ header {
         }
       }
 
+      .search-loading,
+      .search-clear {
+        right:  0.5rem;
+      }
+
       .search-button {
         top: 0;
       }
@@ -361,21 +372,64 @@ header {
       .menu-item {
         display: block;
         line-height: 2.5rem;
+        padding: 0 1rem;
+
+        &:hover {
+          background-color: lighten($global-font-secondary-color, 24%);
+
+          [theme='dark'] & {
+            background-color: darken($global-font-secondary-color-dark, 24%);
+          }
+        }
+
+        .menu-link {
+          display: block;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          overflow-x: hidden;
+          @include flex(4);
+        }
 
         & .nested-item {
           display: flex;
           justify-content: space-between;
           align-items: center;
+
+          .menu-link {
+            max-width: 80%;
+          }
+        }
+        
+        &.theme-switch,
+        &.language {
+          text-align: center;
+        }
+
+        .language-select {
+          position: absolute;
+          opacity: 0;
+          left: 0;
+          top: 0;
+          width: 100%;
+          height: 100%;
         }
       }
 
       .sub-menu {
-        padding-left: 1rem;
+        padding-left: 0;
         display: none;
 
         &.open {
           display: block;
         }
+
+        .menu-item:hover {
+          background-color: lighten($global-font-secondary-color, 20%);
+
+          [theme='dark'] & {
+            background-color: darken($global-font-secondary-color-dark, 20%);
+          }
+        }
       }
 
       &.active {
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 9f3e7d3d..9a798aac 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -82,7 +82,7 @@
               {{- .Language.LanguageName -}}
               <i class="dropdown-icon fas fa-caret-down"></i>
             </span>
-            <ul class="sub-menu" id="language-select-desktop">
+            <ul class="sub-menu">
               {{- if eq .Kind "404" -}}
               <!-- TODO offline i18n -->
                 {{- range .Sites -}}
@@ -244,9 +244,11 @@
           <i class="fas fa-adjust fa-fw"></i>
         </li>
         {{- if .Site.IsMultiLingual -}}
-          <li class="menu-item" title="{{ T "selectLanguage" }}">
-            {{- .Language.LanguageName -}}
-            <i class="dropdown-icon fas fa-caret-down"></i>
+          <li class="menu-item language">
+            <span title="{{ T "selectLanguage" }}">
+              {{- .Language.LanguageName -}}
+              <i class="dropdown-icon fas fa-caret-down"></i>
+            </span>
             <select class="language-select" onchange="location = this.value;">
               {{- if eq .Kind "404" -}}
                 <!-- TODO offline i18n -->
@@ -258,7 +260,7 @@
                 {{- end -}}
               {{- else -}}
                 {{- range .AllTranslations -}}
-                  <option value="{{ .RelPermalink }}"{{ if eq .Lang $.Lang }} selected{{ end }}>
+                  <option value="{{ .RelPermalink }}"{{ if eq .Lang $.Lang }} selected disabled{{ end }}>
                     {{- .Language.LanguageName -}}
                   </option>
                 {{- end -}}