diff --git a/Limelight/Images.xcassets/AddComputer.imageset/Contents.json b/Limelight/Images.xcassets/AddComputer.imageset/Contents.json
deleted file mode 100644
index 142a64cf..00000000
--- a/Limelight/Images.xcassets/AddComputer.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "limelight_computer_add_1x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "limelight_computer_add_2x.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "limelight_computer_add_3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Limelight/Images.xcassets/AddComputer.imageset/limelight_computer_add_1x.png b/Limelight/Images.xcassets/AddComputer.imageset/limelight_computer_add_1x.png
deleted file mode 100644
index ae65f59e..00000000
Binary files a/Limelight/Images.xcassets/AddComputer.imageset/limelight_computer_add_1x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AddComputer.imageset/limelight_computer_add_2x.png b/Limelight/Images.xcassets/AddComputer.imageset/limelight_computer_add_2x.png
deleted file mode 100644
index 77eab3b9..00000000
Binary files a/Limelight/Images.xcassets/AddComputer.imageset/limelight_computer_add_2x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AddComputer.imageset/limelight_computer_add_3x.png b/Limelight/Images.xcassets/AddComputer.imageset/limelight_computer_add_3x.png
deleted file mode 100644
index a63a2636..00000000
Binary files a/Limelight/Images.xcassets/AddComputer.imageset/limelight_computer_add_3x.png and /dev/null differ
diff --git a/Limelight/Images.xcassets/AddComputerIcon.imageset/Contents.json b/Limelight/Images.xcassets/AddComputerIcon.imageset/Contents.json
index 86541cfa..159ec2c0 100644
--- a/Limelight/Images.xcassets/AddComputerIcon.imageset/Contents.json
+++ b/Limelight/Images.xcassets/AddComputerIcon.imageset/Contents.json
@@ -2,7 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "limelight_computer_add_icon_1x.png"
     },
     {
       "idiom" : "universal",
@@ -11,7 +12,8 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "limelight_computer_add_icon_3x.png"
     }
   ],
   "info" : {
diff --git a/Limelight/Images.xcassets/AddComputerIcon.imageset/limelight_computer_add_icon_1x.png b/Limelight/Images.xcassets/AddComputerIcon.imageset/limelight_computer_add_icon_1x.png
new file mode 100644
index 00000000..1c3d2db3
Binary files /dev/null and b/Limelight/Images.xcassets/AddComputerIcon.imageset/limelight_computer_add_icon_1x.png differ
diff --git a/Limelight/Images.xcassets/AddComputerIcon.imageset/limelight_computer_add_icon_3x.png b/Limelight/Images.xcassets/AddComputerIcon.imageset/limelight_computer_add_icon_3x.png
new file mode 100644
index 00000000..9323db1f
Binary files /dev/null and b/Limelight/Images.xcassets/AddComputerIcon.imageset/limelight_computer_add_icon_3x.png differ
diff --git a/Limelight/Images.xcassets/NoAppImage.imageset/Contents.json b/Limelight/Images.xcassets/NoAppImage.imageset/Contents.json
index 05a6f1b6..68259b8a 100644
--- a/Limelight/Images.xcassets/NoAppImage.imageset/Contents.json
+++ b/Limelight/Images.xcassets/NoAppImage.imageset/Contents.json
@@ -2,7 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "limelight_no_app_image_1x.png"
     },
     {
       "idiom" : "universal",
@@ -11,7 +12,8 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "limelight_no_app_image_3x.png"
     }
   ],
   "info" : {
diff --git a/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_1x.png b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_1x.png
new file mode 100644
index 00000000..a1d870ad
Binary files /dev/null and b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_1x.png differ
diff --git a/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_3x.png b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_3x.png
new file mode 100644
index 00000000..f3e9a6eb
Binary files /dev/null and b/Limelight/Images.xcassets/NoAppImage.imageset/limelight_no_app_image_3x.png differ
diff --git a/Limelight/Images.xcassets/Settings.imageset/Contents.json b/Limelight/Images.xcassets/Settings.imageset/Contents.json
index 00e65010..36533464 100644
--- a/Limelight/Images.xcassets/Settings.imageset/Contents.json
+++ b/Limelight/Images.xcassets/Settings.imageset/Contents.json
@@ -2,7 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "settings_1x.png"
     },
     {
       "idiom" : "universal",
@@ -11,7 +12,8 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "settings_3x.png"
     }
   ],
   "info" : {
diff --git a/Limelight/Images.xcassets/Settings.imageset/settings_1x.png b/Limelight/Images.xcassets/Settings.imageset/settings_1x.png
new file mode 100644
index 00000000..e7387704
Binary files /dev/null and b/Limelight/Images.xcassets/Settings.imageset/settings_1x.png differ
diff --git a/Limelight/Images.xcassets/Settings.imageset/settings_3x.png b/Limelight/Images.xcassets/Settings.imageset/settings_3x.png
new file mode 100644
index 00000000..05d1454c
Binary files /dev/null and b/Limelight/Images.xcassets/Settings.imageset/settings_3x.png differ