diff --git a/Riot/Constants/RiotDesignValues.h b/Riot/Constants/RiotDesignValues.h
index 9f0c8db51..e5d7909eb 100644
--- a/Riot/Constants/RiotDesignValues.h
+++ b/Riot/Constants/RiotDesignValues.h
@@ -38,7 +38,6 @@ extern NSString *const kRiotDesignValuesDidChangeThemeNotification;
 #pragma mark - Riot Theme Colors (depends on the selected theme light or dark).
 extern UIColor *kRiotPlaceholderTextColor; // nil is used to keep the default color.
 extern UIColor *kRiotSelectedBgColor; // nil is used to keep the default color.
-extern UIColor *kRiotAuxiliaryColor;
 extern UIColor *kRiotOverlayColor; // fading behind dialog modals. This color includes the transparency value.
 
 #pragma mark - Riot Colors
diff --git a/Riot/Constants/RiotDesignValues.m b/Riot/Constants/RiotDesignValues.m
index b90f8334f..33d4a05fd 100644
--- a/Riot/Constants/RiotDesignValues.m
+++ b/Riot/Constants/RiotDesignValues.m
@@ -28,7 +28,6 @@ NSString *const kRiotDesignValuesDidChangeThemeNotification = @"kRiotDesignValue
 
 UIColor *kRiotPlaceholderTextColor;
 UIColor *kRiotSelectedBgColor;
-UIColor *kRiotAuxiliaryColor;
 UIColor *kRiotOverlayColor;
 
 // Riot Colors
@@ -140,11 +139,6 @@ UIScrollViewIndicatorStyle kRiotScrollBarStyle;
         kRiotScrollBarStyle = UIScrollViewIndicatorStyleDefault;
     }
 
-    // Apply theme color constants
-    id<Theme> theme = [RiotDesignValues theme];
-
-    kRiotAuxiliaryColor = theme.headerTextSecondaryColor;
-
     [UIScrollView appearance].indicatorStyle = kRiotScrollBarStyle;
 
     [[NSNotificationCenter defaultCenter] postNotificationName:kRiotDesignValuesDidChangeThemeNotification object:nil];
diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
index 50dd66286..5a4a57628 100644
--- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
@@ -487,7 +487,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
         
         missedNotifAndUnreadBadgeBgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, bgViewWidth, 20)];
         [missedNotifAndUnreadBadgeBgView.layer setCornerRadius:10];
-        missedNotifAndUnreadBadgeBgView.backgroundColor = kRiotAuxiliaryColor;
+        missedNotifAndUnreadBadgeBgView.backgroundColor = RiotDesignValues.theme.headerTextSecondaryColor;
         
         [missedNotifAndUnreadBadgeBgView addSubview:missedNotifAndUnreadBadgeLabel];
         missedNotifAndUnreadBadgeLabel.center = missedNotifAndUnreadBadgeBgView.center;
diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
index 09fc2f07f..a103bf775 100644
--- a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
+++ b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
@@ -121,7 +121,7 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
             }
             else
             {
-                self.missedNotifAndUnreadIndicator.backgroundColor = kRiotAuxiliaryColor;
+                self.missedNotifAndUnreadIndicator.backgroundColor = RiotDesignValues.theme.headerTextSecondaryColor;
             }
             
             // Use bold font for the room title
diff --git a/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
index ff23658b1..817fd370c 100644
--- a/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
@@ -48,7 +48,7 @@
     // Remove default toolbar background color
     self.backgroundColor = [UIColor clearColor];
     
-    self.separatorView.backgroundColor = kRiotAuxiliaryColor;
+    self.separatorView.backgroundColor = RiotDesignValues.theme.headerTextSecondaryColor;
 
     self.disabledReasonTextView.font = [UIFont systemFontOfSize:15];
     self.disabledReasonTextView.textColor = RiotDesignValues.theme.textPrimaryColor;
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index ac7f5900a..f363c89a9 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -87,7 +87,7 @@
     // Remove default toolbar background color
     self.backgroundColor = [UIColor clearColor];
     
-    self.separatorView.backgroundColor = kRiotAuxiliaryColor;
+    self.separatorView.backgroundColor = RiotDesignValues.theme.headerTextSecondaryColor;
     
     // Custom the growingTextView display
     growingTextView.layer.cornerRadius = 0;
diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
index 837c78a72..e926afcf4 100644
--- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
@@ -168,7 +168,7 @@ static CGFloat const kTextFontSize = 15.0;
     self.deactivateAcccountButton.layer.masksToBounds = YES;
     self.deactivateAcccountButton.backgroundColor = RiotDesignValues.theme.tintColor;
     [self.deactivateAcccountButton setTitle:NSLocalizedStringFromTable(@"deactivate_account_validate_action", @"Vector", nil) forState:UIControlStateNormal];    
-    [self.deactivateAcccountButton setTitleColor:kRiotAuxiliaryColor forState:UIControlStateDisabled];
+    [self.deactivateAcccountButton setTitleColor:RiotDesignValues.theme.headerTextSecondaryColor forState:UIControlStateDisabled];
 }
 
 - (void)setupDeactivateAccountInfosLabel