diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 48c569f868400046269b94a6ba4b65847d65355f..c57216f01c8bd84685692cb92516e80ce99f5cd4 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -1,13 +1,13 @@
 %ul
   = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
     = link_to admin_root_path, title: "Stats" do
-      %i.icon-home
+      Overview
   = nav_link(controller: :projects) do
     = link_to "Projects", admin_projects_path
-  = nav_link(controller: :groups) do
-    = link_to "Groups", admin_groups_path
   = nav_link(controller: :users) do
     = link_to "Users", admin_users_path
+  = nav_link(controller: :groups) do
+    = link_to "Groups", admin_groups_path
   = nav_link(controller: :logs) do
     = link_to "Logs", admin_logs_path
   = nav_link(controller: :broadcast_messages) do
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 12fd49e609f5438842ff18b087790116fc69edbc..a300bbc1904e5dd5ff3ade786ef2e3c75fd0b046 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,7 +1,7 @@
 %ul
   = nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do
     = link_to root_path, title: "Home" do
-      %i.icon-home
+      Activity
   = nav_link(path: 'dashboard#projects') do
     = link_to projects_dashboard_path do
       Projects
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 36b102dc25a30a5aca2e245d0163cf72b6ee6c37..d306e1eeb546c6bdb68520cfc923563b29e8292d 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,7 +1,7 @@
 %ul
   = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
     = link_to group_path(@group), title: "Home" do
-      %i.icon-home
+      Activity
   = nav_link(path: 'groups#issues') do
     = link_to issues_group_path(@group) do
       Issues
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 35d0d417502a7b7318ba9b7cc3222d82cd100ef9..1de5ee99cf496e60bb4e95239a8bdf98cf4f6aad 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,7 +1,7 @@
 %ul
   = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
     = link_to profile_path, title: "Profile" do
-      %i.icon-home
+      Profile
   = nav_link(controller: :accounts) do
     = link_to "Account", profile_account_path
   = nav_link(controller: :emails) do
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index dd48ff6ce384516f042b0095b48b7c14495ebf68..69491c2529ecd04750fff16346a355962a7f78bb 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,7 +1,7 @@
 %ul
   = nav_link(path: 'projects#show', html_options: {class: "home"}) do
     = link_to project_path(@project), title: "Project" do
-      %i.icon-home
+      Activity
 
   - if project_nav_tab? :files
     = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
diff --git a/features/steps/admin/active_tab.rb b/features/steps/admin/active_tab.rb
index ccafe09c18f878ae0c30a312d3a3a59dfa871280..8f09e51ccef68a0cd3e632ae12d49c7d4793f1f1 100644
--- a/features/steps/admin/active_tab.rb
+++ b/features/steps/admin/active_tab.rb
@@ -4,7 +4,7 @@ class AdminActiveTab < Spinach::FeatureSteps
   include SharedActiveTab
 
   Then 'the active main tab should be Home' do
-    ensure_active_main_tab('Home')
+    ensure_active_main_tab('Overview')
   end
 
   Then 'the active main tab should be Projects' do
diff --git a/features/steps/dashboard/active_tab.rb b/features/steps/dashboard/active_tab.rb
index 8f5f0eed81665e7c5f81683fba9f9cdee5cab374..68d32ed971add7cd05b579b095ed6b9c8be93a57 100644
--- a/features/steps/dashboard/active_tab.rb
+++ b/features/steps/dashboard/active_tab.rb
@@ -4,7 +4,7 @@ class DashboardActiveTab < Spinach::FeatureSteps
   include SharedActiveTab
 
   Then 'the active main tab should be Home' do
-    ensure_active_main_tab('Home')
+    ensure_active_main_tab('Activity')
   end
 
   Then 'the active main tab should be Issues' do
diff --git a/features/steps/profile/active_tab.rb b/features/steps/profile/active_tab.rb
index ee9f5f201cfca9509192c15dab16adf906f2baf7..1924a6fa785bb24b3bd289423d598517fecc79e2 100644
--- a/features/steps/profile/active_tab.rb
+++ b/features/steps/profile/active_tab.rb
@@ -4,7 +4,7 @@ class ProfileActiveTab < Spinach::FeatureSteps
   include SharedActiveTab
 
   Then 'the active main tab should be Home' do
-    ensure_active_main_tab('Home')
+    ensure_active_main_tab('Profile')
   end
 
   Then 'the active main tab should be Account' do
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index dcc252f4765d01ec38139841f0985fdcd4af12f3..dfafbc6fc0e35d73b1ac42cc6f229e88b430cdde 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -7,7 +7,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
   # Main Tabs
 
   Then 'the active main tab should be Home' do
-    ensure_active_main_tab('Home')
+    ensure_active_main_tab('Activity')
   end
 
   Then 'the active main tab should be Settings' do
diff --git a/features/steps/shared/active_tab.rb b/features/steps/shared/active_tab.rb
index d504fda3327d476bb799ba5e4d8f131092b358c7..e3cd5fcfe8563d550e668b43c7f8afa9cc2be1ca 100644
--- a/features/steps/shared/active_tab.rb
+++ b/features/steps/shared/active_tab.rb
@@ -2,11 +2,7 @@ module SharedActiveTab
   include Spinach::DSL
 
   def ensure_active_main_tab(content)
-    if content == "Home"
-      page.find('.main-nav li.active').should have_css('i.icon-home')
-    else
-      page.find('.main-nav li.active').should have_content(content)
-    end
+    page.find('.main-nav li.active').should have_content(content)
   end
 
   def ensure_active_sub_tab(content)