diff --git a/Mac/Preferences/Accounts/AccountsAdd.xib b/Mac/Preferences/Accounts/AccountsAdd.xib
index 81789f03b..1fb72c35e 100644
--- a/Mac/Preferences/Accounts/AccountsAdd.xib
+++ b/Mac/Preferences/Accounts/AccountsAdd.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -50,7 +50,7 @@
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="17" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iCD-Yx-4V5">
-                                                        <rect key="frame" x="20" y="8" width="174" height="24"/>
+                                                        <rect key="frame" x="20" y="8" width="133" height="24"/>
                                                         <subviews>
                                                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="KmN-Zk-TBU">
                                                                 <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
@@ -61,9 +61,9 @@
                                                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="oGL-yl-27S"/>
                                                             </imageView>
                                                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="uyu-5W-IaW">
-                                                                <rect key="frame" x="39" y="0.0" width="137" height="24"/>
+                                                                <rect key="frame" x="39" y="4" width="96" height="16"/>
                                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="iOW-VJ-bkx">
-                                                                    <font key="font" metaFont="system" size="20"/>
+                                                                    <font key="font" textStyle="body" name=".SFNS-Regular"/>
                                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
@@ -83,7 +83,7 @@
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="yf7-Ye-Pcd">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                            <font key="font" metaFont="system"/>
+                                                            <font key="font" textStyle="body" name=".SFNS-Regular"/>
                                                         </buttonCell>
                                                         <connections>
                                                             <action selector="pressed:" target="EGi-CQ-lPc" id="2a9-Bp-K3K"/>
diff --git a/Mac/Preferences/Accounts/AccountsAddCloudKit.xib b/Mac/Preferences/Accounts/AccountsAddCloudKit.xib
index b238d070d..b6dc5afd1 100644
--- a/Mac/Preferences/Accounts/AccountsAddCloudKit.xib
+++ b/Mac/Preferences/Accounts/AccountsAddCloudKit.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15505"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,13 +18,13 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="398" height="205"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
-            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="398" height="162"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1792" height="1095"/>
+            <view key="contentView" wantsLayer="YES" misplaced="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="398" height="205"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <stackView distribution="fill" orientation="horizontal" alignment="bottom" spacing="19" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uDK-ji-zlT">
-                        <rect key="frame" x="127" y="108" width="144" height="38"/>
+                        <rect key="frame" x="127" y="107" width="145" height="38"/>
                         <subviews>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ySx-qg-WbT">
                                 <rect key="frame" x="0.0" y="0.0" width="36" height="36"/>
@@ -31,10 +32,10 @@
                                     <constraint firstAttribute="width" constant="36" id="BKI-n8-fbR"/>
                                     <constraint firstAttribute="height" constant="36" id="NLk-V3-hn9"/>
                                 </constraints>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="accountCloudKit" id="9RZ-J3-ioX"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="accountCloudKit" id="9RZ-J3-ioX"/>
                             </imageView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="80D-3X-rL2">
-                                <rect key="frame" x="53" y="0.0" width="93" height="38"/>
+                                <rect key="frame" x="53" y="0.0" width="94" height="38"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="iCloud" id="1d2-Mx-TKe">
                                     <font key="font" metaFont="system" size="32"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -52,7 +53,7 @@
                         </customSpacing>
                     </stackView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xqo-gP-MPl">
-                        <rect key="frame" x="303" y="13" width="81" height="32"/>
+                        <rect key="frame" x="310" y="13" width="75" height="32"/>
                         <buttonCell key="cell" type="push" title="Create" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oih-6c-KbS">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -65,7 +66,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9eG-vV-s8c">
-                        <rect key="frame" x="222" y="13" width="82" height="32"/>
+                        <rect key="frame" x="237" y="13" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iVd-bO-4LN">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -78,7 +79,7 @@ Gw
                         </connections>
                     </button>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Kj-Cl-FJQ">
-                        <rect key="frame" x="47" y="57" width="304" height="16"/>
+                        <rect key="frame" x="47" y="56" width="304" height="16"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="300" id="xiK-wa-r3v"/>
                         </constraints>
@@ -108,6 +109,6 @@ Gw
         </window>
     </objects>
     <resources>
-        <image name="accountCloudKit" width="100" height="70"/>
+        <image name="accountCloudKit" width="191" height="134"/>
     </resources>
 </document>
diff --git a/Mac/Preferences/Accounts/AccountsAddLocal.xib b/Mac/Preferences/Accounts/AccountsAddLocal.xib
index a0d1f1179..315c287f2 100644
--- a/Mac/Preferences/Accounts/AccountsAddLocal.xib
+++ b/Mac/Preferences/Accounts/AccountsAddLocal.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -19,13 +19,13 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="398" height="205"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1792" height="1095"/>
             <view key="contentView" wantsLayer="YES" misplaced="YES" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="398" height="205"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <stackView distribution="fill" orientation="horizontal" alignment="bottom" spacing="19" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uDK-ji-zlT">
-                        <rect key="frame" x="93" y="161" width="213" height="38"/>
+                        <rect key="frame" x="93" y="160" width="213" height="38"/>
                         <subviews>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ySx-qg-WbT">
                                 <rect key="frame" x="0.0" y="0.0" width="36" height="36"/>
@@ -33,7 +33,7 @@
                                     <constraint firstAttribute="width" constant="36" id="BKI-n8-fbR"/>
                                     <constraint firstAttribute="height" constant="36" id="NLk-V3-hn9"/>
                                 </constraints>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="accountLocal" id="9RZ-J3-ioX"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="accountLocal" id="9RZ-J3-ioX"/>
                             </imageView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="80D-3X-rL2">
                                 <rect key="frame" x="53" y="0.0" width="162" height="38"/>
@@ -54,7 +54,7 @@
                         </customSpacing>
                     </stackView>
                     <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Q7-nI-h5u">
-                        <rect key="frame" x="105" y="105" width="188" height="21"/>
+                        <rect key="frame" x="105" y="104" width="188" height="21"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MWg-UL-xtj">
                                 <rect key="frame" x="-2" y="3" width="44" height="16"/>
@@ -86,7 +86,7 @@
                         </customSpacing>
                     </stackView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xqo-gP-MPl">
