diff --git a/src/Calculator.iOS/Calculator.iOS.csproj b/src/Calculator.iOS/Calculator.iOS.csproj
index 03b8a618..e944bee0 100644
--- a/src/Calculator.iOS/Calculator.iOS.csproj
+++ b/src/Calculator.iOS/Calculator.iOS.csproj
@@ -115,12 +115,29 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-83.5%402x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-76%402x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-76.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-60%403x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-60%402x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-40%403x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-40%402x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-40.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-29%403x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-29%402x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-29.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-20%403x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-20%402x.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-20.png" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-1024.png" />
     <None Include="Info.plist">
       <SubType>Designer</SubType>
     </None>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Content Include="Entitlements.plist" />
     <BundleResource Include="Resources\Fonts\CalcMDL2.ttf" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Contents.json" />
+    <ImageAsset Include="Media.xcassets\LaunchImages.launchimage\Contents.json" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -129,22 +146,7 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Contents.json">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\ios-marketing-1024x1024@1x.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-		<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPad-76x76@2x.png">
-			<Visible>false</Visible>
-		</ImageAsset>
-		<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPad-84x84@2x.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-		<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-152x152@3x.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-		<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-120x120@3x.png">
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPad-76x76@2x.png">
       <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-120x120@3x.png">
@@ -153,18 +155,6 @@
     <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-152x152@3x.png">
       <Visible>false</Visible>
     </ImageAsset>
-    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-20x20@2x.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-20x20@3x.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-60x60@2x.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Media.xcassets\LaunchImages.launchimage\Contents.json">
-      <Visible>false</Visible>
-    </ImageAsset>
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\Fonts\winjs-symbols.ttf" />
@@ -184,4 +174,4 @@
   </ItemGroup>
   <Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Contents.json b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Contents.json
index c1658f62..2d852d03 100644
--- a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Contents.json
+++ b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Contents.json
@@ -1,106 +1,119 @@
 {
   "images": [
-    {
-      "scale": "2x",
-      "size": "29x29",
-      "idiom": "iphone"
-    },
-    {
-      "scale": "3x",
-      "size": "29x29",
-      "idiom": "iphone"
-    },
-    {
-      "scale": "2x",
-      "size": "40x40",
-      "idiom": "iphone"
-    },
-    {
-      "scale": "3x",
-      "size": "60x60",
-      "idiom": "iphone"
-    },
-    {
-      "scale": "1x",
-      "size": "20x20",
-      "idiom": "ipad"
-    },
-    {
-      "scale": "2x",
-      "size": "20x20",
-      "idiom": "ipad"
-    },
-    {
-      "scale": "1x",
-      "size": "29x29",
-      "idiom": "ipad"
-    },
-    {
-      "scale": "2x",
-      "size": "29x29",
-      "idiom": "ipad"
-    },
-    {
-      "scale": "1x",
-      "size": "40x40",
-      "idiom": "ipad"
-    },
-    {
-      "scale": "2x",
-      "size": "40x40",
-      "idiom": "ipad"
-    },
-    {
-      "scale": "1x",
-      "size": "76x76",
-      "idiom": "ipad"
-    },
     {
       "scale": "2x",
       "size": "20x20",
       "idiom": "iphone",
-      "filename": "iPhone-20x20@2x.png"
+      "filename": "Icon-20@2x.png"
     },
     {
       "scale": "3x",
       "size": "20x20",
       "idiom": "iphone",
-      "filename": "iPhone-20x20@3x.png"
+      "filename": "Icon-20@3x.png"
     },
     {
-      "scale": "2x",
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "iPhone-60x60@2x.png"
-    },
-    {
-      "scale": "2x",
-      "size": "83.5x83.5",
+      "scale": "1x",
+      "size": "20x20",
       "idiom": "ipad",
-      "filename": "iPad-84x84@2x.png"
+      "filename": "Icon-20.png"
+    },
+    {
+      "scale": "2x",
+      "size": "20x20",
+      "idiom": "ipad",
+      "filename": "Icon-20@2x.png"
     },
     {
       "scale": "1x",
       "size": "1024x1024",
       "idiom": "ios-marketing",
-      "filename": "ios-marketing-1024x1024@1x.png"
+      "filename": "Icon-1024.png"
     },
     {
       "scale": "2x",
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "iPhone-152x152@3x.png"
+      "size": "29x29",
+      "idiom": "iphone",
+      "filename": "Icon-29@2x.png"
+    },
+    {
+      "scale": "3x",
+      "size": "29x29",
+      "idiom": "iphone",
+      "filename": "Icon-29@3x.png"
+    },
+    {
+      "scale": "2x",
+      "size": "40x40",
+      "idiom": "iphone",
+      "filename": "Icon-40@2x.png"
     },
     {
       "scale": "3x",
       "size": "40x40",
       "idiom": "iphone",
-      "filename": "iPhone-120x120@3x.png"
+      "filename": "Icon-40@3x.png"
+    },
+    {
+      "scale": "2x",
+      "size": "60x60",
+      "idiom": "iphone",
+      "filename": "Icon-60@2x.png"
+    },
+    {
+      "scale": "3x",
+      "size": "60x60",
+      "idiom": "iphone",
+      "filename": "Icon-60@3x.png"
+    },
+    {
+      "scale": "1x",
+      "size": "29x29",
+      "idiom": "ipad",
+      "filename": "Icon-29.png"
+    },
+    {
+      "scale": "2x",
+      "size": "29x29",
+      "idiom": "ipad",
+      "filename": "Icon-29@2x.png"
+    },
+    {
+      "scale": "1x",
+      "size": "40x40",
+      "idiom": "ipad",
+      "filename": "Icon-40.png"
+    },
+    {
+      "scale": "2x",
+      "size": "40x40",
+      "idiom": "ipad",
+      "filename": "Icon-40@2x.png"
+    },
+    {
+      "scale": "1x",
+      "size": "76x76",
+      "idiom": "ipad",
+      "filename": "Icon-76.png"
+    },
+    {
+      "scale": "2x",
+      "size": "76x76",
+      "idiom": "ipad",
+      "filename": "Icon-76@2x.png"
+    },
+    {
+      "scale": "2x",
+      "size": "83.5x83.5",
+      "idiom": "ipad",
+      "filename": "Icon-83.5@2x.png"
     }
   ],
-  "properties": {},
+  "properties": {
+    "pre-rendered": false
+  },
   "info": {
     "version": 1,
-    "author": "xcode"
+    "author": ""
   }
 }
