diff --git a/app/assets/javascripts/discourse/views/buttons/category_notifications_button.js b/app/assets/javascripts/discourse/views/buttons/category_notifications_button.js
index 6e35508387e..7586ea1c5e7 100644
--- a/app/assets/javascripts/discourse/views/buttons/category_notifications_button.js
+++ b/app/assets/javascripts/discourse/views/buttons/category_notifications_button.js
@@ -12,10 +12,10 @@ Discourse.CategoryNotificationsButton = Discourse.View.extend({
   hidden: Em.computed.alias('category.deleted'),
   templateName: 'category_notification_dropdown',
 
-  watchingClasses: 'fa fa-circle heatmap-high',
-  trackingClasses: 'fa fa-circle heatmap-low',
-  mutedClasses: 'fa fa-times-circle',
-  regularClasses: 'fa fa-circle-o',
+  watchingClasses: 'fa fa-exclamation-circle watching',
+  trackingClasses: 'fa fa-circle tracking',
+  mutedClasses: 'fa fa-times-circle muted',
+  regularClasses: 'fa fa-circle-o regular',
 
 
   
@@ -30,7 +30,7 @@ Discourse.CategoryNotificationsButton = Discourse.View.extend({
     _.each([
       ['WATCHING', 'watching', this.watchingClasses],
       ['TRACKING', 'tracking', this.trackingClasses],
-      ['REGULAR', 'regular', this.regularClasses],
+      ['REGULAR', 'regular', ''],
       ['MUTED', 'muted', this.mutedClasses]
     ], function(pair) {
 
diff --git a/app/assets/stylesheets/desktop/category-notification.scss b/app/assets/stylesheets/desktop/category-notification.scss
index ee0ceaed498..b7478143d54 100644
--- a/app/assets/stylesheets/desktop/category-notification.scss
+++ b/app/assets/stylesheets/desktop/category-notification.scss
@@ -10,9 +10,9 @@
   padding: 4px 0;
   margin: 32px 560px;
   list-style: none;
-  background-color: $primary_background_color;
-  border: 1px solid $primary_border_color;
-  box-shadow: 0 1px 5px rgba($primary_shadow_color, .4);
+  background-color: $secondary;
+  border: 1px solid $primary;
+  box-shadow: 0 1px 5px rgba($primary, .4);
   background-clip: padding-box;
   span {font-size: 12px;}
   .title {font-weight: bold; display: block; font-size: 14px;}
@@ -23,15 +23,15 @@
     clear: both;
     font-weight: normal;
     line-height: 18px;
-    color: $primary_text_color;
+    color: $primary;
   }
 }
 .notification-dropdown-menu li > a:hover,
 .notification-dropdown-menu .active > a,
 .notification-dropdown-menu .active > a:hover {
-  color: $tertiary_text_color;
+  color: $secondary;
   text-decoration: none;
-  background-color: $emphasis_text_color;
+  background-color: scale-color($tertiary, $lightness: 50%);
 }
 .open > .notification-dropdown-menu {
   display: block;