diff --git a/MacPass/Base.lproj/DatabaseSettingsWindow.xib b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
index 840d01a3..17af7674 100644
--- a/MacPass/Base.lproj/DatabaseSettingsWindow.xib
+++ b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
@@ -33,7 +33,7 @@
                 <outlet property="historyMaximumItemsTextField" destination="593" id="NrX-e0-8Dw"/>
                 <outlet property="historyMaximumSizeStepper" destination="1294" id="Jbo-ZY-5h6"/>
                 <outlet property="historyMaximumSizeTextField" destination="1273" id="5Fo-Pp-8dY"/>
-                <outlet property="keyDerivationPopupButton" destination="5D9-bT-JAr" id="90K-97-HQW"/>
+                <outlet property="keyDerivationPopupButton" destination="2cq-R3-Ksh" id="p3N-lu-r4C"/>
                 <outlet property="keyDerivationSettingsTabView" destination="2MY-PW-kzL" id="1iZ-jt-nxi"/>
                 <outlet property="recommendKeyChangeCheckButton" destination="Hqc-B0-xyz" id="3CK-D7-b8S"/>
                 <outlet property="recommendKeyChangeIntervalStepper" destination="GUO-6H-UI2" id="gIQ-c2-pkx"/>
@@ -49,14 +49,14 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="553" height="319"/>
+            <rect key="contentRect" x="196" y="240" width="500" height="336"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="553" height="484"/>
+                <rect key="frame" x="0.0" y="0.0" width="458" height="388"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="288">
-                        <rect key="frame" x="480" y="13" width="59" height="32"/>
+                        <rect key="frame" x="385" y="13" width="59" height="32"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="289">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -69,7 +69,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="956">
-                        <rect key="frame" x="398" y="13" width="82" height="32"/>
+                        <rect key="frame" x="303" y="13" width="82" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="957">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -82,16 +82,16 @@ Gw
                         </connections>
                     </button>
                     <tabView translatesAutoresizingMaskIntoConstraints="NO" id="357">
-                        <rect key="frame" x="13" y="41" width="527" height="437"/>
+                        <rect key="frame" x="13" y="41" width="432" height="341"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="General" identifier="1" id="358">
                                 <view key="view" id="361">
-                                    <rect key="frame" x="10" y="33" width="502" height="242"/>
+                                    <rect key="frame" x="10" y="33" width="507" height="242"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="231">
-                                            <rect key="frame" x="202" y="200" width="280" height="22"/>
+                                            <rect key="frame" x="207" y="200" width="280" height="22"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="280" id="cra-uC-nCv"/>
                                             </constraints>
@@ -102,7 +102,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="256">
-                                            <rect key="frame" x="118" y="176" width="78" height="17"/>
+                                            <rect key="frame" x="123" y="176" width="78" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Description:" id="257">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -110,7 +110,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="189">
-                                            <rect key="frame" x="94" y="204" width="102" height="17"/>
+                                            <rect key="frame" x="99" y="204" width="102" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Database name:" id="190">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -118,7 +118,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1394">
-                                            <rect key="frame" x="200" y="48" width="70" height="26"/>
+                                            <rect key="frame" x="205" y="48" width="70" height="26"/>
                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="1395">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
@@ -131,7 +131,7 @@ Gw
                                             </popUpButtonCell>
                                         </popUpButton>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1404">
-                                            <rect key="frame" x="108" y="53" width="88" height="17"/>
+                                            <rect key="frame" x="113" y="53" width="88" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Compression:" id="1405">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -139,7 +139,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1434">
-                                            <rect key="frame" x="155" y="23" width="41" height="17"/>
+                                            <rect key="frame" x="160" y="23" width="41" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Color:" id="1435">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -147,7 +147,7 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <colorWell translatesAutoresizingMaskIntoConstraints="NO" id="1439" customClass="HNHUIColorWell">
-                                            <rect key="frame" x="202" y="20" width="44" height="23"/>
+                                            <rect key="frame" x="207" y="20" width="44" height="23"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="44" id="XBF-V3-71G"/>
                                                 <constraint firstAttribute="height" constant="23" id="fgN-h5-Mr8"/>
