diff --git a/DuckDuckGo/SecureVault/View/PasswordManagementItemList.swift b/DuckDuckGo/SecureVault/View/PasswordManagementItemList.swift
index c717288450..6c91e23fc9 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManagementItemList.swift
+++ b/DuckDuckGo/SecureVault/View/PasswordManagementItemList.swift
@@ -123,8 +123,6 @@ struct PasswordManagementItemListCategoryView: View {
                     return 11
                 }
 
-            Spacer()
-
             // MenuButton incorrectly displays a disabled state when you re-render it with a different image.
             // According to Stack Overflow, this was fixed in macOS 12, but it can still be reproduced on 12.2.
             // This also happens with Menu in macOS 11.0+, so using that on later macOS versions doesn't help.
@@ -135,8 +133,10 @@ struct PasswordManagementItemListCategoryView: View {
 
             if model.sortDescriptor.order == .ascending {
                 PasswordManagementSortButton(imageName: "SortAscending")
+                    .frame(width: 24)
             } else {
                 PasswordManagementSortButton(imageName: "SortDescending")
+                    .frame(width: 24)
             }
         }
         .padding(.vertical, -4)
diff --git a/DuckDuckGo/SecureVault/View/PasswordManager.storyboard b/DuckDuckGo/SecureVault/View/PasswordManager.storyboard
index 9435721706..efa488a53a 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManager.storyboard
+++ b/DuckDuckGo/SecureVault/View/PasswordManager.storyboard
@@ -11,21 +11,21 @@
             <objects>
                 <viewController storyboardIdentifier="PasswordManagement" id="6K1-XT-kOf" customClass="PasswordManagementViewController" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" translatesAutoresizingMaskIntoConstraints="NO" id="1D3-i8-ndc">
-                        <rect key="frame" x="0.0" y="0.0" width="527" height="510"/>
+                        <rect key="frame" x="0.0" y="0.0" width="603" height="510"/>
                         <subviews>
                             <box boxType="custom" borderType="none" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="0qE-kH-06x">
-                                <rect key="frame" x="0.0" y="0.0" width="527" height="510"/>
+                                <rect key="frame" x="0.0" y="0.0" width="603" height="510"/>
                                 <view key="contentView" id="qzl-PA-QmD">
-                                    <rect key="frame" x="0.0" y="0.0" width="527" height="510"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="603" height="510"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 </view>
                                 <color key="fillColor" name="PopoverBackgroundColor"/>
                             </box>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="zcF-kd-rwa">
-                                <rect key="frame" x="0.0" y="0.0" width="527" height="510"/>
+                                <rect key="frame" x="2" y="0.0" width="600" height="510"/>
                                 <subviews>
                                     <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="8Rh-Te-6jZ">
-                                        <rect key="frame" x="0.0" y="464" width="527" height="5"/>
+                                        <rect key="frame" x="0.0" y="464" width="600" height="5"/>
                                     </box>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rbb-3S-qEY">
                                         <rect key="frame" x="18" y="478" width="57" height="20"/>
@@ -36,15 +36,15 @@
                                         </textFieldCell>
                                     </textField>
                                     <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k41-d9-6cf">
-                                        <rect key="frame" x="0.0" y="0.0" width="184" height="467"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="250" height="467"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     </customView>
                                     <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Sv2-By-wVg">
-                                        <rect key="frame" x="185" y="0.0" width="342" height="466"/>
+                                        <rect key="frame" x="249" y="0.0" width="351" height="466"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     </customView>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="hjZ-Ei-q1x">
-                                        <rect key="frame" x="185" y="3" width="342" height="464"/>
+                                        <rect key="frame" x="258" y="3" width="342" height="464"/>
                                         <subviews>
                                             <stackView distribution="fill" orientation="vertical" alignment="centerX" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hIq-WK-XFd">
                                                 <rect key="frame" x="75" y="139" width="192" height="226"/>
@@ -112,7 +112,7 @@
                                         </constraints>
                                     </customView>
                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="Z1F-D2-M9A" userLabel="Add Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                        <rect key="frame" x="285" y="474" width="28" height="28"/>
+                                        <rect key="frame" x="358" y="474" width="28" height="28"/>
                                         <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="Add" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="aBc-CG-rrF">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -138,7 +138,7 @@
                                         </connections>
                                     </button>
                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="zlt-eX-SI5" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                        <rect key="frame" x="489" y="474" width="28" height="28"/>
