diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iOS-Marketing-1024@1x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iOS-Marketing-1024@1x.png
deleted file mode 100644
index a3d57d11a8..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iOS-Marketing-1024@1x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-20@1x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-20@1x.png
deleted file mode 100644
index 016311d94d..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-20@1x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-20@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-20@2x.png
deleted file mode 100644
index effe1e25c9..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-20@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-29@1x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-29@1x.png
deleted file mode 100644
index 9845f4c49d..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-29@1x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-29@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-29@2x.png
deleted file mode 100644
index 6e46eab086..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-29@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-40@1x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-40@1x.png
deleted file mode 100644
index effe1e25c9..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-40@1x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-40@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-40@2x.png
deleted file mode 100644
index 59342c01ed..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-40@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-76@1x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-76@1x.png
deleted file mode 100644
index f2c47274f0..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-76@1x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-76@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-76@2x.png
deleted file mode 100644
index bc5f230493..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-76@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-83.5@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-83.5@2x.png
deleted file mode 100644
index 906758b9b3..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPad-83.5@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@2x.png
deleted file mode 100644
index effe1e25c9..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@3x.png
deleted file mode 100644
index babaa4e0fe..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-20@3x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@1x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@1x.png
deleted file mode 100644
index 9845f4c49d..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@1x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@2x.png
deleted file mode 100644
index 6e46eab086..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@3x.png
deleted file mode 100644
index fc4f1a07b1..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-29@3x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@2x.png
deleted file mode 100644
index 59342c01ed..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@3x.png
deleted file mode 100644
index 45cdb81c1f..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-40@3x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-57@1x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-57@1x.png
deleted file mode 100644
index f03bc5e46f..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-57@1x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-57@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-57@2x.png
deleted file mode 100644
index f3934711d7..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-57@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@2x.png
deleted file mode 100644
index 45cdb81c1f..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@3x.png
deleted file mode 100644
index 07d0c7869b..0000000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon~iPhone-60@3x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
index 46683a282a..821cf4ec26 100644
--- a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,129 +1,33 @@
 {
   "images" : [
     {
-      "filename" : "AppIcon~iPhone-20@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "AppIcon~iPhone-20@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "AppIcon~iPhone-29@1x.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "AppIcon~iPhone-29@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "AppIcon~iPhone-29@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "AppIcon~iPhone-40@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "AppIcon~iPhone-40@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "AppIcon~iPhone-57@1x.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "57x57"
-    },
-    {
-      "filename" : "AppIcon~iPhone-57@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "57x57"
-    },
-    {
-      "filename" : "AppIcon~iPhone-60@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "AppIcon~iPhone-60@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "AppIcon~iPad-20@1x.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "AppIcon~iPad-20@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "AppIcon~iPad-29@1x.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "AppIcon~iPad-29@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "AppIcon~iPad-40@1x.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "AppIcon~iPad-40@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "AppIcon~iPad-76@1x.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "AppIcon~iPad-76@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
+      "filename" : "Icon-Light-1024x1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     },
     {
-      "filename" : "AppIcon~iPad-83.5@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Icon-Dark-1024x1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     },
     {
-      "filename" : "AppIcon~iOS-Marketing-1024@1x.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "Icon-Tinted-1024x1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "size" : "1024x1024"
     },
     {
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Dark-1024x1024.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Dark-1024x1024.png
new file mode 100644
index 0000000000..71b13f660f
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Dark-1024x1024.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Light-1024x1024.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Light-1024x1024.png
new file mode 100644
index 0000000000..30a77ea0c6
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Light-1024x1024.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Tinted-1024x1024.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Tinted-1024x1024.png
new file mode 100644
index 0000000000..235bc0517e
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Tinted-1024x1024.png differ