diff --git a/application/views/appointments/book.php b/application/views/appointments/book.php
index 5ce80347..1e56b2e6 100755
--- a/application/views/appointments/book.php
+++ b/application/views/appointments/book.php
@@ -188,7 +188,7 @@
                     <button type="button" id="button-next-1" class="btn button-next btn-info"
                             data-step_index="1">
                         <?= lang('next') ?>
-                        <i class="fas fa-long-arrow-alt-right"></i>
+                        <i class="fas fa-long-arrow-alt-right ml-2"></i>
                     </button>
                 </div>
             </div>
@@ -221,13 +221,13 @@
                 <div class="command-buttons">
                     <button type="button" id="button-back-2" class="btn button-back btn-light"
                             data-step_index="2">
-                        <i class="fas fa-long-arrow-alt-left"></i>
+                        <i class="fas fa-long-arrow-alt-left mr-2"></i>
                         <?= lang('back') ?>
                     </button>
                     <button type="button" id="button-next-2" class="btn button-next btn-info"
                             data-step_index="2">
                         <?= lang('next') ?>
-                        <i class="fas fa-long-arrow-alt-right"></i>
+                        <i class="fas fa-long-arrow-alt-right ml-2"></i>
                     </button>
                 </div>
             </div>
@@ -320,13 +320,14 @@
 
                 <div class="command-buttons">
                     <button type="button" id="button-back-3" class="btn button-back btn-light"
-                            data-step_index="3"><i class="fas fa-long-arrow-alt-left"></i>
+                            data-step_index="3">
+                        <i class="fas fa-long-arrow-alt-left mr-2"></i>
                         <?= lang('back') ?>
                     </button>
                     <button type="button" id="button-next-3" class="btn button-next btn-info"
                             data-step_index="3">
                         <?= lang('next') ?>
-                        <i class="fas fa-long-arrow-alt-right"></i>
+                        <i class="fas fa-long-arrow-alt-right ml-2"></i>
                     </button>
                 </div>
             </div>
@@ -358,12 +359,12 @@
                 <div class="command-buttons">
                     <button type="button" id="button-back-4" class="btn button-back btn-light"
                             data-step_index="4">
-                        <i class="fas fa-long-arrow-alt-left"></i>
+                        <i class="fas fa-long-arrow-alt-left mr-2"></i>
                         <?= lang('back') ?>
                     </button>
                     <form id="book-appointment-form" style="display:inline-block" method="post">
                         <button id="book-appointment-submit" type="button" class="btn btn-success">
-                            <i class="far fa-check-circle"></i>
+                            <i class="far fa-plus-square mr-2"></i>
                             <?= ! $manage_mode ? lang('confirm') : lang('update') ?>
                         </button>
                         <input type="hidden" name="csrfToken"/>
diff --git a/application/views/backend/calendar.php b/application/views/backend/calendar.php
index 32f7ec68..7ff2409f 100755
--- a/application/views/backend/calendar.php
+++ b/application/views/backend/calendar.php
@@ -61,7 +61,7 @@
 
                 <button id="enable-sync" class="btn btn-light" data-toggle="button"
                         title="<?= lang('enable_appointment_sync_hint') ?>">
-                    <i class="far fa-calendar-alt"></i>
+                    <i class="far fa-calendar-alt mr-2"></i>
                     <span><?= lang('enable_sync') ?></span>
                 </button>
             <?php endif ?>
diff --git a/application/views/backend/header.php b/application/views/backend/header.php
index c277c725..d93ee708 100755
--- a/application/views/backend/header.php
+++ b/application/views/backend/header.php
@@ -52,6 +52,7 @@
             <li class="nav-item <?= $active . $hidden ?>">
                 <a href="<?= site_url('backend') ?>" class="nav-link"
                         title="<?= lang('manage_appointment_record_hint') ?>">
+                    <i class="far fa-calendar-alt mr-2"></i>
                     <?= lang('calendar') ?>
                 </a>
             </li>
@@ -61,6 +62,7 @@
             <li class="nav-item <?= $active . $hidden ?>">
                 <a href="<?= site_url('backend/customers') ?>" class="nav-link"
                         title="<?= lang('manage_customers_hint') ?>">
+                    <i class="fas fa-user-friends mr-2"></i>
                     <?= lang('customers') ?>
                 </a>
             </li>
@@ -70,6 +72,7 @@
             <li class="nav-item <?= $active . $hidden ?>">
                 <a href="<?= site_url('backend/services') ?>" class="nav-link"
                         title="<?= lang('manage_services_hint') ?>">
+                    <i class="fas fa-business-time mr-2"></i>
                     <?= lang('services') ?>
                 </a>
             </li>
