diff --git a/Mac/Base.lproj/MainWindow.storyboard b/Mac/Base.lproj/MainWindow.storyboard
index 395954ad2..8272b9ddd 100644
--- a/Mac/Base.lproj/MainWindow.storyboard
+++ b/Mac/Base.lproj/MainWindow.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17147" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17147"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -290,10 +291,10 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <visualEffectView blendingMode="behindWindow" material="appearanceBased" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="977-L4-4ey">
-                                <rect key="frame" x="0.0" y="283" width="166" height="24"/>
+                                <rect key="frame" x="0.0" y="284" width="166" height="23"/>
                                 <subviews>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eZS-8K-qiN">
-                                        <rect key="frame" x="140" y="5" width="14" height="14"/>
+                                        <rect key="frame" x="140" y="4" width="14" height="14"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="14" id="ELp-U5-6Vw"/>
                                             <constraint firstAttribute="width" constant="14" id="vyT-yU-oaI"/>
@@ -309,25 +310,25 @@
                                     </button>
                                 </subviews>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="24" id="Ax2-oO-NTV"/>
+                                    <constraint firstAttribute="height" constant="23" id="Ax2-oO-NTV"/>
                                     <constraint firstAttribute="trailing" secondItem="eZS-8K-qiN" secondAttribute="trailing" constant="12" id="CFy-rz-Otf"/>
                                     <constraint firstItem="eZS-8K-qiN" firstAttribute="top" secondItem="977-L4-4ey" secondAttribute="top" constant="5" id="M0q-C7-z10"/>
                                 </constraints>
                             </visualEffectView>
                             <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="cJj-Wv-9ep">
-                                <rect key="frame" x="0.0" y="0.0" width="166" height="283"/>
+                                <rect key="frame" x="0.0" y="0.0" width="166" height="284"/>
                                 <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="2eU-Wz-F9g">
-                                    <rect key="frame" x="0.0" y="0.0" width="166" height="283"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="166" height="284"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="26" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="23" outlineTableColumn="ih9-mJ-EA7" id="cnV-kg-Dn2" customClass="SidebarOutlineView" customModule="NetNewsWire" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="167" height="283"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="166" height="284"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="0.0"/>
                                             <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn width="164" minWidth="23" maxWidth="1000" id="ih9-mJ-EA7">
+                                                <tableColumn width="134" minWidth="23" maxWidth="1000" id="ih9-mJ-EA7">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -340,7 +341,7 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView identifier="HeaderCell" id="qkt-WA-5tB">
-                                                            <rect key="frame" x="1" y="0.0" width="164" height="17"/>
+                                                            <rect key="frame" x="11" y="0.0" width="143" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fNJ-z1-0Up">
@@ -358,7 +359,7 @@
                                                             </connections>
                                                         </tableCellView>
                                                         <tableCellView identifier="DataCell" id="HJn-Tm-YNO" customClass="SidebarCell" customModule="NetNewsWire" customModuleProvider="target">
-                                                            <rect key="frame" x="1" y="17" width="164" height="17"/>
+                                                            <rect key="frame" x="11" y="17" width="143" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         </tableCellView>
                                                     </prototypeCellViews>
@@ -526,10 +527,10 @@
                                 </connections>
                             </button>
                             <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="7p6-pA-iw6">
-                                <rect key="frame" x="0.0" y="171" width="450" height="5"/>
+                                <rect key="frame" x="0.0" y="172" width="450" height="5"/>
                             </box>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Zpk-pq-9nW" customClass="TimelineContainerView" customModule="NetNewsWire" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="450" height="173"/>
+                                <rect key="frame" x="0.0" y="0.0" width="450" height="174"/>
                             </customView>
                         </subviews>
                         <constraints>
@@ -542,7 +543,7 @@
                             <constraint firstAttribute="bottom" secondItem="Zpk-pq-9nW" secondAttribute="bottom" id="fyv-EG-PC8"/>
                             <constraint firstItem="iA5-go-AO0" firstAttribute="top" secondItem="Dnl-L5-xFP" secondAttribute="top" constant="5" id="nM9-iA-OzY"/>
                             <constraint firstItem="7p6-pA-iw6" firstAttribute="leading" secondItem="Dnl-L5-xFP" secondAttribute="leading" id="pZU-jW-B1h"/>
