diff --git a/Preferences/Preferences/Base.lproj/PathSuggester.xib b/Preferences/Preferences/Base.lproj/PathSuggester.xib
index d9b861bb1..42aeb8e81 100644
--- a/Preferences/Preferences/Base.lproj/PathSuggester.xib
+++ b/Preferences/Preferences/Base.lproj/PathSuggester.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22138.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23727" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22138.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23727"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -52,7 +52,7 @@
                                                     <rect key="frame" x="8" y="0.0" width="62" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JEu-SS-Ht2">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JEu-SS-Ht2">
                                                             <rect key="frame" x="0.0" y="4" width="62" height="16"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="RLN-Pa-Mhl">
@@ -71,7 +71,7 @@
                                                 <binding destination="co7-fb-ZfR" name="value" keyPath="arrangedObjects.enabled" id="AYu-Hb-5Oz"/>
                                             </connections>
                                         </tableColumn>
-                                        <tableColumn identifier="path" width="336.5" minWidth="40" maxWidth="1000" id="23r-ai-XoX">
+                                        <tableColumn identifier="path" width="337" minWidth="40" maxWidth="1000" id="23r-ai-XoX">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Path">
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -87,7 +87,7 @@
                                                     <rect key="frame" x="87" y="0.0" width="334" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3sg-yr-7pE">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3sg-yr-7pE">
                                                             <rect key="frame" x="0.0" y="4" width="335" height="16"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="xFm-ed-yBb">
@@ -135,7 +135,7 @@
                     <constraint firstAttribute="bottom" secondItem="qDP-bP-gt0" secondAttribute="bottom" id="pwc-2L-V1Y"/>
                 </constraints>
             </view>
-            <toolbar key="toolbar" implicitIdentifier="760262BB-BC46-469A-AF4F-7639AE45C1E3" autosavesConfiguration="NO" displayMode="iconOnly" sizeMode="regular" id="6Kb-WZ-fpH">
+            <toolbar key="toolbar" implicitIdentifier="760262BB-BC46-469A-AF4F-7639AE45C1E3" autosavesConfiguration="NO" showsBaselineSeparator="NO" displayMode="iconOnly" sizeMode="regular" id="6Kb-WZ-fpH">
                 <allowedToolbarItems>
                     <toolbarItem implicitItemIdentifier="1B91073D-B1EB-41CA-9CB3-206FFBE03E80" label="Apply" paletteLabel="Apply" title="Apply" id="cJV-DM-SOV">
                         <nil key="toolTip"/>