diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/1024.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/1024.png
new file mode 100644
index 000000000..e163d03cc
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/114-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/114-1.png
deleted file mode 100644
index 2530446b3..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/114-1.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/114.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/114.png
new file mode 100644
index 000000000..5e100baff
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/114.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120-1.png
index 2dda934f3..2c6b9bf5d 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120-1.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120-1.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120-2.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120-2.png
deleted file mode 100644
index 2dda934f3..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120-2.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120.png
new file mode 100644
index 000000000..2c6b9bf5d
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/120.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/128.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/128.png
index df090915d..bc44cfd0a 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/128.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/128.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/152-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/152-1.png
deleted file mode 100644
index 77d55aee4..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/152-1.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/152.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/152.png
new file mode 100644
index 000000000..433e64c78
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/152.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/16.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/16.png
index 311c6e5a9..67f3b5c2b 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/16.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/16.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/167-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/167-1.png
deleted file mode 100644
index aa44604dd..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/167-1.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/167.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/167.png
new file mode 100644
index 000000000..01afcf667
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/167.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/180-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/180-1.png
deleted file mode 100644
index b6285a5d9..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/180-1.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/180.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/180.png
new file mode 100644
index 000000000..560bde19e
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/180.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/20-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/20-1.png
deleted file mode 100644
index b82922d8a..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/20-1.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/20.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/20.png
new file mode 100644
index 000000000..0c66c99f7
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/20.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/256.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/256.png
index 24c0fb975..4dea5c9ca 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/256.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/256.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/29-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/29-1.png
index 919b0dd2e..579be1e8a 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/29-1.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/29-1.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/29.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/29.png
index 919b0dd2e..579be1e8a 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/29.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/29.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/32.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/32.png
index daf80608c..4584ff944 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/32.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/32.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-1.png
index 8f332271f..a972777ca 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-1.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-1.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-2.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-2.png
index 8f332271f..a972777ca 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-2.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-2.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-3.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-3.png
deleted file mode 100644
index 8f332271f..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40-3.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40.png
new file mode 100644
index 000000000..a972777ca
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/40.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/512.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/512.png
index fd3672e99..93cab1215 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/512.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/512.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/57.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/57.png
index b5acb420b..a7953e972 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/57.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/57.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58-1.png
index bb4124323..5f9d8788f 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58-1.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58-1.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58-2.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58-2.png
deleted file mode 100644
index bb4124323..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58-2.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58.png
new file mode 100644
index 000000000..5f9d8788f
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/58.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/60-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/60-1.png
deleted file mode 100644
index 3575896ef..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/60-1.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/60.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/60.png
new file mode 100644
index 000000000..7ea58cc0c
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/60.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/76-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/76-1.png
deleted file mode 100644
index 2f2339b14..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/76-1.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/76.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/76.png
new file mode 100644
index 000000000..9ca04e729
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/76.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80-1.png
index d2ac290e0..77731fbf2 100644
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80-1.png and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80-1.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80-2.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80-2.png
deleted file mode 100644
index d2ac290e0..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80-2.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80.png
new file mode 100644
index 000000000..77731fbf2
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/80.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/87-1.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/87-1.png
deleted file mode 100644
index b3b2248e0..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/87-1.png and /dev/null differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/87.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/87.png
new file mode 100644
index 000000000..808e947d0
Binary files /dev/null and b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/87.png differ
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json
index c02a72c1a..f6479397d 100644
--- a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json
+++ b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Contents.json
@@ -1,13 +1,13 @@
 {
   "images" : [
     {
-      "filename" : "40-1.png",
+      "filename" : "40.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "60-1.png",
+      "filename" : "60.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
@@ -19,25 +19,25 @@
       "size" : "29x29"
     },
     {
-      "filename" : "58-1.png",
+      "filename" : "58.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "87-1.png",
+      "filename" : "87.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
-      "filename" : "80-1.png",
+      "filename" : "80.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "120-2.png",
+      "filename" : "120.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
@@ -49,7 +49,7 @@
       "size" : "57x57"
     },
     {
-      "filename" : "114-1.png",
+      "filename" : "114.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "57x57"
@@ -61,19 +61,19 @@
       "size" : "60x60"
     },
     {
-      "filename" : "180-1.png",
+      "filename" : "180.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
-      "filename" : "20-1.png",
+      "filename" : "20.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
-      "filename" : "40-2.png",
+      "filename" : "40-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
@@ -85,43 +85,43 @@
       "size" : "29x29"
     },
     {
-      "filename" : "58-2.png",
+      "filename" : "58-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "40-3.png",
+      "filename" : "40-2.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
-      "filename" : "80-2.png",
+      "filename" : "80-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "76-1.png",
+      "filename" : "76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
-      "filename" : "152-1.png",
+      "filename" : "152.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
-      "filename" : "167-1.png",
+      "filename" : "167.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "Icon-1024.png",
+      "filename" : "1024.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"
diff --git a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-1024.png b/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-1024.png
deleted file mode 100644
index c4cda64ca..000000000
Binary files a/Riot/Assets/SharedImages.xcassets/AppIcon.appiconset/Icon-1024.png and /dev/null differ