diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Contents.json b/Limelight/Images.xcassets/AppIcon.appiconset/Contents.json
index f3dd257e..122df341 100644
--- a/Limelight/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Limelight/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,81 +1,101 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "app_icon_settings_58x58_@2x-1.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "app_icon_settings_87x87_@3x.png",
+      "filename" : "Icon-App-29x29@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "app_icon_spotlight_80x80_@2x-1.png",
+      "filename" : "Icon-App-40x40@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "app_icon_spotlight_120x120_@3x.png",
+      "filename" : "Icon-App-40x40@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "app_icon_120x120_@2x.png",
+      "filename" : "Icon-App-60x60@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "app_icon_180x180_@3x.png",
+      "filename" : "Icon-App-60x60@3x.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "app_icon_settings_29x29_@1x.png",
+      "filename" : "Icon-App-29x29@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "app_icon_settings_58x58_@2x.png",
+      "filename" : "Icon-App-29x29@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "app_icon_spotlight_40x40_@1x.png",
+      "filename" : "Icon-App-40x40@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "app_icon_spotlight_80x80_@2x.png",
+      "filename" : "Icon-App-40x40@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "app_icon_76x76_@1x.png",
+      "filename" : "Icon-App-76x76@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "app_icon_152x152_@2x.png",
+      "filename" : "Icon-App-76x76@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "app_icon_167x167_@2x.png",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
     }
   ],
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
new file mode 100644
index 00000000..49a6d8cf
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png
new file mode 100644
index 00000000..4b027705
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
new file mode 100644
index 00000000..4b027705
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
new file mode 100644
index 00000000..2d84c50f
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
new file mode 100644
index 00000000..fa7bb64b
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png
new file mode 100644
index 00000000..10d955b9
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
new file mode 100644
index 00000000..10d955b9
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
new file mode 100644
index 00000000..2bb7d5ef
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
new file mode 100644
index 00000000..2bb7d5ef
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
new file mode 100644
index 00000000..29bed7e9
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
new file mode 100644
index 00000000..958f7ae9
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
new file mode 100644
index 00000000..c3c4861d
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
new file mode 100644
index 00000000..284e50a7
Binary files /dev/null and b/Limelight/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_120x120_@2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_120x120_@2x.png
deleted file mode 100644
index 5191e1ef..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_120x120_@2x.png and /dev/null 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
deleted file mode 100644
index cf22967d..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_152x152_@2x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_167x167_@2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_167x167_@2x.png
deleted file mode 100644
index 40619b06..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_167x167_@2x.png and /dev/null 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
deleted file mode 100644
index 23d5f093..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_180x180_@3x.png and /dev/null 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
deleted file mode 100644
index 47746838..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_76x76_@1x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_29x29_@1x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_29x29_@1x.png
deleted file mode 100644
index 4839e302..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_29x29_@1x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_58x58_@2x-1.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_58x58_@2x-1.png
deleted file mode 100644
index 4bf61e6b..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_58x58_@2x-1.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_58x58_@2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_58x58_@2x.png
deleted file mode 100644
index 4bf61e6b..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_58x58_@2x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_87x87_@3x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_87x87_@3x.png
deleted file mode 100644
index 149f3d9d..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_settings_87x87_@3x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_120x120_@3x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_120x120_@3x.png
deleted file mode 100644
index 5191e1ef..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_120x120_@3x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_40x40_@1x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_40x40_@1x.png
deleted file mode 100644
index 5f7bdf5c..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_40x40_@1x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_80x80_@2x-1.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_80x80_@2x-1.png
deleted file mode 100644
index 8bd0845b..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_80x80_@2x-1.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_80x80_@2x.png b/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_80x80_@2x.png
deleted file mode 100644
index 8bd0845b..00000000
Binary files a/Limelight/Images.xcassets/AppIcon.appiconset/app_icon_spotlight_80x80_@2x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/Logo.imageset/Contents.json b/Limelight/Images.xcassets/Logo.imageset/Contents.json
index fa1e9471..7be9c809 100644
--- a/Limelight/Images.xcassets/Logo.imageset/Contents.json
+++ b/Limelight/Images.xcassets/Logo.imageset/Contents.json
@@ -6,8 +6,8 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "logo_universal.png"
+      "filename" : "logo.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
diff --git a/Limelight/Images.xcassets/Logo.imageset/logo.png b/Limelight/Images.xcassets/Logo.imageset/logo.png
new file mode 100644
index 00000000..83368222
Binary files /dev/null and b/Limelight/Images.xcassets/Logo.imageset/logo.png differ
diff --git a/Limelight/Images.xcassets/Logo.imageset/logo_universal.png b/Limelight/Images.xcassets/Logo.imageset/logo_universal.png
deleted file mode 100644
index eb39b82c..00000000
Binary files a/Limelight/Images.xcassets/Logo.imageset/logo_universal.png and /dev/null differ