diff --git a/app/assets/javascripts/discourse/templates/topic-status.raw.hbs b/app/assets/javascripts/discourse/templates/topic-status.raw.hbs
index 891ff71d14..6d8cefd932 100644
--- a/app/assets/javascripts/discourse/templates/topic-status.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-status.raw.hbs
@@ -3,7 +3,7 @@
 {{/if ~}}
 {{~#each status in view.statuses ~}}
 {{~#if status.href ~}}
-<a href='{{status.href}}' title='{{status.title}}' class='topic-status'><i class='fa fa-{{status.icon}}'></i></a>
+<a href='{{status.href}}' title='{{status.title}}' class='topic-status {{status.extraClasses}}'><i class='fa fa-{{status.icon}}'></i></a>
 {{~else ~}}
 <{{status.openTag}} title='{{status.title}}' class='topic-status'><i class='fa fa-{{status.icon}}'></i></{{status.closeTag}}>
 {{~/if ~}}
diff --git a/app/assets/javascripts/discourse/views/topic-status.js.es6 b/app/assets/javascripts/discourse/views/topic-status.js.es6
index 5a755d32cf..c47026e3c4 100644
--- a/app/assets/javascripts/discourse/views/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/views/topic-status.js.es6
@@ -16,10 +16,14 @@ export default Ember.Object.extend({
     if(topic.get('bookmarked')){
       var url = topic.get('url');
       var postNumbers = topic.get('bookmarked_post_numbers');
+      var extraClasses = "";
       if(postNumbers && postNumbers[0] > 1) {
         url += '/' + postNumbers[0];
+      } else {
+        extraClasses = "op-bookmark";
       }
-      results.push({icon: 'bookmark', key: 'bookmarked', href: url});
+
+      results.push({extraClasses: extraClasses, icon: 'bookmark', key: 'bookmarked', href: url});
     }
 
     if(topic.get('closed')){