diff --git a/Signal/Images.xcassets/AppIcon.appiconset/120-1.png b/Signal/Images.xcassets/AppIcon.appiconset/120-1.png
new file mode 100644
index 0000000000..06a713303b
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/120-1.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/120.png b/Signal/Images.xcassets/AppIcon.appiconset/120.png
new file mode 100644
index 0000000000..06a713303b
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/120.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/152.png b/Signal/Images.xcassets/AppIcon.appiconset/152.png
new file mode 100644
index 0000000000..e2e50f2a94
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/152.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/167.png b/Signal/Images.xcassets/AppIcon.appiconset/167.png
new file mode 100644
index 0000000000..c2cfe5aa31
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/167.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/180.png b/Signal/Images.xcassets/AppIcon.appiconset/180.png
new file mode 100644
index 0000000000..97696313ef
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/180.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/29-1.png b/Signal/Images.xcassets/AppIcon.appiconset/29-1.png
new file mode 100644
index 0000000000..7970cee837
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/29-1.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/29.png b/Signal/Images.xcassets/AppIcon.appiconset/29.png
new file mode 100644
index 0000000000..7970cee837
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/29.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/58-1.png b/Signal/Images.xcassets/AppIcon.appiconset/58-1.png
new file mode 100644
index 0000000000..54e069e3e0
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/58-1.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/58.png b/Signal/Images.xcassets/AppIcon.appiconset/58.png
new file mode 100644
index 0000000000..54e069e3e0
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/58.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/60.png b/Signal/Images.xcassets/AppIcon.appiconset/60.png
new file mode 100644
index 0000000000..64a6876e45
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/60.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/76.png b/Signal/Images.xcassets/AppIcon.appiconset/76.png
new file mode 100644
index 0000000000..92d9771744
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/76.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/80-1.png b/Signal/Images.xcassets/AppIcon.appiconset/80-1.png
new file mode 100644
index 0000000000..7210fc0106
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/80-1.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/80.png b/Signal/Images.xcassets/AppIcon.appiconset/80.png
new file mode 100644
index 0000000000..7210fc0106
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/80.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/87.png b/Signal/Images.xcassets/AppIcon.appiconset/87.png
new file mode 100644
index 0000000000..d5fa6ec91d
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/87.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/Contents.json b/Signal/Images.xcassets/AppIcon.appiconset/Contents.json
index d0f940243c..c9f2a32eed 100644
--- a/Signal/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Signal/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,106 +1,111 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "resized icon.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "60.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "spotlight-icon@1x.png",
+      "filename" : "29.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "settings-icon@2x.png",
+      "filename" : "58.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "settings-icon@3x.png",
+      "filename" : "87.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "spotlight-icon@2x.png",
+      "filename" : "80.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "spotlight-icon@3x-1.png",
+      "filename" : "120.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "launch-icon@2x-1.png",
+      "filename" : "120-1.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "launch-icon@3x.png",
+      "filename" : "180.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
       "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "resized icon-3.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "resized icon-2.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "settings-icon@1x.png",
+      "filename" : "29-1.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "launch-icon@2x.png",
+      "filename" : "58-1.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "spotlight-icon@1x-1.png",
+      "filename" : "resized icon-1.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "spotlight-icon@2x-1.png",
+      "filename" : "80-1.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "launch-icon-ipad@1x.png",
+      "filename" : "76.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "launch-icon-ipad@2x.png",
+      "filename" : "152.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "167.png",
       "scale" : "2x"
     }
   ],
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon-ipad@1x.png b/Signal/Images.xcassets/AppIcon.appiconset/launch-icon-ipad@1x.png
deleted file mode 100644
index 3d1e1a1912..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon-ipad@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon-ipad@2x.png b/Signal/Images.xcassets/AppIcon.appiconset/launch-icon-ipad@2x.png
deleted file mode 100644
index f0bc49a408..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon-ipad@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon@2x-1.png b/Signal/Images.xcassets/AppIcon.appiconset/launch-icon@2x-1.png
deleted file mode 100644
index 1ebfa1cc81..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon@2x-1.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon@2x.png b/Signal/Images.xcassets/AppIcon.appiconset/launch-icon@2x.png
deleted file mode 100644
index 94526ca401..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon@3x.png b/Signal/Images.xcassets/AppIcon.appiconset/launch-icon@3x.png
deleted file mode 100644
index df9a72e088..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/launch-icon@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/resized icon-1.png b/Signal/Images.xcassets/AppIcon.appiconset/resized icon-1.png
new file mode 100644
index 0000000000..d6203f9a16
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/resized icon-1.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/resized icon-2.png b/Signal/Images.xcassets/AppIcon.appiconset/resized icon-2.png
new file mode 100644
index 0000000000..d6203f9a16
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/resized icon-2.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/resized icon-3.png b/Signal/Images.xcassets/AppIcon.appiconset/resized icon-3.png
new file mode 100644
index 0000000000..fe43b9d800
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/resized icon-3.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/resized icon.png b/Signal/Images.xcassets/AppIcon.appiconset/resized icon.png
new file mode 100644
index 0000000000..d6203f9a16
Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/resized icon.png differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/settings-icon@1x.png b/Signal/Images.xcassets/AppIcon.appiconset/settings-icon@1x.png
deleted file mode 100644
index 9b5dbc657b..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/settings-icon@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/settings-icon@2x.png b/Signal/Images.xcassets/AppIcon.appiconset/settings-icon@2x.png
deleted file mode 100644
index 94526ca401..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/settings-icon@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/settings-icon@3x.png b/Signal/Images.xcassets/AppIcon.appiconset/settings-icon@3x.png
deleted file mode 100644
index cf91c0d5bb..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/settings-icon@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@1x-1.png b/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@1x-1.png
deleted file mode 100644
index 217cb295b4..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@1x-1.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@1x.png b/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@1x.png
deleted file mode 100644
index 9b5dbc657b..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@2x-1.png b/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@2x-1.png
deleted file mode 100644
index 88d30f731e..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@2x-1.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@2x.png b/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@2x.png
deleted file mode 100644
index 88d30f731e..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@3x-1.png b/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@3x-1.png
deleted file mode 100644
index 1ebfa1cc81..0000000000
Binary files a/Signal/Images.xcassets/AppIcon.appiconset/spotlight-icon@3x-1.png and /dev/null differ