diff --git a/public/img/company.png b/public/img/company.png
new file mode 100644
index 000000000..964e18409
Binary files /dev/null and b/public/img/company.png differ
diff --git a/public/img/user.png b/public/img/user.png
new file mode 100644
index 000000000..3a98dc196
Binary files /dev/null and b/public/img/user.png differ
diff --git a/resources/views/expenses/bills/bill.blade.php b/resources/views/expenses/bills/bill.blade.php
index abe19ca91..e6528180a 100644
--- a/resources/views/expenses/bills/bill.blade.php
+++ b/resources/views/expenses/bills/bill.blade.php
@@ -12,7 +12,7 @@
                             <tr>
                                 <th>
                                     @if ($logo)
-                                        <img src="{{ $logo }}"/>
+                                        <img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
                                     @endif
                                 </th>
                             </tr>
diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php
index f62b4fe36..b7182f896 100644
--- a/resources/views/expenses/bills/show.blade.php
+++ b/resources/views/expenses/bills/show.blade.php
@@ -166,9 +166,7 @@
                                                 @if (isset($bill->contact->logo) && !empty($bill->contact->logo->id))
                                                     <img src="{{ Storage::url($bill->contact->logo->id) }}"/>
                                                 @else
-                                                    <span class="avatar avatar-size rounded-circle bg-primary">
-                                                        <i class="fas fa-building"></i>
-                                                    </span>
+                                                    <img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
                                                 @endif
                                             </th>
                                         </tr>
diff --git a/resources/views/incomes/invoices/invoice.blade.php b/resources/views/incomes/invoices/invoice.blade.php
index a42bf4314..1be5b5ed4 100644
--- a/resources/views/incomes/invoices/invoice.blade.php
+++ b/resources/views/incomes/invoices/invoice.blade.php
@@ -12,7 +12,7 @@
                             <tr>
                                 <th>
                                     @if ($logo)
-                                        <img src="{{ $logo }}"/>
+                                        <img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
                                     @endif
                                 </th>
                             </tr>
@@ -263,10 +263,22 @@
             </div>
         </div>
 
-        @if ($invoice->footer)
-            <div class="row">
-                {!! $invoice->footer !!}
+        <div class="row">
+            <div class="col-md-12">
+                <div class="table-responsive">
+                    <table class="table table-borderless">
+                        <tbody>
+                            <tr>
+                                <th>
+                                    @if ($invoice->footer)
+                                        {!! $invoice->footer !!}
+                                    @endif
+                                </th>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        @endif
+        </div>
     </div>
 @endsection
diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php
index fd5c8d876..3978c11d4 100644
--- a/resources/views/incomes/invoices/show.blade.php
+++ b/resources/views/incomes/invoices/show.blade.php
@@ -188,9 +188,7 @@
                                                 @if (setting('company.logo'))
                                                     <img src="{{ Storage::url(setting('company.logo')) }}"/>
                                                 @else
-                                                    <span class="avatar avatar-size rounded-circle bg-default">
-                                                        <i class="fas fa-building"></i>
-                                                    </span>
+                                                    <img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
                                                 @endif
                                             </th>
                                         </tr>
diff --git a/resources/views/layouts/auth.blade.php b/resources/views/layouts/auth.blade.php
index ca9975ba0..a5178131c 100644
--- a/resources/views/layouts/auth.blade.php
+++ b/resources/views/layouts/auth.blade.php
@@ -12,7 +12,7 @@
                         <div class="header-body text-center mb-5">
                             <div class="row justify-content-center">
                                 <div class="col-xl-5 col-lg-6 col-md-8">
-                                    <img class="login-logo pb-5" src="{{ asset('public/img/akaunting-logo-white.png') }}" alt="Akaunting" />
+                                    <img class="login-logo pb-5" src="{{ asset('public/img/akaunting-logo-white.png') }}" alt="Akaunting"/>
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/modules/item/pre_sale.blade.php b/resources/views/modules/item/pre_sale.blade.php
index 193c518a4..1afe40314 100644
--- a/resources/views/modules/item/pre_sale.blade.php
+++ b/resources/views/modules/item/pre_sale.blade.php
@@ -107,7 +107,7 @@
                                 @else
                                     {!! $module->price_prefix !!}
                                     @if (isset($module->special_price))