@@ -155,7 +155,7 @@ Gw
                                             <color key="color" red="0.05813049898" green="0.055541899059999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </colorWell>
                                         <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1530">
-                                            <rect key="frame" x="202" y="92" width="280" height="100"/>
+                                            <rect key="frame" x="207" y="92" width="280" height="100"/>
                                             <clipView key="contentView" id="WOI-1v-RCe">
                                                 <rect key="frame" x="1" y="1" width="278" height="98"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -199,6 +199,7 @@ Gw
                                         <constraint firstItem="1394" firstAttribute="leading" secondItem="1530" secondAttribute="leading" id="R3K-aw-ZMm"/>
                                         <constraint firstAttribute="trailing" secondItem="231" secondAttribute="trailing" constant="20" symbolic="YES" id="RCb-CX-SDA"/>
                                         <constraint firstItem="256" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="361" secondAttribute="leading" constant="20" symbolic="YES" id="RZm-XN-kiT"/>
+                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1394" secondAttribute="trailing" constant="20" symbolic="YES" id="Sog-QH-0sx"/>
                                         <constraint firstItem="1439" firstAttribute="top" secondItem="1394" secondAttribute="bottom" constant="8" symbolic="YES" id="ZeI-7b-IjZ"/>
                                         <constraint firstItem="256" firstAttribute="trailing" secondItem="189" secondAttribute="trailing" id="al9-qI-MaZ"/>
                                         <constraint firstItem="1394" firstAttribute="leading" secondItem="1439" secondAttribute="leading" id="bFE-Ho-9Zk"/>
@@ -212,75 +213,62 @@ Gw
                             </tabViewItem>
                             <tabViewItem label="Security" identifier="" id="370">
                                 <view key="view" id="371">
-                                    <rect key="frame" x="10" y="33" width="502" height="236"/>
+                                    <rect key="frame" x="10" y="33" width="412" height="295"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3ek-Rg-w82">
-                                            <rect key="frame" x="233" y="192" width="37" height="26"/>
+                                            <rect key="frame" x="129" y="251" width="155" height="26"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="F8Y-Uw-4mL"/>
+                                            </constraints>
                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="e3h-dG-ekU">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
                                                 <menu key="menu" id="I8O-vs-A1G"/>
                                             </popUpButtonCell>
                                         </popUpButton>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vH7-5a-52C">
-                                            <rect key="frame" x="160" y="199" width="69" height="17"/>
-                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Encryption" id="gxY-UL-bEG">
+                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vH7-5a-52C">
+                                            <rect key="frame" x="52" y="258" width="73" height="17"/>
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Encryption:" id="gxY-UL-bEG">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
                                         <box title="Key derivation" translatesAutoresizingMaskIntoConstraints="NO" id="pbl-Mb-r8V">
-                                            <rect key="frame" x="17" y="16" width="468" height="171"/>
+                                            <rect key="frame" x="17" y="16" width="378" height="230"/>
                                             <view key="contentView" id="hkT-SX-Te1">
-                                                <rect key="frame" x="2" y="2" width="464" height="154"/>
+                                                <rect key="frame" x="2" y="2" width="374" height="213"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cqu-Og-bZH">
-                                                        <rect key="frame" x="147" y="117" width="63" height="17"/>
-                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Algorithm" id="U4f-lN-oxi">
-                                                            <font key="font" metaFont="system"/>
-                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                        </textFieldCell>
-                                                    </textField>
-                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5D9-bT-JAr">
-                                                        <rect key="frame" x="214" y="110" width="37" height="26"/>
-                                                        <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="rf4-V3-tPC">
-                                                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                            <font key="font" metaFont="menu"/>
-                                                            <menu key="menu" id="k2J-Eh-7KL"/>
-                                                        </popUpButtonCell>
-                                                    </popUpButton>
                                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P98-Cu-Tha">
-                                                        <rect key="frame" x="301" y="18" width="143" height="25"/>
+                                                        <rect key="frame" x="211" y="18" width="143" height="25"/>
                                                         <buttonCell key="cell" type="roundTextured" title="Generate Parameters" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PoI-Er-Y8P">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="system"/>
                                                         </buttonCell>
                                                     </button>
                                                     <tabView drawsBackground="NO" type="noTabsNoBorder" translatesAutoresizingMaskIntoConstraints="NO" id="2MY-PW-kzL">
