diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
index f598d6d9397..f754217b917 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
@@ -15,9 +15,9 @@
         </div>
       {{else}}
         <div class="tag-name-wrapper">
-          {{discourse-tag tagInfo.name tagName="div" size="large"}}
+          {{discourse-tag tagInfo.name tagName="div"}}
           {{#if canAdminTag}}
-            {{d-button action=(action "edit") class="btn-flat edit-tag" title="tagging.edit_tag" icon="pencil-alt" }}
+            <a href {{action "edit"}} class="edit-tag" title={{i18n "tagging.edit_tag"}}>{{d-icon "pencil-alt"}}</a>
           {{/if}}
         </div>
         <div class="tag-description-wrapper">
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index d40df6de863..bf37376f345 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -369,6 +369,11 @@ section.tag-info {
         }
       }
     }
+    .edit-tag {
+      color: var(--primary-high);
+      font-size: 0.8em;
+      margin-left: 0.5em;
+    }
   }
 
   .tag-description-wrapper {