diff --git a/resources/js/Components/Common/UpgradeModal.vue b/resources/js/Components/Common/UpgradeModal.vue
index f4c22375..7110f185 100644
--- a/resources/js/Components/Common/UpgradeModal.vue
+++ b/resources/js/Components/Common/UpgradeModal.vue
@@ -39,10 +39,10 @@ const show = defineModel('show', { default: false });
                         <PrimaryButton
                             type="button"
                             class="mt-6"
+                            :icon="CreditCardIcon"
                             v-if="
                                 isBillingActivated() && canUpdateOrganization()
                             ">
-                            <CreditCardIcon class="w-5 h-5 me-2" />
                             Go to Billing
                         </PrimaryButton>
                     </Link>
diff --git a/resources/js/Components/NotificationContainer.vue b/resources/js/Components/NotificationContainer.vue
index 428a1c59..881d17cf 100644
--- a/resources/js/Components/NotificationContainer.vue
+++ b/resources/js/Components/NotificationContainer.vue
@@ -41,8 +41,10 @@
                 <Link
                     v-if="isBillingActivated() && canManageBilling()"
                     href="/billing">
-                    <PrimaryButton type="button" class="mt-6">
-                        <CreditCardIcon class="w-5 h-5 me-2" />
+                    <PrimaryButton
+                        :icon="CreditCardIcon"
+                        type="button"
+                        class="mt-6">
                         Go to Billing
                     </PrimaryButton>
                 </Link>
diff --git a/resources/js/Pages/ReportingShared.vue b/resources/js/Pages/ReportingShared.vue
index 74da1ac0..ae00f953 100644
--- a/resources/js/Pages/ReportingShared.vue
+++ b/resources/js/Pages/ReportingShared.vue
@@ -103,10 +103,10 @@ watch(currentPage, () => {
                         <PrimaryButton
                             type="button"
                             class="mt-6"
+                            :icon="CreditCardIcon"
                             v-if="
                                 isBillingActivated() && canUpdateOrganization()
                             ">
-                            <CreditCardIcon class="w-5 h-5 me-2" />
                             Go to Billing
                         </PrimaryButton>
                     </Link>
diff --git a/resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue b/resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue
index fdb0eab9..53f3e61f 100644
--- a/resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue
+++ b/resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue
@@ -64,8 +64,7 @@ const updateTeamName = () => {
                     <Link
                         v-if="isBillingActivated() && canManageBilling()"
                         href="/billing">
-                        <PrimaryButton type="button">
-                            <CreditCardIcon class="w-5 h-5 me-2" />
+                        <PrimaryButton :icon="CreditCardIcon" type="button">
                             Go to Billing
                         </PrimaryButton>
                     </Link>