diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index d56a2848..70bdc62e 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -145,7 +145,6 @@ ios: {
     QMAKE_BUNDLE = nymeaApp
     # Configure generated xcode project to have our bundle id
     xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE}
-    QMAKE_ASSET_CATALOGS += ../packaging/ios/AppIcons.xcassets
     plist.input = ../packaging/ios/Info.plist.in
     plist.output = $$OUT_PWD/Info.plist
     QMAKE_SUBSTITUTES += plist
@@ -154,10 +153,10 @@ ios: {
                    ../packaging/ios/pushnotifications.entitlements \
                    ../packaging/ios/GoogleService-Info.plist
 
-    ios_icon_files.files += $$files(../packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon*.png)
-    ios_launch_images.files += $$files(../packaging/ios/AppIcons.xcassets/LaunchScreen.imageset/*.png) \
-                               ../packaging/ios/NymeaLaunchScreen.storyboard
-    QMAKE_BUNDLE_DATA += ios_icon_files ios_launch_images
+    QMAKE_ASSET_CATALOGS += ../packaging/ios/AppIcons.xcassets
+
+    ios_launch_images.files += ../packaging/ios/NymeaLaunchScreen.storyboard
+    QMAKE_BUNDLE_DATA += ios_launch_images
 
     IOS_DEVELOPMENT_TEAM.name = DEVELOPMENT_TEAM
     IOS_DEVELOPMENT_TEAM.value = Z45PLKLTHM
diff --git a/packaging/ios/AppIcons.xcassets/Launchscreen.imageset/Contents.json b/packaging/ios/AppIcons.xcassets/LaunchImage.imageset/Contents.json
similarity index 74%
rename from packaging/ios/AppIcons.xcassets/Launchscreen.imageset/Contents.json
rename to packaging/ios/AppIcons.xcassets/LaunchImage.imageset/Contents.json
index 08f711bf..6a20736e 100644
--- a/packaging/ios/AppIcons.xcassets/Launchscreen.imageset/Contents.json
+++ b/packaging/ios/AppIcons.xcassets/LaunchImage.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "LuanchScreen-light-1x.png",
+      "filename" : "LaunchScreenL@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "LuanchScreen-dark-1x.png",
+      "filename" : "LaunchScreenD@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "LuanchScreen-light-2x.png",
+      "filename" : "LaunchScreenL@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "LuanchScreen-dark-2x.png",
+      "filename" : "LaunchScreenD@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "LuanchScreen-light-3x.png",
+      "filename" : "LaunchScreenL@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "LuanchScreen-dark-3x.png",
+      "filename" : "LaunchScreenD@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-dark-1x.png b/packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenD@1x.png
similarity index 100%
rename from packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-dark-1x.png
rename to packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenD@1x.png
diff --git a/packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-dark-2x.png b/packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenD@2x.png
similarity index 100%
rename from packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-dark-2x.png
rename to packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenD@2x.png
diff --git a/packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-dark-3x.png b/packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenD@3x.png
similarity index 100%
rename from packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-dark-3x.png
rename to packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenD@3x.png
diff --git a/packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-light-1x.png b/packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenL@1x.png
similarity index 100%
rename from packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-light-1x.png
rename to packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenL@1x.png
diff --git a/packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-light-2x.png b/packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenL@2x.png
similarity index 100%
rename from packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-light-2x.png
rename to packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenL@2x.png
diff --git a/packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-light-3x.png b/packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenL@3x.png
similarity index 100%
rename from packaging/ios/AppIcons.xcassets/Launchscreen.imageset/LuanchScreen-light-3x.png
rename to packaging/ios/AppIcons.xcassets/LaunchImage.imageset/LaunchScreenL@3x.png
diff --git a/packaging/ios/NymeaLaunchScreen.storyboard b/packaging/ios/NymeaLaunchScreen.storyboard
index d5f3e1ed..225c3438 100644
--- a/packaging/ios/NymeaLaunchScreen.storyboard
+++ b/packaging/ios/NymeaLaunchScreen.storyboard
@@ -13,17 +13,22 @@
         <scene sceneID="EHf-IW-A2E">
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                    <view key="view" contentMode="center" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Launchscreen" translatesAutoresizingMaskIntoConstraints="NO" id="AgK-H9-Prn">
-                                <rect key="frame" x="0.0" y="234" width="414" height="429"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="LaunchImage" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AgK-H9-Prn">
+                                <rect key="frame" x="47" y="192" width="320" height="480"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="AgK-H9-Prn" secondAttribute="trailing" constant="1" id="Ma5-cb-44O"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="AgK-H9-Prn" secondAttribute="bottom" constant="1" id="NeI-Sx-Hje"/>
+                            <constraint firstItem="AgK-H9-Prn" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="1" id="rj1-09-4zk"/>
+                            <constraint firstItem="AgK-H9-Prn" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="1" id="siK-lK-Ip4"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -32,7 +37,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Launchscreen" width="320" height="480"/>
+        <image name="LaunchImage" width="320" height="480"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>