diff --git a/Mac/Preferences/Accounts/AccountsDetail.xib b/Mac/Preferences/Accounts/AccountsDetail.xib
index 82b5891c9..00bae7a7a 100644
--- a/Mac/Preferences/Accounts/AccountsDetail.xib
+++ b/Mac/Preferences/Accounts/AccountsDetail.xib
@@ -1,7 +1,7 @@
 <?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="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -21,13 +21,13 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <font key="font" metaFont="system"/>
             <tabViewItems>
-                <tabViewItem label="Account Information" identifier="" id="35c-I3-wfs">
+                <tabViewItem label="Account" identifier="" id="35c-I3-wfs">
                     <view key="view" id="ft2-Mb-5LD">
                         <rect key="frame" x="10" y="33" width="326" height="254"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <gridView xPlacement="fill" yPlacement="center" rowAlignment="none" rowSpacing="9" translatesAutoresizingMaskIntoConstraints="NO" id="nVy-H3-bFO">
-                                <rect key="frame" x="20" y="103" width="286" height="131"/>
+                                <rect key="frame" x="20" y="108" width="286" height="126"/>
                                 <rows>
                                     <gridRow id="yLs-SL-a1b"/>
                                     <gridRow yPlacement="top" id="etw-2m-nWZ"/>
@@ -41,7 +41,7 @@
                                 <gridCells>
                                     <gridCell row="yLs-SL-a1b" column="sMM-Ds-SKX" id="3ea-DE-T3i">
                                         <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jiQ-KJ-SS0">
-                                            <rect key="frame" x="-2" y="114" width="44" height="17"/>
+                                            <rect key="frame" x="-2" y="110" width="44" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Type:" id="tC5-Vt-gBc">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -51,7 +51,7 @@
                                     </gridCell>
                                     <gridCell row="yLs-SL-a1b" column="Fhf-h9-g0O" id="baI-Kp-tKF">
                                         <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XYX-iz-hnq">
-                                            <rect key="frame" x="44" y="114" width="73" height="17"/>
+                                            <rect key="frame" x="44" y="110" width="73" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="On My Mac" id="6yI-bV-1Sh">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -62,7 +62,7 @@
                                     <gridCell row="etw-2m-nWZ" column="sMM-Ds-SKX" id="htf-Ca-Hpv"/>
                                     <gridCell row="etw-2m-nWZ" column="Fhf-h9-g0O" id="NrD-vV-1Y1">
                                         <button key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mgt-uY-fuq">
-                                            <rect key="frame" x="44" y="89" width="60" height="18"/>
+                                            <rect key="frame" x="44" y="85" width="60" height="18"/>
                                             <buttonCell key="cell" type="check" title="Active" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="wxB-dX-nGt">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -74,7 +74,7 @@
                                     </gridCell>
                                     <gridCell row="3IT-3r-gEK" column="sMM-Ds-SKX" id="2yP-oZ-A6S">
                                         <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ted-jN-oYR">
-                                            <rect key="frame" x="-2" y="63" width="44" height="17"/>
+                                            <rect key="frame" x="-2" y="60" width="44" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Name:" id="uyQ-Zi-QCr">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -84,7 +84,7 @@
                                     </gridCell>
                                     <gridCell row="3IT-3r-gEK" column="Fhf-h9-g0O" id="nCq-02-YVv">
                                         <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TT0-Kf-YTC">
-                                            <rect key="frame" x="46" y="60" width="100" height="22"/>
+                                            <rect key="frame" x="46" y="57" width="100" height="21"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="7Vp-Hq-j6n">
                                                 <font key="font" usesAppearanceFont="YES"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -95,7 +95,7 @@
                                     <gridCell row="Y4C-5M-ySp" column="sMM-Ds-SKX" id="dON-E7-yd2"/>
                                     <gridCell row="Y4C-5M-ySp" column="Fhf-h9-g0O" id="i7Y-4k-5TF">
                                         <textField key="contentView" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="xp5-wk-PKc">
-                                            <rect key="frame" x="44" y="0.0" width="244" height="51"/>
+                                            <rect key="frame" x="44" y="0.0" width="244" height="48"/>
                                             <textFieldCell key="cell" selectable="YES" title="The name appears in the sidebar. It can be anything you want. You can even use emoji. 🎸" id="MW0-mH-Gaa">
                                                 <font key="font" usesAppearanceFont="YES"/>
                                                 <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -106,7 +106,7 @@
                                 </gridCells>
                             </gridView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gLh-gl-ZGQ">
-                                <rect key="frame" x="109" y="55" width="109" height="32"/>
+                                <rect key="frame" x="109" y="60" width="109" height="32"/>
                                 <buttonCell key="cell" type="push" title="Credentials" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="vYg-ZC-o4W">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
diff --git a/Mac/Preferences/ExtensionPoints/ExtensionPointDetail.xib b/Mac/Preferences/ExtensionPoints/ExtensionPointDetail.xib
index be4b650a5..ef4f72148 100644
--- a/Mac/Preferences/ExtensionPoints/ExtensionPointDetail.xib
+++ b/Mac/Preferences/ExtensionPoints/ExtensionPointDetail.xib
@@ -20,7 +20,7 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <font key="font" metaFont="system"/>
             <tabViewItems>
-                <tabViewItem label="Extension Information" identifier="" id="k6A-mz-zOF">
+                <tabViewItem label="Extension" identifier="" id="k6A-mz-zOF">
                     <view key="view" id="jT6-Hh-gWM">
                         <rect key="frame" x="10" y="33" width="326" height="254"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
diff --git a/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/Contents.json b/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/Contents.json
index 44cd99384..432281179 100644
--- a/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "marsedit.pdf",
+      "filename" : "MarsEditOfficial.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/MarsEditOfficial.pdf b/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/MarsEditOfficial.pdf
new file mode 100644
index 000000000..82396a369
Binary files /dev/null and b/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/MarsEditOfficial.pdf differ
diff --git a/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/marsedit.pdf b/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/marsedit.pdf
deleted file mode 100644
index 732eb701c..000000000
Binary files a/Mac/Resources/Assets.xcassets/extensionPointMarsEdit.imageset/marsedit.pdf and /dev/null differ