diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index ed3b38814a5..ba3ccb1d2f1 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -79,14 +79,14 @@
   }
 
   .login-button,
-  button.sign-up-button {
+  .sign-up-button {
     padding: 6px 10px;
     .fa {
       margin-right: 3px;
     }
   }
 
-  button.login-button {
+  .login-button {
     margin-left: 7px;
   }
 }
diff --git a/app/views/application/_header.html.erb b/app/views/application/_header.html.erb
index 7287acfce04..9c2e59328ad 100644
--- a/app/views/application/_header.html.erb
+++ b/app/views/application/_header.html.erb
@@ -1,24 +1,24 @@
 <%= replace_plugin_html('server:simple-header') do %>
   <header class="d-header">
     <div class="wrap">
-      <div class="contents">
-        <div class="header-row">
-          <div class="logo-wrapper">
-            <a href="<%= path "/" %>">
-              <%- if application_logo_url.present? %>
-                <img src="<%= application_logo_url %>" alt="<%= SiteSetting.title %>" id="site-logo">
-              <%- else %>
-                <h2 id='site-text-logo'><%= SiteSetting.title %></h2>
-              <%- end %>
-            </a>
-          </div>
+      <div class="contents clearfix">
+        <div class="title">
+          <a href="<%= path "/" %>">
+            <%- if application_logo_url.present? %>
+              <img src="<%= application_logo_url %>" alt="<%= SiteSetting.title %>" id="site-logo">
+            <%- else %>
+              <h2 id='site-text-logo'><%= SiteSetting.title %></h2>
+            <%- end %>
+          </a>
+        </div>
+        <div class="panel clearfix">
           <%- unless current_user || local_assigns[:hide_auth_buttons] %>
-            <div class='auth-buttons'>
+            <span class='header-buttons'>
               <%- if can_sign_up? %>
-                <a href="<%= path "/signup"%>" class='btn btn-primary btn-small signup-button'><%= I18n.t('sign_up') %></a>
+                <a href="<%= path "/signup"%>" class='btn btn-primary btn-small sign-up-button'><%= I18n.t('sign_up') %></a>
               <%- end %>
               <a href="<%= path "/login"%>" class='btn btn-primary btn-small login-button btn-icon-text'><%= SvgSprite.raw_svg('fa-user') %><%= I18n.t('log_in') %></a>
-            </div>
+            </span>
           <%- end %>
         </div>
       </div>