+                                        <rect key="frame" x="562" y="474" width="28" height="28"/>
                                         <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="Settings" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="KQT-Gh-t0V">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -165,7 +165,7 @@
                                         </connections>
                                     </button>
                                     <searchField wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8tS-Kw-TcR">
-                                        <rect key="frame" x="323" y="477" width="156" height="22"/>
+                                        <rect key="frame" x="396" y="477" width="156" height="22"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="156" id="TId-HM-R1Y"/>
                                         </constraints>
@@ -179,20 +179,20 @@
                                         </connections>
                                     </searchField>
                                     <box horizontalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="xmo-kN-6c4">
-                                        <rect key="frame" x="182" y="0.0" width="5" height="466"/>
+                                        <rect key="frame" x="246" y="0.0" width="5" height="466"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     </box>
                                     <box boxType="custom" borderType="none" cornerRadius="4" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="HUM-wf-aMl" userLabel="Lock Screen Container">
-                                        <rect key="frame" x="0.0" y="0.0" width="527" height="466"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="600" height="466"/>
                                         <view key="contentView" id="aQd-Xs-kVe">
-                                            <rect key="frame" x="0.0" y="0.0" width="527" height="466"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="466"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="IHQ-mw-f2J" userLabel="Background View" customClass="ColorView" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                    <rect key="frame" x="0.0" y="0.0" width="527" height="466"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="600" height="466"/>
                                                     <subviews>
                                                         <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KWl-6k-kDV">
-                                                            <rect key="frame" x="179" y="190" width="170" height="136"/>
+                                                            <rect key="frame" x="215" y="190" width="170" height="136"/>
                                                             <subviews>
                                                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="8Df-Ju-wXW">
                                                                     <rect key="frame" x="21" y="40" width="128" height="96"/>
@@ -238,7 +238,7 @@
                                                             </customSpacing>
                                                         </stackView>
                                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D5g-I2-CGd">
-                                                            <rect key="frame" x="18" y="38" width="491" height="16"/>
+                                                            <rect key="frame" x="18" y="38" width="564" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title=" Your Autofill info will remain unlocked until your computer is idle for 5 minutes." id="eT1-Pa-83x">
                                                                 <font key="font" usesAppearanceFont="YES"/>
                                                                 <color key="textColor" name="BlackWhite60"/>
@@ -246,18 +246,18 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <scrollView verticalHuggingPriority="1000" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" verticalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="Gpk-3w-dTw">
-                                                            <rect key="frame" x="20" y="20" width="487" height="16"/>
+                                                            <rect key="frame" x="20" y="20" width="560" height="16"/>
                                                             <clipView key="contentView" drawsBackground="NO" id="hfn-x2-TEg">
-                                                                <rect key="frame" x="0.0" y="0.0" width="487" height="16"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="560" height="16"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                 <subviews>
                                                                     <textView editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="NO" spellingCorrection="YES" smartInsertDelete="YES" id="y9t-iB-hZZ">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="487" height="16"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="560" height="16"/>
                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                         <color key="textColor" name="BlackWhite60"/>
                                                                         <color key="backgroundColor" name="ClearColor"/>
-                                                                        <size key="minSize" width="487" height="16"/>
-                                                                        <size key="maxSize" width="487" height="131"/>
+                                                                        <size key="minSize" width="560" height="16"/>
+                                                                        <size key="maxSize" width="560" height="131"/>
                                                                         <attributedString key="textStorage">
                                                                             <fragment content="Change in Preferences">
                                                                                 <attributes>
@@ -324,7 +324,7 @@
                                     <constraint firstItem="zlt-eX-SI5" firstAttribute="centerY" secondItem="Z1F-D2-M9A" secondAttribute="centerY" id="Q4e-h4-7kh"/>
                                     <constraint firstItem="8Rh-Te-6jZ" firstAttribute="top" secondItem="zcF-kd-rwa" secondAttribute="top" constant="43.5" id="QwC-Bo-3Gb"/>
                                     <constraint firstItem="8Rh-Te-6jZ" firstAttribute="width" secondItem="zcF-kd-rwa" secondAttribute="width" id="TJV-6P-a8l"/>
