diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/Apple_Watch_App_Icon.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/Apple_Watch_App_Icon.png
new file mode 100644
index 000000000..eaff7d9f2
Binary files /dev/null and b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/Apple_Watch_App_Icon.png differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/Contents.json b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/Contents.json
index 05578bfac..c0ac4f0c1 100644
--- a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/Contents.json
+++ b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/Contents.json
@@ -1,92 +1,14 @@
 {
-  "images": [
+  "images" : [
     {
-      "size": "1024x1024",
-      "idiom": "watch-marketing",
-      "filename": "release-1024x1024.png",
-      "scale": "1x"
-    },
-    {
-      "size": "108x108",
-      "idiom": "watch",
-      "filename": "release-216x216.png",
-      "scale": "2x",
-      "role": "quickLook",
-      "subtype": "44mm"
-    },
-    {
-      "size": "98x98",
-      "idiom": "watch",
-      "filename": "release-196x196.png",
-      "scale": "2x",
-      "role": "quickLook",
-      "subtype": "42mm"
-    },
-    {
-      "size": "86x86",
-      "idiom": "watch",
-      "filename": "release-172x172.png",
-      "scale": "2x",
-      "role": "quickLook",
-      "subtype": "38mm"
-    },
-    {
-      "size": "50x50",
-      "idiom": "watch",
-      "filename": "release-100x100.png",
-      "scale": "2x",
-      "role": "appLauncher",
-      "subtype": "44mm"
-    },
-    {
-      "size": "44x44",
-      "idiom": "watch",
-      "filename": "release-88x88.png",
-      "scale": "2x",
-      "role": "appLauncher",
-      "subtype": "40mm"
-    },
-    {
-      "size": "29x29",
-      "idiom": "watch",
-      "filename": "release-87x87.png",
-      "scale": "3x",
-      "role": "companionSettings"
-    },
-    {
-      "size": "40x40",
-      "idiom": "watch",
-      "filename": "release-80x80.png",
-      "scale": "2x",
-      "role": "appLauncher",
-      "subtype": "38mm"
-    },
-    {
-      "size": "29x29",
-      "idiom": "watch",
-      "filename": "release-58x58.png",
-      "scale": "2x",
-      "role": "companionSettings"
-    },
-    {
-      "size": "27.5x27.5",
-      "idiom": "watch",
-      "filename": "release-55x55.png",
-      "scale": "2x",
-      "role": "notificationCenter",
-      "subtype": "42mm"
-    },
-    {
-      "size": "24x24",
-      "idiom": "watch",
-      "filename": "release-48x48.png",
-      "scale": "2x",
-      "role": "notificationCenter",
-      "subtype": "38mm"
+      "filename" : "Apple_Watch_App_Icon.png",
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "fastlane"
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-100x100.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-100x100.png
deleted file mode 100644
index 0592197c3..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-100x100.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-1024x1024.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-1024x1024.png
deleted file mode 100644
index c6ae93b2d..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-1024x1024.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-172x172.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-172x172.png
deleted file mode 100644
index 676b97339..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-172x172.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-196x196.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-196x196.png
deleted file mode 100644
index 88d4692cf..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-196x196.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-216x216.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-216x216.png
deleted file mode 100644
index 276658ae4..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-216x216.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-48x48.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-48x48.png
deleted file mode 100644
index 130339bf3..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-48x48.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-55x55.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-55x55.png
deleted file mode 100644
index 386344273..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-55x55.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-58x58.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-58x58.png
deleted file mode 100644
index 04ed775f4..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-58x58.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-80x80.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-80x80.png
deleted file mode 100644
index 93fd03617..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-80x80.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-87x87.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-87x87.png
deleted file mode 100644
index 7fa9bb65b..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-87x87.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-88x88.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-88x88.png
deleted file mode 100644
index f4e9e1df3..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-88x88.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Apple_Watch_App_Icon-1.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Apple_Watch_App_Icon-1.png
new file mode 100644
index 000000000..18347a0c2
Binary files /dev/null and b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Apple_Watch_App_Icon-1.png differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Contents.json b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Contents.json
index b6bfed140..5b494e338 100644
--- a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Contents.json
+++ b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Contents.json
@@ -1,92 +1,14 @@
 {
-  "images": [
+  "images" : [
     {
-      "size": "1024x1024",
-      "idiom": "watch-marketing",
-      "filename": "beta-1024x1024.png",
-      "scale": "1x"
-    },
-    {
-      "size": "108x108",
-      "idiom": "watch",
-      "filename": "beta-216x216.png",
-      "scale": "2x",
-      "role": "quickLook",
-      "subtype": "44mm"
-    },
-    {
-      "size": "98x98",
-      "idiom": "watch",
-      "filename": "beta-196x196.png",
-      "scale": "2x",
-      "role": "quickLook",
-      "subtype": "42mm"
-    },
-    {
-      "size": "86x86",
-      "idiom": "watch",
-      "filename": "beta-172x172.png",
-      "scale": "2x",
-      "role": "quickLook",
-      "subtype": "38mm"
-    },
-    {
-      "size": "50x50",
-      "idiom": "watch",
-      "filename": "beta-100x100.png",
-      "scale": "2x",
-      "role": "appLauncher",
-      "subtype": "44mm"
-    },
-    {
-      "size": "44x44",
-      "idiom": "watch",
-      "filename": "beta-88x88.png",
-      "scale": "2x",
-      "role": "appLauncher",
-      "subtype": "40mm"
-    },
-    {
-      "size": "29x29",
-      "idiom": "watch",
-      "filename": "beta-87x87.png",
-      "scale": "3x",
-      "role": "companionSettings"
-    },
-    {
-      "size": "40x40",
-      "idiom": "watch",
-      "filename": "beta-80x80.png",
-      "scale": "2x",
-      "role": "appLauncher",
-      "subtype": "38mm"
-    },
-    {
-      "size": "29x29",
-      "idiom": "watch",
-      "filename": "beta-58x58.png",
-      "scale": "2x",
-      "role": "companionSettings"
-    },
-    {
-      "size": "27.5x27.5",
-      "idiom": "watch",
-      "filename": "beta-55x55.png",
-      "scale": "2x",
-      "role": "notificationCenter",
-      "subtype": "42mm"
-    },
-    {
-      "size": "24x24",
-      "idiom": "watch",
-      "filename": "beta-48x48.png",
-      "scale": "2x",
-      "role": "notificationCenter",
-      "subtype": "38mm"
+      "filename" : "Apple_Watch_App_Icon-1.png",
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "fastlane"
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-100x100.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-100x100.png
deleted file mode 100644
index 9bb5d188a..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-100x100.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-1024x1024.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-1024x1024.png
deleted file mode 100644
index 51c934b9c..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-1024x1024.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-172x172.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-172x172.png
deleted file mode 100644
index 203a7e05d..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-172x172.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-196x196.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-196x196.png
deleted file mode 100644
index cd58a8bb3..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-196x196.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-216x216.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-216x216.png
deleted file mode 100644
index 9b586d3db..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-216x216.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-48x48.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-48x48.png
deleted file mode 100644
index 33dcb3c31..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-48x48.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-55x55.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-55x55.png
deleted file mode 100644
index af6f5851d..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-55x55.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-58x58.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-58x58.png
deleted file mode 100644
index a02ba4ddd..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-58x58.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-80x80.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-80x80.png
deleted file mode 100644
index 738e40298..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-80x80.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-87x87.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-87x87.png
deleted file mode 100644
index 8268365c8..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-87x87.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-88x88.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-88x88.png
deleted file mode 100644
index 5ccfcd963..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-88x88.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Apple_Watch_App_Icon-2.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Apple_Watch_App_Icon-2.png
new file mode 100644
index 000000000..dd47a6704
Binary files /dev/null and b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Apple_Watch_App_Icon-2.png differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Contents.json b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Contents.json
index c967000a0..ec22e3837 100644
--- a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Contents.json
+++ b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Contents.json
@@ -1,92 +1,14 @@
 {
-  "images": [
+  "images" : [
     {
-      "size": "1024x1024",
-      "idiom": "watch-marketing",
-      "filename": "dev-1024x1024.png",
-      "scale": "1x"
-    },
-    {
-      "size": "108x108",
-      "idiom": "watch",
-      "filename": "dev-216x216.png",
-      "scale": "2x",
-      "role": "quickLook",
-      "subtype": "44mm"
-    },
-    {
-      "size": "98x98",
-      "idiom": "watch",
-      "filename": "dev-196x196.png",
-      "scale": "2x",
-      "role": "quickLook",
-      "subtype": "42mm"
-    },
-    {
-      "size": "86x86",
-      "idiom": "watch",
-      "filename": "dev-172x172.png",
-      "scale": "2x",
-      "role": "quickLook",
-      "subtype": "38mm"
-    },
-    {
-      "size": "50x50",
-      "idiom": "watch",
-      "filename": "dev-100x100.png",
-      "scale": "2x",
-      "role": "appLauncher",
-      "subtype": "44mm"
-    },
-    {
-      "size": "44x44",
-      "idiom": "watch",
-      "filename": "dev-88x88.png",
-      "scale": "2x",
-      "role": "appLauncher",
-      "subtype": "40mm"
-    },
-    {
-      "size": "29x29",
-      "idiom": "watch",
-      "filename": "dev-87x87.png",
-      "scale": "3x",
-      "role": "companionSettings"
-    },
-    {
-      "size": "40x40",
-      "idiom": "watch",
-      "filename": "dev-80x80.png",
-      "scale": "2x",
-      "role": "appLauncher",
-      "subtype": "38mm"
-    },
-    {
-      "size": "29x29",
-      "idiom": "watch",
-      "filename": "dev-58x58.png",
-      "scale": "2x",
-      "role": "companionSettings"
-    },
-    {
-      "size": "27.5x27.5",
-      "idiom": "watch",
-      "filename": "dev-55x55.png",
-      "scale": "2x",
-      "role": "notificationCenter",
-      "subtype": "42mm"
-    },
-    {
-      "size": "24x24",
-      "idiom": "watch",
-      "filename": "dev-48x48.png",
-      "scale": "2x",
-      "role": "notificationCenter",
-      "subtype": "38mm"
+      "filename" : "Apple_Watch_App_Icon-2.png",
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "fastlane"
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-100x100.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-100x100.png
deleted file mode 100644
index fdc265179..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-100x100.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-1024x1024.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-1024x1024.png
deleted file mode 100644
index 7b016490a..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-1024x1024.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-172x172.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-172x172.png
deleted file mode 100644
index 1a9e0a588..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-172x172.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-196x196.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-196x196.png
deleted file mode 100644
index b543f1c83..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-196x196.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-216x216.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-216x216.png
deleted file mode 100644
index 8bb5b048a..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-216x216.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-48x48.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-48x48.png
deleted file mode 100644
index 7414b2f7c..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-48x48.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-55x55.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-55x55.png
deleted file mode 100644
index 6f5571f45..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-55x55.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-58x58.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-58x58.png
deleted file mode 100644
index ed5696168..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-58x58.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-80x80.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-80x80.png
deleted file mode 100644
index 0243b91df..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-80x80.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-87x87.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-87x87.png
deleted file mode 100644
index cadeb7903..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-87x87.png and /dev/null differ
diff --git a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-88x88.png b/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-88x88.png
deleted file mode 100644
index 58a02285c..000000000
Binary files a/Sources/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-88x88.png and /dev/null differ