diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index bb2120d63..5104933e0 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -156,7 +156,7 @@ return [
     'clear_cache'           => 'Clear Cache',
     'go_to_dashboard'       => 'Go to dashboard',
     'is'                    => 'is',
-    'isnot'                 => 'is not', 
+    'isnot'                 => 'is not',
     'recurring_and_more'    => 'Recurring and more..',
     'due_on'                => 'Due on',
     'amount_due'            => 'Amount due',
@@ -166,7 +166,7 @@ return [
         'number'                => 'Card Number',
         'expiration_date'       => 'Expiration Date',
         'cvv'                   => 'Card CVV',
-        'store'                 => 'Store Card',
+        'save'                  => 'Save Card',
     ],
 
     'title' => [
diff --git a/resources/views/components/documents/form/totals.blade.php b/resources/views/components/documents/form/totals.blade.php
index ae3bf8cf6..4207fc414 100644
--- a/resources/views/components/documents/form/totals.blade.php
+++ b/resources/views/components/documents/form/totals.blade.php
@@ -4,7 +4,7 @@
             <table class="table" id="totals">
                 <colgroup>
                     <col style="width: 50%;">
-                    <col style="width: 35%;">
+                    <col style="width: 30%;">
                     <col style="width: 25%;">
                     <col style="width: 40px;">
                 </colgroup>
@@ -12,7 +12,7 @@
                     @stack('sub_total_td_start')
                     <tr id="tr-subtotal">
                         <td class="border-bottom-0 pb-0"></td>
-                        <td class="text-right border-right-0 border-bottom-0 align-middle pb-0">
+                        <td class="text-right border-right-0 border-bottom-0 align-middle pb-0 pr-0">
                             <strong>{{ trans('invoices.sub_total') }}</strong>
                         </td>
                         <td class="text-right border-bottom-0 long-texts pb-0 pr-3">
@@ -28,7 +28,7 @@
                     @stack('item_discount_td_start')
                         <tr id="tr-line-discount" v-if="totals.item_discount">
                             <td class="border-top-0 pt-0 pb-0"></td>
-                            <td class="text-right border-top-0 border-right-0 border-bottom-0 align-middle pt-0 pb-0">
+                            <td class="text-right border-top-0 border-right-0 border-bottom-0 align-middle pt-0 pb-0 pr-0">
                                 <strong>{{ trans('invoices.item_discount') }}</strong>
                             </td>
                             <td class="text-right border-top-0 border-bottom-0 long-texts pt-0 pb-0 pr-3">
@@ -45,7 +45,7 @@
                     @stack('add_discount_td_start')
                         <tr id="tr-discount">
                             <td class="border-top-0 pt-0 pb-0"></td>
-                            <td class="text-right border-top-0 border-right-0 border-bottom-0 align-middle pt-0 pb-0">
+                            <td class="text-right border-top-0 border-right-0 border-bottom-0 align-middle pt-0 pb-0 pr-0">
                                 <el-popover
                                     popper-class="p-0 h-0"
                                     placement="bottom"
@@ -101,7 +101,7 @@
                     <tr v-for="(tax, tax_index) in totals.taxes"
                     :index="tax_index">
                         <td class="border-top-0 pt-0 pb-0"></td>
-                        <td class="text-right border-top-0  border-right-0 border-bottom-0 align-middle pt-0 pb-0">
+                        <td class="text-right border-top-0  border-right-0 border-bottom-0 align-middle pt-0 pb-0 pr-0">
                             <strong v-html="tax.name"></strong>
                         </td>
                         <td class="text-right border-top-0 border-bottom-0 long-texts pb-0 pr-3">
@@ -116,7 +116,7 @@
                 @stack('grand_total_td_start')
                     <tr id="tr-total">
                         <td class="border-top-0 pt-0 pb-0"></td>
-                        <td class="text-right border-top-0 border-right-0 align-middle pt-0 pb-0">
+                        <td class="text-right border-top-0 border-right-0 align-middle pt-0 pb-0 pr-0">
                             <strong class="document-total-span">{{ trans('invoices.total') }}</strong>
                             {{ Form::selectGroup('currency_code', '', 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'model' => 'form.currency_code', 'change' => 'onChangeCurrency'], 'document-total-currency') }}
                         </td>
@@ -132,7 +132,7 @@
                     @stack('currency_conversion_td_start')
                         <tr id="tr-currency-conversion" class="d-none" :class="[{'d-table-row': (('{{ setting('default.currency') }}' != form.currency_code) && totals.total)}]">
                             <td class="border-top-0 pb-0"></td>
-                            <td class="text-right border-top-0 border-right-0 align-middle pb-0 pr-3" colspan="2">
+                            <td class="text-right border-top-0 border-right-0 align-middle pb-0 pr-3 pr-0" colspan="2">
                                 <akaunting-currency-conversion
                                     currency-conversion-text="{{ trans('currencies.conversion') }}"
                                     :price="(totals.total / form.currency_rate).toFixed(2)"
diff --git a/resources/views/components/documents/show/timeline.blade.php b/resources/views/components/documents/show/timeline.blade.php
index 80423dc4b..4054a96c1 100644
--- a/resources/views/components/documents/show/timeline.blade.php
+++ b/resources/views/components/documents/show/timeline.blade.php
@@ -79,7 +79,7 @@
                                                             </a>
                                                         @else
                                                             <button type="button" class="btn btn-secondary btn-sm" disabled="disabled">
-                                                                <span class="text-disabled">{{ trans($textTimelineSentStatusMarkSent) }}</span>
+                                                                {{ trans($textTimelineSentStatusMarkSent) }}
                                                             </button>
                                                         @endif
                                                     @endcan
@@ -118,9 +118,11 @@
                                                     {{ trans($textTimelineSendStatusMail) }}
                                                 </a>
                                             @else
-                                                <button type="button" class="btn btn-white btn-sm green-tooltip" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}">
-                                                    <span class="text-disabled">{{ trans($textTimelineSendStatusMail) }}</span>
-                                                </button>
+                                                <el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="top" effect="danger">
+                                                    <button type="button" class="btn btn-danger btn-sm" disabled="disabled">
+                                                        {{ trans($textTimelineSendStatusMail) }}
+                                                    </button>
+                                                </el-tooltip>
                                             @endif
                                         @endif
                                     @stack('timeline_sent_body_button_email_end')
