diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
index 855b1ac0..8c4db0bd 100644
--- a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,109 +1,102 @@
 {
   "images" : [
     {
-      "filename" : "notification-icon@2x.png",
+      "filename" : "Icon-Small-40.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "notification-icon@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
-      "filename" : "icon-small@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "icon-small@3x.png",
+      "filename" : "Icon-Small@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
-      "filename" : "icon-40@2x.png",
+      "filename" : "Icon-Small-40@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "icon-40@3x.png",
+      "filename" : "Icon-60@2x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "icon-60@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "icon-60@3x.png",
+      "filename" : "Icon-60@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
-      "filename" : "notification-icon~ipad.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
-      "filename" : "notification-icon~ipad@2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "icon-small.png",
+      "filename" : "Icon-Small.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
-      "filename" : "icon-small@2x-1.png",
+      "filename" : "Icon-Small@2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "icon-40.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
-      "filename" : "icon-40@2x-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "icon-76.png",
+      "filename" : "Icon-76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
-      "filename" : "icon-76@2x.png",
+      "filename" : "Icon-76@2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
-      "filename" : "icon-83.5@2x.png",
+      "filename" : "Icon-83.5@2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "ios-marketing.png",
+      "filename" : "iTunesArtwork@2x.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
new file mode 100644
index 00000000..ef12e2f5
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
new file mode 100644
index 00000000..3057b778
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76.png
new file mode 100644
index 00000000..42cdffed
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
new file mode 100644
index 00000000..aea203fb
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
new file mode 100644
index 00000000..69c2b4e9
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png
new file mode 100644
index 00000000..63350076
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
new file mode 100644
index 00000000..3a92c0d6
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
new file mode 100644
index 00000000..26a937e3
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
new file mode 100644
index 00000000..d9296bdb
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
new file mode 100644
index 00000000..e98e3f3c
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
new file mode 100644
index 00000000..cc435d6f
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png
deleted file mode 100644
index babb8385..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x-1.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x-1.png
deleted file mode 100644
index 2f4206a1..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x-1.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
deleted file mode 100644
index 2f4206a1..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
deleted file mode 100644
index f1f48ea8..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
deleted file mode 100644
index f1f48ea8..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
deleted file mode 100644
index 7914c712..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-76.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-76.png
deleted file mode 100644
index 91aa9bb4..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-76.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
deleted file mode 100644
index e1ca5eea..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
deleted file mode 100644
index f1d7b0a8..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small.png
deleted file mode 100644
index 1781cfe3..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@2x-1.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@2x-1.png
deleted file mode 100644
index 020959c5..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@2x-1.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@2x.png
deleted file mode 100644
index 020959c5..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@3x.png
deleted file mode 100644
index 952360a2..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@3x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/ios-marketing.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/ios-marketing.png
deleted file mode 100644
index a6178615..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/ios-marketing.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon@2x.png
deleted file mode 100644
index babb8385..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon@3x.png
deleted file mode 100644
index 86e3830a..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon@3x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad.png
deleted file mode 100644
index 31fab9f8..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad@2x.png
deleted file mode 100644
index babb8385..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad@2x.png and /dev/null differ