diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss
index 57b9451b264..ae7bdf14c40 100644
--- a/app/assets/stylesheets/framework/panels.scss
+++ b/app/assets/stylesheets/framework/panels.scss
@@ -2,7 +2,13 @@
   margin-bottom: $gl-padding;
 
   .panel-heading {
-    padding: 7px $gl-padding;
+    padding: $gl-vert-padding $gl-padding;
+    line-height: 36px;
+
+    .controls {
+      margin-top: -2px;
+      float: right;
+    }
   }
 
   .panel-body {
@@ -14,7 +20,3 @@
     }
   }
 }
-
-.container-blank .panel .panel-heading {
-  line-height: 42px !important;  
-}
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss
index 88072606bf5..3e709244879 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -114,22 +114,9 @@
  *
  */
 
-.container-blank .panel .panel-heading {
-  font-size: 17px;
-  line-height: 38px;
-}
-
 .panel {
   box-shadow: none;
 
-  .panel-heading {
-    .panel-head-actions {
-      position: relative;
-      top: -5px;
-      float: right;
-    }
-  }
-
   .panel-body {
     form, pre {
       margin: 0;
diff --git a/app/views/admin/deploy_keys/index.html.haml b/app/views/admin/deploy_keys/index.html.haml
index 841e6971fb2..41c43899978 100644
--- a/app/views/admin/deploy_keys/index.html.haml
+++ b/app/views/admin/deploy_keys/index.html.haml
@@ -2,7 +2,7 @@
 .panel.panel-default
   .panel-heading
     Public deploy keys (#{@deploy_keys.count})
-    .panel-head-actions
+    .controls
       = link_to 'New Deploy Key', new_admin_deploy_key_path, class: "btn btn-new btn-sm"
   - if @deploy_keys.any?
     .table-holder
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index d9b481404f7..b96ad6e2208 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,7 +1,7 @@
 - page_title "Projects"
 = render 'shared/show_aside'
 
-.row
+.row.prepend-top-default
   %aside.col-md-3
     .admin-filter
       = form_tag admin_namespaces_projects_path, method: :get, class: '' do
@@ -47,7 +47,7 @@
     .panel.panel-default
       .panel-heading
         Projects (#{@projects.total_count})
-        .panel-head-actions
+        .controls
           .dropdown.inline
             %button.dropdown-toggle.btn.btn-sm{type: 'button', 'data-toggle' => 'dropdown'}
               %span.light sort:
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index e2f97fd9337..3430f56a9c9 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -1,5 +1,4 @@
 - header_title group_title(@group, "Settings", edit_group_path(@group))
-- @blank_container = true
 
 .panel.panel-default.prepend-top-default
   .panel-heading
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 6a8acc42af9..6b7fd5746d6 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -1,6 +1,5 @@
 - page_title "Members"
 - header_title group_title(@group, "Members", group_group_members_path(@group))
-- @blank_container = true
 
 .group-members-page.prepend-top-default
   - if current_user && current_user.can?(:admin_group_member, @group)
@@ -20,7 +19,7 @@
       group members
       %small
         (#{@members.total_count})
-      .pull-right
+      .controls
         = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form'  do
           .form-group
             = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control', spellcheck: false }
diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml
index 9ca11ed1177..dd75766121e 100644
--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@@ -6,9 +6,9 @@
     %strong= @group.name
     projects:
     - if can? current_user, :admin_group, @group
-      .panel-head-actions
+      .controls
         = link_to new_project_path(namespace_id: @group.id), class: "btn btn-sm btn-success" do
-          %i.fa.fa-plus
+          = icon('plus')
           New Project
   %ul.well-list
     - @projects.each do |project|
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index a42fd38de3a..52bfc595fda 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -1,6 +1,5 @@
 - page_title "Account"
 - header_title page_title, profile_account_path
-- @blank_container = true
 
 - if current_user.ldap_user?
   .alert.alert-info
diff --git a/app/views/projects/project_members/_group_members.html.haml b/app/views/projects/project_members/_group_members.html.haml
index 1c2458fa144..c53033e367c 100644
--- a/app/views/projects/project_members/_group_members.html.haml
+++ b/app/views/projects/project_members/_group_members.html.haml
@@ -5,7 +5,7 @@
     %small
       (#{members.count})
     - if can?(current_user, :admin_group_member, @group)
-      .pull-right
+      .controls
         = link_to group_group_members_path(@group), class: 'btn' do
           = icon('pencil-square-o')
           Manage group members
diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml
index ccddab13aaf..e8dce30425f 100644
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
@@ -4,7 +4,7 @@
     project members
     %small
       (#{members.count})
-    .pull-right
+    .controls
       = form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form'  do
         .form-group
           = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control', spellcheck: false }
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index 6239a148905..0f8848a5cbe 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -1,13 +1,12 @@
 - page_title "Members"
 = render "header_title"
-- @blank_container = true
 
 .project-members-page.prepend-top-default
   - if can?(current_user, :admin_project_member, @project)
     .panel.panel-default
       .panel-heading
         Add new user to project
-        .pull-right
+        .controls
           = link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
             Import members
       .panel-body