diff --git a/public/css/custom.css b/public/css/custom.css
index 83b285182..383ceaccb 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -73,6 +73,12 @@
 
 
 /*--------Wizard Steps--------*/
+.wizard-header
+{
+    border-radius: calc(0.375rem - 1px) calc(0.375rem - 1px) 0 0;
+}
+
+
 .wizard-steps
 {
     width: 3.375rem;
diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php
index c9b0843da..8fad49cb8 100644
--- a/resources/views/wizard/companies/edit.blade.php
+++ b/resources/views/wizard/companies/edit.blade.php
@@ -3,51 +3,6 @@
 @section('title', trans('general.wizard'))
 
 @section('content')
-    <div class="card">
-        <div class="card-body">
-            <div class="container-fluid">
-                <div class="row mb--4">
-                    <hr class="wizard-line">
-                    <div class="col-md-3">
-                        <div class="text-center">
-                            <button href="#step-1" type="button" class="btn btn-default btn-lg wizard-steps rounded-circle">
-                                <span class="btn-inner--icon wizard-steps-inner">1</span>
-                            </button>
-                            <p class="mt-2 after-step-text">{{ trans_choice('general.companies', 1) }}</p>
-                        </div>
-                    </div>
-
-                    <div class="col-md-3">
-                        <div class="text-center">
-                            <button type="button" class="btn btn-secondary btn-lg wizard-steps rounded-circle steps">
-                                <span class="btn-inner--icon wizard-steps-inner wizard-steps-color">2</span>
-                            </button>
-                            <p class="mt-2 text-muted step-text">{{ trans_choice('general.currencies', 2) }}</p>
-                        </div>
-                    </div>
-
-                    <div class="col-md-3">
-                        <div class="text-center">
-                            <button type="button" class="btn btn-secondary btn-lg wizard-steps rounded-circle steps">
-                                <span class="btn-inner--icon wizard-steps-inner wizard-steps-color">3</span>
-                            </button>
-                            <p class="mt-2 text-muted step-text">{{ trans_choice('general.taxes', 2) }}</p>
-                        </div>
-                    </div>
-
-                    <div class="col-md-3">
-                        <div class="text-center">
-                            <button type="button" class="btn btn-secondary btn-lg wizard-steps rounded-circle steps">
-                                <span class="btn-inner--icon wizard-steps-inner wizard-steps-color">4</span>
-                            </button>
-                            <p class="mt-2 text-muted step-text">{{ trans_choice('general.finish', 1) }}</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <div class="card">
         {!! Form::model($company, [
             'method' => 'PATCH',
@@ -60,13 +15,51 @@
             '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">
+                        <hr class="wizard-line">
+                        <div class="col-md-3">
+                            <div class="text-center">
+                                <button href="#step-1" type="button" class="btn btn-default btn-lg wizard-steps rounded-circle">
+                                    <span class="btn-inner--icon wizard-steps-inner">1</span>
+                                </button>
+                                <p class="mt-2 after-step-text">{{ trans_choice('general.companies', 1) }}</p>
+                            </div>
+                        </div>
 
-            <div class="card-header">
-                 <h3 class="mb-0">{{ trans_choice('general.companies', 1) }}</h3>
+                        <div class="col-md-3">
+                            <div class="text-center">
+                                <button type="button" class="btn btn-secondary btn-lg wizard-steps rounded-circle steps">
+                                    <span class="btn-inner--icon wizard-steps-inner wizard-steps-color">2</span>
+                                </button>
+                                <p class="mt-2 text-muted step-text">{{ trans_choice('general.currencies', 2) }}</p>
+                            </div>
+                        </div>
+
+                        <div class="col-md-3">
+                            <div class="text-center">
+                                <button type="button" class="btn btn-secondary btn-lg wizard-steps rounded-circle steps">
+                                    <span class="btn-inner--icon wizard-steps-inner wizard-steps-color">3</span>
+                                </button>
+                                <p class="mt-2 text-muted step-text">{{ trans_choice('general.taxes', 2) }}</p>
+                            </div>
+                        </div>
+
+                        <div class="col-md-3">
+                            <div class="text-center">
+                                <button type="button" class="btn btn-secondary btn-lg wizard-steps rounded-circle steps">
+                                    <span class="btn-inner--icon wizard-steps-inner wizard-steps-color">4</span>
+                                </button>
+                                <p class="mt-2 text-muted step-text">{{ trans_choice('general.finish', 1) }}</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
 
-             <div class="card-body">
+            <div class="card-body">
+                <div id="wizard-loading"></div>
                 <div class="row mb--4">
                     <div class="col-md-12 {!! (!setting('apps.api_key', null)) ?: 'hidden' !!}">
                         <div class="form-group {{ $errors->has('api_key') ? 'has-error' : ''}}"
@@ -89,8 +82,8 @@
                             </div>
 
                             <div class="invalid-feedback d-block"
-                                 v-if="form.errors.has('api_key')"
-                                 v-html="form.errors.get('api_key')"></div>
+                                    v-if="form.errors.has('api_key')"
+                                    v-html="form.errors.get('api_key')"></div>
                         </div>
                         <p class="mb-0 mt--3">
                             <small>{!! trans('modules.api_key_link') !!}</small>
@@ -105,19 +98,21 @@
                     {{ Form::textareaGroup('address', trans('settings.company.address')) }}
 
                     {{ Form::fileGroup('logo', trans('settings.company.logo')) }}
-                 </div>
-             </div>
+                </div>
+            </div>
 
             <div class="card-footer">
                 <div class="row">
                     <div class="col-12 text-right">
                         {!! Form::button(
-                            '<div v-if="form.loading" :class="(form.loading) ? \'show \' : \'\'"  class="aka-loader-frame d-none"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>',
-                                [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit', 'data-loading-text' => trans('general.loading')]) !!}
-                        <a href="{{ url('wizard/currencies') }}" id="wizard-skip" class="btn btn-white"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
+                            '<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>',
+                                [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
+
+                        <a href="{{ url('wizard/currencies') }}" id="wizard-skip" class="btn btn-white header-button-top"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
                     </div>
                 </div>
             </div>
+
         {!! Form::close() !!}
     </div>
 @endsection
diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php
index 636101199..72a54c3c5 100644
--- a/resources/views/wizard/currencies/index.blade.php
+++ b/resources/views/wizard/currencies/index.blade.php
@@ -4,9 +4,9 @@
 
 @section('content')
     <div class="card">
-        <div class="card-body">
+        <div class="card-header pb-0">
             <div class="container-fluid">
-                <div class="row mb--4">
+                <div class="row">
                     <hr class="wizard-line">
                     <div class="col-md-3">
                         <div class="text-center">
@@ -48,15 +48,10 @@
                 </div>
             </div>
         </div>
-    </div>
 
-    <div class="card">
-        <div class="card-header border-bottom-0">
+        <div class="card-body border-bottom-0">
             <div class="row">
-                <div class="col-6">
-                    <h3 class="mb-0">{{ trans_choice('general.currencies', 2) }}</h3>
-                </div>
-                <div class="col-6 text-right">
+                <div class="col-12 text-right">
                     <span class="new-button">
                         <button type="button" @click="onAddCurrency" class="btn btn-success btn-sm">
                             <span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}
@@ -129,13 +124,13 @@
 
                         <tr class="row align-items-center border-top-1" v-show="show">
                             <td class="col-xs-4 col-sm-3 currency-name">
-                                {{ Form::textGroup('name', trans('general.name'), 'id-card-o', [], null, '') }}
+                                {{ Form::textGroup('name', trans('general.name'), 'font', [], null, '') }}
                             </td>
                             <td class="col-sm-3 hidden-sm currency-code">
                                 {{ Form::selectGroup('code', trans('currencies.code'), 'code', $codes, null, ['required' => 'required', 'change' => 'onChangeCode'], '') }}
                             </td>
                             <td class="col-sm-2 hidden-sm currency-rate">
-                                {{ Form::textGroup('rate', trans('currencies.rate'), 'money', ['required' => 'required'], null, '') }}
+                                {{ Form::textGroup('rate', trans('currencies.rate'), 'percentage', ['required' => 'required'], null, '') }}
                             </td>
                             <td class="col-xs-4 col-sm-2 currency-status">
                                 {{ Form::radioGroup('enabled', trans('general.enabled')) }}
@@ -172,7 +167,7 @@
         <div class="card-footer">
             <div class="row">
                 <div class="col-12 text-right">
-                    <a href="{{ url('wizard/taxes') }}" id="wizard-skip" class="btn btn-white">
+                    <a href="{{ url('wizard/taxes') }}" id="wizard-skip" class="btn btn-white header-button-top">
                         <span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}
                     </a>
                 </div>
diff --git a/resources/views/wizard/finish/index.blade.php b/resources/views/wizard/finish/index.blade.php
index 6896be87b..6589a1feb 100644
--- a/resources/views/wizard/finish/index.blade.php
+++ b/resources/views/wizard/finish/index.blade.php
@@ -4,9 +4,9 @@
 
 @section('content')
     <div class="card">
-        <div class="card-body">
+        <div class="card-header pb-0">
             <div class="container-fluid">
-                <div class="row mb--4">
+                <div class="row">
                     <hr class="wizard-line">
                     <div class="col-md-3">
                         <div class="text-center">
@@ -52,50 +52,54 @@
                 </div>
             </div>
         </div>
-    </div>
 
-    <div class="row mb-4">
-        <div class="col-md-12 text-center">
-            <a href="{{ url('/') }}" class="btn btn-lg btn-success"><span class="fa fa-home"></span> &nbsp;{{ trans('general.go_to', ['name' => trans('general.dashboard')]) }}</a>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-12 col-xl-12">
-            <div class="content-header">
-                <h3 class="text-white">{{ trans('modules.recommended_apps') }}</h3>
-            </div>
-
-            @if ($modules)
-                <div class="row">
-                    @foreach ($modules->data as $module)
-                        @include('partials.modules.item')
-                    @endforeach
-                </div>
-
-                <div class="col-md-12">
-                    <ul>
-                        @if ($modules->current_page < $modules->last_page)
-                            <li class="next"><a href="{{ url(request()->path()) }}?page={{ $modules->current_page + 1 }}" class="btn btn-default btn-sm">{{ trans('pagination.next') }}</a></li>
-                        @endif
-                        @if ($modules->current_page > 1)
-                            <li class="previous"><a href="{{ url(request()->path()) }}?page={{ $modules->current_page - 1 }}" class="btn btn-default btn-sm">{{ trans('pagination.previous') }}</a></li>
-                        @endif
-                    </ul>
-                </div>
-            @else
-                <div class="card">
-                    <div class="card-body">
-                        <p class="col-md-12">
-                            {{ trans('modules.no_apps') }}
-                        </p>
-
-                        <p class="col-md-12">
-                            <small>{!! trans('modules.developer') !!}</small>
-                        </p>
+        <div class="card-body bg-secondary">
+            <div class="row">
+                <div class="col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                    <div class="content-header">
+                        <h3 class="text-white">{{ trans('modules.recommended_apps') }}</h3>
                     </div>
+
+                    @if ($modules)
+                        <div class="row">
+                            @foreach ($modules->data as $module)
+                                @include('partials.modules.item')
+                            @endforeach
+                        </div>
+
+                        <div class="col-md-12">
+                            <ul>
+                                @if ($modules->current_page < $modules->last_page)
+                                    <li class="next"><a href="{{ url(request()->path()) }}?page={{ $modules->current_page + 1 }}" class="btn btn-default btn-sm">{{ trans('pagination.next') }}</a></li>
+                                @endif
+                                @if ($modules->current_page > 1)
+                                    <li class="previous"><a href="{{ url(request()->path()) }}?page={{ $modules->current_page - 1 }}" class="btn btn-default btn-sm">{{ trans('pagination.previous') }}</a></li>
+                                @endif
+                            </ul>
+                        </div>
+                    @else
+                        <div class="card">
+                            <div class="card-body">
+                                <p class="col-md-12">
+                                    {{ trans('modules.no_apps') }}
+                                </p>
+
+                                <p class="col-md-12">
+                                    <small>{!! trans('modules.developer') !!}</small>
+                                </p>
+                            </div>
+                        </div>
+                    @endif
                 </div>
-            @endif
+            </div>
+        </div>
+
+        <div class="card-footer">
+            <div class="row">
+                <div class="col-md-12 text-right">
+                    <a href="{{ url('/') }}" class="btn btn-lg btn-success header-button-top"><span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to', ['name' => trans('general.dashboard')]) }}</a>
+                </div>
+            </div>
         </div>
     </div>
 @endsection
diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php
index fe5c5a812..c257c8fd2 100644
--- a/resources/views/wizard/taxes/index.blade.php
+++ b/resources/views/wizard/taxes/index.blade.php
@@ -4,9 +4,9 @@
 
 @section('content')
     <div class="card">
-        <div class="card-body">
+        <div class="card-header pb-0">
             <div class="container-fluid">
-                <div class="row mb--4">
+                <div class="row">
                     <hr class="wizard-line">
                     <div class="col-md-3">
                         <div class="text-center">
@@ -50,15 +50,10 @@
                 </div>
             </div>
         </div>
-    </div>
 
-    <div class="card">
-        <div class="card-header border-bottom-0">
+        <div class="card-body border-bottom-0">
             <div class="row">
-                <div class="col-6">
-                    <h3 class="mb-0">{{ trans_choice('general.taxes', 2) }}</h3>
-                </div>
-                <div class="col-6 text-right">
+                <div class="col-12 text-right">
                     <span class="new-button">
                         <button type="button" @click="onAddTax" class="btn btn-success btn-sm">
                             <span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}
@@ -129,10 +124,10 @@
 
                         <tr class="row align-items-center border-top-1" v-show="show">
                             <td class="col-xs-4 col-sm-3 tax-name">
-                                {{ Form::textGroup('name', trans('general.name'), 'id-card-o', [], null, '') }}
+                                {{ Form::textGroup('name', trans('general.name'), 'font', [], null, '') }}
                             </td>
                             <td class="col-sm-3 hidden-sm tax-rate">
-                                {{ Form::textGroup('rate', trans('currencies.rate'), 'money', ['required' => 'required'], null, '') }}
+                                {{ Form::textGroup('rate', trans('currencies.rate'), 'percentage', ['required' => 'required'], null, '') }}
                             </td>
                             <td class="col-xs-4 col-sm-3 tax-status">
                                 {{ Form::radioGroup('enabled', trans('general.enabled')) }}
@@ -157,7 +152,7 @@
         <div class="card-footer">
             <div class="row">
                 <div class="col-12 text-right">
-                    <a href="{{ url('wizard/finish') }}" id="wizard-skip" class="btn btn-white">
+                    <a href="{{ url('wizard/finish') }}" id="wizard-skip" class="btn btn-white header-button-top">
                         <span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}
                     </a>
                 </div>