diff --git a/public/css/custom.css b/public/css/custom.css
index 2e52c47f5..e553429f1 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -680,34 +680,6 @@ table .align-items-center td span.badge {
 {
     width: 147px;
 }
-
-/*--------Border Dashed--------*/
-.border-dashed
-{
-    border-top: 1px dashed #3c3f72 !important;
-}
-/*--------Border Dashed Finish--------*/
-
-.invoice-classic-line
-{
-    border: 2px solid #3c3f72;
-    border-radius: 5px;
-}
-
-.invoice-classic-frame
-{
-    width: 100%;
-    height:100px;
-    border: 3px solid #3c3f72;
-}
-
-.invoice-classic-inline-frame
-{
-    margin: 7px 1%;
-    width: 98%;
-    height: 80px;
-    border: 3px solid #3c3f72;
-}
 /*--------Print Template Finish--------*/
 
 
diff --git a/public/css/print.css b/public/css/print.css
new file mode 100644
index 000000000..0a61e1e8d
--- /dev/null
+++ b/public/css/print.css
@@ -0,0 +1,340 @@
+@charset "UTF-8";
+
+/*!
+
+=========================================================
+* Print Template - Default ------------ Start
+=========================================================
+
+*/
+
+body {
+    margin: 0;
+    padding: 0;
+    font-family: Arial, sans-serif;
+    color: #3c3f72;
+}
+
+table {
+    width: 100%;
+}
+
+th, td {
+    padding: 18px;
+}
+
+.row {
+    font-size: 0;
+}
+
+.mb-1 {
+    margin-bottom: 8px;
+}
+
+.mt-1 {
+    margin-top: 8px;
+}
+
+.ml-1 {
+    margin-left: 8px;
+}
+
+.mt-2 {
+    margin-top: 16px;
+}
+
+.mt-3 {
+    margin-top: 24px;
+}
+
+.mt-4 {
+    margin-top: 32px;
+}
+
+.mt-5 {
+    margin-top: 40px;
+}
+
+.mt-6 {
+    margin-top: 48px;
+}
+
+.mt-7 {
+    margin-top: 56px;
+}
+
+.mt-8 {
+    margin-top: 64px;
+}
+
+.mt-9 {
+    margin-top: 72px;
+}
+
+.pb-0 {
+    padding-bottom: 0;
+}
+
+.pb-1 {
+    padding-bottom: 8px;
+}
+
+.py-1 {
+  padding-bottom: 8px;
+  padding-top: 8px;
+}
+
+.py-2 {
+    padding-bottom: 16px;
+    padding-top: 16px;
+  }
+
+.pr-2 {
+    padding-right: 16px;
+} 
+
+.pl-2 {
+    padding-left: 16px;
+}
+
+.col-58 {
+    display: inline-block;
+    width: 58%;
+    vertical-align: top;
+}
+
+.col-42 {
+    display: inline-block;
+    width: 42%;
+    vertical-align: top;
+}
+
+.col-100 {
+    display: inline-block;
+    width: 100%;
+    vertical-align: top;
+}
+
+.border-1 {
+    border: 1px solid #e5e5e5;
+}
+
+.border-top-1 {
+     border-top: 1px solid #e5e5e5;
+}
+
+.border-bottom-1 {
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.border-radius-default {
+    border-radius: 0.25rem
+}
+
+.text {
+    color: #3c3f72;
+    font-size: 16px;
+}
+
+.text-right {
+    text-align: right;
+}
+
+.text-center {
+    text-align: center;
+}
+
+.text-white {
+    color: #ffffff;
+}
+
+.bg-default {
+    background-color: #3c3f72;
+}
+
+.bg-primary {
+    background-color: #55588b;
+}
+
+.lines {
+    border-collapse: collapse;
+    table-layout: fixed;
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.lines tbody td {
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.lines .item {
+    width: 40%;
+}
+
+.lines .quantity {
+    width: 20%;
+    text-align: center;
+}
+
+.lines .price {
+    width: 20%;
+    text-align: right;
+}
+
+.lines .total {
+    width: 20%;
+    text-align: right;
+}
+
+.d-logo {
+    padding-top: 35px;
+    padding-bottom:64.5px;
+}
+
+.d-note {
+    width: 80%;
+    background-color: #e5e5e5; 
+}
+
+/*!
+
+=========================================================
+* Print Template - Default ------------ Finish
+=========================================================
+
+=========================================================
+* Print Template - Classic ------------ Start
+=========================================================
+
+*/
+
+.c-logo {
+    padding-top: 50px;
+}
+
+.c-note {
+    width: 80%;
+}
+
+.invoice-classic-line
+{
+    border: 2px solid #3c3f72;
+}
+
+.invoice-classic-frame
+{
+    width: 90%;
+    height:70px;
+    border: 3px solid #3c3f72;
+}
+
+.invoice-classic-inline-frame
+{
+    margin: 0.3% 1% 0.3% 1%;
+    width: 95%;
+    height: 59px;
+    border: 3px solid #3c3f72;
+}
+
+.col-33 {
+    display: inline-block;
+    width: 33%;
+    vertical-align: top;
+}
+
+.c-lines thead th {
+    border-top: 1px dashed #e5e5e5;
+}
+
+.c-lines tbody td {
+    border-top: 1px dashed #e5e5e5;
+}
+
+.c-lines .item {
+    width: 40%;
+}
+
+.c-lines .quantity {
+    width: 20%;
+    text-align: center;
+}
+
+.c-lines .price {
+    width: 20%;
+    text-align: right;
+}
+
+.c-lines .total {
+    width: 20%;
+    text-align: right;
+}
+
+.border-top-dashed {
+    border-top: 1px dashed #e5e5e5;
+}
+
+/*!
+
+=========================================================
+* Print Template - Classic ------------ Finish
+=========================================================
+
+=========================================================
+* Print Template - Modern ------------ Start
+=========================================================
+
+*/
+
+.m-first-column {
+    padding-top: 35px; 
+    padding-bottom:48px;
+}
+
+.m-logo {
+    padding-top: 10px; 
+    padding-bottom: -36px;
+}
+
+.m-fc-left {
+    padding-right: 30px;
+}
+
+.m-fc-right {
+    padding-left: 170px;
+     margin-top: -40px;
+}
+
+.m-note {
+    width: 80%;
+}
+
+.m-lines {
+    border-collapse: collapse;
+    table-layout: fixed;
+}
+
+.m-lines .item {
+    width: 40%;
+}
+
+.m-lines .quantity {
+    width: 20%;
+    text-align: center;
+}
+
+.m-lines .price {
+    width: 20%;
+    text-align: right;
+}
+
+.m-lines .total {
+    width: 20%;
+    text-align: right;
+}
+
+/*!
+
+=========================================================
+* Print Template - Modern ------------ Finish
+=========================================================
+
+*/
\ No newline at end of file
diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php
index 7d4b2e7cb..2352cd606 100644
--- a/resources/views/layouts/print.blade.php
+++ b/resources/views/layouts/print.blade.php
@@ -1,12 +1,6 @@
 <html lang="{{ app()->getLocale() }}">
 
-    @include('partials.admin.head')
-
-    <style type="text/css">
-        * {
-            font-family: DejaVu Sans, sans-serif !important;
-        }
-    </style>
+    @include('partials.print.head')
 
     <body onload="window.print();">
         @stack('body_start')
diff --git a/resources/views/partials/print/head.blade.php b/resources/views/partials/print/head.blade.php
new file mode 100644
index 000000000..a3d2460b9
--- /dev/null
+++ b/resources/views/partials/print/head.blade.php
@@ -0,0 +1,33 @@
+<head>
+    @stack('head_start')
+
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8; charset=ISO-8859-1"/>
+
+    <title>@yield('title') - @setting('company.name')</title>
+
+    <!-- Favicon -->
+    <link rel="icon" href="{{ asset('public/img/favicon.ico') }}" type="image/png">
+
+    <!-- Css -->
+    <link rel="stylesheet" href="{{ asset('public/css/print.css?v=' . version('short')) }}" type="text/css">
+
+    <style type="text/css">
+        * {
+            font-family: DejaVu Sans, sans-serif !important;
+        }
+    </style>
+
+
+    @stack('css')
+
+    @stack('stylesheet')
+
+    @stack('js')
+
+    @stack('scripts')
+
+    @stack('head_end')
+</head>
diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php
index 9702ba666..9df21e6b0 100644
--- a/resources/views/sales/invoices/print_classic.blade.php
+++ b/resources/views/sales/invoices/print_classic.blade.php
@@ -4,157 +4,159 @@
 
 @section('content')
     <div class="row">
-        <div class="col-md-7">
-            <img class="mt-4" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
+        <div class="col-58">
+            <div class="text company">
+                <img src="{{ $logo }}" class="c-logo" alt="{{ setting('company.name') }}"/>
+            </div>
         </div>
-        <div class="col-md-5 text-right">
-            <p class="mb-0 mt-4 font-weight-600">
-                {{ setting('company.name') }}
-            </p>
 
-            <p class="mb-0">
-                {!! nl2br(setting('company.address')) !!}
-            </p>
+        <div class="col-42">
+            <div class="text company">
+                <strong>{{ setting('company.name') }}</strong><br>
 
-            <p class="mb-0">
-                @if (setting('company.tax_number'))
-                    {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
-                @endif
-            </p>
+                <p>{!! nl2br(setting('company.address')) !!}</p>
 
-            <p class="mb-0 mt-3">
-                @if (setting('company.phone'))
-                    {{ setting('company.phone') }}
-                @endif
-            </p>
+                <p>
+                    @if (setting('company.tax_number'))
+                        {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
+                    @endif
+                </p>
 
-            <p class="mb-0">
-                {{ setting('company.email') }}
-            </p>
+                <p>
+                    @if (setting('company.phone'))
+                        {{ setting('company.phone') }}
+                    @endif
+                </p>
+
+                <p>{{ setting('company.email') }}</p>
+            </div>
         </div>
     </div>
 
-    <div class="row my-4">
-        <div class="col-md-4">
-            <hr class="bg-default invoice-classic-line mb-1 mt-5">
-            <hr class="bg-default invoice-classic-line my-0">
+    <div class="row mt-2">
+        <div class="col-33">
+            <hr class="bg-default invoice-classic-line mb-1 mt-4">
+            <hr class="bg-default invoice-classic-line">
         </div>
-        <div class="col-md-4 text-center">
-            <div class="invoice-classic-frame">
-                <div class="invoice-classic-inline-frame">
+
+        <div class="col-33">
+            <div class="invoice-classic-frame ml-1">
+                <div class="invoice-classic-inline-frame text-center">
                     @stack('invoice_number_input_start')
-                        <p class="mt-4">
-                            <b>{{ trans('invoices.invoice_number') }}:</b>
+                        <div class="text company">
+                            <strong>{{ trans('invoices.invoice_number') }}:</strong><br>
                             {{ $invoice->invoice_number }}
-                        </p>
+                        </div>
                     @stack('invoice_number_input_end')
                 </div>
             </div>
         </div>
-        <div class="col-md-4">
-            <hr class="bg-default invoice-classic-line mb-1 mt-5">
-            <hr class="bg-default invoice-classic-line my-0">
+
+        <div class="col-33">
+            <hr class="bg-default invoice-classic-line mb-1 mt-4">
+            <hr class="bg-default invoice-classic-line">
         </div>
     </div>
 
-    <div class="row mb-4">
-        <div class="col-md-7">
+    <div class="row">
+        <div class="col-58">
+            <div class="text company">
+                <strong>{{ trans('invoices.bill_to') }}</strong><br>
+                @stack('name_input_start')
+                    <strong>{{ $invoice->contact_name }}</strong><br>
+                @stack('name_input_end')
 
-            <h4>{{ trans('invoices.bill_to') }}</h4>
-            @stack('name_input_start')
-                <strong class="d-block">{{ $invoice->contact_name }}</strong>
-            @stack('name_input_end')
+                @stack('address_input_start')
+                    <p>{!! nl2br($invoice->contact_address) !!}</p>
+                @stack('address_input_end')
 
-            @stack('address_input_start')
-                <p class="mb-0">
-                    {!! nl2br($invoice->contact_address) !!}
-                </p>
-            @stack('address_input_end')
-
-            @stack('tax_number_input_start')
-                <p class="mb-0">
-                    @if ($invoice->contact_tax_number)
-                        {{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }}<br>
-                    @endif
-                </p>
-            @stack('tax_number_input_end')
-
-            @stack('phone_input_start')
-                <p class="mb-0 mt-3">
-                    @if ($invoice->contact_phone)
-                        {{ $invoice->contact_phone }}
-                    @endif
-                </p>
-            @stack('phone_input_end')
-
-            @stack('email_start')
-                <p class="mb-0">
-                    {{ $invoice->contact_email }}
-                </p>
-            @stack('email_input_end')
-
-        </div>
-        <div class="col-md-5 text-right">
-            @stack('order_number_input_start')
-                @if ($invoice->order_number)
+                @stack('tax_number_input_start')
                     <p>
-                        <b>{{ trans('invoices.order_number') }}:</b>
-                        {{ $invoice->order_number }}
+                        @if ($invoice->contact_tax_number)
+                            {{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }}
+                        @endif
                     </p>
-                @endif
-            @stack('order_number_input_end')
+                @stack('tax_number_input_end')
 
-            @stack('invoiced_at_input_start')
-                <p>
-                    <b>{{ trans('invoices.invoice_date') }}:</b>
-                    @date($invoice->invoiced_at)
-                </p>
-            @stack('invoiced_at_input_end')
-
-            @stack('due_at_input_start')
-                <p>
-                    <b>{{ trans('invoices.payment_due') }}:</b>
-                    @date($invoice->due_at)
-                </p>
-            @stack('due_at_input_end')
-
-            @foreach ($invoice->totals as $total)
-                @if ($total->code == 'total')
-                    <p class="bg-light border-radius-default float-right text-center w-50">
-                        <b>{{ trans($total->name) }}:</b>
-                        @money($total->amount - $invoice->paid, $invoice->currency_code, true)
+                @stack('phone_input_start')
+                    <p>
+                        @if ($invoice->contact_phone)
+                            {{ $invoice->contact_phone }}
+                        @endif
                     </p>
-                @endif
-            @endforeach
+                @stack('phone_input_end')
+
+                @stack('email_start')
+                    <p>{{ $invoice->contact_email }}</p>
+                @stack('email_input_end')
+            </div>
+        </div>
+
+        <div class="col-42 text-right">
+            <div class="text company">
+                @stack('order_number_input_start')
+                    @if ($invoice->order_number)
+                        <p>
+                            <b>{{ trans('invoices.order_number') }}:</b>
+                            {{ $invoice->order_number }}
+                        </p>
+                    @endif
+                @stack('order_number_input_end')
+
+                @stack('invoiced_at_input_start')
+                    <p>
+                        <b>{{ trans('invoices.invoice_date') }}:</b>
+                        @date($invoice->invoiced_at)
+                    </p>
+                @stack('invoiced_at_input_end')
+
+                @stack('due_at_input_start')
+                    <p>
+                        <b>{{ trans('invoices.payment_due') }}:</b>
+                        @date($invoice->due_at)
+                    </p>
+                @stack('due_at_input_end')
+
+                @foreach ($invoice->totals as $total)
+                    @if ($total->code == 'total')
+                        <p>
+                            <b>{{ trans($total->name) }}:</b>
+                            @money($total->amount - $invoice->paid, $invoice->currency_code, true)
+                        </p>
+                    @endif
+                @endforeach
+            </div>
         </div>
     </div>
 
-    <div class="row show-table">
-        <div class="col-md-12">
-            <div class="table-responsive">
-                <table class="table table-borderless">
-                    <tbody>
-                        <tr class="row border-dashed">
+    <div class="row">
+        <div class="col-100">
+            <div class="text">
+                <table class="c-lines">
+                    <thead>
+                        <tr>
                             @stack('name_th_start')
-                                <th class="col-xs-4 col-sm-3 pl-5">{{ trans_choice($text_override['items'], 2) }}</th>
+                                <th class="item">{{ trans_choice($text_override['items'], 2) }}</th>
                             @stack('name_th_end')
 
                             @stack('quantity_th_start')
-                                <th class="col-xs-4 col-sm-3 text-center">{{ trans($text_override['quantity']) }}</th>
+                                <th class="quantity">{{ trans($text_override['quantity']) }}</th>
                             @stack('quantity_th_end')
 
                             @stack('price_th_start')
-                                <th class="col-sm-3 text-center d-none d-sm-block pl-5">{{ trans($text_override['price']) }}</th>
+                                <th class="price">{{ trans($text_override['price']) }}</th>
                             @stack('price_th_end')
 
                             @stack('total_th_start')
-                                <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th>
+                                <th class="total">{{ trans('invoices.total') }}</th>
                             @stack('total_th_end')
                         </tr>
+                    </thead>
+                    <tbody>
                         @foreach($invoice->items as $item)
-                            <tr class="row border-dashed">
+                            <tr>
                                 @stack('name_td_start')
-                                    <td class="col-xs-4 col-sm-3 pl-5">
+                                    <td class="item">
                                         {{ $item->name }}
                                         @if ($item->desc)
                                             <br><small>{!! $item->desc !!}</small>
@@ -163,15 +165,15 @@
                                 @stack('name_td_end')
 
                                 @stack('quantity_td_start')
-                                    <td class="col-xs-4 col-sm-3 text-center">{{ $item->quantity }}</td>
+                                    <td class="quantity">{{ $item->quantity }}</td>
                                 @stack('quantity_td_end')
 
                                 @stack('price_td_start')
-                                    <td class="col-sm-3 text-center d-none d-sm-block pl-5">@money($item->price, $invoice->currency_code, true)</td>
+                                    <td class="price">@money($item->price, $invoice->currency_code, true)</td>
                                 @stack('price_td_end')
 
                                 @stack('total_td_start')
-                                    <td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $invoice->currency_code, true)</td>
+                                    <td class="total">@money($item->total, $invoice->currency_code, true)</td>
                                 @stack('total_td_end')
                             </tr>
                         @endforeach
@@ -181,83 +183,57 @@
         </div>
     </div>
 
-    <div class="row mt-3">
-        <div class="col-md-7">
-            <div class="table-responsive">
+    <div class="row mt-4">
+        <div class="col-58">
+            <div class="text company">
                 @stack('notes_input_start')
                     @if ($invoice->notes)
-                        <table class="table table-borderless">
-                            <tbody>
-                                <tr>
-                                    <th>
-                                        <p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p>
-                                        <p class="form-control text-muted">{{ $invoice->notes }}</p>
-                                    </th>
-                                </tr>
-                            </tbody>
-                        </table>
+                        <strong>{{ trans_choice('general.notes', 2) }}</strong><br><br>
+                        <div class="border-1 py-1 border-radius-default pl-2 c-note">
+                            {{ $invoice->notes }}
+                        </div>
                     @endif
                 @stack('notes_input_end')
             </div>
         </div>
-        <div class="col-md-5">
-            <div class="table-responsive">
-                <table class="table table-borderless border-dashed">
-                    <tbody>
-                         @foreach ($invoice->totals as $total)
-                             @if ($total->code != 'total')
-                                 @stack($total->code . '_td_start')
-                                     <tr class="border-dashed">
-                                        <th>
-                                            {{ trans($total->title) }}:
-                                        </th>
-                                        <td class="text-right">
-                                            @money($total->amount, $invoice->currency_code, true)
-                                        </td>
-                                    </tr>
-                                 @stack($total->code . '_td_end')
-                             @else
-                                 @if ($invoice->paid)
-                                     <tr class="border-dashed">
-                                        <th>
-                                            {{ trans('invoices.paid') }}:
-                                        </th>
-                                        <td class="text-right">
-                                            - @money($invoice->paid, $invoice->currency_code, true)
-                                        </td>
-                                    </tr>
-                                 @endif
-                                 @stack('grand_total_td_start')
-                                     <tr class="border-dashed">
-                                        <th>
-                                            {{ trans($total->name) }}:
-                                        </th>
-                                        <td class="text-right">
-                                            @money($total->amount - $invoice->paid, $invoice->currency_code, true)
-                                        </td>
-                                    </tr>
-                                 @stack('grand_total_td_end')
-                             @endif
-                        @endforeach
-                    </tbody>
-               </table>
+
+        <div class="col-42 text-right">
+            <div class="text company pr-2">
+                @foreach ($invoice->totals as $total)
+                    @if ($total->code != 'total')
+                        @stack($total->code . '_td_start')
+                            <div class="border-top-dashed">
+                                <br>
+                                <strong>{{ trans($total->title) }}:</strong>
+                                <strong>@money($total->amount, $invoice->currency_code, true)</strong><br><br>
+                            </div>
+                        @stack($total->code . '_td_end')
+                    @else
+                        @if ($invoice->paid)
+                            <div class="border-top-dashed">
+                                <br>
+                                <strong>{{ trans('invoices.paid') }}:</strong>
+                                <strong>- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br>
+                            </div>
+                        @endif
+                        @stack('grand_total_td_start')
+                            <div class="border-top-dashed">
+                                <br>
+                                <strong>{{ trans($total->name) }}:</strong>
+                                <strong>@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong>
+                            </div>
+                        @stack('grand_total_td_end')
+                    @endif
+                @endforeach
             </div>
         </div>
     </div>
 
     @if ($invoice->footer)
-        <div class="row">
-            <div class="col-md-12">
-                <div class="table-responsive">
-                    <table class="table table-borderless mb-0">
-                        <tbody>
-                            <tr>
-                                <th>
-                                    {!! $invoice->footer !!}
-                                </th>
-                            </tr>
-                        </tbody>
-                    </table>
+        <div class="row mt-1">
+            <div class="col-100">
+                <div class="text company">
+                    <strong>{!! $invoice->footer !!}</strong>
                 </div>
             </div>
         </div>
diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php
index ff60cf586..90a83db89 100644
--- a/resources/views/sales/invoices/print_default.blade.php
+++ b/resources/views/sales/invoices/print_default.blade.php
@@ -3,173 +3,141 @@
 @section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
 
 @section('content')
-    <div class="row mx--4">
-        <div class="col-md-7 border-bottom-1">
-            <div class="table-responsive mt-4">
-                <table class="table table-borderless">
-                    <tbody>
-                        <tr>
-                            <th>
-                                <img src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
-                            </th>
-                        </tr>
-                    </tbody>
-                </table>
+    <div class="row">
+            <div class="col-58">
+                <div class="border-bottom-1">
+                    <div class="text company">
+                        <img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
+                    </div>
+                </div>
             </div>
-        </div>
-        <div class="col-md-5 border-bottom-1">
-            <div class="table-responsive">
-                <table class="table table-borderless">
-                    <tbody>
-                        <tr>
-                            <th>
-                                {{ setting('company.name') }}
-                            </th>
-                        </tr>
-                        <tr>
-                            <th>
-                                {!! nl2br(setting('company.address')) !!}
-                            </th>
-                        </tr>
-                        <tr>
-                            <th>
-                                @if (setting('company.tax_number'))
-                                    {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
-                                @endif
-                            </th>
-                        </tr>
-                        <tr>
-                            <th>
-                                @if (setting('company.phone'))
-                                    {{ setting('company.phone') }}
-                                @endif
-                            </th>
-                        </tr>
-                        <tr>
-                            <th>
-                                {{ setting('company.email') }}
-                            </th>
-                        </tr>
-                    </tbody>
-                </table>
+
+            <div class="col-42">
+                <div class="border-bottom-1">
+                    <div class="text company">
+                        <strong>{{ setting('company.name') }}</strong><br>
+                        <p>{!! nl2br(setting('company.address')) !!}</p>
+
+                        <p>
+                            @if (setting('company.tax_number'))
+                                {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
+                            @endif
+                        </p>
+
+                        <p>
+                            @if (setting('company.phone'))
+                                {{ setting('company.phone') }}
+                            @endif
+                        </p>
+
+                        <p>{{ setting('company.email') }}</p>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
 
     <div class="row">
-        <div class="col-md-7">
-            <div class="table-responsive">
-                <table class="table table-borderless">
-                    <tbody>
-                        <tr>
-                            <th>
-                                {{ trans('invoices.bill_to') }}
-                                @stack('name_input_start')
-                                    <strong class="d-block">{{ $invoice->contact_name }}</strong>
-                                @stack('name_input_end')
-                            </th>
-                        </tr>
-                        <tr>
-                            <th>
-                                @stack('address_input_start')
-                                    {!! nl2br($invoice->contact_address) !!}
-                                @stack('address_input_end')
-                            </th>
-                        </tr>
-                        <tr>
-                            <th>
-                                @stack('tax_number_input_start')
-                                    @if ($invoice->contact_tax_number)
-                                        {{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }}<br>
-                                    @endif
-                                @stack('tax_number_input_end')
-                            </th>
-                        </tr>
-                        <tr>
-                            <th>
-                                @stack('phone_input_start')
-                                    @if ($invoice->contact_phone)
-                                        {{ $invoice->contact_phone }}
-                                    @endif
-                                @stack('phone_input_end')
-                            </th>
-                        </tr>
-                        <tr>
-                            <th>
-                                @stack('email_start')
-                                    {{ $invoice->contact_email }}
-                                @stack('email_input_end')
-                            </th>
-                        </tr>
-                    </tbody>
-                </table>
+        <div class="col-58">
+            <div class="text company">
+                <br>
+                <strong>{{ trans('invoices.bill_to') }}</strong><br>
+                @stack('name_input_start')
+                    <strong>{{ $invoice->contact_name }}</strong><br>
+                @stack('name_input_end')
+
+                @stack('address_input_start')
+                    <p>{!! nl2br($invoice->contact_address) !!}</p>
+                @stack('address_input_end')
+
+                @stack('tax_number_input_start')
+                    <p>
+                        @if ($invoice->contact_tax_number)
+                            {{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }}
+                        @endif
+                    </p>
+                @stack('tax_number_input_end')
+
+                @stack('phone_input_start')
+                    <p>
+                        @if ($invoice->contact_phone)
+                            {{ $invoice->contact_phone }}
+                        @endif
+                    </p>
+                @stack('phone_input_end')
+
+                @stack('email_start')
+                    <p>
+                        {{ $invoice->contact_email }}
+                    </p>
+                @stack('email_input_end')
             </div>
         </div>
-        <div class="col-md-5">
-            <div class="table-responsive">
-                <table class="table table-borderless">
-                    <tbody>
-                        @stack('invoice_number_input_start')
-                            <tr>
-                                <th>{{ trans('invoices.invoice_number') }}:</th>
-                                <td class="text-right">{{ $invoice->invoice_number }}</td>
-                            </tr>
-                        @stack('invoice_number_input_end')
 
-                        @stack('order_number_input_start')
-                            @if ($invoice->order_number)
-                                <tr>
-                                    <th>{{ trans('invoices.order_number') }}:</th>
-                                    <td class="text-right">{{ $invoice->order_number }}</td>
-                                </tr>
-                            @endif
-                        @stack('order_number_input_end')
+        <div class="col-42">
+            <div class="text company">
+                <br>
+                @stack('invoice_number_input_start')
+                    <strong>
+                        {{ trans('invoices.invoice_number') }}:
+                    </strong>
+                    {{ $invoice->invoice_number }}<br><br>
+                @stack('invoice_number_input_end')
 
-                        @stack('invoiced_at_input_start')
-                            <tr>
-                                <th>{{ trans('invoices.invoice_date') }}:</th>
-                                <td class="text-right">@date($invoice->invoiced_at)</td>
-                            </tr>
-                        @stack('invoiced_at_input_end')
+                @stack('order_number_input_start')
+                    @if ($invoice->order_number)
+                        <strong>
+                            {{ trans('invoices.order_number') }}:
+                        </strong>
+                        {{ $invoice->order_number }}<br><br>
+                    @endif
+                @stack('order_number_input_end')
 
-                        @stack('due_at_input_start')
-                            <tr>
-                                <th>{{ trans('invoices.payment_due') }}:</th>
-                                <td class="text-right">@date($invoice->due_at)</td>
-                            </tr>
-                        @stack('due_at_input_end')
-                    </tbody>
-                </table>
+                @stack('invoiced_at_input_start')
+                    <strong>
+                        {{ trans('invoices.invoice_date') }}:
+                    </strong>
+                    @date($invoice->invoiced_at)<br><br>
+                @stack('invoiced_at_input_end')
+
+                @stack('due_at_input_start')
+                    <strong>
+                        {{ trans('invoices.payment_due') }}:
+                    </strong>
+                    @date($invoice->due_at)<br><br>
+                @stack('due_at_input_end')
             </div>
         </div>
     </div>
 
-    <div class="row show-table">
-        <div class="col-md-12">
-            <div class="table-responsive">
-                <table class="table">
-                    <tbody>
-                        <tr class="row bg-default text-white">
+    <div class="row">
+        <div class="col-100">
+            <div class="text">
+                <table class="lines">
+                    <thead class="bg-default">
+                        <tr>
                             @stack('name_th_start')
-                                <th class="col-xs-4 col-sm-3 pl-5 text-white">{{ trans_choice($text_override['items'], 2) }}</th>
+                                <th class="item text-white">{{ trans_choice($text_override['items'], 2) }}</th>
                             @stack('name_th_end')
 
                             @stack('quantity_th_start')
-                                <th class="col-xs-4 col-sm-3 text-center text-white">{{ trans($text_override['quantity']) }}</th>
+                                <th class="quantity text-white">{{ trans($text_override['quantity']) }}</th>
                             @stack('quantity_th_end')
 
                             @stack('price_th_start')
-                                <th class="col-sm-3 text-center d-none d-sm-block pl-5 text-white">{{ trans($text_override['price']) }}</th>
+                                <th class="price text-white">{{ trans($text_override['price']) }}</th>
                             @stack('price_th_end')
 
                             @stack('total_th_start')
-                                <th class="col-xs-4 col-sm-3 text-right pr-5 text-white">{{ trans('invoices.total') }}</th>
+                                <th class="total text-white">{{ trans('invoices.total') }}</th>
                             @stack('total_th_end')
                         </tr>
+                    </thead>
+                    <tbody>
                         @foreach($invoice->items as $item)
-                            <tr class="row">
+                            <tr>
                                 @stack('name_td_start')
-                                    <td class="col-xs-4 col-sm-3 pl-5">
+                                    <td class="item">
                                         {{ $item->name }}
                                         @if ($item->desc)
                                             <br><small>{!! $item->desc !!}</small>
@@ -178,15 +146,15 @@
                                 @stack('name_td_end')
 
                                 @stack('quantity_td_start')
-                                    <td class="col-xs-4 col-sm-3 text-center">{{ $item->quantity }}</td>
+                                    <td class="quantity">{{ $item->quantity }}</td>
                                 @stack('quantity_td_end')
 
                                 @stack('price_td_start')
-                                    <td class="col-sm-3 text-center d-none d-sm-block pl-5">@money($item->price, $invoice->currency_code, true)</td>
+                                    <td class="price">@money($item->price, $invoice->currency_code, true)</td>
                                 @stack('price_td_end')
 
                                 @stack('total_td_start')
-                                    <td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $invoice->currency_code, true)</td>
+                                    <td class="total">@money($item->total, $invoice->currency_code, true)</td>
                                 @stack('total_td_end')
                             </tr>
                         @endforeach
@@ -196,83 +164,57 @@
         </div>
     </div>
 
-    <div class="row mt-5">
-        <div class="col-md-7">
-            <div class="table-responsive">
+    <div class="row mt-9">
+        <div class="col-58">
+            <div class="text company">
                 @stack('notes_input_start')
                     @if ($invoice->notes)
-                        <table class="table table-borderless">
-                            <tbody>
-                                <tr>
-                                    <th>
-                                        <p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p>
-                                        <p class="form-control text-muted">{{ $invoice->notes }}</p>
-                                    </th>
-                                </tr>
-                            </tbody>
-                        </table>
+                        <strong>{{ trans_choice('general.notes', 2) }}</strong><br><br>
+                        <div class="border-1 py-1 border-radius-default pl-2 d-note">
+                            {{ $invoice->notes }}
+                        </div>
                     @endif
                 @stack('notes_input_end')
             </div>
         </div>
-        <div class="col-md-5">
-            <div class="table-responsive">
-                <table class="table">
-                    <tbody>
-                            @foreach ($invoice->totals as $total)
-                                @if ($total->code != 'total')
-                                    @stack($total->code . '_td_start')
-                                        <tr>
-                                        <th>
-                                            {{ trans($total->title) }}:
-                                        </th>
-                                        <td class="text-right">
-                                            @money($total->amount, $invoice->currency_code, true)
-                                        </td>
-                                    </tr>
-                                    @stack($total->code . '_td_end')
-                                @else
-                                    @if ($invoice->paid)
-                                        <tr>
-                                        <th>
-                                            {{ trans('invoices.paid') }}:
-                                        </th>
-                                        <td class="text-right">
-                                            - @money($invoice->paid, $invoice->currency_code, true)
-                                        </td>
-                                    </tr>
-                                    @endif
-                                    @stack('grand_total_td_start')
-                                        <tr>
-                                        <th>
-                                            {{ trans($total->name) }}:
-                                        </th>
-                                        <td class="text-right">
-                                            @money($total->amount - $invoice->paid, $invoice->currency_code, true)
-                                        </td>
-                                    </tr>
-                                    @stack('grand_total_td_end')
-                                @endif
-                        @endforeach
-                    </tbody>
-                </table>
+
+        <div class="col-42 text-right">
+            <div class="text company pr-2">
+                @foreach ($invoice->totals as $total)
+                    @if ($total->code != 'total')
+                        @stack($total->code . '_td_start')
+                            <div class="border-top-1">
+                                <br>
+                                <strong>{{ trans($total->title) }}:</strong>
+                                <strong>@money($total->amount, $invoice->currency_code, true)</strong><br><br>
+                            </div>
+                        @stack($total->code . '_td_end')
+                    @else
+                        @if ($invoice->paid)
+                            <div class="border-top-1">
+                                <br>
+                                <strong>{{ trans('invoices.paid') }}:</strong>
+                                <strong>- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br>
+                            </div>
+                        @endif
+                        @stack('grand_total_td_start')
+                            <div class="border-top-1">
+                                <br>
+                                <strong>{{ trans($total->name) }}:</strong>
+                                <strong>@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong>
+                            </div>
+                        @stack('grand_total_td_end')
+                    @endif
+                @endforeach
             </div>
         </div>
     </div>
 
     @if ($invoice->footer)
-        <div class="row">
-            <div class="col-md-12">
-                <div class="table-responsive">
-                    <table class="table table-borderless">
-                        <tbody>
-                            <tr>
-                                <th>
-                                    {!! $invoice->footer !!}
-                                </th>
-                            </tr>
-                        </tbody>
-                    </table>
+        <div class="row mt-4">
+            <div class="col-100 text-left">
+                <div class="text company">
+                    <strong>{!! $invoice->footer !!}<strong>
                 </div>
             </div>
         </div>
diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php
index b0eaeccba..d763e9fd5 100644
--- a/resources/views/sales/invoices/print_modern.blade.php
+++ b/resources/views/sales/invoices/print_modern.blade.php
@@ -3,186 +3,149 @@
 @section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
 
 @section('content')
-    <div class="row">
-        <div class="col-md-7 bg-primary">
-            <div class="table-responsive">
-                <table class="table table-borderless mt-4">
-                    <tbody>
-                        <tr>
-                            <th class="d-flex align-items-center">
-                                <img src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
-                                <h3 class="ml-4 text-white">{{ setting('company.name') }}</h3>
-                            </th>
-                        </tr>
-                    </tbody>
-                </table>
+    <div class="row bg-primary">
+        <div class="col-58 m-first-column">
+            <div class="text company pl-2 m-fc-left">
+                <img src="{{ $logo }}" class="m-logo" alt="{{ setting('company.name') }}"/>
+            </div>
+            <div class="text company m-fc-right">
+                <strong class="text-white">{{ setting('company.name') }}</strong>
             </div>
         </div>
-        <div class="col-md-5 bg-default">
-            <div class="table-responsive">
-                <table class="table table-borderless">
-                    <tbody>
-                        <tr>
-                            <th class="text-white">
-                                {!! nl2br(setting('company.address')) !!}
-                            </th>
-                        </tr>
-                        <tr>
-                            <th class="text-white">
-                                @if (setting('company.tax_number'))
-                                    {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
-                                @endif
-                            </th>
-                        </tr>
-                        <tr>
-                            <th class="text-white">
-                                @if (setting('company.phone'))
-                                    {{ setting('company.phone') }}
-                                @endif
-                            </th>
-                        </tr>
-                        <tr>
-                            <th class="text-white">
-                                {{ setting('company.email') }}
-                            </th>
-                        </tr>
-                    </tbody>
-                </table>
+        
+        <div class="col-42">
+            <div class="text company">
+                <br>
+                <strong class="text-white">{!! nl2br(setting('company.address')) !!}</strong><br><br>
+
+                <strong class="text-white">
+                    @if (setting('company.tax_number'))
+                        {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
+                    @endif
+                </strong><br><br>
+
+                <strong class="text-white">
+                    @if (setting('company.phone'))
+                        {{ setting('company.phone') }}
+                    @endif
+                </strong><br><br>
+
+                <strong class="text-white">{{ setting('company.email') }}</strong><br><br>
             </div>
         </div>
     </div>
 
     <div class="row">
-        <div class="col-md-7">
-            <div class="table-responsive">
-                <table class="table table-borderless">
-                    <tbody>
-                        <tr>
-                            <th>
-                                <h4>{{ trans('invoices.bill_to') }}</h4>
-                                @stack('name_input_start')
-                                    <strong class="d-block">{{ $invoice->contact_name }}</strong>
-                                @stack('name_input_end')
-                            </th>
-                        </tr>
-                        <tr>
-                            <td>
-                                @stack('address_input_start')
-                                    {!! nl2br($invoice->contact_address) !!}
-                                @stack('address_input_end')
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                @stack('tax_number_input_start')
-                                    @if ($invoice->contact_tax_number)
-                                        {{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }}<br>
-                                    @endif
-                                @stack('tax_number_input_end')
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                @stack('phone_input_start')
-                                    @if ($invoice->contact_phone)
-                                        {{ $invoice->contact_phone }}
-                                    @endif
-                                @stack('phone_input_end')
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                @stack('email_start')
-                                    {{ $invoice->contact_email }}
-                                @stack('email_input_end')
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+        <div class="col-58">
+            <div class="text company">
+                <br>
+                <strong>{{ trans('invoices.bill_to') }}</strong><br>
+                @stack('name_input_start')
+                    <strong>{{ $invoice->contact_name }}</strong><br><br>
+                @stack('name_input_end')
+        
+                @stack('address_input_start')
+                    {!! nl2br($invoice->contact_address) !!}<br><br>
+                @stack('address_input_end')
+
+                @stack('tax_number_input_start')
+                    @if ($invoice->contact_tax_number)
+                       {{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }}<br><br>
+                    @endif
+                @stack('tax_number_input_end')
+            
+                @stack('phone_input_start')
+                    @if ($invoice->contact_phone)
+                        {{ $invoice->contact_phone }}<br><br>
+                    @endif
+                @stack('phone_input_end')
+
+                @stack('email_start')
+                    {{ $invoice->contact_email }}<br><br>
+                @stack('email_input_end')
             </div>
         </div>
-        <div class="col-md-5">
-            <div class="table-responsive">
-                <table class="table table-borderless">
-                    <tbody>
-                        @stack('invoice_number_input_start')
-                            <tr>
-                                <th>{{ trans('invoices.invoice_number') }}:</th>
-                                <td class="text-right">{{ $invoice->invoice_number }}</td>
-                            </tr>
-                        @stack('invoice_number_input_end')
 
-                        @stack('order_number_input_start')
-                            @if ($invoice->order_number)
-                                <tr>
-                                    <th>{{ trans('invoices.order_number') }}:</th>
-                                    <td class="text-right">{{ $invoice->order_number }}</td>
-                                </tr>
-                            @endif
-                        @stack('order_number_input_end')
+        <div class="col-42">
+            <div class="text company">
+                @stack('order_number_input_start')
+                    @if ($invoice->order_number)
+                        <p>
+                            <b>{{ trans('invoices.order_number') }}:</b>
+                            {{ $invoice->order_number }}
+                        </p>
+                    @endif
+                @stack('order_number_input_end')
 
-                        @stack('invoiced_at_input_start')
-                            <tr>
-                                <th>{{ trans('invoices.invoice_date') }}:</th>
-                                <td class="text-right">@date($invoice->invoiced_at)</td>
-                            </tr>
-                        @stack('invoiced_at_input_end')
+                @stack('invoice_number_input_start')
+                    <p>
+                        <b>{{ trans('invoices.invoice_number') }}:</b>
+                        {{ $invoice->invoice_number }}
+                    </p>
+                @stack('invoice_number_input_end')
 
-                        @stack('due_at_input_start')
-                            <tr>
-                                <th>{{ trans('invoices.payment_due') }}:</th>
-                                <td class="text-right">@date($invoice->due_at)</td>
-                            </tr>
-                        @stack('due_at_input_end')
-                    </tbody>
-                </table>
+                @stack('invoiced_at_input_start')
+                    <p>
+                        <b>{{ trans('invoices.invoice_date') }}:</b>
+                        @date($invoice->invoiced_at)
+                    </p>
+                @stack('invoiced_at_input_end')
+
+                @stack('due_at_input_start')
+                    <p>
+                        <b>{{ trans('invoices.payment_due') }}:</b>
+                        @date($invoice->due_at)
+                    </p>
+                @stack('due_at_input_end')
             </div>
         </div>
     </div>
 
-    <div class="row show-table">
-        <div class="col-md-12">
-            <div class="table-responsive">
-                <table class="table table-borderless">
-                    <tbody>
-                        <tr class="row bg-default">
+    <div class="row">
+        <div class="col-100">
+            <div class="text">
+                <table class="m-lines">
+                    <thead class="bg-default">
+                        <tr>
                             @stack('name_th_start')
-                                <th class="col-xs-4 col-sm-3 pl-5 text-white">{{ trans_choice($text_override['items'], 2) }}</th>
+                                <th class="item text-white">{{ trans_choice($text_override['items'], 2) }}</th>
                             @stack('name_th_end')
 
                             @stack('quantity_th_start')
-                                <th class="col-xs-4 col-sm-3 text-center text-white">{{ trans($text_override['quantity']) }}</th>
+                                <th class="quantity text-white">{{ trans($text_override['quantity']) }}</th>
                             @stack('quantity_th_end')
 
                             @stack('price_th_start')
-                                <th class="col-sm-3 text-center d-none d-sm-block pl-5 text-white">{{ trans($text_override['price']) }}</th>
+                                <th class="price text-white">{{ trans($text_override['price']) }}</th>
                             @stack('price_th_end')
 
                             @stack('total_th_start')
-                                <th class="col-xs-4 col-sm-3 text-right pr-5 text-white">{{ trans('invoices.total') }}</th>
+                                <th class="total text-white">{{ trans('invoices.total') }}</th>
                             @stack('total_th_end')
                         </tr>
+                    </thead>
+                    <tbody>
                         @foreach($invoice->items as $item)
-                            <tr class="row">
+                            <tr>
                                 @stack('name_td_start')
-                                    <td class="col-xs-4 col-sm-3 pl-5">
+                                    <td class="item">
                                         {{ $item->name }}
                                         @if ($item->desc)
-                                            <br><small>{!! $item->desc !!}</small>
+                                            {!! $item->desc !!}
                                         @endif
                                     </td>
                                 @stack('name_td_end')
 
                                 @stack('quantity_td_start')
-                                    <td class="col-xs-4 col-sm-3 text-center">{{ $item->quantity }}</td>
+                                    <td class="quantity">{{ $item->quantity }}</td>
                                 @stack('quantity_td_end')
 
                                 @stack('price_td_start')
-                                    <td class="col-sm-3 text-center d-none d-sm-block pl-5">@money($item->price, $invoice->currency_code, true)</td>
+                                    <td class="price">@money($item->price, $invoice->currency_code, true)</td>
                                 @stack('price_td_end')
 
                                 @stack('total_td_start')
-                                    <td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $invoice->currency_code, true)</td>
+                                    <td class="total">@money($item->total, $invoice->currency_code, true)</td>
                                 @stack('total_td_end')
                             </tr>
                         @endforeach
@@ -192,83 +155,48 @@
         </div>
     </div>
 
-    <div class="row mt-3">
-        <div class="col-md-7">
-            <div class="table-responsive">
+    <div class="row mt-7">
+        <div class="col-58">
+            <div class="text company">
                 @stack('notes_input_start')
                     @if ($invoice->notes)
-                        <table class="table table-borderless">
-                            <tbody>
-                                <tr>
-                                    <th>
-                                        <p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p>
-                                        <p class="form-control text-muted">{{ $invoice->notes }}</p>
-                                    </th>
-                                </tr>
-                            </tbody>
-                        </table>
+                        <strong>{{ trans_choice('general.notes', 2) }}</strong><br><br>
+                        <div class="border-1 py-1 border-radius-default pl-2 m-note">
+                            {{ $invoice->notes }}
+                        </div>
                     @endif
                 @stack('notes_input_end')
             </div>
         </div>
-        <div class="col-md-5">
-            <div class="table-responsive">
-                <table class="table table-borderless">
-                    <tbody>
-                         @foreach ($invoice->totals as $total)
-                             @if ($total->code != 'total')
-                                 @stack($total->code . '_td_start')
-                                     <tr>
-                                        <th>
-                                            {{ trans($total->title) }}:
-                                        </th>
-                                        <td class="text-right">
-                                            @money($total->amount, $invoice->currency_code, true)
-                                        </td>
-                                    </tr>
-                                 @stack($total->code . '_td_end')
-                             @else
-                                 @if ($invoice->paid)
-                                     <tr>
-                                        <th>
-                                            {{ trans('invoices.paid') }}:
-                                        </th>
-                                        <td class="text-right">
-                                            - @money($invoice->paid, $invoice->currency_code, true)
-                                        </td>
-                                    </tr>
-                                 @endif
-                                 @stack('grand_total_td_start')
-                                     <tr>
-                                        <th>
-                                            {{ trans($total->name) }}:
-                                        </th>
-                                        <td class="text-right">
-                                            @money($total->amount - $invoice->paid, $invoice->currency_code, true)
-                                        </td>
-                                    </tr>
-                                 @stack('grand_total_td_end')
-                             @endif
-                        @endforeach
-                    </tbody>
-               </table>
+        
+        <div class="col-42 text-right">
+            <div class="text company pr-2">
+                @foreach ($invoice->totals as $total)
+                    @if ($total->code != 'total')
+                        @stack($total->code . '_td_start')
+                            <strong>{{ trans($total->title) }}:</strong>
+                            @money($total->amount, $invoice->currency_code, true)<br><br>
+                        @stack($total->code . '_td_end')
+                    @else
+                        @if ($invoice->paid)
+                            <strong>{{ trans('invoices.paid') }}:</strong>
+                            - @money($invoice->paid, $invoice->currency_code, true)</strong><br>
+                        @endif
+                        @stack('grand_total_td_start')
+                            <strong>{{ trans($total->name) }}:</strong>
+                            @money($total->amount - $invoice->paid, $invoice->currency_code, true)
+                        @stack('grand_total_td_end')
+                    @endif
+                @endforeach
             </div>
         </div>
     </div>
 
     @if ($invoice->footer)
-        <div class="row">
-            <div class="col-md-12 bg-default">
-                <div class="table-responsive">
-                    <table class="table table-borderless mb-0">
-                        <tbody>
-                            <tr>
-                                <th class="text-white">
-                                    {!! $invoice->footer !!}
-                                </th>
-                            </tr>
-                        </tbody>
-                    </table>
+        <div class="row mt-7">
+            <div class="col-100 bg-default py-2">
+                <div class="text company pl-2">
+                    <strong class="text-white">{!! $invoice->footer !!}</strong>
                 </div>
             </div>
         </div>