-                                                        <rect key="frame" x="13" y="50" width="438" height="62"/>
+                                                        <rect key="frame" x="13" y="50" width="348" height="114"/>
                                                         <font key="font" metaFont="system"/>
                                                         <tabViewItems>
                                                             <tabViewItem label="Aes" identifier="1" id="ft1-pl-lpO">
                                                                 <view key="view" id="88i-IZ-Yev">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="438" height="62"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="62"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <subviews>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ztz-iY-hWV">
-                                                                            <rect key="frame" x="123" y="23" width="50" height="17"/>
+                                                                            <rect key="frame" x="64" y="23" width="50" height="17"/>
                                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Rounds" id="uUQ-9s-M5E">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8aq-34-rcd">
-                                                                            <rect key="frame" x="179" y="20" width="80" height="22"/>
+                                                                            <rect key="frame" x="120" y="20" width="150" height="22"/>
                                                                             <constraints>
-                                                                                <constraint firstAttribute="width" constant="80" id="rV0-LL-xXc"/>
+                                                                                <constraint firstAttribute="width" constant="150" id="cdb-ED-zB3"/>
                                                                             </constraints>
                                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="DTY-h6-A7Z">
                                                                                 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="PHD-wY-sQ2">
@@ -296,19 +284,20 @@ Gw
                                                                         <constraint firstItem="8aq-34-rcd" firstAttribute="leading" secondItem="ztz-iY-hWV" secondAttribute="trailing" constant="8" symbolic="YES" id="1rK-1s-hmj"/>
                                                                         <constraint firstItem="ztz-iY-hWV" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="88i-IZ-Yev" secondAttribute="leading" constant="20" symbolic="YES" id="68e-t0-M72"/>
                                                                         <constraint firstAttribute="bottom" secondItem="8aq-34-rcd" secondAttribute="bottom" constant="20" symbolic="YES" id="P33-GP-h3e"/>
-                                                                        <constraint firstItem="8aq-34-rcd" firstAttribute="centerX" secondItem="88i-IZ-Yev" secondAttribute="centerX" id="Twz-Ot-3wP"/>
-                                                                        <constraint firstItem="8aq-34-rcd" firstAttribute="top" secondItem="88i-IZ-Yev" secondAttribute="top" constant="20" id="uK6-22-35U"/>
+                                                                        <constraint firstItem="8aq-34-rcd" firstAttribute="centerX" secondItem="88i-IZ-Yev" secondAttribute="centerX" id="dFa-D5-JxM"/>
+                                                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="8aq-34-rcd" secondAttribute="trailing" constant="20" symbolic="YES" id="gbt-mz-T84"/>
+                                                                        <constraint firstItem="8aq-34-rcd" firstAttribute="top" secondItem="88i-IZ-Yev" secondAttribute="top" constant="20" symbolic="YES" id="uK6-22-35U"/>
                                                                         <constraint firstItem="8aq-34-rcd" firstAttribute="baseline" secondItem="ztz-iY-hWV" secondAttribute="baseline" id="yOh-B1-dkr"/>
                                                                     </constraints>
                                                                 </view>
                                                             </tabViewItem>
                                                             <tabViewItem label="Argon2" identifier="2" id="6qB-sH-9FI">
                                                                 <view key="view" id="ORc-Gq-vFd">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="438" height="126"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="348" height="114"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <subviews>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aNy-eF-jKq">
-                                                                            <rect key="frame" x="119" y="87" width="54" height="17"/>
+                                                                            <rect key="frame" x="39" y="87" width="54" height="17"/>
                                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Threads" id="2QI-ne-N5d">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -316,7 +305,7 @@ Gw
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ml2-wP-EaZ">
-                                                                            <rect key="frame" x="112" y="55" width="61" height="17"/>
+                                                                            <rect key="frame" x="32" y="55" width="61" height="17"/>
                                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Iterations" id="2ZA-Gc-JdZ">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -324,9 +313,9 @@ Gw
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="178-0f-guB">
-                                                                            <rect key="frame" x="179" y="84" width="80" height="22"/>
+                                                                            <rect key="frame" x="99" y="84" width="150" height="22"/>
                                                                             <constraints>
