diff --git a/layouts/partials/site-header.html b/layouts/partials/site-header.html
index 915a1b0..6abce85 100644
--- a/layouts/partials/site-header.html
+++ b/layouts/partials/site-header.html
@@ -25,9 +25,7 @@
       </a>
     </div>
     <div class="gdoc-menu-header">
-      <span
-        {{ if .Root.Site.Data.menu.extra.header }}class="gdoc-menu-header__items"{{ end }}
-      >
+      <span class="gdoc-menu-header__items">
         {{ if .Root.Site.Data.menu.extra.header }}
           {{ partial "menu-extra" (dict "current" .Root "source" .Root.Site.Data.menu.extra.header "target" "header") }}
         {{ end }}
@@ -48,38 +46,33 @@
           </svg>
         </span>
 
-        {{ if .Root.Site.Data.menu.extra.header }}
-          <span class="gdoc-menu-header__home">
-            <a href="{{ .Root.Site.BaseURL }}" class="gdoc-header__link">
-              <svg class="icon gdoc_home">
-                <title>{{ i18n "button_homepage" }}</title>
-                <use xlink:href="#gdoc_home"></use>
-              </svg>
-            </a>
-          </span>
-        {{ end }}
+        <span class="gdoc-menu-header__home">
+          <a href="{{ .Root.Site.BaseURL }}" class="gdoc-header__link">
+            <svg class="icon gdoc_home">
+              <title>{{ i18n "button_homepage" }}</title>
+              <use xlink:href="#gdoc_home"></use>
+            </svg>
+          </a>
+        </span>
 
         {{ partial "language" .Root }}
 
-        {{ if .Root.Site.Data.menu.extra.header }}
-          <span class="gdoc-menu-header__control">
-            <label for="menu-header-control">
-              <svg class="icon gdoc_keyboard_arrow_right">
-                <use xlink:href="#gdoc_keyboard_arrow_right"></use>
-                <title>{{ i18n "button_menu_close" }}</title>
-              </svg>
-            </label>
-          </span>
-        {{ end }}
+
+        <span class="gdoc-menu-header__control">
+          <label for="menu-header-control">
+            <svg class="icon gdoc_keyboard_arrow_right">
+              <use xlink:href="#gdoc_keyboard_arrow_right"></use>
+              <title>{{ i18n "button_menu_close" }}</title>
+            </svg>
+          </label>
+        </span>
       </span>
-      {{ if .Root.Site.Data.menu.extra.header }}
-        <label for="menu-header-control" class="gdoc-menu-header__control">
-          <svg class="icon gdoc_keyboard_arrow_left">
-            <use xlink:href="#gdoc_keyboard_arrow_left"></use>
-            <title>{{ i18n "button_menu_open" }}</title>
-          </svg>
-        </label>
-      {{ end }}
+      <label for="menu-header-control" class="gdoc-menu-header__control">
+        <svg class="icon gdoc_keyboard_arrow_left">
+          <use xlink:href="#gdoc_keyboard_arrow_left"></use>
+          <title>{{ i18n "button_menu_open" }}</title>
+        </svg>
+      </label>
     </div>
   </div>
 </header>
diff --git a/src/sass/_base.scss b/src/sass/_base.scss
index 791a4ab..921e768 100644
--- a/src/sass/_base.scss
+++ b/src/sass/_base.scss
@@ -194,6 +194,7 @@ img {
 
 .gdoc-brand {
   font-size: $font-size-32;
+  line-height: $font-size-32;
 
   &__img {
     margin-right: $padding-16;