-                        <rect key="frame" x="303" y="13" width="81" height="32"/>
+                        <rect key="frame" x="310" y="13" width="75" height="32"/>
                         <buttonCell key="cell" type="push" title="Create" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oih-6c-KbS">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -99,7 +99,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9eG-vV-s8c">
-                        <rect key="frame" x="222" y="13" width="82" height="32"/>
+                        <rect key="frame" x="237" y="13" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iVd-bO-4LN">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -112,7 +112,7 @@ Gw
                         </connections>
                     </button>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Kj-Cl-FJQ">
-                        <rect key="frame" x="87" y="57" width="224" height="32"/>
+                        <rect key="frame" x="87" y="56" width="224" height="32"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="220" id="xiK-wa-r3v"/>
                         </constraints>
@@ -144,6 +144,6 @@ Gw
         </window>
     </objects>
     <resources>
-        <image name="accountLocal" width="78" height="98"/>
+        <image name="accountLocal" width="119" height="102"/>
     </resources>
 </document>
diff --git a/Mac/Preferences/Accounts/AccountsAddViewController.swift b/Mac/Preferences/Accounts/AccountsAddViewController.swift
index c541160f0..2b78d7532 100644
--- a/Mac/Preferences/Accounts/AccountsAddViewController.swift
+++ b/Mac/Preferences/Accounts/AccountsAddViewController.swift
@@ -171,7 +171,6 @@ extension AccountsAddViewController: AccountsAddTableCellViewDelegate {
 			accountsReaderAPIWindowController.accountType = .theOldReader
 			accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!)
 			accountsAddWindowController = accountsReaderAPIWindowController
-			
 		}
 		
 	}
diff --git a/Mac/Preferences/Accounts/AccountsFeedWrangler.xib b/Mac/Preferences/Accounts/AccountsFeedWrangler.xib
index 308836ac0..d28eadf16 100644
--- a/Mac/Preferences/Accounts/AccountsFeedWrangler.xib
+++ b/Mac/Preferences/Accounts/AccountsFeedWrangler.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -22,7 +22,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="433" height="249"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1792" height="1095"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="433" height="249"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -36,7 +36,7 @@
                                     <constraint firstAttribute="height" constant="36" id="Ern-Kk-8LX"/>
                                     <constraint firstAttribute="width" constant="36" id="PLS-68-NMc"/>
                                 </constraints>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="accountFeedWrangler" id="y38-YL-woC"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="accountFeedWrangler" id="y38-YL-woC"/>
                             </imageView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lti-yM-8LV">
                                 <rect key="frame" x="53" y="0.0" width="205" height="38"/>
@@ -58,9 +58,6 @@
                     </stackView>
                     <gridView xPlacement="trailing" yPlacement="center" rowAlignment="none" rowSpacing="12" columnSpacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="zBB-JH-huI">
                         <rect key="frame" x="79" y="60" width="276" height="99"/>
-                        <constraints>
-                            <constraint firstItem="byK-Sd-r7F" firstAttribute="width" secondItem="JSa-LY-zNQ" secondAttribute="width" id="Dda-Q6-t0d"/>
-                        </constraints>
                         <rows>
                             <gridRow id="DRl-lC-vUc"/>
                             <gridRow id="eW8-uH-txq"/>
@@ -120,17 +117,17 @@
                                     </secureTextFieldCell>
                                 </secureTextField>
                             </gridCell>
-                            <gridCell row="DbI-7g-Xme" column="fCQ-jY-Mts" xPlacement="leading" id="xX0-vn-AId"/>
-                            <gridCell row="DbI-7g-Xme" column="7CY-bX-6x4" id="hk5-St-E4y">
+                            <gridCell row="DbI-7g-Xme" column="fCQ-jY-Mts" headOfMergedCell="xX0-vn-AId" xPlacement="leading" id="xX0-vn-AId">
                                 <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="byK-Sd-r7F">
-                                    <rect key="frame" x="74" y="9" width="204" height="16"/>
-                                    <textFieldCell key="cell" id="0yh-Ab-UTX">
+                                    <rect key="frame" x="-2" y="9" width="104" height="16"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" id="0yh-Ab-UTX">
                                         <font key="font" usesAppearanceFont="YES"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
                             </gridCell>
+                            <gridCell row="DbI-7g-Xme" column="7CY-bX-6x4" headOfMergedCell="xX0-vn-AId" id="hk5-St-E4y"/>
                         </gridCells>
                     </gridView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9mz-D9-krh">
@@ -184,6 +181,6 @@ Gw
         </window>
     </objects>
     <resources>
-        <image name="accountFeedWrangler" width="190" height="235"/>
+        <image name="accountFeedWrangler" width="261" height="261"/>
     </resources>
 </document>
diff --git a/Mac/Preferences/Accounts/AccountsFeedbin.xib b/Mac/Preferences/Accounts/AccountsFeedbin.xib
index 2152cd497..8edd2ce12 100644
--- a/Mac/Preferences/Accounts/AccountsFeedbin.xib
+++ b/Mac/Preferences/Accounts/AccountsFeedbin.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -21,13 +22,13 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="433" height="249"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1792" height="1095"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="433" height="249"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <stackView distribution="fill" orientation="horizontal" alignment="bottom" spacing="19" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Ht-Fn-0Ya">
-                        <rect key="frame" x="134" y="190" width="166" height="39"/>
+                        <rect key="frame" x="134" y="191" width="166" height="38"/>
                         <subviews>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ssh-Dh-xbg">
                                 <rect key="frame" x="0.0" y="0.0" width="36" height="36"/>
@@ -35,10 +36,10 @@
                                     <constraint firstAttribute="height" constant="36" id="Ern-Kk-8LX"/>
                                     <constraint firstAttribute="width" constant="36" id="PLS-68-NMc"/>
                                 </constraints>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="accountFeedbin" id="y38-YL-woC"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="accountFeedbin" id="y38-YL-woC"/>
                             </imageView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lti-yM-8LV">