@@ -79,6 +82,7 @@
             <li class="nav-item <?= $active . $hidden ?>">
                 <a href="<?= site_url('backend/users') ?>" class="nav-link"
                         title="<?= lang('manage_users_hint') ?>">
+                    <i class="fas fa-users-cog mr-2"></i>
                     <?= lang('users') ?>
                 </a>
             </li>
@@ -89,6 +93,7 @@
             <li class="nav-item <?= $active . $hidden ?>">
                 <a href="<?= site_url('backend/settings') ?>" class="nav-link"
                         title="<?= lang('settings_hint') ?>">
+                    <i class="fas fa-cogs mr-2"></i>
                     <?= lang('settings') ?>
                 </a>
             </li>
@@ -96,6 +101,7 @@
             <li class="nav-item">
                 <a href="<?= site_url('user/logout') ?>" class="nav-link"
                         title="<?= lang('log_out_hint') ?>">
+                    <i class="fas fa-sign-out-alt mr-2"></i>
                     <?= lang('log_out') ?>
                 </a>
             </li>
diff --git a/application/views/general/error404.php b/application/views/general/error404.php
index 97e15933..07e8fa58 100644
--- a/application/views/general/error404.php
+++ b/application/views/general/error404.php
@@ -36,12 +36,12 @@
         <br>
 
         <a href="<?= site_url() ?>" class="btn btn-primary btn-large">
-            <i class="far fa-calendar-alt"></i>
+            <i class="far fa-calendar-alt mr-2"></i>
             <?= lang('book_appointment_title') ?>
         </a>
 
         <a href="<?= site_url('backend') ?>" class="btn btn-light btn-large">
-            <i class="fas fa-wrench"></i>
+            <i class="fas fa-wrench mr-2"></i>
             <?= lang('backend_section') ?>
         </a>
 
diff --git a/application/views/general/installation.php b/application/views/general/installation.php
index 99a868f7..bc311d4c 100755
--- a/application/views/general/installation.php
+++ b/application/views/general/installation.php
@@ -125,7 +125,7 @@
         <br>
 
         <button type="button" id="install" class="btn btn-success btn-large">
-            <i class="icon-white icon-ok"></i>
+            <i class="icon-white icon-ok mr-2"></i>
             Install Easy!Appointments</button>
     </div>
 
diff --git a/application/views/general/update.php b/application/views/general/update.php
index 78f7ca56..854bded0 100644
--- a/application/views/general/update.php
+++ b/application/views/general/update.php
@@ -46,7 +46,7 @@
 
         <div>
             <a href="<?= site_url('backend') ?>" class="btn btn-light btn-large">
-                <i class="fas fa-wrench"></i>
+                <i class="fas fa-wrench mr-2"></i>
                 <?= lang('backend_section') ?>
             </a>
         </div>
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php
index 5db9d4b5..ccce2cd0 100644
--- a/application/views/user/forgot_password.php
+++ b/application/views/user/forgot_password.php
@@ -51,6 +51,7 @@
             <br>
 
             <button type="submit" id="get-new-password" class="btn btn-primary btn-large">
+                <i class="fas fa-unlock-alt mr-2"></i>
                 <?= lang('regenerate_password') ?>
             </button>
 
diff --git a/application/views/user/login.php b/application/views/user/login.php
index 885c43a6..599148e6 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -60,7 +60,8 @@
             <br>
 
             <button type="submit" id="login" class="btn btn-primary">
-            	<?= lang('login') ?>
+                <i class="fas fa-sign-in-alt mr-2"></i>
+                <?= lang('login') ?>
             </button>
 
             <br>
diff --git a/application/views/user/logout.php b/application/views/user/logout.php
index 688d2702..0cb88a41 100644
--- a/application/views/user/logout.php
+++ b/application/views/user/logout.php
@@ -33,12 +33,12 @@
         <br>
 
         <a href="<?= site_url() ?>" class="btn btn-success btn-large">
-            <i class="far fa-calendar-alt"></i>
+            <i class="far fa-calendar-alt mr-2"></i>
             <?= lang('book_appointment_title') ?>
         </a>
 
         <a href="<?= site_url('backend') ?>" class="btn btn-light btn-large">
-            <i class="fas fa-wrench"></i>
+            <i class="fas fa-wrench mr-2"></i>
             <?= lang('backend_section') ?>
         </a>
 
diff --git a/application/views/user/no_privileges.php b/application/views/user/no_privileges.php
index 93e75df8..035462d5 100644
--- a/application/views/user/no_privileges.php
+++ b/application/views/user/no_privileges.php
@@ -28,7 +28,7 @@
         <br>
 
         <a href="<?= site_url('backend') ?>" class="btn btn-success btn-large">
-            <i class="icon-calendar icon-white"></i>
+            <i class="icon-calendar icon-white mr-2"></i>
             <?= lang('backend_calendar') ?>
         </a>