diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index dcaae9d60..4f130011c 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 0dbc993c5..de367e540 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index f8cdb721f..ba58ba094 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 9d778dae6..88f8ff382 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 073d39987..7b985a732 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png
new file mode 100644
index 000000000..d427470ef
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x-1.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x-1.png
new file mode 100644
index 000000000..9eff5130e
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x-1.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png
new file mode 100644
index 000000000..9eff5130e
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png
new file mode 100644
index 000000000..7a3faf54d
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png
new file mode 100644
index 000000000..694696608
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x-1.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x-1.png
new file mode 100644
index 000000000..52b6fecc4
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x-1.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png
new file mode 100644
index 000000000..52b6fecc4
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png
new file mode 100644
index 000000000..e82397fa4
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png
new file mode 100644
index 000000000..9eff5130e
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x-1.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x-1.png
new file mode 100644
index 000000000..b2200b15a
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x-1.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png
new file mode 100644
index 000000000..b2200b15a
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png
similarity index 95%
rename from ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
rename to ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png
index b231b225e..05cb64b1b 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png
new file mode 100644
index 000000000..611a82ad1
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png
new file mode 100644
index 000000000..0572200b0
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png
new file mode 100644
index 000000000..0edba821d
Binary files /dev/null and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Contents.json
index 45f49d2d9..40df08797 100644
--- a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,37 +1,39 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "20@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "20@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-Small@2x.png",
+      "filename" : "29@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-Small@3x.png",
+      "filename" : "29@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon-Small-40@2x.png",
+      "filename" : "40@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon-Small-40@3x.png",
+      "filename" : "40@3x.png",
       "scale" : "3x"
     },
     {
@@ -47,55 +49,57 @@
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
       "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "20.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "20@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-Small.png",
+      "filename" : "29.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-Small@2x.png",
+      "filename" : "29@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-Small-40.png",
+      "filename" : "40.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-Small-40@2x.png",
+      "filename" : "40@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon-76.png",
+      "filename" : "76.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon-76@2x.png",
+      "filename" : "76@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "Icon-83.5@2x.png",
+      "filename" : "83.5@2x.png",
       "scale" : "2x"
     }
   ],
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60.png
index 831ca372a..7a3faf54d 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
index 56cf8cf63..05cb64b1b 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
index d8a3ce214..c48763cb8 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72.png
index a6f6fd102..2f8795e93 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png
index 9f5980f00..0eda645e7 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-76.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-76.png
deleted file mode 100644
index fbbce5232..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-76.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
deleted file mode 100644
index 222e678fe..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png
deleted file mode 100644
index 164bf2240..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
deleted file mode 100644
index dacec88da..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
deleted file mode 100644
index 400d21ab7..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png
index 23d55fc26..afb064df8 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png
index bf07903f5..e610ab903 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small.png
deleted file mode 100644
index c551d5c30..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
deleted file mode 100644
index cbec52bad..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
deleted file mode 100644
index 374a89390..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon.png
index cda486b65..1bde4de8b 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon.png differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon@2x.png
index 8cd3500d8..ad963231f 100644
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon@2x.png differ