diff --git a/MasterPassword/ObjC/iOS/MPUnlockViewController.m b/MasterPassword/ObjC/iOS/MPUnlockViewController.m
index 4c50c146..33f65894 100644
--- a/MasterPassword/ObjC/iOS/MPUnlockViewController.m
+++ b/MasterPassword/ObjC/iOS/MPUnlockViewController.m
@@ -982,7 +982,7 @@
     self.emergencyName.text = @"";
     self.emergencyMasterPassword.text = @"";
     self.emergencySite.text = @"";
-    self.emergencyCounterStepper.value = 0;
+    self.emergencyCounterStepper.value = 1;
     [self.emergencyPassword setTitle:@"" forState:UIControlStateNormal];
     [self.emergencyActivity stopAnimating];
     self.emergencyGeneratorContainer.alpha = 0;
diff --git a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
index 013fe907..5d24c05f 100644
--- a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
@@ -1039,6 +1039,7 @@ L4m3P4sSw0rD</string>
                         </subviews>
                         <color key="backgroundColor" red="0.14901960784313725" green="0.16470588235294117" blue="0.1803921568627451" alpha="1" colorSpace="calibratedRGB"/>
                     </view>
+                    <extendedEdge key="edgesForExtendedLayout"/>
                     <navigationItem key="navigationItem" id="hB9-S6-KHC">
                         <barButtonItem key="backBarButtonItem" title="Site" id="MOV-d1-f0k"/>
                         <barButtonItem key="rightBarButtonItem" systemItem="action" id="8Y7-Bf-FHa">
@@ -1624,7 +1625,7 @@ You can use the words in the background for inspiration in finding a memorable m
                                                 <rect key="frame" x="187" y="260" width="94" height="29"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                             </stepper>
-                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="TJC-xD-fjQ">
+                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="TJC-xD-fjQ">
                                                 <rect key="frame" x="79" y="263" width="100" height="21"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -1843,7 +1844,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo
         <!--Element List All View Controller-->
         <scene sceneID="I7c-vt-d2s">
             <objects>
-                <tableViewController id="idA-Pj-1U9" customClass="MPElementListAllViewController" sceneMemberID="viewController">
+                <tableViewController automaticallyAdjustsScrollViewInsets="NO" id="idA-Pj-1U9" customClass="MPElementListAllViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="48" sectionHeaderHeight="22" sectionFooterHeight="22" id="N83-sj-4tl">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1875,6 +1876,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo
                             <outlet property="delegate" destination="idA-Pj-1U9" id="bdk-Iu-Hpv"/>
                         </connections>
                     </tableView>
+                    <extendedEdge key="edgesForExtendedLayout"/>
                     <connections>
                         <outlet property="navigationBar" destination="l0p-Tu-L9k" id="9DR-L3-ggI"/>
                     </connections>
@@ -2949,7 +2951,7 @@ However, it means that anyone who finds your device unlocked can do the same.</s
     <inferredMetricsTieBreakers>
         <segue reference="swi-5o-hfK"/>
         <segue reference="hxY-aA-ngI"/>
+        <segue reference="9Bs-cD-ddF"/>
         <segue reference="rWT-Kr-cAs"/>
-        <segue reference="KIl-ZW-M7G"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file
diff --git a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist
index 2d50ca59..b459a0d7 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist
+++ b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist
@@ -30,22 +30,9 @@
 	<key>CFBundleIconFile</key>
 	<string>Icon</string>
 	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>Icon</string>
-				<string>Icon-72</string>
-				<string>Icon-Small</string>
-				<string>Icon-Small-50</string>
-				<string>Icon.png</string>
-				<string>Icon@2x.png</string>
-			</array>
-			<key>UIPrerenderedIcon</key>
-			<true/>
-		</dict>
-	</dict>
+	<dict/>
+	<key>CFBundleIcons~ipad</key>
+	<dict/>
 	<key>CFBundleIdentifier</key>
 	<string>com.lyndir.lhunath.MasterPassword</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
index 96837218..8c84e868 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -59,14 +59,6 @@
 		DA5E5C7517248959003798D8 /* sysendian.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6C17248959003798D8 /* sysendian.h */; };
 		DA5E5C7617248959003798D8 /* warn.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C6D17248959003798D8 /* warn.h */; };
 		DA5E5C78172489FA003798D8 /* libscryptenc-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5E5C77172489FA003798D8 /* libscryptenc-ios.a */; };
