diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
deleted file mode 100644
index 5cccf9a6ad2..00000000000
--- a/app/views/layouts/_public_head_panel.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
-  .container
-    .header-logo
-      = link_to explore_root_path, class: "home" do
-        = brand_header_logo
-        %h3 GitLab
-    .header-content
-      %h1.title= title
-
-      %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
-        %span.sr-only Toggle navigation
-        %i.fa.fa-bars
-
-      - unless current_controller?('sessions')
-        .pull-right.hidden-xs
-          = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new append-right-10'
-
-        .navbar-collapse.collapse
-          %ul.nav.navbar-nav
-            %li.visible-xs
-              = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
-
-= render 'shared/outdated_browser'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a97feeb1ecd..155825cc4c2 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -3,8 +3,8 @@
   = render "layouts/head"
   %body{class: "#{app_theme}", :'data-page' => body_data_page}
     - if current_user
-      = render "layouts/head_panel", title: header_title
+      = render "layouts/header/default", title: header_title
     - else
-      = render "layouts/public_head_panel", title: header_title
+      = render "layouts/header/public", title: header_title
 
     = render 'layouts/page', sidebar: sidebar
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 5a59c9fd59a..d406f5764a7 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -2,7 +2,7 @@
 %html{ lang: "en"}
   = render "layouts/head"
   %body.ui_mars.login-page.application
-    = render "layouts/empty_head_panel"
+    = render "layouts/header/empty"
     = render "layouts/broadcast"
     .container.navless-container
       .content
diff --git a/app/views/layouts/errors.html.haml b/app/views/layouts/errors.html.haml
index 25cce11990a..2e3a2b16eb7 100644
--- a/app/views/layouts/errors.html.haml
+++ b/app/views/layouts/errors.html.haml
@@ -2,7 +2,7 @@
 %html{ lang: "en"}
   = render "layouts/head"
   %body{class: "#{app_theme}  application"}
-    = render "layouts/empty_head_panel"
+    = render "layouts/header/empty"
     .container.navless-container
       = render "layouts/flash"
       .error-page
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/header/_default.html.haml
similarity index 100%
rename from app/views/layouts/_head_panel.html.haml
rename to app/views/layouts/header/_default.html.haml
diff --git a/app/views/layouts/_empty_head_panel.html.haml b/app/views/layouts/header/_empty.html.haml
similarity index 100%
rename from app/views/layouts/_empty_head_panel.html.haml
rename to app/views/layouts/header/_empty.html.haml
diff --git a/app/views/layouts/header/_public.html.haml b/app/views/layouts/header/_public.html.haml
new file mode 100644
index 00000000000..6a031722aaa
--- /dev/null
+++ b/app/views/layouts/header/_public.html.haml
@@ -0,0 +1,14 @@
+%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
+  .container
+    .header-logo
+      = link_to explore_root_path, class: "home" do
+        = brand_header_logo
+        %h3 GitLab
+    .header-content
+      %h1.title= title
+
+      - unless current_controller?('sessions')
+        .pull-right
+          = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success btn-sm'
+
+= render 'shared/outdated_browser'