diff --git a/app/assets/javascripts/discourse/components/stream-item.js.es6 b/app/assets/javascripts/discourse/components/stream-item.js.es6
index ef7b03ad5c3..9a29d874384 100644
--- a/app/assets/javascripts/discourse/components/stream-item.js.es6
+++ b/app/assets/javascripts/discourse/components/stream-item.js.es6
@@ -1,7 +1,13 @@
-import { actionDescription } from 'discourse/components/small-action';
+import { actionDescription } from "discourse/components/small-action";
 
 export default Ember.Component.extend({
-  classNameBindings: [':item', 'item.hidden', 'item.deleted', 'moderatorAction'],
-  moderatorAction: Discourse.computed.propertyEqual('item.post_type', 'site.post_types.moderator_action'),
-  actionDescription: actionDescription('item.action_code', 'item.created_at')
+  classNameBindings: [":item", "item.hidden", "item.deleted", "moderatorAction"],
+  moderatorAction: Discourse.computed.propertyEqual("item.post_type", "site.post_types.moderator_action"),
+  actionDescription: actionDescription("item.action_code", "item.created_at"),
+
+  actions: {
+    removeBookmark(userAction) {
+      this.sendAction("removeBookmark", userAction);
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-activity.js.es6 b/app/assets/javascripts/discourse/routes/user-activity.js.es6
index ca4bd71febb..e654ac9b2c8 100644
--- a/app/assets/javascripts/discourse/routes/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity.js.es6
@@ -1,20 +1,20 @@
 export default Discourse.Route.extend({
-  model: function() {
-    return this.modelFor('user');
+  model() {
+    return this.modelFor("user");
   },
 
-  setupController: function(controller, user) {
-    this.controllerFor('user-activity').set('model', user);
+  setupController(controller, user) {
+    this.controllerFor("user-activity").set("model", user);
 
     // Bring up a draft
-    const composerController = this.controllerFor('composer');
-    controller.set('model', user);
+    const composerController = this.controllerFor("composer");
+    controller.set("model", user);
     if (this.currentUser) {
-      Discourse.Draft.get('new_private_message').then(function(data) {
+      Discourse.Draft.get("new_private_message").then(function(data) {
         if (data.draft) {
           composerController.open({
             draft: data.draft,
-            draftKey: 'new_private_message',
+            draftKey: "new_private_message",
             ignoreIfChanged: true,
             draftSequence: data.draft_sequence
           });
diff --git a/app/assets/javascripts/discourse/templates/components/stream-item.hbs b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
index 8dea1ccb131..c84082519bd 100644
--- a/app/assets/javascripts/discourse/templates/components/stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
@@ -14,7 +14,6 @@
 
 <p class='excerpt'>{{{item.excerpt}}}</p>
 
-
 {{#each item.children as |child|}}
   <div class='child-actions'>
     <i class="icon {{child.icon}}"></i>
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index 4f03bef896c..c7b3114470a 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,3 +1,3 @@
 {{#each model.content as |item|}}
-  {{stream-item item=item}}
+  {{stream-item item=item removeBookmark="removeBookmark"}}
 {{/each}}
diff --git a/test/javascripts/adapaters/topic-list-test.js.es6 b/test/javascripts/adapters/topic-list-test.js.es6
similarity index 100%
rename from test/javascripts/adapaters/topic-list-test.js.es6
rename to test/javascripts/adapters/topic-list-test.js.es6