diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml
index 8a397a84e0ee1df98da2abad8098f926e1807ed8..dcd6c97d44d8943cfcf9c31bfde5c12cf5a08d61 100644
--- a/app/views/dashboard/_groups_head.html.haml
+++ b/app/views/dashboard/_groups_head.html.haml
@@ -3,5 +3,5 @@
     = link_to dashboard_groups_path, title: 'Your groups', data: {placement: 'right'} do
       Your Groups
   = nav_link(page: [explore_groups_path]) do
-    = link_to explore_groups_path, title: 'Explore groups', data: {toggle: 'tooltip', placement: 'bottom'} do
+    = link_to explore_groups_path, title: 'Explore groups', data: {placement: 'bottom'} do
       Explore Groups
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index 9ba12036f2749c1693969ac5e6d5c6f877826128..13a5eae3cdc41e36e78c0a22bac0e0555742a90e 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -6,5 +6,5 @@
     = link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
       Starred Projects
   = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path], html_options: { class: 'hidden-xs' }) do
-    = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
+    = link_to explore_root_path, title: 'Explore', data: {placement: 'right'} do
       Explore Projects
diff --git a/app/views/dashboard/activity.html.haml b/app/views/dashboard/activity.html.haml
index 72419bf94dd3fd677ea20c2ef9127d0cc780e94e..3e24338af642d41f29ef3b463cb38b10ffe8db2f 100644
--- a/app/views/dashboard/activity.html.haml
+++ b/app/views/dashboard/activity.html.haml
@@ -2,6 +2,7 @@
   - if current_user
     = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
 
+- header_title  "Activity", activity_dashboard_path
 = render 'dashboard/activity_head'
 
 %section.activities
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml
index 9307812d495e50d42a3a1d5f7260111130c01cc4..c249f5cacecb8b988b549acc08dd5875015e99a7 100644
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Groups"
+- header_title  "Groups", dashboard_groups_path
 = render 'dashboard/groups_head'
 
 .gray-content-block
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 94318d1bcf5517e6f14c478321cbc1137e59bbd5..14734ae73724f75945449f7ce89e22d61458934d 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -1,14 +1,11 @@
 - page_title "Issues"
+- header_title  "Issues", issues_dashboard_path(assignee_id: current_user.id)
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, issues_dashboard_url(format: :atom, private_token: current_user.private_token), title: "#{current_user.name} issues")
 
-%h3.page-title
-  Issues
-
 %p.light
   List all issues from all projects you have access to.
-%hr
 
 .append-bottom-20
   .pull-right
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 90611d562b05342bc6faa901b7a1fdb9c4b8b962..3739a7d5dbcb999c5d21cc0eefc14d8ef447a860 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -1,11 +1,9 @@
 - page_title "Merge Requests"
-%h3.page-title
-  Merge Requests
-
+- header_title  "Merge Requests", merge_requests_dashboard_path(assignee_id: current_user.id)
 
 %p.light
   List all merge requests from all projects you have access to.
-%hr
+
 .append-bottom-20
   = render 'shared/issuable/filter', type: :merge_requests
 = render 'shared/merge_requests'
diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml
index 9a9a5e139a44f72333c0043cd3b615f2d7dcace0..88ad3cd729701e06ae6a5e3e6f652b911c6690aa 100644
--- a/app/views/dashboard/milestones/index.html.haml
+++ b/app/views/dashboard/milestones/index.html.haml
@@ -1,12 +1,9 @@
 - page_title "Milestones"
-%h3.page-title
-  Milestones
-  %span.pull-right #{@dashboard_milestones.count} milestones
+- header_title  "Milestones", dashboard_milestones_path
 
 %p.light
   List all milestones from all projects you have access to.
 
-%hr
 
 = render 'shared/milestones_filter'
 .milestones
diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml
index becd989c1f3d206e28e4967e3cbf7cf33450367c..2fd7a1cf16cf7c32ddb37e1315cca491a9bd95c5 100644
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@@ -1,4 +1,5 @@
 - page_title "Starred Projects"
+- header_title "Projects", (current_user ? root_path : explore_root_path)
 = render 'dashboard/projects_head'
 
 - if @projects.any?
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index 4cf2feb9aa60048ae4cb5f16a505531ec24949fd..1d5324e0d72274edc9ac81f6a58deb807e7b663c 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -2,6 +2,7 @@
   - if current_user
     = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
 
+- header_title "Projects", (current_user ? root_path : explore_root_path)
 = render 'dashboard/projects_head'
 
 - if @last_push
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index 86410db2b2d5dbdb12c0da10044cbe00368583bc..e8a6752de8ce43c25fdb95e0b63bca596882836a 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Groups"
+- header_title "Groups", (current_user ? dashboard_groups_path : explore_groups_path)
 - if current_user
   = render 'dashboard/groups_head'
 .gray-content-block.clearfix
diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml
index c72eca10bf4c379635b91a52a85a48a2e0a8a4b7..fad7de69432096078e30d11a695c4abbffa18f13 100644
--- a/app/views/layouts/dashboard.html.haml
+++ b/app/views/layouts/dashboard.html.haml
@@ -1,5 +1,6 @@
 - page_title    "Dashboard"
-- header_title  "Dashboard", root_path
+- unless @header_title
+  - header_title  "Dashboard", root_path
 - sidebar       "dashboard"
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml
index 17fee9c510db12af71c5cf6c51774150457f0c77..9098554e6f0c62962a9c0720a2400d1801d1a2bf 100644
--- a/app/views/layouts/explore.html.haml
+++ b/app/views/layouts/explore.html.haml
@@ -1,6 +1,7 @@
 - page_title    "Explore"
 - if current_user
-  - header_title  "Dashboard", root_path
+  - unless @header_title
+    - header_title "Projects", (current_user ? root_path : explore_root_path)
 - else
   - header_title  "Explore GitLab", explore_root_path
 - sidebar       "dashboard"
diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml
index b77fe09fc2a20f50c68083572c7c7964b894061e..d9c90d4fcef98cbbe824f65693b9d9c283d9b380 100644
--- a/app/views/layouts/snippets.html.haml
+++ b/app/views/layouts/snippets.html.haml
@@ -1,6 +1,6 @@
 - page_title    'Snippets'
 - if current_user
-  - header_title  "Dashboard", root_path
+  - header_title  "Snippets", user_snippets_path(current_user)
 - else
   - header_title  'Snippets', snippets_path
 - sidebar       "dashboard"
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index 62a967a2e069d624b5a17ab1899b32fc56cb5fc3..d704407c4dd9d8161b80f0e1e9a20fa0bcf5cadc 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,14 +1,15 @@
 - page_title "Your Snippets"
 = render 'head'
 
-.slead
-  Share code pastes with others out of git repository
-
+.gray-content-block
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-new btn-sm", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
       Add new snippet
 
-%ul.nav.nav-tabs
+  .oneline
+    Share code pastes with others out of git repository
+
+%ul.nav.nav-tabs.prepend-top-20
   = nav_tab :scope, nil do
     = link_to user_snippets_path(@user) do
       All
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 8608815e0a68d5a89dbd43c7e4a4bf0529f1d62e..3b62dd2a6e14b4a250e33770fdbbeccab1e1542a 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -2,8 +2,14 @@
 - if current_user
   = render 'head'
 
-.slead
-  Public snippets created by you and other users are listed here
+.gray-content-block
+  - if current_user
+    .pull-right
+      = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
+        Add new snippet
+
+  .oneline
+    Public snippets created by you and other users are listed here
 
 = render 'snippets'