diff --git a/MacPass/Base.lproj/GeneralSettings.xib b/MacPass/Base.lproj/GeneralSettings.xib
index a556262e..9ee986fa 100644
--- a/MacPass/Base.lproj/GeneralSettings.xib
+++ b/MacPass/Base.lproj/GeneralSettings.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
         <capability name="box content view" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
@@ -29,8 +29,8 @@
                         <rect key="frame" x="1" y="1" width="364" height="230"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="431">
-                                <rect key="frame" x="16" y="202" width="124" height="17"/>
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="431">
+                                <rect key="frame" x="16" y="202" width="120" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="803"/>
                                 </constraints>
@@ -60,8 +60,8 @@
                                     </menu>
                                 </popUpButtonCell>
                             </popUpButton>
-                            <button verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="447">
-                                <rect key="frame" x="31" y="178" width="172" height="18"/>
+                            <button verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="447">
+                                <rect key="frame" x="31" y="178" width="164" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="14" id="773"/>
                                 </constraints>
@@ -87,23 +87,23 @@
                                     </menu>
                                 </popUpButtonCell>
                             </popUpButton>
-                            <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="630">
-                                <rect key="frame" x="31" y="131" width="121" height="18"/>
+                            <button translatesAutoresizingMaskIntoConstraints="NO" id="630">
+                                <rect key="frame" x="31" y="131" width="119" height="18"/>
                                 <buttonCell key="cell" type="check" title="Lock after sleep" bezelStyle="regularSquare" imagePosition="left" enabled="NO" state="on" inset="2" id="631">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
-                            <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="805">
-                                <rect key="frame" x="16" y="155" width="97" height="17"/>
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="805">
+                                <rect key="frame" x="16" y="155" width="93" height="17"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Lock while idle" id="806">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <button verticalHuggingPriority="249" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bSt-Wf-FNZ">
-                                <rect key="frame" x="16" y="106" width="226" height="18"/>
+                            <button verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="bSt-Wf-FNZ">
+                                <rect key="frame" x="16" y="106" width="220" height="18"/>
                                 <buttonCell key="cell" type="check" title="Remember Keyfile for Databases" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="r6q-He-nYU">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -118,8 +118,8 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oQr-FC-HkN">
-                                <rect key="frame" x="156" y="7" width="196" height="32"/>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oQr-FC-HkN">
+                                <rect key="frame" x="162" y="7" width="190" height="32"/>
                                 <buttonCell key="cell" type="push" title="Clear all stored locations" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8Ri-2s-c39">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -165,15 +165,15 @@
                         <rect key="frame" x="1" y="1" width="364" height="58"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button verticalHuggingPriority="252" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="530">
-                                <rect key="frame" x="16" y="12" width="240" height="18"/>
+                            <button verticalHuggingPriority="252" translatesAutoresizingMaskIntoConstraints="NO" id="530">
+                                <rect key="frame" x="16" y="12" width="234" height="18"/>
                                 <buttonCell key="cell" type="check" title="Reopen last Database after Launch" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="531">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
-                            <button verticalHuggingPriority="252" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="879">
-                                <rect key="frame" x="16" y="32" width="228" height="18"/>
+                            <button verticalHuggingPriority="252" translatesAutoresizingMaskIntoConstraints="NO" id="879">
+                                <rect key="frame" x="16" y="32" width="223" height="18"/>
                                 <buttonCell key="cell" type="check" title="Create new Database if activated" bezelStyle="regularSquare" imagePosition="left" enabled="NO" state="on" inset="2" id="880">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
diff --git a/MacPass/Base.lproj/IntegrationSettings.xib b/MacPass/Base.lproj/IntegrationSettings.xib
index a96b49af..e4e030ff 100644
--- a/MacPass/Base.lproj/IntegrationSettings.xib
+++ b/MacPass/Base.lproj/IntegrationSettings.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
         <capability name="box content view" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