diff --git a/resources/views/components/documents/show/top-buttons.blade.php b/resources/views/components/documents/show/top-buttons.blade.php
index b62de9edb..d83435744 100644
--- a/resources/views/components/documents/show/top-buttons.blade.php
+++ b/resources/views/components/documents/show/top-buttons.blade.php
@@ -7,6 +7,18 @@
 
         <div class="dropdown-menu" role="menu">
             @stack('button_dropdown_start')
+            @if (in_array($document->status, $hideTimelineStatuses))
+                @stack('edit_button_start')
+                    @if (!$hideButtonEdit)
+                        @can($permissionUpdate)
+                            <a class="dropdown-item" href="{{ route($routeButtonEdit, $document->id) }}">
+                                {{ trans('general.edit') }}
+                            </a>
+                        @endcan
+                    @endif
+                @stack('edit_button_end')
+            @endif
+
             @stack('duplicate_button_start')
                 @if (!$hideButtonDuplicate)
                     @can($permissionCreate)
@@ -18,9 +30,9 @@
             @stack('duplicate_button_end')
 
             @stack('button_dropdown_divider_1_start')
-            @if (!$hideButtonGroupDivider1)
-                <div class="dropdown-divider"></div>
-            @endif
+                @if (!$hideButtonGroupDivider1)
+                    <div class="dropdown-divider"></div>
+                @endif
             @stack('button_dropdown_divider_1_end')
 
             @if (!$hideButtonPrint)
@@ -41,12 +53,40 @@
                 @endif
             @endif
 
