diff --git a/app/assets/javascripts/discourse/models/user_action.js b/app/assets/javascripts/discourse/models/user_action.js
index 04e98a3e58b..fd88f179170 100644
--- a/app/assets/javascripts/discourse/models/user_action.js
+++ b/app/assets/javascripts/discourse/models/user_action.js
@@ -108,6 +108,7 @@ Discourse.UserAction = Discourse.Model.extend({
   mentionType: Em.computed.equal('action_type', UserActionTypes.mentions),
   isPM: Em.computed.or('messageSentType', 'messageReceivedType'),
   postReplyType: Em.computed.or('postType', 'replyType'),
+  removableBookmark: Em.computed.and('bookmarkType', 'sameUser'),
 
   addChild: function(action) {
     var groups = this.get("childGroups");
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index 39792b31cbc..c3e5da2672f 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -13,10 +13,9 @@
       <div class='child-actions'>
         <i class="icon {{unbound icon}}"></i>
         {{#grouped-each items}}
-          {{#if bookmarkType}}
+          {{#if removableBookmark}}
             <button class="btn btn-default remove-bookmark" {{action "removeBookmark" this}}>
-              <i class="fa fa-times"></i>
-              {{i18n "bookmarks.remove"}}
+              {{fa-icon 'times'}} {{i18n "bookmarks.remove"}}
             </button>
           {{/if}}
           <a href="{{unbound userUrl}}" data-user-card="{{unbound username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar this imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}</div></a>