diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php
index cf2c7de4..f7a89d27 100644
--- a/src/application/views/backend/calendar.php
+++ b/src/application/views/backend/calendar.php
@@ -46,20 +46,19 @@
         
         <div id="calendar-actions">
             <div class="btn-group">
-                <?php //if ($privileges[PRIV_USERS]['edit'] == TRUE) { ?>
                 <?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER)
-                        && $this->config->item('ea_google_sync_feature') == TRUE) { ?>
-                <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'); ?>
-                </button>
-
-                <button id="enable-sync" class="btn" data-toggle="button" 
-                        title="<?php echo $this->lang->line('enable_appointment_sync_hint'); ?>">
-                    <span class="glyphicon glyphicon-calendar"></span>
-                    <?php echo $this->lang->line('enable_sync'); ?>
-                </button>
+                        && Config::GOOGLE_SYNC_FEATURE == TRUE) { ?>
+                    <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'); ?>
+                    </button>
+                
+                    <button id="enable-sync" class="btn" data-toggle="button" 
+                            title="<?php echo $this->lang->line('enable_appointment_sync_hint'); ?>">
+                        <span class="glyphicon glyphicon-calendar"></span>
+                        <?php echo $this->lang->line('enable_sync'); ?>
+                    </button>
                 <?php } ?>
                 
                 <button id="reload-appointments" class="btn" 
diff --git a/src/assets/js/backend_calendar.js b/src/assets/js/backend_calendar.js
index a31b83ed..f5c4fbf4 100644
--- a/src/assets/js/backend_calendar.js
+++ b/src/assets/js/backend_calendar.js
@@ -268,13 +268,13 @@ var BackendCalendar = {
                 // style changes.
                 if ($('#select-filter-item option:selected').attr('google-sync') === 'true') {
                     $('#enable-sync').addClass('btn-success enabled');
-                    $('#enable-sync i').addClass('icon-white');
-                    $('#enable-sync span').text(EALang['disable_sync']);
+                    $('#enable-sync span:eq(1)').addClass('icon-white');
+                    $('#enable-sync span:eq(2)').text(EALang['disable_sync']);
                     $('#google-sync').prop('disabled', false);
                 } else {
                     $('#enable-sync').removeClass('btn-success enabled');
-                    $('#enable-sync i').removeClass('icon-white');
-                    $('#enable-sync span').text(EALang['enable_sync']);
+                    $('#enable-sync span:eq(1)').removeClass('icon-white');
+                    $('#enable-sync span:eq(2)').text(EALang['enable_sync']);
                     $('#google-sync').prop('disabled', true);
                 }
             }
@@ -715,8 +715,8 @@ var BackendCalendar = {
                             windowHandle.close();
                             window.clearInterval(authInterval);
                             $('#enable-sync').addClass('btn-success enabled');
-                            $('#enable-sync i').addClass('icon-white');
-                            $('#enable-sync span').text(EALang['disable_sync']);
+                            $('#enable-sync span:eq(1)').addClass('icon-white');
+                            $('#enable-sync span:eq(2)').text(EALang['disable_sync']);
                             $('#google-sync').prop('disabled', false);
                             $('#select-filter-item option:selected').attr('google-sync', 'true');
                             
@@ -760,8 +760,8 @@ var BackendCalendar = {
                         BackendCalendar.disableProviderSync(provider['id']);
                         
                         $('#enable-sync').removeClass('btn-success enabled');
-                        $('#enable-sync i').removeClass('icon-white');
-                        $('#enable-sync span').text(EALang['enable_sync']);
+                        $('#enable-sync span:eq(1)').removeClass('icon-white');
+                        $('#enable-sync span:eq(2)').text(EALang['enable_sync']);
                         $('#google-sync').prop('disabled', true);
                         $('#select-filter-item option:selected').attr('google-sync', 'false');