diff --git a/Frameworks/FeedProvider/FeedProvider.swift b/Frameworks/FeedProvider/FeedProvider.swift
index 8ce988d1e..8f2247cfa 100644
--- a/Frameworks/FeedProvider/FeedProvider.swift
+++ b/Frameworks/FeedProvider/FeedProvider.swift
@@ -11,7 +11,9 @@ import RSCore
 
 public enum FeedProviderType: Int, Codable {
 	// Raw values should not change since they’re stored.
-	case twitter = 1
+	case marsEdit = 1
+	case microblog = 2
+	case twitter = 3
 }
 
 
diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift
index 101174152..c19d809c2 100644
--- a/Mac/AppAssets.swift
+++ b/Mac/AppAssets.swift
@@ -45,6 +45,18 @@ struct AppAssets {
 		return RSImage(named: "accountNewsBlur")
 	}()
 	
+	static var adapterMarsEdit: RSImage = {
+		return RSImage(named: "adapterMarsEdit")!
+	}()
+	
+	static var adapterMicroblog: RSImage = {
+		return RSImage(named: "adapterMicroblog")!
+	}()
+	
+	static var adapterTwitter: RSImage = {
+		return RSImage(named: "adapterTwitter")!
+	}()
+	
 	static var articleExtractor: RSImage! = {
 		return RSImage(named: "articleExtractor")
 	}()
@@ -78,7 +90,7 @@ struct AppAssets {
 	}()
 	
 	static var bookmarkImage: RSImage? = {
-		let path = "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/BookmarkIcon.icns"
+		let path = "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/KEXT.icns"
 		let image = RSImage(contentsOfFile: path)
 		return image
 	}()
@@ -87,10 +99,6 @@ struct AppAssets {
 		return RSImage(named: "faviconTemplateImage")!
 	}()
 
-	static var feedProviderTwitter: RSImage = {
-		return RSImage(named: "feedProviderTwitter")!
-	}()
-
 	static var filterActive: RSImage = {
 		return RSImage(named: "filterActive")!
 	}()
diff --git a/Mac/Preferences/FeedProviders/FeedProvidersAddViewController.swift b/Mac/Preferences/FeedProviders/FeedProvidersAddViewController.swift
index 426037d96..e0721c0d3 100644
--- a/Mac/Preferences/FeedProviders/FeedProvidersAddViewController.swift
+++ b/Mac/Preferences/FeedProviders/FeedProvidersAddViewController.swift
@@ -16,7 +16,7 @@ class FeedProvidersAddViewController: NSViewController {
 	private var accountsAddWindowController: NSWindowController?
 	
 	#if DEBUG
-	private var addableFeedProviderTypes: [FeedProviderType] = [.twitter]
+	private var addableFeedProviderTypes: [FeedProviderType] = [.marsEdit, .microblog, .twitter]
 	#else
 	private var addableFeedProviderTypes: [FeedProviderType] = [.twitter]
 	#endif
@@ -60,9 +60,15 @@ extension FeedProvidersAddViewController: NSTableViewDelegate {
 		
 		if let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell"), owner: nil) as? FeedProvidersAddTableCellView {
 			switch addableFeedProviderTypes[row] {
+			case .marsEdit:
+				cell.feedProviderNameLabel?.stringValue = NSLocalizedString("MarsEdit", comment: "MarsEdit")
+				cell.feedProviderImageView?.image = AppAssets.adapterMarsEdit
+			case .microblog:
+				cell.feedProviderNameLabel?.stringValue = NSLocalizedString("Micro.blog", comment: "Micro.blog")
+				cell.feedProviderImageView?.image = AppAssets.adapterMicroblog
 			case .twitter:
 				cell.feedProviderNameLabel?.stringValue = NSLocalizedString("Twitter", comment: "Twitter")
-				cell.feedProviderImageView?.image = AppAssets.feedProviderTwitter
+				cell.feedProviderImageView?.image = AppAssets.adapterTwitter
 			}
 			return cell
 		}
diff --git a/Mac/Preferences/PreferencesWindowController.swift b/Mac/Preferences/PreferencesWindowController.swift
index e6d225914..9679aa9a3 100644
--- a/Mac/Preferences/PreferencesWindowController.swift
+++ b/Mac/Preferences/PreferencesWindowController.swift
@@ -41,7 +41,7 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
 											 name: NSLocalizedString("Accounts", comment: "Preferences"),
 											 image: NSImage(named: NSImage.userAccountsName))]
 		specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.FeedProvider,
-											 name: NSLocalizedString("Integrations", comment: "Preferences"),
+											 name: NSLocalizedString("Extensions", comment: "Preferences"),
 											 image: AppAssets.bookmarkImage)]
 
 		// Omit the Advanced Preferences for now because the Software Update related functionality is
diff --git a/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/Contents.json b/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/Contents.json
new file mode 100644
index 000000000..44cd99384
--- /dev/null
+++ b/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "marsedit.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/marsedit.pdf b/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/marsedit.pdf
new file mode 100644
index 000000000..732eb701c
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/adapterMarsEdit.imageset/marsedit.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/adapterMicroblog.imageset/micro-dot-blog.pdf b/Mac/Resources/Assets.xcassets/adapterMicroblog.imageset/micro-dot-blog.pdf
new file mode 100644
index 000000000..ad66dd377
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/adapterMicroblog.imageset/micro-dot-blog.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/feedProviderTwitter.imageset/Contents.json b/Mac/Resources/Assets.xcassets/adapterTwitter.imageset/Contents.json
similarity index 100%
rename from Mac/Resources/Assets.xcassets/feedProviderTwitter.imageset/Contents.json
rename to Mac/Resources/Assets.xcassets/adapterTwitter.imageset/Contents.json
diff --git a/Mac/Resources/Assets.xcassets/feedProviderTwitter.imageset/twitter.pdf b/Mac/Resources/Assets.xcassets/adapterTwitter.imageset/twitter.pdf
similarity index 100%
rename from Mac/Resources/Assets.xcassets/feedProviderTwitter.imageset/twitter.pdf
rename to Mac/Resources/Assets.xcassets/adapterTwitter.imageset/twitter.pdf