diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index d5fe5bc2ef13172af330989508e9be2990079f97..7626ac41e50b4eb35031041b7c5cff48cd2ae1cf 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -97,6 +97,17 @@
   }
 }
 
+.sub-header-block {
+  background-color: $white-light;
+  border-bottom: 1px solid $white-dark;
+  margin: 11px 0;
+  padding-bottom: 11px;
+
+  .oneline {
+    line-height: 35px;
+  }
+}
+
 .cover-block {
   text-align: center;
   background: $background-color;
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 694f09c04644a7b3d8de75efaba048769b001f40..0281b06d3ba3e874358c892cbd47b8c6b9d459eb 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -111,10 +111,6 @@
     width: 50%;
     line-height: 28px;
 
-    &.wiki-page {
-      padding: 16px 10px 11px;
-    }
-
     /* Small devices (phones, tablets, 768px and lower) */
     @media (max-width: $screen-sm-min) {
       width: 100%;
diff --git a/app/views/projects/graphs/ci.html.haml b/app/views/projects/graphs/ci.html.haml
index 6a40cff0e09f5e4990a7dc816b0fd95c8ea10683..e695d3ae369ca92585e9288acbd3d3dfe376287e 100644
--- a/app/views/projects/graphs/ci.html.haml
+++ b/app/views/projects/graphs/ci.html.haml
@@ -3,7 +3,7 @@
 = render 'head'
 
 %div{ class: (container_class) }
-  .row-content-block.append-bottom-default
+  .sub-header-block
     .oneline
       A collection of graphs for Continuous Integration
 
diff --git a/app/views/projects/graphs/commits.html.haml b/app/views/projects/graphs/commits.html.haml
index 2b858c5e0f6e2f1d92a30858563ab1173f35b95c..0daffe68f6fd55fe7c001c983d9fbc708a809fe9 100644
--- a/app/views/projects/graphs/commits.html.haml
+++ b/app/views/projects/graphs/commits.html.haml
@@ -3,7 +3,7 @@
 = render 'head'
 
 %div{ class: (container_class) }
-  .row-content-block.append-bottom-default
+  .sub-header-block
     .tree-ref-holder
       = render 'shared/ref_switcher', destination: 'graphs_commits'
     %ul.breadcrumb.repo-breadcrumb
diff --git a/app/views/projects/graphs/languages.html.haml b/app/views/projects/graphs/languages.html.haml
index 415414a4ebbf02af0e1822be08c1f299dc447dca..6d97f552a8e83f28b64b6fd1c806405d2ece3c48 100644
--- a/app/views/projects/graphs/languages.html.haml
+++ b/app/views/projects/graphs/languages.html.haml
@@ -3,7 +3,7 @@
 = render 'head'
 
 %div{ class: (container_class) }
-  .row-content-block.append-bottom-default
+  .sub-header-block
     .oneline
       Programming languages used in this repository
 
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 61706c1d0fe6b875889515b58d33ed80ffa5fd18..9f7e2a361ff7ddca93806b1f4b02d8659816a53c 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -3,7 +3,7 @@
 = render 'head'
 
 %div{ class: (container_class) }
-  .row-content-block.append-bottom-default
+  .sub-header-block
     .tree-ref-holder
       = render 'shared/ref_switcher', destination: 'graphs'
     %ul.breadcrumb.repo-breadcrumb
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index 81cb709d05335710f15a170cc307eb4058b978bd..af9d23bbfb339290d959ea86d75ba502cf75bcd9 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -4,7 +4,7 @@
 
 %div{ class: (container_class) }
   .top-area
-    .nav-text.wiki-page
+    .nav-text
       %strong
         - if @page.persisted?
           = link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page)
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index e129df16123762634b88b813f44a4bb527f42a08..6caf7230f350d6ee4c3f5f471947bf40e1ab1105 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -3,7 +3,7 @@
 
 = render 'nav'
 %div{ class: (container_class) }
-  .row-content-block
+  .sub-header-block
     %span.oneline
       Git access for
       %strong= @project_wiki.path_with_namespace
@@ -11,7 +11,7 @@
     .pull-right
       = render "shared/clone_panel", project: @project_wiki
 
-  .git-empty.prepend-top-default
+  .prepend-top-default
     %fieldset
       %legend Install Gollum:
       %pre.dark