diff --git a/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift b/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift
index ff0fb6b7ae..1438a36120 100644
--- a/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift
+++ b/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift
@@ -104,36 +104,42 @@ class FollowRequestNotificationTableViewCell: UITableViewCell {
         updateTimestampWorkItem = nil
     }
     
+    private func addLabel(_ text: String) {
+        let label = UILabel()
+        label.textAlignment = .center
+        label.font = .boldSystemFont(ofSize: 17)
+        label.text = text
+        self.stackView.addArrangedSubview(label)
+    }
+    
     // MARK: - Interaction
     
     @IBAction func rejectButtonPressed() {
+        acceptButton.isEnabled = false
+        rejectButton.isEnabled = false
+        
         let request = Account.rejectFollowRequest(account)
         mastodonController.run(request) { (response) in
             guard case .success(_, _) = response else { fatalError() }
             DispatchQueue.main.async {
                 UINotificationFeedbackGenerator().notificationOccurred(.success)
                 self.actionButtonsStackView.isHidden = true
-                let label = UILabel()
-                label.textAlignment = .center
-                label.font = .boldSystemFont(ofSize: 17)
-                label.text = NSLocalizedString("Rejected", comment: "rejected follow request label")
-                self.stackView.addArrangedSubview(label)
+                self.addLabel(NSLocalizedString("Rejected", comment: "rejected follow request label"))
             }
         }
     }
     
     @IBAction func acceptButtonPressed() {
+        acceptButton.isEnabled = false
+        rejectButton.isEnabled = false
+        
         let request = Account.authorizeFollowRequest(account)
         mastodonController.run(request) { (response) in
             guard case .success(_, _) = response else { fatalError() }
             DispatchQueue.main.async {
                 UINotificationFeedbackGenerator().notificationOccurred(.success)
                 self.actionButtonsStackView.isHidden = true
-                let label = UILabel()
-                label.textAlignment = .center
-                label.font = .boldSystemFont(ofSize: 17)
-                label.text = NSLocalizedString("Accepted", comment: "accepted follow request label")
-                self.stackView.addArrangedSubview(label)
+                self.addLabel(NSLocalizedString("Accepted", comment: "accepted follow request label"))
             }
         }
     }
diff --git a/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.xib b/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.xib
index 55abf8f761..be1f165dce 100644
--- a/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.xib
+++ b/Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.xib
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16092.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16082.1"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17124"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -30,12 +32,12 @@
                                         </constraints>
                                     </imageView>
                                     <view contentMode="scaleToFill" horizontalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="9WN-Ql-DDL">
-                                        <rect key="frame" x="30" y="0.0" width="175.5" height="30"/>
+                                        <rect key="frame" x="30" y="0.0" width="176" height="30"/>
                                     </view>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="2m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Saq-P5-oVH">
-                                        <rect key="frame" x="205.5" y="0.0" width="24.5" height="30"/>
+                                        <rect key="frame" x="206" y="0.0" width="24" height="30"/>
                                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
-                                        <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="textColor" systemColor="secondaryLabelColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -49,19 +51,20 @@
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="20F-2n-eQx">
                                 <rect key="frame" x="0.0" y="58.5" width="230" height="26.5"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CMQ-TI-X9k">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CMQ-TI-X9k">
                                         <rect key="frame" x="0.0" y="0.0" width="115" height="26.5"/>
-                                        <state key="normal" image="checkmark.circle.fill" catalog="system">
-                                            <preferredSymbolConfiguration key="preferredSymbolConfiguration" configurationType="pointSize" pointSize="22"/>
+                                        <accessibility key="accessibilityConfiguration" label="Accept Request"/>
+                                        <state key="normal" title=" Accept" image="checkmark.circle.fill" catalog="system">
+                                            <color key="titleColor" systemColor="systemBlueColor"/>
                                         </state>
                                         <connections>
                                             <action selector="acceptButtonPressed" destination="Pcu-ap-Xqf" eventType="touchUpInside" id="hGw-3d-RNi"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7MW-rY-m5l">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7MW-rY-m5l">
                                         <rect key="frame" x="115" y="0.0" width="115" height="26.5"/>
-                                        <state key="normal" image="xmark.circle.fill" catalog="system">
-                                            <preferredSymbolConfiguration key="preferredSymbolConfiguration" configurationType="pointSize" pointSize="22"/>
+                                        <state key="normal" title=" Reject" image="xmark.circle.fill" catalog="system">
+                                            <color key="titleColor" systemColor="systemBlueColor"/>
                                         </state>
                                         <connections>
                                             <action selector="rejectButtonPressed" destination="Pcu-ap-Xqf" eventType="touchUpInside" id="EP6-Bg-3nC"/>
@@ -105,5 +108,11 @@
         <image name="checkmark.circle.fill" catalog="system" width="128" height="121"/>
         <image name="person.fill" catalog="system" width="128" height="120"/>
         <image name="xmark.circle.fill" catalog="system" width="128" height="121"/>
+        <systemColor name="secondaryLabelColor">
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemBlueColor">
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>