diff --git a/iOS/Base.lproj/LaunchScreenPad.storyboard b/iOS/Base.lproj/LaunchScreenPad.storyboard
index edb676e06..da3b37910 100644
--- a/iOS/Base.lproj/LaunchScreenPad.storyboard
+++ b/iOS/Base.lproj/LaunchScreenPad.storyboard
@@ -65,12 +65,12 @@
                         </connections>
                     </tableView>
                     <toolbarItems>
+                        <barButtonItem image="line.horizontal.3.decrease.circle" catalog="system" id="Khk-Hd-iNS"/>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="Kjl-Sb-QP1"/>
                         <barButtonItem systemItem="add" id="PVr-3K-nPg"/>
                     </toolbarItems>
                     <navigationItem key="navigationItem" title="Feeds" largeTitleDisplayMode="never" id="lE1-xw-gjH">
                         <barButtonItem key="leftBarButtonItem" title="Item" image="gear" catalog="system" id="AK3-N5-4ke"/>
-                        <barButtonItem key="rightBarButtonItem" image="line.horizontal.3.decrease.circle" catalog="system" id="Khk-Hd-iNS"/>
                     </navigationItem>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
                 </tableViewController>
diff --git a/iOS/Base.lproj/LaunchScreenPhone.storyboard b/iOS/Base.lproj/LaunchScreenPhone.storyboard
index 6ac462068..e2fb7fa5c 100644
--- a/iOS/Base.lproj/LaunchScreenPhone.storyboard
+++ b/iOS/Base.lproj/LaunchScreenPhone.storyboard
@@ -65,12 +65,12 @@
                         </connections>
                     </tableView>
                     <toolbarItems>
+                        <barButtonItem image="line.horizontal.3.decrease.circle" catalog="system" id="Khk-Hd-iNS"/>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="Kjl-Sb-QP1"/>
                         <barButtonItem systemItem="add" id="PVr-3K-nPg"/>
                     </toolbarItems>
                     <navigationItem key="navigationItem" title="Feeds" largeTitleDisplayMode="always" id="lE1-xw-gjH">
                         <barButtonItem key="leftBarButtonItem" title="Item" image="gear" catalog="system" id="AK3-N5-4ke"/>
-                        <barButtonItem key="rightBarButtonItem" image="line.horizontal.3.decrease.circle" catalog="system" id="Khk-Hd-iNS"/>
                     </navigationItem>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
                 </tableViewController>
diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index e49f78bd6..5f91ef60a 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -119,12 +119,12 @@
                         </connections>
                     </tableView>
                     <toolbarItems>
-                        <barButtonItem title="Item" image="markAllAsRead" id="fTv-eX-72r">
+                        <barButtonItem image="line.horizontal.3.decrease.circle" catalog="system" id="af2-lj-EcA">
                             <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Mark All as Read"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="FIlter Articles"/>
                             </userDefinedRuntimeAttributes>
                             <connections>
-                                <action selector="markAllAsRead:" destination="Kyk-vK-QRX" id="4nd-Gg-APm"/>
+                                <action selector="toggleFilter:" destination="Kyk-vK-QRX" id="jxP-b2-V1n"/>
                             </connections>
                         </barButtonItem>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="53V-wq-bat"/>
@@ -139,9 +139,12 @@
                         </barButtonItem>
                     </toolbarItems>
                     <navigationItem key="navigationItem" title="Timeline" largeTitleDisplayMode="never" id="wcC-1L-ug4">
-                        <barButtonItem key="rightBarButtonItem" image="line.horizontal.3.decrease.circle" catalog="system" id="af2-lj-EcA">
+                        <barButtonItem key="rightBarButtonItem" title="Item" image="markAllAsRead" id="fTv-eX-72r">
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Mark All as Read"/>
+                            </userDefinedRuntimeAttributes>
                             <connections>
-                                <action selector="toggleFilter:" destination="Kyk-vK-QRX" id="jxP-b2-V1n"/>
+                                <action selector="markAllAsRead:" destination="Kyk-vK-QRX" id="4nd-Gg-APm"/>
                             </connections>
                         </barButtonItem>
                     </navigationItem>
