diff --git a/resources/views/auth/forgot/create.blade.php b/resources/views/auth/forgot/create.blade.php
index 9f3deb2ed..ced46325e 100644
--- a/resources/views/auth/forgot/create.blade.php
+++ b/resources/views/auth/forgot/create.blade.php
@@ -41,8 +41,9 @@
                     override="class"
                     data-loading-text="{{ trans('general.loading') }}"
                 >
-                    <span>{{ trans('general.send') }}</span>
-                    <x-button.loading v-if="form.loading" text="{{ trans('general.send') }}" text-hide="[{'opacity-0': form.loading}]" />
+                    <x-button.loading>
+                        {{ trans('general.send') }}
+                    </x-button.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 80e00e651..0a3ecf927 100644
--- a/resources/views/auth/login/create.blade.php
+++ b/resources/views/auth/login/create.blade.php
@@ -70,8 +70,9 @@
                     override="class"
                     data-loading-text="{{ trans('general.loading') }}"
                 >
-                    <span>{{ trans('auth.login') }}</span>
-                    <x-button.loading v-if="form.loading" text="{{ trans('auth.login') }}" text-hide="[{'opacity-0': form.loading}]" />
+                    <x-button.loading>
+                        {{ trans('auth.login') }}
+                    </x-button.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 f11e9c996..c48fefa93 100644
--- a/resources/views/auth/reset/create.blade.php
+++ b/resources/views/auth/reset/create.blade.php
@@ -58,8 +58,9 @@
                     override="class"
                     data-loading-text="{{ trans('general.loading') }}"
                 >
-                    <span>{{ trans('auth.reset') }}</span>
-                    <x-button.loading v-if="form.loading" text="{{ trans('auth.reset') }}" text-hide="[{'opacity-0': form.loading}]" />
+                    <x-button.loading>
+                        {{ trans('auth.reset') }}
+                    </x-button.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 264f48dd2..2438d2659 100644
--- a/resources/views/banking/reconciliations/create.blade.php
+++ b/resources/views/banking/reconciliations/create.blade.php
@@ -264,8 +264,9 @@
                                     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"
                                 >
-                                    <span>{{ trans('reconciliations.save_draft') }}</span>
-                                    <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.save_draft') }}" text-hide="[{'opacity-0': form.loading}]" />
+                                    <x-button.loading>
+                                        {{ trans('reconciliations.save_draft') }}
+                                    </x-button.loading>
                                 </x-button>
     
                                 <div v-if="reconcile">
@@ -278,8 +279,9 @@
                                           @click="onReconcileSubmit"
                                           data-loading-text="{{ trans('general.loading') }}"
                                         >
-                                            <span>{{ trans('reconciliations.reconcile') }}</span>
-                                            <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                            <x-button.loading action="! reconcile">
+                                                {{ trans('reconciliations.reconcile') }}
+                                            </x-button.loading>
                                         </x-button>
                                     </x-tooltip>
                                 </div>
@@ -292,8 +294,9 @@
                                       @click="onReconcileSubmit"
                                       data-loading-text="{{ trans('general.loading') }}"
                                     >
-                                        <span>{{ trans('reconciliations.reconcile') }}</span>
-                                        <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                        <x-button.loading action="! reconcile">
+                                            {{ trans('reconciliations.reconcile') }}
+                                        </x-button.loading>
                                     </x-button>
                                 </div>
                             </div>
diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php
index 3cb635fcd..152eb75e1 100644
--- a/resources/views/banking/reconciliations/edit.blade.php
+++ b/resources/views/banking/reconciliations/edit.blade.php
@@ -203,9 +203,11 @@
                                 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"
                             >
-                                <span>{{ trans('general.save') }}</span>
-                                <x-button.loading v-if="form.loading" text="{{ trans('general.save') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                <x-button.loading>
+                                    {{ trans('general.save') }}
+                                </x-button.loading>
                             </x-button>
+
                             <div v-if="reconcile">
                                 <x-tooltip id="tooltip-reconcile" placement="top" message="{{ trans('reconciliations.irreconcilable') }}">
                                     <x-button
@@ -216,11 +218,13 @@
                                         @click="onReconcileSubmit"
                                         data-loading-text="{{ trans('general.loading') }}"
                                     >
-                                        <span>{{ trans('reconciliations.reconcile') }}</span>
-                                        <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                        <x-button.loading action="! reconcile">
+                                            {{ trans('reconciliations.reconcile') }}
+                                        </x-button.loading>
                                     </x-button>
                                 </x-tooltip>
                             </div>
+
                             <div v-else>
                                 <x-button
                                     type="button"
@@ -230,8 +234,9 @@
                                     @click="onReconcileSubmit"
                                     data-loading-text="{{ trans('general.loading') }}"
                                 >
-                                    <span>{{ trans('reconciliations.reconcile') }}"</span>
-                                    <x-button.loading v-if="form.loading" text="{{ trans('reconciliations.reconcile') }}" text-hide="[{'opacity-1': reconcile}]" />
+                                    <x-button.loading action="! reconcile">
+                                        {{ trans('reconciliations.reconcile') }}
+                                    </x-button.loading>
                                 </x-button>
                             </div>
                         </div>
