diff --git a/app/View/Components/Button.php b/app/View/Components/Button.php
index 6e5f083b9..a9134ec72 100644
--- a/app/View/Components/Button.php
+++ b/app/View/Components/Button.php
@@ -37,7 +37,7 @@ class Button extends Component
      */
     public function render()
     {
-        return view('components.button');
+        return view('components.button.index');
     }
 
     protected function getOverride($override)
diff --git a/resources/views/auth/forgot/create.blade.php b/resources/views/auth/forgot/create.blade.php
index 81b457120..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') }}"
                 >
-                    <i v-if="form.loading" 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]"></i>
-                    <span :class="[{'opacity-0': form.loading}]">{{ trans('general.send') }}</span>
+                    <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 ccaf72d3f..7b0eb2802 100644
--- a/resources/views/auth/login/create.blade.php
+++ b/resources/views/auth/login/create.blade.php
@@ -68,12 +68,10 @@
                     ::disabled="form.loading"
                     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 sm:col-span-6"
                     override="class"
-                    data-loading-text="{{ trans('general.loading') }}"
                 >
-                    <i v-if="form.loading" 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]"></i> 
-                    <span :class="[{'opacity-0': form.loading}]">
+                    <x-button.loading>
                         {{ trans('auth.login') }}
-                    </span>
+                    </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 f8f32091e..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') }}"
                 >
-                <i v-if="form.loading" 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]"></i>
-                <span :class="[{'opacity-0': form.loading}]">{{ trans('auth.reset') }}</span>
+                    <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 36b00756a..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"
                                 >
-                                    <i v-if="form.loading" class="material-icons 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]"></i>
-                                    <span :class="[{'ml-0': form.loading}]">{{ trans('reconciliations.save_draft') }}</span>
+                                    <x-button.loading>
+                                        {{ trans('reconciliations.save_draft') }}
+                                    </x-button.loading>
                                 </x-button>
     
                                 <div v-if="reconcile">
@@ -278,13 +279,9 @@
                                           @click="onReconcileSubmit"
                                           data-loading-text="{{ trans('general.loading') }}"
                                         >
-                                          <i 
-                                            v-if="form.loading"
-                                            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]"
-                                          >
-                                          </i>
-
-                                          <span :class="[{'opacity-1': reconcile}]">{{ trans('reconciliations.reconcile') }}</span>
+                                            <x-button.loading action="! reconcile">
+                                                {{ trans('reconciliations.reconcile') }}
+                                            </x-button.loading>
                                         </x-button>
                                     </x-tooltip>
                                 </div>
@@ -297,12 +294,9 @@
                                       @click="onReconcileSubmit"
                                       data-loading-text="{{ trans('general.loading') }}"
                                     >
-                                    <i 
-                                      v-if="form.loading"
-                                      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]"
-                                    >
-                                    </i>
-                                    <span :class="[{'opacity-1': reconcile}]">{{ trans('reconciliations.reconcile') }}</span>
+                                        <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 3324ded68..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"
                             >
-                                <i v-if="form.loading" 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]"></i>
-                                <span :class="[{'ml-0': form.loading}]">{{ trans('general.save') }}</span>
+                                <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,16 +218,13 @@
                                         @click="onReconcileSubmit"
                                         data-loading-text="{{ trans('general.loading') }}"
                                     >
-
-                                    <i 
-                                        v-if="form.loading"
-                                        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]"
-                                    >
-                                    </i>
-                                    <span :class="[{'opacity-1': reconcile}]">{{ trans('reconciliations.reconcile') }}</span>
+                                        <x-button.loading action="! reconcile">
+                                            {{ trans('reconciliations.reconcile') }}
+                                        </x-button.loading>
                                     </x-button>
                                 </x-tooltip>
                             </div>
+
                             <div v-else>
                                 <x-button
                                     type="button"
@@ -235,13 +234,9 @@
                                     @click="onReconcileSubmit"
                                     data-loading-text="{{ trans('general.loading') }}"
                                 >
