diff --git a/public/js/app.js b/public/js/app.js
index 589cbb2f6..85aceef44 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -191,6 +191,12 @@ $(document).ready(function () {
         $(".input-group-recurring #recurring_frequency").select2();
         $('.input-group-recurring #recurring_frequency').trigger('change');
     }
+
+    $('.form-loading-button').submit(function( event ) {
+        $('.button-submit').button('loading');
+
+        return true;
+    });
 });
 
 function confirmDelete(form_id, title, message, button_cancel, button_delete) {
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 8d289c4ec..b87dece6e 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -81,6 +81,7 @@ return [
     'color'                 => 'Colour',
     'save'                  => 'Save',
     'cancel'                => 'Cancel',
+    'loading'               => 'Loading...',
     'from'                  => 'From',
     'to'                    => 'To',
     'print'                 => 'Print',
diff --git a/resources/views/auth/permissions/create.blade.php b/resources/views/auth/permissions/create.blade.php
index d5f693ec0..432ee385e 100644
--- a/resources/views/auth/permissions/create.blade.php
+++ b/resources/views/auth/permissions/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'auth/permissions', 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'auth/permissions', 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('display_name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/auth/permissions/edit.blade.php b/resources/views/auth/permissions/edit.blade.php
index 7ca0c49cd..dc37729ab 100644
--- a/resources/views/auth/permissions/edit.blade.php
+++ b/resources/views/auth/permissions/edit.blade.php
@@ -8,7 +8,8 @@
         {!! Form::model($permission, [
             'method' => 'PATCH',
             'url' => ['auth/permissions', $permission->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/auth/roles/create.blade.php b/resources/views/auth/roles/create.blade.php
index 074b37aae..c80961c2c 100644
--- a/resources/views/auth/roles/create.blade.php
+++ b/resources/views/auth/roles/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'auth/roles', 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'auth/roles', 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('display_name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/auth/roles/edit.blade.php b/resources/views/auth/roles/edit.blade.php
index b34f77b25..1f6c2816d 100644
--- a/resources/views/auth/roles/edit.blade.php
+++ b/resources/views/auth/roles/edit.blade.php
@@ -8,7 +8,8 @@
         {!! Form::model($role, [
             'method' => 'PATCH',
             'url' => ['auth/roles', $role->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php
index 602259c2b..d2b9de3c5 100644
--- a/resources/views/auth/users/create.blade.php
+++ b/resources/views/auth/users/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'auth/users', 'files' => true, 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'auth/users', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php
index 657adfd5e..0b8bd9b5f 100644
--- a/resources/views/auth/users/edit.blade.php
+++ b/resources/views/auth/users/edit.blade.php
@@ -9,7 +9,8 @@
             'method' => 'PATCH',
             'files' => true,
             'url' => ['auth/users', $user->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php
index 48c69db48..d3e42ad05 100644
--- a/resources/views/banking/accounts/create.blade.php
+++ b/resources/views/banking/accounts/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'banking/accounts', 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'banking/accounts', 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/banking/accounts/edit.blade.php b/resources/views/banking/accounts/edit.blade.php
index 7e53f8f37..6c8035534 100644
--- a/resources/views/banking/accounts/edit.blade.php
+++ b/resources/views/banking/accounts/edit.blade.php
@@ -8,7 +8,8 @@
         {!! Form::model($account, [
             'method' => 'PATCH',
             'url' => ['banking/accounts', $account->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php
index ae055f8ff..fa8c271c2 100644
--- a/resources/views/banking/transfers/create.blade.php
+++ b/resources/views/banking/transfers/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'banking/transfers', 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'banking/transfers', 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::selectGroup('from_account_id', trans('transfers.from_account'), 'university', $accounts) }}
diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php
index 52c09e372..57ebc690f 100644
--- a/resources/views/banking/transfers/edit.blade.php
+++ b/resources/views/banking/transfers/edit.blade.php
@@ -8,7 +8,8 @@
         {!! Form::model($transfer, [
             'method' => 'PATCH',
             'url' => ['banking/transfers', $transfer->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/common/companies/create.blade.php b/resources/views/common/companies/create.blade.php
index b31d404d5..498a68d9c 100644
--- a/resources/views/common/companies/create.blade.php
+++ b/resources/views/common/companies/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'common/companies', 'files' => true, 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'common/companies', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
         <div class="box-body">
             {{ Form::textGroup('company_name', trans('general.name'), 'id-card-o') }}
 
diff --git a/resources/views/common/companies/edit.blade.php b/resources/views/common/companies/edit.blade.php
index 962cb4515..29defd177 100644
--- a/resources/views/common/companies/edit.blade.php
+++ b/resources/views/common/companies/edit.blade.php
@@ -9,7 +9,8 @@
                 'method' => 'PATCH',
                 'url' => ['common/companies', $company->id],
                 'files' => true,
-                'role' => 'form'
+                'role' => 'form',
+                'class' => 'form-loading-button'
             ]) !!}
 
             <div class="box-body">
diff --git a/resources/views/common/import/create.blade.php b/resources/views/common/import/create.blade.php
index 94c73123f..a7d4d785b 100644
--- a/resources/views/common/import/create.blade.php
+++ b/resources/views/common/import/create.blade.php
@@ -4,7 +4,7 @@
 
 @section('content')
     <div class="box box-success">
-        {!! Form::open(['url' => $path . '/import', 'files' => true, 'role' => 'form']) !!}
+        {!! Form::open(['url' => $path . '/import', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             <div class="col-md-12">
diff --git a/resources/views/common/items/create.blade.php b/resources/views/common/items/create.blade.php
index a6ada7179..b9f56d58b 100644
--- a/resources/views/common/items/create.blade.php
+++ b/resources/views/common/items/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
         <!-- Default box -->
 <div class="box box-success">
-    {!! Form::open(['route' => 'items.store', 'files' => true, 'role' => 'form']) !!}
+    {!! Form::open(['route' => 'items.store', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
     <div class="box-body">
         {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/common/items/edit.blade.php b/resources/views/common/items/edit.blade.php
index 155e374b8..9bb5df5b1 100644
--- a/resources/views/common/items/edit.blade.php
+++ b/resources/views/common/items/edit.blade.php
@@ -9,7 +9,8 @@
         'method' => 'PATCH',
         'files' => true,
         'route' => ['items.update', $item->id],
-        'role' => 'form'
+        'role' => 'form',
+        'class' => 'form-loading-button'
     ]) !!}
 
     <div class="box-body">
diff --git a/resources/views/customers/profile/edit.blade.php b/resources/views/customers/profile/edit.blade.php
index fbe8b774f..ba5464bcf 100644
--- a/resources/views/customers/profile/edit.blade.php
+++ b/resources/views/customers/profile/edit.blade.php
@@ -9,7 +9,8 @@
             'method' => 'PATCH',
             'files' => true,
             'url' => ['customers/profile/update'],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php
index 07713c7d6..593358906 100644
--- a/resources/views/expenses/bills/create.blade.php
+++ b/resources/views/expenses/bills/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
 <!-- Default box -->
 <div class="box box-success">
-    {!! Form::open(['url' => 'expenses/bills', 'files' => true, 'role' => 'form']) !!}
+    {!! Form::open(['url' => 'expenses/bills', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
     <div class="box-body">
         @stack('vendor_id_input_start')
diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php
index 3f3c9e06e..f34552b1c 100644
--- a/resources/views/expenses/bills/edit.blade.php
+++ b/resources/views/expenses/bills/edit.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::model($bill, ['method' => 'PATCH', 'files' => true, 'url' => ['expenses/bills', $bill->id], 'role' => 'form']) !!}
+        {!! Form::model($bill, ['method' => 'PATCH', 'files' => true, 'url' => ['expenses/bills', $bill->id], 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::selectGroup('vendor_id', trans_choice('general.vendors', 1), 'user', $vendors) }}
diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php
index 715a26bd3..75ed7eecf 100644
--- a/resources/views/expenses/payments/create.blade.php
+++ b/resources/views/expenses/payments/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'expenses/payments', 'files' => true, 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'expenses/payments', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php
index c38cd0c9b..2a4873543 100644
--- a/resources/views/expenses/payments/edit.blade.php
+++ b/resources/views/expenses/payments/edit.blade.php
@@ -21,7 +21,8 @@
             'method' => 'PATCH',
             'files' => true,
             'url' => ['expenses/payments', $payment->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/expenses/vendors/create.blade.php b/resources/views/expenses/vendors/create.blade.php
index faee66d82..707182f34 100644
--- a/resources/views/expenses/vendors/create.blade.php
+++ b/resources/views/expenses/vendors/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'expenses/vendors', 'files' => true, 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'expenses/vendors', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/expenses/vendors/edit.blade.php b/resources/views/expenses/vendors/edit.blade.php
index 48c1682db..f977288ab 100644
--- a/resources/views/expenses/vendors/edit.blade.php
+++ b/resources/views/expenses/vendors/edit.blade.php
@@ -9,7 +9,8 @@
             'method' => 'PATCH',
             'files' => true,
             'url' => ['expenses/vendors', $vendor->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/incomes/customers/create.blade.php b/resources/views/incomes/customers/create.blade.php
index f1c313b86..00d1466bf 100644
--- a/resources/views/incomes/customers/create.blade.php
+++ b/resources/views/incomes/customers/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'incomes/customers', 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'incomes/customers', 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/incomes/customers/edit.blade.php b/resources/views/incomes/customers/edit.blade.php
index e34291182..fb2aafc49 100644
--- a/resources/views/incomes/customers/edit.blade.php
+++ b/resources/views/incomes/customers/edit.blade.php
@@ -8,7 +8,8 @@
     {!! Form::model($customer, [
         'method' => 'PATCH',
         'url' => ['incomes/customers', $customer->id],
-        'role' => 'form'
+        'role' => 'form',
+        'class' => 'form-loading-button'
     ]) !!}
 
     <div class="box-body">
diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php
index c46545e8a..dfbe70377 100644
--- a/resources/views/incomes/invoices/create.blade.php
+++ b/resources/views/incomes/invoices/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
 <!-- Default box -->
 <div class="box box-success">
-    {!! Form::open(['url' => 'incomes/invoices', 'files' => true, 'role' => 'form']) !!}
+    {!! Form::open(['url' => 'incomes/invoices', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
     <div class="box-body">
         @stack('customer_id_input_start')
diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php
index 036b47a90..7e9f99fc0 100644
--- a/resources/views/incomes/invoices/edit.blade.php
+++ b/resources/views/incomes/invoices/edit.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::model($invoice, ['method' => 'PATCH', 'files' => true, 'url' => ['incomes/invoices', $invoice->id], 'role' => 'form']) !!}
+        {!! Form::model($invoice, ['method' => 'PATCH', 'files' => true, 'url' => ['incomes/invoices', $invoice->id], 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::selectGroup('customer_id', trans_choice('general.customers', 1), 'user', $customers, config('general.customers')) }}
diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php
index ee6bfd309..a1b52a75c 100644
--- a/resources/views/incomes/revenues/create.blade.php
+++ b/resources/views/incomes/revenues/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
 <!-- Default box -->
 <div class="box box-success">
-    {!! Form::open(['url' => 'incomes/revenues', 'files' => true, 'role' => 'form']) !!}
+    {!! Form::open(['url' => 'incomes/revenues', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
     <div class="box-body">
         {{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php
index de89f9915..d399fa24c 100644
--- a/resources/views/incomes/revenues/edit.blade.php
+++ b/resources/views/incomes/revenues/edit.blade.php
@@ -21,7 +21,8 @@
             'method' => 'PATCH',
             'files' => true,
             'url' => ['incomes/revenues', $revenue->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/modals/bills/payment.blade.php b/resources/views/modals/bills/payment.blade.php
index cd396c758..f6b00ec41 100644
--- a/resources/views/modals/bills/payment.blade.php
+++ b/resources/views/modals/bills/payment.blade.php
@@ -7,7 +7,7 @@
             </div>
             <div class="modal-body">
                 <div class="modal-message"></div>
-                {!! Form::open(['id' => 'form-add-payment', 'role' => 'form']) !!}
+                {!! Form::open(['id' => 'form-add-payment', 'role' => 'form', 'class' => 'form-loading-button']) !!}
                 <div class="row">
                     {{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
 
@@ -38,7 +38,7 @@
             </div>
             <div class="modal-footer">
                 <div class="pull-left">
-                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-add-payment', 'class' => 'btn btn-success']) !!}
+                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-add-payment', 'class' => 'btn btn-success button-submit', 'data-loading-text' => trans('general.loading')]) !!}
                     <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>
                 </div>
             </div>
diff --git a/resources/views/modals/categories/create.blade.php b/resources/views/modals/categories/create.blade.php
index c3c774168..6f7993cbf 100644
--- a/resources/views/modals/categories/create.blade.php
+++ b/resources/views/modals/categories/create.blade.php
@@ -5,7 +5,7 @@
                 <h4 class="modal-title">{{ trans('general.title.new', ['type' => trans_choice('general.categories', 1)]) }}</h4>
             </div>
             <div class="modal-body">
-                {!! Form::open(['id' => 'form-create-category', 'role' => 'form']) !!}
+                {!! Form::open(['id' => 'form-create-category', 'role' => 'form', 'class' => 'form-loading-button']) !!}
                 <div class="row">
                     {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
 
@@ -27,7 +27,7 @@
             </div>
             <div class="modal-footer">
                 <div class="pull-left">
-                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-category', 'class' => 'btn btn-success']) !!}
+                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-category', 'class' => 'btn btn-success button-submit', 'data-loading-text' => trans('general.loading')]) !!}
                     <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>
                 </div>
             </div>
diff --git a/resources/views/modals/customers/create.blade.php b/resources/views/modals/customers/create.blade.php
index 8b7706b2a..7797f9c53 100644
--- a/resources/views/modals/customers/create.blade.php
+++ b/resources/views/modals/customers/create.blade.php
@@ -5,7 +5,7 @@
                 <h4 class="modal-title">{{ trans('general.title.new', ['type' => trans_choice('general.customers', 1)]) }}</h4>
             </div>
             <div class="modal-body">
-                {!! Form::open(['id' => 'form-create-customer', 'role' => 'form']) !!}
+                {!! Form::open(['id' => 'form-create-customer', 'role' => 'form', 'class' => 'form-loading-button']) !!}
                 <div class="row">
                     {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
 
@@ -23,7 +23,7 @@
             </div>
             <div class="modal-footer">
                 <div class="pull-left">
-                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-customer', 'class' => 'btn btn-success']) !!}
+                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-customer', 'class' => 'btn btn-success button-submit', 'data-loading-text' => trans('general.loading')]) !!}
                     <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>
                 </div>
             </div>
diff --git a/resources/views/modals/invoices/payment.blade.php b/resources/views/modals/invoices/payment.blade.php
index 4be733073..7a154289a 100644
--- a/resources/views/modals/invoices/payment.blade.php
+++ b/resources/views/modals/invoices/payment.blade.php
@@ -7,7 +7,7 @@
             </div>
             <div class="modal-body">
                 <div class="modal-message"></div>
-                {!! Form::open(['id' => 'form-add-payment', 'role' => 'form']) !!}
+                {!! Form::open(['id' => 'form-add-payment', 'role' => 'form', 'class' => 'form-loading-button']) !!}
                 <div class="row">
                     {{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
 
@@ -38,7 +38,7 @@
             </div>
             <div class="modal-footer">
                 <div class="pull-left">
-                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-add-payment', 'class' => 'btn btn-success']) !!}
+                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-add-payment', 'class' => 'btn btn-success button-submit', 'data-loading-text' => trans('general.loading')]) !!}
                     <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>
                 </div>
             </div>
diff --git a/resources/views/modals/vendors/create.blade.php b/resources/views/modals/vendors/create.blade.php
index 867b4a3ef..7ff0953ae 100644
--- a/resources/views/modals/vendors/create.blade.php
+++ b/resources/views/modals/vendors/create.blade.php
@@ -5,7 +5,7 @@
                 <h4 class="modal-title">{{ trans('general.title.new', ['type' => trans_choice('general.vendors', 1)]) }}</h4>
             </div>
             <div class="modal-body">
-                {!! Form::open(['id' => 'form-create-vendor', 'role' => 'form']) !!}
+                {!! Form::open(['id' => 'form-create-vendor', 'role' => 'form', 'class' => 'form-loading-button']) !!}
                 <div class="row">
                     {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
 
@@ -23,7 +23,7 @@
             </div>
             <div class="modal-footer">
                 <div class="pull-left">
-                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-vendor', 'class' => 'btn btn-success']) !!}
+                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-vendor', 'class' => 'btn btn-success button-submit', 'data-loading-text' => trans('general.loading')]) !!}
                     <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>
                 </div>
             </div>
diff --git a/resources/views/modules/token/create.blade.php b/resources/views/modules/token/create.blade.php
index 61faa3bbe..26fc269f3 100644
--- a/resources/views/modules/token/create.blade.php
+++ b/resources/views/modules/token/create.blade.php
@@ -4,7 +4,7 @@
 
 @section('content')
     <div class="box box-success">
-        {!! Form::open(['url' => 'apps/token', 'files' => true, 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'apps/token', 'files' => true, 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             <div class="col-md-12">
diff --git a/resources/views/partials/form/save_buttons.blade.php b/resources/views/partials/form/save_buttons.blade.php
index fa0e4d2d9..bdaf0b5ac 100644
--- a/resources/views/partials/form/save_buttons.blade.php
+++ b/resources/views/partials/form/save_buttons.blade.php
@@ -2,7 +2,7 @@
 
 <div class="{{ $col }}">
     <div class="form-group no-margin">
-        {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'submit', 'class' => 'btn btn-success']) !!}
+        {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'submit', 'class' => 'btn btn-success  button-submit', 'data-loading-text' => trans('general.loading')]) !!}
         <a href="{{ url($cancel) }}" class="btn btn-default"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</a>
     </div>
 </div>
diff --git a/resources/views/settings/categories/create.blade.php b/resources/views/settings/categories/create.blade.php
index 4036f24fc..82d75df0f 100644
--- a/resources/views/settings/categories/create.blade.php
+++ b/resources/views/settings/categories/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-        {!! Form::open(['url' => 'settings/categories', 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'settings/categories', 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/settings/categories/edit.blade.php b/resources/views/settings/categories/edit.blade.php
index e11f75f20..7cec3b6e7 100644
--- a/resources/views/settings/categories/edit.blade.php
+++ b/resources/views/settings/categories/edit.blade.php
@@ -8,7 +8,8 @@
         {!! Form::model($category, [
             'method' => 'PATCH',
             'url' => ['settings/categories', $category->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/settings/currencies/create.blade.php b/resources/views/settings/currencies/create.blade.php
index e52e29cce..71fc44b5f 100644
--- a/resources/views/settings/currencies/create.blade.php
+++ b/resources/views/settings/currencies/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <!-- Default box -->
     <div class="box box-success">
-    {!! Form::open(['url' => 'settings/currencies', 'role' => 'form']) !!}
+    {!! Form::open(['url' => 'settings/currencies', 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
     <div class="box-body">
         {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/settings/currencies/edit.blade.php b/resources/views/settings/currencies/edit.blade.php
index c67e2d245..5a4e43e7a 100644
--- a/resources/views/settings/currencies/edit.blade.php
+++ b/resources/views/settings/currencies/edit.blade.php
@@ -8,7 +8,8 @@
         {!! Form::model($currency, [
             'method' => 'PATCH',
             'url' => ['settings/currencies', $currency->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/settings/modules/edit.blade.php b/resources/views/settings/modules/edit.blade.php
index 98806ef2e..9c86ef7db 100644
--- a/resources/views/settings/modules/edit.blade.php
+++ b/resources/views/settings/modules/edit.blade.php
@@ -9,7 +9,8 @@
             'method' => 'PATCH',
             'url' => ['settings/apps/' . $module->getAlias()],
             'files' => true,
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">
diff --git a/resources/views/settings/settings/edit.blade.php b/resources/views/settings/settings/edit.blade.php
index d75a5e85e..2dd80568a 100644
--- a/resources/views/settings/settings/edit.blade.php
+++ b/resources/views/settings/settings/edit.blade.php
@@ -8,7 +8,7 @@
         {!! Form::model($setting, [
             'method' => 'PATCH',
             'url' => ['settings/settings'],
-            'class' => 'setting-form',
+            'class' => 'setting-form form-loading-button'
             'files' => true,
             'role' => 'form'
         ]) !!}
diff --git a/resources/views/settings/taxes/create.blade.php b/resources/views/settings/taxes/create.blade.php
index 4405c7cfc..ac4785ebd 100644
--- a/resources/views/settings/taxes/create.blade.php
+++ b/resources/views/settings/taxes/create.blade.php
@@ -5,7 +5,7 @@
 @section('content')
       <!-- Default box -->
       <div class="box box-success">
-        {!! Form::open(['url' => 'settings/taxes', 'role' => 'form']) !!}
+        {!! Form::open(['url' => 'settings/taxes', 'role' => 'form', 'class' => 'form-loading-button']) !!}
 
         <div class="box-body">
             {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
diff --git a/resources/views/settings/taxes/edit.blade.php b/resources/views/settings/taxes/edit.blade.php
index eaad372df..1131b6489 100644
--- a/resources/views/settings/taxes/edit.blade.php
+++ b/resources/views/settings/taxes/edit.blade.php
@@ -8,7 +8,8 @@
         {!! Form::model($tax, [
             'method' => 'PATCH',
             'url' => ['settings/taxes', $tax->id],
-            'role' => 'form'
+            'role' => 'form',
+            'class' => 'form-loading-button'
         ]) !!}
 
         <div class="box-body">