@@ -186,7 +186,7 @@
                 <constraint firstItem="P9N-HM-wER" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="ulV-xL-ldJ"/>
                 <constraint firstItem="VVs-b5-cX9" firstAttribute="leading" secondItem="P9N-HM-wER" secondAttribute="leading" id="z4a-9C-78h"/>
             </constraints>
-            <point key="canvasLocation" x="-188" y="59"/>
+            <point key="canvasLocation" x="130" y="148"/>
         </customView>
     </objects>
 </document>
diff --git a/MacPass/Base.lproj/PluginSettings.xib b/MacPass/Base.lproj/PluginSettings.xib
index 5c179b9e..70e3f705 100644
--- a/MacPass/Base.lproj/PluginSettings.xib
+++ b/MacPass/Base.lproj/PluginSettings.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
         <capability name="box content view" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
@@ -122,7 +122,7 @@
                 <constraint firstItem="vBs-Ga-aq0" firstAttribute="leading" secondItem="fCk-fL-jU8" secondAttribute="trailing" constant="8" id="xNu-Sj-xQO"/>
                 <constraint firstItem="aoG-FD-ds8" firstAttribute="top" secondItem="CqP-oK-S8k" secondAttribute="bottom" constant="8" symbolic="YES" id="zSW-h3-BrT"/>
             </constraints>
-            <point key="canvasLocation" x="-455" y="97"/>
+            <point key="canvasLocation" x="-288" y="133"/>
         </customView>
     </objects>
 </document>
diff --git a/MacPass/Base.lproj/UpdateSettings.xib b/MacPass/Base.lproj/UpdateSettings.xib
index a77c535a..97f90bfd 100644
--- a/MacPass/Base.lproj/UpdateSettings.xib
+++ b/MacPass/Base.lproj/UpdateSettings.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPUpdateSettingsController">
diff --git a/MacPass/Base.lproj/WorkflowSettings.xib b/MacPass/Base.lproj/WorkflowSettings.xib
index 3f4008c3..b0de6e31 100644
--- a/MacPass/Base.lproj/WorkflowSettings.xib
+++ b/MacPass/Base.lproj/WorkflowSettings.xib
@@ -57,12 +57,12 @@
                             </textField>
                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="40">
                                 <rect key="frame" x="154" y="11" width="138" height="26"/>
-                                <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="41">
+                                <popUpButtonCell key="cell" type="push" title="Opens Inspector" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="44" id="41">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="menu"/>
                                     <menu key="menu" title="OtherViews" id="42">
                                         <items>
-                                            <menuItem title="Opens Inspector" id="44"/>
+                                            <menuItem title="Opens Inspector" state="on" id="44"/>
                                             <menuItem title="Is Ignored" id="43"/>
                                         </items>
                                     </menu>
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 3c94b252..8c668cc7 100644
Binary files a/MacPass/de.lproj/Localizable.strings and b/MacPass/de.lproj/Localizable.strings differ
diff --git a/MacPass/de.lproj/WorkflowSettings.strings b/MacPass/de.lproj/WorkflowSettings.strings
index 1698658c..d138d698 100644
--- a/MacPass/de.lproj/WorkflowSettings.strings
+++ b/MacPass/de.lproj/WorkflowSettings.strings
@@ -1,6 +1,6 @@
 
 /* Class = "NSBox"; title = "Entry Table"; ObjectID = "2"; */
-"2.title" = "Entry Table";
+"2.title" = "Passwort Tabelle";
 
 /* Class = "NSTextFieldCell"; title = "Double-click on URL:"; ObjectID = "10"; */
 "10.title" = "Doppelklick auf Link:";
@@ -24,19 +24,10 @@
 "43.title" = "ignorieren";
 
 /* Class = "NSMenuItem"; title = "Opens Inspector"; ObjectID = "44"; */