-            @stack('button_pdf_start')
-            @if (!$hideButtonPdf)
-                <a class="dropdown-item" href="{{ route($routeButtonPdf, $document->id) }}">
-                    {{ trans('general.download_pdf') }}
-                </a>
+            @if (in_array($document->status, $hideTimelineStatuses))
+                @stack('share_button_start')
+                    @if (!$hideButtonShare)
+                        @if ($document->status != 'cancelled')
+                            <a class="dropdown-item" href="{{ $signedUrl }}" target="_blank">
+                                {{ trans('general.share') }}
+                            </a>
+                        @endif
+                    @endif
+                @stack('share_button_end')
+
+                @stack('edit_button_start')
+                    @if (!$hideButtonEmail)
+                        @if($document->contact_email)
+                            <a class="dropdown-item" href="{{ route($routeButtonEmail, $document->id) }}">
+                                {{ trans($textTimelineSendStatusMail) }}
+                            </a>
+                        @else
+                            <el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="right" effect="danger">
+                                <button type="button" class="dropdown-item" disabled="disabled">
+                                    <span class="text-disabled">{{ trans($textTimelineSendStatusMail) }}</span>
+                                </button>
+                            </el-tooltip>
+                        @endif
+                    @endif
+                @stack('edit_button_end')
             @endif
+
+            @stack('button_pdf_start')
+                @if (!$hideButtonPdf)
+                    <a class="dropdown-item" href="{{ route($routeButtonPdf, $document->id) }}">
+                        {{ trans('general.download_pdf') }}
+                    </a>
+                @endif
             @stack('button_pdf_end')
 
             @if (!$hideButtonCancel)
@@ -70,9 +110,9 @@
             @endif
 
             @stack('button_dropdown_divider_2_start')
-            @if (!$hideButtonGroupDivider2)
-                <div class="dropdown-divider"></div>
-            @endif
+                @if (!$hideButtonGroupDivider2)
+                    <div class="dropdown-divider"></div>
+                @endif
             @stack('button_dropdown_divider_2_end')
 
             @if (!$hideButtonCustomize)
@@ -86,23 +126,23 @@
             @endif
 
             @stack('button_dropdown_divider_3_start')
-            @if (!$hideButtonGroupDivider3)
-                <div class="dropdown-divider"></div>
-            @endif
+                @if (!$hideButtonGroupDivider3)
+                    <div class="dropdown-divider"></div>
+                @endif
             @stack('button_dropdown_divider_3_end')
 
             @stack('delete_button_start')
-            @if (!$hideButtonDelete)
-                @can($permissionDelete)
-                    @if ($checkButtonReconciled)
-                        @if (!$document->reconciled)
+                @if (!$hideButtonDelete)
+                    @can($permissionDelete)
+                        @if ($checkButtonReconciled)
+                            @if (!$document->reconciled)
+                                {!! Form::deleteLink($document, $routeButtonDelete, $textDeleteModal, 'document_number') !!}
+                            @endif
+                        @else
                             {!! Form::deleteLink($document, $routeButtonDelete, $textDeleteModal, 'document_number') !!}
                         @endif
-                    @else
-                        {!! Form::deleteLink($document, $routeButtonDelete, $textDeleteModal, 'document_number') !!}
-                    @endif
-                @endcan
-            @endif
+                    @endcan
+                @endif
             @stack('delete_button_end')
             @stack('button_dropdown_end')
         </div>
diff --git a/resources/views/partials/portal/payment_method/hosted.blade.php b/resources/views/partials/portal/payment_method/hosted.blade.php
index 6095d1154..0d1b8641e 100644
--- a/resources/views/partials/portal/payment_method/hosted.blade.php
+++ b/resources/views/partials/portal/payment_method/hosted.blade.php
@@ -10,7 +10,7 @@
     text-year="{{ trans('general.year') }}"
     text-cvv="{{ trans('general.card.cvv') }}"
     textButton="{{ trans('general.confirm') }}"
-    textStoreCard="{{ trans('general.card.store') }} "
+    textStoreCard="{{ trans('general.card.save') }} "
     :store-card="{{ !empty($store_card) ? 'true' : 'false' }}"
     :cards="{{ !empty($cards) ? json_encode($cards) : json_encode([]) }}"
     :form-data="formData"