diff --git a/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6
index 4a0db76713c..39c89b5f79b 100644
--- a/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/feature-topic-on-profile.js.es6
@@ -13,6 +13,10 @@ export default Controller.extend(ModalFunctionality, {
     this.set("newFeaturedTopic", null);
   },
 
+  onShow() {
+    this.set("modal.modalClass", "choose-topic-modal");
+  },
+
   actions: {
     save() {
       return ajax(`/u/${this.model.username}/feature-topic`, {
diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
index f80b659baaf..9fc84facfa4 100644
--- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6
@@ -74,7 +74,7 @@ export default Controller.extend(ModalFunctionality, {
 
   onShow() {
     this.setProperties({
-      "modal.modalClass": "move-to-modal",
+      "modal.modalClass": "choose-topic-modal",
       saving: false,
       selection: "new_topic",
       categoryId: null,
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
index c6f54a9340c..751789e66de 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic-on-profile.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body class="feature-topic-on-profile"}}
+{{#d-modal-body class="feature-topic-on-profile" id='choosing-topic'}}
   {{choose-topic currentTopicId=model.featured_topic.id
     selectedTopicId=newFeaturedTopicId
     additionalFilters="in:created status:public"
@@ -6,8 +6,11 @@
     topicChangedCallback=(action "newTopicSelected")
     loadOnInit=true
   }}
+{{/d-modal-body}}
+
+<div class="modal-footer">
   {{d-button action=(action "save")
     class="btn-primary save-featured-topic-on-profile"
     disabled=noTopicSelected
     label="user.feature_topic_on_profile.save"}}
-{{/d-modal-body}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
index 3a0335af40f..0574ff843f1 100644
--- a/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body id='move-selected'}}
+{{#d-modal-body id='choosing-topic'}}
 
   {{#if model.isPrivateMessage}}
     <div class="radios">
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index cd319406f30..47dbc7a143b 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -68,7 +68,7 @@
 
     <div>
       {{d-button action=(action "showFeaturedTopicModal")
-        class="btn-primary feature-topic-on-profile-btn"
+        class="btn-default feature-topic-on-profile-btn"
         label="user.feature_topic_on_profile.open_search"}}
       {{#if model.featured_topic}}
         {{d-button action=(action "clearFeaturedTopicFromProfile")
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index f68600c08bc..18216a8fe8a 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -619,7 +619,7 @@
 }
 
 // move-to topic modal
-.move-to-modal {
+.choose-topic-modal {
   // move to existing topic
   .existing-topic {
     .radio {
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index c897e3fbb4c..0af4a22d69a 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -110,13 +110,13 @@
   }
 }
 
-.move-to-modal {
+.choose-topic-modal {
   .modal-body {
     position: relative;
     height: 350px;
   }
 
-  #move-selected {
+  #choosing-topic {
     // prevents content from moving when user selects different move options 525px
     // is the same width we set on category edit modal
     width: 525px;
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 4cee126a130..33f4efc19bb 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -43,7 +43,7 @@
   font-size: $font-up-4;
 }
 
-#move-selected {
+#choosing-topic {
   p {
     margin-top: 0;
   }
diff --git a/test/javascripts/acceptance/topic-move-posts-test.js.es6 b/test/javascripts/acceptance/topic-move-posts-test.js.es6
index c86af80d314..ea5ab11a06e 100644
--- a/test/javascripts/acceptance/topic-move-posts-test.js.es6
+++ b/test/javascripts/acceptance/topic-move-posts-test.js.es6
@@ -18,28 +18,28 @@ QUnit.test("default", async assert => {
   await click(".selected-posts .move-to-topic");
 
   assert.ok(
-    find(".move-to-modal .title")
+    find(".choose-topic-modal .title")
       .html()
       .includes(I18n.t("topic.move_to.title")),
     "it opens move to modal"
   );
 
   assert.ok(
-    find(".move-to-modal .radios")
+    find(".choose-topic-modal .radios")
       .html()
       .includes(I18n.t("topic.split_topic.radio_label")),
     "it shows an option to move to new topic"
   );
 
   assert.ok(
-    find(".move-to-modal .radios")
+    find(".choose-topic-modal .radios")
       .html()
       .includes(I18n.t("topic.merge_topic.radio_label")),
     "it shows an option to move to existing topic"
   );
 
   assert.ok(
-    find(".move-to-modal .radios")
+    find(".choose-topic-modal .radios")
       .html()
       .includes(I18n.t("topic.move_to_new_message.radio_label")),
     "it shows an option to move to new message"
@@ -54,28 +54,28 @@ QUnit.test("moving all posts", async assert => {
   await click(".selected-posts .move-to-topic");
 
   assert.ok(
-    find(".move-to-modal .title")
+    find(".choose-topic-modal .title")
       .html()
       .includes(I18n.t("topic.move_to.title")),
     "it opens move to modal"
   );
 
   assert.not(
-    find(".move-to-modal .radios")
+    find(".choose-topic-modal .radios")
       .html()
       .includes(I18n.t("topic.split_topic.radio_label")),
     "it does not show an option to move to new topic"
   );
 
   assert.ok(
-    find(".move-to-modal .radios")
+    find(".choose-topic-modal .radios")
       .html()
       .includes(I18n.t("topic.merge_topic.radio_label")),
     "it shows an option to move to existing topic"
   );
 
   assert.not(
-    find(".move-to-modal .radios")
+    find(".choose-topic-modal .radios")
       .html()
       .includes(I18n.t("topic.move_to_new_message.radio_label")),
     "it does not show an option to move to new message"
@@ -99,21 +99,21 @@ QUnit.test("moving posts from personal message", async assert => {
   await click(".selected-posts .move-to-topic");
 
   assert.ok(
-    find(".move-to-modal .title")
+    find(".choose-topic-modal .title")
       .html()
       .includes(I18n.t("topic.move_to.title")),
     "it opens move to modal"
   );
 
   assert.ok(
-    find(".move-to-modal .radios")
+    find(".choose-topic-modal .radios")
       .html()
       .includes(I18n.t("topic.move_to_new_message.radio_label")),
     "it shows an option to move to new message"
   );
 
   assert.ok(
-    find(".move-to-modal .radios")
+    find(".choose-topic-modal .radios")
       .html()
       .includes(I18n.t("topic.move_to_existing_message.radio_label")),
     "it shows an option to move to existing message"