diff --git a/app/assets/javascripts/discourse/components/category-notification-options.js.es6 b/app/assets/javascripts/discourse/components/category-notification-options.js.es6
index d08c1726f82..132b119e0f8 100644
--- a/app/assets/javascripts/discourse/components/category-notification-options.js.es6
+++ b/app/assets/javascripts/discourse/components/category-notification-options.js.es6
@@ -1,5 +1,6 @@
 import NotificationOptionsComponent from "discourse/components/notification-options";
 import { observes } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
 export default NotificationOptionsComponent.extend({
@@ -12,7 +13,12 @@ export default NotificationOptionsComponent.extend({
 
   value: Em.computed.alias("category.notification_level"),
 
-  generatedHeadertext: iconHTML("caret-down").htmlSafe(),
+  @computed("value")
+  icon() {
+    return `${this._super()}${iconHTML("caret-down")}`.htmlSafe();
+  },
+
+  generatedHeadertext: null,
 
   @observes("value")
   _notificationLevelChanged() {
diff --git a/app/assets/stylesheets/common/components/categories-admin-actions.scss b/app/assets/stylesheets/common/components/categories-admin-actions.scss
new file mode 100644
index 00000000000..d56ae5346ee
--- /dev/null
+++ b/app/assets/stylesheets/common/components/categories-admin-actions.scss
@@ -0,0 +1,5 @@
+.categories-admin-actions.categories-admin-actions.categories-admin-actions {
+  .select-box-body {
+    min-width: auto;
+  }
+}
diff --git a/app/assets/stylesheets/common/components/dropdown-select-box.scss b/app/assets/stylesheets/common/components/dropdown-select-box.scss
index db32fab394c..05dcf94b538 100644
--- a/app/assets/stylesheets/common/components/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/components/dropdown-select-box.scss
@@ -37,7 +37,6 @@
         align-self: center;
         margin-right: 0;
         opacity: 1;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
       }
     }
 
diff --git a/app/assets/stylesheets/common/components/topic-notification-options-button.scss b/app/assets/stylesheets/common/components/topic-notification-options-button.scss
index 7a0a2e523ab..433071e30be 100644
--- a/app/assets/stylesheets/common/components/topic-notification-options-button.scss
+++ b/app/assets/stylesheets/common/components/topic-notification-options-button.scss
@@ -8,7 +8,7 @@
 
     .reason {
       line-height: 16px;
-      margin: 0 0 0 5px;
+      margin: 0 0 0 10px;
     }
   }
 }
@@ -21,7 +21,7 @@
   display: inline-flex;
   justify-content: flex-start;
   align-items: center;
-  margin: 5px 0;
+  margin: 0;
 
   .topic-notification-options, .reason {
     display: inline-flex;