diff --git a/src/application/views/appointments/book.php b/src/application/views/appointments/book.php
index e38ab020..3bdde8ec 100644
--- a/src/application/views/appointments/book.php
+++ b/src/application/views/appointments/book.php
@@ -139,7 +139,7 @@
                                             . '/index.php/appointments/cancel/' . $appointment_data['hash'] . '">
                                         <input type="hidden" name="csrfToken" value="' . $this->security->get_csrf_hash() . '" />
                                         <textarea name="cancel_reason" style="display:none"></textarea>
-                                        <button id="cancel-appointment" class="btn btn-inverse">' .
+                                        <button id="cancel-appointment" class="btn btn-default">' .
                                                 $this->lang->line('cancel') . '</button>
                                     </form>
                                 </div>
@@ -247,7 +247,8 @@
                         <button type="button" id="button-next-1" class="btn button-next btn-primary" 
                                 data-step_index="1">
                             <?php echo $this->lang->line('next'); ?> 
-                            <i class="icon-forward icon-white"></i></button>
+                            <span class="glyphicon glyphicon-forward"></span>
+                        </button>
                     </div>
                 </div>
 
@@ -274,13 +275,14 @@
                     
                     <div class="command-buttons">
                         <button type="button" id="button-back-2" class="btn button-back" 
-                                data-step_index="2"><i class="icon-backward"></i> 
+                                data-step_index="2">
+                            <span class="glyphicon glyphicon-backward"></span> 
                             <?php echo $this->lang->line('back'); ?>
                         </button>
                         <button type="button" id="button-next-2" class="btn button-next btn-primary" 
                                 data-step_index="2">
                             <?php echo $this->lang->line('next'); ?>
-                            <i class="icon-forward icon-white"></i>
+                            <span class="glyphicon glyphicon-forward"></span>
                         </button>
                     </div>
                 </div>
@@ -339,13 +341,13 @@
                     
                     <div class="command-buttons">
                         <button type="button" id="button-back-3" class="btn button-back" 
-                                data-step_index="3"><i class="icon-backward"></i> 
+                                data-step_index="3"><span class="glyphicon glyphicon-backward"></span> 
                             <?php echo $this->lang->line('back'); ?>
                         </button>
                         <button type="button" id="button-next-3" class="btn button-next btn-primary" 
                                 data-step_index="3">
                             <?php echo $this->lang->line('next'); ?>
-                            <i class="icon-forward icon-white"></i>
+                            <span class="glyphicon glyphicon-forward"></span>
                         </button>
                     </div>
                 </div>
@@ -365,12 +367,13 @@
                     
                     <div class="command-buttons">
                         <button type="button" id="button-back-4" class="btn button-back" 
-                                data-step_index="4"><i class="icon-backward"></i> 
+                                data-step_index="4">
+                            <span class="glyphicon glyphicon-backward"></span> 
                             <?php echo $this->lang->line('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="icon-ok icon-white"></i>
+                                <span class="glyphicon glyphicon-ok"></span>
                                 <?php
                                     echo (!$manage_mode) ? $this->lang->line('confirm')
                                             : $this->lang->line('update');
diff --git a/src/application/views/appointments/book_success.php b/src/application/views/appointments/book_success.php
index f2b6549a..b47af824 100644
--- a/src/application/views/appointments/book_success.php
+++ b/src/application/views/appointments/book_success.php
@@ -48,7 +48,7 @@
                         if ($this->config->item('ea_google_sync_feature')) { 
                             echo '
                                 <button id="add-to-google-calendar" class="btn btn-primary">
-                                    <i class="icon-plus icon-white"></i>
+                                    <span class="glyphicon glyphicon-plus"></span>
                                     ' . $this->lang->line('add_to_google_calendar') . '
                                 </button>';
                         }
diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php
index cffec2f7..d60d3e63 100644
--- a/src/application/views/backend/calendar.php
+++ b/src/application/views/backend/calendar.php
@@ -51,7 +51,7 @@
                     <button id="google-sync" class="btn btn-primary" 
                             title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>">
                         <span class="glyphicon glyphicon-refresh"></span>
-                            <?php echo $this->lang->line('synchronize'); ?>
+                        <span><?php echo $this->lang->line('synchronize'); ?></span>
                     </button>
                 
                     <button id="enable-sync" class="btn" data-toggle="button" 
@@ -70,7 +70,7 @@
             
             <?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE) { ?>
             <div class="btn-group">
-                <button id="insert-appointment" class="btn btn-info" 
+                <button id="insert-appointment" class="btn btn-primary" 
                         title="<?php echo $this->lang->line('new_appointment_hint'); ?>">
                     <span class="glyphicon glyphicon-plus"></span>
                     <?php echo $this->lang->line('appointment'); ?>
diff --git a/src/assets/css/general.css b/src/assets/css/general.css
index 107db032..50cd5d41 100644
--- a/src/assets/css/general.css
+++ b/src/assets/css/general.css
@@ -116,4 +116,11 @@ li.language:hover {
 
 .ui-timepicker-rtl{ direction: rtl; }
 .ui-timepicker-rtl dl { text-align: right; }
-.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }
\ No newline at end of file
+.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }
+
+
+/* BOOTSTRAP THEME FIXES
+   ------------------------------------------------------------------------- */
+.btn-danger:active, .btn-danger.active, .open>.dropdown-toggle.btn-danger {
+    background-color: #E24C52;
+}
\ No newline at end of file
diff --git a/src/assets/js/backend_calendar.js b/src/assets/js/backend_calendar.js
index 1a71826c..495a36a7 100644
--- a/src/assets/js/backend_calendar.js
+++ b/src/assets/js/backend_calendar.js
@@ -267,7 +267,7 @@ var BackendCalendar = {
                 // If the user has already the sync enabled then apply the proper
                 // style changes.
                 if ($('#select-filter-item option:selected').attr('google-sync') === 'true') {
-                    $('#enable-sync').addClass('btn-success enabled');
+                    $('#enable-sync').addClass('btn-danger enabled');
                     $('#enable-sync span:eq(1)').text(EALang['disable_sync']);
                     $('#google-sync').prop('disabled', false);
                 } else {
@@ -712,7 +712,7 @@ var BackendCalendar = {
                             // The user has granted access to his data.
                             windowHandle.close();
                             window.clearInterval(authInterval);
-                            $('#enable-sync').addClass('btn-success enabled');
+                            $('#enable-sync').addClass('btn-danger enabled');
                             $('#enable-sync span:eq(1)').text(EALang['disable_sync']);
                             $('#google-sync').prop('disabled', false);
                             $('#select-filter-item option:selected').attr('google-sync', 'true');