-                            <constraint firstItem="7p6-pA-iw6" firstAttribute="top" secondItem="Dnl-L5-xFP" secondAttribute="top" constant="24" id="tUm-nX-Jce"/>
+                            <constraint firstItem="7p6-pA-iw6" firstAttribute="top" secondItem="Dnl-L5-xFP" secondAttribute="top" constant="23" id="tUm-nX-Jce"/>
                             <constraint firstItem="iA5-go-AO0" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="lSU-OC-sEC" secondAttribute="trailing" constant="8" id="yCg-gc-exN"/>
                             <constraint firstItem="lSU-OC-sEC" firstAttribute="top" secondItem="Dnl-L5-xFP" secondAttribute="top" constant="4" id="zay-ZJ-od3"/>
                         </constraints>
@@ -616,11 +617,11 @@
         </scene>
     </scenes>
     <resources>
-        <image name="NSAddTemplate" width="11" height="11"/>
-        <image name="NSRefreshTemplate" width="11" height="15"/>
-        <image name="NSShareTemplate" width="11" height="16"/>
+        <image name="NSAddTemplate" width="14" height="13"/>
+        <image name="NSRefreshTemplate" width="14" height="16"/>
+        <image name="NSShareTemplate" width="15" height="17"/>
         <image name="cleanUp" width="149" height="113"/>
-        <image name="filterInactive" width="100" height="101"/>
+        <image name="filterInactive" width="13" height="13"/>
         <image name="markAllRead" width="22" height="19"/>
         <image name="markRead" width="19" height="19"/>
         <image name="newFolder" width="19" height="19"/>
diff --git a/Mac/Resources/Assets.xcassets/filterActive.imageset/Contents.json b/Mac/Resources/Assets.xcassets/filterActive.imageset/Contents.json
index 6d8907a7a..a8b873158 100644
--- a/Mac/Resources/Assets.xcassets/filterActive.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/filterActive.imageset/Contents.json
@@ -1,15 +1,25 @@
 {
   "images" : [
     {
+      "filename" : "filter-selected_Normal.png",
       "idiom" : "universal",
-      "filename" : "filterActive.pdf"
+      "scale" : "1x"
+    },
+    {
+      "filename" : "filter-selected_Normal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
\ No newline at end of file
+}
diff --git a/Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal.png b/Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal.png
new file mode 100644
index 000000000..c3c6a0e8b
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal.png differ
diff --git a/Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal@2x.png b/Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal@2x.png
new file mode 100644
index 000000000..a88e6ae7e
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal@2x.png differ
diff --git a/Mac/Resources/Assets.xcassets/filterActive.imageset/filterActive.pdf b/Mac/Resources/Assets.xcassets/filterActive.imageset/filterActive.pdf
deleted file mode 100644
index 68eb230b5..000000000
Binary files a/Mac/Resources/Assets.xcassets/filterActive.imageset/filterActive.pdf and /dev/null differ
diff --git a/Mac/Resources/Assets.xcassets/filterInactive.imageset/Contents.json b/Mac/Resources/Assets.xcassets/filterInactive.imageset/Contents.json
index 93ba12c1b..1bc9bbbe1 100644
--- a/Mac/Resources/Assets.xcassets/filterInactive.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/filterInactive.imageset/Contents.json
@@ -1,15 +1,25 @@
 {
   "images" : [
     {
+      "filename" : "filter-unselected_Normal.png",
       "idiom" : "universal",
-      "filename" : "filterInactive.pdf"
+      "scale" : "1x"
+    },
+    {
+      "filename" : "filter-unselected_Normal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
\ No newline at end of file
+}
diff --git a/Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal.png b/Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal.png
new file mode 100644
index 000000000..28da341c4
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal.png differ
diff --git a/Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal@2x.png b/Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal@2x.png
new file mode 100644
index 000000000..a9f373af9
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal@2x.png differ
diff --git a/Mac/Resources/Assets.xcassets/filterInactive.imageset/filterInactive.pdf b/Mac/Resources/Assets.xcassets/filterInactive.imageset/filterInactive.pdf
deleted file mode 100644
index 0d6b6c9b2..000000000
Binary files a/Mac/Resources/Assets.xcassets/filterInactive.imageset/filterInactive.pdf and /dev/null differ