diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index a7dca76f9..0eef8995b 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -1147,16 +1147,13 @@ private extension MainWindowController {
 		
 		if let toolbarItem = item as? NSToolbarItem {
 			toolbarItem.toolTip = commandName
+			toolbarItem.image = markingRead ? AppAssets.readClosedImage : AppAssets.readOpenImage
 		}
 		
 		if let menuItem = item as? NSMenuItem {
 			menuItem.title = commandName
 		}
 		
-		if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
-			button.image = markingRead ? AppAssets.readClosedImage : AppAssets.readOpenImage
-		}
-		
 		return result
 	}
 
@@ -1237,16 +1234,13 @@ private extension MainWindowController {
 
 		if let toolbarItem = item as? NSToolbarItem {
 			toolbarItem.toolTip = commandName
+			toolbarItem.image = starring ? AppAssets.starOpenImage : AppAssets.starClosedImage
 		}
 
 		if let menuItem = item as? NSMenuItem {
 			menuItem.title = commandName
 		}
 
-		if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
-			button.image = starring ? AppAssets.starOpenImage : AppAssets.starClosedImage
-		}
-
 		return result
 	}
 	
@@ -1269,24 +1263,24 @@ private extension MainWindowController {
 
 		guard let isReadFiltered = timelineContainerViewController?.isReadFiltered else {
 			(item as? NSMenuItem)?.title = hideCommand
-			if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
+			if let toolbarItem = item as? NSToolbarItem {
 				toolbarItem.toolTip = hideCommand
-				button.image = AppAssets.filterInactive
+				toolbarItem.image = AppAssets.filterInactive
 			}
 			return false
 		}
 
 		if isReadFiltered {
 			(item as? NSMenuItem)?.title = showCommand
-			if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
+			if let toolbarItem = item as? NSToolbarItem {
 				toolbarItem.toolTip = showCommand
-				button.image = AppAssets.filterActive
+				toolbarItem.image = AppAssets.filterActive
 			}
 		} else {
 			(item as? NSMenuItem)?.title = hideCommand
-			if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
+			if let toolbarItem = item as? NSToolbarItem {
 				toolbarItem.toolTip = hideCommand
-				button.image = AppAssets.filterInactive
+				toolbarItem.image = AppAssets.filterInactive
 			}
 		}
 		
diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 1ba1722c4..bf4a81482 100644
--- a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/Ranchero-Software/RSCore.git",
         "state": {
           "branch": null,
-          "revision": "b0d9ac8811cc35f8cce7b099f552bc947bfcddf5",
-          "version": "1.1.0"
+          "revision": "d3a4a32b265ff682eaef32cecc5878261bfa269e",
+          "version": "1.1.1"
         }
       },
       {