diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index 3895a8bfe..347b5c3b1 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/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">
-                            <connections>
-                                <action selector="showOPMLImportExport:" destination="7bK-jq-Zjz" id="qIa-yP-E6a"/>
-                            </connections>
-                        </barButtonItem>
+                        <leftBarButtonItems>
+                            <barButtonItem image="settingsImage" id="7xz-3z-0PJ"/>
+                            <barButtonItem title="Tools" image="toolsImage" id="2lM-3y-hKs">
+                                <connections>
+                                    <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="circleOpenImage" width="20" height="20"/>
-        <image name="starOpenImage" width="18" height="18"/>
-        <image name="toolsImage" width="20" height="18"/>
+        <image name="browserImage" width="22" height="22"/>
+        <image name="circleOpenImage" width="22" height="22"/>
+        <image name="settingsImage" width="24" height="24"/>
+        <image name="starOpenImage" width="24" height="24"/>
+        <image name="toolsImage" width="24" height="22"/>
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="RT3-gH-cyN"/>
diff --git a/iOS/Master/Cell/MasterTableViewCell.swift b/iOS/Master/Cell/MasterTableViewCell.swift
index 19151d4a8..a71cc4b44 100644
--- a/iOS/Master/Cell/MasterTableViewCell.swift
+++ b/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)
 	}
 
diff --git a/iOS/Master/Cell/MasterTableViewCellLayout.swift b/iOS/Master/Cell/MasterTableViewCellLayout.swift
index 629e77796..f55bbb5e3 100644
--- a/iOS/Master/Cell/MasterTableViewCellLayout.swift
+++ b/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
diff --git a/iOS/Master/MasterViewController.swift b/iOS/Master/MasterViewController.swift
index 4a73646c7..bc139c841 100644
--- a/iOS/Master/MasterViewController.swift
+++ b/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)
diff --git a/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json
index 1dba92e17..0718c2065 100644
--- a/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json
+++ b/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Safari.pdf"
+      "filename" : "safari.pdf"
     }
   ],
   "info" : {
diff --git a/iOS/Resources/Assets.xcassets/browserImage.imageset/Safari.pdf b/iOS/Resources/Assets.xcassets/browserImage.imageset/safari.pdf
similarity index 64%
rename from iOS/Resources/Assets.xcassets/browserImage.imageset/Safari.pdf
rename to iOS/Resources/Assets.xcassets/browserImage.imageset/safari.pdf
index 2dc9c6e8f..5f59660eb 100644
Binary files a/iOS/Resources/Assets.xcassets/browserImage.imageset/Safari.pdf and b/iOS/Resources/Assets.xcassets/browserImage.imageset/safari.pdf differ
diff --git a/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/Contents.json
index 9a22be9d0..96164f72b 100644
--- a/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/Contents.json
+++ b/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "circlefilled.pdf"
+      "filename" : "circleClosed.pdf"
     }
   ],
   "info" : {
diff --git a/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circlefilled.pdf b/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circleClosed.pdf
similarity index 91%
rename from iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circlefilled.pdf
rename to iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circleClosed.pdf
index de652a543..453518063 100644
Binary files a/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circlefilled.pdf and b/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circleClosed.pdf differ
diff --git a/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/Contents.json
index 6f57c5865..af022ee47 100644
--- a/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/Contents.json
+++ b/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "circleopen.pdf"
+      "filename" : "circleOpen.pdf"
     }
   ],
   "info" : {
diff --git a/iOS/Resources/Assets.xcassets/starOpenImage.imageset/staropen.pdf b/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleOpen.pdf
similarity index 83%
rename from iOS/Resources/Assets.xcassets/starOpenImage.imageset/staropen.pdf
rename to iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleOpen.pdf
index 36ce192cf..6fd77db9a 100644
Binary files a/iOS/Resources/Assets.xcassets/starOpenImage.imageset/staropen.pdf and b/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleOpen.pdf differ
diff --git a/iOS/Resources/Assets.xcassets/settingsImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/settingsImage.imageset/Contents.json
new file mode 100644
index 000000000..228b81a81
--- /dev/null
+++ b/iOS/Resources/Assets.xcassets/settingsImage.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "settings.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iOS/Resources/Assets.xcassets/settingsImage.imageset/settings.pdf b/iOS/Resources/Assets.xcassets/settingsImage.imageset/settings.pdf
new file mode 100644
index 000000000..87bba4b21
Binary files /dev/null and b/iOS/Resources/Assets.xcassets/settingsImage.imageset/settings.pdf differ
diff --git a/iOS/Resources/Assets.xcassets/starClosedImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/starClosedImage.imageset/Contents.json
index 630617b60..38cbb2719 100644
--- a/iOS/Resources/Assets.xcassets/starClosedImage.imageset/Contents.json
+++ b/iOS/Resources/Assets.xcassets/starClosedImage.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "star.pdf"
+      "filename" : "starClosed.pdf"
     }
   ],
   "info" : {
diff --git a/iOS/Resources/Assets.xcassets/starClosedImage.imageset/star.pdf b/iOS/Resources/Assets.xcassets/starClosedImage.imageset/starClosed.pdf
similarity index 85%
rename from iOS/Resources/Assets.xcassets/starClosedImage.imageset/star.pdf
rename to iOS/Resources/Assets.xcassets/starClosedImage.imageset/starClosed.pdf
index 267d229be..04042a300 100644
Binary files a/iOS/Resources/Assets.xcassets/starClosedImage.imageset/star.pdf and b/iOS/Resources/Assets.xcassets/starClosedImage.imageset/starClosed.pdf differ
diff --git a/iOS/Resources/Assets.xcassets/starOpenImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/starOpenImage.imageset/Contents.json
index fad0e5c23..19c68b8c4 100644
--- a/iOS/Resources/Assets.xcassets/starOpenImage.imageset/Contents.json
+++ b/iOS/Resources/Assets.xcassets/starOpenImage.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "staropen.pdf"
+      "filename" : "starOpen.pdf"
     }
   ],
   "info" : {
diff --git a/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleopen.pdf b/iOS/Resources/Assets.xcassets/starOpenImage.imageset/starOpen.pdf
similarity index 82%
rename from iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleopen.pdf
rename to iOS/Resources/Assets.xcassets/starOpenImage.imageset/starOpen.pdf
index 814275c22..803a3f8ec 100644
Binary files a/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleopen.pdf and b/iOS/Resources/Assets.xcassets/starOpenImage.imageset/starOpen.pdf differ
diff --git a/iOS/Resources/Assets.xcassets/toolsImage.imageset/tools.pdf b/iOS/Resources/Assets.xcassets/toolsImage.imageset/tools.pdf
index 3c8d19dac..76d33106f 100644
Binary files a/iOS/Resources/Assets.xcassets/toolsImage.imageset/tools.pdf and b/iOS/Resources/Assets.xcassets/toolsImage.imageset/tools.pdf differ