diff --git a/app/assets/javascripts/discourse/components/breadcrumbs_component.js b/app/assets/javascripts/discourse/components/breadcrumbs_component.js
index 1f4d900942..d1efb82aef 100644
--- a/app/assets/javascripts/discourse/components/breadcrumbs_component.js
+++ b/app/assets/javascripts/discourse/components/breadcrumbs_component.js
@@ -7,16 +7,20 @@ Discourse.DiscourseBreadcrumbsComponent = Ember.Component.extend({
     return !c.get('parentCategory');
   }),
 
-  targetCategory: function() {
-    // Note we can't use Em.computed.or here because it returns a boolean not the object
+  firstCategory: function() {
     return this.get('parentCategory') || this.get('category');
   }.property('parentCategory', 'category'),
 
+  secondCategory: function() {
+    if (this.get('parentCategory')) return this.get('category');
+    return null;
+  }.property('category', 'parentCategory'),
+
   childCategories: function() {
     var self = this;
     return this.get('categories').filter(function (c) {
-      return c.get('parentCategory') === self.get('targetCategory');
+      return c.get('parentCategory') === self.get('firstCategory');
     });
-  }.property('targetCategory')
+  }.property('firstCategory')
 
 });
diff --git a/app/assets/javascripts/discourse/components/categorydrop_component.js b/app/assets/javascripts/discourse/components/categorydrop_component.js
index 0eb45d0995..cc1ef418a4 100644
--- a/app/assets/javascripts/discourse/components/categorydrop_component.js
+++ b/app/assets/javascripts/discourse/components/categorydrop_component.js
@@ -7,6 +7,17 @@ Discourse.DiscourseCategorydropComponent = Ember.Component.extend({
     return "icon icon-caret-right";
   }.property('expanded'),
 
+  allCategoriesUrl: function() {
+    return this.get('category.parentCategory.url') || "/";
+  }.property('category'),
+
+  allCategoriesLabel: function() {
+    if (this.get('subCategory')) {
+      return I18n.t('categories.all_subcategories');
+    }
+    return I18n.t('categories.all');
+  }.property('category'),
+
   badgeStyle: function() {
     var category = this.get('category');
     if (category) {
diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js
index dc75876c55..afd286cf8e 100644
--- a/app/assets/javascripts/discourse/models/category.js
+++ b/app/assets/javascripts/discourse/models/category.js
@@ -31,7 +31,7 @@ Discourse.Category = Discourse.Model.extend({
   }.property('id'),
 
   url: function() {
-    return Discourse.getURL("/category/") + (this.get('slug'));
+    return Discourse.getURL("/category/") + Discourse.Category.slugFor(this);
   }.property('name'),
 
   unreadUrl: function() {
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-breadcrumbs.js.handlebars b/app/assets/javascripts/discourse/templates/components/discourse-breadcrumbs.js.handlebars
index a67132bf28..a25f303fc2 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-breadcrumbs.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/discourse-breadcrumbs.js.handlebars
@@ -1,12 +1,10 @@
 <li>
-{{discourse-categorydrop parentCategory=category categories=parentCategories}}
+{{discourse-categorydrop category=firstCategory categories=parentCategories}}
 </li>
-<li>
-  {{discourse-categorydrop parentCategory=category category=targetCategory categories=childCategories}}
-</li>
-{{#if parentCategory}}
+
+{{#if childCategories}}
   <li>
-    {{boundCategoryLink category}}
+    {{discourse-categorydrop category=secondCategory categories=childCategories subCategory="true"}}
   </li>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-categorydrop.js.handlebars b/app/assets/javascripts/discourse/templates/components/discourse-categorydrop.js.handlebars
index c743153909..c3b09e9cc7 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-categorydrop.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/discourse-categorydrop.js.handlebars
@@ -1,12 +1,13 @@
 {{#if category}}
-  {{boundCategoryLink category allowUncategorized=true}}
+  <a href="#" {{action expand}} class="badge-category" {{bindAttr style="badgeStyle"}}>{{category.name}}</a>
 {{else}}
-  <a href='/' class='badge-category home' {{bindAttr style="badgeStyle"}}><i class='icon icon-home'></i></a>
+  <a href='#' {{action expand}} class='badge-category home' {{bindAttr style="badgeStyle"}}>{{allCategoriesLabel}}</i></a>
 {{/if}}
 
 {{#if categories}}
   <a href='#' {{action expand}} class='badge-category category-dropdown-button' {{bindAttr style="badgeStyle"}}><i {{bindAttr class="iconClass"}}></i></a>
   <section {{bindAttr class="expanded::hidden :category-dropdown-menu"}} class='chooser'>
+    <div class='cat'><a {{bindAttr href=allCategoriesUrl}} class='badge-category home'>{{allCategoriesLabel}}</a></div>
     {{#each categories}}<div class='cat'>{{categoryLink this allowUncategorized=true}}</div>{{/each}}
   </section>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list.js.handlebars b/app/assets/javascripts/discourse/templates/list.js.handlebars
index ab0c79b242..929844a99a 100644
--- a/app/assets/javascripts/discourse/templates/list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list.js.handlebars
@@ -1,9 +1,7 @@
 <div class='list-controls'>
   <div class="container">
 
-    {{#if category}}
-      {{discourse-breadcrumbs category=category categories=categories}}
-    {{/if}}
+    {{discourse-breadcrumbs category=category categories=categories}}
 
     <ul class="nav nav-pills" id='category-filter'>
       {{each availableNavItems itemViewClass="Discourse.NavItemView"}}
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 7c61af2622..aecf0526eb 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -351,8 +351,8 @@
 
 .list-controls {
   .home {
-    font-size: 20px;
-    font-weight: normal;
+    background-color: #eee;
+    color: #333;
   }
 
   .badge-category {
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 591499c24b..8877ef4ea3 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -241,8 +241,8 @@
 
 .list-controls {
   .home {
-    font-size: 20px;
-    font-weight: normal;
+    color: #333;
+    background-color: #eee;
   }
 
   .badge-category {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 944550edb2..0be59d5f86 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -184,6 +184,8 @@ en:
       "13": "Inbox"
 
     categories:
+      all: "all categories"
+      all_subcategories: "all subcategories"
       category: "Category"
       posts: "Posts"
       topics: "Topics"