diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m
index 8a7731e91..192d49529 100644
--- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m
@@ -36,6 +36,7 @@
         [section addItem:[OWSTableItem
                              itemWithCustomCellBlock:^{
                                  UITableViewCell *cell = [OWSTableItem newCell];
+                                 cell.tintColor = UIColor.lokiGreen;
                                  [[cell textLabel] setText:[prefs nameForNotificationPreviewType:notificationType]];
                                  if (selectedNotifType == notificationType) {
                                      cell.accessoryType = UITableViewCellAccessoryCheckmark;
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 622b7e262..1c9be1d5d 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -120,7 +120,7 @@ const CGFloat kMaxTextViewHeight = 98;
         self.backgroundColor = Theme.toolbarBackgroundColor;
     } else {
         CGFloat alpha = OWSNavigationBar.backgroundBlurMutingFactor;
-        self.backgroundColor = UIColor.lokiDarkerGray;
+        self.backgroundColor = [UIColor.lokiDarkerGray colorWithAlphaComponent:alpha];
 
         UIVisualEffectView *blurEffectView = [[UIVisualEffectView alloc] initWithEffect:Theme.barBlurEffect];
         blurEffectView.layer.zPosition = -1;
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
index 8b1c203a2..2cf21b99d 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
@@ -57,10 +57,8 @@ NS_ASSUME_NONNULL_BEGIN
     self.circleView = circleView;
     circleView.userInteractionEnabled = NO;
     circleView.layer.cornerRadius = circleSize * 0.5f;
-    circleView.layer.shadowColor = Theme.middleGrayColor.CGColor;
-    circleView.layer.shadowOffset = CGSizeMake(+1.f, +2.f);
-    circleView.layer.shadowRadius = 1.5f;
-    circleView.layer.shadowOpacity = 0.35f;
+    circleView.layer.borderColor = UIColor.whiteColor.CGColor;
+    circleView.layer.borderWidth = 1 / UIScreen.mainScreen.scale;
     [circleView autoSetDimension:ALDimensionWidth toSize:circleSize];
     [circleView autoSetDimension:ALDimensionHeight toSize:circleSize];
 
diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m
index 5c6195988..1fdd2cfc5 100644
--- a/Signal/src/ViewControllers/ProfileViewController.m
+++ b/Signal/src/ViewControllers/ProfileViewController.m
@@ -118,7 +118,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
     UILabel *nameLabel = [UILabel new];
     nameLabel.text = NSLocalizedString(@"Display Name", @"");
     nameLabel.textColor = Theme.primaryColor;
-    nameLabel.font = [UIFont ows_mediumFontWithSize:fontSizePoints];
+    nameLabel.font = [UIFont ows_regularFontWithSize:fontSizePoints];
     [nameRow addSubview:nameLabel];
     [nameLabel autoPinLeadingToSuperviewMargin];
     [nameLabel autoPinHeightToSuperviewWithMargin:5.f];
@@ -130,14 +130,15 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
         nameTextField = [OWSTextField new];
     }
     _nameTextField = nameTextField;
-    nameTextField.font = [UIFont ows_mediumFontWithSize:18.f];
-    nameTextField.textColor = [UIColor ows_materialBlueColor];
+    nameTextField.font = [UIFont ows_regularFontWithSize:18.f];
+    nameTextField.textColor = UIColor.whiteColor;
+    nameTextField.tintColor = UIColor.lokiGreen;
     nameTextField.placeholder = NSLocalizedString(
         @"PROFILE_VIEW_NAME_DEFAULT_TEXT", @"Default text for the profile name field of the profile view.");
     nameTextField.delegate = self;
     nameTextField.text = [OWSProfileManager.sharedManager localProfileName];
     nameTextField.textAlignment = NSTextAlignmentRight;
-    nameTextField.font = [UIFont ows_mediumFontWithSize:fontSizePoints];
+    nameTextField.font = [UIFont ows_regularFontWithSize:fontSizePoints];
     SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, nameTextField);
     [nameTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
     [nameRow addSubview:nameTextField];
diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.m b/SignalMessaging/ViewControllers/OWSTableViewController.m
index 5a4303c9a..7baa5f8f5 100644
--- a/SignalMessaging/ViewControllers/OWSTableViewController.m
+++ b/SignalMessaging/ViewControllers/OWSTableViewController.m
@@ -217,6 +217,7 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f;
         cell.textLabel.text = text;
         cell.accessoryType = accessoryType;
         cell.accessibilityIdentifier = accessibilityIdentifier;
+        cell.tintColor = UIColor.lokiGreen;
         return cell;
     };
     return item;
diff --git a/SignalMessaging/appearance/Theme.m b/SignalMessaging/appearance/Theme.m
index df9e32120..5b892d9da 100644
--- a/SignalMessaging/appearance/Theme.m
+++ b/SignalMessaging/appearance/Theme.m
@@ -231,8 +231,7 @@ NSString *const ThemeKeyThemeEnabled = @"ThemeKeyThemeEnabled";
 
 + (UIColor *)scrollButtonBackgroundColor
 {
-    return Theme.isDarkThemeEnabled ? [UIColor colorWithWhite:0.25f alpha:1.f]
-                                    : [UIColor colorWithWhite:0.95f alpha:1.f];
+    return UIColor.lokiDarkerGray;
 }
 
 @end