diff --git a/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@1x.png b/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@1x.png
index b3b418577..0f5e4afaf 100644
Binary files a/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@1x.png and b/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@1x.png differ
diff --git a/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@2x.png b/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@2x.png
index dcaa33b20..e5e37c339 100644
Binary files a/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@2x.png and b/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@2x.png differ
diff --git a/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@3x.png b/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@3x.png
index fb55818f3..245a839d9 100644
Binary files a/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@3x.png and b/Signal/Images.xcassets/NavBarBack.imageset/NavBarBackWhite@3x.png differ
diff --git a/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@1x.png b/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@1x.png
index 5a87562ad..f8ca6af22 100644
Binary files a/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@1x.png and b/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@1x.png differ
diff --git a/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@2x.png b/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@2x.png
index 1b5e8a4c5..4b3fd71a0 100644
Binary files a/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@2x.png and b/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@2x.png differ
diff --git a/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@3x.png b/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@3x.png
index 8f5419079..06394bded 100644
Binary files a/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@3x.png and b/Signal/Images.xcassets/button_settings_white.imageset/button_settings_white@3x.png differ
diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index 132f1f29b..07fb46b02 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -525,8 +525,8 @@ typedef enum : NSUInteger {
         [self.navigationBarTitleView addSubview:self.navigationBarTitleLabel];
         
         self.navigationBarSubtitleLabel = [UILabel new];
-        self.navigationBarSubtitleLabel.textColor = [UIColor colorWithWhite:0.85f alpha:1.f];
-        self.navigationBarSubtitleLabel.font = [UIFont ows_boldFontWithSize:9.f];
+        self.navigationBarSubtitleLabel.textColor = [UIColor colorWithWhite:0.9f alpha:1.f];
+        self.navigationBarSubtitleLabel.font = [UIFont ows_regularFontWithSize:9.f];
         self.navigationBarSubtitleLabel.text = NSLocalizedString(@"MESSAGES_VIEW_TITLE_SUBTITLE",
                                                                  @"The subtitle for the messages view title indicates that the title can be tapped to access settings for this conversation.");
         [self.navigationBarTitleView addSubview:self.navigationBarSubtitleLabel];
@@ -550,22 +550,22 @@ typedef enum : NSUInteger {
     if (disappearingMessagesConfiguration.isEnabled) {
         rightBarButtonItemCount++;
     }
-    CGFloat rightBarButtonSize = 0;
+    CGFloat barButtonSize = 0;
     switch (rightBarButtonItemCount) {
         case 0:
-            rightBarButtonSize = 65;
+            barButtonSize = 70;
             break;
         case 1:
-            rightBarButtonSize = 100;
+            barButtonSize = 105;
             break;
         default:
             OWSAssert(0);
             // In production, fall through to the largest defined case.
         case 2:
-            rightBarButtonSize = 145;
+            barButtonSize = 150;
             break;
     }
-    CGFloat maxTitleViewWidth = kShortScreenDimension - rightBarButtonSize;
+    CGFloat maxTitleViewWidth = kShortScreenDimension - barButtonSize;
     const CGFloat titleViewWidth = MIN(maxTitleViewWidth,
                                        MAX(self.navigationBarTitleLabel.frame.size.width,
                                            self.navigationBarSubtitleLabel.frame.size.width));