diff --git a/resources/views/auth/forgot/create.blade.php b/resources/views/auth/forgot/create.blade.php
index f02a5cea8..8fe07c8ea 100644
--- a/resources/views/auth/forgot/create.blade.php
+++ b/resources/views/auth/forgot/create.blade.php
@@ -41,7 +41,7 @@
                     override="class"
                     data-loading-text="{{ trans('general.loading') }}"
                 >
-                    <x-button-loading v-if="form.loading" text="{{ trans('general.send') }}" text-hide="[{'opacity-0': form.loading}]" />
+                    <x-button.loading v-if="form.loading" text="{{ trans('general.send') }}" text-hide="[{'opacity-0': form.loading}]" />
                 </x-button>
             </div>
         </x-form>
diff --git a/resources/views/auth/login/create.blade.php b/resources/views/auth/login/create.blade.php
index aaba5ef84..b62665bc9 100644
--- a/resources/views/auth/login/create.blade.php
+++ b/resources/views/auth/login/create.blade.php
@@ -70,7 +70,7 @@
                     override="class"
                     data-loading-text="{{ trans('general.loading') }}"
                 >
-                    <x-button-loading v-if="form.loading" text="{{ trans('auth.login') }}" text-hide="[{'opacity-0': form.loading}]" />
+                    <x-button.loading v-if="form.loading" text="{{ trans('auth.login') }}" text-hide="[{'opacity-0': form.loading}]" />
                 </x-button>
             </div>
         </x-form>
diff --git a/resources/views/auth/reset/create.blade.php b/resources/views/auth/reset/create.blade.php
index 8ad7867af..766138570 100644
--- a/resources/views/auth/reset/create.blade.php
+++ b/resources/views/auth/reset/create.blade.php
@@ -58,7 +58,7 @@
                     override="class"
                     data-loading-text="{{ trans('general.loading') }}"
                 >
-                    <x-button-loading v-if="form.loading" text="{{ trans('auth.reset') }}" text-hide="[{'opacity-0': form.loading}]" />
+                    <x-button.loading v-if="form.loading" text="{{ trans('auth.reset') }}" text-hide="[{'opacity-0': form.loading}]" />
                 </x-button>
             </div>
         </x-form>
diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php
index 9e6fe558c..d3b6bbd64 100644
--- a/resources/views/banking/reconciliations/create.blade.php
+++ b/resources/views/banking/reconciliations/create.blade.php
@@ -264,7 +264,7 @@
                                     class="flex items-center justify-center bg-transparent hover:bg-gray-200 px-3 py-1.5 text-base rounded-lg disabled:opacity-50"
                                     override="class"
                                 >
-                                    <x-button-loading v-if="form.loading" text="{{ trans('reconciliations.save_draft') }}" text-hide="[{'opacity-0': form.loading}]" />
+                                    <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.save_draft') }}" text-hide="[{'opacity-0': form.loading}]" />
                                 </x-button>
     
                                 <div v-if="reconcile">
@@ -277,7 +277,7 @@
                                           @click="onReconcileSubmit"
                                           data-loading-text="{{ trans('general.loading') }}"
                                         >
-                                            <x-button-loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                            <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
                                         </x-button>
                                     </x-tooltip>
                                 </div>
@@ -290,7 +290,7 @@
                                       @click="onReconcileSubmit"
                                       data-loading-text="{{ trans('general.loading') }}"
                                     >
-                                        <x-button-loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                        <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
                                     </x-button>
                                 </div>
                             </div>
diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php
index 6d4b49ed4..d17e496d0 100644
--- a/resources/views/banking/reconciliations/edit.blade.php
+++ b/resources/views/banking/reconciliations/edit.blade.php
@@ -203,7 +203,7 @@
                                 class="relative flex items-center justify-center bg-transparent hover:bg-gray-200 px-3 py-1.5 text-base rounded-lg disabled:opacity-50"
                                 override="class"
                             >
-                                <x-button-loading v-if="form.loading" text="{{ trans('general.save') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                <x-button.loading v-if="form.loading" text="{{ trans('general.save') }}" text-hide="[{'opacity-1': reconcile}]" />
                             </x-button>
                             <div v-if="reconcile">
                                 <x-tooltip id="tooltip-reconcile" placement="top" message="{{ trans('reconciliations.irreconcilable') }}">
@@ -216,7 +216,7 @@
                                         data-loading-text="{{ trans('general.loading') }}"
                                     >
 
-                                        <x-button-loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                        <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
                                     </x-button>
                                 </x-tooltip>
                             </div>
@@ -230,7 +230,7 @@
                                     data-loading-text="{{ trans('general.loading') }}"
                                 >
 
-                                    <x-button-loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                    <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
                                 </x-button>
                             </div>
                         </div>
diff --git a/resources/views/banking/transfers/show.blade.php b/resources/views/banking/transfers/show.blade.php
index 3feb71825..dab688a27 100644
--- a/resources/views/banking/transfers/show.blade.php
+++ b/resources/views/banking/transfers/show.blade.php
@@ -41,7 +41,7 @@
                     </button>
 
                     <button :disabled="form.loading"  type="button" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100" @click="addTemplate">
