diff --git a/Signal/src/Loki/FriendRequestView.swift b/Signal/src/Loki/FriendRequestView.swift
index 057caaa3b..8e992d212 100644
--- a/Signal/src/Loki/FriendRequestView.swift
+++ b/Signal/src/Loki/FriendRequestView.swift
@@ -36,10 +36,10 @@
         mainStackView.addArrangedSubview(buttonStackView)
         let buttonFont = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight()
         let buttonHeight = buttonFont.pointSize * 48 / 17
-        let acceptButton = OWSFlatButton.button(title: NSLocalizedString("Accept", comment: ""), font: buttonFont, titleColor: .ows_materialBlue, backgroundColor: .clear, target: self, selector: #selector(accept))
+        let acceptButton = OWSFlatButton.button(title: NSLocalizedString("Accept", comment: ""), font: buttonFont, titleColor: .ows_materialBlue, backgroundColor: .white, target: self, selector: #selector(accept))
         acceptButton.autoSetDimension(.height, toSize: buttonHeight)
         buttonStackView.addArrangedSubview(acceptButton)
-        let declineButton = OWSFlatButton.button(title: NSLocalizedString("Decline", comment: ""), font: buttonFont, titleColor: .ows_destructiveRed, backgroundColor: .clear, target: self, selector: #selector(decline))
+        let declineButton = OWSFlatButton.button(title: NSLocalizedString("Decline", comment: ""), font: buttonFont, titleColor: .ows_destructiveRed, backgroundColor: .white, target: self, selector: #selector(decline))
         declineButton.autoSetDimension(.height, toSize: buttonHeight)
         buttonStackView.addArrangedSubview(declineButton)
         addSubview(mainStackView)
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 15cc78e25..39b221c6f 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -371,7 +371,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     if (self.isIncomingFriendRequest) {
-        cellSize.height += 118; // TODO: Measure dynamically
+        cellSize.height += 98; // TODO: Measure dynamically
     }
     
     cellSize = CGSizeCeil(cellSize);
@@ -452,6 +452,10 @@ NS_ASSUME_NONNULL_BEGIN
 {
     OWSAssertDebug(self.delegate);
 
+    if (self.isIncomingFriendRequest) {
+        return;
+    }
+    
     if (sender.state != UIGestureRecognizerStateBegan) {
         return;
     }