diff --git a/assets/javascripts/discourse/components/campaign-banner.hbs b/assets/javascripts/discourse/components/campaign-banner.hbs
index ad2a4096..d062e010 100644
--- a/assets/javascripts/discourse/components/campaign-banner.hbs
+++ b/assets/javascripts/discourse/components/campaign-banner.hbs
@@ -3,7 +3,7 @@
     class="campaign-banner"
     style={{html-safe (concat "box-shadow: 5px 5px #" this.dropShadowColor)}}
   >
-    <DButton @icon="times" @action={{this.dismissBanner}} class="close" />
+    <DButton @icon="xmark" @action={{this.dismissBanner}} class="close" />
 
     <div class="campaign-banner-info" style={{html-safe this.bannerInfoStyle}}>
       {{#if this.isGoalMet}}
diff --git a/assets/javascripts/discourse/components/create-coupon-form.hbs b/assets/javascripts/discourse/components/create-coupon-form.hbs
index 0560f356..0ed548b9 100644
--- a/assets/javascripts/discourse/components/create-coupon-form.hbs
+++ b/assets/javascripts/discourse/components/create-coupon-form.hbs
@@ -44,7 +44,7 @@
     @action={{action "cancelCreate"}}
     label="cancel"
     @title="cancel"
-    @icon="times"
+    @icon="xmark"
     class="btn btn-icon"
   />
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjs b/assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjs
index e925dee0..df92b1d7 100644
--- a/assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjs
+++ b/assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjs
@@ -31,7 +31,7 @@ export default class AdminCancelSubscription extends Component {
               closeModal=@closeModal
             )
           }}
-          @icon="times"
+          @icon="xmark"
           @isLoading={{@model.subscription.loading}}
           class="btn-danger"
         />
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs
index 70a840d7..09da58d3 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs
@@ -32,7 +32,7 @@
               <DButton
                 @action={{action "deleteCoupon"}}
                 @actionParam={{coupon}}
-                @icon="trash-alt"
+                @icon="trash-can"
                 class="btn-danger btn btn-icon btn-no-text"
               />
             </td>
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs
index f7d3cd1d..c64e2535 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs
@@ -16,13 +16,13 @@
         <td class="td-right">
           <DButton
             @action={{action "editPlan" plan.id}}
-            @icon="far-edit"
+            @icon="far-pen-to-square"
             class="btn no-text btn-icon"
           />
           <DButton
             @action={{route-action "destroyPlan"}}
             @actionParam={{plan}}
-            @icon="trash-alt"
+            @icon="trash-can"
             class="btn-danger btn no-text btn-icon"
           />
         </td>
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs
index 6dd1700c..5b2cd16f 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs
@@ -57,7 +57,7 @@
                 <DButton
                   @action={{route-action "destroyProduct"}}
                   @actionParam={{product}}
-                  @icon="trash-alt"
+                  @icon="trash-can"
                   class="btn-danger btn no-text btn-icon"
                 />
               </div>
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs
index e7ad701a..3cac252e 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs
@@ -139,7 +139,7 @@
 {{/unless}}
 
 <div class="pull-right">
-  <DButton @label="cancel" @action={{action "cancelProduct"}} @icon="times" />
+  <DButton @label="cancel" @action={{action "cancelProduct"}} @icon="xmark" />
 
   {{#if this.model.product.isNew}}
     <DButton
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs
index e82fa10f..9c72dcb8 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs
@@ -76,7 +76,7 @@
                   @disabled={{subscription.canceled}}
                   @label="cancel"
                   @action={{action "showCancelModal" subscription}}
-                  @icon="times"
+                  @icon="xmark"
                 />
               {{/if}}
             </td>
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs
index e8417449..de37c679 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs
@@ -8,14 +8,14 @@
     {{#if this.campaignEnabled}}
       <DButton
         @label="discourse_subscriptions.campaign.refresh_campaign"
-        @icon="sync-alt"
+        @icon="rotate"
         @action={{action "triggerManualRefresh"}}
       />
     {{else}}
       {{#unless this.campaignProductSet}}
         <DButton
           @label="discourse_subscriptions.campaign.one_click_campaign"
-          @icon="plus-square"
+          @icon="square-plus"
           @action={{action "createOneClickCampaign"}}
           @isLoading={{this.loading}}
         />
diff --git a/assets/javascripts/discourse/templates/user/billing/subscriptions/index.hbs b/assets/javascripts/discourse/templates/user/billing/subscriptions/index.hbs
index 41173329..594f6050 100644
--- a/assets/javascripts/discourse/templates/user/billing/subscriptions/index.hbs
+++ b/assets/javascripts/discourse/templates/user/billing/subscriptions/index.hbs
@@ -32,12 +32,12 @@
               {{else}}
                 <DButton
                   @action={{route-action "updateCard" subscription.id}}
-                  @icon="far-edit"
+                  @icon="far-pen-to-square"
                   class="btn no-text btn-icon"
                 />
                 <DButton
                   class="btn-danger btn no-text btn-icon"
-                  @icon="trash-alt"
+                  @icon="trash-can"
                   @disabled={{subscription.canceled_at}}
                   @action={{route-action "cancelSubscription" subscription}}
                 />