-                        <x-button-loading v-if="form.loading" text="{{ trans('general.confirm') }}" text-hide="[{'opacity-0': form.loading}]" />
+                        <x-button.loading v-if="form.loading" text="{{ trans('general.confirm') }}" text-hide="[{'opacity-0': form.loading}]" />
                     </button>
                 </div>
             </template>
diff --git a/resources/views/common/import/create.blade.php b/resources/views/common/import/create.blade.php
index 42e18dcea..a62998008 100644
--- a/resources/views/common/import/create.blade.php
+++ b/resources/views/common/import/create.blade.php
@@ -47,7 +47,7 @@
                             ::disabled="form.loading"
                             override="class"
                         >
-                            <x-button-loading v-if="form.loading" text="{{ trans('import.import') }}" text-hide="[{'opacity-0': form.loading}]" />
+                            <x-button.loading v-if="form.loading" text="{{ trans('import.import') }}" text-hide="[{'opacity-0': form.loading}]" />
                         </x-button>
                     </div>
                 </div>
diff --git a/resources/views/components/button-loading.blade.php b/resources/views/components/button/loading.blade.php
similarity index 100%
rename from resources/views/components/button-loading.blade.php
rename to resources/views/components/button/loading.blade.php
diff --git a/resources/views/components/form/buttons.blade.php b/resources/views/components/form/buttons.blade.php
index 793311cd3..5dbb47e50 100644
--- a/resources/views/components/form/buttons.blade.php
+++ b/resources/views/components/form/buttons.blade.php
@@ -17,7 +17,7 @@
             ::disabled="form.loading"
             override="class"
         >
-            <x-button-loading v-if="form.loading" text="{{ trans('general.save') }}" text-hide="[{'opacity-0': form.loading}]" />
+            <x-button.loading v-if="form.loading" text="{{ trans('general.save') }}" text-hide="[{'opacity-0': form.loading}]" />
         </x-button>
     </div>
 @stack('save_buttons_end')
diff --git a/resources/views/components/layouts/modules/show/releases.blade.php b/resources/views/components/layouts/modules/show/releases.blade.php
index 2e1b0ec3b..91f0bd197 100644
--- a/resources/views/components/layouts/modules/show/releases.blade.php
+++ b/resources/views/components/layouts/modules/show/releases.blade.php
@@ -21,7 +21,7 @@
             @click="onModuleLoadMore('releases')"
             class="w-48 bg-green m-auto block whitespace-nowrap px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white text-center js-learn-more js-button-modal-submit hover:bg-green-700 disabled:bg-green-300"
         >
-            <x-button-loading v-if="loadMoreLoading" text="{{ trans('modules.see_more') }}" text-hide="[{'opacity-0': loadMoreLoading}]" />
+            <x-button.loading v-if="loadMoreLoading" text="{{ trans('modules.see_more') }}" text-hide="[{'opacity-0': loadMoreLoading}]" />
         </button>
     </div>
 
diff --git a/resources/views/components/layouts/modules/show/reviews.blade.php b/resources/views/components/layouts/modules/show/reviews.blade.php
index 55e8e20c7..e57f2612d 100644
--- a/resources/views/components/layouts/modules/show/reviews.blade.php
+++ b/resources/views/components/layouts/modules/show/reviews.blade.php
@@ -21,7 +21,7 @@
             @click="onModuleLoadMore('reviews')"
             class="w-48 bg-green m-auto block whitespace-nowrap px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white text-center js-learn-more js-button-modal-submit hover:bg-green-700 disabled:bg-green-300"
         >
-            <x-button-loading v-if="loadMoreLoading" text="{{ trans('modules.see_more') }}" text-hide="[{'opacity-0': loadMoreLoading}]" />
+            <x-button.loading v-if="loadMoreLoading" text="{{ trans('modules.see_more') }}" text-hide="[{'opacity-0': loadMoreLoading}]" />
         </button>
     </div>
 
diff --git a/resources/views/components/modules/items.blade.php b/resources/views/components/modules/items.blade.php
index 496a5eb1f..45ec6b9cd 100644
--- a/resources/views/components/modules/items.blade.php
+++ b/resources/views/components/modules/items.blade.php
@@ -34,7 +34,7 @@
                     :disabled="loadMoreLoading"
                     class="w-48 m-auto relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100 js-learn-more js-button-modal-submit"
                 >
-                    <x-button-loading v-if="loadMoreLoading" text="{{ trans('modules.see_more') }}" text-hide="[{'opacity-0': loadMoreLoading}]" />
+                    <x-button.loading v-if="loadMoreLoading" text="{{ trans('modules.see_more') }}" text-hide="[{'opacity-0': loadMoreLoading}]" />
                 </button>
 
                 <x-form.input.hidden name="see_more_path" value="{{ route('apps.load-more', ['type' => $type]) }}" />