diff --git a/resources/views/banking/transfers/show.blade.php b/resources/views/banking/transfers/show.blade.php
index 8ae853bb3..8a2563d89 100644
--- a/resources/views/banking/transfers/show.blade.php
+++ b/resources/views/banking/transfers/show.blade.php
@@ -40,9 +40,10 @@
                         {{ trans('general.cancel') }}
                     </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">
-                        <span>{{ trans('general.confirm') }}</span>
-                        <x-button.loading v-if="form.loading" text="{{ trans('general.confirm') }}" text-hide="[{'opacity-0': form.loading}]" />
+                    <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>
+                            {{ trans('general.confirm') }}
+                        </x-button.loading>
                     </button>
                 </div>
             </template>
diff --git a/resources/views/common/import/create.blade.php b/resources/views/common/import/create.blade.php
index e7f885487..6e7ec5744 100644
--- a/resources/views/common/import/create.blade.php
+++ b/resources/views/common/import/create.blade.php
@@ -47,8 +47,9 @@
                             ::disabled="form.loading"
                             override="class"
                         >
-                            <span>{{ trans('import.import') }}</span>
-                            <x-button.loading v-if="form.loading" text="{{ trans('import.import') }}" text-hide="[{'opacity-0': form.loading}]" />
+                            <x-button.loading>
+                                {{ trans('import.import') }}
+                            </x-button.loading>
                         </x-button>
                     </div>
                 </div>
diff --git a/resources/views/components/button/loading.blade.php b/resources/views/components/button/loading.blade.php
index 66bafbf5d..47d9d6c2a 100644
--- a/resources/views/components/button/loading.blade.php
+++ b/resources/views/components/button/loading.blade.php
@@ -1,9 +1,21 @@
+@props('action')
+@php
+    if (empty($action)) {
+        $action = 'form.loading';
+    }
+@endphp
+
 <i
-  @class([
-    'animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto',
-    'before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s]',
-    'after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]'
-  ])
-  {{ $attributes }}
+    @class([
+        'animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto',
+        'before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s]',
+        'after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]'
+    ])
+    {{ $attributes }}
+    v-if="{{ $action }}"
 >
-</i>
\ No newline at end of file
+</i>
+
+<span :class="[{'opacity-0': {{ $action }}}]">
+    {!! $slot !!}
+</span>
diff --git a/resources/views/components/form/buttons.blade.php b/resources/views/components/form/buttons.blade.php
index e63659603..e66b04c42 100644
--- a/resources/views/components/form/buttons.blade.php
+++ b/resources/views/components/form/buttons.blade.php
@@ -17,8 +17,9 @@
             ::disabled="form.loading"
             override="class"
         >
-            <span>{{ trans('general.save') }}</span>
-            <x-button.loading v-if="form.loading" text="{{ trans('general.save') }}" text-hide="[{'opacity-0': form.loading}]" />
+            <x-button.loading>
+                {{ trans('general.save') }}
+            </x-button.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 2d45c55f5..17844f24e 100644
--- a/resources/views/components/layouts/modules/show/releases.blade.php
+++ b/resources/views/components/layouts/modules/show/releases.blade.php
@@ -21,8 +21,9 @@
             @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"
         >
-            <span>{{ trans('modules.see_more') }}</span>
-            <x-button.loading v-if="loadMoreLoading" text="{{ trans('modules.see_more') }}" text-hide="[{'opacity-0': loadMoreLoading}]" />
+            <x-button.loading action="loadMoreLoading">
+                {{ trans('modules.see_more') }}
+            </x-button.loading>
         </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 b050b56aa..871bee219 100644
--- a/resources/views/components/layouts/modules/show/reviews.blade.php
+++ b/resources/views/components/layouts/modules/show/reviews.blade.php
@@ -21,8 +21,9 @@
             @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"
         >
-            <span>{{ trans('modules.see_more') }}</span>
-            <x-button.loading v-if="loadMoreLoading" text="{{ trans('modules.see_more') }}" text-hide="[{'opacity-0': loadMoreLoading}]" />
+            <x-button.loading action="loadMoreLoading">
+                {{ trans('modules.see_more') }}
+            </x-button.loading>
         </button>
     </div>
 
diff --git a/resources/views/components/modules/items.blade.php b/resources/views/components/modules/items.blade.php
index 58b367afc..047f34f91 100644
--- a/resources/views/components/modules/items.blade.php
+++ b/resources/views/components/modules/items.blade.php
@@ -30,12 +30,16 @@
 
         @if ($seeMore)
             <div class="flex items-center mt-10">
-                <button type="button" id="button-pre-load" @click="onloadMore"
+                <button
+                    type="button"
+                    id="button-pre-load"
+                    @click="onloadMore"
                     :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"
                 >
-                    <span>{{ trans('modules.see_more') }}</span>
-                    <x-button.loading v-if="loadMoreLoading" text="{{ trans('modules.see_more') }}" text-hide="[{'opacity-0': loadMoreLoading}]" />
+                    <x-button.loading action="loadMoreLoading">
+                        {{ trans('modules.see_more') }}
+                    </x-button.loading>
                 </button>
 
                 <x-form.input.hidden name="see_more_path" value="{{ route('apps.load-more', ['type' => $type]) }}" />