diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index 47b714b8dc1..e01a9bb5c82 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -2,5 +2,8 @@
   {{fa-icon icon}}
 {{/if}}
 
-{{{translatedLabel}}}
+{{#if translatedLabel}}
+  <span class='d-button-label'>{{{translatedLabel}}}</span>
+{{/if}}
+
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
index f97952449fb..567e484a995 100644
--- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
@@ -7,6 +7,11 @@
     {{categories-admin-dropdown}}
   {{/if}}
   {{#if canCreateTopic}}
-    <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i><span>{{i18n 'topic.create'}}</span></button>
+    {{d-button
+      id="create-topic"
+      action="createTopic"
+      icon="plus"
+      label="topic.create"
+    }}
   {{/if}}
 {{/d-section}}