diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index c464ee2f2..2b9ee898d 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -535,6 +535,7 @@ typedef enum : NSUInteger {
 {
     [super loadView];
 
+    // make sure toolbar extends below iPhoneX home button.
     self.view.backgroundColor = [UIColor ows_toolbarBackgroundColor];
 }
 
@@ -2582,8 +2583,7 @@ typedef enum : NSUInteger {
     [self.scrollDownButton autoSetDimension:ALDimensionWidth toSize:ConversationScrollButton.buttonSize];
     [self.scrollDownButton autoSetDimension:ALDimensionHeight toSize:ConversationScrollButton.buttonSize];
 
-    self.scrollDownButtonButtomConstraint =
-        [self.scrollDownButton autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.collectionView];
+    self.scrollDownButtonButtomConstraint = [self.scrollDownButton autoPinEdgeToSuperviewMargin:ALEdgeBottom];
     [self.scrollDownButton autoPinEdgeToSuperviewEdge:ALEdgeTrailing];
 
 #ifdef DEBUG
diff --git a/SignalMessaging/categories/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m
index 1fe9aa645..f6e5dbf18 100644
--- a/SignalMessaging/categories/UIColor+OWS.m
+++ b/SignalMessaging/categories/UIColor+OWS.m
@@ -91,7 +91,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (UIColor *)ows_toolbarBackgroundColor
 {
-    return [self colorWithWhite:245 / 255.f alpha:1.f];
+    return self.ows_navbarBackgroundColor;
 }
 
 + (UIColor *)ows_lightBackgroundColor