-                                <rect key="frame" x="53" y="0.0" width="115" height="39"/>
+                                <rect key="frame" x="53" y="0.0" width="115" height="38"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Feedbin" id="ras-dj-nP8">
                                     <font key="font" metaFont="system" size="32"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -56,7 +57,7 @@
                         </customSpacing>
                     </stackView>
                     <gridView xPlacement="trailing" yPlacement="center" rowAlignment="none" rowSpacing="12" columnSpacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="zBB-JH-huI">
-                        <rect key="frame" x="82" y="61" width="270" height="97"/>
+                        <rect key="frame" x="82" y="60" width="270" height="99"/>
                         <constraints>
                             <constraint firstItem="byK-Sd-r7F" firstAttribute="width" secondItem="JSa-LY-zNQ" secondAttribute="width" id="ImZ-BU-uKB"/>
                         </constraints>
@@ -72,7 +73,7 @@
                         <gridCells>
                             <gridCell row="DRl-lC-vUc" column="fCQ-jY-Mts" id="4DI-01-jGD">
                                 <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zy6-9c-8TI">
-                                    <rect key="frame" x="23" y="78" width="41" height="17"/>
+                                    <rect key="frame" x="23" y="81" width="41" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Email:" id="DqN-SV-v35">
                                         <font key="font" usesAppearanceFont="YES"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -82,7 +83,7 @@
                             </gridCell>
                             <gridCell row="DRl-lC-vUc" column="7CY-bX-6x4" id="Z0b-qS-MUJ">
                                 <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="78p-Cf-f55">
-                                    <rect key="frame" x="70" y="75" width="200" height="22"/>
+                                    <rect key="frame" x="70" y="78" width="200" height="21"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="200" id="Qin-jm-4zt"/>
                                     </constraints>
@@ -95,7 +96,7 @@
                             </gridCell>
                             <gridCell row="eW8-uH-txq" column="fCQ-jY-Mts" id="Hqa-3w-cQv">
                                 <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wEx-TM-rPM">
-                                    <rect key="frame" x="-2" y="44" width="66" height="17"/>
+                                    <rect key="frame" x="-2" y="48" width="66" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Password:" id="7g8-Kk-ISg">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -105,7 +106,7 @@
                             </gridCell>
                             <gridCell row="eW8-uH-txq" column="7CY-bX-6x4" id="m16-3v-9pf">
                                 <secureTextField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JSa-LY-zNQ">
-                                    <rect key="frame" x="70" y="41" width="200" height="22"/>
+                                    <rect key="frame" x="70" y="45" width="200" height="21"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="200" id="eal-wa-1nU"/>
                                     </constraints>
@@ -122,7 +123,7 @@
                             <gridCell row="DbI-7g-Xme" column="fCQ-jY-Mts" xPlacement="leading" id="xX0-vn-AId"/>
                             <gridCell row="DbI-7g-Xme" column="7CY-bX-6x4" yPlacement="top" id="hk5-St-E4y">
                                 <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="byK-Sd-r7F">
-                                    <rect key="frame" x="68" y="12" width="204" height="17"/>
+                                    <rect key="frame" x="68" y="17" width="204" height="16"/>
                                     <textFieldCell key="cell" id="0yh-Ab-UTX">
                                         <font key="font" usesAppearanceFont="YES"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -133,7 +134,7 @@
                         </gridCells>
                     </gridView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9mz-D9-krh">
-                        <rect key="frame" x="340" y="13" width="79" height="32"/>
+                        <rect key="frame" x="347" y="13" width="73" height="32"/>
                         <buttonCell key="cell" type="push" title="Action" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="IMO-YT-k9Z">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -146,7 +147,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XAM-Hb-0Hw">
-                        <rect key="frame" x="258" y="13" width="82" height="32"/>
+                        <rect key="frame" x="273" y="13" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ufs-ar-BAY">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -159,7 +160,7 @@ Gw
                         </connections>
                     </button>
                     <progressIndicator hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="B0W-bh-Evv">
-                        <rect key="frame" x="209" y="166" width="16" height="16"/>
+                        <rect key="frame" x="209" y="167" width="16" height="16"/>
                     </progressIndicator>
                 </subviews>
                 <constraints>
@@ -183,6 +184,6 @@ Gw
         </window>
     </objects>
     <resources>
-        <image name="accountFeedbin" width="120" height="102"/>
+        <image name="accountFeedbin" width="369" height="343"/>
     </resources>
 </document>
diff --git a/Mac/Preferences/Accounts/AccountsNewsBlur.xib b/Mac/Preferences/Accounts/AccountsNewsBlur.xib
index 3b6027ed8..798f154a1 100644
--- a/Mac/Preferences/Accounts/AccountsNewsBlur.xib
+++ b/Mac/Preferences/Accounts/AccountsNewsBlur.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15702" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15702"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -21,7 +22,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="433" height="249"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1792" height="1095"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="433" height="249"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -35,7 +36,7 @@
                                     <constraint firstAttribute="height" constant="36" id="Ern-Kk-8LX"/>
                                     <constraint firstAttribute="width" constant="36" id="PLS-68-NMc"/>
                                 </constraints>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="accountNewsBlur" id="y38-YL-woC"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="accountNewsBlur" id="y38-YL-woC"/>
                             </imageView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lti-yM-8LV">
                                 <rect key="frame" x="53" y="0.0" width="137" height="38"/>
@@ -56,7 +57,7 @@
                         </customSpacing>
                     </stackView>
                     <gridView xPlacement="trailing" yPlacement="center" rowAlignment="none" rowSpacing="12" columnSpacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="zBB-JH-huI">
-                        <rect key="frame" x="51" y="61" width="332" height="98"/>
+                        <rect key="frame" x="51" y="60" width="332" height="99"/>
                         <rows>
                             <gridRow id="DRl-lC-vUc"/>
                             <gridRow id="eW8-uH-txq"/>
@@ -69,7 +70,7 @@
                         <gridCells>
                             <gridCell row="DRl-lC-vUc" column="fCQ-jY-Mts" id="4DI-01-jGD">
                                 <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zy6-9c-8TI">