-                                                                                <constraint firstAttribute="width" constant="80" id="pWc-wH-acx"/>
+                                                                                <constraint firstAttribute="width" constant="150" id="IEL-Dn-XFa"/>
                                                                             </constraints>
                                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="E2f-UU-u53">
                                                                                 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="99Y-Zs-26E">
@@ -339,7 +328,7 @@ Gw
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="39N-8Q-J8b">
-                                                                            <rect key="frame" x="179" y="52" width="80" height="22"/>
+                                                                            <rect key="frame" x="99" y="52" width="150" height="22"/>
                                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="9wr-x8-Wtv">
                                                                                 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Kim-cZ-JbF">
                                                                                     <real key="minimum" value="1"/>
@@ -351,8 +340,8 @@ Gw
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eEW-oa-V7U">
-                                                                            <rect key="frame" x="179" y="20" width="80" height="22"/>
-                                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="M1E-89-YVm">
+                                                                            <rect key="frame" x="99" y="20" width="129" height="22"/>
+                                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="M1E-89-YVm">
                                                                                 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="nQR-dh-won">
                                                                                     <real key="minimum" value="8192"/>
                                                                                 </numberFormatter>
@@ -362,51 +351,87 @@ Gw
                                                                             </textFieldCell>
                                                                         </textField>
                                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9kV-19-lm6">
-                                                                            <rect key="frame" x="119" y="23" width="54" height="17"/>
+                                                                            <rect key="frame" x="39" y="23" width="54" height="17"/>
                                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Memory" id="iRY-If-Kwn">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                             </textFieldCell>
                                                                         </textField>
+                                                                        <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NfL-iP-SRk">
+                                                                            <rect key="frame" x="233" y="18" width="19" height="27"/>
+                                                                            <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="dvB-J3-Wmb"/>
+                                                                        </stepper>
                                                                     </subviews>
                                                                     <constraints>
-                                                                        <constraint firstItem="178-0f-guB" firstAttribute="trailing" secondItem="39N-8Q-J8b" secondAttribute="trailing" id="1kQ-s7-kBh"/>
+                                                                        <constraint firstItem="NfL-iP-SRk" firstAttribute="trailing" secondItem="39N-8Q-J8b" secondAttribute="trailing" id="264-rE-LMu"/>
                                                                         <constraint firstItem="ml2-wP-EaZ" firstAttribute="baseline" secondItem="39N-8Q-J8b" secondAttribute="baseline" id="2qS-68-RoC"/>
                                                                         <constraint firstItem="39N-8Q-J8b" firstAttribute="top" secondItem="178-0f-guB" secondAttribute="bottom" constant="10" symbolic="YES" id="9GS-Lv-8hf"/>
-                                                                        <constraint firstItem="178-0f-guB" firstAttribute="top" secondItem="ORc-Gq-vFd" secondAttribute="top" constant="20" id="BP8-Q8-bRB"/>
-                                                                        <constraint firstItem="eEW-oa-V7U" firstAttribute="leading" secondItem="39N-8Q-J8b" secondAttribute="leading" id="EK8-oS-e6f"/>
+                                                                        <constraint firstItem="39N-8Q-J8b" firstAttribute="leading" secondItem="178-0f-guB" secondAttribute="leading" id="B9B-7d-H9o"/>
+                                                                        <constraint firstItem="178-0f-guB" firstAttribute="top" secondItem="ORc-Gq-vFd" secondAttribute="top" constant="8" id="BP8-Q8-bRB"/>
+                                                                        <constraint firstItem="eEW-oa-V7U" firstAttribute="leading" secondItem="39N-8Q-J8b" secondAttribute="leading" id="HIY-JA-4aW"/>
                                                                         <constraint firstItem="39N-8Q-J8b" firstAttribute="leading" secondItem="ml2-wP-EaZ" secondAttribute="trailing" constant="8" symbolic="YES" id="KM7-HV-rzC"/>
                                                                         <constraint firstItem="aNy-eF-jKq" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ORc-Gq-vFd" secondAttribute="leading" constant="20" symbolic="YES" id="Lcs-rI-XEr"/>
