diff --git a/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift b/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift
index 883c859d7..160b10bc0 100644
--- a/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift
+++ b/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift
@@ -13,15 +13,13 @@ import RSTree
 
 class SidebarCell : NSTableCellView {
 
-	var image: NSImage? {
+	var iconImage: IconImage? {
 		didSet {
-			if let image = image {
-				faviconImageView.image = shouldShowImage ? image : nil
-				faviconImageView.alphaValue = image.isTemplate ? 0.75 : 1.0
+			if let image = iconImage {
+				faviconImageView.iconImage = shouldShowImage ? image : nil
 			}
 			else {
-				faviconImageView.image = nil
-				faviconImageView.alphaValue = 1.0
+				faviconImageView.iconImage = nil
 			}
 		}
 	}
@@ -31,7 +29,7 @@ class SidebarCell : NSTableCellView {
 			if shouldShowImage != oldValue {
 				needsLayout = true
 			}
-			faviconImageView.image = shouldShowImage ? image : nil
+			faviconImageView.iconImage = shouldShowImage ? iconImage : nil
 		}
 	}
 
@@ -80,14 +78,7 @@ class SidebarCell : NSTableCellView {
 		return textField
 	}()
 
-	private let faviconImageView: NSImageView = {
-		let imageView = NSImageView(frame: NSRect.zero)
-		imageView.animates = false
-		imageView.imageAlignment = .alignCenter
-		imageView.imageScaling = .scaleProportionallyDown
-		imageView.wantsLayer = true
-		return imageView
-	}()
+	private let faviconImageView = IconView()
 
 	private let unreadCountView = UnreadCountView(frame: NSZeroRect)
 
diff --git a/Mac/MainWindow/Sidebar/SidebarViewController.swift b/Mac/MainWindow/Sidebar/SidebarViewController.swift
index c0008daa2..da708afc7 100644
--- a/Mac/MainWindow/Sidebar/SidebarViewController.swift
+++ b/Mac/MainWindow/Sidebar/SidebarViewController.swift
@@ -73,6 +73,7 @@ protocol SidebarDelegate: class {
 		NotificationCenter.default.addObserver(self, selector: #selector(userDidAddFeed(_:)), name: .UserDidAddFeed, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(batchUpdateDidPerform(_:)), name: .BatchUpdateDidPerform, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(faviconDidBecomeAvailable(_:)), name: .FaviconDidBecomeAvailable, object: nil)
+		NotificationCenter.default.addObserver(self, selector: #selector(webFeedIconDidBecomeAvailable(_:)), name: .WebFeedIconDidBecomeAvailable, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(webFeedSettingDidChange(_:)), name: .WebFeedSettingDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange(_:)), name: .DisplayNameDidChange, object: nil)
 
@@ -191,6 +192,11 @@ protocol SidebarDelegate: class {
 		applyToAvailableCells(configureFavicon)
 	}
 
+	@objc func webFeedIconDidBecomeAvailable(_ note: Notification) {
+		guard let webFeed = note.userInfo?[UserInfoKey.webFeed] as? WebFeed else { return }
+		configureCellsForRepresentedObject(webFeed)
+	}
+	
 	@objc func webFeedSettingDidChange(_ note: Notification) {
 		guard let webFeed = note.object as? WebFeed, let key = note.userInfo?[WebFeed.WebFeedSettingUserInfoKey] as? String else {
 			return
@@ -733,7 +739,7 @@ private extension SidebarViewController {
 	}
 
 	func configureFavicon(_ cell: SidebarCell, _ node: Node) {
-		cell.image = imageFor(node)?.image
+		cell.iconImage = imageFor(node)
 	}
 
 	func configureGroupCell(_ cell: NSTableCellView, _ node: Node) {
@@ -741,6 +747,9 @@ private extension SidebarViewController {
 	}
 
 	func imageFor(_ node: Node) -> IconImage? {
+		if let feed = node.representedObject as? WebFeed, let feedIcon = appDelegate.webFeedIconDownloader.icon(for: feed) {
+			return feedIcon
+		}
 		if let smallIconProvider = node.representedObject as? SmallIconProvider {
 			return smallIconProvider.smallIcon
 		}