diff --git a/Limelight.xcodeproj/project.pbxproj b/Limelight.xcodeproj/project.pbxproj
index 02757d0..4bceb21 100644
--- a/Limelight.xcodeproj/project.pbxproj
+++ b/Limelight.xcodeproj/project.pbxproj
@@ -41,6 +41,8 @@
 		FB7E794419C8B71B00A15F68 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FB7E794319C8B71B00A15F68 /* libiconv.dylib */; };
 		FB8945EF19F5C3CD00339C8A /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = FB8945EE19F5C3CD00339C8A /* Utils.m */; };
 		FB8945F219F5C76C00339C8A /* StreamConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = FB8945F119F5C76C00339C8A /* StreamConfiguration.m */; };
+		FB8945F619F626BA00339C8A /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = FB8945F519F626BA00339C8A /* Launch Screen.xib */; };
+		FB8945F819F62A2B00339C8A /* store_icon_1024x1024.png in Resources */ = {isa = PBXBuildFile; fileRef = FB8945F719F62A2B00339C8A /* store_icon_1024x1024.png */; };
 		FBAB29F219EDB08B00929691 /* MDNSManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FBAB29F119EDB08B00929691 /* MDNSManager.m */; };
 		FBAB29F619EDE0F800929691 /* Computer.m in Sources */ = {isa = PBXBuildFile; fileRef = FBAB29F519EDE0F800929691 /* Computer.m */; };
 		FBAB29FC19EE13AA00929691 /* CryptoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FBAB29FB19EE13AA00929691 /* CryptoManager.m */; };
@@ -133,6 +135,8 @@
 		FB8945EE19F5C3CD00339C8A /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
 		FB8945F019F5C76C00339C8A /* StreamConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamConfiguration.h; sourceTree = "<group>"; };
 		FB8945F119F5C76C00339C8A /* StreamConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StreamConfiguration.m; sourceTree = "<group>"; };
+		FB8945F519F626BA00339C8A /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Launch Screen.xib"; sourceTree = "<group>"; };
+		FB8945F719F62A2B00339C8A /* store_icon_1024x1024.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = store_icon_1024x1024.png; sourceTree = "<group>"; };
 		FBAB29F119EDB08B00929691 /* MDNSManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MDNSManager.m; sourceTree = "<group>"; };
 		FBAB29F319EDB0C400929691 /* MDNSManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MDNSManager.h; sourceTree = "<group>"; };
 		FBAB29F419EDE0F800929691 /* Computer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Computer.h; sourceTree = "<group>"; };
@@ -306,6 +310,7 @@
 		FB290CF919B2C406004C83CF /* Limelight */ = {
 			isa = PBXGroup;
 			children = (
+				FB8945F719F62A2B00339C8A /* store_icon_1024x1024.png */,
 				FB63FCF019F43EBC00227761 /* PairManager.h */,
 				FB63FCF119F43EBC00227761 /* PairManager.m */,
 				FB290D3019B2C6E3004C83CF /* Video */,
@@ -342,6 +347,7 @@
 				FB8945F119F5C76C00339C8A /* StreamConfiguration.m */,
 				98B175B219F5DAFC00DA2AED /* ControllerSupport.h */,
 				98B175B319F5DAFC00DA2AED /* ControllerSupport.m */,
+				FB8945F519F626BA00339C8A /* Launch Screen.xib */,
 			);
 			path = Limelight;
 			sourceTree = "<group>";
@@ -678,9 +684,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				FB290E7919B37D81004C83CF /* MainFrame-iPad.storyboard in Resources */,
+				FB8945F819F62A2B00339C8A /* store_icon_1024x1024.png in Resources */,
 				FB290CFE19B2C406004C83CF /* InfoPlist.strings in Resources */,
 				FB290E7B19B38036004C83CF /* MainFrame-iPhone.storyboard in Resources */,
 				FB290D0919B2C406004C83CF /* Images.xcassets in Resources */,
+				FB8945F619F626BA00339C8A /* Launch Screen.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -839,7 +847,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -867,7 +874,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Contents.json b/Limelight/Images.xcassets/AppIcon.appiconset/Contents.json
index b7f3352..15721e4 100644
--- a/Limelight/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Limelight/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -11,13 +11,15 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "app_icon_120x120_2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "app_icon_180x180_3x.png",
       "scale" : "3x"
     },
     {
@@ -41,13 +43,15 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "app_icon_76x76_1x.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "app_icon_152x152_2x.png",
       "scale" : "2x"
     }
   ],
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_120x120_2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_120x120_2x.png
new file mode 100644
index 0000000..6f7d81b
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_120x120_2x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_152x152_2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_152x152_2x.png
new file mode 100644
index 0000000..2d16650
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_152x152_2x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_180x180_3x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_180x180_3x.png
new file mode 100644
index 0000000..ea23007
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_180x180_3x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_76x76_1x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_76x76_1x.png
new file mode 100644
index 0000000..80fb87d
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_76x76_1x.png differ
diff --git a/Limelight/Images.xcassets/LaunchImage.launchimage/Contents.json b/Limelight/Images.xcassets/LaunchImage.launchimage/Contents.json
index 6f870a4..6da7c45 100644
--- a/Limelight/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/Limelight/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -10,9 +10,9 @@
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
-      "subtype" : "retina4",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
       "scale" : "2x"
     },
     {
diff --git a/Limelight/Launch Screen.xib b/Limelight/Launch Screen.xib
new file mode 100644
index 0000000..aaedfdf
--- /dev/null
+++ b/Limelight/Launch Screen.xib	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2014 Limelight Stream. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="22" y="439" width="437" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" red="0.15294117647058825" green="1" blue="0.10196078431372549" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                    <variation key="widthClass=compact">
+                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                    </variation>
+                </label>
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="store_icon_1024x1024.png" translatesAutoresizingMaskIntoConstraints="NO" id="tIx-KE-YER">
+                    <rect key="frame" x="127" y="126" width="227" height="227"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="227" id="EI7-Sf-3cH"/>
+                        <constraint firstAttribute="height" constant="227" id="b0G-y9-aP0"/>
+                    </constraints>
+                </imageView>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+            <constraints>
+                <constraint firstItem="tIx-KE-YER" firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="GN9-Xb-RLD"/>
+                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Gnz-uJ-CDw"/>
+                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+                <constraint firstAttribute="centerY" secondItem="tIx-KE-YER" secondAttribute="centerY" constant="0.5" id="trN-ZP-0Hg"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="404" y="445"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="store_icon_1024x1024.png" width="1024" height="1024"/>
+    </resources>
+</document>
diff --git a/Limelight/Limelight-Info.plist b/Limelight/Limelight-Info.plist
index 0fa11f2..efb36ad 100644
--- a/Limelight/Limelight-Info.plist
+++ b/Limelight/Limelight-Info.plist
@@ -24,6 +24,8 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>Launch Screen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>MainFrame-iPhone</string>
 	<key>UIMainStoryboardFile~ipad</key>
diff --git a/Limelight/store_icon_1024x1024.png b/Limelight/store_icon_1024x1024.png
new file mode 100644
index 0000000..cbdc228
Binary files /dev/null and b/Limelight/store_icon_1024x1024.png differ