-		DA5E5D4C1724F616003798D8 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5D441724F616003798D8 /* Icon-72.png */; };
-		DA5E5D4D1724F616003798D8 /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5D451724F616003798D8 /* Icon-72@2x.png */; };
-		DA5E5D4E1724F616003798D8 /* Icon-Small-50.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5D461724F616003798D8 /* Icon-Small-50.png */; };
-		DA5E5D4F1724F616003798D8 /* Icon-Small-50@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5D471724F616003798D8 /* Icon-Small-50@2x.png */; };
-		DA5E5D501724F616003798D8 /* Icon-Small.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5D481724F616003798D8 /* Icon-Small.png */; };
-		DA5E5D511724F616003798D8 /* Icon-Small@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5D491724F616003798D8 /* Icon-Small@2x.png */; };
-		DA5E5D521724F616003798D8 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5D4A1724F616003798D8 /* Icon.png */; };
-		DA5E5D531724F616003798D8 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5D4B1724F616003798D8 /* Icon@2x.png */; };
 		DA6701B816406A4100B61001 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA6701B716406A4100B61001 /* Accounts.framework */; settings = {ATTRIBUTES = (Required, ); }; };
 		DA6701DE16406B7300B61001 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA6701DD16406B7300B61001 /* Social.framework */; settings = {ATTRIBUTES = (Required, ); }; };
 		DA6701E016406BB400B61001 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA6701DF16406BB400B61001 /* AdSupport.framework */; settings = {ATTRIBUTES = (Required, ); }; };
@@ -76,6 +68,7 @@
 		DA69540717D975D900BF294E /* icon_gears@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37851711E29500CF925C /* icon_gears@2x.png */; };
 		DA829E52159847E0002417D3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DA829E6215984832002417D3 /* libFontReplacer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA829E51159847E0002417D3 /* libFontReplacer.a */; };
+		DA945C8717E3F3FD0053236B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA945C8617E3F3FD0053236B /* Images.xcassets */; };
 		DA95D5F214DF0B2C008D1B94 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA95D5F014DF0B1E008D1B94 /* MessageUI.framework */; };
 		DABB981615100B4000B05417 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DABB981515100B4000B05417 /* SystemConfiguration.framework */; };
 		DABD38DB1711E29700CF925C /* ui_background.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD360F1711E29400CF925C /* ui_background.png */; };
@@ -144,10 +137,6 @@
 		DABD395C1711E29700CF925C /* avatar-9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36911711E29400CF925C /* avatar-9@2x.png */; };
 		DABD395D1711E29700CF925C /* background.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36931711E29400CF925C /* background.png */; };
 		DABD395E1711E29700CF925C /* background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36941711E29400CF925C /* background@2x.png */; };
-		DABD395F1711E29700CF925C /* Default-568h.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36951711E29400CF925C /* Default-568h.png */; };
-		DABD39601711E29700CF925C /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36961711E29400CF925C /* Default-568h@2x.png */; };
-		DABD39611711E29700CF925C /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36971711E29400CF925C /* Default.png */; };
-		DABD39621711E29700CF925C /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36981711E29400CF925C /* Default@2x.png */; };
 		DABD39841711E29700CF925C /* Exo-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DABD36BC1711E29500CF925C /* Exo-Bold.otf */; };
 		DABD39851711E29700CF925C /* Exo-ExtraBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DABD36BD1711E29500CF925C /* Exo-ExtraBold.otf */; };
 		DABD39861711E29700CF925C /* Exo-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = DABD36BE1711E29500CF925C /* Exo-Regular.otf */; };
