diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index aaf5572a220..e264ef11375 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -3,25 +3,23 @@
 
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
+    {{#if canSee}}
+      <a class="show-tracking" href="{{unbound model.watchingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+    {{/if}}
     {{category-selector categories=model.watchedCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
-  {{#if canSee}}
-    <div class="controls">
-      <a href="{{unbound model.watchingTopicsPath}}">{{i18n 'user.watched_topics_link'}}</a>
-    </div>
-  {{/if}}
+
 
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
+    {{#if canSee}}
+      <a class="show-tracking" href="{{unbound model.trackingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+    {{/if}}
     {{category-selector categories=model.trackedCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
-  {{#if canSee}}
-    <div class="controls">
-      <a href="{{unbound model.trackingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
-    </div>
-  {{/if}}
+
 
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching-first"}} {{i18n 'user.watched_first_post_categories'}}</label>
@@ -31,14 +29,12 @@
 
   <div class="controls tracking-controls">
     <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
+    {{#if canSee}}
+      <a class="show-tracking" href="{{unbound model.mutedTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
+    {{/if}}
     {{category-selector categories=model.mutedCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n (if hideMutedTags 'user.muted_categories_instructions' 'user.muted_categories_instructions_dont_hide')}}</div>
-  {{#if canSee}}
-    <div class="controls">
-      <a href="{{unbound model.mutedTopicsPath}}">{{i18n 'user.muted_topics_link'}}</a>
-    </div>
-  {{/if}}
 </div>
 
 {{plugin-outlet name="user-preferences-categories" args=(hash model=model save=(action "save"))}}
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 7fb618214e9..a4dcbdf3acf 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -546,10 +546,19 @@
   .tracking-controls {
     label {
       align-items: center;
+      display: inline-block;
       .d-icon {
         margin-right: 3px;
       }
     }
+    .select-kit.multi-select {
+      @include breakpoint(mobile) {
+        width: 100%;
+      }
+    }
+    .show-tracking {
+      float: right;
+    }
   }
 
   .static {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 06da3d7c24f..6e20a945e0a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -868,9 +868,7 @@ en:
       muted_users_instructions: "Suppress all notifications from these users."
       ignored_users: "Ignored"
       ignored_users_instructions: "Suppress all posts and notifications from these users."
-      muted_topics_link: "Show muted topics"
-      watched_topics_link: "Show watched topics"
-      tracked_topics_link: "Show tracked topics"
+      tracked_topics_link: "Show"
       automatically_unpin_topics: "Automatically unpin topics when I reach the bottom."
       apps: "Apps"
       revoke_access: "Revoke Access"