diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 53782a8b..e2c864b8 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -166,7 +166,6 @@
 		4C67D33317981ABA00A7BDFC /* HNHTokenFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C67D33217981ABA00A7BDFC /* HNHTokenFieldCell.m */; };
 		4C68456A17BC21DD00FCDBFC /* KPKAutotype.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C68456917BC21DD00FCDBFC /* KPKAutotype.m */; };
 		4C68456D17BC227B00FCDBFC /* KPKWindowAssociation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C68456C17BC227B00FCDBFC /* KPKWindowAssociation.m */; };
-		4C68456F17BC2A0700FCDBFC /* WelcomeWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C68456E17BC2A0700FCDBFC /* WelcomeWindow.xib */; };
 		4C69A73A16D589DF00EC1B1A /* HNHGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C69A73916D589DF00EC1B1A /* HNHGradientView.m */; };
 		4C6AEEF91A043E2B00CA2420 /* MPDocumentController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6AEEF81A043E2B00CA2420 /* MPDocumentController.m */; };
 		4C6AEF031A04400E00CA2420 /* OpenPanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C6AEF021A04400E00CA2420 /* OpenPanelAccessoryView.xib */; };
@@ -203,6 +202,7 @@
 		4C7ABA4C17BAEC6700FF5799 /* 20_MiscTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4717BAEC6700FF5799 /* 20_MiscTemplate.pdf */; };
 		4C7ABA4E17BAEC7000FF5799 /* addEntryTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4D17BAEC7000FF5799 /* addEntryTemplate.pdf */; };
 		4C7BD07619FE94C900C7AA5C /* MacPassImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4C7BD07519FE94C900C7AA5C /* MacPassImages.xcassets */; };
+		4C7F8B681A10B68400CCB83D /* WelcomeWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C7F8B6A1A10B68400CCB83D /* WelcomeWindow.xib */; };
 		4C80BB6F176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */; };
 		4C811C8316ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */; };
 		4C83814215BF4677001AE468 /* MPDocumentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPDocumentWindowController.m */; };
@@ -674,7 +674,6 @@
 		4C68456917BC21DD00FCDBFC /* KPKAutotype.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKAutotype.m; sourceTree = "<group>"; };
 		4C68456B17BC227B00FCDBFC /* KPKWindowAssociation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKWindowAssociation.h; sourceTree = "<group>"; };
 		4C68456C17BC227B00FCDBFC /* KPKWindowAssociation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKWindowAssociation.m; sourceTree = "<group>"; };
-		4C68456E17BC2A0700FCDBFC /* WelcomeWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WelcomeWindow.xib; sourceTree = "<group>"; };
 		4C69A73816D589DF00EC1B1A /* HNHGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHGradientView.h; sourceTree = "<group>"; };
 		4C69A73916D589DF00EC1B1A /* HNHGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHGradientView.m; sourceTree = "<group>"; };
 		4C6AEEF71A043E2B00CA2420 /* MPDocumentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDocumentController.h; sourceTree = "<group>"; };
@@ -736,6 +735,12 @@
 		4C7ABA4717BAEC6700FF5799 /* 20_MiscTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 20_MiscTemplate.pdf; sourceTree = "<group>"; };
 		4C7ABA4D17BAEC7000FF5799 /* addEntryTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = addEntryTemplate.pdf; path = Icons/addEntryTemplate.pdf; sourceTree = "<group>"; };
 		4C7BD07519FE94C900C7AA5C /* MacPassImages.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = MacPassImages.xcassets; sourceTree = "<group>"; };
+		4C7F8B691A10B68400CCB83D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/WelcomeWindow.xib; sourceTree = "<group>"; };
+		4C7F8B741A10B69300CCB83D /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/WelcomeWindow.strings; sourceTree = "<group>"; };
+		4C7F8B761A10B69400CCB83D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/WelcomeWindow.strings"; sourceTree = "<group>"; };
+		4C7F8B781A10B69500CCB83D /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WelcomeWindow.strings; sourceTree = "<group>"; };
+		4C7F8B7A1A10B69700CCB83D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/WelcomeWindow.strings; sourceTree = "<group>"; };
+		4C7F8B7C1A10B69800CCB83D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/WelcomeWindow.strings; sourceTree = "<group>"; };
 		4C80BB6D176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHScrollDocumentViewAdapter.h; sourceTree = "<group>"; };
 		4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHScrollDocumentViewAdapter.m; sourceTree = "<group>"; };
 		4C811C8116ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPKeyfilePathControlDelegate.h; sourceTree = "<group>"; };
@@ -1999,7 +2004,7 @@
 				4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */,
 				6021FE9A18E1650F00C3BC51 /* DatabaseSettingsWindow.xib */,
 				6021FE8418E160BC00C3BC51 /* PasswordEditWindow.xib */,
