diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift
index 146af1bb1..8d846c360 100644
--- a/Mac/AppAssets.swift
+++ b/Mac/AppAssets.swift
@@ -49,4 +49,21 @@ struct AppAssets {
 	static var avatarDarkBackgroundColor: NSColor = {
 		return NSColor(named: NSColor.Name("avatarDarkBackgroundColor"))!
 	}()
+
+	static var searchFeedImage: RSImage = {
+		return RSImage(named: NSImage.smartBadgeTemplateName)!
+	}()
+
+	static var starredFeedImage: RSImage = {
+		return RSImage(named: NSImage.smartBadgeTemplateName)!
+	}()
+
+	static var todayFeedImage: RSImage = {
+		return RSImage(named: NSImage.smartBadgeTemplateName)!
+	}()
+
+	static var unreadFeedImage: RSImage = {
+		return RSImage(named: NSImage.smartBadgeTemplateName)!
+	}()
+
 }
diff --git a/Shared/SmartFeeds/SearchFeedDelegate.swift b/Shared/SmartFeeds/SearchFeedDelegate.swift
index a9ca5de83..b5c2b4b66 100644
--- a/Shared/SmartFeeds/SearchFeedDelegate.swift
+++ b/Shared/SmartFeeds/SearchFeedDelegate.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import RSCore
 import Account
 import Articles
 
