diff --git a/rhodecode/public/css/polymer.less b/rhodecode/public/css/polymer.less
--- a/rhodecode/public/css/polymer.less
+++ b/rhodecode/public/css/polymer.less
@@ -9,8 +9,18 @@
 @import 'buttons';
 
 :root {
-  --primary-color: @rcblue;
-  --light-primary-color: @rclightblue;
-  --dark-primary-color: @rcdarkblue;
-  --primary-text-color: @grey2;
+    --primary-color: @rcblue;
+    --light-primary-color: @rclightblue;
+    --dark-primary-color: @rcdarkblue;
+    --primary-text-color: @text-color;
+
+    --paper-spinner-layer-1-color: @grey6;
+    --paper-spinner-layer-2-color: @grey5;
+    --paper-spinner-layer-3-color: @grey4;
+    --paper-spinner-layer-4-color: @grey3;
 }
+
+.paper-toggle-button {
+  display: inline;
+}
+
diff --git a/rhodecode/templates/admin/my_account/my_account_notifications.html b/rhodecode/templates/admin/my_account/my_account_notifications.html
--- a/rhodecode/templates/admin/my_account/my_account_notifications.html
+++ b/rhodecode/templates/admin/my_account/my_account_notifications.html
@@ -10,7 +10,7 @@
 
 <div class="panel panel-default">
   <div class="panel-heading">
-    <h3 class="panel-title">${_('Your live notification settings')}</h3>
+    <h3 class="panel-title">${_('Your Live Notification Settings')}</h3>
   </div>
     <div class="panel-body">
 
@@ -23,15 +23,13 @@
             <div class="fields">
                 <div class="field">
                     <div class="label">
-                        <label for="new_email">${_('Notifications status')}:</label>
+                        <label for="new_email">${_('Notifications Status')}:</label>
                     </div>
                     <div class="checkboxes">
-                        <div style="display: inline-block">
-                        <paper-toggle-button on-change="toggleNotifications"  ${'checked' if c.rhodecode_user.get_instance().user_data.get('notification_status') else ''}></paper-toggle-button>
+                        <paper-toggle-button class="paper-toggle-button" on-change="toggleNotifications"  ${'checked' if c.rhodecode_user.get_instance().user_data.get('notification_status') else ''}></paper-toggle-button>
                         <paper-tooltip>Toggle your notifications on/off globally.</paper-tooltip>
-                        </div>
                         <template is="dom-if" if="{{changeNotificationsLoading}}">
-                        <paper-spinner active class="toggle-ajax-spinner"></paper-spinner>
+                            <paper-spinner active class="toggle-ajax-spinner"></paper-spinner>
                         </template>
                     </div>
                 </div>