\ No newline at end of file
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-1024.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-1024.png
new file mode 100644
index 00000000..96cdc3fa
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-1024.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20.png
new file mode 100644
index 00000000..bc0c13e2
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png
new file mode 100644
index 00000000..309b7c8a
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png
new file mode 100644
index 00000000..53ae1b40
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29.png
new file mode 100644
index 00000000..835697b9
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png
new file mode 100644
index 00000000..c16b942c
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png
new file mode 100644
index 00000000..9476b491
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40.png
new file mode 100644
index 00000000..309b7c8a
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png
new file mode 100644
index 00000000..c736c93c
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png
new file mode 100644
index 00000000..178a1b98
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png
new file mode 100644
index 00000000..178a1b98
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png
new file mode 100644
index 00000000..cf4d6301
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76.png
new file mode 100644
index 00000000..b5e86a46
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png
new file mode 100644
index 00000000..4b7e4fc7
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png
new file mode 100644
index 00000000..57845314
Binary files /dev/null and b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPad-76x76@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPad-76x76@2x.png
deleted file mode 100644
index 5b02c03d..00000000
Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPad-76x76@2x.png and /dev/null differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPad-84x84@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPad-84x84@2x.png
deleted file mode 100644
index 5f38288d..00000000
Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPad-84x84@2x.png and /dev/null differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-120x120@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-120x120@3x.png
deleted file mode 100644
index 624dd45c..00000000
Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-120x120@3x.png and /dev/null differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-152x152@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-152x152@3x.png
deleted file mode 100644
index d1235e2f..00000000
Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-152x152@3x.png and /dev/null differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@2x.png
deleted file mode 100644
index 15c895f3..00000000
Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@2x.png and /dev/null differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@3x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@3x.png
deleted file mode 100644
index 7c034c51..00000000
Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-20x20@3x.png and /dev/null differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-60x60@2x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-60x60@2x.png
deleted file mode 100644
index 5835894a..00000000
Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-60x60@2x.png and /dev/null differ
diff --git a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/ios-marketing-1024x1024@1x.png b/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/ios-marketing-1024x1024@1x.png
deleted file mode 100644
index 7601500a..00000000
Binary files a/src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/ios-marketing-1024x1024@1x.png and /dev/null differ
diff --git a/src/Calculator.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/Calculator.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json
index 69555e44..d808521a 100644
--- a/src/Calculator.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json
+++ b/src/Calculator.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json
@@ -5,7 +5,7 @@
       "extent": "full-screen",
       "minimum-system-version": "7.0",
       "scale": "2x",
-      "size": "640x960",
+      "size": "0x0",
       "idiom": "iphone"
     },
     {
@@ -14,7 +14,7 @@
       "minimum-system-version": "7.0",
       "subtype": "retina4",
       "scale": "2x",
-      "size": "640x1136",
+      "size": "0x0",
       "idiom": "iphone"
     },
     {
@@ -22,7 +22,7 @@
       "extent": "full-screen",
       "minimum-system-version": "7.0",
       "scale": "1x",
-      "size": "768x1024",
+      "size": "0x0",
       "idiom": "ipad"
     },
     {
@@ -30,7 +30,7 @@
       "extent": "full-screen",
       "minimum-system-version": "7.0",
       "scale": "1x",
-      "size": "1024x768",
+      "size": "0x0",
       "idiom": "ipad"
     },
     {
@@ -38,7 +38,7 @@
       "extent": "full-screen",
       "minimum-system-version": "7.0",
       "scale": "2x",
-      "size": "1536x2048",
+      "size": "0x0",
       "idiom": "ipad"
     },
     {
@@ -46,7 +46,7 @@
       "extent": "full-screen",
       "minimum-system-version": "7.0",
       "scale": "2x",
-      "size": "2048x1536",
+      "size": "0x0",
       "idiom": "ipad"
     }
   ],
diff --git a/src/Calculator.iOS/SplashScreen@2x.png b/src/Calculator.iOS/SplashScreen@2x.png
new file mode 100644
index 00000000..f8e793d9
Binary files /dev/null and b/src/Calculator.iOS/SplashScreen@2x.png differ
diff --git a/src/Calculator.iOS/SplashScreen@3x.png b/src/Calculator.iOS/SplashScreen@3x.png
new file mode 100644
index 00000000..8c5f3984
Binary files /dev/null and b/src/Calculator.iOS/SplashScreen@3x.png differ