-                                    <constraint firstAttribute="width" constant="527" id="eZd-Sh-dfY"/>
+                                    <constraint firstAttribute="width" constant="600" id="eZd-Sh-dfY"/>
                                     <constraint firstItem="8Rh-Te-6jZ" firstAttribute="centerX" secondItem="zcF-kd-rwa" secondAttribute="centerX" id="fSz-Ju-8zk"/>
                                     <constraint firstAttribute="height" constant="510" id="h2V-J5-s7O"/>
                                     <constraint firstItem="Rbb-3S-qEY" firstAttribute="centerY" secondItem="Z1F-D2-M9A" secondAttribute="centerY" id="iEo-TT-Aek"/>
@@ -402,7 +402,7 @@
                     </connections>
                 </menu>
             </objects>
-            <point key="canvasLocation" x="-1134.5" y="155"/>
+            <point key="canvasLocation" x="-1172.5" y="155"/>
         </scene>
         <!--Save Credentials View Controller-->
         <scene sceneID="wXf-99-dfm">
@@ -422,8 +422,8 @@
                                 <color key="fillColor" name="PopoverBackgroundColor"/>
                             </box>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JGJ-to-6ws" userLabel="Title Label">
-                                <rect key="frame" x="14" y="271" width="88" height="19"/>
-                                <textFieldCell key="cell" lineBreakMode="clipping" title="Save Login?" id="8Fd-VW-A1G">
+                                <rect key="frame" x="14" y="271" width="312" height="19"/>
+                                <textFieldCell key="cell" title="Save Login?" id="8Fd-VW-A1G">
                                     <font key="font" metaFont="systemMedium" size="15"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -482,8 +482,8 @@
                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="BitwardenLogoSmall" id="3Os-pa-TYg"/>
                                     </imageView>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Yhz-y2-Vss" userLabel="Title Label">
-                                        <rect key="frame" x="50" y="13" width="184" height="19"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Unlock Bitwarden to Save" id="ejl-jN-aFF">
+                                        <rect key="frame" x="50" y="13" width="272" height="19"/>
+                                        <textFieldCell key="cell" lineBreakMode="charWrapping" title="Unlock Bitwarden to Save" id="ejl-jN-aFF">
                                             <font key="font" metaFont="systemMedium" size="15"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -491,6 +491,8 @@
                                     </textField>
                                 </subviews>
                                 <constraints>
+                                    <constraint firstItem="Yhz-y2-Vss" firstAttribute="leading" secondItem="OEf-hT-7kz" secondAttribute="trailing" constant="8" symbolic="YES" id="Goi-gd-MSd"/>
+                                    <constraint firstAttribute="trailing" secondItem="Yhz-y2-Vss" secondAttribute="trailing" constant="20" symbolic="YES" id="H86-ln-ckr"/>
                                     <constraint firstItem="OEf-hT-7kz" firstAttribute="centerY" secondItem="kVM-zS-wtC" secondAttribute="centerY" id="HVB-S7-lk4"/>
                                     <constraint firstItem="Yhz-y2-Vss" firstAttribute="leading" secondItem="OEf-hT-7kz" secondAttribute="trailing" constant="8" symbolic="YES" id="U37-4U-Uax"/>
                                     <constraint firstItem="Yhz-y2-Vss" firstAttribute="centerY" secondItem="kVM-zS-wtC" secondAttribute="centerY" id="nOL-pa-k6U"/>
@@ -607,7 +609,7 @@
                                 <rect key="frame" x="0.0" y="42" width="340" height="5"/>
                             </box>
                             <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eiY-Kq-70Z">
-                                <rect key="frame" x="233" y="5" width="94" height="32"/>
+                                <rect key="frame" x="263" y="5" width="64" height="32"/>
                                 <buttonCell key="cell" type="push" title="Save" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="GrT-0l-ZWK">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -615,19 +617,16 @@
 DQ
 </string>
                                 </buttonCell>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="80" id="OuV-Ln-eyL"/>
-                                </constraints>
                                 <connections>
                                     <action selector="onSaveClickedWithSender:" target="fGn-92-O2G" id="oyY-wd-Jsd"/>
                                 </connections>
                             </button>
-                            <segmentedControl hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7ot-Jg-LOR">
-                                <rect key="frame" x="128" y="10" width="107" height="24"/>
+                            <segmentedControl hidden="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="7ot-Jg-LOR">
+                                <rect key="frame" x="158" y="10" width="107" height="24"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="101" id="MlH-vi-bhe"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="101" id="MlH-vi-bhe"/>
                                 </constraints>
-                                <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="4a4-It-pz8">
+                                <segmentedCell key="cell" borderStyle="border" alignment="left" segmentDistribution="fillProportionally" style="rounded" trackingMode="momentary" id="4a4-It-pz8">
                                     <font key="font" metaFont="system"/>
                                     <segments>
                                         <segment label="Don't Save" width="80"/>
