diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index 57c3fe632..84f014f78 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -225,6 +225,8 @@
 
     self.softLogoutClearDataLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
     self.softLogoutClearDataButton.backgroundColor = ThemeService.shared.theme.warningColor;
+    
+    self.customServersTickButton.tintColor = ThemeService.shared.theme.tintColor;
 
     [self.authInputsView customizeViewRendering];
     
diff --git a/Riot/Modules/BugReport/BugReportViewController.m b/Riot/Modules/BugReport/BugReportViewController.m
index cd46b57c0..879fa5111 100644
--- a/Riot/Modules/BugReport/BugReportViewController.m
+++ b/Riot/Modules/BugReport/BugReportViewController.m
@@ -163,6 +163,9 @@
     self.cancelButton.tintColor = ThemeService.shared.theme.tintColor;
     
     _bugReportDescriptionTextView.layer.borderColor = ThemeService.shared.theme.headerBackgroundColor.CGColor;
+    
+    self.sendLogsButtonImage.tintColor = ThemeService.shared.theme.tintColor;
+    self.sendScreenshotButtonImage.tintColor = ThemeService.shared.theme.tintColor;
 
     [self setNeedsStatusBarAppearanceUpdate];
 }
diff --git a/Riot/Modules/Contacts/DataSources/ContactsDataSource.m b/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
index df86b7673..5990794ea 100644
--- a/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
+++ b/Riot/Modules/Contacts/DataSources/ContactsDataSource.m
@@ -862,6 +862,7 @@
         
         // Set the right value of the tick box
         localContactsCheckbox.image = hideNonMatrixEnabledContacts ? [UIImage imageNamed:@"selection_tick"] : [UIImage imageNamed:@"selection_untick"];
+        localContactsCheckbox.tintColor = ThemeService.shared.theme.tintColor;
         
         // Add the check box container
         [sectionHeader addSubview:localContactsCheckboxContainer];
diff --git a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
index d3966b9a9..7b078894d 100644
--- a/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
+++ b/Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m
@@ -277,6 +277,7 @@
         cell.bottomLeftIcon.hidden = (asset.mediaType == PHAssetMediaTypeImage);
 
         cell.bottomRightIcon.image = [UIImage imageNamed:@"selection_tick"];
+        cell.bottomRightIcon.tintColor = ThemeService.shared.theme.tintColor;
         cell.bottomRightIcon.hidden = !selectedAssets || (NSNotFound == [selectedAssets indexOfObject:asset]);
 
         // Disable user interaction in mxkImageView, in order to let collection handle user selection
diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m
index 5f575c745..088f72b19 100644
--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxAndLabel.m
@@ -27,6 +27,7 @@
     [super customizeTableViewCellRendering];
     
     _label.textColor = ThemeService.shared.theme.textPrimaryColor;
+    self.checkBox.tintColor = ThemeService.shared.theme.tintColor;
 }
 
 - (void)setEnabled:(BOOL)enabled
diff --git a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m
index 76a7839a8..0b588bbdc 100644
--- a/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m
+++ b/Riot/Modules/Room/Settings/Views/TableViewCellWithCheckBoxes.m
@@ -17,6 +17,8 @@
 
 #import "TableViewCellWithCheckBoxes.h"
 
+#import "Riot-Swift.h"
+
 // The space between 2 check boxes
 #define TABLEVIEWCELLWITHCHECKBOXES_MARGIN 8
 
@@ -130,6 +132,7 @@
         
         // Store the new check box unselected by default
         checkbox.image = [UIImage imageNamed:@"selection_untick"];
+        checkbox.tintColor = ThemeService.shared.theme.tintColor;
         checkbox.tag = 0;
         [checkBoxesArray addObject:checkbox];
         
diff --git a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
index 8d35500f0..ce0519741 100644
--- a/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+++ b/Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
@@ -129,6 +129,8 @@ static CGFloat const kTextFontSize = 15.0;
     self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
 
     self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
+    
+    self.forgetMessageButton.tintColor = ThemeService.shared.theme.tintColor;
 
     [self updateStringAttributes];
     [self updateNavigationBar];