diff --git a/Threaded.xcodeproj/project.pbxproj b/Threaded.xcodeproj/project.pbxproj
index bcdd681..10da041 100644
--- a/Threaded.xcodeproj/project.pbxproj
+++ b/Threaded.xcodeproj/project.pbxproj
@@ -992,7 +992,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = fr.lumaa.Threaded.watchkitapp;
 				PRODUCT_NAME = Threaded;
 				SDKROOT = watchos;
@@ -1023,7 +1023,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = fr.lumaa.Threaded.watchkitapp;
 				PRODUCT_NAME = Threaded;
 				SDKROOT = watchos;
@@ -1054,7 +1054,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = fr.lumaa.Threaded.ThreadedWidgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1088,7 +1088,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = fr.lumaa.Threaded.ThreadedWidgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1324,7 +1324,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = fr.lumaa.Threaded.AuthService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1354,7 +1354,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = fr.lumaa.Threaded.AuthService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
diff --git a/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/AppIcon-artisticly.jpg b/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/AppIcon-artisticly.jpg
deleted file mode 100644
index 75c3cc4..0000000
Binary files a/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/AppIcon-artisticly.jpg and /dev/null differ
diff --git a/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/AppIcon-artisticly.png b/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/AppIcon-artisticly.png
new file mode 100644
index 0000000..b3c3337
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/AppIcon-artisticly.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/Contents.json b/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/Contents.json
index aae214b..28e31f9 100644
--- a/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/Contents.json
+++ b/Threaded/Assets.xcassets/AppIcons/ArtisticlyIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "AppIcon-artisticly.jpg",
+      "filename" : "AppIcon-artisticly.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
diff --git a/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/AppIcon-async.jpg b/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/AppIcon-async.jpg
deleted file mode 100644
index f8e3db0..0000000
Binary files a/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/AppIcon-async.jpg and /dev/null differ
diff --git a/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/AppIcon-async.png b/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/AppIcon-async.png
new file mode 100644
index 0000000..5000887
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/AppIcon-async.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/Contents.json b/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/Contents.json
index c05ed15..c80957c 100644
--- a/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/Contents.json
+++ b/Threaded/Assets.xcassets/AppIcons/AsyncIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "AppIcon-async.jpg",
+      "filename" : "AppIcon-async.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
diff --git a/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/AppIcon-blue.jpg b/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/AppIcon-blue.jpg
deleted file mode 100644
index 1d410eb..0000000
Binary files a/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/AppIcon-blue.jpg and /dev/null differ
diff --git a/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/AppIcon-blue.png b/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/AppIcon-blue.png
new file mode 100644
index 0000000..717e6d6
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/AppIcon-blue.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/Contents.json b/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/Contents.json
index ebd3c65..f022009 100644
--- a/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/Contents.json
+++ b/Threaded/Assets.xcassets/AppIcons/BlueIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "AppIcon-blue.jpg",
+      "filename" : "AppIcon-blue.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
diff --git a/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/AppIcon-brat.jpg b/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/AppIcon-brat.jpg
deleted file mode 100644
index e16b0e7..0000000
Binary files a/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/AppIcon-brat.jpg and /dev/null differ
diff --git a/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/AppIcon-brat.png b/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/AppIcon-brat.png
new file mode 100644
index 0000000..62cd758
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/AppIcon-brat.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/Contents.json b/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/Contents.json
index be23c22..4e2e478 100644
--- a/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/Contents.json
+++ b/Threaded/Assets.xcassets/AppIcons/BratIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "AppIcon-brat.jpg",
+      "filename" : "AppIcon-brat.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
diff --git a/Threaded/Assets.xcassets/AppIcons/PinkIcon.imageset/AppIcon-pink.png b/Threaded/Assets.xcassets/AppIcons/PinkIcon.imageset/AppIcon-pink.png
new file mode 100644
index 0000000..7bbb8ad
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/PinkIcon.imageset/AppIcon-pink.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/PinkIcon.imageset/Contents.json b/Threaded/Assets.xcassets/AppIcons/PinkIcon.imageset/Contents.json
new file mode 100644
index 0000000..e553e47
--- /dev/null
+++ b/Threaded/Assets.xcassets/AppIcons/PinkIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon-pink.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/AppIcon-pride.jpg b/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/AppIcon-pride.jpg
deleted file mode 100644
index 24ed1b8..0000000
Binary files a/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/AppIcon-pride.jpg and /dev/null differ
diff --git a/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/AppIcon-pride.png b/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/AppIcon-pride.png
new file mode 100644
index 0000000..392d4bc
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/AppIcon-pride.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/Contents.json b/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/Contents.json
index 3815109..efdeaff 100644
--- a/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/Contents.json
+++ b/Threaded/Assets.xcassets/AppIcons/PrideIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "AppIcon-pride.jpg",
+      "filename" : "AppIcon-pride.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
diff --git a/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/AppIcon-purple.jpg b/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/AppIcon-purple.jpg
deleted file mode 100644
index 9a6a49e..0000000
Binary files a/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/AppIcon-purple.jpg and /dev/null differ
diff --git a/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/AppIcon-purple.png b/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/AppIcon-purple.png
new file mode 100644
index 0000000..9ea358e
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/AppIcon-purple.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/Contents.json b/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/Contents.json
index a694e3f..2508d28 100644
--- a/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/Contents.json
+++ b/Threaded/Assets.xcassets/AppIcons/PurpleIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "AppIcon-purple.jpg",
+      "filename" : "AppIcon-purple.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
diff --git a/Threaded/Assets.xcassets/AppIcons/RedIcon.appiconset/AppIcon-red.png b/Threaded/Assets.xcassets/AppIcons/RedIcon.appiconset/AppIcon-red.png
new file mode 100644
index 0000000..36ec8bd
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/RedIcon.appiconset/AppIcon-red.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/RedIcon.appiconset/Contents.json b/Threaded/Assets.xcassets/AppIcons/RedIcon.appiconset/Contents.json
new file mode 100644
index 0000000..cbd85e8
--- /dev/null
+++ b/Threaded/Assets.xcassets/AppIcons/RedIcon.appiconset/Contents.json
@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon-red.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Threaded/Assets.xcassets/AppIcons/StoneImage.imageset/AppIcon-stone.png b/Threaded/Assets.xcassets/AppIcons/StoneImage.imageset/AppIcon-stone.png
new file mode 100644
index 0000000..5280b4a
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/StoneImage.imageset/AppIcon-stone.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/StoneImage.imageset/Contents.json b/Threaded/Assets.xcassets/AppIcons/StoneImage.imageset/Contents.json
new file mode 100644
index 0000000..2267dc8
--- /dev/null
+++ b/Threaded/Assets.xcassets/AppIcons/StoneImage.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon-stone.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/AppIcon-twitter.jpg b/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/AppIcon-twitter.jpg
deleted file mode 100644
index c1a87a0..0000000
Binary files a/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/AppIcon-twitter.jpg and /dev/null differ
diff --git a/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/AppIcon-twitter.png b/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/AppIcon-twitter.png
new file mode 100644
index 0000000..eb33aff
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/AppIcon-twitter.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/Contents.json b/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/Contents.json
index 023c015..b9cf421 100644
--- a/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/Contents.json
+++ b/Threaded/Assets.xcassets/AppIcons/TwitterIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "AppIcon-twitter.jpg",
+      "filename" : "AppIcon-twitter.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
diff --git a/Threaded/Assets.xcassets/AppIcons/YellowIcon.imageset/AppIcon-yellow.png b/Threaded/Assets.xcassets/AppIcons/YellowIcon.imageset/AppIcon-yellow.png
new file mode 100644
index 0000000..d918189
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIcons/YellowIcon.imageset/AppIcon-yellow.png differ
diff --git a/Threaded/Assets.xcassets/AppIcons/YellowIcon.imageset/Contents.json b/Threaded/Assets.xcassets/AppIcons/YellowIcon.imageset/Contents.json
new file mode 100644
index 0000000..a579a15
--- /dev/null
+++ b/Threaded/Assets.xcassets/AppIcons/YellowIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon-yellow.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Threaded/Assets.xcassets/AppIconsPrevis/PinkIcon.imageset/AppIcon-pink.png b/Threaded/Assets.xcassets/AppIconsPrevis/PinkIcon.imageset/AppIcon-pink.png
new file mode 100644
index 0000000..7bbb8ad
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIconsPrevis/PinkIcon.imageset/AppIcon-pink.png differ
diff --git a/Threaded/Assets.xcassets/AppIconsPrevis/PinkIcon.imageset/Contents.json b/Threaded/Assets.xcassets/AppIconsPrevis/PinkIcon.imageset/Contents.json
new file mode 100644
index 0000000..e553e47
--- /dev/null
+++ b/Threaded/Assets.xcassets/AppIconsPrevis/PinkIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon-pink.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Threaded/Assets.xcassets/AppIconsPrevis/RedIcon.imageset/AppIcon-red.png b/Threaded/Assets.xcassets/AppIconsPrevis/RedIcon.imageset/AppIcon-red.png
new file mode 100644
index 0000000..36ec8bd
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIconsPrevis/RedIcon.imageset/AppIcon-red.png differ
diff --git a/Threaded/Assets.xcassets/AppIconsPrevis/RedIcon.imageset/Contents.json b/Threaded/Assets.xcassets/AppIconsPrevis/RedIcon.imageset/Contents.json
new file mode 100644
index 0000000..6181339
--- /dev/null
+++ b/Threaded/Assets.xcassets/AppIconsPrevis/RedIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon-red.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Threaded/Assets.xcassets/AppIconsPrevis/StoneIcon.imageset/AppIcon-stone.png b/Threaded/Assets.xcassets/AppIconsPrevis/StoneIcon.imageset/AppIcon-stone.png
new file mode 100644
index 0000000..5280b4a
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIconsPrevis/StoneIcon.imageset/AppIcon-stone.png differ
diff --git a/Threaded/Assets.xcassets/AppIconsPrevis/StoneIcon.imageset/Contents.json b/Threaded/Assets.xcassets/AppIconsPrevis/StoneIcon.imageset/Contents.json
new file mode 100644
index 0000000..2267dc8
--- /dev/null
+++ b/Threaded/Assets.xcassets/AppIconsPrevis/StoneIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon-stone.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Threaded/Assets.xcassets/AppIconsPrevis/YellowIcon.imageset/AppIcon-yellow.png b/Threaded/Assets.xcassets/AppIconsPrevis/YellowIcon.imageset/AppIcon-yellow.png
new file mode 100644
index 0000000..d918189
Binary files /dev/null and b/Threaded/Assets.xcassets/AppIconsPrevis/YellowIcon.imageset/AppIcon-yellow.png differ
diff --git a/Threaded/Assets.xcassets/AppIconsPrevis/YellowIcon.imageset/Contents.json b/Threaded/Assets.xcassets/AppIconsPrevis/YellowIcon.imageset/Contents.json
new file mode 100644
index 0000000..a579a15
--- /dev/null
+++ b/Threaded/Assets.xcassets/AppIconsPrevis/YellowIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon-yellow.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Threaded/Localizable.xcstrings b/Threaded/Localizable.xcstrings
index f95c231..d9a2b47 100644
--- a/Threaded/Localizable.xcstrings
+++ b/Threaded/Localizable.xcstrings
@@ -1976,6 +1976,22 @@
         }
       }
     },
+    "setting.app-icon.pink" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pink"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Rose"
+          }
+        }
+      }
+    },
     "setting.app-icon.pride" : {
       "localizations" : {
         "en" : {
@@ -2008,6 +2024,22 @@
         }
       }
     },
+    "setting.app-icon.red" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Red"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Rouge"
+          }
+        }
+      }
+    },
     "setting.app-icon.unknown" : {
       "localizations" : {
         "en" : {
@@ -2024,6 +2056,22 @@
         }
       }
     },
+    "setting.app-icon.yellow" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Yellow"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Jaune"
+          }
+        }
+      }
+    },
     "setting.appearence" : {
       "localizations" : {
         "en" : {