diff --git a/Riot/Modules/Authentication/AuthenticationViewController.h b/Riot/Modules/Authentication/AuthenticationViewController.h
index 67b3b0463..5358f20f6 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.h
+++ b/Riot/Modules/Authentication/AuthenticationViewController.h
@@ -20,6 +20,7 @@
 @interface AuthenticationViewController : MXKAuthenticationViewController <MXKAuthenticationViewControllerDelegate>
 
 @property (weak, nonatomic) IBOutlet UINavigationBar *navigationBar;
+@property (weak, nonatomic) IBOutlet UIView *navigationBarSeparatorView;
 
 @property (weak, nonatomic) IBOutlet UINavigationItem *mainNavigationItem;
 @property (weak, nonatomic) IBOutlet UIBarButtonItem *rightBarButtonItem;
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index 4efb30d30..3449cca21 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -132,6 +132,7 @@
 - (void)userInterfaceThemeDidChange
 {
     [ThemeService.shared.theme applyStyleOnNavigationBar:self.navigationBar];
+    self.navigationBarSeparatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
 
     // This view controller is not part of a navigation controller
     // so that applyStyleOnNavigationBar does not fully work.
@@ -173,9 +174,11 @@
     [self.customServersTickButton setAttributedTitle:serverOptionsTitle forState:UIControlStateNormal];
     [self.customServersTickButton setAttributedTitle:serverOptionsTitle forState:UIControlStateHighlighted];
     
+    self.homeServerSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
     self.homeServerTextField.textColor = ThemeService.shared.theme.textPrimaryColor;
     self.homeServerLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
     
+    self.identityServerSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
     self.identityServerTextField.textColor = ThemeService.shared.theme.textPrimaryColor;
     self.identityServerLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
 
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.xib b/Riot/Modules/Authentication/AuthenticationViewController.xib
index 95b4eb970..c87bea248 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.xib
+++ b/Riot/Modules/Authentication/AuthenticationViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.23.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.16.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -35,6 +35,7 @@
                 <outlet property="identityServerTextField" destination="PZC-Hd-Q6a" id="vKg-sd-dzJ"/>
                 <outlet property="mainNavigationItem" destination="rj9-wP-8QS" id="yNN-Dg-4Yw"/>
                 <outlet property="navigationBar" destination="k7D-Gy-yBR" id="6Uc-3Q-3dO"/>
+                <outlet property="navigationBarSeparatorView" destination="izX-ya-hXh" id="gY5-Oj-nSl"/>
                 <outlet property="noFlowLabel" destination="54b-4O-ip9" id="f18-H1-cQm"/>
                 <outlet property="optionsContainer" destination="Gg0-TE-OGb" id="RWa-Pl-eaL"/>
                 <outlet property="retryButton" destination="wIH-Kd-r7q" id="42j-Ad-zVS"/>
diff --git a/Riot/Modules/Authentication/Views/AuthInputsView.m b/Riot/Modules/Authentication/Views/AuthInputsView.m
index c8b11a933..09ddcb3b3 100644
--- a/Riot/Modules/Authentication/Views/AuthInputsView.m
+++ b/Riot/Modules/Authentication/Views/AuthInputsView.m
@@ -112,6 +112,12 @@
     
     self.messageLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
     self.messageLabel.numberOfLines = 0;
+    
+    self.userLoginSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
+    self.emailSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
+    self.phoneSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
+    self.passwordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
+    self.repeatPasswordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
 
     if (self.userLoginTextField.placeholder)
     {
diff --git a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
index 6f16f2533..812106638 100644
--- a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
+++ b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m
@@ -108,6 +108,10 @@
     self.passWordTextField.textColor = ThemeService.shared.theme.textPrimaryColor;
     self.repeatPasswordTextField.textColor = ThemeService.shared.theme.textPrimaryColor;
     
+    self.emailSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
+    self.passwordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
+    self.repeatPasswordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
+    
     self.messageLabel.numberOfLines = 0;
     
     [self.nextStepButton.layer setCornerRadius:5];
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
index fa95b06f2..1fd5962de 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -165,6 +165,7 @@
     
     // Use the primary bg color for the recents table view in plain style.
     self.recentsTableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    self.recentsTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     topview.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
     self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
 
diff --git a/Riot/Modules/Communities/Home/GroupHomeViewController.m b/Riot/Modules/Communities/Home/GroupHomeViewController.m
index b488c7102..2acae23b5 100644
--- a/Riot/Modules/Communities/Home/GroupHomeViewController.m
+++ b/Riot/Modules/Communities/Home/GroupHomeViewController.m
@@ -128,7 +128,7 @@
     self.inviteLabel.textColor = ThemeService.shared.theme.baseTextSecondaryColor;
     self.inviteLabel.numberOfLines = 0;
     
-    self.separatorView.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
+    self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
     
     [self.leftButton.layer setCornerRadius:5];
     self.leftButton.clipsToBounds = YES;
diff --git a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
index fc5ec787e..33dcbc2a4 100644
--- a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
+++ b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m
@@ -156,6 +156,7 @@
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     // Update the gradient view above the screen
     CGFloat white = 1.0;
diff --git a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
index 9eb349d5b..20cb7c448 100644
--- a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
+++ b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m
@@ -137,6 +137,7 @@
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.tableView.dataSource)
     {
diff --git a/Riot/Modules/Contacts/ContactsTableViewController.m b/Riot/Modules/Contacts/ContactsTableViewController.m
index 558813569..c6671e364 100644
--- a/Riot/Modules/Contacts/ContactsTableViewController.m
+++ b/Riot/Modules/Contacts/ContactsTableViewController.m
@@ -111,6 +111,7 @@
     // Check the table view style to select its bg color.
     self.contactsTableView.backgroundColor = ((self.contactsTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.contactsTableView.backgroundColor;
+    self.contactsTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.contactsTableView.dataSource)
     {
diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
index dedcb530a..9dd380180 100644
--- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
+++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m
@@ -242,6 +242,7 @@
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.tableView.dataSource)
     {
diff --git a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
index 612297f11..7630f10ab 100644
--- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m
@@ -78,6 +78,7 @@
     // Check the table view style to select its bg color.
     self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.searchTableView.backgroundColor;
+    self.searchTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     self.noResultsLabel.textColor = ThemeService.shared.theme.backgroundColor;
     
diff --git a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
index dc55572a9..d5b20a9d2 100644
--- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
+++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m
@@ -85,6 +85,7 @@
     // Check the table view style to select its bg color.
     self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.searchTableView.backgroundColor;
+    self.searchTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     self.noResultsLabel.textColor = ThemeService.shared.theme.backgroundColor;
     
diff --git a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
index d4c420694..52a93451c 100644
--- a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
+++ b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
@@ -78,6 +78,7 @@
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.tableView.dataSource)
     {
diff --git a/Riot/Modules/MediaPicker/MediaPickerViewController.m b/Riot/Modules/MediaPicker/MediaPickerViewController.m
index ff48c46b0..9e3f46144 100644
--- a/Riot/Modules/MediaPicker/MediaPickerViewController.m
+++ b/Riot/Modules/MediaPicker/MediaPickerViewController.m
@@ -191,6 +191,7 @@ static void *RecordingContext = &RecordingContext;
     
     self.userAlbumsTableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
     self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    self.userAlbumsTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle
diff --git a/Riot/Modules/Room/Files/RoomFilesViewController.m b/Riot/Modules/Room/Files/RoomFilesViewController.m
index 4fb62f934..ff922a33e 100644
--- a/Riot/Modules/Room/Files/RoomFilesViewController.m
+++ b/Riot/Modules/Room/Files/RoomFilesViewController.m
@@ -117,6 +117,7 @@
     // Check the table view style to select its bg color.
     self.bubblesTableView.backgroundColor = ((self.bubblesTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.bubblesTableView.backgroundColor;
+    self.bubblesTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.bubblesTableView.dataSource)
     {
diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
index 7837018ee..1fcb9985c 100644
--- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
@@ -231,6 +231,7 @@
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.tableView.dataSource)
     {
diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.m b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
index 14b54210f..09582da19 100644
--- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
@@ -168,6 +168,7 @@
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     // Update the gradient view above the screen
     CGFloat white = 1.0;
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 3b7a6d701..7fd848e9a 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -454,6 +454,7 @@
     
     // Check the table view style to select its bg color.
     self.bubblesTableView.backgroundColor = ((self.bubblesTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
+    self.bubblesTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     self.view.backgroundColor = self.bubblesTableView.backgroundColor;
     
     if (self.bubblesTableView.dataSource)
diff --git a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
index 51c74d6a1..b9cbac836 100644
--- a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m
@@ -79,6 +79,7 @@
     // Check the table view style to select its bg color.
     self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.searchTableView.backgroundColor;
+    self.searchTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     self.noResultsLabel.textColor = ThemeService.shared.theme.backgroundColor;
     
diff --git a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
index a13185f45..1adfc6c84 100644
--- a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
+++ b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m
@@ -80,6 +80,7 @@
     // Check the table view style to select its bg color.
     self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.searchTableView.backgroundColor;
+    self.searchTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     self.noResultsLabel.textColor = ThemeService.shared.theme.backgroundColor;
     
diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.m b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
index 706a75f4f..bd287fae9 100644
--- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m
+++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
@@ -273,6 +273,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.tableView.dataSource)
     {
diff --git a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
index e5b959ec4..2f2e05053 100644
--- a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
+++ b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
@@ -112,7 +112,7 @@
 {
     [super customizeViewRendering];
     
-    self.separatorView.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
+    self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
     if (self.messageLabel.textColor != ThemeService.shared.theme.warningColor)
     {
         self.messageLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
index 8cf27a17f..709d7d1b5 100644
--- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
+++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m
@@ -38,7 +38,7 @@ NSString *const kRoomMembershipExpandedBubbleCellTapOnCollapseButton = @"kRoomMe
 {
     [super customizeTableViewCellRendering];
     
-    self.separatorView.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
+    self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
     
     [self.collapseButton setTintColor:ThemeService.shared.theme.tintColor];
     self.collapseButton.titleLabel.font = [UIFont systemFontOfSize:14];
diff --git a/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m
index d3dce27e5..3c10a800f 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 = ThemeService.shared.theme.headerTextSecondaryColor;
+    self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
 
     self.disabledReasonTextView.font = [UIFont systemFontOfSize:15];
     self.disabledReasonTextView.textColor = ThemeService.shared.theme.textPrimaryColor;
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index 577592a41..6db9905ed 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 = ThemeService.shared.theme.headerTextSecondaryColor;
+    self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
     
     // Custom the growingTextView display
     growingTextView.layer.cornerRadius = 0;
diff --git a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
index a72c3d372..9559ee9d0 100644
--- a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
+++ b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m
@@ -127,6 +127,7 @@
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.tableView.dataSource)
     {
diff --git a/Riot/Modules/Settings/Language/LanguagePickerViewController.m b/Riot/Modules/Settings/Language/LanguagePickerViewController.m
index 915de9864..12a51252b 100644
--- a/Riot/Modules/Settings/Language/LanguagePickerViewController.m
+++ b/Riot/Modules/Settings/Language/LanguagePickerViewController.m
@@ -77,6 +77,7 @@
     
     // Use the primary bg color for the table view in plain style.
     self.tableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     topview.backgroundColor = ThemeService.shared.theme.backgroundColor;
     
     if (self.tableView.dataSource)
diff --git a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
index ef7943c5f..0f52ba2e5 100644
--- a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
+++ b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
@@ -80,6 +80,7 @@
     
     // Use the primary bg color for the table view in plain style.
     self.tableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     topview.backgroundColor = ThemeService.shared.theme.backgroundColor;
     self.searchDisplayController.searchResultsTableView.backgroundColor = self.tableView.backgroundColor;
     
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 7df4871e3..a955504a6 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -370,6 +370,7 @@ SignOutAlertPresenterDelegate>
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.tableView.dataSource)
     {
diff --git a/Riot/Modules/StartChat/StartChatViewController.m b/Riot/Modules/StartChat/StartChatViewController.m
index cbc7dabf4..d72abda68 100644
--- a/Riot/Modules/StartChat/StartChatViewController.m
+++ b/Riot/Modules/StartChat/StartChatViewController.m
@@ -154,6 +154,7 @@
     // Check the table view style to select its bg color.
     self.contactsTableView.backgroundColor = ((self.contactsTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.contactsTableView.backgroundColor;
+    self.contactsTableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.contactsTableView.dataSource)
     {
diff --git a/Riot/Modules/UserDevices/UsersDevicesViewController.m b/Riot/Modules/UserDevices/UsersDevicesViewController.m
index 132627553..886c8a915 100644
--- a/Riot/Modules/UserDevices/UsersDevicesViewController.m
+++ b/Riot/Modules/UserDevices/UsersDevicesViewController.m
@@ -89,6 +89,7 @@
     // Check the table view style to select its bg color.
     self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor);
     self.view.backgroundColor = self.tableView.backgroundColor;
+    self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
     
     if (self.tableView.dataSource)
     {