diff --git a/public/css/print.css b/public/css/print.css
index 32a762d13..c89eb61ec 100644
--- a/public/css/print.css
+++ b/public/css/print.css
@@ -131,6 +131,15 @@ th, td {
     border-radius: 0.25rem
 }
 
+.float-left {
+    float: left !important;
+}
+
+
+.float-right {
+    float: right !important;
+}
+
 .text {
     color: #3c3f72;
     margin-top:10px;
@@ -294,11 +303,6 @@ th, td {
     padding-bottom:48px;
 }
 
-.m-logo {
-    padding-top: 10px;
-    padding-bottom: -36px;
-}
-
 .m-fc-left {
     padding-right: 30px;
 }
diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php
index fc9882bd5..3638add5c 100644
--- a/resources/views/sales/invoices/print_classic.blade.php
+++ b/resources/views/sales/invoices/print_classic.blade.php
@@ -58,7 +58,7 @@
         </div>
     </div>
 
-    <div class="row">
+    <div class="row mt-2">
         <div class="col-58">
             <div class="text company">
                 <strong>{{ trans('invoices.bill_to') }}</strong><br>
@@ -92,37 +92,29 @@
             </div>
         </div>
 
-        <div class="col-42 text-right">
+        <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>
+                        <strong>{{ trans('invoices.order_number') }}:</strong>
+                        <span class="float-right">{{ $invoice->order_number }}</span><br><br>
                     @endif
                 @stack('order_number_input_end')
 
                 @stack('invoiced_at_input_start')
-                    <p>
-                        <b>{{ trans('invoices.invoice_date') }}:</b>
-                        @date($invoice->invoiced_at)
-                    </p>
+                    <strong>{{ trans('invoices.invoice_date') }}:</strong>
+                    <span class="float-right">@date($invoice->invoiced_at)</span><br><br>
                 @stack('invoiced_at_input_end')
 
                 @stack('due_at_input_start')
-                    <p>
-                        <b>{{ trans('invoices.payment_due') }}:</b>
-                        @date($invoice->due_at)
-                    </p>
+                    <strong>{{ trans('invoices.payment_due') }}:</strong>
+                    <span class="float-right">@date($invoice->due_at)</span><br><br>
                 @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>
+                        <strong>{{ trans($total->name) }}:</strong>
+                        <span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span><br><br>
                     @endif
                 @endforeach
             </div>
@@ -189,15 +181,13 @@
                 @stack('notes_input_start')
                     @if ($invoice->notes)
                         <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>
+                        {{ $invoice->notes }}
                     @endif
                 @stack('notes_input_end')
             </div>
         </div>
 
-        <div class="col-42 text-right">
+        <div class="col-42">
             <div class="text company pr-2">
                 @foreach ($invoice->totals as $total)
                     @if ($total->code != 'total')
@@ -205,7 +195,7 @@
                             <div class="border-top-dashed">
                                 <br>
                                 <strong>{{ trans($total->title) }}:</strong>
-                                <strong>@money($total->amount, $invoice->currency_code, true)</strong><br><br>
+                                <strong class="float-right">@money($total->amount, $invoice->currency_code, true)</strong><br><br>
                             </div>
                         @stack($total->code . '_td_end')
                     @else
@@ -213,14 +203,14 @@
                             <div class="border-top-dashed">
                                 <br>
                                 <strong>{{ trans('invoices.paid') }}:</strong>
-                                <strong>- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br>
+                                <strong class="float-right">- @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>
+                                <strong class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong>
                             </div>
                         @stack('grand_total_td_end')
                     @endif
diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php
index 00716d635..77b341acb 100644
--- a/resources/views/sales/invoices/print_default.blade.php
+++ b/resources/views/sales/invoices/print_default.blade.php
@@ -77,7 +77,7 @@
                     <strong>
                         {{ trans('invoices.invoice_number') }}:
                     </strong>
-                    {{ $invoice->invoice_number }}<br><br>
+                    <span class="float-right">{{ $invoice->invoice_number }}</span><br><br>
                 @stack('invoice_number_input_end')
 
                 @stack('order_number_input_start')
@@ -85,7 +85,7 @@
                         <strong>
                             {{ trans('invoices.order_number') }}:
                         </strong>
-                        {{ $invoice->order_number }}<br><br>
+                        <span class="float-right">{{ $invoice->order_number }}</span><br><br>
                     @endif
                 @stack('order_number_input_end')
 
@@ -93,14 +93,14 @@
                     <strong>
                         {{ trans('invoices.invoice_date') }}:
                     </strong>
-                    @date($invoice->invoiced_at)<br><br>
+                    <span class="float-right">@date($invoice->invoiced_at)</span><br><br>
                 @stack('invoiced_at_input_end')
 
                 @stack('due_at_input_start')
                     <strong>
                         {{ trans('invoices.payment_due') }}:
                     </strong>
-                    @date($invoice->due_at)<br><br>
+                    <span class="float-right">@date($invoice->due_at)</span><br><br>
                 @stack('due_at_input_end')
             </div>
         </div>
@@ -168,15 +168,13 @@
                 @stack('notes_input_start')
                     @if ($invoice->notes)
                         <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>
+                        {{ $invoice->notes }}
                     @endif
                 @stack('notes_input_end')
             </div>
         </div>
 
-        <div class="col-42 text-right">
+        <div class="col-42">
             <div class="text company pr-2">
                 @foreach ($invoice->totals as $total)
                     @if ($total->code != 'total')
@@ -184,7 +182,7 @@
                             <div class="border-top-1">
                                 <br>
                                 <strong>{{ trans($total->title) }}:</strong>
-                                <strong>@money($total->amount, $invoice->currency_code, true)</strong><br><br>
+                                <strong class="float-right">@money($total->amount, $invoice->currency_code, true)</strong><br><br>
                             </div>
                         @stack($total->code . '_td_end')
                     @else
@@ -192,14 +190,14 @@
                             <div class="border-top-1">
                                 <br>
                                 <strong>{{ trans('invoices.paid') }}:</strong>
-                                <strong>- @money($invoice->paid, $invoice->currency_code, true)</strong><br><br>
+                                <strong class="float-right">- @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>
+                                <strong class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</strong>
                             </div>
                         @stack('grand_total_td_end')
                     @endif
diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php
index dc2537ac3..d37f4cdd9 100644
--- a/resources/views/sales/invoices/print_modern.blade.php
+++ b/resources/views/sales/invoices/print_modern.blade.php
@@ -6,6 +6,7 @@
     <div class="row" style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
         <div class="col-58 m-first-column">
             <div class="text company pl-2 m-fc-left">
+                <img src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
             </div>
             <div class="text company m-fc-right">
                 <strong class="text-white">{{ setting('company.name') }}</strong>
@@ -14,7 +15,6 @@
 
         <div class="col-42">
             <div class="text company">
-                <br>
                 <strong class="text-white">{!! nl2br(setting('company.address')) !!}</strong><br><br>
 
                 <strong class="text-white">
@@ -34,10 +34,9 @@
         </div>
     </div>
 
-    <div class="row">
+    <div class="row mt-2">
         <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>
@@ -69,32 +68,24 @@
             <div class="text company">
                 @stack('order_number_input_start')
                     @if ($invoice->order_number)
-                        <p>
-                            <b>{{ trans('invoices.order_number') }}:</b>
-                            {{ $invoice->order_number }}
-                        </p>
+                        <strong>{{ trans('invoices.order_number') }}:</strong>
+                        <span class="float-right">{{ $invoice->order_number }}</span><br><br>
                     @endif
                 @stack('order_number_input_end')
 
                 @stack('invoice_number_input_start')
-                    <p>
-                        <b>{{ trans('invoices.invoice_number') }}:</b>
-                        {{ $invoice->invoice_number }}
-                    </p>
+                    <strong>{{ trans('invoices.invoice_number') }}:</strong>
+                    <span class="float-right">{{ $invoice->invoice_number }}</span><br><br>
                 @stack('invoice_number_input_end')
 
                 @stack('invoiced_at_input_start')
-                    <p>
-                        <b>{{ trans('invoices.invoice_date') }}:</b>
-                        @date($invoice->invoiced_at)
-                    </p>
+                    <strong>{{ trans('invoices.invoice_date') }}:</strong>
+                    <span class="float-right">@date($invoice->invoiced_at)</span><br><br>
                 @stack('invoiced_at_input_end')
 
                 @stack('due_at_input_start')
-                    <p>
-                        <b>{{ trans('invoices.payment_due') }}:</b>
-                        @date($invoice->due_at)
-                    </p>
+                    <strong>{{ trans('invoices.payment_due') }}:</strong>
+                    <span class="float-right">@date($invoice->due_at)</span>
                 @stack('due_at_input_end')
             </div>
         </div>
@@ -160,30 +151,28 @@
                 @stack('notes_input_start')
                     @if ($invoice->notes)
                         <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>
+                        {{ $invoice->notes }}
                     @endif
                 @stack('notes_input_end')
             </div>
         </div>
 
-        <div class="col-42 text-right">
+        <div class="col-42">
             <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>
+                            <span class="float-right">@money($total->amount, $invoice->currency_code, true)</span><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>
+                            <span class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</span><br><br>
                         @endif
                         @stack('grand_total_td_start')
                             <strong>{{ trans($total->name) }}:</strong>
-                            @money($total->amount - $invoice->paid, $invoice->currency_code, true)
+                            <span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
                         @stack('grand_total_td_end')
                     @endif
                 @endforeach