diff --git a/Cartfile b/Cartfile
index 9d35e20c..c17c597b 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
 github "sparkle-project/Sparkle" ~> 1.18.1
-github "MacPass/KeePassKit" ~> 1.10
+github "MacPass/KeePassKit" ~> 1.12
 github "mstarke/HNHUi" ~> 1.4.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 4c8eb1be..3fbe65ad 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "MacPass/KeePassKit" "1.10"
+github "MacPass/KeePassKit" "1.12"
 github "mstarke/HNHUi" "1.4.2"
 github "sparkle-project/Sparkle" "1.18.1"
diff --git a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
index 60d4abfa..ae4f7dd1 100644
--- a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
+++ b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
@@ -64,7 +64,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = "de"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/MacPass/Base.lproj/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib
index 5beb83ca..0be1b43b 100644
--- a/MacPass/Base.lproj/PasswordInputView.xib
+++ b/MacPass/Base.lproj/PasswordInputView.xib
@@ -22,10 +22,10 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="1">
-            <rect key="frame" x="0.0" y="0.0" width="524" height="303"/>
+            <rect key="frame" x="0.0" y="0.0" width="508" height="303"/>
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2">
-                    <rect key="frame" x="318" y="64" width="83" height="32"/>
+                    <rect key="frame" x="310" y="64" width="83" height="32"/>
                     <buttonCell key="cell" type="push" title="Unlock" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -38,7 +38,7 @@ DQ
                     </connections>
                 </button>
                 <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="17">
-                    <rect key="frame" x="116" y="112" width="45" height="17"/>
+                    <rect key="frame" x="108" y="112" width="45" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Keyfile" id="18">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -46,7 +46,7 @@ DQ
                     </textFieldCell>
                 </textField>
                 <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="241" customClass="MPPathControl">
-                    <rect key="frame" x="164" y="108" width="197" height="26"/>
+                    <rect key="frame" x="156" y="108" width="197" height="26"/>
                     <pathCell key="cell" selectable="YES" editable="YES" alignment="left" pathStyle="popUp" id="242">
                         <font key="font" metaFont="system"/>
                     </pathCell>
@@ -55,7 +55,7 @@ DQ
                     </connections>
                 </pathControl>
                 <imageView translatesAutoresizingMaskIntoConstraints="NO" id="262">
-                    <rect key="frame" x="238" y="197" width="48" height="48"/>
+                    <rect key="frame" x="230" y="197" width="48" height="48"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="48" id="273"/>
                         <constraint firstAttribute="width" constant="48" id="456"/>
@@ -63,7 +63,7 @@ DQ
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="02_MessageBoxWarningTemplate" id="263"/>
                 </imageView>
                 <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="268">
-                    <rect key="frame" x="207" y="172" width="110" height="17"/>
+                    <rect key="frame" x="199" y="172" width="110" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Wrong password!" id="269">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -71,7 +71,7 @@ DQ
                     </textFieldCell>
                 </textField>
                 <secureTextField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="338" customClass="HNHUIRoundedSecureTextField">
-                    <rect key="frame" x="167" y="140" width="191" height="24"/>
+                    <rect key="frame" x="159" y="140" width="191" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="191" id="389"/>
                     </constraints>
@@ -88,14 +88,14 @@ DQ
                     </connections>
                 </secureTextField>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="408">
-                    <rect key="frame" x="366" y="140" width="29" height="25"/>
+                    <rect key="frame" x="358" y="140" width="29" height="25"/>
                     <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSQuickLookTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="409">
                         <behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="486">
-                    <rect key="frame" x="366" y="107" width="29" height="25"/>
+                    <rect key="frame" x="358" y="107" width="29" height="25"/>
                     <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSStopProgressTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="487">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -105,14 +105,14 @@ DQ
                     </connections>
                 </button>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="d8O-Ha-rrS">
-                    <rect key="frame" x="80" y="143" width="81" height="18"/>
+                    <rect key="frame" x="72" y="143" width="81" height="18"/>
                     <buttonCell key="cell" type="check" title="Password" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="IU9-5u-jn9">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2pb-ZG-spA">
-                    <rect key="frame" x="236" y="64" width="82" height="32"/>
+                    <rect key="frame" x="228" y="64" width="82" height="32"/>
                     <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="erj-mR-UyO">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -155,7 +155,7 @@ Gw
                 <constraint firstItem="d8O-Ha-rrS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="1" secondAttribute="leading" constant="20" symbolic="YES" id="vxq-YP-UhR"/>
                 <constraint firstItem="2" firstAttribute="leading" secondItem="2pb-ZG-spA" secondAttribute="trailing" constant="12" id="ytJ-5Z-5rT"/>
             </constraints>
-            <point key="canvasLocation" x="54" y="45"/>
+            <point key="canvasLocation" x="-429" y="-68"/>
         </customView>
         <customObject id="MfG-kk-cQe" customClass="MPKeyfilePathControlDelegate"/>
     </objects>