diff --git a/public/css/element.css b/public/css/element.css
index f7007c501..0920b12d4 100644
--- a/public/css/element.css
+++ b/public/css/element.css
@@ -10547,12 +10547,6 @@
     background: #6da252;
 }
 
-.el-step__head.is-success .el-step__icon:hover {
-    cursor: pointer;
-    border: 5px solid #3c3f72;
-    background: #3c3f72;
-}
-
 .el-step__head.is-wait .el-step__icon-inner {
     color: #999999;
 }
diff --git a/resources/assets/js/views/wizard/company.js b/resources/assets/js/views/wizard/company.js
index 42e0762cf..eca63d48e 100644
--- a/resources/assets/js/views/wizard/company.js
+++ b/resources/assets/js/views/wizard/company.js
@@ -40,7 +40,7 @@ const app = new Vue({
 
     methods: {
         next() {
-            if (this.active++ > 1) this.active = 0;
+            if (this.active++ > 3) this.active = 0;
         }
     }
 });
diff --git a/resources/assets/js/views/wizard/currencies.js b/resources/assets/js/views/wizard/currencies.js
index 68168bdd8..0d3096f63 100644
--- a/resources/assets/js/views/wizard/currencies.js
+++ b/resources/assets/js/views/wizard/currencies.js
@@ -108,7 +108,7 @@ const app = new Vue({
         },
 
         next() {
-            if (this.active++ > 1) this.active = 0;
+            if (this.active++ > 3) this.active = 0;
         }
     }
 });
diff --git a/resources/assets/js/views/wizard/finish.js b/resources/assets/js/views/wizard/finish.js
index d4ef21a76..626052e86 100644
--- a/resources/assets/js/views/wizard/finish.js
+++ b/resources/assets/js/views/wizard/finish.js
@@ -37,7 +37,7 @@ const app = new Vue({
 
     methods: {
         next() {
-            if (this.active++ > 1) this.active = 0;
+            if (this.active++ > 3) this.active = 0;
           }
     }
 });
diff --git a/resources/assets/js/views/wizard/taxes.js b/resources/assets/js/views/wizard/taxes.js
index f99ebc2fc..ab39ba81f 100644
--- a/resources/assets/js/views/wizard/taxes.js
+++ b/resources/assets/js/views/wizard/taxes.js
@@ -80,7 +80,7 @@ const app = new Vue({
         },
 
         next() {
-            if (this.active++ > 1) this.active = 0;
+            if (this.active++ > 3) this.active = 0;
         }
     }
 });
diff --git a/resources/views/partials/wizard/steps.blade.php b/resources/views/partials/wizard/steps.blade.php
index 178268306..0b0131b49 100644
--- a/resources/views/partials/wizard/steps.blade.php
+++ b/resources/views/partials/wizard/steps.blade.php
@@ -1,10 +1,10 @@
 @stack('steps_start')
     <div class="card-header wizard-header p-3">
         <el-steps :active="active" finish-status="success" align-center>
-            <el-step href="{{ url('wizard/companies') }}" title="Company"></el-step>
-            <el-step href="{{ url('wizard/currencies') }}" title="Currency"></el-step>
-            <el-step href="{{ url('wizard/taxes') }}" title="Taxes"></el-step>
-            <el-step href="{{ url('wizard/finish') }}" title="Finish"></el-step>
+            <el-step title="Company"></el-step>
+            <el-step title="Currency"></el-step>
+            <el-step title="Taxes"></el-step>
+            <el-step title="Finish"></el-step>
         </el-steps>
     </div>
 @stack('steps_end')
diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php
index 7e2157270..911b3b3b4 100644
--- a/resources/views/wizard/companies/edit.blade.php
+++ b/resources/views/wizard/companies/edit.blade.php
@@ -63,13 +63,13 @@
 
             <div class="card-footer">
                 <div class="row">
-                    <div class="col-12 text-right">
+                    <div class="col-md-12 text-right">
                         {!! Form::button(
                             '<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" @click="next">
-                            <span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}
+                            <span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }}
                         </a>
                     </div>
                 </div>
diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php
index e2e83c34e..cc0637116 100644
--- a/resources/views/wizard/currencies/index.blade.php
+++ b/resources/views/wizard/currencies/index.blade.php
@@ -122,9 +122,14 @@
 
         <div class="card-footer">
             <div class="row">
-                <div class="col-12 text-right">
+                <div class="col-md-6">
+                    <a href="{{ url('wizard/companies') }}" class="btn btn-white header-button-top">
+                        <span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}
+                    </a>
+                </div>
+                <div class="col-md-6 text-right">
                     <a href="{{ url('wizard/taxes') }}" id="wizard-skip" class="btn btn-white header-button-top" @click="next">
-                        <span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}
+                        <span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }}
                     </a>
                 </div>
             </div>
diff --git a/resources/views/wizard/finish/index.blade.php b/resources/views/wizard/finish/index.blade.php
index 6a8b133a4..8e88bc238 100644
--- a/resources/views/wizard/finish/index.blade.php
+++ b/resources/views/wizard/finish/index.blade.php
@@ -49,7 +49,12 @@
 
         <div class="card-footer">
             <div class="row">
-                <div class="col-md-12 text-right">
+                <div class="col-md-6">
+                    <a href="{{ url('wizard/taxes') }}" class="btn btn-white header-button-top">
+                        <span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}
+                    </a>
+                </div>
+                <div class="col-md-6 text-right">
                     <a href="{{ url('/') }}" class="btn btn-lg btn-success header-button-top" @click="next">
                         <span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}
                     </a>
diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php
index 56b1f2be8..6185177b1 100644
--- a/resources/views/wizard/taxes/index.blade.php
+++ b/resources/views/wizard/taxes/index.blade.php
@@ -105,9 +105,14 @@
 
         <div class="card-footer">
             <div class="row">
-                <div class="col-12 text-right">
+                <div class="col-md-6">
+                    <a href="{{ url('wizard/currencies') }}" class="btn btn-white header-button-top">
+                        <span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}
+                    </a>
+                </div>
+                <div class="col-md-6 text-right">
                     <a href="{{ url('wizard/finish') }}" id="wizard-skip" class="btn btn-white header-button-top" @click="next">
-                        <span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}
+                        <span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }}
                     </a>
                 </div>
             </div>