diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
index 625cb090..a0a28b62 100644
--- a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,103 +1,103 @@
 {
   "images" : [
     {
-      "filename" : "Icon-Small-40.png",
+      "filename" : "icon_20pt@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "notification-icon@3x.png",
+      "filename" : "icon_20pt@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
-      "filename" : "Icon-Small@2x-1.png",
+      "filename" : "icon_29pt@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "Icon-Small@3x.png",
+      "filename" : "icon_29pt@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
-      "filename" : "Icon-Small-40@2x.png",
+      "filename" : "icon_40pt@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-60@2x.png",
+      "filename" : "icon_40pt@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "icon-60@2x-1.png",
+      "filename" : "icon_60pt@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "Icon-60@3x.png",
+      "filename" : "icon_60pt@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
-      "filename" : "notification-icon~ipad.png",
+      "filename" : "icon_20pt.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
-      "filename" : "Icon-Small-41.png",
+      "filename" : "icon_20pt@2x-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "Icon-Small.png",
+      "filename" : "icon_29pt.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
-      "filename" : "Icon-Small@2x.png",
+      "filename" : "icon_29pt@2x-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "Icon-Small-42.png",
+      "filename" : "icon_40pt.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-Small-40@2x-1.png",
+      "filename" : "icon_40pt@2x-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-76.png",
+      "filename" : "icon_76pt.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
-      "filename" : "Icon-76@2x.png",
+      "filename" : "icon_76pt@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"
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 ef12e2f5..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 3057b778..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 42cdffed..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 aea203fb..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 69c2b4e9..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-40.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png
deleted file mode 100644
index 63350076..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png
deleted file mode 100644
index 3a92c0d6..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png and /dev/null 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
deleted file mode 100644
index 3a92c0d6..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-41.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-41.png
deleted file mode 100644
index 63350076..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-41.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-42.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-42.png
deleted file mode 100644
index 63350076..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Icon-Small-42.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 26a937e3..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 d9296bdb..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 d9296bdb..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 e98e3f3c..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/icon-60@2x-1.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@2x-1.png
deleted file mode 100644
index 96cde3e3..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-60@2x-1.png and /dev/null differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt.png
new file mode 100644
index 00000000..ae8e49ce
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x-1.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x-1.png
new file mode 100644
index 00000000..965ec201
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x-1.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x.png
new file mode 100644
index 00000000..965ec201
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt@3x.png
new file mode 100644
index 00000000..3d0267ca
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_20pt@3x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt.png
new file mode 100644
index 00000000..7e77b9be
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x-1.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x-1.png
new file mode 100644
index 00000000..ccb3c08e
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x-1.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x.png
new file mode 100644
index 00000000..ccb3c08e
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt@3x.png
new file mode 100644
index 00000000..d288ff81
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_29pt@3x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt.png
new file mode 100644
index 00000000..965ec201
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x-1.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x-1.png
new file mode 100644
index 00000000..35726ff6
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x-1.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x.png
new file mode 100644
index 00000000..35726ff6
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt@3x.png
new file mode 100644
index 00000000..adf3d119
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_40pt@3x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_60pt@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_60pt@2x.png
new file mode 100644
index 00000000..adf3d119
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_60pt@2x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_60pt@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_60pt@3x.png
new file mode 100644
index 00000000..588f6603
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_60pt@3x.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_76pt.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_76pt.png
new file mode 100644
index 00000000..1b5a8622
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_76pt.png differ
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_76pt@2x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_76pt@2x.png
new file mode 100644
index 00000000..c6000830
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon_76pt@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..d5705366
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/notification-icon@3x.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon@3x.png
deleted file mode 100644
index 7f6f672f..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 5eaa5fce..00000000
Binary files a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad.png and /dev/null differ