-
-                                    <i 
-                                        v-if="form.loading"
-                                        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]"
-                                    >
-                                    </i>
-                                    <span :class="[{'opacity-1': reconcile}]">{{ trans('reconciliations.reconcile') }}</span>
+                                    <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 dceea98e5..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">
-                        <i v-if="form.loading" 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]"></i>
-                        <span :class="[{'opacity-0': form.loading}]">{{ trans('general.confirm') }}</span>
+                    <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 0a1107206..6e7ec5744 100644
--- a/resources/views/common/import/create.blade.php
+++ b/resources/views/common/import/create.blade.php
@@ -47,10 +47,9 @@
                             ::disabled="form.loading"
                             override="class"
                         >
-                            <i v-if="form.loading" 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]"></i>
-                            <span :class="[{'opacity-0': form.loading}]">
+                            <x-button.loading>
                                 {{ trans('import.import') }}
-                            </span>
+                            </x-button.loading>
                         </x-button>
                     </div>
                 </div>
diff --git a/resources/views/components/button.blade.php b/resources/views/components/button/index.blade.php
similarity index 100%
rename from resources/views/components/button.blade.php
rename to resources/views/components/button/index.blade.php
diff --git a/resources/views/components/button/loading.blade.php b/resources/views/components/button/loading.blade.php
new file mode 100644
index 000000000..a94953e34
--- /dev/null
+++ b/resources/views/components/button/loading.blade.php
@@ -0,0 +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 }}
+    v-if="{{ $action }}"
+>
+</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 efa84f1a8..e66b04c42 100644
--- a/resources/views/components/form/buttons.blade.php
+++ b/resources/views/components/form/buttons.blade.php
@@ -17,10 +17,9 @@
             ::disabled="form.loading"
             override="class"
         >
-            <i v-if="form.loading" 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:-left-3.5 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:-right-3.5 after:rounded-full after:animate-submit after:delay-[0.42s]"></i>
-            <span :class="[{'opacity-0': form.loading}]">
+            <x-button.loading>
                 {{ trans('general.save') }}
-            </span>
+            </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 287b1c05e..82dd6c84d 100644
--- a/resources/views/components/layouts/modules/show/releases.blade.php
+++ b/resources/views/components/layouts/modules/show/releases.blade.php
@@ -19,12 +19,11 @@
             id="releases-load-more"
             :disabled="loadMoreLoading"
             @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"
+            class="relative 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"
         >
-            <i v-if="loadMoreLoading" 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]"></i>
-            <span :class="[{'opacity-0': loadMoreLoading}]">
+            <x-button.loading action="loadMoreLoading">
                 {{ trans('modules.see_more') }}
-            </span>
+            </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 79eac6ca5..352e3310b 100644
--- a/resources/views/components/layouts/modules/show/reviews.blade.php
+++ b/resources/views/components/layouts/modules/show/reviews.blade.php
@@ -19,12 +19,11 @@
             id="review-load-more"
             :disabled="loadMoreLoading"
             @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"
+            class="relative 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"
         >
-            <i v-if="loadMoreLoading" 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]"></i>
-            <span :class="[{'opacity-0': loadMoreLoading}]">
+            <x-button.loading action="loadMoreLoading">
                 {{ trans('modules.see_more') }}
-            </span>
+            </x-button.loading>
         </button>
     </div>
 
diff --git a/resources/views/components/modules/items.blade.php b/resources/views/components/modules/items.blade.php
index 94f07fbbb..47b82f5bb 100644
--- a/resources/views/components/modules/items.blade.php
+++ b/resources/views/components/modules/items.blade.php
@@ -30,14 +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"
+                    class="relative w-48 m-auto 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"
                 >
-                    <i v-if="loadMoreLoading" 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]"></i>
-                    <span :class="[{'opacity-0': loadMoreLoading}]">
+                    <x-button.loading action="loadMoreLoading">
                         {{ trans('modules.see_more') }}
-                    </span>
+                    </x-button.loading>
                 </button>
 
                 <x-form.input.hidden name="see_more_path" value="{{ route('apps.load-more', ['type' => $type]) }}" />