@@ -192,17 +195,9 @@
                                 <action selector="settings:" destination="7bK-jq-Zjz" id="Y8a-lz-Im7"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" image="line.horizontal.3.decrease.circle" catalog="system" id="ZJu-oJ-c1R">
-                            <connections>
-                                <action selector="toggleFilter:" destination="7bK-jq-Zjz" id="7lh-Bz-nfD"/>
-                            </connections>
-                        </barButtonItem>
                     </navigationItem>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
-                    <connections>
-                        <outlet property="filterButton" destination="ZJu-oJ-c1R" id="jiO-wg-qrG"/>
-                    </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Rux-fX-hf1" sceneMemberID="firstResponder"/>
             </objects>
@@ -373,7 +368,7 @@
         <image name="circle" catalog="system" width="64" height="60"/>
         <image name="gear" catalog="system" width="64" height="58"/>
         <image name="line.horizontal.3.decrease.circle" catalog="system" width="64" height="60"/>
-        <image name="markAllAsRead" width="17" height="17"/>
+        <image name="markAllAsRead" width="17" height="26"/>
         <image name="multiply.circle.fill" catalog="system" width="64" height="60"/>
         <image name="square.and.arrow.up" catalog="system" width="56" height="64"/>
         <image name="square.and.arrow.up.fill" catalog="system" width="56" height="64"/>
diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift
index 9987eef5d..ad6fd9c35 100644
--- a/iOS/MasterFeed/MasterFeedViewController.swift
+++ b/iOS/MasterFeed/MasterFeedViewController.swift
@@ -14,7 +14,7 @@ import RSTree
 
 class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 
-	@IBOutlet weak var filterButton: UIBarButtonItem!
+	private var filterButton: UIBarButtonItem!
 	private var refreshProgressView: RefreshProgressView?
 	private var addNewItemButton: UIBarButtonItem!
 	
@@ -400,7 +400,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		coordinator.showSettings()
 	}
 	
-	@IBAction func toggleFilter(_ sender: Any) {
+	@objc func toggleFilter(_ sender: Any) {
 		if coordinator.isReadFeedsFiltered {
 			filterButton.image = AppAssets.filterInactiveImage
 			coordinator.showAllFeeds()
@@ -410,7 +410,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		}
 	}
 	
-	@IBAction func add(_ sender: UIBarButtonItem) {
+	@objc func add(_ sender: UIBarButtonItem) {
 		coordinator.showAdd(.feed)
 	}
 	
@@ -669,12 +669,15 @@ private extension MasterFeedViewController {
 
 		self.refreshProgressView = refreshProgressView
 
+		filterButton = UIBarButtonItem(image: AppAssets.filterInactiveImage, style: .plain, target: self, action: #selector(toggleFilter(_:)))
+		filterButton.accLabelText = NSLocalizedString("Filter Feeds", comment: "Filter Feeds")
 		let spaceItemButton1 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
 		let refreshProgressItemButton = UIBarButtonItem(customView: refreshProgressView)
 		let spaceItemButton2 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
 		addNewItemButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(add(_:)))
 		
-		setToolbarItems([spaceItemButton1,
+		setToolbarItems([filterButton,
+						 spaceItemButton1,
 						 refreshProgressItemButton,
 						 spaceItemButton2,
 						 addNewItemButton
@@ -683,9 +686,9 @@ private extension MasterFeedViewController {
 	
 	func updateUI() {
 		if coordinator.isReadFeedsFiltered {
-			filterButton.image = AppAssets.filterActiveImage
+			filterButton?.image = AppAssets.filterActiveImage
 		} else {
-			filterButton.image = AppAssets.filterInactiveImage
+			filterButton?.image = AppAssets.filterInactiveImage
 		}
 		refreshProgressView?.updateRefreshLabel()
 		addNewItemButton?.isEnabled = !AccountManager.shared.activeAccounts.isEmpty