@@ -639,7 +638,7 @@ DQ
                                 </connections>
                             </segmentedControl>
                             <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DIw-JQ-5Ie">
-                                <rect key="frame" x="233" y="5" width="94" height="32"/>
+                                <rect key="frame" x="248" y="5" width="79" height="32"/>
                                 <buttonCell key="cell" type="push" title="Update" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="vpe-dC-QU8">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -649,7 +648,6 @@ DQ
                                 </buttonCell>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="VPj-fC-hxT"/>
-                                    <constraint firstAttribute="width" constant="80" id="xFN-oU-dU4"/>
                                 </constraints>
                                 <connections>
                                     <action selector="onSaveClickedWithSender:" target="fGn-92-O2G" id="08i-f0-5T8"/>
@@ -665,7 +663,6 @@ DQ
 </string>
                                 </buttonCell>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="117" id="DXo-MZ-t1f"/>
                                     <constraint firstAttribute="height" constant="20" id="MpD-wH-oAf"/>
                                 </constraints>
                                 <connections>
@@ -673,7 +670,7 @@ DQ
                                 </connections>
                             </button>
                             <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wIW-tZ-7h0">
-                                <rect key="frame" x="120" y="5" width="115" height="32"/>
+                                <rect key="frame" x="135" y="5" width="115" height="32"/>
                                 <buttonCell key="cell" type="push" title="Don't Update" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rnd-a2-F2F">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -721,7 +718,7 @@ DQ
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="80" id="i5w-ma-q4V"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="i5w-ma-q4V"/>
                                 </constraints>
                                 <connections>
                                     <action selector="onNotNowClickedWithSender:" target="fGn-92-O2G" id="4r8-gx-5J2"/>
@@ -737,6 +734,7 @@ DQ
                             <constraint firstAttribute="bottom" secondItem="5fV-VD-sxc" secondAttribute="bottom" constant="12" id="5UI-pN-iYJ"/>
                             <constraint firstItem="ibe-8n-iFx" firstAttribute="top" secondItem="wxi-3R-xRg" secondAttribute="bottom" constant="8" symbolic="YES" id="7O4-dM-2Ac"/>
                             <constraint firstItem="IW5-vR-XCv" firstAttribute="top" secondItem="B3X-Kr-GS1" secondAttribute="top" id="7Of-31-0hk"/>
+                            <constraint firstAttribute="trailing" secondItem="JGJ-to-6ws" secondAttribute="trailing" constant="16" id="7nW-9N-z6n"/>
                             <constraint firstItem="DIw-JQ-5Ie" firstAttribute="top" secondItem="yiH-18-x9b" secondAttribute="bottom" constant="12" id="93p-qA-fQq"/>
                             <constraint firstItem="wxi-3R-xRg" firstAttribute="top" secondItem="HEP-bz-HhW" secondAttribute="bottom" constant="15" id="9p4-EC-q0o"/>
                             <constraint firstAttribute="bottom" secondItem="DIw-JQ-5Ie" secondAttribute="bottom" constant="12" id="B6Y-eC-ZLy"/>
@@ -826,7 +824,7 @@ DQ
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OHW-Gu-BCa">
-                                <rect key="frame" x="14" y="142" width="108" height="19"/>
+                                <rect key="frame" x="14" y="142" width="284" height="19"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Save Address?" id="xWe-8F-g7D">
                                     <font key="font" metaFont="systemMedium" size="15"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -908,6 +906,7 @@ DQ
                             <constraint firstItem="0ck-vZ-Zvs" firstAttribute="leading" secondItem="b4t-QK-2lD" secondAttribute="leading" constant="16" id="2Nd-Oc-pQM"/>
                             <constraint firstItem="bh2-5e-fbe" firstAttribute="leading" secondItem="0ck-vZ-Zvs" secondAttribute="trailing" constant="16" id="3aM-FG-g7C"/>
                             <constraint firstItem="dep-LE-rxg" firstAttribute="centerY" secondItem="OHW-Gu-BCa" secondAttribute="centerY" id="8ak-4w-EfO"/>