-                                                                        <constraint firstItem="178-0f-guB" firstAttribute="leading" secondItem="39N-8Q-J8b" secondAttribute="leading" id="NIV-TP-tNg"/>
-                                                                        <constraint firstItem="eEW-oa-V7U" firstAttribute="trailing" secondItem="39N-8Q-J8b" secondAttribute="trailing" id="Puj-lS-iSq"/>
+                                                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="178-0f-guB" secondAttribute="trailing" constant="20" symbolic="YES" id="NWd-9r-dax"/>
+                                                                        <constraint firstItem="NfL-iP-SRk" firstAttribute="leading" secondItem="eEW-oa-V7U" secondAttribute="trailing" constant="8" symbolic="YES" id="WG7-FQ-Uyz"/>
                                                                         <constraint firstItem="eEW-oa-V7U" firstAttribute="leading" secondItem="9kV-19-lm6" secondAttribute="trailing" constant="8" symbolic="YES" id="X6b-Xh-c4a"/>
                                                                         <constraint firstItem="9kV-19-lm6" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ORc-Gq-vFd" secondAttribute="leading" constant="20" symbolic="YES" id="XQk-mB-L1e"/>
                                                                         <constraint firstItem="ml2-wP-EaZ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ORc-Gq-vFd" secondAttribute="leading" constant="20" symbolic="YES" id="Y0n-Fm-1o3"/>
-                                                                        <constraint firstItem="178-0f-guB" firstAttribute="centerX" secondItem="ORc-Gq-vFd" secondAttribute="centerX" id="ZIg-d3-hij"/>
+                                                                        <constraint firstAttribute="trailing" secondItem="NfL-iP-SRk" secondAttribute="trailing" constant="99" id="c0K-KX-m5h"/>
                                                                         <constraint firstItem="9kV-19-lm6" firstAttribute="baseline" secondItem="eEW-oa-V7U" secondAttribute="baseline" id="cVQ-WW-b7c"/>
                                                                         <constraint firstItem="aNy-eF-jKq" firstAttribute="baseline" secondItem="178-0f-guB" secondAttribute="baseline" id="eQi-Ki-OCJ"/>
                                                                         <constraint firstItem="eEW-oa-V7U" firstAttribute="top" secondItem="39N-8Q-J8b" secondAttribute="bottom" constant="10" symbolic="YES" id="eky-9x-cpq"/>
+                                                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="39N-8Q-J8b" secondAttribute="trailing" constant="20" symbolic="YES" id="jZZ-iz-nil"/>
+                                                                        <constraint firstItem="39N-8Q-J8b" firstAttribute="width" secondItem="178-0f-guB" secondAttribute="width" id="ohu-Ju-A7Q"/>
                                                                         <constraint firstAttribute="bottom" secondItem="eEW-oa-V7U" secondAttribute="bottom" constant="20" symbolic="YES" id="pU0-CH-dyS"/>
+                                                                        <constraint firstItem="NfL-iP-SRk" firstAttribute="centerY" secondItem="eEW-oa-V7U" secondAttribute="centerY" id="s7x-Q2-Wf2"/>
+                                                                        <constraint firstItem="178-0f-guB" firstAttribute="centerX" secondItem="ORc-Gq-vFd" secondAttribute="centerX" id="wvA-qj-oCY"/>
                                                                         <constraint firstItem="178-0f-guB" firstAttribute="leading" secondItem="aNy-eF-jKq" secondAttribute="trailing" constant="8" symbolic="YES" id="yn1-bP-4KY"/>
                                                                     </constraints>
                                                                 </view>
                                                             </tabViewItem>
                                                         </tabViewItems>
                                                     </tabView>
+                                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2cq-R3-Ksh">
+                                                        <rect key="frame" x="110" y="169" width="155" height="26"/>
+                                                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3TG-ij-Je3" id="Pb9-YV-rYe">
+                                                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                            <font key="font" metaFont="menu"/>
+                                                            <menu key="menu" id="Xkn-e7-Cia">
+                                                                <items>
+                                                                    <menuItem title="Item 1" state="on" id="3TG-ij-Je3"/>
+                                                                    <menuItem title="Item 2" id="Y2i-7g-NOb"/>
+                                                                    <menuItem title="Item 3" id="vdQ-cw-Uvk"/>
+                                                                </items>
+                                                            </menu>
+                                                        </popUpButtonCell>
+                                                        <connections>
+                                                            <action selector="selectKeyDerivation:" target="-2" id="aAv-dN-8bG"/>
+                                                        </connections>
+                                                    </popUpButton>
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4el-r1-iRL">
+                                                        <rect key="frame" x="43" y="175" width="63" height="17"/>
+                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Algorithm" id="GVd-KH-pHc">
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
                                                 </subviews>
                                                 <constraints>
