Updated some of the graphics to be more correct and added the Edit button to the Master view.

iOS/Base.lproj/Main.storyboard

@@ -205,11 +205,14 @@
                         </barButtonItem>
                     </toolbarItems>
                     <navigationItem key="navigationItem" title="Feeds" id="Zdf-7t-Un8">
-                        <barButtonItem key="leftBarButtonItem" title="Tools" image="toolsImage" id="2lM-3y-hKs">
+                        <leftBarButtonItems>
-                            <connections>
+                            <barButtonItem image="settingsImage" id="7xz-3z-0PJ"/>
-                                <action selector="showOPMLImportExport:" destination="7bK-jq-Zjz" id="qIa-yP-E6a"/>
+                            <barButtonItem title="Tools" image="toolsImage" id="2lM-3y-hKs">
-                            </connections>
+                                <connections>
-                        </barButtonItem>
+                                    <action selector="showOPMLImportExport:" destination="7bK-jq-Zjz" id="qIa-yP-E6a"/>
+                                </connections>
+                            </barButtonItem>
+                        </leftBarButtonItems>
                     </navigationItem>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
                 </tableViewController>
@@ -280,10 +283,11 @@
         </scene>
     </scenes>
     <resources>
-        <image name="browserImage" width="20" height="20"/>
+        <image name="browserImage" width="22" height="22"/>
-        <image name="circleOpenImage" width="20" height="20"/>
+        <image name="circleOpenImage" width="22" height="22"/>
-        <image name="starOpenImage" width="18" height="18"/>
+        <image name="settingsImage" width="24" height="24"/>
-        <image name="toolsImage" width="20" height="18"/>
+        <image name="starOpenImage" width="24" height="24"/>
+        <image name="toolsImage" width="24" height="22"/>
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="RT3-gH-cyN"/>

iOS/Master/Cell/MasterTableViewCell.swift

@@ -92,7 +92,7 @@ class MasterTableViewCell : UITableViewCell {
 
 	override func layoutSubviews() {
 		super.layoutSubviews()
-		let layout = MasterTableViewCellLayout(cellSize: bounds.size, shouldShowImage: shouldShowImage, label: titleView, unreadCountView: unreadCountView)
+		let layout = MasterTableViewCellLayout(cellSize: bounds.size, shouldShowImage: shouldShowImage, label: titleView, unreadCountView: unreadCountView, isEditing: isEditing)
 		layoutWith(layout)
 	}
 

iOS/Master/Cell/MasterTableViewCellLayout.swift

@@ -21,13 +21,14 @@ struct MasterTableViewCellLayout {
 	let titleRect: CGRect
 	let unreadCountRect: CGRect
 	
-	init(cellSize: CGSize, shouldShowImage: Bool, label: UILabel, unreadCountView: MasterUnreadCountView) {
+	init(cellSize: CGSize, shouldShowImage: Bool, label: UILabel, unreadCountView: MasterUnreadCountView, isEditing: Bool) {
 
 		let bounds = CGRect(x: 0.0, y: 0.0, width: floor(cellSize.width), height: floor(cellSize.height))
 
 		var rFavicon = CGRect.zero
 		if shouldShowImage {
-			rFavicon = CGRect(x: MasterTableViewCellLayout.imageMarginLeft, y: 0.0, width: MasterTableViewCellLayout.imageSize.width, height: MasterTableViewCellLayout.imageSize.height)
+			let indent = isEditing ? MasterTableViewCellLayout.imageMarginLeft + 40 : MasterTableViewCellLayout.imageMarginLeft
+			rFavicon = CGRect(x: indent, y: 0.0, width: MasterTableViewCellLayout.imageSize.width, height: MasterTableViewCellLayout.imageSize.height)
 			rFavicon = MasterTableViewCellLayout.centerVertically(rFavicon, bounds)
 		}
 		self.faviconRect = rFavicon

iOS/Master/MasterViewController.swift

@@ -30,6 +30,8 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
 
 		super.viewDidLoad()
 
+		navigationItem.rightBarButtonItem = editButtonItem
+		
 		NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(containerChildrenDidChange(_:)), name: .ChildrenDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(batchUpdateDidPerform(_:)), name: .BatchUpdateDidPerform, object: nil)

iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Safari.pdf"
+      "filename" : "safari.pdf"
     }
   ],
   "info" : {

iOS/Resources/Assets.xcassets/circleClosedImage.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "circlefilled.pdf"
+      "filename" : "circleClosed.pdf"
     }
   ],
   "info" : {

iOS/Resources/Assets.xcassets/circleOpenImage.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "circleopen.pdf"
+      "filename" : "circleOpen.pdf"
     }
   ],
   "info" : {

iOS/Resources/Assets.xcassets/settingsImage.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "settings.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iOS/Resources/Assets.xcassets/starClosedImage.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "star.pdf"
+      "filename" : "starClosed.pdf"
     }
   ],
   "info" : {

iOS/Resources/Assets.xcassets/starOpenImage.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "staropen.pdf"
+      "filename" : "starOpen.pdf"
     }
   ],
   "info" : {