diff --git a/iOS/Account/Account.storyboard b/iOS/Account/Account.storyboard
index 5da28a067..7cedd59df 100644
--- a/iOS/Account/Account.storyboard
+++ b/iOS/Account/Account.storyboard
@@ -110,7 +110,7 @@
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="On My Device" id="AOA-LS-PIB">
-                        <barButtonItem key="leftBarButtonItem" style="plain" systemItem="cancel" id="b2H-re-cgN">
+                        <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="b2H-re-cgN">
                             <connections>
                                 <action selector="cancel:" destination="vi3-jb-8XS" id="gRE-sR-r4Z"/>
                             </connections>
@@ -225,12 +225,12 @@
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="Feedbin" id="tYg-9f-kyd">
-                        <barButtonItem key="leftBarButtonItem" style="plain" systemItem="cancel" id="pfF-Of-5NT">
+                        <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="pfF-Of-5NT">
                             <connections>
                                 <action selector="cancel:" destination="ECy-jg-Kyc" id="ZKI-gV-ylg"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" style="plain" id="Xwp-LO-qff">
+                        <barButtonItem key="rightBarButtonItem" id="Xwp-LO-qff">
                             <view key="customView" contentMode="scaleToFill" id="cn4-b1-uZa">
                                 <rect key="frame" x="374" y="12" width="20" height="20"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
diff --git a/iOS/Inspector/Inspector.storyboard b/iOS/Inspector/Inspector.storyboard
index 6fc8a3149..a3b96470b 100644
--- a/iOS/Inspector/Inspector.storyboard
+++ b/iOS/Inspector/Inspector.storyboard
@@ -94,9 +94,8 @@
                                                 </button>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="TYD-py-8IF" firstAttribute="top" secondItem="rJW-6J-9DM" secondAttribute="top" id="g3l-m2-eby"/>
+                                                <constraint firstItem="TYD-py-8IF" firstAttribute="centerY" secondItem="rJW-6J-9DM" secondAttribute="centerY" id="We5-ck-yMq"/>
                                                 <constraint firstItem="TYD-py-8IF" firstAttribute="leading" secondItem="rJW-6J-9DM" secondAttribute="leading" id="gIs-Z2-bBf"/>
-                                                <constraint firstAttribute="bottom" secondItem="TYD-py-8IF" secondAttribute="bottom" id="hGo-PI-2l6"/>
                                                 <constraint firstAttribute="trailing" secondItem="TYD-py-8IF" secondAttribute="trailing" id="uFe-xv-QBo"/>
                                             </constraints>
                                         </tableViewCellContentView>
@@ -135,10 +134,9 @@
                                                 </button>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="obv-a5-Pl6" firstAttribute="top" secondItem="fIH-xP-nza" secondAttribute="top" id="0be-8X-t2s"/>
                                                 <constraint firstAttribute="trailing" secondItem="obv-a5-Pl6" secondAttribute="trailing" id="1Po-cv-lMZ"/>
                                                 <constraint firstItem="obv-a5-Pl6" firstAttribute="leading" secondItem="fIH-xP-nza" secondAttribute="leading" id="4Xk-ff-eUv"/>
-                                                <constraint firstAttribute="bottom" secondItem="obv-a5-Pl6" secondAttribute="bottom" id="SS5-Ph-SHG"/>
+                                                <constraint firstItem="obv-a5-Pl6" firstAttribute="centerY" secondItem="fIH-xP-nza" secondAttribute="centerY" id="Vs4-U1-hKv"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift
index 77db16270..90bc20a30 100644
--- a/iOS/SceneCoordinator.swift
+++ b/iOS/SceneCoordinator.swift
@@ -255,10 +255,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 	}
 
 	var isTimelineUnreadAvailable: Bool {
-		if let unreadProvider = timelineFeed as? UnreadCountProvider {
-			return unreadProvider.unreadCount > 0
-		}
-		return false
+		return timelineFeed?.unreadCount ?? 0 > 0
 	}
 	
 	var isAnyUnreadAvailable: Bool {