diff --git a/config.pri b/config.pri
index dc183355..9d0cae52 100644
--- a/config.pri
+++ b/config.pri
@@ -8,7 +8,6 @@ top_builddir=$$shadowed($$PWD)
 VERSION_INFO=$$cat(version.txt)
 APP_VERSION=$$member(VERSION_INFO, 0)
 APP_REVISION=$$member(VERSION_INFO, 1)
-message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})")
 
 DEFINES+=APP_VERSION=\\\"$${APP_VERSION}\\\"
 android:QMAKE_POST_LINK += cp $$top_srcdir/version.txt $$top_builddir/
diff --git a/nymea-app.pro b/nymea-app.pro
index 9aa7a232..cdb96d64 100644
--- a/nymea-app.pro
+++ b/nymea-app.pro
@@ -1,4 +1,5 @@
 include(config.pri)
+message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})")
 
 TEMPLATE=subdirs
 
diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index ce539406..0ca0762f 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -69,6 +69,7 @@ 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
diff --git a/packaging/ios/AppIcon1024x1024.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon1024x1024.png
similarity index 100%
rename from packaging/ios/AppIcon1024x1024.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon1024x1024.png
diff --git a/packaging/ios/AppIcon167x167.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167.png
similarity index 100%
rename from packaging/ios/AppIcon167x167.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167.png
diff --git a/packaging/ios/AppIcon20x20.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20.png
similarity index 100%
rename from packaging/ios/AppIcon20x20.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20.png
diff --git a/packaging/ios/AppIcon20x20@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png
similarity index 100%
rename from packaging/ios/AppIcon20x20@2x.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png
diff --git a/packaging/ios/AppIcon20x20@3x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png
similarity index 100%
rename from packaging/ios/AppIcon20x20@3x.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png
diff --git a/packaging/ios/AppIcon29x29.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29.png
similarity index 100%
rename from packaging/ios/AppIcon29x29.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29.png
diff --git a/packaging/ios/AppIcon29x29@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png
similarity index 100%
rename from packaging/ios/AppIcon29x29@2x.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png
diff --git a/packaging/ios/AppIcon29x29@3x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png
similarity index 100%
rename from packaging/ios/AppIcon29x29@3x.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png
diff --git a/packaging/ios/AppIcon40x40.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40.png
similarity index 100%
rename from packaging/ios/AppIcon40x40.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40.png
diff --git a/packaging/ios/AppIcon40x40@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png
similarity index 100%
rename from packaging/ios/AppIcon40x40@2x.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png
diff --git a/packaging/ios/AppIcon40x40@3x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@3x.png
similarity index 100%
rename from packaging/ios/AppIcon40x40@3x.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@3x.png
diff --git a/packaging/ios/AppIcon60x60@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png
similarity index 100%
rename from packaging/ios/AppIcon60x60@2x.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png
diff --git a/packaging/ios/AppIcon60x60@3x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png
similarity index 100%
rename from packaging/ios/AppIcon60x60@3x.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png
diff --git a/packaging/ios/AppIcon76x76.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon76x76.png
similarity index 100%
rename from packaging/ios/AppIcon76x76.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon76x76.png
diff --git a/packaging/ios/AppIcon76x76@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png
similarity index 100%
rename from packaging/ios/AppIcon76x76@2x.png
rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png
diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 00000000..05946256
--- /dev/null
+++ b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon60x60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon20x20.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon29x29.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon40x40.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon76x76.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "AppIcon167x167.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "AppIcon1024x1024.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/packaging/ios/AppIcons.xcassets/Contents.json b/packaging/ios/AppIcons.xcassets/Contents.json
new file mode 100644
index 00000000..da4a164c
--- /dev/null
+++ b/packaging/ios/AppIcons.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in
index 73c0290a..31878275 100644
--- a/packaging/ios/Info.plist.in
+++ b/packaging/ios/Info.plist.in
@@ -8,30 +8,6 @@
         <string>nymea-app</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Created by Qt/QMake</string>
-        <key>CFBundleIcons</key>
-        <dict>
-            <key>CFBundlePrimaryIcon</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>AppIcon1024x1024.png</string>
-                    <string>AppIcon20x20.png</string>
-                    <string>AppIcon20x20@2x.png</string>
-                    <string>AppIcon20x20@3x.png</string>
-                    <string>AppIcon29x29.png</string>
-                    <string>AppIcon29x29@2x.png</string>
-                    <string>AppIcon29x29@3x.png</string>
-                    <string>AppIcon40x40.png</string>
-                    <string>AppIcon40x40@2x.png</string>
-                    <string>AppIcon40x40@3x.png</string>
-                    <string>AppIcon60x60@2x.png</string>
-                    <string>AppIcon60x60@3x.png</string>
-                    <string>AppIcon76x76.png</string>
-                    <string>AppIcon167x167.png</string>
-                    <string>AppIcon76x76@2x.png</string>
-                </array>
-            </dict>
-        </dict>
         <key>CFBundleIdentifier</key>
         <string>io.guh.nymeaApp</string>
 	<key>CFBundleName</key>
@@ -43,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>${QMAKE_PKGINFO_TYPEINFO}</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+        <string>2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
diff --git a/packaging/ios/exportappicons.sh b/packaging/ios/exportappicons.sh
index fee7c83a..f47f3f1a 100755
--- a/packaging/ios/exportappicons.sh
+++ b/packaging/ios/exportappicons.sh
@@ -7,9 +7,9 @@ function exportImage() {
   if [ ${scaleFactor} -ne 1 ]; then
     finalSize=$((size * scaleFactor))
     echo final size is ${finalSize}
-    inkscape AppIcon.svg -e AppIcon${size}x${size}@${scaleFactor}x.png -C -w $finalSize -h $finalSize
+    inkscape AppIcon.svg -e AppIcons.xcassets/AppIcon.appiconset/AppIcon${size}x${size}@${scaleFactor}x.png -C -w $finalSize -h $finalSize
   else
-    inkscape AppIcon.svg -e AppIcon${size}x${size}.png -C -w ${size} -h ${size}
+    inkscape AppIcon.svg -e AppIcons.xcassets/AppIcon.appiconset/AppIcon${size}x${size}.png -C -w ${size} -h ${size}
   fi
 }