@@ -19,6 +20,7 @@ struct SearchFeedDelegate: SmartFeedDelegate {
 	let nameForDisplayPrefix = NSLocalizedString("Search: ", comment: "Search smart feed title prefix")
 	let searchString: String
 	let fetchType: FetchType
+	var smallIcon: RSImage? = AppAssets.searchFeedImage
 
 	init(searchString: String) {
 		self.searchString = searchString
diff --git a/Shared/SmartFeeds/SearchTimelineFeedDelegate.swift b/Shared/SmartFeeds/SearchTimelineFeedDelegate.swift
index 398e60d8e..443f248ed 100644
--- a/Shared/SmartFeeds/SearchTimelineFeedDelegate.swift
+++ b/Shared/SmartFeeds/SearchTimelineFeedDelegate.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import RSCore
 import Account
 import Articles
 
@@ -19,6 +20,7 @@ struct SearchTimelineFeedDelegate: SmartFeedDelegate {
 	let nameForDisplayPrefix = NSLocalizedString("Search: ", comment: "Search smart feed title prefix")
 	let searchString: String
 	let fetchType: FetchType
+	var smallIcon: RSImage? = AppAssets.searchFeedImage
 
 	init(searchString: String, articleIDs: Set<String>) {
 		self.searchString = searchString
diff --git a/Shared/SmartFeeds/SmartFeed.swift b/Shared/SmartFeeds/SmartFeed.swift
index 436198d79..9a9b3e677 100644
--- a/Shared/SmartFeeds/SmartFeed.swift
+++ b/Shared/SmartFeeds/SmartFeed.swift
@@ -25,6 +25,10 @@ final class SmartFeed: PseudoFeed {
 		}
 	}
 
+	var smallIcon: RSImage? {
+		return delegate.smallIcon
+	}
+	
 	#if os(macOS)
 	var pasteboardWriter: NSPasteboardWriting {
 		return SmartFeedPasteboardWriter(smartFeed: self)
diff --git a/Shared/SmartFeeds/SmartFeedDelegate.swift b/Shared/SmartFeeds/SmartFeedDelegate.swift
index 65da30094..a39d4b411 100644
--- a/Shared/SmartFeeds/SmartFeedDelegate.swift
+++ b/Shared/SmartFeeds/SmartFeedDelegate.swift
@@ -11,7 +11,7 @@ import Account
 import Articles
 import RSCore
 
-protocol SmartFeedDelegate: DisplayNameProvider, ArticleFetcher {
+protocol SmartFeedDelegate: DisplayNameProvider, ArticleFetcher, SmallIconProvider {
 
 	var fetchType: FetchType { get }
 
diff --git a/Shared/SmartFeeds/StarredFeedDelegate.swift b/Shared/SmartFeeds/StarredFeedDelegate.swift
index f71689553..10e5b7957 100644
--- a/Shared/SmartFeeds/StarredFeedDelegate.swift
+++ b/Shared/SmartFeeds/StarredFeedDelegate.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import RSCore
 import Articles
 import Account
 
@@ -16,6 +17,7 @@ struct StarredFeedDelegate: SmartFeedDelegate {
 
 	let nameForDisplay = NSLocalizedString("Starred", comment: "Starred pseudo-feed title")
 	let fetchType: FetchType = .starred
+	var smallIcon: RSImage? = AppAssets.starredFeedImage
 
 	func fetchUnreadCount(for account: Account, callback: @escaping (Int) -> Void) {
 		account.fetchUnreadCountForStarredArticles(callback)
diff --git a/Shared/SmartFeeds/TodayFeedDelegate.swift b/Shared/SmartFeeds/TodayFeedDelegate.swift
index 9d717c70f..936d3bf42 100644
--- a/Shared/SmartFeeds/TodayFeedDelegate.swift
+++ b/Shared/SmartFeeds/TodayFeedDelegate.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import RSCore
 import Articles
 import Account
 
@@ -14,7 +15,8 @@ struct TodayFeedDelegate: SmartFeedDelegate {
 
 	let nameForDisplay = NSLocalizedString("Today", comment: "Today pseudo-feed title")
 	let fetchType = FetchType.today
-
+	var smallIcon: RSImage? = AppAssets.todayFeedImage
+	
 	func fetchUnreadCount(for account: Account, callback: @escaping (Int) -> Void) {
 		account.fetchUnreadCountForToday(callback)
 	}
diff --git a/Shared/SmartFeeds/UnreadFeed.swift b/Shared/SmartFeeds/UnreadFeed.swift
index 80057c775..115070885 100644
--- a/Shared/SmartFeeds/UnreadFeed.swift
+++ b/Shared/SmartFeeds/UnreadFeed.swift
@@ -11,6 +11,7 @@ import AppKit
 #else
 import Foundation
 #endif
+import RSCore
 import Account
 import Articles
 
@@ -29,6 +30,8 @@ final class UnreadFeed: PseudoFeed {
 		}
 	}
 
+	var smallIcon: RSImage? = AppAssets.unreadFeedImage
+	
 	#if os(macOS)
 	var pasteboardWriter: NSPasteboardWriting {
 		return SmartFeedPasteboardWriter(smartFeed: self)
diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift
index d2110e9ae..2dcfd5396 100644
--- a/iOS/AppAssets.swift
+++ b/iOS/AppAssets.swift
@@ -27,7 +27,7 @@ struct AppAssets {
 	}()
 
 	static var circleClosedImage: UIImage = {
-		return UIImage(systemName: "circle.fill")!
+		return UIImage(systemName: "largecircle.fill.circle")!
 	}()
 	
 	static var circleOpenImage: UIImage = {
@@ -60,10 +60,6 @@ struct AppAssets {
 		return RSImage(named: "faviconTemplateImage")!
 	}()
 	
-	static var feedImage: RSImage = {
-		return RSImage(named: "feedImage")!
-	}()
-	
 	static var markAllInFeedAsReadImage: UIImage = {
 		return UIImage(systemName: "asterisk.circle")!
 	}()
@@ -96,8 +92,8 @@ struct AppAssets {
 		return UIImage(systemName: "safari")!
 	}()
 	
-	static var settingsImage: UIImage = {
-		return UIImage(named: "settingsImage")!
+	static var searchFeedImage: UIImage = {
+		return UIImage(named: "magnifyingglass")!
 	}()
 	
 	static var shareImage: UIImage = {
@@ -120,6 +116,10 @@ struct AppAssets {
 		return UIImage(systemName: "star")!
 	}()
 	
+	static var starredFeedImage: UIImage = {
+		return UIImage(systemName: "star.fill")!
+	}()
+
 	static var tableViewCellHighlightedTextColor: UIColor = {
 		return UIColor(named: "tableViewCellHighlightedTextColor")!
 	}()
@@ -141,8 +141,16 @@ struct AppAssets {
 		return UIColor(named: "timelineUnreadCircleColor")!
 	}()
 	
+	static var todayFeedImage: UIImage = {
+		return UIImage(systemName: "sun.max.fill")!
+	}()
+
 	static var trashImage: UIImage = {
 		return UIImage(systemName: "trash")!
 	}()
 	
+	static var unreadFeedImage: UIImage = {
+		return UIImage(systemName: "largecircle.fill.circle")!
+	}()
+	
 }
diff --git a/iOS/Base.lproj/LaunchScreenPad.storyboard b/iOS/Base.lproj/LaunchScreenPad.storyboard
index 8176071f3..81d675131 100644
--- a/iOS/Base.lproj/LaunchScreenPad.storyboard
+++ b/iOS/Base.lproj/LaunchScreenPad.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Cqo-6I-B1A">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Cqo-6I-B1A">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -70,7 +70,7 @@
                         <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="settingsImage" id="AK3-N5-4ke"/>
+                        <barButtonItem key="leftBarButtonItem" title="Item" image="gear" catalog="system" id="AK3-N5-4ke"/>
                         <barButtonItem key="rightBarButtonItem" title="Edit" id="Khk-Hd-iNS"/>
                     </navigationItem>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
@@ -114,6 +114,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="settingsImage" width="24" height="24"/>
+        <image name="gear" catalog="system" width="64" height="60"/>
     </resources>
 </document>
diff --git a/iOS/Base.lproj/LaunchScreenPhone.storyboard b/iOS/Base.lproj/LaunchScreenPhone.storyboard
index 3dff55742..7e19f8713 100644
--- a/iOS/Base.lproj/LaunchScreenPhone.storyboard
+++ b/iOS/Base.lproj/LaunchScreenPhone.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Cqo-6I-B1A">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Cqo-6I-B1A">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -70,7 +70,7 @@
                         <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="settingsImage" id="AK3-N5-4ke"/>
+                        <barButtonItem key="leftBarButtonItem" title="Item" image="gear" catalog="system" id="AK3-N5-4ke"/>
                         <barButtonItem key="rightBarButtonItem" title="Edit" id="Khk-Hd-iNS"/>
                     </navigationItem>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
@@ -114,6 +114,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="settingsImage" width="24" height="24"/>
+        <image name="gear" catalog="system" width="64" height="60"/>
     </resources>
 </document>
diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index 8ca69e6e5..e58263b3e 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14865.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="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -235,7 +235,7 @@
                         </barButtonItem>
                     </toolbarItems>
                     <navigationItem key="navigationItem" title="Feeds" id="Zdf-7t-Un8">
-                        <barButtonItem key="leftBarButtonItem" image="settingsImage" id="TlU-Pg-ATe">
+                        <barButtonItem key="leftBarButtonItem" title="Item" image="gear" catalog="system" id="TlU-Pg-ATe">
                             <connections>
                                 <action selector="settings:" destination="7bK-jq-Zjz" id="Y8a-lz-Im7"/>
                             </connections>
@@ -258,8 +258,8 @@
         <image name="arrow.down.circle" catalog="system" width="64" height="62"/>
         <image name="arrow.up" catalog="system" width="58" height="64"/>
         <image name="circle" catalog="system" width="64" height="62"/>
+        <image name="gear" catalog="system" width="64" height="60"/>
         <image name="safari" catalog="system" width="64" height="62"/>
-        <image name="settingsImage" width="24" height="24"/>
         <image name="square.and.arrow.up" catalog="system" width="56" height="64"/>
         <image name="star" catalog="system" width="64" height="58"/>
     </resources>
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
index 43d8aeecf..737bbffc6 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
+++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
@@ -93,7 +93,7 @@ class MasterFeedTableViewCell : NNWTableViewCell {
 	}()
 
 	private let faviconImageView: UIImageView = {
-		return NonIntrinsicImageView(image: AppAssets.feedImage)
+		return NonIntrinsicImageView(image: AppAssets.faviconTemplateImage)
 	}()
 
 	private var unreadCountView = MasterFeedUnreadCountView(frame: CGRect.zero)
diff --git a/iOS/MasterTimeline/Cell/MasterTimelineAvatarView.swift b/iOS/MasterTimeline/Cell/MasterTimelineAvatarView.swift
index 8973c71bb..1208d7491 100644
--- a/iOS/MasterTimeline/Cell/MasterTimelineAvatarView.swift
+++ b/iOS/MasterTimeline/Cell/MasterTimelineAvatarView.swift
@@ -21,7 +21,7 @@ final class MasterTimelineAvatarView: UIView {
 	}
 
 	private let imageView: UIImageView = {
-		let imageView = NonIntrinsicImageView(image: AppAssets.feedImage)
+		let imageView = NonIntrinsicImageView(image: AppAssets.faviconTemplateImage)
 		imageView.contentMode = .scaleAspectFit
 		return imageView
 	}()
diff --git a/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json
deleted file mode 100644
index ad0c7555f..000000000
--- a/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "safari.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
\ No newline at end of file
diff --git a/iOS/Resources/Assets.xcassets/browserImage.imageset/safari.pdf b/iOS/Resources/Assets.xcassets/browserImage.imageset/safari.pdf
deleted file mode 100644
index 8173d420b..000000000
Binary files a/iOS/Resources/Assets.xcassets/browserImage.imageset/safari.pdf and /dev/null differ
diff --git a/iOS/Resources/Assets.xcassets/feedImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/feedImage.imageset/Contents.json
deleted file mode 100644
index aa4ae543d..000000000
--- a/iOS/Resources/Assets.xcassets/feedImage.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "globe.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iOS/Resources/Assets.xcassets/feedImage.imageset/globe.pdf b/iOS/Resources/Assets.xcassets/feedImage.imageset/globe.pdf
deleted file mode 100644
index f870a17d9..000000000
Binary files a/iOS/Resources/Assets.xcassets/feedImage.imageset/globe.pdf and /dev/null differ
diff --git a/iOS/Resources/Assets.xcassets/rssImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/rssImage.imageset/Contents.json
deleted file mode 100644
index 4c921fd9e..000000000
--- a/iOS/Resources/Assets.xcassets/rssImage.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "rss.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iOS/Resources/Assets.xcassets/rssImage.imageset/rss.pdf b/iOS/Resources/Assets.xcassets/rssImage.imageset/rss.pdf
deleted file mode 100644
index 3e0f82564..000000000
Binary files a/iOS/Resources/Assets.xcassets/rssImage.imageset/rss.pdf and /dev/null differ
diff --git a/iOS/Resources/Assets.xcassets/settingsImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/settingsImage.imageset/Contents.json
deleted file mode 100644
index 6d34a9d99..000000000
--- a/iOS/Resources/Assets.xcassets/settingsImage.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "settings3.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
\ No newline at end of file
diff --git a/iOS/Resources/Assets.xcassets/settingsImage.imageset/settings3.pdf b/iOS/Resources/Assets.xcassets/settingsImage.imageset/settings3.pdf
deleted file mode 100644
index 04f6b8737..000000000
Binary files a/iOS/Resources/Assets.xcassets/settingsImage.imageset/settings3.pdf and /dev/null differ
diff --git a/iOS/Resources/Assets.xcassets/smartFeedImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/smartFeedImage.imageset/Contents.json
deleted file mode 100644
index 85c4c38a9..000000000
--- a/iOS/Resources/Assets.xcassets/smartFeedImage.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "smartFeed.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iOS/Resources/Assets.xcassets/smartFeedImage.imageset/smartFeed.pdf b/iOS/Resources/Assets.xcassets/smartFeedImage.imageset/smartFeed.pdf
deleted file mode 100644
index 8ce103865..000000000
Binary files a/iOS/Resources/Assets.xcassets/smartFeedImage.imageset/smartFeed.pdf and /dev/null differ