diff --git a/Tusker/Extensions/UIViewController+Delegates.swift b/Tusker/Extensions/UIViewController+Delegates.swift
index 0c6d5fb671..4861038f52 100644
--- a/Tusker/Extensions/UIViewController+Delegates.swift
+++ b/Tusker/Extensions/UIViewController+Delegates.swift
@@ -10,29 +10,32 @@ import UIKit
 
 extension UIViewController: UIViewControllerTransitioningDelegate {
     public func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        if presented is LargeImageViewController {
-            return LargeImageExpandAnimationController()
-        } else {
-            return nil
-        }
+        return nil
+//        if presented is LargeImageViewController {
+//            return LargeImageExpandAnimationController()
+//        } else {
+//            return nil
+//        }
     }
     
     public func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        if let dismissed = dismissed as? LargeImageViewController {
-            return LargeImageShrinkAnimationController(interactionController: dismissed.dismissInteractionController)
-        } else {
-            return nil
-        }
+        return nil
+//        if let dismissed = dismissed as? LargeImageViewController {
+//            return LargeImageShrinkAnimationController(interactionController: dismissed.dismissInteractionController)
+//        } else {
+//            return nil
+//        }
     }
     
     public func interactionControllerForDismissal(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
-        if let animator = animator as? LargeImageShrinkAnimationController,
-            let interactionController = animator.interactionController,
-            interactionController.inProgress {
-            
-            return interactionController
-        } else {
-            return nil
-        }
+        return nil
+//        if let animator = animator as? LargeImageShrinkAnimationController,
+//            let interactionController = animator.interactionController,
+//            interactionController.inProgress {
+//
+//            return interactionController
+//        } else {
+//            return nil
+//        }
     }
 }
diff --git a/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.xib b/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.xib
index 502b3c556e..b933f8341e 100644
--- a/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.xib	
+++ b/Tusker/Views/Profile Header/ProfileHeaderTableViewCell.xib	
@@ -58,7 +58,7 @@
                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Follows you" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a32-1a-xXZ">
                             <rect key="frame" x="0.0" y="0.0" width="75.5" height="0.0"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <color key="textColor" cocoaTouchSystemColor="secondaryLabelColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Note" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I0n-aP-dJP" customClass="StatusContentLabel" customModule="Tusker" customModuleProvider="target">
diff --git a/Tusker/Views/Status/StatusTableViewCell.xib b/Tusker/Views/Status/StatusTableViewCell.xib
index 31eef1d416..e6116551c4 100644
--- a/Tusker/Views/Status/StatusTableViewCell.xib
+++ b/Tusker/Views/Status/StatusTableViewCell.xib
@@ -24,7 +24,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="ve3-Y1-NQH">
-                            <rect key="frame" x="0.0" y="28.5" width="343" height="79.5"/>
+                            <rect key="frame" x="0.0" y="28.5" width="343" height="75.5"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QMP-j2-HLn">
                                     <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -60,7 +60,7 @@
                                     </subviews>
                                 </stackView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Content" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HrJ-t9-KcD" customClass="StatusContentLabel" customModule="Tusker" customModuleProvider="target">
-                                    <rect key="frame" x="58" y="24.5" width="285" height="55"/>
+                                    <rect key="frame" x="58" y="24.5" width="285" height="51"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -79,47 +79,44 @@
                             </constraints>
                         </view>
                         <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nbq-yr-2mA">
-                            <rect key="frame" x="0.0" y="112" width="343" height="0.0"/>
+                            <rect key="frame" x="0.0" y="108" width="343" height="0.0"/>
                             <color key="backgroundColor" cocoaTouchSystemColor="secondarySystemBackgroundColor"/>
                             <constraints>
                                 <constraint firstAttribute="height" priority="999" constant="200" id="J42-49-2MU"/>
                             </constraints>
                         </view>
                         <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="Zlb-yt-NTw">
-                            <rect key="frame" x="0.0" y="116" width="343" height="18"/>
+                            <rect key="frame" x="0.0" y="112" width="343" height="22"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="leading" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rKF-yF-KIa">
-                                    <rect key="frame" x="0.0" y="0.0" width="21.5" height="18"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="21.5" height="22"/>
                                     <state key="normal" image="arrowshape.turn.up.left.fill" catalog="system"/>
                                     <connections>
                                         <action selector="replyPressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="Ohg-uU-d3Z"/>
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="x0t-TR-jJ4">
-                                    <rect key="frame" x="107.5" y="0.0" width="22.5" height="18"/>
+                                    <rect key="frame" x="107.5" y="0.0" width="22.5" height="22"/>
                                     <state key="normal" image="star.fill" catalog="system"/>
                                     <connections>
                                         <action selector="favoritePressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="gKJ-Hu-za3"/>
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6tW-z8-Qh9">
-                                    <rect key="frame" x="215.5" y="0.0" width="23" height="18"/>
+                                    <rect key="frame" x="215.5" y="0.0" width="23" height="22"/>
                                     <state key="normal" image="repeat" catalog="system"/>
                                     <connections>
                                         <action selector="reblogPressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="JQI-VT-wTt"/>
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="982-J4-NGl">
-                                    <rect key="frame" x="324.5" y="0.0" width="18.5" height="18"/>
+                                    <rect key="frame" x="324.5" y="0.0" width="18.5" height="22"/>
                                     <state key="normal" image="ellipsis" catalog="system"/>
                                     <connections>
                                         <action selector="morePressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="dcV-Ez-EIe"/>
                                     </connections>
                                 </button>
                             </subviews>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="18" id="TKC-Uc-C4K"/>
-                            </constraints>
                         </stackView>
                     </subviews>
                     <constraints>