diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d6386dbb6fc3eada546e95b9245b37dc811773a2..20c772d8e949c9e989508065fba671074d7e2bd9 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -23,12 +23,8 @@ body {
 
 .help li { color:$style_color; }
 
-.back_link {
-  text-decoration: underline;
+.back-link {
   font-size: 14px;
-  font-weight: bold;
-  padding: 10px 0;
-  padding-bottom: 0;
 }
 
 table a code {
@@ -412,7 +408,7 @@ img.emoji {
 }
 
 .navless-container {
-  margin-top: 30px;
+  margin-top: 20px;
 }
 
 .description-block {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 867920ad08f497292769e976b5dc6d6b79f9e7ee..eb19bec0a7ae1db9a160047635609896fdc753be 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -11,7 +11,7 @@
  */
 .ui-box {
   background: #F9F9F9;
-  margin-bottom: 25px;
+  margin-bottom: 20px;
   border: 1px solid #CCC;
   word-wrap: break-word;
   @include solid-shade;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
index ab14624186d0927cf50c5dc3527b84bb839e6b67..544581057a2e30b93b23b38cf9416f628ce50c16 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
@@ -7,11 +7,12 @@ h1, h2, h3, h4, h5, h6 { margin: 0; }
 h3, h4, h5, h6 { line-height: 36px; }
 h5 { font-size: 14px; }
 
-h3.page_title {
+h3.page-title {
   color: #456;
   font-size: 20px;
   font-weight: normal;
   line-height: 28px;
+  margin-bottom: 15px;
 }
 
 h6 {
diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss
index 7d09f548589910074c51e2fa08ca66ee3aae6211..54263523e85f439384e57f6c514b68b11a3fa6d4 100644
--- a/app/assets/stylesheets/sections/nav.scss
+++ b/app/assets/stylesheets/sections/nav.scss
@@ -1,6 +1,6 @@
 .main-nav {
   background: #f5f5f5;
-  margin: 30px 0;
+  margin: 20px 0;
   margin-top: 0;
   padding-top: 4px;
   border-bottom: 1px solid #E1E1E1;
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 22618765eaae030b7e51daa5b6b470b296e898dd..3430e7cdbc3d6ee8e535fd7239ef222e0cef96f5 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -48,7 +48,7 @@
     margin-bottom: 50px;
   }
   h3 {
-    @extend .page_title;
+    @extend .page-title;
   }
 
 }
diff --git a/app/assets/stylesheets/sections/votes.scss b/app/assets/stylesheets/sections/votes.scss
index 6c81d9a81b8dd2c705291f6d978608dbb67a20d2..49489babab71465ed7bdf842a7a2b3b5570a7d73 100644
--- a/app/assets/stylesheets/sections/votes.scss
+++ b/app/assets/stylesheets/sections/votes.scss
@@ -27,7 +27,7 @@
   }
 }
 .votes-block {
-  margin: 14px 6px 6px 0;
+  margin: 6px;
   .downvotes {
     float: right;
   }
diff --git a/app/assets/stylesheets/sections/wiki.scss b/app/assets/stylesheets/sections/wiki.scss
index 175911d731202e188b37e5ed83eb402a7ba19e21..ed3a432ded04421159b62d1f11965f74bb639335 100644
--- a/app/assets/stylesheets/sections/wiki.scss
+++ b/app/assets/stylesheets/sections/wiki.scss
@@ -1,4 +1,4 @@
-h3.page_title .edit-wiki-header {
+h3.page-title .edit-wiki-header {
   width: 780px;
   margin-left: auto;
   margin-right: auto;
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index 499738f9a0645d6c60259ae32f95905dae6bd507..2d4ffc10d5fb7d7b9c6b303f8fe66af81a6fb117 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Background Jobs
+%h3.page-title Background Jobs
 %br
 .ui-box
   %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index af87503128e9e1c9ce91e1577f1222caac1137b6..f4d931f480f2b4d28649d5147dc35f07bf90d71b 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/app/views/admin/groups/edit.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Edit Group
+%h3.page-title Edit Group
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index d880ff61c9be3470e526c07e88fad563a91944b0..cff0251cd5abd52edc3c628e520eb97ee6c86255 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Groups (#{@groups.total_count})
   %small
     allows you to keep projects organized.
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index 2da654ec764a388d6ee0e089dad06d723c9d22e9..483c40b179188fe26338a93ef419cc7d09b54d2f 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title New Group
+%h3.page-title New Group
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 977fac291f38eb806b80dd3e15047b329988c480..13159fdb56d3573365abd56b1c961b58c42b09a0 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Group: #{@group.name}
 
   = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 70ea460a06f3d8a8a76628eef691221b1e1a9f7e..59d8bd7d67ac7d7b901d36b4031b395acdde2e6f 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Projects
   = link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
 
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 8779ec08870f1414dc457fbd45859f8f5b336d8a..d76af14b77bcd308e1949dd2d822767e75c56a79 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Project: #{@project.name_with_namespace}
   = link_to edit_project_path(@project), class: "btn pull-right" do
     %i.icon-edit
diff --git a/app/views/admin/users/edit.html.haml b/app/views/admin/users/edit.html.haml
index 0e31a0ba332fd8adf311b5fd9b3d02db27fa673a..2a4f8c60546e97e5b4af55e56e6136152fd41b88 100644
--- a/app/views/admin/users/edit.html.haml
+++ b/app/views/admin/users/edit.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   #{@user.name} →
   %i.icon-edit
   Edit user
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 0f74e8f68f4b3076713cd7ca579324df60d9dfc3..2cd095cfe9f66ee4e6a00d517800f10d3ab5a6be 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Users
   = link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
 %br
diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml
index 1e82b249cf1f8566492d4b2246f115b18ce95e72..a1c90c48946ce4992dcf6cdbc27a84b1bb8d408c 100644
--- a/app/views/admin/users/new.html.haml
+++ b/app/views/admin/users/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   %i.icon-plus
   New user
 %hr
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index eaa7ebc3f49724e0337f3b1fa62ed22b433df8eb..7b67fb09fca573d2e17ada9d68400edb527c8b21 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   User:
   = @user.name
   - if @user.blocked?
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index ad104657fea831463f42fdeaa87bdfc330bc9af0..7fdc8b37cac3880be3a118e97a9d33f56eb5beba 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -1,12 +1,10 @@
-%h3.page_title
+%h3.page-title
   Issues
   %span.light
     –
     Assigned to you
   %span.pull-right #{@issues.total_count} issues
 
-%br
-
 .row
   .span3
     = render 'filter', entity: 'issue'
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index de1c457c3183c2666d34c66c44dad84c850a7070..de5d8018757fde06f8e250d7e5a61c424bf373bc 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -1,11 +1,10 @@
-%h3.page_title
+%h3.page-title
   Merge Requests
   %span.light
     –
     Authored by or assigned to you
   %span.pull-right #{@merge_requests.total_count} merge requests
 
-%br
 .row
   .span3
     = render 'filter', entity: 'merge_request'
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index 5d47cbc3b834b0820f25bf49bff99007addabf49..76e164456ec23eac842d988d88a178bd459a681d 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
-  %h3.page_title Reset password
+  %h3.page-title Reset password
   %br
   = devise_error_messages!
   = f.email_field :email, placeholder: "Email",  class: "text"
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 17a0c8fd79aa3c72d89d08632c8e35dbcb900ba7..d749d7bac093ce5526af9a9a3eac0ec9580aff46 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
-  %h3.page_title Sign Up
+  %h3.page-title Sign Up
   %br
   = devise_error_messages!
   %div
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 504522558600951409658d7942c9db7f03917f8b..caaa51f11000b647fc2165667433c2249f006708 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,5 +1,5 @@
 .login-box
-  %h3.page_title Sign in
+  %h3.page-title Sign in
   %br
   - if ldap_enabled?
     %ul.nav.nav-tabs
diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml
index f2d082cb77defd275ead59eba0b1ac71cd9e5905..6aa78f0c2a81de07f4e10e9caf4719ff502efa2d 100644
--- a/app/views/errors/access_denied.html.haml
+++ b/app/views/errors/access_denied.html.haml
@@ -1,5 +1,5 @@
 %h1.http_status_code 403
-%h3.page_title Access Denied
+%h3.page-title Access Denied
 %hr
 %p You are not allowed to access this page.
 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml
index a0aa63064896171ef874e73c7bb3561379a49456..7021f06dd7f9a7d2e1927b0bfa957a769b61e04f 100644
--- a/app/views/errors/encoding.html.haml
+++ b/app/views/errors/encoding.html.haml
@@ -1,4 +1,4 @@
 %h1.http_status_code 500
-%h3.page_title Encoding Error
+%h3.page-title Encoding Error
 %hr
 %p Page can't be loaded because of an encoding error.
diff --git a/app/views/errors/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml
index 5c9c4953284f1dc7db2291b4e0985d673baee9ca..d8ed77732076253a8cabc9ae34dd3767880c152c 100644
--- a/app/views/errors/git_not_found.html.haml
+++ b/app/views/errors/git_not_found.html.haml
@@ -1,5 +1,5 @@
 %h1.http_status_code 404
-%h3.page_title Git Resource Not found
+%h3.page-title Git Resource Not found
 %hr
 %p
   Application can't get access to some branch or commit in your repository. It
diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml
index ee23d2197b4760d7589f48c50dbac54d49be9a37..4b97ddefc720a7f4e446522192cc0b6fcb58535c 100644
--- a/app/views/errors/not_found.html.haml
+++ b/app/views/errors/not_found.html.haml
@@ -1,4 +1,4 @@
 %h1.http_status_code 404
-%h3.page_title The resource you were looking for doesn't exist.
+%h3.page-title The resource you were looking for doesn't exist.
 %hr
 %p You may have mistyped the address or the page may have moved.
diff --git a/app/views/groups/_filter.html.haml b/app/views/groups/_filter.html.haml
index 5c66f97753137c89b32fb5e1901dfa3b7daca96f..9fbc6c190cc16b867c15a7c365e0f071f35fbe13 100644
--- a/app/views/groups/_filter.html.haml
+++ b/app/views/groups/_filter.html.haml
@@ -1,11 +1,5 @@
 = form_tag group_filter_path(entity), method: 'get' do
-  %fieldset.dashboard-search-filter
-    = search_field_tag "search", params[:search], { placeholder: 'Search', class: 'search-text-input' }
-    = button_tag type: 'submit', class: 'btn' do
-      %i.icon-search
-
   %fieldset
-    %legend Status:
     %ul.nav.nav-pills.nav-stacked
       %li{class: ("active" if !params[:status])}
         = link_to group_filter_path(entity, status: nil) do
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 38dac634bf934c49cc5cb003bbba51d9ba0162ed..7ecc5f7b630afad1da13c03ba692b601587d3076 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Issues
   %small (assigned to you)
   %small.pull-right #{@issues.total_count} issues
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index a311729dd4d3386c3afa4f17e26729a98f3292c4..eb8497c03f1905c406c47c5af9544a77d08d0b2a 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Merge Requests
   %small (authored by or assigned to you)
   %small.pull-right #{@merge_requests.total_count} merge requests
diff --git a/app/views/help/api.html.haml b/app/views/help/api.html.haml
index b6ad5e14fc3910736c23ce549b63f9c2f2736c75..5eb59ab266d0c43335c2caadf7f6c5138038cb4d 100644
--- a/app/views/help/api.html.haml
+++ b/app/views/help/api.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/api_layout' do
-  %h3.page_title
+  %h3.page-title
     %span.light API
     %span
       \/
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 6529da7ddd5ee07e60ef5b1d31ee54b620394277..48c8112421f85c69fd6b7079d7d2211df0469e10 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   GITLAB
   .pull-right
     %span= Gitlab::VERSION
diff --git a/app/views/help/markdown.html.haml b/app/views/help/markdown.html.haml
index b4ff88c7f93dcd7469f200891237937e1084ae52..6ba67bf050b6e62da9094420dd99fd0318d7825b 100644
--- a/app/views/help/markdown.html.haml
+++ b/app/views/help/markdown.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title GitLab Flavored Markdown
+  %h3.page-title GitLab Flavored Markdown
   %br
 
   .help_body
diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml
index 4748b296960d4ffbd158cbbca7c0f9151abb76dc..2c093ba4cd711154595663792c66061d01c54bfa 100644
--- a/app/views/help/permissions.html.haml
+++ b/app/views/help/permissions.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title Permissions
+  %h3.page-title Permissions
   %br
 
   %fieldset
diff --git a/app/views/help/public_access.html.haml b/app/views/help/public_access.html.haml
index 66de17a34edc62819e82702005f0c5f8c3738e06..13bf90bc02ff8c25187c9820e519b693ac2f4875 100644
--- a/app/views/help/public_access.html.haml
+++ b/app/views/help/public_access.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title Public Access
+  %h3.page-title Public Access
   %br
 
   %p
diff --git a/app/views/help/raketasks.html.haml b/app/views/help/raketasks.html.haml
index bcc874fc3902618778903d604e9e0706b812106b..0f02696a111739b25b3a61ee9188d776c51073e4 100644
--- a/app/views/help/raketasks.html.haml
+++ b/app/views/help/raketasks.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title GitLab Rake Tasks
+  %h3.page-title GitLab Rake Tasks
   %br
 
   %p.slead
diff --git a/app/views/help/ssh.html.haml b/app/views/help/ssh.html.haml
index 114415977b4e14a04b45a48957b66384550e9371..f35d578f14493c91433cdb835ed130b41d8f226d 100644
--- a/app/views/help/ssh.html.haml
+++ b/app/views/help/ssh.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title SSH Keys
+  %h3.page-title SSH Keys
   %br
 
   %p.slead
diff --git a/app/views/help/system_hooks.html.haml b/app/views/help/system_hooks.html.haml
index c49011a22698c89c23a81b10234fce1537660247..59b714dd839ccc42bc648ce90082d0a627fc52a2 100644
--- a/app/views/help/system_hooks.html.haml
+++ b/app/views/help/system_hooks.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title System hooks
+  %h3.page-title System hooks
   %br
 
   %p.slead
diff --git a/app/views/help/web_hooks.html.haml b/app/views/help/web_hooks.html.haml
index 272b4c4302c714b12d01e6cebd5bc28372f50d41..d3527697631babf402580d2bc717c459d594f78f 100644
--- a/app/views/help/web_hooks.html.haml
+++ b/app/views/help/web_hooks.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title Web hooks
+  %h3.page-title Web hooks
   %br
 
   %p.slead
diff --git a/app/views/help/workflow.html.haml b/app/views/help/workflow.html.haml
index 495b7c6e6fc0955fa4bb966f2911640618378aee..4143d60f889747a1e28ef2ec59e9794d714ad5a1 100644
--- a/app/views/help/workflow.html.haml
+++ b/app/views/help/workflow.html.haml
@@ -1,5 +1,5 @@
 = render layout: 'help/layout' do
-  %h3.page_title Workflow
+  %h3.page-title Workflow
   %br
 
   %ol.help
diff --git a/app/views/layouts/_page_title.html.haml b/app/views/layouts/_page_title.html.haml
index ea72b25add91a61eaadffb967ae7aa131f01ffd2..54da507476388cd697beb27ad2e7dca6bb5b68df 100644
--- a/app/views/layouts/_page_title.html.haml
+++ b/app/views/layouts/_page_title.html.haml
@@ -1,2 +1,2 @@
-- if content_for?(:page_title)
-  = yield :page_title
+- if content_for?(:page-title)
+  = yield :page-title
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index 05c481ded23438c31e927862450fa3dac3872eef..ec814c4abf41821c76b76bb12cd56a2cf9d7e4d6 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   SSH Keys
   = link_to "Add SSH Key", new_profile_key_path, class: "btn pull-right btn-primary"
 
diff --git a/app/views/profiles/keys/new.html.haml b/app/views/profiles/keys/new.html.haml
index fff3805890e173556d9adc91cb248993a93b1519..f1b8fe08d5c42d55b4782c0bf173fc87175bac69 100644
--- a/app/views/profiles/keys/new.html.haml
+++ b/app/views/profiles/keys/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Add an SSH Key
+%h3.page-title Add an SSH Key
 %hr
 = render 'form'
 
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index 069747097c508462c9fc38d5ff3426ec79c7beca..c69955ae3096891b29abdaa463a201a2e0b13b31 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Setup your notification level
+%h3.page-title Setup your notification level
 
 %br
 
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 0bcf03bae8aadfe836f48c54e65ff2d97913ff4d..3eaa54a299cade9b000c73c606db93915e8eb61a 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -1,6 +1,6 @@
 .profile_avatar_holder
   = image_tag gravatar_icon(@user.email, 90), alt: ''
-%h3.page_title
+%h3.page-title
   = @user.name
   %br
   %small
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 62ef2871096bd703d0998460291436550c95aa22..a592823a070756e8d4d17458936201bebf81e737 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -15,7 +15,7 @@
           %li= link_to "Plain Diff",    project_commit_path(@project, @commit, format: :diff)
       = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
         %span Browse Code »
-    %h3.commit-title.page_title
+    %h3.commit-title.page-title
       = gfm escape_once(@commit.title)
     - if @commit.description.present?
       %pre.commit-description
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 95cfb60d88567473ee2db4a196387e47b068fc95..9d491e72a5b1ebe57542a98f3bf0c4cbdcf9f232 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -1,6 +1,6 @@
 = render "projects/commits/head"
 
-%h3.page_title
+%h3.page-title
   Compare View
 %hr
 
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 51e88d1c47d78916a46f4834b30e21ee2afcf376..24be291bde2b8064f61029d78d63f2b62730fdf4 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -1,6 +1,6 @@
 = render "projects/commits/head"
 
-%h3.page_title
+%h3.page-title
   Compare View
 %hr
 
diff --git a/app/views/projects/deploy_keys/new.html.haml b/app/views/projects/deploy_keys/new.html.haml
index b0e2a8b29490c31aaf9a9df944f861db5da7e488..186d6b58972f256ea8719302eb4f109e8a3748ca 100644
--- a/app/views/projects/deploy_keys/new.html.haml
+++ b/app/views/projects/deploy_keys/new.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title New Deploy key
+%h3.page-title New Deploy key
 %hr
 
 = render 'form'
diff --git a/app/views/projects/deploy_keys/show.html.haml b/app/views/projects/deploy_keys/show.html.haml
index 26fd7428b7e8516e02ab7a27c53f7c4a10f4624e..49566f83d20620dcd35d3fc340348f107da87446 100644
--- a/app/views/projects/deploy_keys/show.html.haml
+++ b/app/views/projects/deploy_keys/show.html.haml
@@ -1,10 +1,10 @@
-%h3.page_title
+%h3.page-title
   Deploy key:
   = @key.title
   %small
     created at
     = @key.created_at.stamp("Aug 21, 2011")
-.back_link
+.back-link
   = link_to project_deploy_keys_path(@project) do
     ← To keys list
 %hr
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 6593319af27c62f26c5851e0cf254c8c8bab8190..6f9a161a13c95c9428a6bc89e0a69f699eb9d890 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -1,7 +1,7 @@
 .loading-graph
   %center
     .loading
-    %h3.page_title Building repository graph. Please wait a moment.
+    %h3.page-title Building repository graph. Please wait a moment.
 
 .stat-graph
   .header.clearfix
@@ -10,7 +10,7 @@
         %option{:value => "commits"} Commits
         %option{:value => "additions"} Additions
         %option{:value => "deletions"} Deletions
-    %h3#date_header.page_title
+    %h3#date_header.page-title
     %input#brush_change{:type => "hidden"}
   .graphs
     #contributors-master
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index 38aea6f06dc384c968887c3d6673b249eda2746d..153a477fdc84e92599b86d29b031390b9dd50169 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -1,5 +1,5 @@
 %div.issue-form-holder
-  %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
+  %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
   = form_for [@project, @issue] do |f|
     -if @issue.errors.any?
       .alert.alert-error
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index d3fd9886d45dba977783b48513aedcda4025c3e1..ebe124d89068374857c24897e56049bdbc3f6c61 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,6 +1,6 @@
 = render "head"
 .issues_content
-  %h3.page_title
+  %h3.page-title
     Issues
     %span (<span class=issue_counter>#{@issues.total_count}</span>)
     .pull-right
@@ -16,8 +16,6 @@
           = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
           = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
 
-  .clearfix
-
 .row
   .span3
     = render 'filter', entity: 'issue'
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 2c72d550b3c8fc1b983162e6ab0918eadf8a67e2..fc6faa9c19d175be36dc6c8e33e4ac2f0e5c381a 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Issue ##{@issue.id}
 
   %small
@@ -22,7 +22,7 @@
 .pull-right
   .span3#votes= render 'votes/votes_block', votable: @issue
 
-.back_link
+.back-link
   = link_to project_issues_path(@project) do
     &larr; To issues list
 
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index b6a4b07b9ae9783645d57324036711cfd6023ac9..b0aa72783b484e5d5682e2cb97208006649edfe7 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -1,6 +1,6 @@
 = render "projects/issues/head"
 
-%h3.page_title
+%h3.page-title
   Labels
 %br
 
diff --git a/app/views/projects/merge_requests/edit.html.haml b/app/views/projects/merge_requests/edit.html.haml
index eee148994d71716689fcad21a1b211d1206407fb..348ebee46e4046e35e84a02a7688fe591c39959a 100644
--- a/app/views/projects/merge_requests/edit.html.haml
+++ b/app/views/projects/merge_requests/edit.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = "Edit merge request #{@merge_request.id}"
 %hr
 = render 'form'
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index b9e9096e3ae1330a75eb8e167ce260a79521c277..7db5a21280e1e83f046ce051f9d33a7682a552d1 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -2,7 +2,7 @@
   = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
     %i.icon-plus
     New Merge Request
-%h3.page_title
+%h3.page-title
   Merge Requests
 
 %br
diff --git a/app/views/projects/merge_requests/new.html.haml b/app/views/projects/merge_requests/new.html.haml
index 594089995eaae7315be46e608495470b20cf8c02..8ee0e1a8d46a2d7feddf750889d03a9af9feefdf 100644
--- a/app/views/projects/merge_requests/new.html.haml
+++ b/app/views/projects/merge_requests/new.html.haml
@@ -1,3 +1,3 @@
-%h3.page_title New Merge Request
+%h3.page-title New Merge Request
 %hr
 = render 'form'
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 24285c272a827d79ea30c79d331286332d5eb149..5a07258f91c1974e1758f8014f402729cd7cba1b 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = "Merge Request ##{@merge_request.id}:"
   &nbsp;
   %span.label-branch= @merge_request.source_branch
@@ -26,6 +26,6 @@
 .pull-right
   .span3#votes= render 'votes/votes_block', votable: @merge_request
 
-.back_link
+.back-link
   = link_to project_merge_requests_path(@project) do
     &larr; To merge requests
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 50e3e71b2c3b1b609ce212deb15d7323d357afe7..0dc9dab872f7cdb594ce2ab4b9630a5dfc8f29de 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -1,5 +1,5 @@
-%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
-.back_link
+%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
+.back-link
   = link_to project_milestones_path(@project) do
     &larr; To milestones
 
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index 1bc359398abbf3768bdea484943daaa3fd46e960..76cd16c4000df133b7d16ed7ee2f9be47db70d33 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -1,6 +1,6 @@
 = render "projects/issues/head"
 .milestones_content
-  %h3.page_title
+  %h3.page-title
     Milestones
     - if can? current_user, :admin_milestone, @project
       = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index d16de0da390ee4b378f469b0efe7885bd8ca5227..b9e5bd9bcc5b26ca952ba7a337c10ea7039c1dc5 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -1,11 +1,11 @@
 = render "projects/issues/head"
 .row
   .span6
-    %h3.page_title
+    %h3.page-title
       Milestone ##{@milestone.id}
       %small
         = @milestone.expires_at
-    .back_link
+    .back-link
       = link_to project_milestones_path(@project) do
         &larr; To milestones list
   .span6
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index 62ab8b049ac4a989596405586b3d824fdb301da3..e75b85c7ade6a0ff7368dafadbc0a334995b831d 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Project Network Graph
+%h3.page-title Project Network Graph
 %hr
 
 .clearfix
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index ff6769531c407a6816870ce5ec71516423cb1886..b3cbf17809f7618330f335a61e991ab623e186b7 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   - if @service.activated?
     %span.cgreen
       %i.icon-circle
@@ -9,7 +9,7 @@
 
 %p= @service.description
 
-.back_link
+.back-link
   = link_to project_services_path(@project) do
     &larr; to services
 
diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml
index 6d254f66f1c3a6e622ccd2f344b97fb71d788bb3..2aa2a0699437e2867260b65e206623801805953c 100644
--- a/app/views/projects/services/index.html.haml
+++ b/app/views/projects/services/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Services
+%h3.page-title Services
 %br
 
 %ul.bordered-list
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index b36b56415aa2b5b2745e136b79d8f21897517f24..38cd4c408758f18b98eef0b52023e03a6776a9b4 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -7,7 +7,7 @@
     .loading.hide
   .span3
     .light-well
-      %h3.page_title
+      %h3.page-title
         = @project.name
       - if @project.description.present?
         %p.light= @project.description
diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml
index 99a8761daef573d3017b9134b7ffe05967654415..a4f307347896d42ab994ff99a79d3c942c43538b 100644
--- a/app/views/projects/snippets/_form.html.haml
+++ b/app/views/projects/snippets/_form.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
index ce36bed1e0d6b0348d3fe2f141d00e965c91dc9a..2e8dddefffcd7fe52c6427238420b03610d8491f 100644
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Snippets
   %small share code pastes with others out of git repository
 
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index 36161c5706ca9222122f936ed028e96a3d5541de..d5b334c9e904ca28d9519f4d465cbbb10d36f930 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   %i.icon-lock.cgreen
   = @snippet.title
 
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index 4e8f67702cf6f9557b9988ca09a68b06f61dcdcf..2c6d9d892d0dd1a038dccccfb7ed9e7b3cbde025 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = "New Team member(s)"
 %hr
 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml
index 2b22c917a1604efeb365043e4911551ef20a256a..c293cb4beefc468ec7bdccbe26ed66e0d1b450f6 100644
--- a/app/views/projects/team_members/import.html.haml
+++ b/app/views/projects/team_members/import.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = "Import team from another project"
 %hr
 %p.slead
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index 8f81390ca130b0f709036934ae5441fec31ba4e9..e8ae84bb8f5c0108e7d705596acbc54d8d1d8606 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Users with access to this project
 
   - if can? current_user, :admin_team_member, @project
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 7cf08815f7861b801c9988a49af752a1f876bc1f..464b1508a7ec11a857f4a2658c948b900ef9c834 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -8,7 +8,7 @@
 
   .ui-box.ui-box-show
     .ui-box-head
-      %h3.page_title
+      %h3.page-title
         .edit-wiki-header
           = @wiki.title.titleize
           = f.hidden_field :title, value: @wiki.title
diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml
index ca8e7c1b4b4597c5de6c9173ba700324d4570a98..66f28b8b804dd13dade996eabb913be5844a61e6 100644
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
@@ -1,7 +1,7 @@
 %div#modal-new-wiki.modal.hide
   .modal-header
     %a.close{href: "#"} ×
-    %h3.page_title New Wiki Page
+    %h3.page-title New Wiki Page
   .modal-body
     = label_tag :new_wiki_path do
       %span Page slug
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index 4e318c92db3a37245941b5840a1a307d37662ea4..66be82777c9b832e535cd0c117a2009a65b0161a 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   Editing page
   = render 'main_links'
 = render 'form'
diff --git a/app/views/projects/wikis/empty.html.haml b/app/views/projects/wikis/empty.html.haml
index 08b59f0328ba550e167463208bc77831dc38c6e0..48058124f97fc28154ae2f46ea4b6fdb4a258c8e 100644
--- a/app/views/projects/wikis/empty.html.haml
+++ b/app/views/projects/wikis/empty.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title Empty page
+%h3.page-title Empty page
 %hr
 .error_message
   You are not allowed to create wiki pages
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index 71e2b48d37070fefbf7840c9b535654d8717d9bf..e783a982ddbbf9f7f2de784f95209eac92a42396 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   Git Access
   %strong= @gollum_wiki.path_with_namespace
   = render 'main_links'
diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml
index 138c384353d144772fb110dd5fe7d09254b54efe..6544102b83f9d3faca24654c0a73de75b52a4e97 100644
--- a/app/views/projects/wikis/history.html.haml
+++ b/app/views/projects/wikis/history.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   %span.light History for
   = @wiki.title.titleize
   = render 'main_links'
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index 07e942ec62f16ce5f26865e1347d3d75fb2c1aae..829617d77cd0c850cfbb294271684e2976cc2afe 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   All Pages
   = render 'main_links'
 %br
diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml
index d9d57e2d8be49ee9d19843bd5af7c0d4f6b5e217..2fdaa8d00e4ce70f76072291d68488dba4cec002 100644
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -1,5 +1,5 @@
 = render 'nav'
-%h3.page_title
+%h3.page-title
   = @wiki.title.titleize
   = render 'main_links'
 %br
diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml
index e2b19d0d824951b4ff54f91e06e562c7d5ce8ea1..69d86e18f3fbeede3e5d0cd777c366dcbebc0ed4 100644
--- a/app/views/public/projects/index.html.haml
+++ b/app/views/public/projects/index.html.haml
@@ -1,6 +1,6 @@
 .row
   .span6
-    %h3.page_title
+    %h3.page-title
       Projects (#{@projects.total_count})
       %small with read-only access
   .span6
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 95e9e0357bc9c233630a8762e43f6f6c6e3d7a1f..e05794e820c08714c0e61f240b253d4524202216 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index cf5c3084dc460f60503405758e1fdf01d665a992..1d9b60f73314d4a58f6d71472c57a4af8b46232b 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   My Snippets
   %small share code pastes with others out of git repository
   .pull-right
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 4301f90f9d6a2bd801d60ac59bb8b3e033cc789d..1502a6698fe1a160c3b43fdbfe510d5d5d8c74fa 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   Public snippets
   %small share code pastes with others out of git repository
 
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index ac6daed56b63d68d0800bbee15d67fa1528528ea..fd837624dc9eb24e0b67abbb4a8b7a33862df15c 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   - if @snippet.private?
     %i{:class => "icon-lock cgreen has_bottom_tooltip", "data-original-title" => "Private snippet"}
   - else
diff --git a/app/views/snippets/user_index.html.haml b/app/views/snippets/user_index.html.haml
index 79e3ddf96fdce1e2c883503b545b8a0b05cf7878..a9563b75e796bb97c4c75a3e2a5a68fd1f7b95ae 100644
--- a/app/views/snippets/user_index.html.haml
+++ b/app/views/snippets/user_index.html.haml
@@ -1,4 +1,4 @@
-%h3.page_title
+%h3.page-title
   = image_tag gravatar_icon(@user.email), class: "avatar s24"
   = @user.name
   %span
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index b70f41932094333e2de94215559f106b6f0dd6a2..284098b9b1993622dc70eba192194abe9f01b599 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,6 +1,6 @@
 .row
   .span8
-    %h3.page_title
+    %h3.page-title
       = image_tag gravatar_icon(@user.email, 90), class: "avatar s90", alt: ''
       = @user.name
       - if @user == current_user