-                                    <rect key="frame" x="-2" y="80" width="122" height="16"/>
+                                    <rect key="frame" x="-2" y="81" width="122" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Username or Email:" id="DqN-SV-v35">
                                         <font key="font" usesAppearanceFont="YES"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -79,7 +80,7 @@
                             </gridCell>
                             <gridCell row="DRl-lC-vUc" column="7CY-bX-6x4" id="Z0b-qS-MUJ">
                                 <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="78p-Cf-f55">
-                                    <rect key="frame" x="132" y="77" width="200" height="21"/>
+                                    <rect key="frame" x="132" y="78" width="200" height="21"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="200" id="Qin-jm-4zt"/>
                                     </constraints>
@@ -92,7 +93,7 @@
                             </gridCell>
                             <gridCell row="eW8-uH-txq" column="fCQ-jY-Mts" id="Hqa-3w-cQv">
                                 <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wEx-TM-rPM">
-                                    <rect key="frame" x="54" y="47" width="66" height="16"/>
+                                    <rect key="frame" x="54" y="48" width="66" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Password:" id="7g8-Kk-ISg">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -102,7 +103,7 @@
                             </gridCell>
                             <gridCell row="eW8-uH-txq" column="7CY-bX-6x4" id="m16-3v-9pf">
                                 <secureTextField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JSa-LY-zNQ">
-                                    <rect key="frame" x="132" y="44" width="200" height="21"/>
+                                    <rect key="frame" x="132" y="45" width="200" height="21"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="200" id="eal-wa-1nU"/>
                                     </constraints>
@@ -118,7 +119,7 @@
                             </gridCell>
                             <gridCell row="DbI-7g-Xme" column="fCQ-jY-Mts" headOfMergedCell="xX0-vn-AId" xPlacement="leading" id="xX0-vn-AId">
                                 <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="byK-Sd-r7F">
-                                    <rect key="frame" x="-2" y="8" width="104" height="16"/>
+                                    <rect key="frame" x="-2" y="9" width="104" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" id="0yh-Ab-UTX">
                                         <font key="font" usesAppearanceFont="YES"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -130,7 +131,7 @@
                         </gridCells>
                     </gridView>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9mz-D9-krh">
-                        <rect key="frame" x="340" y="13" width="79" height="32"/>
+                        <rect key="frame" x="347" y="13" width="73" height="32"/>
                         <buttonCell key="cell" type="push" title="Action" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="IMO-YT-k9Z">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -143,7 +144,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XAM-Hb-0Hw">
-                        <rect key="frame" x="258" y="13" width="82" height="32"/>
+                        <rect key="frame" x="273" y="13" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ufs-ar-BAY">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -180,6 +181,6 @@ Gw
         </window>
     </objects>
     <resources>
-        <image name="accountNewsBlur" width="512" height="512"/>
+        <image name="accountNewsBlur" width="25" height="25"/>
     </resources>
 </document>
diff --git a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift
index 740e77f5a..50ef70f42 100644
--- a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift
+++ b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift
@@ -8,12 +8,17 @@
 
 import AppKit
 import Account
+import SwiftUI
+import RSCore
+
 
 final class AccountsPreferencesViewController: NSViewController {
 
 	@IBOutlet weak var tableView: NSTableView!
 	@IBOutlet weak var detailView: NSView!
 	@IBOutlet weak var deleteButton: NSButton!
+	var addAccountDelegate: AccountsPreferencesAddAccountDelegate?
+	
 	
 	private var sortedAccounts = [Account]()
 
@@ -23,12 +28,12 @@ final class AccountsPreferencesViewController: NSViewController {
 		updateSortedAccounts()
 		tableView.delegate = self
 		tableView.dataSource = self
+		addAccountDelegate = self
 		
 		NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange(_:)), name: .DisplayNameDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(accountsDidChange(_:)), name: .UserDidAddAccount, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(accountsDidChange(_:)), name: .UserDidDeleteAccount, object: nil)
 
-		showController(AccountsAddViewController())
 
 		// Fix tableView frame — for some reason IB wants it 1pt wider than the clip view. This leads to unwanted horizontal scrolling.
 		var rTable = tableView.frame