-                                                    <constraint firstItem="5D9-bT-JAr" firstAttribute="leading" secondItem="cqu-Og-bZH" secondAttribute="trailing" constant="8" id="1ao-8V-Duk"/>
-                                                    <constraint firstItem="5D9-bT-JAr" firstAttribute="baseline" secondItem="cqu-Og-bZH" secondAttribute="baseline" id="GYM-tE-OyA"/>
+                                                    <constraint firstItem="P98-Cu-Tha" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="hkT-SX-Te1" secondAttribute="leading" constant="20" symbolic="YES" id="5oT-fQ-aHS"/>
+                                                    <constraint firstItem="2cq-R3-Ksh" firstAttribute="top" secondItem="hkT-SX-Te1" secondAttribute="top" constant="20" symbolic="YES" id="Alt-ua-wkF"/>
+                                                    <constraint firstItem="2MY-PW-kzL" firstAttribute="top" secondItem="2cq-R3-Ksh" secondAttribute="bottom" constant="8" symbolic="YES" id="HKF-bW-5dU"/>
+                                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="2cq-R3-Ksh" secondAttribute="trailing" constant="20" symbolic="YES" id="NIO-Sq-sb1"/>
                                                     <constraint firstItem="P98-Cu-Tha" firstAttribute="top" secondItem="2MY-PW-kzL" secondAttribute="bottom" constant="8" symbolic="YES" id="O73-33-ZW2"/>
-                                                    <constraint firstItem="5D9-bT-JAr" firstAttribute="centerX" secondItem="hkT-SX-Te1" secondAttribute="centerX" id="P7O-rC-peC"/>
                                                     <constraint firstAttribute="trailing" secondItem="P98-Cu-Tha" secondAttribute="trailing" constant="20" symbolic="YES" id="Rh5-ui-UcZ"/>
-                                                    <constraint firstItem="cqu-Og-bZH" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="hkT-SX-Te1" secondAttribute="leading" constant="20" symbolic="YES" id="d5c-TB-dUg"/>
-                                                    <constraint firstItem="2MY-PW-kzL" firstAttribute="top" secondItem="5D9-bT-JAr" secondAttribute="bottom" constant="1" id="kWf-As-lIR"/>
+                                                    <constraint firstItem="2cq-R3-Ksh" firstAttribute="leading" secondItem="4el-r1-iRL" secondAttribute="trailing" constant="8" symbolic="YES" id="Tuh-Ct-N47"/>
+                                                    <constraint firstItem="2cq-R3-Ksh" firstAttribute="centerX" secondItem="hkT-SX-Te1" secondAttribute="centerX" id="me3-mS-tg8"/>
+                                                    <constraint firstItem="4el-r1-iRL" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="hkT-SX-Te1" secondAttribute="leading" constant="20" symbolic="YES" id="oAu-CY-ejp"/>
+                                                    <constraint firstItem="2cq-R3-Ksh" firstAttribute="baseline" secondItem="4el-r1-iRL" secondAttribute="baseline" id="xXI-QL-cg1"/>
                                                 </constraints>
                                             </view>
                                             <constraints>
-                                                <constraint firstItem="5D9-bT-JAr" firstAttribute="top" secondItem="pbl-Mb-r8V" secondAttribute="top" constant="35" id="1aq-Gf-OVC"/>
                                                 <constraint firstItem="2MY-PW-kzL" firstAttribute="leading" secondItem="pbl-Mb-r8V" secondAttribute="leading" constant="12" id="8kL-ui-1U7"/>
                                                 <constraint firstAttribute="trailing" secondItem="2MY-PW-kzL" secondAttribute="trailing" constant="12" id="e6k-9T-Hzd"/>
                                                 <constraint firstAttribute="bottom" secondItem="P98-Cu-Tha" secondAttribute="bottom" constant="18" id="pMD-oU-IjH"/>