-"44.title" = "Opens Inspector";
+"44.title" = "Inspector öffnen";
 
 /* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
 "7YX-EA-9KA.title" = "Vorgabe-Browser";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
-"XgO-Tj-QjO.title" = "OtherViews";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
-"gej-kA-GzQ.title" = "Eintrag 2";
-
 /* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
 "soD-wI-YOH.title" = "Links öffnen in:";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
-"zC2-cM-KDv.title" = "Eintrag 3";
diff --git a/MacPass/en.lproj/WorkflowSettings.strings b/MacPass/en.lproj/WorkflowSettings.strings
index 56e8924f..cd38ef2d 100644
--- a/MacPass/en.lproj/WorkflowSettings.strings
+++ b/MacPass/en.lproj/WorkflowSettings.strings
@@ -32,11 +32,6 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
 "XgO-Tj-QjO.title" = "OtherViews";
 
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
-"gej-kA-GzQ.title" = "Item 2";
-
 /* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
 "soD-wI-YOH.title" = "Open URLs in:";
 
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
-"zC2-cM-KDv.title" = "Item 3";
diff --git a/MacPass/it.lproj/WorkflowSettings.strings b/MacPass/it.lproj/WorkflowSettings.strings
index 1f2a5281..45c55658 100644
--- a/MacPass/it.lproj/WorkflowSettings.strings
+++ b/MacPass/it.lproj/WorkflowSettings.strings
@@ -29,14 +29,5 @@
 /* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
 "7YX-EA-9KA.title" = "Browser Predefinito";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
-"XgO-Tj-QjO.title" = "OtherViews";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
-"gej-kA-GzQ.title" = "Elemento 2";
-
 /* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
-"soD-wI-YOH.title" = "Apre URL in:";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
-"zC2-cM-KDv.title" = "Elemento 3";
+"soD-wI-YOH.title" = "Apre URL in:";
\ No newline at end of file
diff --git a/MacPass/nl.lproj/WorkflowSettings.strings b/MacPass/nl.lproj/WorkflowSettings.strings
index 0c511add..807e63e9 100644
--- a/MacPass/nl.lproj/WorkflowSettings.strings
+++ b/MacPass/nl.lproj/WorkflowSettings.strings
@@ -29,14 +29,5 @@
 /* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
 "7YX-EA-9KA.title" = "Standaard Browser";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
-"XgO-Tj-QjO.title" = "OverigeViews";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
-"gej-kA-GzQ.title" = "Item 2";
-
 /* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
 "soD-wI-YOH.title" = "Opent URLs in:";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
-"zC2-cM-KDv.title" = "Item 3";
diff --git a/MacPass/ru.lproj/WorkflowSettings.strings b/MacPass/ru.lproj/WorkflowSettings.strings
index 8401ce9c..3c00a432 100644
--- a/MacPass/ru.lproj/WorkflowSettings.strings
+++ b/MacPass/ru.lproj/WorkflowSettings.strings
@@ -17,9 +17,6 @@
 /* Class = "NSTextFieldCell"; title = "Double-click on Title:"; ObjectID = "37"; */
 "37.title" = "Дабл-клик по Заголовку:";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "42"; */
-"42.title" = "OtherViews";
-
 /* Class = "NSMenuItem"; title = "Is Ignored"; ObjectID = "43"; */
 "43.title" = "Игнорируется";
 
@@ -29,14 +26,5 @@
 /* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
 "7YX-EA-9KA.title" = "Браузер по умолчанию";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
-"XgO-Tj-QjO.title" = "OtherViews";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
-"gej-kA-GzQ.title" = "Элемент 2";
-
 /* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
 "soD-wI-YOH.title" = "Открывать URLы в:";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
-"zC2-cM-KDv.title" = "Элемент 3";
diff --git a/MacPass/zh-Hans.lproj/WorkflowSettings.strings b/MacPass/zh-Hans.lproj/WorkflowSettings.strings
index 5b98d640..ccebfd36 100644
--- a/MacPass/zh-Hans.lproj/WorkflowSettings.strings
+++ b/MacPass/zh-Hans.lproj/WorkflowSettings.strings
@@ -32,11 +32,5 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
 "XgO-Tj-QjO.title" = "其他视图";
 
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
-"gej-kA-GzQ.title" = "Item 2";
-
 /* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
 "soD-wI-YOH.title" = "用其他浏览器打开 URL:";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
-"zC2-cM-KDv.title" = "Item 3";