diff --git a/Signal/src/views/ReminderView.swift b/Signal/src/views/ReminderView.swift
index 5b8e4201f..7981af096 100644
--- a/Signal/src/views/ReminderView.swift
+++ b/Signal/src/views/ReminderView.swift
@@ -66,7 +66,10 @@ class ReminderView: UIView {
         case .nag:
             self.backgroundColor = UIColor.ows_reminderYellow
         case .explanation:
-            self.backgroundColor = UIColor(rgbHex: 0xf5f5f5)
+            // TODO: Theme, review with design.
+            self.backgroundColor = (UIColor.isThemeEnabled()
+                    ? UIColor(rgbHex: 0x202020)
+                : UIColor(rgbHex: 0xf5f5f5))
         }
         self.clipsToBounds = true
 
@@ -85,7 +88,7 @@ class ReminderView: UIView {
         // Label
         label.font = UIFont.ows_dynamicTypeSubheadline
         container.addArrangedSubview(label)
-        label.textColor = UIColor.black.withAlphaComponent(0.9)
+        label.textColor = UIColor.ows_themeForeground()
         label.numberOfLines = 0
         label.lineBreakMode = .byWordWrapping
 
@@ -99,7 +102,7 @@ class ReminderView: UIView {
             }
             let iconView = UIImageView(image: iconImage.withRenderingMode(.alwaysTemplate))
             iconView.contentMode = .scaleAspectFit
-            iconView.tintColor = UIColor.black.withAlphaComponent(0.6)
+            iconView.tintColor = UIColor.ows_themeSecondary()
             iconView.autoSetDimension(.width, toSize: 13)
             container.addArrangedSubview(iconView)
         }
diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.m b/SignalMessaging/ViewControllers/OWSTableViewController.m
index d7b9972cb..4a749b0e3 100644
--- a/SignalMessaging/ViewControllers/OWSTableViewController.m
+++ b/SignalMessaging/ViewControllers/OWSTableViewController.m
@@ -104,6 +104,12 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f;
     cell.backgroundColor = [UIColor ows_themeBackgroundColor];
     cell.textLabel.font = [UIFont ows_regularFontWithSize:18.f];
     cell.textLabel.textColor = [UIColor ows_themeForegroundColor];
+
+    UIView *selectedBackgroundView = [UIView new];
+    selectedBackgroundView.backgroundColor =
+        [(UIColor.isThemeEnabled ? [UIColor ows_whiteColor] : [UIColor ows_blackColor]) colorWithAlphaComponent:0.08];
+    cell.selectedBackgroundView = selectedBackgroundView;
+
     return cell;
 }