diff --git a/app/assets/javascripts/discourse/views/user/activity_filter_view.js b/app/assets/javascripts/discourse/views/user/activity_filter_view.js
index 783e6e9d804..e80ec7919b9 100644
--- a/app/assets/javascripts/discourse/views/user/activity_filter_view.js
+++ b/app/assets/javascripts/discourse/views/user/activity_filter_view.js
@@ -8,11 +8,13 @@
 **/
 Discourse.ActivityFilterView = Discourse.View.extend({
   tagName: 'li',
-  classNameBindings: ['active'],
+  classNameBindings: ['active', 'noGlyph'],
 
   stream: Em.computed.alias('controller.content'),
   shouldRerender: Discourse.View.renderIfChanged('count'),
 
+  noGlyph: Em.computed.empty('icon'),
+
   active: function() {
     var content = this.get('content');
     if (content) {
@@ -34,14 +36,15 @@ Discourse.ActivityFilterView = Discourse.View.extend({
       description = I18n.t("user.filters.all");
     }
 
-    buffer.push("<a href='#'>" + description +
-        " <span class='count'>(" + count + ")</span>");
-
     var icon = this.get('icon');
     if(icon) {
       buffer.push("<i class='glyph icon icon-" + icon + "'></i>");
     }
 
+    buffer.push("<a href='#'>" + description +
+        " <span class='count'>(" + count + ")</span>");
+
+
     buffer.push("<span class='icon-chevron-right'></span></a>");
 
   },
diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss
index 499c505bfb0..e3435a7a046 100644
--- a/app/assets/stylesheets/application/topic-post.css.scss
+++ b/app/assets/stylesheets/application/topic-post.css.scss
@@ -136,6 +136,7 @@
         line-height: 19px;
         text-align: center;
         background-color: #fafafa;
+        padding: 1px 2px;
         @include border-radius-all(20px);
         &:after {
           display: block;
diff --git a/app/assets/stylesheets/components/navs.css.scss b/app/assets/stylesheets/components/navs.css.scss
index 86afc424629..30da604c22d 100644
--- a/app/assets/stylesheets/components/navs.css.scss
+++ b/app/assets/stylesheets/components/navs.css.scss
@@ -94,8 +94,17 @@
     line-height: 20px;
   }
 
+  .no-glyph {
+    a {
+      padding-left: 30px;
+    }
+  }
+
   .glyph {
     font-size: 12px;
-    margin-left: 8px;
+    margin: 15px 0 0 0;
+    width: 30px;
+    text-align: center;
+    float: left;
   }
 }