-				4C68456E17BC2A0700FCDBFC /* WelcomeWindow.xib */,
+				4C7F8B6A1A10B68400CCB83D /* WelcomeWindow.xib */,
 				4C0DD6C518B2A44700FCB193 /* AutotypeCandidateSelectionWindow.xib */,
 				4CB915931A0159A20089CE5B /* DuplicateEntryOptionsWindow.xib */,
 			);
@@ -2258,7 +2263,7 @@
 				4C7ABA4C17BAEC6700FF5799 /* 20_MiscTemplate.pdf in Resources */,
 				4C7ABA4E17BAEC7000FF5799 /* addEntryTemplate.pdf in Resources */,
 				4C53A7A51864C39D000DFF0D /* KPKLocalizable.strings in Resources */,
-				4C68456F17BC2A0700FCDBFC /* WelcomeWindow.xib in Resources */,
+				4C7F8B681A10B68400CCB83D /* WelcomeWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2609,6 +2614,19 @@
 			name = MainMenu.xib;
 			sourceTree = "<group>";
 		};
+		4C7F8B6A1A10B68400CCB83D /* WelcomeWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				4C7F8B691A10B68400CCB83D /* Base */,
+				4C7F8B741A10B69300CCB83D /* nl */,
+				4C7F8B761A10B69400CCB83D /* zh-Hans */,
+				4C7F8B781A10B69500CCB83D /* fr */,
+				4C7F8B7A1A10B69700CCB83D /* de */,
+				4C7F8B7C1A10B69800CCB83D /* en */,
+			);
+			name = WelcomeWindow.xib;
+			sourceTree = "<group>";
+		};
 		4C888C8E16EB6C91003D34A1 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/MacPass/Base.lproj/PasswordEditWindow.xib b/MacPass/Base.lproj/PasswordEditWindow.xib
index 25290a29..d7ddd970 100644
--- a/MacPass/Base.lproj/PasswordEditWindow.xib
+++ b/MacPass/Base.lproj/PasswordEditWindow.xib
@@ -23,7 +23,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="335" height="212"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <view key="contentView" id="2">
                 <rect key="frame" x="0.0" y="0.0" width="335" height="212"/>
                 <autoresizingMask key="autoresizingMask"/>
diff --git a/MacPass/WelcomeWindow.xib b/MacPass/Base.lproj/WelcomeWindow.xib
similarity index 98%
rename from MacPass/WelcomeWindow.xib
rename to MacPass/Base.lproj/WelcomeWindow.xib
index 81f02ebc..ae6fd685 100644
--- a/MacPass/WelcomeWindow.xib
+++ b/MacPass/Base.lproj/WelcomeWindow.xib
@@ -15,7 +15,7 @@
         <window title="Welcome" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="448" height="255"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <view key="contentView" id="2">
                 <rect key="frame" x="0.0" y="0.0" width="448" height="255"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
diff --git a/MacPass/IconSelection.xib b/MacPass/IconSelection.xib
index c16fe6ea..f8f84a86 100644
--- a/MacPass/IconSelection.xib
+++ b/MacPass/IconSelection.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPIconSelectViewController">
@@ -12,14 +12,13 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="1">
             <rect key="frame" x="0.0" y="0.0" width="400" height="340"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="57" customClass="HNHScrollView">
                     <rect key="frame" x="10" y="50" width="380" height="280"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="Gwf-zs-lPT">
                         <rect key="frame" x="0.0" y="0.0" width="380" height="280"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -46,7 +45,6 @@
                 </scrollView>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="101">
                     <rect key="frame" x="263" y="18" width="117" height="25"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="roundTextured" title="Use Default Icon" bezelStyle="texturedRounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="102">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -57,7 +55,6 @@
                 </button>
                 <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="His-4A-hcY">
                     <rect key="frame" x="199" y="18" width="56" height="25"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="roundTextured" title="Cancel" bezelStyle="texturedRounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="1kM-cI-P1o">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -87,7 +84,6 @@
             <subviews>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="114">
                     <rect key="frame" x="4" y="4" width="32" height="32"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="32" id="161"/>
                         <constraint firstAttribute="height" constant="32" id="162"/>
