diff --git a/build_ios.sh b/build_ios.sh
index 3b2e01c2730ff7470d7985f5df739a42cefd9b79..3d3d8873aafae6fb061b8ba5192274c8673b4125 100755
--- a/build_ios.sh
+++ b/build_ios.sh
@@ -14,7 +14,7 @@ mkdir -p ${SHADOW_BUILD_DIR} &&
 cd ${SHADOW_BUILD_DIR} &&
 #-- Create project only (build using Xcode)
 ${QMAKE} -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release CONFIG+=ForAppStore
-rsync -av ${TRAVIS_BUILD_DIR}/ios/Images.xcassets ${SHADOW_BUILD_DIR}/QGroundControl/
+sed -i .bak 's/com.yourcompany.${PRODUCT_NAME:rfc1034identifier}/org.QGroundControl.qgc/' ${SHADOW_BUILD_DIR}/QGroundControl.xcodeproj/project.pbxproj
 #-- Create and build
 #${QMAKE} -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release CONFIG+=ForAppStore &&
 #xcodebuild -configuration Release -xcconfig ${TRAVIS_BUILD_DIR}/ios/qgroundcontrol_appstore.xcconfig
diff --git a/ios/AppIcon29x29.png b/ios/AppIcon29x29.png
deleted file mode 100644
index be15514c8cf56e2e144083f29a05b0fc32c1e3b9..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon29x29.png and /dev/null differ
diff --git a/ios/AppIcon29x29@2x.png b/ios/AppIcon29x29@2x.png
deleted file mode 100644
index c88419121fc2ee845fa49f2b8681c431e6b3fbd1..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon29x29@2x.png and /dev/null differ
diff --git a/ios/AppIcon29x29@2x~ipad.png b/ios/AppIcon29x29@2x~ipad.png
deleted file mode 100644
index f7e168a033066189cf58773d56fcff1da8c029b0..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon29x29@2x~ipad.png and /dev/null differ
diff --git a/ios/AppIcon29x29~ipad.png b/ios/AppIcon29x29~ipad.png
deleted file mode 100644
index 58e563e536b0f2901ae40c69958fdafa9fc79469..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon29x29~ipad.png and /dev/null differ
diff --git a/ios/AppIcon40x40@2x.png b/ios/AppIcon40x40@2x.png
deleted file mode 100644
index ef033eea3ecefc62127ed4bb4b327a78befe131f..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon40x40@2x.png and /dev/null differ
diff --git a/ios/AppIcon40x40@2x~ipad.png b/ios/AppIcon40x40@2x~ipad.png
deleted file mode 100644
index 6f3bca5d8053923005a4fda32a035d1a3a36345f..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon40x40@2x~ipad.png and /dev/null differ
diff --git a/ios/AppIcon40x40~ipad.png b/ios/AppIcon40x40~ipad.png
deleted file mode 100644
index f45170234c63abf82fb53a9947dc51117d22b6bb..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon40x40~ipad.png and /dev/null differ
diff --git a/ios/AppIcon50x50@2x~ipad.png b/ios/AppIcon50x50@2x~ipad.png
deleted file mode 100644
index 3ead1ebc856bc1e8579f2e1071d326f812d1edca..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon50x50@2x~ipad.png and /dev/null differ
diff --git a/ios/AppIcon50x50~ipad.png b/ios/AppIcon50x50~ipad.png
deleted file mode 100644
index 98efa88fafcd45a34d99f6d0e1d8d278932225e1..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon50x50~ipad.png and /dev/null differ
diff --git a/ios/AppIcon57x57.png b/ios/AppIcon57x57.png
deleted file mode 100644
index 924ae4ef46863a1d95a53a155e5d21b0b8aa6c5b..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon57x57.png and /dev/null differ
diff --git a/ios/AppIcon57x57@2x.png b/ios/AppIcon57x57@2x.png
deleted file mode 100644
index dc3edd1cdd34a2981b96ade4f7ad2ae2810ec536..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon57x57@2x.png and /dev/null differ
diff --git a/ios/AppIcon60x60@2x.png b/ios/AppIcon60x60@2x.png
deleted file mode 100644
index 2977c664f6882b8b02a08d57d2357ed56660c1e5..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon60x60@2x.png and /dev/null differ
diff --git a/ios/AppIcon72x72@2x~ipad.png b/ios/AppIcon72x72@2x~ipad.png
deleted file mode 100644
index 77f568f8bf2a9b5de7bf6c3ab6559e4e82cb1cf5..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon72x72@2x~ipad.png and /dev/null differ
diff --git a/ios/AppIcon72x72~ipad.png b/ios/AppIcon72x72~ipad.png
deleted file mode 100644
index ca7bbd19ef7a6370026f5598240acc6403e0c395..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon72x72~ipad.png and /dev/null differ
diff --git a/ios/AppIcon76x76@2x~ipad.png b/ios/AppIcon76x76@2x~ipad.png
deleted file mode 100644
index 044f7cc8b6db50a71ec263150f3accaaca161231..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon76x76@2x~ipad.png and /dev/null differ
diff --git a/ios/AppIcon76x76~ipad.png b/ios/AppIcon76x76~ipad.png
deleted file mode 100644
index 3628aa976d66fc26aed83fa08225cbc771fa7626..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon76x76~ipad.png and /dev/null differ
diff --git a/ios/AppIcon83.5x83.5@2x~ipad.png b/ios/AppIcon83.5x83.5@2x~ipad.png
deleted file mode 100644
index 072f3317187340f1385e0741206048be209ec3e6..0000000000000000000000000000000000000000
Binary files a/ios/AppIcon83.5x83.5@2x~ipad.png and /dev/null differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png
index 6e9cba219773e96827a93afe14026e76c4dc405b..8da3b548a402ac9cd23125e7f97b434622187e80 100644
Binary files a/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png and b/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Contents.json b/ios/Images.xcassets/LaunchImage.launchimage/Contents.json
deleted file mode 100644
index e737326cd7c35edb4c2fa8e2fc7864d101926473..0000000000000000000000000000000000000000
--- a/ios/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-  "images" : [
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "2436h",
-      "filename" : "Default1125x2436.png",
-      "minimum-system-version" : "11.0",
-      "orientation" : "portrait",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "2436h",
-      "filename" : "Default2436x1125.png",
-      "minimum-system-version" : "11.0",
-      "orientation" : "landscape",
-      "scale" : "3x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "tv",
-      "filename" : "Default3840x2160.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "11.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "tv",
-      "filename" : "Default1920x1080.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "9.0",
-      "scale" : "1x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "Default1242x2208.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "Default2208x1242.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "landscape",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "667h",
-      "filename" : "Default750x1334.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "Default640x960.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "retina4",
-      "filename" : "Default640x1136.png",
-      "minimum-system-version" : "7.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "filename" : "Default768x1024.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "filename" : "Default1024x768.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "filename" : "Default1536x2048.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "filename" : "Default2048x1536.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "Default320x480.png",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "Default640x960.png",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "Default640x1136.png",
-      "extent" : "full-screen",
-      "subtype" : "retina4",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "filename" : "Default768x1024.png",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "filename" : "Default1024x768.png",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "filename" : "Default1536x2048.png",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "filename" : "Default2048x1536.png",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1024x768.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1024x768.png
deleted file mode 100644
index 778c14401915fe2cd293e1cb112f6db61ca83239..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1024x768.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1125x2436.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1125x2436.png
deleted file mode 100644
index 3fe1113776793a2ea2f685cb11d00d074b56a3ed..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1125x2436.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1242x2208.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1242x2208.png
deleted file mode 100644
index 601b256675569c379c7fa268b74092ff666fa8d3..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1242x2208.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1536x2048.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1536x2048.png
deleted file mode 100644
index 68151c2685d53721c079977b2ae20f88ba64c8b8..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1536x2048.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1920x1080.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1920x1080.png
deleted file mode 100644
index 21b35a1a8551be7934ba673a6deddde909694b81..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1920x1080.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default2048x1536.png b/ios/Images.xcassets/LaunchImage.launchimage/Default2048x1536.png
deleted file mode 100644
index 50efd7a2feba3a44d547c607a9c8f3c636a1fdca..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default2048x1536.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default2208x1242.png b/ios/Images.xcassets/LaunchImage.launchimage/Default2208x1242.png
deleted file mode 100644
index 61e79279e3eb26ad78961f0e9d3c9aeefb549bd2..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default2208x1242.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default2436x1125.png b/ios/Images.xcassets/LaunchImage.launchimage/Default2436x1125.png
deleted file mode 100644
index 25f71a05d664fc08c9c8e1aa800140419a691415..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default2436x1125.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default320x480.png b/ios/Images.xcassets/LaunchImage.launchimage/Default320x480.png
deleted file mode 100644
index 0f59f02b5876601f63716809137215ebae7a20e5..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default320x480.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default3840x2160.png b/ios/Images.xcassets/LaunchImage.launchimage/Default3840x2160.png
deleted file mode 100644
index 4634a8381aa3d1f7001ee35d7109a4801de4fd13..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default3840x2160.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default640x1136.png b/ios/Images.xcassets/LaunchImage.launchimage/Default640x1136.png
deleted file mode 100644
index 458e9b258c33d7c039fec9503ed98f4a2f6b3206..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default640x1136.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default640x960.png b/ios/Images.xcassets/LaunchImage.launchimage/Default640x960.png
deleted file mode 100644
index c033ad24f3108e1418a966d9944428d2e667cca1..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default640x960.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default750x1334.png b/ios/Images.xcassets/LaunchImage.launchimage/Default750x1334.png
deleted file mode 100644
index 00a12c53a0351edfa29f391cd9bedc71df6050ad..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default750x1334.png and /dev/null differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default768x1024.png b/ios/Images.xcassets/LaunchImage.launchimage/Default768x1024.png
deleted file mode 100644
index 83b2a088f59445fa0e53128cf302e2df6ef631ff..0000000000000000000000000000000000000000
Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default768x1024.png and /dev/null differ
diff --git a/ios/iOS-Info.plist b/ios/iOS-Info.plist
index f9ea584bf62e0c494017c7fcc4cea0c2c23a9399..042cab652291a6aa701cf981958d21263f05e69f 100644
--- a/ios/iOS-Info.plist
+++ b/ios/iOS-Info.plist
@@ -26,8 +26,6 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>QGCLaunchScreen</string>
 	<key>UIRequiresFullScreen</key>
 	<true/>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -38,6 +36,8 @@
 	<string>Ground Station Location</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Ground Station Location</string>
+	<key>UILaunchStoryboardName</key>
+	<string>QGCLaunchScreen</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
diff --git a/ios/iOSForAppStore-Info-Source.plist b/ios/iOSForAppStore-Info-Source.plist
index 9baabdbec2a9b81ac3e1c5bb2de1f94a7361d6ca..9967773727914d698d56fa3c880450b0f4f34541 100644
--- a/ios/iOSForAppStore-Info-Source.plist
+++ b/ios/iOSForAppStore-Info-Source.plist
@@ -16,51 +16,12 @@
 	<string>QGC uses UVC devices for video streaming.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>We do not access it. Apple thinks we do.</string>
+	<key>UILaunchStoryboardName</key>
+	<string>QGCLaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
-	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>AppIcon29x29.png</string>
-				<string>AppIcon29x29@2x.png</string>
-				<string>AppIcon40x40@2x.png</string>
-				<string>AppIcon57x57.png</string>
-				<string>AppIcon57x57@2x.png</string>
-				<string>AppIcon60x60@2x.png</string>
-			</array>
-		</dict>
-	</dict>
-	<key>CFBundleIcons~ipad</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>AppIcon29x29.png</string>
-				<string>AppIcon29x29@2x.png</string>
-				<string>AppIcon40x40@2x.png</string>
-				<string>AppIcon57x57.png</string>
-				<string>AppIcon57x57@2x.png</string>
-				<string>AppIcon60x60@2x.png</string>
-				<string>AppIcon29x29~ipad.png</string>
-				<string>AppIcon29x29@2x~ipad.png</string>
-				<string>AppIcon40x40~ipad.png</string>
-				<string>AppIcon40x40@2x~ipad.png</string>
-				<string>AppIcon50x50~ipad.png</string>
-				<string>AppIcon50x50@2x~ipad.png</string>
-				<string>AppIcon72x72~ipad.png</string>
-				<string>AppIcon72x72@2x~ipad.png</string>
-				<string>AppIcon76x76~ipad.png</string>
-				<string>AppIcon76x76@2x~ipad.png</string>
-				<string>AppIcon83.5x83.5@2x~ipad.png</string>
-			</array>
-		</dict>
-	</dict>
 	<key>CFBundleIdentifier</key>
 	<string>org.QGroundControl.qgc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -85,8 +46,6 @@
 	<string>Ground Station Location</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>Ground Station Location</string>
-	<key>UILaunchStoryboardName</key>
-	<string>QGCLaunchScreen</string>
     <key>NSBluetoothPeripheralUsageDescription</key>
     <string>QGroundControl would like to use bluetooth.</string>    
 	<key>UIRequiresFullScreen</key>
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index b2ca974c1bd8937e84cbff2c9e42662d0ec876ae..b3847f14daf43ce830f1b8d248a96bd08f31df65 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -62,9 +62,9 @@ iOSBuild {
         QMAKE_INFO_PLIST  = $${BASEDIR}/ios/iOS-Info.plist
         OTHER_FILES      += $${BASEDIR}/ios/iOS-Info.plist
     }
-    BUNDLE.files        = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/QGCLaunchScreen.xib $$QMAKE_INFO_PLIST
-    QMAKE_BUNDLE_DATA  += BUNDLE
-    #-- TODO: Add iTunesArtwork
+    QMAKE_ASSET_CATALOGS += ios/Images.xcassets
+    BUNDLE.files          = ios/QGCLaunchScreen.xib $$QMAKE_INFO_PLIST
+    QMAKE_BUNDLE_DATA    += BUNDLE
 }
 
 LinuxBuild {