@@ -417,9 +442,12 @@ Gw
                                         <constraint firstItem="3ek-Rg-w82" firstAttribute="top" secondItem="371" secondAttribute="top" constant="20" symbolic="YES" id="Asf-Dt-ast"/>
                                         <constraint firstItem="3ek-Rg-w82" firstAttribute="leading" secondItem="vH7-5a-52C" secondAttribute="trailing" constant="8" symbolic="YES" id="EUz-LX-WBL"/>
                                         <constraint firstItem="vH7-5a-52C" firstAttribute="baseline" secondItem="3ek-Rg-w82" secondAttribute="baseline" id="FAZ-N9-97A"/>
-                                        <constraint firstItem="3ek-Rg-w82" firstAttribute="centerX" secondItem="371" secondAttribute="centerX" id="Su4-Ay-OKi"/>
                                         <constraint firstItem="pbl-Mb-r8V" firstAttribute="top" secondItem="3ek-Rg-w82" secondAttribute="bottom" constant="8" symbolic="YES" id="YFc-sE-fBN"/>
+                                        <constraint firstItem="vH7-5a-52C" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="371" secondAttribute="leading" constant="20" symbolic="YES" id="bg1-Yx-ddv"/>
+                                        <constraint firstItem="3ek-Rg-w82" firstAttribute="centerX" secondItem="371" secondAttribute="centerX" id="czX-D2-qug"/>
+                                        <constraint firstItem="2cq-R3-Ksh" firstAttribute="width" secondItem="3ek-Rg-w82" secondAttribute="width" id="hNZ-0Z-sXK"/>
                                         <constraint firstItem="pbl-Mb-r8V" firstAttribute="leading" secondItem="371" secondAttribute="leading" constant="20" symbolic="YES" id="jal-JQ-kci"/>
+                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="3ek-Rg-w82" secondAttribute="trailing" constant="20" symbolic="YES" id="lUe-Ua-vIs"/>
                                         <constraint firstAttribute="trailing" secondItem="pbl-Mb-r8V" secondAttribute="trailing" constant="20" symbolic="YES" id="nsC-9j-WLM"/>
                                         <constraint firstAttribute="bottom" secondItem="pbl-Mb-r8V" secondAttribute="bottom" constant="20" symbolic="YES" id="orD-8p-mko"/>
                                     </constraints>
@@ -617,6 +645,7 @@ Gw
                                     </subviews>
                                     <constraints>
                                         <constraint firstItem="1273" firstAttribute="leading" secondItem="531" secondAttribute="leading" id="1oM-2t-AOv"/>
+                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="535" secondAttribute="trailing" constant="20" symbolic="YES" id="21A-KW-N4v"/>
                                         <constraint firstItem="GUO-6H-UI2" firstAttribute="leading" secondItem="19r-LE-7X5" secondAttribute="trailing" constant="8" symbolic="YES" id="2PV-sa-5h6"/>
                                         <constraint firstItem="VYh-cm-fix" firstAttribute="leading" secondItem="531" secondAttribute="leading" id="2Xr-j4-fRh"/>
                                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="GUO-6H-UI2" secondAttribute="trailing" constant="20" symbolic="YES" id="3y6-lK-yT4"/>
@@ -708,9 +737,10 @@ Gw
                     <constraint firstAttribute="bottom" secondItem="956" secondAttribute="bottom" constant="20" symbolic="YES" id="958"/>
                     <constraint firstItem="288" firstAttribute="leading" secondItem="956" secondAttribute="trailing" constant="12" symbolic="YES" id="959"/>
                     <constraint firstItem="956" firstAttribute="top" secondItem="357" secondAttribute="bottom" constant="10" id="1096"/>
+                    <constraint firstItem="956" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="Yla-YR-bgz"/>
                 </constraints>
             </view>
-            <point key="canvasLocation" x="-1413" y="-351"/>
+            <point key="canvasLocation" x="-1314" y="-536"/>
         </window>
     </objects>
 </document>
