diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index a7b16b295c5..151198f0d6f 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -95,11 +95,7 @@ $search-pad-horizontal: 0.5em;
           margin-right: 0.5em;
         }
         .discourse-tags .discourse-tag {
-          margin-right: 0.25em;
-
-          .d-icon {
-            margin-right: 0;
-          }
+          margin-right: 0.35em;
         }
       }
     }
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 5f669ad3f42..b50b573d354 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -124,17 +124,13 @@
     font-size: var(--font-down-1);
   }
   .discourse-tags + .topic-featured-link {
-    margin-left: 8px;
+    margin-left: 0.5em;
   }
 }
 
 .discourse-tags {
   display: inline-flex;
   flex-wrap: wrap;
-  a,
-  span {
-    margin-right: 0.25em;
-  }
 }
 
 .fps-result .add-full-page-tags {
@@ -163,6 +159,12 @@ header .discourse-tag {
   max-width: 100%;
 }
 
+#topic-title {
+  .discourse-tags .discourse-tag {
+    margin-right: 0.35em;
+  }
+}
+
 .title-wrapper .tag-chooser {
   width: 500px;
 }