+                            <constraint firstItem="dep-LE-rxg" firstAttribute="leading" secondItem="OHW-Gu-BCa" secondAttribute="trailing" constant="8" symbolic="YES" id="Ept-wq-DhE"/>
                             <constraint firstItem="AhU-y6-peF" firstAttribute="leading" secondItem="PUd-Oq-V8t" secondAttribute="trailing" constant="8" id="FsO-je-hjd"/>
                             <constraint firstAttribute="bottom" secondItem="AhU-y6-peF" secondAttribute="bottom" constant="12" id="IRg-ia-zXv"/>
                             <constraint firstAttribute="trailing" secondItem="SCQ-X6-vcJ" secondAttribute="trailing" id="LZk-wR-IXE"/>
@@ -935,7 +934,7 @@ DQ
                 </viewController>
                 <customObject id="NxN-y3-DhI" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="63" y="462"/>
+            <point key="canvasLocation" x="63" y="461.5"/>
         </scene>
         <!--Save Payment Method View Controller-->
         <scene sceneID="W4A-81-fU0">
@@ -946,8 +945,11 @@ DQ
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Eqg-CC-0GJ">
-                                <rect key="frame" x="14" y="122" width="169" height="19"/>
-                                <textFieldCell key="cell" lineBreakMode="clipping" title="Save Payment Method?" id="Y0v-Ue-n0b">
+                                <rect key="frame" x="14" y="122" width="284" height="19"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="280" id="za5-LG-v7l"/>
+                                </constraints>
+                                <textFieldCell key="cell" title="Save Payment Method?" id="Y0v-Ue-n0b">
                                     <font key="font" metaFont="systemMedium" size="15"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1056,7 +1058,7 @@ DQ
                 </viewController>
                 <customObject id="YCw-TR-eCR" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="63" y="690"/>
+            <point key="canvasLocation" x="63" y="689.5"/>
         </scene>
     </scenes>
     <resources>
diff --git a/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift b/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift
index 2f6fbd8601..91f2aea8c6 100644
--- a/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift
+++ b/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift
@@ -108,6 +108,10 @@ final class SaveCredentialsViewController: NSViewController {
         fireproofCheckDescription.title = UserText.passwordManagementSaveCredentialsFireproofCheckboxDescription
         saveButton.title = UserText.save
         notNowSegmentedControl.setLabel(UserText.dontSave, forSegment: 0)
+        let fontAttributes = [NSAttributedString.Key.font: NSFont.systemFont(ofSize: NSFont.systemFontSize)]
+          let titleSize = (UserText.dontSave as NSString).size(withAttributes: fontAttributes)
+        notNowSegmentedControl.setWidth(titleSize.width + 16, forSegment: 0)
+        notNowSegmentedControl.setLabel(UserText.dontSave, forSegment: 0)
         updateButton.title = UserText.update
         openPasswordManagerButton.title = UserText.bitwardenPreferencesOpenBitwarden
         dontUpdateButton.title = UserText.dontUpdate
@@ -170,6 +174,21 @@ final class SaveCredentialsViewController: NSViewController {
             titleLabel.stringValue = UserText.pmSaveCredentialsNonEditableTitle
             view.window?.makeFirstResponder(nil)
         }
+        let notNowTrailingToOpenPasswordConstraint = passwordManagerNotNowButton.trailingAnchor.constraint(equalTo: openPasswordManagerButton.leadingAnchor, constant: -12)
+        let notNowTrailingToSaveButtonConstraint = passwordManagerNotNowButton.trailingAnchor.constraint(equalTo: saveButton.leadingAnchor, constant: -12)
+        let dontUpdateRrailingToOpenPasswordConstraint = dontUpdateButton.trailingAnchor.constraint(equalTo: openPasswordManagerButton.leadingAnchor, constant: -12)
+        let dontUpdateTrailingToUpdateButtonConstraint = dontUpdateButton.trailingAnchor.constraint(equalTo: updateButton.leadingAnchor, constant: -12)
+        if openPasswordManagerButton.isHidden {
+            notNowTrailingToOpenPasswordConstraint.isActive = false
+            dontUpdateRrailingToOpenPasswordConstraint.isActive = false
+            notNowTrailingToSaveButtonConstraint.isActive = true
+            dontUpdateTrailingToUpdateButtonConstraint.isActive = true
+        } else {
+            notNowTrailingToSaveButtonConstraint.isActive = false
+            dontUpdateTrailingToUpdateButtonConstraint.isActive = false
+            notNowTrailingToOpenPasswordConstraint.isActive = true
+            dontUpdateRrailingToOpenPasswordConstraint.isActive = true
+        }
     }
 
     private func updateSaveSegmentedControl() {