@@ -37,8 +42,9 @@ final class AccountsPreferencesViewController: NSViewController {
 	}
 	
 	@IBAction func addAccount(_ sender: Any) {
-		tableView.selectRowIndexes([], byExtendingSelection: false)
-		showController(AccountsAddViewController())
+		let controller = NSHostingController(rootView: AddAccountsView(delegate: self))
+		controller.rootView.parent = controller
+		presentAsSheet(controller)
 	}
 	
 	@IBAction func removeAccount(_ sender: Any) {
@@ -62,7 +68,6 @@ final class AccountsPreferencesViewController: NSViewController {
 			if result == NSApplication.ModalResponse.alertFirstButtonReturn {
 				guard let self = self else { return }
 				AccountManager.shared.deleteAccount(self.sortedAccounts[self.tableView.selectedRow])
-				self.showController(AccountsAddViewController())
 			}
 		}
 		
@@ -132,6 +137,88 @@ extension AccountsPreferencesViewController: NSTableViewDelegate {
 	
 }
 
+// MARK: - AccountsPreferencesAddAccountDelegate
+protocol AccountsPreferencesAddAccountDelegate {
+	func presentSheetForAccount(_ accountType: AccountType)
+}
+
+extension AccountsPreferencesViewController: AccountsPreferencesAddAccountDelegate {
+	func presentSheetForAccount(_ accountType: AccountType) {
+		switch accountType {
+		case .onMyMac:
+			let accountsAddLocalWindowController = AccountsAddLocalWindowController()
+			accountsAddLocalWindowController.runSheetOnWindow(self.view.window!)
+			
+		case .cloudKit:
+			let accountsAddCloudKitWindowController = AccountsAddCloudKitWindowController()
+			accountsAddCloudKitWindowController.runSheetOnWindow(self.view.window!) { response in
+				if response == NSApplication.ModalResponse.OK {
+					self.tableView.reloadData()
+				}
+			}
+			
+		case .feedbin:
+			let accountsFeedbinWindowController = AccountsFeedbinWindowController()
+			accountsFeedbinWindowController.runSheetOnWindow(self.view.window!)
+		case .feedWrangler:
+			let accountsFeedWranglerWindowController = AccountsFeedWranglerWindowController()
+			accountsFeedWranglerWindowController.runSheetOnWindow(self.view.window!)
+		case .freshRSS:
+			let accountsReaderAPIWindowController = AccountsReaderAPIWindowController()
+			accountsReaderAPIWindowController.accountType = .freshRSS
+			accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!)
+		case .feedly:
+			let addAccount = OAuthAccountAuthorizationOperation(accountType: .feedly)
+			addAccount.delegate = self
+			addAccount.presentationAnchor = self.view.window!
+			runAwaitingFeedlyLoginAlertModal(forLifetimeOf: addAccount)
+			MainThreadOperationQueue.shared.add(addAccount)
+		case .newsBlur:
+			let accountsNewsBlurWindowController = AccountsNewsBlurWindowController()
+			accountsNewsBlurWindowController.runSheetOnWindow(self.view.window!)
+		case .inoreader:
+			let accountsReaderAPIWindowController = AccountsReaderAPIWindowController()
+			accountsReaderAPIWindowController.accountType = .inoreader
+			accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!)
+		case .bazQux:
+			let accountsReaderAPIWindowController = AccountsReaderAPIWindowController()
+			accountsReaderAPIWindowController.accountType = .bazQux
+			accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!)
+		case .theOldReader:
+			let accountsReaderAPIWindowController = AccountsReaderAPIWindowController()
+			accountsReaderAPIWindowController.accountType = .theOldReader
+			accountsReaderAPIWindowController.runSheetOnWindow(self.view.window!)
+		}
+	}
+	
+	private func runAwaitingFeedlyLoginAlertModal(forLifetimeOf operation: OAuthAccountAuthorizationOperation) {
+		let alert = NSAlert()
+		alert.alertStyle = .informational
+		alert.messageText = NSLocalizedString("Waiting for access to Feedly",
+											  comment: "Alert title when adding a Feedly account and waiting for authorization from the user.")
+		
+		alert.informativeText = NSLocalizedString("Your default web browser will open the Feedly login for you to authorize access.",
+												  comment: "Alert informative text when adding a Feedly account and waiting for authorization from the user.")
+		
+		alert.addButton(withTitle: NSLocalizedString("Cancel", comment: "Cancel"))
+		
+		let attachedWindow = self.view.window!
+		
+		alert.beginSheetModal(for: attachedWindow) { response in
+			if response == .alertFirstButtonReturn {
+				operation.cancel()
+			}
+		}
+		
+		operation.completionBlock = { _ in
+			guard alert.window.isVisible else {
+				return
+			}
+			attachedWindow.endSheet(alert.window)
+		}
+	}
+}
+
 // MARK: - Private
 
 private extension AccountsPreferencesViewController {
@@ -155,3 +242,31 @@ private extension AccountsPreferencesViewController {
 	}
 	
 }
+
+extension AccountsPreferencesViewController: OAuthAccountAuthorizationOperationDelegate {
+	
+	func oauthAccountAuthorizationOperation(_ operation: OAuthAccountAuthorizationOperation, didCreate account: Account) {
+		// `OAuthAccountAuthorizationOperation` is using `ASWebAuthenticationSession` which bounces the user
+		// to their browser on macOS for authorizing NetNewsWire to access the user's Feedly account.
+		// When this authorization is granted, the browser remains the foreground app which is unfortunate
+		// because the user probably wants to see the result of authorizing NetNewsWire to act on their behalf.
+		NSApp.activate(ignoringOtherApps: true)
+		
+		account.refreshAll { [weak self] result in
+			switch result {
+			case .success:
+				break
+			case .failure(let error):
+				self?.presentError(error)
+			}
+		}
+	}
+	
+	func oauthAccountAuthorizationOperation(_ operation: OAuthAccountAuthorizationOperation, didFailWith error: Error) {
+		// `OAuthAccountAuthorizationOperation` is using `ASWebAuthenticationSession` which bounces the user
+		// to their browser on macOS for authorizing NetNewsWire to access the user's Feedly account.
+		NSApp.activate(ignoringOtherApps: true)
+		
+		view.window?.presentError(error)
+	}
+}
diff --git a/Mac/Preferences/Accounts/AccountsReaderAPI.xib b/Mac/Preferences/Accounts/AccountsReaderAPI.xib
index b49e8911c..749dbccdf 100644
--- a/Mac/Preferences/Accounts/AccountsReaderAPI.xib
+++ b/Mac/Preferences/Accounts/AccountsReaderAPI.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -27,7 +27,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="433" height="249"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1792" height="1095"/>
             <view key="contentView" misplaced="YES" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="433" height="249"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -41,7 +41,7 @@
                                     <constraint firstAttribute="height" constant="36" id="Ern-Kk-8LX"/>
                                     <constraint firstAttribute="width" constant="36" id="PLS-68-NMc"/>
                                 </constraints>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="y38-YL-woC"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" id="y38-YL-woC"/>
                             </imageView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lti-yM-8LV">
                                 <rect key="frame" x="53" y="0.0" width="157" height="38"/>
