diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Contents.json b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Contents.json
index 29d91251df..4a9123c273 100644
--- a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Contents.json
+++ b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Contents.json
@@ -1,116 +1,38 @@
 {
   "images" : [
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "icon_20pt@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "icon_20pt@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon_29pt@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon_29pt@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon_40pt@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon_40pt@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "icon_60pt@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "icon_60pt@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "icon_20pt.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "icon_20pt@2x-1.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "icon_29pt.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "icon_29pt@2x-1.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon_40pt.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon_40pt@2x-1.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "icon_76pt.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "icon_76pt@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "icon_83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
       "filename" : "Icon.png",
-      "scale" : "1x"
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Icon-dark.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "Icon-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Icon-dark.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Icon-dark.png
new file mode 100644
index 0000000000..59d52c0939
Binary files /dev/null and b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Icon-dark.png differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Icon-tinted.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Icon-tinted.png
new file mode 100644
index 0000000000..3a5052f03a
Binary files /dev/null and b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/Icon-tinted.png differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt.png
deleted file mode 100644
index 9e63277b69..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt@2x-1.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt@2x-1.png
deleted file mode 100644
index 46b16ff10e..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt@2x-1.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt@2x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt@2x.png
deleted file mode 100644
index 46b16ff10e..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt@3x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt@3x.png
deleted file mode 100644
index e802e8ac2e..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_20pt@3x.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt.png
deleted file mode 100644
index 65516e2b2c..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt@2x-1.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt@2x-1.png
deleted file mode 100644
index d47b20b371..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt@2x-1.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt@2x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt@2x.png
deleted file mode 100644
index d47b20b371..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt@3x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt@3x.png
deleted file mode 100644
index 05b0a95ad4..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_29pt@3x.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt.png
deleted file mode 100644
index 46b16ff10e..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt@2x-1.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt@2x-1.png
deleted file mode 100644
index 3ea02f17f5..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt@2x-1.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt@2x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt@2x.png
deleted file mode 100644
index 3ea02f17f5..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt@3x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt@3x.png
deleted file mode 100644
index 68f41228f2..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_40pt@3x.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_60pt@2x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_60pt@2x.png
deleted file mode 100644
index 68f41228f2..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_60pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_60pt@3x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_60pt@3x.png
deleted file mode 100644
index ad599ec434..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_60pt@3x.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_76pt.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_76pt.png
deleted file mode 100644
index 0826a168d2..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_76pt.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_76pt@2x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_76pt@2x.png
deleted file mode 100644
index 5bab5b21cd..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_76pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_83.5@2x.png b/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_83.5@2x.png
deleted file mode 100644
index b89cd4ed57..0000000000
Binary files a/OverrideAssetsLoop.xcassets/AppIcon.appiconset/icon_83.5@2x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json
index e41963c636..5b3f05e9aa 100644
--- a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json
+++ b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json
@@ -1,129 +1,9 @@
 {
   "images" : [
-    {
-      "filename" : "icon_24pt@2x.png",
-      "idiom" : "watch",
-      "role" : "notificationCenter",
-      "scale" : "2x",
-      "size" : "24x24",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "icon_27.5pt@2x.png",
-      "idiom" : "watch",
-      "role" : "notificationCenter",
-      "scale" : "2x",
-      "size" : "27.5x27.5",
-      "subtype" : "42mm"
-    },
-    {
-      "filename" : "icon_29pt@2x.png",
-      "idiom" : "watch",
-      "role" : "companionSettings",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "icon_29pt@3x.png",
-      "idiom" : "watch",
-      "role" : "companionSettings",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "notificationCenter",
-      "scale" : "2x",
-      "size" : "33x33",
-      "subtype" : "45mm"
-    },
-    {
-      "filename" : "icon_40pt@2x.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "40x40",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "icon_44pt@2x.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "44x44",
-      "subtype" : "40mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "46x46",
-      "subtype" : "41mm"
-    },
-    {
-      "filename" : "icon_50pt@2x.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "50x50",
-      "subtype" : "44mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "51x51",
-      "subtype" : "45mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "54x54",
-      "subtype" : "49mm"
-    },
-    {
-      "filename" : "icon_86pt@2x.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "86x86",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "icon_98pt@2x.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "98x98",
-      "subtype" : "42mm"
-    },
-    {
-      "filename" : "icon_108pt@2x.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "108x108",
-      "subtype" : "44mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "117x117",
-      "subtype" : "45mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "129x129",
-      "subtype" : "49mm"
-    },
     {
       "filename" : "Icon.png",
-      "idiom" : "watch-marketing",
-      "scale" : "1x",
+      "idiom" : "universal",
+      "platform" : "watchos",
       "size" : "1024x1024"
     }
   ],
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_108pt@2x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_108pt@2x.png
deleted file mode 100644
index 660a9fa3d3..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_108pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_24pt@2x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_24pt@2x.png
deleted file mode 100644
index 8a2b5202bb..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_24pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_27.5pt@2x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_27.5pt@2x.png
deleted file mode 100644
index 57fe85f89f..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_27.5pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_29pt@2x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_29pt@2x.png
deleted file mode 100644
index 64f465126b..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_29pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_29pt@3x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_29pt@3x.png
deleted file mode 100644
index c0e1042519..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_29pt@3x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_40pt@2x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_40pt@2x.png
deleted file mode 100644
index 42461280e5..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_40pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_44pt@2x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_44pt@2x.png
deleted file mode 100644
index 242f88c577..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_44pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_50pt@2x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_50pt@2x.png
deleted file mode 100644
index 428a927df3..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_50pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_86pt@2x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_86pt@2x.png
deleted file mode 100644
index 3d71febd9e..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_86pt@2x.png and /dev/null differ
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_98pt@2x.png b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_98pt@2x.png
deleted file mode 100644
index ad82e87ff7..0000000000
Binary files a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/icon_98pt@2x.png and /dev/null differ