diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj
index 85576315..e5429eea 100644
--- a/Mastodon.xcodeproj/project.pbxproj
+++ b/Mastodon.xcodeproj/project.pbxproj
@@ -1784,6 +1784,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
 				DEVELOPMENT_TEAM = 7LFDZ96332;
 				INFOPLIST_FILE = Mastodon/Info.plist;
@@ -1810,6 +1811,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
 				DEVELOPMENT_TEAM = 7LFDZ96332;
 				INFOPLIST_FILE = Mastodon/Info.plist;
diff --git a/Mastodon/Info.plist b/Mastodon/Info.plist
index ff87c179..e3d8d4a9 100644
--- a/Mastodon/Info.plist
+++ b/Mastodon/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>sparrow</string>
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
index 9221b9bb..855b1ac0 100644
--- a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,91 +1,109 @@
 {
   "images" : [
     {
+      "filename" : "notification-icon@2x.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",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
+      "filename" : "icon-40@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "icon-40@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
+      "filename" : "icon-60@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
+      "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",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
+      "filename" : "icon-small@2x-1.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",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
+      "filename" : "icon-76@2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
+      "filename" : "icon-83.5@2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
+      "filename" : "ios-marketing.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"
diff --git a/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png
new file mode 100644
index 00000000..babb8385
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40.png 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
new file mode 100644
index 00000000..2f4206a1
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x-1.png 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
new file mode 100644
index 00000000..2f4206a1
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png 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
new file mode 100644
index 00000000..f1f48ea8
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png 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
new file mode 100644
index 00000000..f1f48ea8
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..7914c712
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..91aa9bb4
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..e1ca5eea
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..f1d7b0a8
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.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small.png
new file mode 100644
index 00000000..1781cfe3
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-1.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@2x-1.png
new file mode 100644
index 00000000..020959c5
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/icon-small@2x-1.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..020959c5
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..952360a2
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/ios-marketing.png b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/ios-marketing.png
new file mode 100644
index 00000000..a6178615
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/ios-marketing.png 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
new file mode 100644
index 00000000..babb8385
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon@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
new file mode 100644
index 00000000..86e3830a
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon@3x.png 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
new file mode 100644
index 00000000..31fab9f8
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad.png 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
new file mode 100644
index 00000000..babb8385
Binary files /dev/null and b/Mastodon/Resources/Assets.xcassets/AppIcon.appiconset/notification-icon~ipad@2x.png differ