diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 11cd9269d..265a5b225 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -71,8 +71,6 @@ en:
       unknown_person: "unknown person"
       video_title:
         unknown: "Unknown Video Title"
-      aspect_badge:
-        all_aspects: "All Aspects"
 
   aspects:
     zero: "no aspects"
diff --git a/features/comments.feature b/features/comments.feature
index d28243e90..5b6ad01d4 100644
--- a/features/comments.feature
+++ b/features/comments.feature
@@ -15,7 +15,7 @@ Feature: commenting
     And I fill in "status_message_fake_text" with "Look at this dog"
     And I press "Share"
     And I wait for the ajax to finish
-    And I follow "All aspects"
+    And I follow "All Aspects"
     Then I should see "Look at this dog" within ".stream_element"
     And I should see a "img" within ".stream_element div.photo_attachments"
     Then I log out
diff --git a/features/manages_aspects.feature b/features/manages_aspects.feature
index 56287dd2f..0bee9e688 100644
--- a/features/manages_aspects.feature
+++ b/features/manages_aspects.feature
@@ -6,7 +6,7 @@ Feature: User manages aspects
 
   Scenario: creating an aspect from manage aspects page
     Given I am signed in
-    When I follow "All aspects" in the header
+    When I follow "All Aspects" in the header
     And I follow "Manage aspects"
     And I follow "+ Add a new aspect"
     And I fill in "Name" with "Dorm Mates" in the modal window
@@ -15,7 +15,7 @@ Feature: User manages aspects
     
   Scenario: creating an aspect from homepage
     Given I am signed in
-    When I follow "All aspects" in the header
+    When I follow "All Aspects" in the header
     And I follow "+" in the header
     And I fill in "Name" with "losers" in the modal window
     And I press "Create" in the modal window
diff --git a/features/manages_contact_requests.feature b/features/manages_contact_requests.feature
index 390b579f1..b70fcbb86 100644
--- a/features/manages_contact_requests.feature
+++ b/features/manages_contact_requests.feature
@@ -7,9 +7,8 @@ Feature: managing contact requests
     
   Scenario: seeing contact request notifications
     When I am on the home page
-    Then I should see "All aspects" in the header
-    Then I should see "All aspects" in the header
-    When I follow "All aspects"
+    Then I should see "All Aspects" in the header
+    When I follow "All Aspects"
     Then I should see "new request!"
     
   @javascript
diff --git a/features/posts.feature b/features/posts.feature
index 5fd5484e7..ddbeb59b0 100644
--- a/features/posts.feature
+++ b/features/posts.feature
@@ -21,7 +21,7 @@ Feature: posting
       Given I expand the publisher
       When I fill in "status_message_fake_text" with "I am eating a yogurt"
         And I press "Share"
-        And I follow "All aspects"
+        And I follow "All Aspects"
       Then I should see "I am eating a yogurt" within ".stream_element"
 
     Scenario: delete a post
@@ -29,12 +29,12 @@ Feature: posting
       When I fill in "status_message_fake_text" with "I am eating a yogurt"
         And I press "Share"
         And I wait for the ajax to finish
-        And I follow "All aspects"
+        And I follow "All Aspects"
         And I hover over the post
         And I preemptively confirm the alert
         And I click to delete the first post
         And I wait for the ajax to finish
-        And I follow "All aspects"
+        And I follow "All Aspects"
         Then I should not see "I am eating a yogurt"
 
     Scenario Outline: post to one aspect
@@ -43,7 +43,7 @@ Feature: posting
         And I expand the publisher
         And I fill in "status_message_fake_text" with "I am eating a yogurt"
         And I press "Share"
-        And I follow "All aspects"
+        And I follow "All Aspects"
         And I follow "<aspect>"
       Then I should <see> "I am eating a yogurt"
 
diff --git a/features/saved_state.feature b/features/saved_state.feature
index a763112d7..8d159d73c 100644
--- a/features/saved_state.feature
+++ b/features/saved_state.feature
@@ -28,8 +28,8 @@ Feature: saved state
       But I should have aspect "Closed 1" "not selected"
       But I should have aspect "Closed 2" "not selected"
 
-      And I follow "All aspects"
-      Then I should have aspect "All aspects" "selected"
+      And I follow "All Aspects"
+      Then I should have aspect "All Aspects" "selected"
 
   Scenario: home persists across sessions
     Given I am signed in
@@ -37,9 +37,9 @@ Feature: saved state
       And I have an aspect called "Closed 2"
       And I am on the aspects page
      When I follow "Closed 1"
-     When I follow "All aspects"
+     When I follow "All Aspects"
 
-      Then I should have aspect "All aspects" "selected"
+      Then I should have aspect "All Aspects" "selected"
       Then I should have aspect "Closed 1" "not selected"
       Then I should have aspect "Closed 2" "not selected"
 
@@ -51,6 +51,6 @@ Feature: saved state
       And I am signed in
 
       Then I should be on the aspects page
-      Then I should have aspect "All aspects" "selected"
+      Then I should have aspect "All Aspects" "selected"
       Then I should have aspect "Closed 1" "not selected"
       Then I should have aspect "Closed 2" "not selected"