diff --git a/Mac/Preferences/Accounts/AddAccountsView.swift b/Mac/Preferences/Accounts/AddAccountsView.swift
new file mode 100644
index 000000000..4a6acdc24
--- /dev/null
+++ b/Mac/Preferences/Accounts/AddAccountsView.swift
@@ -0,0 +1,265 @@
+//
+//  AddAccountsView.swift
+//  NetNewsWire
+//
+//  Created by Stuart Breckenridge on 28/10/20.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Account
+
+private enum AddAccountSections: Int, CaseIterable {
+	case local = 0
+	case icloud
+	case web
+	case selfhosted
+	
+	var sectionHeader: String {
+		switch self {
+		case .local:
+			return NSLocalizedString("Local", comment: "Local Account")
+		case .icloud:
+			return NSLocalizedString("iCloud", comment: "iCloud Account")
+		case .web:
+			return NSLocalizedString("Web", comment: "Web Account")
+		case .selfhosted:
+			return NSLocalizedString("Self-hosted", comment: "Self hosted Account")
+		}
+	}
+	
+	var sectionFooter: String {
+		switch self {
+		case .local:
+			return NSLocalizedString("This account does not sync subscriptions across devices.", comment: "Local Account")
+		case .icloud:
+			return NSLocalizedString("Use your iCloud account to sync your subscriptions across your iOS and macOS devices.", comment: "iCloud Account")
+		case .web:
+			return NSLocalizedString("Web accounts sync your subscriptions across all your devices.", comment: "Web Account")
+		case .selfhosted:
+			return NSLocalizedString("Self-hosted accounts sync your subscriptions across all your devices.", comment: "Self hosted Account")
+		}
+	}
+	
+	var sectionContent: [AccountType] {
+		switch self {
+		case .local:
+			return [.onMyMac]
+		case .icloud:
+			return [.cloudKit]
+		case .web:
+			return [.bazQux, .feedbin, .feedly, .feedWrangler, .inoreader, .newsBlur, .theOldReader]
+		case .selfhosted:
+			return [.freshRSS]
+		}
+	}
+}
+
+struct AddAccountsView: View {
+    
+	weak var parent: NSHostingController<AddAccountsView>? // required because presentationMode.dismiss() doesn't work
+	var addAccountDelegate: AccountsPreferencesAddAccountDelegate?
+	@State private var selectedAccount: AccountType = .onMyMac
+	
+	init(delegate: AccountsPreferencesAddAccountDelegate?) {
+		self.addAccountDelegate = delegate
+	}
+	
+	var body: some View {
+		VStack(alignment: .leading, spacing: 8) {
+			Text("Choose an account type to add...")
+				.font(.headline)
+				.padding()
+			
+			localAccount
+			icloudAccount
+			webAccounts
+			selfhostedAccounts
+			
+			HStack(spacing: 12) {
+				Spacer()
+				if #available(OSX 11.0, *) {
+					Button(action: {
+						parent?.dismiss(nil)
+					}, label: {
+						Text("Cancel")
+							.frame(width: 80)
+					})
+					.help("Cancel")
+					.keyboardShortcut(.cancelAction)
+					
+				} else {
+					Button(action: {
+						parent?.dismiss(nil)
+					}, label: {
+						Text("Cancel")
+							.frame(width: 80)
+					})
+					.accessibility(label: Text("Add Account"))
+				}
+				if #available(OSX 11.0, *) {
+					Button(action: {
+						addAccountDelegate?.presentSheetForAccount(selectedAccount)
+						parent?.dismiss(nil)
+					}, label: {
+						Text("Continue")
+							.frame(width: 80)
+					})
+					.help("Add Account")
+					.keyboardShortcut(.defaultAction)
+					
+				} else {
+					Button(action: {
+						addAccountDelegate?.presentSheetForAccount(selectedAccount)
+						parent?.dismiss(nil)
+					}, label: {
+						Text("Continue")
+							.frame(width: 80)
+					})
+				}
+			}.padding(.vertical, 8)
+		}
+		.pickerStyle(RadioGroupPickerStyle())
+		.fixedSize(horizontal: false, vertical: true)
+		.frame(width: 420)
+		.padding()
+    }
+	
+	var localAccount: some View {
+		VStack(alignment: .leading) {
+			Text("Local")
+				.font(.headline)
+				.padding(.horizontal)
+			Picker(selection: $selectedAccount, label: Text(""), content: {
+				ForEach(AddAccountSections.local.sectionContent, id: \.self, content: { account in
+					HStack(alignment: .top) {
+						account.image()
+							.resizable()
+							.aspectRatio(contentMode: .fit)
+							.frame(width: 25, height: 25, alignment: .center)
+							.offset(CGSize(width: 0, height: -2.5))
+							.padding(.leading, 4)
+						
+							
+						VStack(alignment: .leading, spacing: 4) {
+							Text(account.localizedAccountName())
+							Text(AddAccountSections.local.sectionFooter).foregroundColor(.gray)
+								.font(.caption)
+						}
+					}
+					.tag(account)
+				})
+			})
+			.pickerStyle(RadioGroupPickerStyle())
+			.offset(x: 7.5, y: 0)
+		}
+		
+	}
+	
+	var icloudAccount: some View {
+		VStack(alignment: .leading) {
+			Text("iCloud")
+				.font(.headline)
+				.padding(.horizontal)
+			Picker(selection: $selectedAccount, label: Text(""), content: {
+				ForEach(AddAccountSections.icloud.sectionContent, id: \.self, content: { account in
+					HStack(alignment: .top) {
+						account.image()
+							.resizable()
+							.aspectRatio(contentMode: .fit)
+							.frame(width: 25, height: 25, alignment: .center)
+							.offset(CGSize(width: 0, height: -5))
+							.padding(.leading, 4)
+						
+						VStack(alignment: .leading, spacing: 4) {
+							Text(account.localizedAccountName())
+							Text(AddAccountSections.icloud.sectionFooter).foregroundColor(.gray)
+								.font(.caption)
+						}
+					}
+					.tag(account)
+				})
+			})
+			.offset(x: 7.5, y: 0)
+			.disabled(isCloudInUse())
+		}
+	}
+	
+	var webAccounts: some View {
+		VStack(alignment: .leading) {
+			Text("Web")
+				.font(.headline)
+				.padding(.horizontal)
+			Picker(selection: $selectedAccount, label: Text(""), content: {
+				ForEach(AddAccountSections.web.sectionContent.filter({ isRestricted($0) != true }), id: \.self, content: { account in
+					
+					HStack(alignment: .center) {
+						account.image()
+							.resizable()
+							.aspectRatio(contentMode: .fit)
+							.frame(width: 25, height: 25, alignment: .center)
+							.padding(.leading, 4)
+							
+						VStack(alignment: .leading) {
+							Text(account.localizedAccountName())
+						}
+					}
+					.tag(account)
+					
+				})
+			})
+			.offset(x: 7.5, y: 0)
+		}
+	}
+	
+	var selfhostedAccounts: some View {
+		VStack(alignment: .leading) {
+			Text("Self-hosted")
+				.font(.headline)
+				.padding(.horizontal)
+				.padding(.top, 8)
+			Picker(selection: $selectedAccount, label: Text(""), content: {
+				ForEach(AddAccountSections.selfhosted.sectionContent, id: \.self, content: { account in
+					HStack(alignment: .top) {
+						account.image()
+							.resizable()
+							.aspectRatio(contentMode: .fit)
+							.frame(width: 25, height: 25, alignment: .center)
+							.offset(CGSize(width: 0, height: -4))
+							.padding(.leading, 4)
+						
+
+						VStack(alignment: .leading, spacing: 4) {
+							Text(account.localizedAccountName())
+							Text("Web and self-hosted accounts sync across all signed-in devices.")
+								.font(.caption)
+								.foregroundColor(.gray)
+						}
+					}.tag(account)
+				})
+			})
+			.offset(x: 7.5, y: 0)
+			
+			
+		}
+	}
+	
+	private func isCloudInUse() -> Bool {
+		AccountManager.shared.accounts.contains(where: { $0.type == .cloudKit })
+	}
+	
+	private func isRestricted(_ accountType: AccountType) -> Bool {
+		if AppDefaults.shared.isDeveloperBuild && (accountType == .feedly || accountType == .feedWrangler || accountType == .inoreader) {
+			return true
+		}
+		return false
+	}
+}
+
+
+struct AddAccountsView_Previews: PreviewProvider {
+	static var previews: some View {
+		AddAccountsView(delegate: nil)
+	}
+}
+
diff --git a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json
index abd37acbd..a5b1d6c76 100644
--- a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "CloudKitAny.pdf",
+      "filename" : "icloud-any.pdf",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "CloudKitDark.pdf",
+      "filename" : "icloud-dark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -20,6 +20,7 @@
     "version" : 1
   },
   "properties" : {
+    "preserves-vector-representation" : true,
     "template-rendering-intent" : "original"
   }
 }
