diff --git a/resources/assets/js/components/AkauntingModal.vue b/resources/assets/js/components/AkauntingModal.vue
index 36898fd71..0db825292 100644
--- a/resources/assets/js/components/AkauntingModal.vue
+++ b/resources/assets/js/components/AkauntingModal.vue
@@ -17,10 +17,10 @@
                     </slot>
                 </div>
                 <slot name="modal-body">
-                    <div class="modal-body" v-html="message">
+                    <div class="modal-body pb-0" v-html="message">
                     </div>
                 </slot>
-                <div class="card-footer border-top-0">
+                <div class="card-footer border-top-0 pt-0">
                     <slot name="card-footer">
                         <div class="float-right">
                             <button type="button" class="btn btn-icon btn-outline-secondary" @click="onCancel">
diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue
index 159e58306..51bd1bb64 100644
--- a/resources/assets/js/components/AkauntingModalAddNew.vue
+++ b/resources/assets/js/components/AkauntingModalAddNew.vue
@@ -17,14 +17,14 @@
                     </slot>
                 </div>
                 <slot name="modal-body">
-                    <div class="modal-body" v-if="!is_component" v-html="message">
+                    <div class="modal-body pb-0" v-if="!is_component" v-html="message">
                     </div>
-                    <div class="modal-body" v-else>
+                    <div class="modal-body pb-0" v-else>
                         <form id="form-create" method="POST" action="#"/>
                         <component v-bind:is="component"></component>
                     </div>
                 </slot>
-                <div class="card-footer border-top-0">
+                <div class="card-footer border-top-0 pt-0">
                     <slot name="card-footer">
                         <div class="float-right">
                             <button type="button" class="btn btn-icon" :class="buttons.cancel.class" @click="onCancel">
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index a5b0d082c..5c08087a3 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -76,6 +76,7 @@ return [
     'edit'                  => 'Edit',
     'delete'                => 'Delete',
     'send'                  => 'Send',
+    'share'                 => 'Share',
     'download'              => 'Download',
     'delete_confirm'        => 'Confirm delete :name :type?',
     'name'                  => 'Name',
diff --git a/resources/views/modals/bills/payment.blade.php b/resources/views/modals/bills/payment.blade.php
index 82d2347fa..1a19ba884 100644
--- a/resources/views/modals/bills/payment.blade.php
+++ b/resources/views/modals/bills/payment.blade.php
@@ -1,13 +1,13 @@
 <div class="modal-body">
     {!! Form::open([
-            'url' => 'modals/bills/' . $bill->id . '/transactions',
-            'id' => 'transaction',
-            '@submit.prevent' => 'onSubmit',
-            '@keydown' => 'transaction_form.errors.clear($event.target.name)',
-            'files' => true,
-            'role' => 'form',
-            'class' => 'form-loading-button',
-            'novalidate' => true
+        'url' => 'modals/bills/' . $bill->id . '/transactions',
+        'id' => 'transaction',
+        '@submit.prevent' => 'onSubmit',
+        '@keydown' => 'transaction_form.errors.clear($event.target.name)',
+        'files' => true,
+        'role' => 'form',
+        'class' => 'form-loading-button',
+        'novalidate' => true
     ]) !!}
         <div class="row">
             <base-alert type="warning" v-if="typeof transaction_form.response !== 'undefined' && transaction_form.response.error" v-html="transaction_form.response.message"></base-alert>
@@ -19,13 +19,7 @@
             {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }}
 
             @stack('currency_code_input_start')
