diff --git a/Shared/SmartFeeds/StarredFeedDelegate.swift b/Shared/SmartFeeds/StarredFeedDelegate.swift
index 2c70b079e..251e72cd5 100644
--- a/Shared/SmartFeeds/StarredFeedDelegate.swift
+++ b/Shared/SmartFeeds/StarredFeedDelegate.swift
@@ -22,7 +22,9 @@ struct StarredFeedDelegate: SmartFeedDelegate {
 
 	let nameForDisplay = NSLocalizedString("Starred", comment: "Starred pseudo-feed title")
 	let fetchType: FetchType = .starred
-	var smallIcon: IconImage? = AppAssets.starredFeedImage
+	var smallIcon: IconImage? {
+		return AppAssets.starredFeedImage
+	}
 
 	func fetchUnreadCount(for account: Account, completion: @escaping SingleUnreadCountCompletionBlock) {
 		account.fetchUnreadCountForStarredArticles(completion)
diff --git a/Shared/SmartFeeds/TodayFeedDelegate.swift b/Shared/SmartFeeds/TodayFeedDelegate.swift
index 50c275665..085a43777 100644
--- a/Shared/SmartFeeds/TodayFeedDelegate.swift
+++ b/Shared/SmartFeeds/TodayFeedDelegate.swift
@@ -20,7 +20,9 @@ struct TodayFeedDelegate: SmartFeedDelegate {
 	
 	let nameForDisplay = NSLocalizedString("Today", comment: "Today pseudo-feed title")
 	let fetchType = FetchType.today
-	var smallIcon: IconImage? = AppAssets.todayFeedImage
+	var smallIcon: IconImage? {
+		return AppAssets.todayFeedImage
+	}
 	
 	func fetchUnreadCount(for account: Account, completion: @escaping SingleUnreadCountCompletionBlock) {
 		account.fetchUnreadCountForToday(completion)
diff --git a/Shared/SmartFeeds/UnreadFeed.swift b/Shared/SmartFeeds/UnreadFeed.swift
index ed258a314..4ef22635b 100644
--- a/Shared/SmartFeeds/UnreadFeed.swift
+++ b/Shared/SmartFeeds/UnreadFeed.swift
@@ -39,7 +39,9 @@ final class UnreadFeed: PseudoFeed {
 		}
 	}
 
-	var smallIcon: IconImage? = AppAssets.unreadFeedImage
+	var smallIcon: IconImage? {
+		return AppAssets.unreadFeedImage
+	}
 	
 	#if os(macOS)
 	var pasteboardWriter: NSPasteboardWriting {
diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift
index b3b74b14c..b34b4db4c 100644
--- a/iOS/AppAssets.swift
+++ b/iOS/AppAssets.swift
@@ -177,9 +177,9 @@ struct AppAssets {
 		return UIImage(systemName: "arrow.turn.down.left")!
 	}()
 	
-	static var primaryAccentColor: UIColor = {
+	static var primaryAccentColor: UIColor {
 		return UIColor(named: "primaryAccentColor")!
-	}()
+	}
 	
 	static var safariImage: UIImage = {
 		return UIImage(systemName: "safari")!
@@ -189,9 +189,9 @@ struct AppAssets {
 		return IconImage(UIImage(systemName: "magnifyingglass")!, isSymbol: true)
 	}()
 	
-	static var secondaryAccentColor: UIColor = {
+	static var secondaryAccentColor: UIColor {
 		return UIColor(named: "secondaryAccentColor")!
-	}()
+	}
 	
 	static var sectionHeaderColor: UIColor = {
 		return UIColor(named: "sectionHeaderColor")!
@@ -217,10 +217,10 @@ struct AppAssets {
 		return UIImage(systemName: "star")!
 	}()
 	
-	static var starredFeedImage: IconImage = {
-		let image = UIImage(named: "smartFeedStar")!
-		return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: nil)
-	}()
+	static var starredFeedImage: IconImage {
+		let image = UIImage(systemName: "star.fill")!
+		return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: AppAssets.starColor.cgColor)
+	}
 
 	static var tickMarkColor: UIColor = {
 		return UIColor(named: "tickMarkColor")!
@@ -231,19 +231,19 @@ struct AppAssets {
 		return image.withTintColor(AppAssets.starColor, renderingMode: .alwaysOriginal)
 	}()
 	
-	static var todayFeedImage: IconImage = {
-		let image = UIImage(named: "smartFeedToday")!
-		return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: nil)
-	}()
+	static var todayFeedImage: IconImage {
+		let image = UIImage(systemName: "sun.max.fill")!
+		return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: UIColor.systemOrange.cgColor)
+	}
 
 	static var trashImage: UIImage = {
 		return UIImage(systemName: "trash")!
 	}()
 	
-	static var unreadFeedImage: IconImage = {
-		let image = UIImage(named: "smartFeedUnread")!
-		return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: nil)
-	}()
+	static var unreadFeedImage: IconImage {
+		let image = UIImage(systemName: "largecircle.fill.circle")!
+		return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: AppAssets.secondaryAccentColor.cgColor)
+	}
 	
 	static var vibrantTextColor: UIColor = {
 		return UIColor(named: "vibrantTextColor")!
diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index db1c5561a..cf1166c5f 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17503.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17502"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -332,7 +332,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Article Title" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iFp-rn-HhQ">
-                                <rect key="frame" x="20" y="74.5" width="135.5" height="33.5"/>
+                                <rect key="frame" x="20" y="74.5" width="136" height="33.5"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift
index 59020a283..eb264e520 100644
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/MasterTimeline/MasterTimelineViewController.swift
@@ -588,7 +588,14 @@ private extension MasterTimelineViewController {
 		title = coordinator.timelineFeed?.nameForDisplay ?? "Timeline"
 
 		if let titleView = navigationItem.titleView as? MasterTimelineTitleView {
-			titleView.iconView.iconImage = coordinator.timelineIconImage
+			let timelineIconImage = coordinator.timelineIconImage
+			titleView.iconView.iconImage = timelineIconImage
+			if let preferredColor = timelineIconImage?.preferredColor {
+				titleView.iconView.tintColor = UIColor(cgColor: preferredColor)
+			} else {
+				titleView.iconView.tintColor = nil
+			}
+			
 			titleView.label.text = coordinator.timelineFeed?.nameForDisplay
 			updateTitleUnreadCount()
 
diff --git a/iOS/Resources/Assets.xcassets/smartFeedStar.imageset/Contents.json b/iOS/Resources/Assets.xcassets/smartFeedStar.imageset/Contents.json
deleted file mode 100644
index 36b70afee..000000000
--- a/iOS/Resources/Assets.xcassets/smartFeedStar.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "smartfeed.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
diff --git a/iOS/Resources/Assets.xcassets/smartFeedStar.imageset/smartfeed.pdf b/iOS/Resources/Assets.xcassets/smartFeedStar.imageset/smartfeed.pdf
deleted file mode 100644
index e6d654435..000000000
Binary files a/iOS/Resources/Assets.xcassets/smartFeedStar.imageset/smartfeed.pdf and /dev/null differ
diff --git a/iOS/Resources/Assets.xcassets/smartFeedToday.imageset/Contents.json b/iOS/Resources/Assets.xcassets/smartFeedToday.imageset/Contents.json
deleted file mode 100644
index eef86ef84..000000000
--- a/iOS/Resources/Assets.xcassets/smartFeedToday.imageset/Contents.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "today-any.pdf",
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "today-dark.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
diff --git a/iOS/Resources/Assets.xcassets/smartFeedToday.imageset/today-any.pdf b/iOS/Resources/Assets.xcassets/smartFeedToday.imageset/today-any.pdf
deleted file mode 100644
index 82736f90c..000000000
Binary files a/iOS/Resources/Assets.xcassets/smartFeedToday.imageset/today-any.pdf and /dev/null differ
diff --git a/iOS/Resources/Assets.xcassets/smartFeedToday.imageset/today-dark.pdf b/iOS/Resources/Assets.xcassets/smartFeedToday.imageset/today-dark.pdf
deleted file mode 100644
index e2dbb04a7..000000000
Binary files a/iOS/Resources/Assets.xcassets/smartFeedToday.imageset/today-dark.pdf and /dev/null differ
diff --git a/iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/Contents.json b/iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/Contents.json
deleted file mode 100644
index 9a04ad91a..000000000
--- a/iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/Contents.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "unread-any.pdf",
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "unread-dark.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
diff --git a/iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/unread-any.pdf b/iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/unread-any.pdf
deleted file mode 100644
index cf4db360e..000000000
Binary files a/iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/unread-any.pdf and /dev/null differ
diff --git a/iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/unread-dark.pdf b/iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/unread-dark.pdf
deleted file mode 100644
index 8b4443ee2..000000000
Binary files a/iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/unread-dark.pdf and /dev/null differ