diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
index 57c09e39e..a3eb9d56d 100644
--- a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6
@@ -29,23 +29,19 @@ export default ObjectController.extend(ModalFunctionality, {
   }.property("categoryLink", "pinnedInCategoryCount"),
 
   onShow() {
-    const self = this;
-
     this.set("loading", true);
 
     return Discourse.ajax("/topics/feature_stats.json", {
       data: { category_id: this.get("category.id") }
-    }).then(function(result) {
+    }).then(result => {
       if (result) {
-        self.setProperties({
+        this.setProperties({
           pinnedInCategoryCount: result.pinned_in_category_count,
           pinnedGloballyCount: result.pinned_globally_count,
           bannerCount: result.banner_count,
         });
       }
-    }).finally(function() {
-      self.set("loading", false);
-    });
+    }).finally(() => this.set("loading", false));
   },
 
   _forwardAction(name) {
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 2cc24a5c1..d06840bf5 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -58,9 +58,9 @@
   <div class="feature-section">
     <div class="button">
       {{#if isBanner}}
-        {{d-button action="removeBanner" icon="bullhorn" label="topic.actions.remove_banner" class="btn-primary"}}
+        {{d-button action="removeBanner" icon="thumb-tack" label="topic.actions.remove_banner" class="btn-primary"}}
       {{else}}
-        {{d-button action="makeBanner" icon="bullhorn" label="topic.actions.make_banner" class="btn-primary"}}
+        {{d-button action="makeBanner" icon="thumb-tack" label="topic.actions.make_banner" class="btn-primary"}}
       {{/if}}
     </div>
     <div class="desc">
diff --git a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
index 195743465..67daf1343 100644
--- a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
@@ -30,9 +30,9 @@
     {{#if visible}}
       <li>
         {{#if isFeatured}}
-          {{d-button action="showFeatureTopic" icon="bullhorn" label="topic.actions.remove_feature" class="btn-admin"}}
+          {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.unpin" class="btn-admin"}}
         {{else}}
-          {{d-button action="showFeatureTopic" icon="bullhorn" label="topic.actions.feature" class="btn-admin"}}
+          {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.pin" class="btn-admin"}}
         {{/if}}
       </li>
     {{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9b3399ed4..571bd3938 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -988,8 +988,6 @@ en:
         open: "Open Topic"
         close: "Close Topic"
         auto_close: "Auto Close"
-        feature: "Feature Topic"
-        remove_feature: "Remove Feature"
         make_banner: "Banner Topic"
         remove_banner: "Remove Banner Topic"
         pin: "Pin Topic"