diff --git a/public/css/app.css b/public/css/app.css
index c2ca0f4cb..150baf2bf 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -48200,10 +48200,6 @@ body{
     grid-column: span 8 / span 8;
   }
 
-  .sm\:col-span-7{
-    grid-column: span 7 / span 7;
-  }
-
   .sm\:col-span-12{
     grid-column: span 12 / span 12;
   }
diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php
index 07453e509..af012dcea 100644
--- a/resources/views/components/documents/template/classic.blade.php
+++ b/resources/views/components/documents/template/classic.blade.php
@@ -239,43 +239,43 @@
                             <tr>
                                 @stack('name_th_start')
                                     @if (! $hideItems || (! $hideName && ! $hideDescription))
-                                        <th class="item text font-semibold text-alignment-left text-left">
+                                        <td class="item text font-semibold text-alignment-left text-left">
                                             {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
-                                        </th>
+                                        </td>
                                     @endif
                                 @stack('name_th_end')
 
                                 @stack('quantity_th_start')
                                     @if (! $hideQuantity)
-                                        <th class="quantity text font-semibold text-alignment-right text-right">
+                                        <td class="quantity text font-semibold text-alignment-right text-right">
                                             {{ trans($textQuantity) }}
-                                        </th>
+                                        </td>
                                     @endif
                                 @stack('quantity_th_end')
 
                                 @stack('price_th_start')
                                     @if (! $hidePrice)
-                                        <th class="price text font-semibold text-alignment-right text-right">
+                                        <td class="price text font-semibold text-alignment-right text-right">
                                             {{ trans($textPrice) }}
-                                        </th>
+                                        </td>
                                     @endif
                                 @stack('price_th_end')
 
                                 @if (! $hideDiscount)
                                     @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
                                         @stack('discount_td_start')
-                                            <th class="discount text font-semibold text-alignment-right text-right">
+                                            <td class="discount text font-semibold text-alignment-right text-right">
                                                 {{ trans('invoices.discount') }}
-                                            </th>
+                                            </td>
                                         @stack('discount_td_end')
                                     @endif
                                 @endif
 
                                 @stack('total_th_start')
                                     @if (! $hideAmount)
-                                        <th class="total text font-semibold text-alignment-right text-right">
+                                        <td class="total text font-semibold text-alignment-right text-right">
                                             {{ trans($textAmount) }}
-                                        </th>
+                                        </td>
                                     @endif
                                 @stack('total_th_end')
                             </tr>
diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php
index dd8b7cc8b..023e80b44 100644
--- a/resources/views/components/documents/template/default.blade.php
+++ b/resources/views/components/documents/template/default.blade.php
@@ -200,43 +200,53 @@
                             <tr>
                                 @stack('name_th_start')
                                     @if (! $hideItems || (! $hideName && ! $hideDescription))
-                                        <th class="item text font-semibold text-alignment-left text-left text-white border-radius-first">
-                                            {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
-                                        </th>
+                                        <td class="item text font-semibold text-alignment-left text-left text-white border-radius-first">
+                                            <span>
+                                                {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
+                                            </span>
+                                        </td>
                                     @endif
                                 @stack('name_th_end')
 
                                 @stack('quantity_th_start')
                                     @if (! $hideQuantity)
-                                        <th class="quantity text font-semibold text-alignment-right text-right text-white">
-                                            {{ trans($textQuantity) }}
-                                        </th>
+                                        <td class="quantity text font-semibold text-alignment-right text-right text-white">
+                                            <span>
+                                                {{ trans($textQuantity) }}
+                                            </span>
+                                        </td>
                                     @endif
                                 @stack('quantity_th_end')
 
                                 @stack('price_th_start')
                                     @if (! $hidePrice)
-                                        <th class="price text font-semibold text-alignment-right text-right text-white">
-                                            {{ trans($textPrice) }}
-                                        </th>
+                                        <td class="price text font-semibold text-alignment-right text-right text-white">
+                                            <span>
+                                                {{ trans($textPrice) }}
+                                            </span>
+                                        </td>
                                     @endif
                                 @stack('price_th_end')
 
                                 @if (! $hideDiscount)
                                     @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
                                         @stack('discount_td_start')
-                                            <th class="discount text font-semibold text-alignment-right text-right text-white">
-                                                {{ trans('invoices.discount') }}
-                                            </th>
+                                            <td class="discount text font-semibold text-alignment-right text-right text-white">
+                                                <span>
+                                                    {{ trans('invoices.discount') }}
+                                                </span>
+                                            </td>
                                         @stack('discount_td_end')
                                     @endif
                                 @endif
 
                                 @stack('total_th_start')
                                     @if (! $hideAmount)
-                                        <th class="total text font-semibold text-white text-alignment-right text-right border-radius-last">
-                                            {{ trans($textAmount) }}
-                                        </th>
+                                        <td class="total text font-semibold text-white text-alignment-right text-right border-radius-last">
+                                            <span>
+                                                {{ trans($textAmount) }}
+                                            </span>
+                                        </td>
                                     @endif
                                 @stack('total_th_end')
                             </tr>
@@ -337,9 +347,9 @@
             <div class="row mt-4">
                 <div class="col-100 text-left">
                     <div class="text">
-                        <strong>
+                        <span class="font-bold">
                             {!! nl2br($document->footer) !!}
-                        </strong>
+                        </span>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php
index 15f3498cb..ee83c890b 100644
--- a/resources/views/components/documents/template/modern.blade.php
+++ b/resources/views/components/documents/template/modern.blade.php
@@ -211,25 +211,25 @@
                             <tr>
                                 @stack('name_th_start')
                                     @if (! $hideItems || (! $hideName && ! $hideDescription))
-                                        <th class="item text font-semibold text-alignment-left text-left text-white border-radius-first">
+                                        <td class="item text font-semibold text-alignment-left text-left text-white border-radius-first">
                                             {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
-                                        </th>
+                                        </td>
                                     @endif
                                 @stack('name_th_end')
 
                                 @stack('quantity_th_start')
                                     @if (! $hideQuantity)
-                                        <th class="quantity text font-semibold text-white text-alignment-right text-right">
+                                        <td class="quantity text font-semibold text-white text-alignment-right text-right">
                                             {{ trans($textQuantity) }}
-                                        </th>
+                                        </td>
                                     @endif
                                 @stack('quantity_th_end')
 
                                 @stack('price_th_start')
                                     @if (! $hidePrice)
-                                        <th class="price text font-semibold text-white text-alignment-right text-right">
+                                        <td class="price text font-semibold text-white text-alignment-right text-right">
                                             {{ trans($textPrice) }}
-                                        </th>
+                                        </td>
                                     @endif
                                 @stack('price_th_end')
 
@@ -245,9 +245,9 @@
 
                                 @stack('total_th_start')
                                     @if (! $hideAmount)
-                                        <th class="total text font-semibold text-white text-alignment-right text-right border-radius-last">
+                                        <td class="total text font-semibold text-white text-alignment-right text-right border-radius-last">
                                             {{ trans($textAmount) }}
-                                        </th>
+                                        </td>
                                     @endif
                                 @stack('total_th_end')
                             </tr>
@@ -348,9 +348,9 @@
             <div class="row mt-7">
                 <div class="col-100 py-top p-modern" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
                     <div class="text pl-2">
-                        <strong class="text-white">
+                        <span class="text-white font-bold">
                             {!! nl2br($document->footer) !!}
-                        </strong>
+                        </span>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/components/layouts/print/head.blade.php b/resources/views/components/layouts/print/head.blade.php
index 2956c0565..41222b6c2 100644
--- a/resources/views/components/layouts/print/head.blade.php
+++ b/resources/views/components/layouts/print/head.blade.php
@@ -20,7 +20,7 @@
     <!-- Css -->
     <link rel="stylesheet" href="{{ asset('public/css/print.css') }}" type="text/css">
 
-    @if (isset($currency_style) && $currency_style && in_array(app()->getLocale(), ['zh-CN', 'ja-JP', 'zh-TW']))
+    @if (isset($currency_style) && $currency_style || in_array(app()->getLocale(), ['zh-CN', 'ja-JP', 'zh-TW']))
     <style type="text/css">
         @font-face {
             font-family: 'Firefly Sung';
diff --git a/resources/views/components/transactions/template/default.blade.php b/resources/views/components/transactions/template/default.blade.php
index ea3f0ed69..5fb7659fb 100644
--- a/resources/views/components/transactions/template/default.blade.php
+++ b/resources/views/components/transactions/template/default.blade.php
@@ -59,9 +59,9 @@
         <table>
             <tr>
                 <td style="width: 60%; padding: 15px 0 15px 0;">
-                    <h2 style="font-size: 12px; font-weight:600;">
+                    <div class="font-semibold" style="font-size: 12px;">
                         {{ $textContentTitle != trans_choice($textContentTitle, 1) ? trans_choice($textContentTitle, 1) : trans($textContentTitle) }}
-                    </h2>
+                    </div>
                 </td>
             </tr>
         </table>
@@ -71,7 +71,7 @@
         @stack('number_input_start')
         @if (! $hideNumber)
             <tr>
-                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                     {{ trans_choice($textNumber, 1) }}
                 </td>
 
@@ -85,7 +85,7 @@
         @stack('paid_at_input_start')
         @if (! $hidePaidAt)
             <tr>
-                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                     {{ trans($textPaidAt) }}
                 </td>
 
@@ -99,7 +99,7 @@
         @stack('account_id_input_start')
         @if (! $hideAccount)
             <tr>
-                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                     {{ trans_choice($textAccount, 1) }}
                 </td>
 
@@ -113,7 +113,7 @@
         @stack('category_id_input_start')
         @if (! $hideCategory)
             <tr>
-                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                     {{ trans_choice($textCategory, 1) }}
                 </td>
 
@@ -127,7 +127,7 @@
         @stack('payment_method_input_start')
         @if (! $hidePaymentMethods)
             <tr>
-                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                     {{ trans_choice($textPaymentMethods, 1) }}
                 </td>
 
@@ -141,7 +141,7 @@
         @stack('reference_input_start')
         @if (! $hideReference)
             <tr>
-                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                     {{ trans($textReference) }}
                 </td>
 
@@ -155,7 +155,7 @@
         @stack('description_input_start')
         @if (! $hideDescription)
             <tr>
-                <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                     {{ trans($textDescription) }}
                 </td>
 
@@ -172,9 +172,9 @@
     <table class="border-top-1" style="margin-top:15px;">
         <tr>
             <td style="width: 60%; padding: 15px 0 15px 0;">
-                <h2 style="font-size: 12px; font-weight:600;">
+                <div class="font-semibold" style="font-size: 12px;">
                     {{ trans($textPaidBy) }}
-                </h2>
+                </div>
             </td>
         </tr>
     </table>
@@ -183,8 +183,8 @@
         @if (! $hideContact)
             @if (! $hideContactInfo)
                 <tr>
-                    <td style="margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
-                        <strong>{{ trans($textContactInfo) }}</strong><br>
+                    <td class="font-semibold" style="margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
+                        {{ trans($textContactInfo) }}<br>
                     </td>
                 </tr>
             @endif
@@ -192,7 +192,7 @@
             @stack('name_input_start')
             @if (! $hideContactName)
                 <tr>
-                    <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                    <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                         {{ trans('general.name') }}
                     </td>
 
@@ -206,7 +206,7 @@
             @stack('address_input_start')
             @if (! $hideContactAddress)
                 <tr>
-                    <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                    <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                         {{ trans('general.address') }}
                     </td>
 
@@ -220,7 +220,7 @@
             @stack('tax_number_input_start')
             @if (! $hideContactTaxNumber)
                 <tr>
-                    <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                    <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                         {{ trans('general.tax_number') }}
                     </td>
 
@@ -236,7 +236,7 @@
             @stack('phone_input_start')
             @if (! $hideContactPhone)
                 <tr>
-                    <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                    <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                         {{ trans('general.phone') }}
                     </td>
 
@@ -252,7 +252,7 @@
             @stack('email_start')
             @if (! $hideContactEmail)
                 <tr>
-                    <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                    <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                         {{ trans('general.email') }}
                     </td>
 
@@ -274,9 +274,9 @@
             <table>
                 <tr>
                     <td style="padding:15px 0 0 0;">
-                        <h2 style="font-size: 12px; font-weight:600; margin-bottom: 15px;">
+                        <div class="font-semibold" style="font-size: 12px; margin-bottom: 15px;">
                             {{ trans($textRelatedTransansaction) }}
-                        </h2>
+                        </div>
                     </td>
                 </tr>
             </table>
@@ -284,7 +284,7 @@
             <table class="table" cellspacing="0" cellpadding="0" style="padding:15px 0 0 0;">
                 <thead style="color:#424242; font-size:12px;">
                     <tr class="border-bottom-1">
-                        <th class="item text-alignment-left text-left" style="padding:5px 0;">
+                        <td class="item text-alignment-left text-left font-semibold" style="padding:5px 0;">
                             @if (! $hideRelatedDocumentNumber)
                                 <span style="font-size: 13px;">
                                     {{ trans_choice($textRelatedDocumentNumber, 1) }}
@@ -293,19 +293,19 @@
                             @endif
 
                             @if (! $hideRelatedContact)
-                                <span style="font-weight:500;">
+                                <span>
                                     {{ trans_choice($textRelatedContact, 1) }}
                                 </span>
                             @endif
-                        </th>
+                        </td>
 
                         @if (! $hideRelatedDocumentDate)
-                            <th class="price" style="padding:5px 0; text-align:center;">
+                            <td class="price font-semibold" style="padding:5px 0; text-align:center;">
                                 {{ trans($textRelatedDocumentDate) }}
-                            </th>
+                            </td>
                         @endif
 
-                        <th class="price text-alignment-right text-right" style="padding: 5px 0;">
+                        <td class="price text-alignment-right text-right font-semibold" style="padding: 5px 0;">
                             @if (! $hideRelatedDocumentAmount)
                                 <span style="font-size: 13px;">
                                     {{ trans($textRelatedDocumentAmount) }}
@@ -314,11 +314,11 @@
                             @endif
 
                             @if (! $hideRelatedAmount)
-                                <span style="font-weight:500;">
+                                <span>
                                     {{ trans($textRelatedAmount) }}
                                 </span>
                             @endif
-                        </th>
+                        </td>
                     </tr>
                 </thead>
 
@@ -369,7 +369,7 @@
                     <table>
                         <tr>
                             <td valign="center" style="font-size: 14px; color: #ffffff; padding: 0;">
-                                <span class="ml-2" style="font-weight: 600;">{{ trans($textAmount) }}</span>
+                                <span class="ml-2 font-semibold">{{ trans($textAmount) }}</span>
                                 @money($transaction->amount, $transaction->currency_code, true)
                             </td>
                         </tr>
diff --git a/resources/views/components/transfers/template/default.blade.php b/resources/views/components/transfers/template/default.blade.php
index a52fa14d3..5ff3758db 100644
--- a/resources/views/components/transfers/template/default.blade.php
+++ b/resources/views/components/transfers/template/default.blade.php
@@ -5,14 +5,14 @@
             @stack('from_account_id_start')
             <tr>
                 <td style="width: 60%; padding: 0 0 15px 0;">
-                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                    <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
                         {{ trans('transfers.from_account') }}
-                    </h2>
+                    </div>
 
                     <table>
                         @stack('from_account_name_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('accounts.account_name') }}
                             </td>
 
@@ -26,7 +26,7 @@
                     <table>
                         @stack('from_account_number_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('accounts.number') }}
                             </td>
 
@@ -41,7 +41,7 @@
                     <table>
                         @stack('from_account_bank_name_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold"  style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('accounts.bank_name') }}
                             </td>
 
@@ -57,7 +57,7 @@
                     <table>
                         @stack('from_account_phone_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold"  style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('general.phone') }}
                             </td>
 
@@ -73,7 +73,7 @@
                     <table>
                         @stack('from_account_address_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold"  style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('general.address') }}
                             </td>
 
@@ -97,14 +97,14 @@
             @stack('to_account_id_start')
             <tr>
                 <td style="width: 60%; padding: 0 0 15px 0;">
-                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                    <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
                         {{ trans('transfers.to_account') }}
-                    </h2>
+                    </div>
 
                     <table>
                         @stack('to_account_name_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('accounts.account_name') }}
                             </td>
 
@@ -118,7 +118,7 @@
                     <table>
                         @stack('to_account_number_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('accounts.number') }}
                             </td>
 
@@ -133,7 +133,7 @@
                     <table>
                         @stack('to_account_bank_name_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('accounts.bank_name') }}
                             </td>
 
@@ -149,7 +149,7 @@
                     <table>
                         @stack('to_account_phone_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('general.phone') }}
                             </td>
 
@@ -165,7 +165,7 @@
                     <table>
                         @stack('to_account_address_input_start')
                         <tr>
-                            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+                            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                                 {{ trans('general.address') }}
                             </td>
 
@@ -187,9 +187,9 @@
     <table style="margin-top:15px;">
         <tr>
             <td style="padding:0 0 15px 0;">
-                <h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;">
+                <div class="text-left text-uppercase font-semibold" style="font-size: 14px;">
                     {{ trans_choice('transfers.details', 2) }}
-                </h2>
+                </div>
             </td>
         </tr>
     </table>
@@ -197,7 +197,7 @@
     <table class="border-bottom-1" style="padding-bottom:15px;">
         @stack('transferred_at_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                 {{ trans('general.date') }}
             </td>
 
@@ -209,7 +209,7 @@
 
         @stack('payment_method_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                 {{ trans_choice('general.payment_methods', 1) }}
             </td>
 
@@ -225,7 +225,7 @@
 
         @stack('reference_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                 {{ trans('general.reference') }}
             </td>
 
@@ -237,7 +237,7 @@
 
         @stack('description_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px; font-weight:600;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 4px 0 0; font-size: 12px;">
                 {{ trans('general.description') }}
             </td>
 
@@ -261,11 +261,11 @@
                 <table>
                     @stack('amount_input_start')
                     <tr>
-                        <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600; color:#ffffff;">
-                            {{ trans('general.amount') }}
-                        </td>
+                        <td valign="center" class="font-semibold" style="padding:0; font-size: 14px; color:#ffffff;">
+                            <span class="ml-2">
+                                {{ trans('general.amount') }}
+                            </span>
 
-                        <td valign="center" style="width: 20%; padding:0; font-size: 14px; color:#ffffff;">
                             <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
                         </td>
                     </tr>
diff --git a/resources/views/components/transfers/template/second.blade.php b/resources/views/components/transfers/template/second.blade.php
index fcc896a32..cd3379192 100644
--- a/resources/views/components/transfers/template/second.blade.php
+++ b/resources/views/components/transfers/template/second.blade.php
@@ -3,9 +3,9 @@
     <table style="width: 100%;">
         <tr>
             <td style="padding:0 0 15px 0;">
-                <h2 class="text-left" style="font-size: 14px; font-weight:600;">
+                <div class="text-left font-semibold" style="font-size: 14px;">
                     {{ trans_choice('transfers.details', 2) }}
-                </h2>
+                </div>
             </td>
         </tr>
     </table>
@@ -13,7 +13,7 @@
     <table>
         @stack('transferred_at_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
                 {{ trans('general.date') }}
             </td>
 
@@ -25,7 +25,7 @@
 
         @stack('payment_method_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
                 {{ trans_choice('general.payment_methods', 1) }}
             </td>
 
@@ -41,7 +41,7 @@
 
         @stack('reference_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
                 {{ trans('general.reference') }}
             </td>
 
@@ -53,7 +53,7 @@
 
         @stack('description_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; font-weight:600; border-bottom:1px solid #adadad;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 8px 0 8px 0; font-size: 12px; border-bottom:1px solid #adadad;">
                 {{ trans('general.description') }}
             </td>
 
@@ -71,14 +71,14 @@
             @stack('from_account_id_start')
             <tr>
                 <td class="border-bottom-1 border-top-1" style="width: 60%; padding: 15px 0 15px 0;">
-                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                    <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
                         {{ trans('transfers.from_account') }}
-                    </h2>
+                    </div>
 
                     <table>
                         @stack('from_account_name_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('accounts.account_name') }}
                             </td>
 
@@ -92,7 +92,7 @@
                     <table>
                         @stack('from_account_number_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('accounts.number') }}
                             </td>
 
@@ -107,7 +107,7 @@
                     <table>
                         @stack('from_account_bank_name_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('accounts.bank_name') }}
                             </td>
 
@@ -123,7 +123,7 @@
                     <table>
                         @stack('from_account_phone_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('general.phone') }}
                             </td>
 
@@ -139,7 +139,7 @@
                     <table>
                         @stack('from_account_address_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('general.address') }}
                             </td>
 
@@ -163,14 +163,14 @@
             @stack('to_account_id_start')
             <tr>
                 <td style="width: 60%; padding: 0 0 15px 0;">
-                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                    <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
                         {{ trans('transfers.to_account') }}
-                    </h2>
+                    </div>
 
                     <table>
                         @stack('to_account_name_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('accounts.number') }}
                             </td>
 
@@ -184,7 +184,7 @@
                     <table>
                         @stack('to_account_number_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('accounts.number') }}
                             </td>
 
@@ -199,7 +199,7 @@
                     <table>
                         @stack('to_account_bank_name_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('accounts.bank_name') }}
                             </td>
 
@@ -215,7 +215,7 @@
                     <table>
                         @stack('to_account_phone_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('general.phone') }}
                             </td>
 
@@ -231,7 +231,7 @@
                     <table>
                         @stack('to_account_address_input_start')
                         <tr>
-                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                 {{ trans('general.address') }}
                             </td>
 
@@ -257,11 +257,11 @@
                 <table>
                     @stack('amount_input_start')
                     <tr>
-                        <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
-                            {{ trans('general.amount') }}
-                        </td>
+                        <td valign="center" class="font-semibold" style="padding:0; font-size: 14px;">
+                            <span class="ml-2">
+                                {{ trans('general.amount') }}
+                            </span>
 
-                        <td valign="center" style="width: 20%; padding:0; font-size: 14px;">
                             <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
                         </td>
                     </tr>
diff --git a/resources/views/components/transfers/template/third.blade.php b/resources/views/components/transfers/template/third.blade.php
index 387dbae4f..e1034c8bd 100644
--- a/resources/views/components/transfers/template/third.blade.php
+++ b/resources/views/components/transfers/template/third.blade.php
@@ -9,14 +9,14 @@
                             @stack('from_account_id_start')
                             <tr>
                                 <td style="padding:0;">
-                                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                                    <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
                                         {{ trans('transfers.from_account') }}
-                                    </h2>
+                                    </div>
 
                                     <table>
                                         @stack('from_account_name_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('accounts.account_name') }}
                                             </td>
 
@@ -30,7 +30,7 @@
                                     <table>
                                         @stack('from_account_number_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('accounts.number') }}
                                             </td>
 
@@ -45,7 +45,7 @@
                                     <table>
                                         @stack('from_account_bank_name_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('accounts.bank_name') }}
                                             </td>
 
@@ -61,7 +61,7 @@
                                     <table>
                                         @stack('from_account_phone_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('general.phone') }}
                                             </td>
 
@@ -77,7 +77,7 @@
                                     <table>
                                         @stack('from_account_address_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('general.address') }}
                                             </td>
 
@@ -103,14 +103,14 @@
                             @stack('to_account_id_start')
                             <tr>
                                 <td style="padding:0;">
-                                    <h2 class="mb-1" style="font-size: 14px; font-weight:600; margin-bottom: 15px;">
+                                    <div class="mb-1 font-semibold" style="font-size: 14px; margin-bottom: 15px;">
                                         {{ trans('transfers.to_account') }}
-                                    </h2>
+                                    </div>
 
                                     <table>
                                         @stack('to_account_name_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('accounts.account_name') }}
                                             </td>
 
@@ -124,7 +124,7 @@
                                     <table>
                                         @stack('to_account_number_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('accounts.number') }}
                                             </td>
 
@@ -139,7 +139,7 @@
                                     <table>
                                         @stack('to_account_bank_name_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('accounts.bank_name') }}
                                             </td>
 
@@ -155,7 +155,7 @@
                                     <table>
                                         @stack('to_account_phone_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('general.phone') }}
                                             </td>
 
@@ -171,7 +171,7 @@
                                     <table>
                                         @stack('to_account_address_input_start')
                                         <tr>
-                                            <td style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px; font-weight:600;">
+                                            <td class="font-semibold" style="width:30%; margin: 0px; padding: 0 0 8px 0; font-size: 12px;">
                                                 {{ trans('general.address') }}
                                             </td>
 
@@ -197,9 +197,9 @@
     <table style="width: 100%; margin-top:15px;">
         <tr>
             <td style="padding:0 0 15px 0;">
-                <h2 class="text-left text-uppercase" style="font-size: 14px; font-weight:600;">
+                <div class="text-left text-uppercase font-semibold" style="font-size: 14px;">
                     {{ trans_choice('transfers.details', 2) }}
-                </h2>
+                </div>
             </td>
         </tr>
     </table>
@@ -207,7 +207,7 @@
     <table>
         @stack('transferred_at_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; line-height: 24px;">
                 {{ trans('general.date') }}
             </td>
 
@@ -219,7 +219,7 @@
 
         @stack('payment_method_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; line-height: 24px;">
                 {{ trans_choice('general.payment_methods', 1) }}
             </td>
 
@@ -235,7 +235,7 @@
 
         @stack('reference_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; line-height: 24px;">
                 {{ trans('general.reference') }}
             </td>
 
@@ -247,7 +247,7 @@
 
         @stack('description_input_start')
         <tr>
-            <td valign="top" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; font-weight:600; line-height: 24px;">
+            <td valign="top" class="font-semibold" style="width: 30%; margin: 0px; padding: 0; font-size: 12px; line-height: 24px;">
                 {{ trans('general.description') }}
             </td>
 
@@ -271,11 +271,11 @@
                 <table>
                     @stack('amount_input_start')
                     <tr>
-                        <td valign="center" style="width: 80%; padding:0; font-size: 14px; font-weight:600;">
-                            {{ trans('general.amount') }}
-                        </td>
+                        <td valign="center" class="font-semibold" style="width: 80%; padding:0; font-size: 14px;">
+                            <span class="ml-2">
+                                {{ trans('general.amount') }}
+                            </span>
 
-                        <td valign="center" style="width: 20%; padding:0; font-size: 14px;">
                             <x-money :amount="$transfer->expense_transaction->amount" :currency="$transfer->expense_transaction->currency_code" convert />
                         </td>
                     </tr>