diff --git a/MacPass/MPDatabaseSettingsWindowController.m b/MacPass/MPDatabaseSettingsWindowController.m
index dd3c07a1..8b19d43d 100644
--- a/MacPass/MPDatabaseSettingsWindowController.m
+++ b/MacPass/MPDatabaseSettingsWindowController.m
@@ -295,6 +295,7 @@
   self.historyMaximumSizeStepper.increment = 1024*1024; // 1MB
   [self.historyMaximumSizeStepper bind:NSEnabledBinding toObject:self withKeyPath:NSStringFromSelector(@selector(enableHistory)) options:nil];
   [self.historyMaximumSizeStepper bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(maxiumHistorySize)) options:nil];
+  [self.historyMaximumSizeTextField bind:NSEnabledBinding toObject:self withKeyPath:NSStringFromSelector(@selector(enableHistory)) options:nil];
   [self.historyMaximumSizeTextField bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(maxiumHistorySize)) options:nil];
   
   /* history count */
@@ -304,6 +305,7 @@
   self.historyMaximumItemsStepper.increment = 1;
   [self.historyMaximumItemsStepper bind:NSEnabledBinding toObject:self withKeyPath:NSStringFromSelector(@selector(enableHistory)) options:nil];
   [self.historyMaximumItemsStepper bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(maxiumHistoryItems)) options:nil];
+  [self.historyMaximumItemsTextField bind:NSEnabledBinding toObject:self withKeyPath:NSStringFromSelector(@selector(enableHistory)) options:nil];
   [self.historyMaximumItemsTextField bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(maxiumHistoryItems)) options:nil];
   
   /* trash */
@@ -321,7 +323,7 @@
   self.enforceKeyChange = tree.metaData.enforceMasterKeyChange;
   self.recommendKeyChange = tree.metaData.recommendMasterKeyChange;
   HNHUISetStateFromBool(self.enforceKeyChangeOnceCheckButton, tree.metaData.enforceMasterKeyChangeOnce);
-
+  
   [self.enforceKeyChangeCheckButton bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(enforceKeyChange)) options:nil];
   [self.recommendKeyChangeCheckButton bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(recommendKeyChange)) options:nil];
   
@@ -332,6 +334,7 @@
   self.enforceKeyChangeIntervalStepper.increment = 1; // 1 day steps
   [self.enforceKeyChangeIntervalStepper bind:NSEnabledBinding toObject:self withKeyPath:NSStringFromSelector(@selector(enforceKeyChange)) options:nil];
   [self.enforceKeyChangeIntervalStepper bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(enforceKeyChangeInterval)) options:nil];
+  [self.enforceKeyChangeIntervalTextField bind:NSEnabledBinding toObject:self withKeyPath:NSStringFromSelector(@selector(enforceKeyChange)) options:nil];
   [self.enforceKeyChangeIntervalTextField bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(enforceKeyChangeInterval)) options:nil];
   ((MPDayCountFormatter *)self.enforceKeyChangeIntervalTextField.formatter).valueFormat = NSLocalizedString(@"every %ld days", @"");
   ((MPDayCountFormatter *)self.enforceKeyChangeIntervalTextField.formatter).zeroFormat = NSLocalizedString(@"after each unlock", @"");
@@ -342,6 +345,7 @@
   self.recommendKeyChangeIntervalStepper.increment = 1; // 1 day steps
   [self.recommendKeyChangeIntervalStepper bind:NSEnabledBinding toObject:self withKeyPath:NSStringFromSelector(@selector(recommendKeyChange)) options:nil];
   [self.recommendKeyChangeIntervalStepper bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(recommendKeyChangeInterval)) options:nil];
+  [self.recommendKeyChangeIntervalTextField bind:NSEnabledBinding toObject:self withKeyPath:NSStringFromSelector(@selector(recommendKeyChange)) options:nil];
   [self.recommendKeyChangeIntervalTextField bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(recommendKeyChangeInterval)) options:nil];
   ((MPDayCountFormatter *)self.recommendKeyChangeIntervalTextField.formatter).valueFormat = NSLocalizedString(@"every %ld days", @"");
   ((MPDayCountFormatter *)self.recommendKeyChangeIntervalTextField.formatter).zeroFormat = NSLocalizedString(@"after each unlock", @"");