diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift
index c28c5e0d3..c5341ce80 100644
--- a/iOS/AppAssets.swift
+++ b/iOS/AppAssets.swift
@@ -14,26 +14,26 @@ struct AppAssets {
 		return UIColor(named: "avatarBackgroundColor")!
 	}()
 
-	static var circleClosedImage: RSImage = {
-		return RSImage(named: "circleClosedImage")!
+	static var circleClosedImage: UIImage = {
+		return UIImage(systemName: "circle.fill")!
 	}()
 	
-	static var circleOpenImage: RSImage = {
-		return RSImage(named: "circleOpenImage")!
+	static var circleOpenImage: UIImage = {
+		return UIImage(systemName: "circle")!
 	}()
 	
 	static var chevronDisclosureColor: UIColor = {
 		return UIColor(named: "chevronDisclosureColor")!
 	}()
 	
-	static var chevronDownImage: RSImage = {
-		let image = RSImage(named: "chevronDownImage")!
-		return image.maskWithColor(color: AppAssets.chevronDisclosureColor.cgColor)!
+	static var chevronDownImage: UIImage = {
+		let image = UIImage(systemName: "chevron.down")!
+		return image.withTintColor(AppAssets.chevronDisclosureColor, renderingMode: .alwaysOriginal)
 	}()
 	
-	static var chevronRightImage: RSImage = {
-		let image = RSImage(named: "chevronRightImage")!
-		return image.maskWithColor(color: AppAssets.chevronDisclosureColor.cgColor)!
+	static var chevronRightImage: UIImage = {
+		let image = UIImage(systemName: "chevron.right")!
+		return image.withTintColor(AppAssets.chevronDisclosureColor, renderingMode: .alwaysOriginal)
 	}()
 	
 	static var faviconTemplateImage: RSImage = {
@@ -47,10 +47,10 @@ struct AppAssets {
 	static var masterFolderColor: UIColor = {
 		return UIColor(named: "masterFolderColor")!
 	}()
-
-	static var masterFolderImage: RSImage = {
-		let image = RSImage(systemName: "folder.fill")!
-		return image.maskWithColor(color: AppAssets.masterFolderColor.cgColor)!
+	
+	static var masterFolderImage: UIImage = {
+		let image = UIImage(systemName: "folder.fill")!
+		return image.withTintColor(AppAssets.masterFolderColor, renderingMode: .alwaysOriginal)
 	}()
 	
 	static var netNewsWireBlueColor: UIColor = {
@@ -61,28 +61,28 @@ struct AppAssets {
 		return UIColor(named: "smartFeedColor")!
 	}()
 	
-	static var smartFeedImage: RSImage = {
-		let image = RSImage(named: "smartFeedImage")!
-		return image.maskWithColor(color: AppAssets.smartFeedColor.cgColor)!
+	static var smartFeedImage: UIImage = {
+		let image = UIImage(systemName: "gear")!
+		return image.withTintColor(AppAssets.smartFeedColor, renderingMode: .alwaysOriginal)
 	}()
 	
 	static var starColor: UIColor = {
 		return UIColor(named: "starColor")!
 	}()
 	
-	static var starClosedImage: RSImage = {
-		return RSImage(named: "starClosedImage")!
+	static var starClosedImage: UIImage = {
+		return UIImage(systemName: "star.fill")!
 	}()
 	
-	static var starOpenImage: RSImage = {
-		return RSImage(named: "starOpenImage")!
+	static var starOpenImage: UIImage = {
+		return UIImage(systemName: "star")!
 	}()
 	
-	static var timelineStarImage: RSImage = {
-		let image = RSImage(named: "starClosedImage")!
-		return image.maskWithColor(color: AppAssets.starColor.cgColor)!
+	static var timelineStarImage: UIImage = {
+		let image = UIImage(systemName: "star.fill")!
+		return image.withTintColor(AppAssets.starColor, renderingMode: .alwaysOriginal)
 	}()
-
+	
 	static var timelineUnreadCircleColor: UIColor = {
 		return UIColor(named: "timelineUnreadCircleColor")!
 	}()