@@ -111,4 +107,4 @@
     <resources>
         <image name="NSAddTemplate" width="8" height="8"/>
     </resources>
-</document>
\ No newline at end of file
+</document>
diff --git a/MacPass/de.lproj/WelcomeWindow.strings b/MacPass/de.lproj/WelcomeWindow.strings
new file mode 100644
index 00000000..8d1c068f
--- /dev/null
+++ b/MacPass/de.lproj/WelcomeWindow.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSWindow"; title = "Welcome"; ObjectID = "1"; */
+"1.title" = "Willkommen";
+
+/* Class = "NSTextFieldCell"; title = "Welcome to MacPass"; ObjectID = "24"; */
+"24.title" = "Willkommen zu MacPass";
+
+/* Class = "NSButtonCell"; title = "Open Database…"; ObjectID = "44"; */
+"44.title" = "Datenbank öffnen…";
+
+/* Class = "NSButtonCell"; title = "Create new Database"; ObjectID = "48"; */
+"48.title" = "Neue Datenbank erstellen";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "70"; */
+"70.title" = "Abbrechen";
diff --git a/MacPass/en.lproj/WelcomeWindow.strings b/MacPass/en.lproj/WelcomeWindow.strings
new file mode 100644
index 00000000..ab104467
--- /dev/null
+++ b/MacPass/en.lproj/WelcomeWindow.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSWindow"; title = "Welcome"; ObjectID = "1"; */
+"1.title" = "Welcome";
+
+/* Class = "NSTextFieldCell"; title = "Welcome to MacPass"; ObjectID = "24"; */
+"24.title" = "Welcome to MacPass";
+
+/* Class = "NSButtonCell"; title = "Open Database…"; ObjectID = "44"; */
+"44.title" = "Open Database…";
+
+/* Class = "NSButtonCell"; title = "Create new Database"; ObjectID = "48"; */
+"48.title" = "Create new Database";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "70"; */
+"70.title" = "Cancel";
diff --git a/MacPass/fr.lproj/WelcomeWindow.strings b/MacPass/fr.lproj/WelcomeWindow.strings
new file mode 100644
index 00000000..ab104467
--- /dev/null
+++ b/MacPass/fr.lproj/WelcomeWindow.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSWindow"; title = "Welcome"; ObjectID = "1"; */
+"1.title" = "Welcome";
+
+/* Class = "NSTextFieldCell"; title = "Welcome to MacPass"; ObjectID = "24"; */
+"24.title" = "Welcome to MacPass";
+
+/* Class = "NSButtonCell"; title = "Open Database…"; ObjectID = "44"; */
+"44.title" = "Open Database…";
+
+/* Class = "NSButtonCell"; title = "Create new Database"; ObjectID = "48"; */
+"48.title" = "Create new Database";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "70"; */
+"70.title" = "Cancel";
diff --git a/MacPass/nl.lproj/WelcomeWindow.strings b/MacPass/nl.lproj/WelcomeWindow.strings
new file mode 100644
index 00000000..b392b866
--- /dev/null
+++ b/MacPass/nl.lproj/WelcomeWindow.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSWindow"; title = "Welcome"; ObjectID = "1"; */
+"1.title" = "Welcome";
+
+/* Class = "NSTextFieldCell"; title = "Welcome to MacPass"; ObjectID = "24"; */
+"24.title" = "Welcome to MacPass";
+
+/* Class = "NSButtonCell"; title = "Open Database…"; ObjectID = "44"; */
+"44.title" = "Open Database…";
+
+/* Class = "NSButtonCell"; title = "Create new Database"; ObjectID = "48"; */
+"48.title" = "Create new Database";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "70"; */
+"70.title" = "Annuleer";
diff --git a/MacPass/zh-Hans.lproj/WelcomeWindow.strings b/MacPass/zh-Hans.lproj/WelcomeWindow.strings
new file mode 100644
index 00000000..ab104467
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/WelcomeWindow.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSWindow"; title = "Welcome"; ObjectID = "1"; */
+"1.title" = "Welcome";
+
+/* Class = "NSTextFieldCell"; title = "Welcome to MacPass"; ObjectID = "24"; */
+"24.title" = "Welcome to MacPass";
+
+/* Class = "NSButtonCell"; title = "Open Database…"; ObjectID = "44"; */
+"44.title" = "Open Database…";
+
+/* Class = "NSButtonCell"; title = "Create new Database"; ObjectID = "48"; */
+"48.title" = "Create new Database";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "70"; */
+"70.title" = "Cancel";