diff --git a/assets/javascripts/discourse/components/wizard-subscription-badge.hbs b/assets/javascripts/discourse/components/wizard-subscription-badge.hbs
index f05004df79..bd4e7d966c 100644
--- a/assets/javascripts/discourse/components/wizard-subscription-badge.hbs
+++ b/assets/javascripts/discourse/components/wizard-subscription-badge.hbs
@@ -1,8 +1,7 @@
-<button
-  onclick={{this.click}}
-  type="button"
+<DButton
+  @action={{this.click}}
   class="wizard-subscription-badge {{this.subscription.subscriptionType}}"
-  title={{this.title}}
+  @title={{this.title}}
 >
   <svg
     width="300px"
@@ -28,4 +27,4 @@
     </g>
   </svg>
   <span>{{label}}</span>
-</button>
\ No newline at end of file
+</DButton>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-subscription-cta.hbs b/assets/javascripts/discourse/components/wizard-subscription-cta.hbs
index 86b2188c0b..0224518c27 100644
--- a/assets/javascripts/discourse/components/wizard-subscription-cta.hbs
+++ b/assets/javascripts/discourse/components/wizard-subscription-cta.hbs
@@ -1,8 +1,7 @@
-<button
-  onclick={{this.click}}
-  type="button"
+<DButton
+  @action={{this.click}}
   class="btn btn-pavilion-support {{this.subscription.subscriptionType}}"
-  title={{this.title}}
+  @title={{this.title}}
 >
   {{d-icon icon}}{{label}}
-</button>
\ No newline at end of file
+</DButton>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-subscription-status.hbs b/assets/javascripts/discourse/components/wizard-subscription-status.hbs
index a184af0971..98d06df293 100644
--- a/assets/javascripts/discourse/components/wizard-subscription-status.hbs
+++ b/assets/javascripts/discourse/components/wizard-subscription-status.hbs
@@ -1,23 +1,22 @@
 <div class="supplier-authorize">
   {{#if authorized}}
     {{conditional-loading-spinner size="small" condition=unauthorizing}}
-    <button
-      {{action "deauthorize"}}
+    <DButton
       class="deauthorize"
-      title={{i18n "admin.subscription_client.supplier.deauthorize"}}
-      role="button"
-      disabled={{unauthorizing}}
+      @title={{i18n "admin.subscription_client.supplier.deauthorize"}}
+      @disabled={{unauthorizing}}
+      @action={{this.deauthorize}}
     >
       {{i18n "admin.wizard.subscription.deauthorize"}}
     </button>
   {{else}}
-    {{d-button
-      icon="id-card"
+    <DButton
+      @icon="id-card"
       class="btn-primary"
-      label="admin.wizard.subscription.authorize"
-      title="admin.wizard.subscription.authorize"
-      action=(action "authorize")
-    }}
+      @label="admin.wizard.subscription.authorize"
+      @title="admin.wizard.subscription.authorize"
+      @action={{this.authorize}}
+    />
   {{/if}}
   <WizardSubscriptionBadge />
   <WizardSubscriptionCta />