@@ -437,19 +426,12 @@
 		DA5E5C6C17248959003798D8 /* sysendian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysendian.h; sourceTree = "<group>"; };
 		DA5E5C6D17248959003798D8 /* warn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = warn.h; sourceTree = "<group>"; };
 		DA5E5C77172489FA003798D8 /* libscryptenc-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libscryptenc-ios.a"; path = "/Users/.z/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib/libscryptenc-ios.a"; sourceTree = "<absolute>"; };
-		DA5E5D441724F616003798D8 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
-		DA5E5D451724F616003798D8 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = "<group>"; };
-		DA5E5D461724F616003798D8 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small-50.png"; sourceTree = "<group>"; };
-		DA5E5D471724F616003798D8 /* Icon-Small-50@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small-50@2x.png"; sourceTree = "<group>"; };
-		DA5E5D481724F616003798D8 /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small.png"; sourceTree = "<group>"; };
-		DA5E5D491724F616003798D8 /* Icon-Small@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small@2x.png"; sourceTree = "<group>"; };
-		DA5E5D4A1724F616003798D8 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
-		DA5E5D4B1724F616003798D8 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
 		DA6701B716406A4100B61001 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
 		DA6701DD16406B7300B61001 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		DA6701DF16406BB400B61001 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
 		DA672D2E14F92C6B004A189C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		DA829E51159847E0002417D3 /* libFontReplacer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFontReplacer.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		DA945C8617E3F3FD0053236B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		DA95D5F014DF0B1E008D1B94 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		DAAC35DD156BD77D00C5FD93 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
 		DABB981515100B4000B05417 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
@@ -585,10 +567,6 @@
 		DABD36911711E29400CF925C /* avatar-9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-9@2x.png"; sourceTree = "<group>"; };
 		DABD36931711E29400CF925C /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = "<group>"; };
 		DABD36941711E29400CF925C /* background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "background@2x.png"; sourceTree = "<group>"; };
-		DABD36951711E29400CF925C /* Default-568h.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h.png"; sourceTree = "<group>"; };
-		DABD36961711E29400CF925C /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
-		DABD36971711E29400CF925C /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
-		DABD36981711E29400CF925C /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
 		DABD36BC1711E29500CF925C /* Exo-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Exo-Bold.otf"; sourceTree = "<group>"; };
 		DABD36BD1711E29500CF925C /* Exo-ExtraBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Exo-ExtraBold.otf"; sourceTree = "<group>"; };
 		DABD36BE1711E29500CF925C /* Exo-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Exo-Regular.otf"; sourceTree = "<group>"; };
@@ -1507,14 +1485,7 @@
 		DABD360D1711E29400CF925C /* Media */ = {
 			isa = PBXGroup;
 			children = (
-				DA5E5D441724F616003798D8 /* Icon-72.png */,
-				DA5E5D451724F616003798D8 /* Icon-72@2x.png */,
-				DA5E5D461724F616003798D8 /* Icon-Small-50.png */,
-				DA5E5D471724F616003798D8 /* Icon-Small-50@2x.png */,
-				DA5E5D481724F616003798D8 /* Icon-Small.png */,
-				DA5E5D491724F616003798D8 /* Icon-Small@2x.png */,
-				DA5E5D4A1724F616003798D8 /* Icon.png */,
-				DA5E5D4B1724F616003798D8 /* Icon@2x.png */,
+				DA945C8617E3F3FD0053236B /* Images.xcassets */,
 				DA5E5C3C1723681B003798D8 /* Square-bottom.png */,
 				DA5A09E8171BB0F7005284AB /* unlocked.png */,
 				DA5A09E9171BB0F7005284AB /* unlocked@2x.png */,
@@ -1523,10 +1494,6 @@
 				DABD360E1711E29400CF925C /* Automaton */,
 				DABD366B1711E29400CF925C /* Avatars */,
 				DABD36921711E29400CF925C /* Background */,
-				DABD36951711E29400CF925C /* Default-568h.png */,
-				DABD36961711E29400CF925C /* Default-568h@2x.png */,
-				DABD36971711E29400CF925C /* Default.png */,
-				DABD36981711E29400CF925C /* Default@2x.png */,
 				DABD36BB1711E29500CF925C /* Fonts */,
 				DABD36D91711E29500CF925C /* Insignia */,
 				DABD38751711E29700CF925C /* Tooltips */,
@@ -3168,13 +3135,10 @@
 				DABD395C1711E29700CF925C /* avatar-9@2x.png in Resources */,
 				DABD395D1711E29700CF925C /* background.png in Resources */,
 				DABD395E1711E29700CF925C /* background@2x.png in Resources */,
-				DABD395F1711E29700CF925C /* Default-568h.png in Resources */,
-				DABD39601711E29700CF925C /* Default-568h@2x.png in Resources */,
-				DABD39611711E29700CF925C /* Default.png in Resources */,
-				DABD39621711E29700CF925C /* Default@2x.png in Resources */,
 				DABD39841711E29700CF925C /* Exo-Bold.otf in Resources */,
 				DABD39851711E29700CF925C /* Exo-ExtraBold.otf in Resources */,
 				DABD39861711E29700CF925C /* Exo-Regular.otf in Resources */,
+				DA945C8717E3F3FD0053236B /* Images.xcassets in Resources */,
 				DABD39871711E29700CF925C /* SourceCodePro-Black.otf in Resources */,
 				DABD39881711E29700CF925C /* SourceCodePro-ExtraLight.otf in Resources */,
 				DABD39A01711E29700CF925C /* icon_action.png in Resources */,
@@ -3241,14 +3205,6 @@
 				DA5A09EA171BB0F7005284AB /* unlocked.png in Resources */,
 				DA5A09EB171BB0F7005284AB /* unlocked@2x.png in Resources */,
 				DA5E5C3D1723681B003798D8 /* Square-bottom.png in Resources */,
-				DA5E5D4C1724F616003798D8 /* Icon-72.png in Resources */,
-				DA5E5D4D1724F616003798D8 /* Icon-72@2x.png in Resources */,
-				DA5E5D4E1724F616003798D8 /* Icon-Small-50.png in Resources */,
-				DA5E5D4F1724F616003798D8 /* Icon-Small-50@2x.png in Resources */,
-				DA5E5D501724F616003798D8 /* Icon-Small.png in Resources */,
-				DA5E5D511724F616003798D8 /* Icon-Small@2x.png in Resources */,
-				DA5E5D521724F616003798D8 /* Icon.png in Resources */,
-				DA5E5D531724F616003798D8 /* Icon@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3749,6 +3705,8 @@
 		DA5BFA6E147E415C00F98B1E /* Debug-iOS */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -3766,6 +3724,8 @@
 		DA5BFA6F147E415C00F98B1E /* AdHoc-iOS */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Maarten Billemont";
@@ -3880,6 +3840,8 @@
 		DA95D60A14DF3F3B008D1B94 /* AppStore-iOS */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				EXCLUDED_SOURCE_FILE_NAMES = libTestFlight.a;
diff --git a/MasterPassword/Resources/Media/Default-568h.png b/MasterPassword/Resources/Media/Default-568h.png
deleted file mode 100644
index e82a690c..00000000
Binary files a/MasterPassword/Resources/Media/Default-568h.png and /dev/null differ
diff --git a/MasterPassword/Resources/Media/Icon-72.png b/MasterPassword/Resources/Media/Icon-72.png
deleted file mode 100644
index d508e44f..00000000
Binary files a/MasterPassword/Resources/Media/Icon-72.png and /dev/null differ
diff --git a/MasterPassword/Resources/Media/Icon-Small-50.png b/MasterPassword/Resources/Media/Icon-Small-50.png
deleted file mode 100644
index 70a9a69d..00000000
Binary files a/MasterPassword/Resources/Media/Icon-Small-50.png and /dev/null differ
diff --git a/MasterPassword/Resources/Media/Icon-Small.png b/MasterPassword/Resources/Media/Icon-Small.png
deleted file mode 100644
index 73872c60..00000000
Binary files a/MasterPassword/Resources/Media/Icon-Small.png and /dev/null differ
diff --git a/MasterPassword/Resources/Media/Icon.png b/MasterPassword/Resources/Media/Icon.png
deleted file mode 100644
index 4e8eb30b..00000000
Binary files a/MasterPassword/Resources/Media/Icon.png and /dev/null differ
diff --git a/MasterPassword/Resources/Media/Icon_Square.png b/MasterPassword/Resources/Media/Icon_Square.png
deleted file mode 100644
index 52981061..00000000
Binary files a/MasterPassword/Resources/Media/Icon_Square.png and /dev/null differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 00000000..61a1eaae
--- /dev/null
+++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,44 @@
+{
+  "images" : [
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40.png
new file mode 100644
index 00000000..2555019f
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40.png differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
new file mode 100644
index 00000000..436d9cc2
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60.png
new file mode 100644
index 00000000..dc37f8f8
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60.png differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
new file mode 100644
index 00000000..9b877513
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72.png
new file mode 100644
index 00000000..6ab7ecfa
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72.png differ
diff --git a/MasterPassword/Resources/Media/Icon-72@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png
similarity index 99%
rename from MasterPassword/Resources/Media/Icon-72@2x.png
rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png
index 11d66f3d..09207bc3 100644
Binary files a/MasterPassword/Resources/Media/Icon-72@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png
new file mode 100644
index 00000000..cf0fc07a
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png differ
diff --git a/MasterPassword/Resources/Media/Icon-Small-50@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png
similarity index 98%
rename from MasterPassword/Resources/Media/Icon-Small-50@2x.png
rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png
index 1b927073..2514c4cf 100644
Binary files a/MasterPassword/Resources/Media/Icon-Small-50@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png
new file mode 100644
index 00000000..00a72dd0
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png differ
diff --git a/MasterPassword/Resources/Media/Icon-Small@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
similarity index 95%
rename from MasterPassword/Resources/Media/Icon-Small@2x.png
rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
index 663356f4..cdae343e 100644
Binary files a/MasterPassword/Resources/Media/Icon-Small@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon.png
new file mode 100644
index 00000000..12082cf7
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon.png differ
diff --git a/MasterPassword/Resources/Media/Icon@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon@2x.png
similarity index 98%
rename from MasterPassword/Resources/Media/Icon@2x.png
rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon@2x.png
index ff1e6231..140aefaa 100644
Binary files a/MasterPassword/Resources/Media/Icon@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon@2x.png differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/iTunesArtwork b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/iTunesArtwork
new file mode 100644
index 00000000..193cfdf7
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/iTunesArtwork differ
diff --git a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Contents.json b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Contents.json
new file mode 100644
index 00000000..ce5e4a3a
--- /dev/null
+++ b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,42 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default@2x.png",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default-568h@2x.png",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default.png",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default-568h@2x.png",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-568h.png b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-568h.png
new file mode 100644
index 00000000..b87fe53a
Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-568h.png differ
diff --git a/MasterPassword/Resources/Media/Default-568h@2x.png b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
similarity index 100%
rename from MasterPassword/Resources/Media/Default-568h@2x.png
rename to MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
diff --git a/MasterPassword/Resources/Media/Default.png b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default.png
similarity index 100%
rename from MasterPassword/Resources/Media/Default.png
rename to MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default.png
diff --git a/MasterPassword/Resources/Media/Default@2x.png b/MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default@2x.png
similarity index 100%
rename from MasterPassword/Resources/Media/Default@2x.png
rename to MasterPassword/Resources/Media/Images.xcassets/LaunchImage.launchimage/Default@2x.png
diff --git a/MasterPassword/Resources/Media/iTunesArtwork@2x.png b/MasterPassword/Resources/Media/iTunesArtwork@2x.png
new file mode 100644
index 00000000..9f5bb0bd
Binary files /dev/null and b/MasterPassword/Resources/Media/iTunesArtwork@2x.png differ
diff --git a/Scripts/convertImages b/Scripts/convertImages
index 98bdd060..43c47c47 100755
--- a/Scripts/convertImages
+++ b/Scripts/convertImages
@@ -14,20 +14,18 @@ downsize() {
 
 
 
-inf "Converting iTunesArtwork"
+inf "Converting appiconsets"
 icons=(
-    [57]="Icon.png"
     [114]="Icon@2x.png"
-    [72]="Icon-72.png"
+    [120]="Icon-60@2x.png"
+    [80]="Icon-40@2x.png"
     [144]="Icon-72@2x.png"
-    [29]="Icon-Small.png"
     [58]="Icon-Small@2x.png"
-    [50]="Icon-Small-50.png"
     [100]="Icon-Small-50@2x.png"
     [512]="iTunesArtwork"
 )
 for size in $(reverse "${!icons[@]}"); do
-    file=${icons[size]}
+    file=Images.xcassets/AppIcon.appiconset/${icons[size]}
 
     if [[ "iTunesArtwork@2x" -nt $file ]]; then
         pinf "$file ($size px)"