diff --git a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitAny.pdf b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/icloud-any.pdf
similarity index 76%
rename from Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitAny.pdf
rename to Mac/Resources/Assets.xcassets/accountCloudKit.imageset/icloud-any.pdf
index 27a2f136a..552cab54c 100644
Binary files a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitAny.pdf and b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/icloud-any.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitDark.pdf b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/icloud-dark.pdf
similarity index 76%
rename from Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitDark.pdf
rename to Mac/Resources/Assets.xcassets/accountCloudKit.imageset/icloud-dark.pdf
index c2777a879..2a7da4068 100644
Binary files a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/CloudKitDark.pdf and b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/icloud-dark.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json
index a29363d1e..f7b68151c 100644
--- a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "feedwranger-any.png",
+      "filename" : "feedwranger-any-slice.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "feedwranger-dark.png",
+      "filename" : "feedwranger-dark-slice.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "feedwranger-any@2x.png",
+      "filename" : "feedwranger-any-slice@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "feedwranger-dark@2x.png",
+      "filename" : "feedwranger-dark-slice@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "feedwranger-any@3x.png",
+      "filename" : "feedwranger-any-slice@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "feedwranger-dark@3x.png",
+      "filename" : "feedwranger-dark-slice@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any-slice.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any-slice.png
new file mode 100644
index 000000000..a04e07f9a
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any-slice.png differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any-slice@2x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any-slice@2x.png
new file mode 100644
index 000000000..dd25a60ae
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any-slice@2x.png differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any-slice@3x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any-slice@3x.png
new file mode 100644
index 000000000..1fceca03d
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any-slice@3x.png differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any.png
deleted file mode 100644
index e2c215e32..000000000
Binary files a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any.png and /dev/null differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@2x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@2x.png
deleted file mode 100644
index da7ec8828..000000000
Binary files a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@2x.png and /dev/null differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@3x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@3x.png
deleted file mode 100644
index 6ee6ef7ce..000000000
Binary files a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-any@3x.png and /dev/null differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark-slice.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark-slice.png
new file mode 100644
index 000000000..ff1990102
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark-slice.png differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark-slice@2x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark-slice@2x.png
new file mode 100644
index 000000000..e2e52edb5
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark-slice@2x.png differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark-slice@3x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark-slice@3x.png
new file mode 100644
index 000000000..e1640465a
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark-slice@3x.png differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark.png
deleted file mode 100644
index 4eb275ba0..000000000
Binary files a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark.png and /dev/null differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@2x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@2x.png
deleted file mode 100644
index 672efa478..000000000
Binary files a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@2x.png and /dev/null differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@3x.png b/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@3x.png
deleted file mode 100644
index f10de405b..000000000
Binary files a/Mac/Resources/Assets.xcassets/accountFeedWrangler.imageset/feedwranger-dark@3x.png and /dev/null differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json
index b16e4373f..ec7826d65 100644
--- a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "feedbin-logo-filled-1.pdf",
+      "filename" : "feedbin-logo-filled.pdf",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "feedbin-logo-filled.pdf",
+      "filename" : "feedbin-logo-filled-1.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf
index a68d754ae..72ff612eb 100644
Binary files a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf and b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf
index a68d754ae..72ff612eb 100644
Binary files a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf and b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json
index 151fb1a8e..974a47751 100644
--- a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json
@@ -10,6 +10,7 @@
     "version" : 1
   },
   "properties" : {
+    "preserves-vector-representation" : true,
     "template-rendering-intent" : "original"
   }
 }
diff --git a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf
index 78d2bca2b..066de5aa3 100644
Binary files a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf and b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf
index d22c40842..4c5befe74 100644
Binary files a/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf and b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-any.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf
index 4de910eaf..2ab5d34dd 100644
Binary files a/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf and b/Mac/Resources/Assets.xcassets/accountInoreader.imageset/inoreader_logo-dark.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json
index f560c64f3..a73c591f6 100644
--- a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "NewsBlur.pdf",
+      "filename" : "Newsblur-any.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Newsblur-any.pdf
similarity index 70%
rename from Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf
rename to Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Newsblur-any.pdf
index d2b62c6eb..8b07ac745 100644
Binary files a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf and b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Newsblur-any.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json
index 31c201dd0..231c33ab0 100644
--- a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "theOldReaderAny.pdf",
+      "filename" : "oldreader-icon-any.pdf",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "theOldReaderDark.pdf",
+      "filename" : "oldreader-icon-dark.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-any.pdf
similarity index 64%
rename from Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf
rename to Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-any.pdf
index 2c1511bf2..05b0003b1 100644
Binary files a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf and b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-any.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-dark.pdf
similarity index 64%
rename from Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf
rename to Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-dark.pdf
index 1f3dac415..dfe4ce8b4 100644
Binary files a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf and b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-dark.pdf differ
diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index 5934518be..2d8fcc1a4 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -41,6 +41,8 @@
 		177A0C2D25454AAB00D7EAF6 /* ReaderAPIAccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177A0C2C25454AAB00D7EAF6 /* ReaderAPIAccountViewController.swift */; };
 		17897ACA24C281A40014BA03 /* InspectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17897AC924C281A40014BA03 /* InspectorView.swift */; };
 		17897ACB24C281A40014BA03 /* InspectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17897AC924C281A40014BA03 /* InspectorView.swift */; };
