diff --git a/Riot/Constants/Colors/DarkTheme.swift b/Riot/Constants/Colors/DarkTheme.swift
index a66f8dac2..ba742d496 100644
--- a/Riot/Constants/Colors/DarkTheme.swift
+++ b/Riot/Constants/Colors/DarkTheme.swift
@@ -43,8 +43,8 @@ final class DarkTheme: NSObject, Theme {
     let tintColor: UIColor = UIColor(rgb: 0x7AC9A1)
     let unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648)
     
-    let notificationUnreadColor: UIColor = UIColor(rgb: 0x7AC9A1)
-    let notificationMentionColor: UIColor = UIColor(rgb: 0xF56679)
+    let notificationSecondaryColor: UIColor = UIColor(rgb: 0x7AC9A1)
+    let notificationPrimaryColor: UIColor = UIColor(rgb: 0xF56679)
 
     let avatarColors: [UIColor] = [
         UIColor(rgb: 0x7AC9A1),
diff --git a/Riot/Constants/Colors/DefaultTheme.swift b/Riot/Constants/Colors/DefaultTheme.swift
index 96794e9f5..ed81ba251 100644
--- a/Riot/Constants/Colors/DefaultTheme.swift
+++ b/Riot/Constants/Colors/DefaultTheme.swift
@@ -43,8 +43,8 @@ final class DefaultTheme: NSObject, Theme {
     let tintColor: UIColor = UIColor(rgb: 0x7AC9A1)
     let unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648)
     
-    let notificationUnreadColor: UIColor = UIColor(rgb: 0x7AC9A1)
-    let notificationMentionColor: UIColor = UIColor(rgb: 0xF56679)
+    let notificationSecondaryColor: UIColor = UIColor(rgb: 0x7AC9A1)
+    let notificationPrimaryColor: UIColor = UIColor(rgb: 0xF56679)
 
     let avatarColors: [UIColor] = [
         UIColor(rgb: 0x7AC9A1),
diff --git a/Riot/Constants/Colors/Theme.swift b/Riot/Constants/Colors/Theme.swift
index 82f7017a7..bbf46aa58 100644
--- a/Riot/Constants/Colors/Theme.swift
+++ b/Riot/Constants/Colors/Theme.swift
@@ -41,8 +41,10 @@ import UIKit
 
     var unreadRoomIndentColor: UIColor { get }
 
-    var notificationUnreadColor: UIColor { get }
-    var notificationMentionColor: UIColor { get }
+    /// Color for notifications for unread messages
+    var notificationSecondaryColor: UIColor { get }
+    /// Color for notifications for mention messages
+    var notificationPrimaryColor: UIColor { get }
 
     var avatarColors: [UIColor] { get }
 
diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
index 368246820..cc0903d79 100644
--- a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
+++ b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
@@ -109,7 +109,7 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
             
             if (0 < roomCellData.notificationCount)
             {
-                self.missedNotifAndUnreadIndicator.backgroundColor = roomCellData.highlightCount ? ThemeService.shared.theme.notificationMentionColor : ThemeService.shared.theme.notificationUnreadColor;
+                self.missedNotifAndUnreadIndicator.backgroundColor = roomCellData.highlightCount ? ThemeService.shared.theme.notificationPrimaryColor : ThemeService.shared.theme.notificationSecondaryColor;
                 
                 self.missedNotifAndUnreadBadgeBgView.hidden = NO;
                 self.missedNotifAndUnreadBadgeBgView.backgroundColor = self.missedNotifAndUnreadIndicator.backgroundColor;
diff --git a/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m b/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
index 783cb420d..0152d8382 100644
--- a/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
+++ b/Riot/Modules/Communities/Views/GroupInviteTableViewCell.m
@@ -58,7 +58,7 @@ NSString *const kGroupInviteTableViewCellRoomKey = @"kGroupInviteTableViewCellRo
     self.leftButton.backgroundColor = ThemeService.shared.riotColorBlue;
     self.rightButton.backgroundColor = ThemeService.shared.riotColorBlue;
     
-    self.noticeBadgeView.backgroundColor = ThemeService.shared.theme.notificationMentionColor;
+    self.noticeBadgeView.backgroundColor = ThemeService.shared.theme.notificationPrimaryColor;
 }
 
 - (void)onDeclinePressed:(id)sender
diff --git a/Riot/Modules/Home/Views/RoomCollectionViewCell.m b/Riot/Modules/Home/Views/RoomCollectionViewCell.m
index a9ccbd35f..1d9cb0f54 100644
--- a/Riot/Modules/Home/Views/RoomCollectionViewCell.m
+++ b/Riot/Modules/Home/Views/RoomCollectionViewCell.m
@@ -126,7 +126,7 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
             if (0 < roomCellData.notificationCount)
             {
                 self.missedNotifAndUnreadBadgeBgView.hidden = NO;
-                self.missedNotifAndUnreadBadgeBgView.backgroundColor = roomCellData.highlightCount ? ThemeService.shared.theme.notificationMentionColor : ThemeService.shared.theme.notificationUnreadColor;
+                self.missedNotifAndUnreadBadgeBgView.backgroundColor = roomCellData.highlightCount ? ThemeService.shared.theme.notificationPrimaryColor : ThemeService.shared.theme.notificationSecondaryColor;
                 
                 self.missedNotifAndUnreadBadgeLabel.text = roomCellData.notificationCountStringValue;
                 [self.missedNotifAndUnreadBadgeLabel sizeToFit];
@@ -147,7 +147,7 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
         else if (roomCellData.roomSummary.room.summary.membership == MXMembershipInvite)
         {
             self.missedNotifAndUnreadBadgeBgView.hidden = NO;
-            self.missedNotifAndUnreadBadgeBgView.backgroundColor = ThemeService.shared.theme.notificationMentionColor;
+            self.missedNotifAndUnreadBadgeBgView.backgroundColor = ThemeService.shared.theme.notificationPrimaryColor;
             
             self.missedNotifAndUnreadBadgeLabel.text = @"!";
             [self.missedNotifAndUnreadBadgeLabel sizeToFit];
diff --git a/Riot/Modules/People/Views/InviteRecentTableViewCell.m b/Riot/Modules/People/Views/InviteRecentTableViewCell.m
index e094e6c85..993ed2a89 100644
--- a/Riot/Modules/People/Views/InviteRecentTableViewCell.m
+++ b/Riot/Modules/People/Views/InviteRecentTableViewCell.m
@@ -63,7 +63,7 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
     self.leftButton.backgroundColor = ThemeService.shared.theme.tintColor;
     self.rightButton.backgroundColor = ThemeService.shared.theme.tintColor;
     
-    self.noticeBadgeView.backgroundColor = ThemeService.shared.theme.notificationMentionColor;
+    self.noticeBadgeView.backgroundColor = ThemeService.shared.theme.notificationPrimaryColor;
 }
 
 - (void)onDeclinePressed:(id)sender
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index f16e9cd7d..5f487e571 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -4230,11 +4230,11 @@
             // Set the right background color
             if (highlightCount)
             {
-                missedDiscussionsBadgeLabelBgView.backgroundColor = ThemeService.shared.theme.notificationMentionColor;
+                missedDiscussionsBadgeLabelBgView.backgroundColor = ThemeService.shared.theme.notificationPrimaryColor;
             }
             else
             {
-                missedDiscussionsBadgeLabelBgView.backgroundColor = ThemeService.shared.theme.notificationUnreadColor;
+                missedDiscussionsBadgeLabelBgView.backgroundColor = ThemeService.shared.theme.notificationSecondaryColor;
             }
             
             if (!missedDiscussionsButton || [leftBarButtonItems indexOfObject:missedDiscussionsButton] == NSNotFound)
diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m
index 2d89150c7..0e93fc032 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.m
+++ b/Riot/Modules/TabBar/MasterTabBarController.m
@@ -798,15 +798,15 @@
     // Use a middle dot to signal missed notif in favourites
     [self setMissedDiscussionsMark:(recentsDataSource.missedFavouriteDiscussionsCount? @"\u00B7": nil)
                       onTabBarItem:TABBAR_FAVOURITES_INDEX
-                    withBadgeColor:(recentsDataSource.missedHighlightFavouriteDiscussionsCount ? ThemeService.shared.theme.notificationMentionColor : ThemeService.shared.theme.notificationUnreadColor)];
+                    withBadgeColor:(recentsDataSource.missedHighlightFavouriteDiscussionsCount ? ThemeService.shared.theme.notificationPrimaryColor : ThemeService.shared.theme.notificationSecondaryColor)];
     
     // Update the badge on People and Rooms tabs
     [self setMissedDiscussionsCount:recentsDataSource.missedDirectDiscussionsCount
                        onTabBarItem:TABBAR_PEOPLE_INDEX
-                     withBadgeColor:(recentsDataSource.missedHighlightDirectDiscussionsCount ? ThemeService.shared.theme.notificationMentionColor : ThemeService.shared.theme.notificationUnreadColor)];
+                     withBadgeColor:(recentsDataSource.missedHighlightDirectDiscussionsCount ? ThemeService.shared.theme.notificationPrimaryColor : ThemeService.shared.theme.notificationSecondaryColor)];
     [self setMissedDiscussionsCount:recentsDataSource.missedGroupDiscussionsCount
                        onTabBarItem:TABBAR_ROOMS_INDEX
-                     withBadgeColor:(recentsDataSource.missedHighlightGroupDiscussionsCount ? ThemeService.shared.theme.notificationMentionColor : ThemeService.shared.theme.notificationUnreadColor)];
+                     withBadgeColor:(recentsDataSource.missedHighlightGroupDiscussionsCount ? ThemeService.shared.theme.notificationPrimaryColor : ThemeService.shared.theme.notificationSecondaryColor)];
 }
 
 - (void)setMissedDiscussionsCount:(NSUInteger)count onTabBarItem:(NSUInteger)index withBadgeColor:(UIColor*)badgeColor
diff --git a/Riot/Utils/EventFormatter.m b/Riot/Utils/EventFormatter.m
index ea370402d..7b893c038 100644
--- a/Riot/Utils/EventFormatter.m
+++ b/Riot/Utils/EventFormatter.m
@@ -220,7 +220,7 @@ NSString *const kEventFormatterOnReRequestKeysLinkActionSeparator = @"/";
         self.defaultTextColor = ThemeService.shared.theme.textPrimaryColor;
         self.subTitleTextColor = ThemeService.shared.theme.textSecondaryColor;
         self.prefixTextColor = ThemeService.shared.theme.textSecondaryColor;
-        self.bingTextColor = ThemeService.shared.theme.notificationMentionColor;
+        self.bingTextColor = ThemeService.shared.theme.notificationPrimaryColor;
         self.encryptingTextColor = ThemeService.shared.theme.tintColor;
         self.sendingTextColor = ThemeService.shared.theme.textSecondaryColor;
         self.errorTextColor = ThemeService.shared.riotColorRed;