diff --git a/app/assets/images/logo-black.png b/app/assets/images/logo-black.png
index 49cdc16cacd..a58645ed7b0 100644
Binary files a/app/assets/images/logo-black.png and b/app/assets/images/logo-black.png differ
diff --git a/app/assets/images/logo-white.png b/app/assets/images/logo-white.png
index 2299153caba..917bcfcb7e7 100644
Binary files a/app/assets/images/logo-white.png and b/app/assets/images/logo-white.png differ
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 28fbe03ee75..26b4d04106e 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -100,18 +100,14 @@ header {
 
     a {
       float: left;
-      padding: 0px;
-      margin: 0 6px;
+      padding: 5px 0;
+      height: 46px;
+      width: 52px;
+      text-align: center;
 
-      h1 {
-        margin: 0;
-        background: image-url('logo-black.png') no-repeat center center;
-        background-size: 32px;
-        float: left;
-        height: 46px;
-        width: 40px;
-        @include header-font;
-        text-indent: -9999px;
+      img {
+        width: 36px;
+        height: 36px;
       }
     }
     &:hover {
diff --git a/app/assets/stylesheets/themes/dark-theme.scss b/app/assets/stylesheets/themes/dark-theme.scss
index abb1ba6686d..b7b22a8724e 100644
--- a/app/assets/stylesheets/themes/dark-theme.scss
+++ b/app/assets/stylesheets/themes/dark-theme.scss
@@ -12,12 +12,6 @@
           &:hover {
             background-color: $color-darker;
           }
-
-          h1 {
-            background: image-url('logo-white.png') no-repeat center center;
-            background-size: 32px;
-            color: #FFF;
-          }
         }
 
         .app_logo {
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb
index 96e5d43a369..21e8557abc7 100644
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -14,4 +14,12 @@ module AppearancesHelper
   def brand_text
     nil
   end
+
+  def brand_header_logo
+    if theme_type == 'light_theme'
+      image_tag 'logo-black.png'
+    else
+      image_tag 'logo-white.png'
+    end
+  end
 end
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index d5928d2ed25..fc8a487ece7 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -3,7 +3,7 @@
     .container
       %div.app_logo
         = link_to root_path, class: "home has_bottom_tooltip", title: "Dashboard" do
-          %h1 GITLAB
+          = brand_header_logo
       %h1.title= title
 
       %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index e912fea2aee..bd6bb3c720d 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -2,10 +2,8 @@
   .navbar-inner
     .container
       %div.app_logo
-        %span.separator
         = link_to explore_root_path, class: "home" do
-          %h1 GITLAB
-        %span.separator
+          = brand_header_logo
       %h1.title= title
 
       %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}