-                                        <del>{{ $module->price }}</del>
+                                        <del class="text-danger">{{ $module->price }}</del>
                                         {{ $module->special_price }}
                                     @else
                                         {{ $module->price }}
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
index 2764372d0..6ef7a58da 100644
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@@ -182,7 +182,7 @@
                                     {!! $module->price_prefix !!}
 
                                     @if (isset($module->special_price))
-                                        <del>{{ $module->price }}</del>
+                                        <del class="text-danger">{{ $module->price }}</del>
                                         {{ $module->special_price }}
                                     @else
                                         {{ $module->price }}
@@ -219,7 +219,7 @@
                                 </a>
                             @endif
                         @endpermission
-                    @endif  
+                    @endif
 
                     @if ($module->purchase_faq)
                          <div class="text-center mt-3">
diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php
index 92e3b480e..637fb379f 100644
--- a/resources/views/partials/admin/navbar.blade.php
+++ b/resources/views/partials/admin/navbar.blade.php
@@ -199,9 +199,7 @@
                     <li class="nav-item dropdown">
                         <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                             <div class="media align-items-center">
-                                <span class="avatar avatar-sm rounded-circle bg-default font-size-1">
-                                    <i class="fas fa-user-alt"></i>
-                                </span>
+                                <img src="{{ asset('public/img/user.png') }}" height="36" width="36" alt="User"/>
                                 <div class="media-body ml-2 d-none d-lg-block">
                                     <span class="mb-0 text-sm  font-weight-bold">
                                         @if (!empty($user->name))
diff --git a/resources/views/partials/modules/item.blade.php b/resources/views/partials/modules/item.blade.php
index b57b9b8a7..7c508a217 100644
--- a/resources/views/partials/modules/item.blade.php
+++ b/resources/views/partials/modules/item.blade.php
@@ -46,7 +46,7 @@
                         @else
                             {!! $module->price_prefix !!}
                         @if (isset($module->special_price))
-                            <del>{{ $module->price }}</del>
+                            <del class="text-danger">{{ $module->price }}</del>
                             {{ $module->special_price }}
                         @else
                             {{ $module->price }}
diff --git a/resources/views/partials/modules/pre_sale.blade.php b/resources/views/partials/modules/pre_sale.blade.php
index 1941c2f83..3b462256b 100644
--- a/resources/views/partials/modules/pre_sale.blade.php
+++ b/resources/views/partials/modules/pre_sale.blade.php
@@ -30,7 +30,7 @@
                         @else
                             {!! $module->price_prefix !!}
                                 @if (isset($module->special_price))
-                                    <del>{{ $module->price }}</del>
+                                    <del class="text-danger">{{ $module->price }}</del>
                                     {{ $module->special_price }}
                                 @else
                                     {{ $module->price }}
diff --git a/resources/views/partials/portal/navbar.blade.php b/resources/views/partials/portal/navbar.blade.php
index 8d9e54551..e14501912 100644
--- a/resources/views/partials/portal/navbar.blade.php
+++ b/resources/views/partials/portal/navbar.blade.php
@@ -91,9 +91,7 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <div class="media align-items-center">
-                            <span class="avatar avatar-sm rounded-circle bg-default font-size-1">
-                               <i class="fas fa-user-alt"></i>
-                            </span>
+                            <img src="{{ asset('public/img/user.png') }}" height="36" width="36" alt="User"/>
                             <div class="media-body ml-2 d-none d-lg-block">
                                 <span class="mb-0 text-sm  font-weight-bold">
                                     @if (!empty($user->name))
diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php
index 8fad49cb8..abd0d17f2 100644
--- a/resources/views/wizard/companies/edit.blade.php
+++ b/resources/views/wizard/companies/edit.blade.php
@@ -15,6 +15,7 @@
             'class' => 'form-loading-button mb-0',
             'novalidate' => true
         ]) !!}
+        <div id="wizard-loading"></div>
             <div class="card-header wizard-header pb-0">
                 <div class="container-fluid">
                     <div class="row">