+		178A9F9D2549449F00AB7E9D /* AddAccountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 178A9F9C2549449F00AB7E9D /* AddAccountsView.swift */; };
+		178A9F9E2549449F00AB7E9D /* AddAccountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 178A9F9C2549449F00AB7E9D /* AddAccountsView.swift */; };
 		17930ED424AF10EE00A9BA52 /* AddWebFeedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17930ED324AF10EE00A9BA52 /* AddWebFeedView.swift */; };
 		17930ED524AF10EE00A9BA52 /* AddWebFeedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17930ED324AF10EE00A9BA52 /* AddWebFeedView.swift */; };
 		1799E6A924C2F93F00511E91 /* InspectorPlatformModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1799E6A824C2F93F00511E91 /* InspectorPlatformModifier.swift */; };
@@ -1468,6 +1470,7 @@
 		1776E88D24AC5F8A00E78166 /* AppDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDefaults.swift; sourceTree = "<group>"; };
 		177A0C2C25454AAB00D7EAF6 /* ReaderAPIAccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderAPIAccountViewController.swift; sourceTree = "<group>"; };
 		17897AC924C281A40014BA03 /* InspectorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorView.swift; sourceTree = "<group>"; };
+		178A9F9C2549449F00AB7E9D /* AddAccountsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAccountsView.swift; sourceTree = "<group>"; };
 		17930ED324AF10EE00A9BA52 /* AddWebFeedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWebFeedView.swift; sourceTree = "<group>"; };
 		1799E6A824C2F93F00511E91 /* InspectorPlatformModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorPlatformModifier.swift; sourceTree = "<group>"; };
 		1799E6CC24C320D600511E91 /* InspectorModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorModel.swift; sourceTree = "<group>"; };
@@ -3345,6 +3348,7 @@
 		84C9FC6F22629E1200D921D6 /* Accounts */ = {
 			isa = PBXGroup;
 			children = (
+				178A9F9C2549449F00AB7E9D /* AddAccountsView.swift */,
 				84C9FC7222629E1200D921D6 /* AccountsPreferencesViewController.swift */,
 				51EF0F8D2279C9260050506E /* AccountsAdd.xib */,
 				51EF0F8F2279C9500050506E /* AccountsAddViewController.swift */,
@@ -4948,6 +4952,7 @@
 				515A5108243D0CCD0089E588 /* TwitterFeedProvider-Extensions.swift in Sources */,
 				65ED402B235DEF6C0081F399 /* ImportOPMLWindowController.swift in Sources */,
 				65ED402C235DEF6C0081F399 /* TimelineTableView.swift in Sources */,
+				178A9F9E2549449F00AB7E9D /* AddAccountsView.swift in Sources */,
 				65ED402D235DEF6C0081F399 /* DetailStatusBarView.swift in Sources */,
 				65ED402E235DEF6C0081F399 /* MainWindowController+Scriptability.swift in Sources */,
 				65ED402F235DEF6C0081F399 /* PreferencesWindowController.swift in Sources */,
@@ -5309,6 +5314,7 @@
 				84B99C9D1FAE83C600ECDEDB /* DeleteCommand.swift in Sources */,
 				849A97541ED9EAC0007D329B /* AddWebFeedWindowController.swift in Sources */,
 				5144EA40227A37EC00D19003 /* ImportOPMLWindowController.swift in Sources */,
+				178A9F9D2549449F00AB7E9D /* AddAccountsView.swift in Sources */,
 				51C4CFF024D37D1F00AF9874 /* Secrets.swift in Sources */,
 				849A976D1ED9EBC8007D329B /* TimelineTableView.swift in Sources */,
 				51333D1624685D2E00EB5C91 /* AddRedditFeedWindowController.swift in Sources */,
diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
index 5cc61ce43..b1d7d2d16 100644
--- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
+++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
@@ -72,6 +72,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      debugAsWhichUser = "root"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Shared/AccountType+Helpers.swift b/Shared/AccountType+Helpers.swift
index d83c8fa28..ac40239bc 100644
--- a/Shared/AccountType+Helpers.swift
+++ b/Shared/AccountType+Helpers.swift
@@ -13,6 +13,7 @@ import AppKit
 #else
 import UIKit
 #endif
+import SwiftUI
 
 extension AccountType {
 	
@@ -51,8 +52,35 @@ extension AccountType {
 			return NSLocalizedString("NewsBlur", comment: "Account name")
 		case .theOldReader:
 			return NSLocalizedString("The Old Reader", comment: "Account name")
+		default:
+			return ""
+		}
+	}
+	
+	// MARK: - SwiftUI Images
+	func image() -> Image {
+		switch self {
+		case .onMyMac:
+			return Image("accountLocal")
+		case .bazQux:
+			return Image("accountBazQux")
+		case .cloudKit:
+			return Image("accountCloudKit")
+		case .feedWrangler:
+			return Image("accountFeedWrangler")
+		case .feedbin:
+			return Image("accountFeedbin")
+		case .feedly:
+			return Image("accountFeedly")
+		case .freshRSS:
+			return Image("accountFreshRSS")
+		case .inoreader:
+			return Image("accountInoreader")
+		case .newsBlur:
+			return Image("accountNewsBlur")
+		case .theOldReader:
+			return Image("accountTheOldReader")
 		}
-		
 	}
 
 }