-                <div class="form-group col-md-6 required">
-                    {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
-                    <div class="input-group">
-                        <div class="input-group-addon"><i class="fa fa-exchange"></i></div>
-                        {!! Form::text('currency', $currencies[$bill->currency_code], ['v-model' => 'transaction_form.currency', 'v-error' => 'payment.errors.get("currency")', 'v-error-message' => 'payment.errors.get("currency")','id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
-                    </div>
-                </div>
+                {{ Form::textGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', ['disabled' => 'disabled', 'v-model' => 'transaction_form.currency', 'v-error' => 'payment.errors.get("currency")', 'v-error-message' => 'payment.errors.get("currency")'], $currencies[$bill->currency_code]) }}
             @stack('currency_code_input_end')
 
             {{ Form::textareaGroup('description', trans('general.description'), '', null, ['rows' => '3', 'v-model' => 'transaction_form.description', 'v-error' => 'payment.errors.get("description")', 'v-error-message' => 'payment.errors.get("description")']) }}
diff --git a/resources/views/modals/categories/create.blade.php b/resources/views/modals/categories/create.blade.php
index 236995682..a036994fc 100644
--- a/resources/views/modals/categories/create.blade.php
+++ b/resources/views/modals/categories/create.blade.php
@@ -8,7 +8,7 @@
     'novalidate' => true
 ]) !!}
     <div class="row">
-        {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
+        {{ Form::textGroup('name', trans('general.name'), 'font') }}
 
         @stack('color_input_start')
             <div class="form-group col-md-6 required {{ $errors->has('color') ? 'has-error' : ''}}">
diff --git a/resources/views/modals/invoices/payment.blade.php b/resources/views/modals/invoices/payment.blade.php
index 1fcb337e3..c7b64a19c 100644
--- a/resources/views/modals/invoices/payment.blade.php
+++ b/resources/views/modals/invoices/payment.blade.php
@@ -1,13 +1,13 @@
-<div class="modal-body">
+<div class="modal-body pb-0">
     {!! Form::open([
-            'url' => 'modals/invoices/' . $invoice->id . '/transactions',
-            'id' => 'transaction',
-            '@submit.prevent' => 'onSubmit',
-            '@keydown' => 'transaction_form.errors.clear($event.target.name)',
-            'files' => true,
-            'role' => 'form',
-            'class' => 'form-loading-button',
-            'novalidate' => true
+        'url' => 'modals/invoices/' . $invoice->id . '/transactions',
+        'id' => 'transaction',
+        '@submit.prevent' => 'onSubmit',
+        '@keydown' => 'transaction_form.errors.clear($event.target.name)',
+        'files' => true,
+        'role' => 'form',
+        'class' => 'form-loading-button',
+        'novalidate' => true
     ]) !!}
         <div class="row">
             <base-alert type="warning" v-if="typeof transaction_form.response !== 'undefined' && transaction_form.response.error" v-html="transaction_form.response.message"></base-alert>
@@ -19,13 +19,7 @@
             {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }}
 
             @stack('currency_code_input_start')
-                <div class="form-group col-md-6 required">
-                    {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
-                    <div class="input-group">
-                        <div class="input-group-addon"><i class="fa fa-exchange"></i></div>
-                        {!! Form::text('currency', $currencies[$invoice->currency_code], ['v-model' => 'transaction_form.currency', 'v-error' => 'payment.errors.get("currency")', 'v-error-message' => 'payment.errors.get("currency")','id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
-                    </div>
-                </div>
+                {{ Form::textGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', ['disabled' => 'disabled', 'v-model' => 'transaction_form.currency', 'v-error' => 'payment.errors.get("currency")', 'v-error-message' => 'payment.errors.get("currency")'], $currencies[$invoice->currency_code]) }}
             @stack('currency_code_input_end')
 
             {{ Form::textareaGroup('description', trans('general.description'), '', null, ['rows' => '3', 'v-model' => 'transaction_form.description', 'v-error' => 'payment.errors.get("description")', 'v-error-message' => 'payment.errors.get("description")']) }}
diff --git a/resources/views/modals/settings/invoice_template.blade.php b/resources/views/modals/settings/invoice_template.blade.php
index 70e17da11..0ae1d8654 100644
--- a/resources/views/modals/settings/invoice_template.blade.php
+++ b/resources/views/modals/settings/invoice_template.blade.php
@@ -1,4 +1,4 @@
-<div class="modal-body">
+<div class="modal-body pb-0">
     {!! Form::open([
             'route' => 'modals.invoice-templates.update',
             'method' => 'PATCH',
diff --git a/resources/views/modals/taxes/create.blade.php b/resources/views/modals/taxes/create.blade.php
index ea98d8738..f753337d2 100644
--- a/resources/views/modals/taxes/create.blade.php
+++ b/resources/views/modals/taxes/create.blade.php
@@ -3,12 +3,12 @@
     '@submit.prevent' => 'onSubmit',
     '@keydown' => 'form.errors.clear($event.target.name)',
     'role' => 'form',
-    'class' => 'form-loading-button',
+    'class' => 'form-loading-button m--3',
     'route' => 'taxes.store',
     'novalidate' => true
 ]) !!}
     <div class="row">
-        {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
+        {{ Form::textGroup('name', trans('general.name'), 'font') }}
 
         {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
 
diff --git a/resources/views/modals/vendors/create.blade.php b/resources/views/modals/vendors/create.blade.php
index 00f589e8b..a2a6f81a2 100644
--- a/resources/views/modals/vendors/create.blade.php
+++ b/resources/views/modals/vendors/create.blade.php
@@ -8,13 +8,13 @@
     'novalidate' => true
 ]) !!}
     <div class="row">
-        {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }}
+        {{ Form::textGroup('name', trans('general.name'), 'font') }}
 
         {{ Form::textGroup('email', trans('general.email'), 'envelope', []) }}
 
         {{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', []) }}
 
-        {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('default.currency')) }}
+        {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency')) }}
 
         {{ Form::textareaGroup('address', trans('general.address')) }}
 
diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php
index 927d6be53..79a0b2ec9 100644
--- a/resources/views/purchases/bills/show.blade.php
+++ b/resources/views/purchases/bills/show.blade.php
@@ -447,7 +447,7 @@
                                     @stack('button_pay_start')
                                         @if($bill->status != 'paid')
                                             @if(empty($bill->paid) || ($bill->paid != $bill->amount))
-                                                <a class="dropdown-item" href="#" id="button-payment">{{ trans('bills.add_payment') }}</a>
+                                                <button class="dropdown-item" id="button-payment" @click="onPayment">{{ trans('bills.add_payment') }}</button>
                                             @endif
                                             @permission('update-purchases-bills')
                                                 @if($bill->status == 'draft')
@@ -592,6 +592,7 @@
 
 @push('content_content_end')
     <akaunting-modal
+        class="modal-payment"
         :show="payment.modal"
         @cancel="payment.modal = false"
         :title="'{{ trans('general.title.new', ['type' => trans_choice('general.payments', 1)]) }}'"
@@ -622,3 +623,4 @@
 @push('scripts_start')
     <script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
 @endpush
+
diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php
index 2c4a2967f..fbb8ee946 100644
--- a/resources/views/sales/invoices/show.blade.php
+++ b/resources/views/sales/invoices/show.blade.php
@@ -467,7 +467,7 @@
 
                         @stack('button_share_start')
                             <a href="{{ $signed_url }}" target="_blank" class="btn btn-white header-button-top">
-                                <i class="fa fa-share"></i>&nbsp; Share
+                                <i class="fa fa-share"></i>&nbsp; {{ trans('general.share') }}
                             </a>
                         @stack('button_share_end')