diff --git a/assets/javascripts/discourse/components/wizard-subscription-badge.hbs b/assets/javascripts/discourse/components/wizard-subscription-badge.hbs
index 30b79cb5..08853169 100644
--- a/assets/javascripts/discourse/components/wizard-subscription-badge.hbs
+++ b/assets/javascripts/discourse/components/wizard-subscription-badge.hbs
@@ -7,17 +7,14 @@
   {{d-icon "pavilion-logo"}}
   <span>{{this.label}}</span>
 </DButton>
-<span class="loading-container">
-  {{#if this.updating}}
-    {{loading-spinner size="small"}}
-  {{else if updateIcon}}
-    {{d-icon updateIcon}}
-  {{/if}}
-</span>
 <DButton
-  @icon="sync"
+  @icon={{this.updateIcon}}
   @action={{this.update}}
   class="btn btn-primary update"
   @disabled={{this.updating}}
   @title="admin.wizard.subscription.update.title"
-/>
\ No newline at end of file
+>
+{{#if this.updating}}
+  {{loading-spinner size="small"}}
+{{/if}}
+</DButton>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/wizard-subscription-badge.js b/assets/javascripts/discourse/components/wizard-subscription-badge.js
index f2115fdb..e103c95b 100644
--- a/assets/javascripts/discourse/components/wizard-subscription-badge.js
+++ b/assets/javascripts/discourse/components/wizard-subscription-badge.js
@@ -8,7 +8,7 @@ import I18n from "I18n";
 export default class WizardSubscriptionBadge extends Component {
   @service subscription;
   @tracked updating = false;
-  @tracked updateIcon = null;
+  @tracked updateIcon = "sync";
   basePath = "/admin/plugins/subscription-client";
 
   @computed("subscription.subscriptionType")
@@ -38,12 +38,10 @@ export default class WizardSubscriptionBadge extends Component {
   @action
   update() {
     this.updating = true;
-    this.updateIcon = "check";
+    this.updateIcon = null;
     this.subscription.updateSubscriptionStatus().finally(() => {
+      this.updateIcon = "sync";
       this.updating = false;
-      setTimeout(() => {
-        this.updateIcon = null;
-      }, 5000);
     });
   }
 }