diff --git a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Contents.json b/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Contents.json
index 28dcea4e30..29d91251df 100644
--- a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Contents.json
+++ b/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Contents.json
@@ -107,83 +107,6 @@
       "idiom" : "ios-marketing",
       "filename" : "Icon.png",
       "scale" : "1x"
-    },
-    {
-      "size" : "24x24",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "27.5x27.5",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "notificationCenter",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "icon_29pt@2x-2.png",
-      "role" : "companionSettings",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "watch",
-      "filename" : "icon_29pt@3x-1.png",
-      "role" : "companionSettings",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "watch",
-      "filename" : "icon_40pt@2x-2.png",
-      "scale" : "2x",
-      "role" : "appLauncher",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "44x44",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "appLauncher",
-      "subtype" : "40mm"
-    },
-    {
-      "size" : "50x50",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "appLauncher",
-      "subtype" : "44mm"
-    },
-    {
-      "size" : "86x86",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "38mm"
-    },
-    {
-      "size" : "98x98",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "42mm"
-    },
-    {
-      "size" : "108x108",
-      "idiom" : "watch",
-      "scale" : "2x",
-      "role" : "quickLook",
-      "subtype" : "44mm"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "watch-marketing",
-      "filename" : "Icon-1.png",
-      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Icon.png b/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Icon.png
index 12bd1e5772..9a01fc7a8a 100644
Binary files a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Icon.png and b/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Icon.png differ
diff --git a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@2x-2.png b/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@2x-2.png
deleted file mode 100644
index d47b20b371..0000000000
Binary files a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@2x-2.png and /dev/null differ
diff --git a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@3x-1.png b/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@3x-1.png
deleted file mode 100644
index 05b0a95ad4..0000000000
Binary files a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@3x-1.png and /dev/null differ
diff --git a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_40pt@2x-2.png b/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_40pt@2x-2.png
deleted file mode 100644
index 3ea02f17f5..0000000000
Binary files a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_40pt@2x-2.png and /dev/null differ
diff --git a/AdditionalWatchAssets.xcassets/Contents.json b/AdditionalWatchAssets.xcassets/Contents.json
new file mode 100644
index 0000000000..da4a164c91
--- /dev/null
+++ b/AdditionalWatchAssets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/Contents.json b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/Contents.json
new file mode 100644
index 0000000000..b77585b335
--- /dev/null
+++ b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/Contents.json
@@ -0,0 +1,92 @@
+{
+  "images" : [
+    {
+      "size" : "24x24",
+      "idiom" : "watch",
+      "filename" : "icon_24pt@2x.png",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "27.5x27.5",
+      "idiom" : "watch",
+      "filename" : "icon_27.5pt@2x.png",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "filename" : "icon_29pt@2x.png",
+      "role" : "companionSettings",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "filename" : "icon_29pt@3x.png",
+      "role" : "companionSettings",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "watch",
+      "filename" : "icon_40pt@2x.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "44x44",
+      "idiom" : "watch",
+      "filename" : "icon_44pt@2x.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "40mm"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "watch",
+      "filename" : "icon_50pt@2x.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "44mm"
+    },
+    {
+      "size" : "86x86",
+      "idiom" : "watch",
+      "filename" : "icon_86pt@2x.png",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "98x98",
+      "idiom" : "watch",
+      "filename" : "icon_98pt@2x.png",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "108x108",
+      "idiom" : "watch",
+      "filename" : "icon_108pt@2x.png",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "44mm"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "watch-marketing",
+      "filename" : "Icon.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Icon-1.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/Icon.png
similarity index 99%
rename from AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Icon-1.png
rename to AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/Icon.png
index 12bd1e5772..9a01fc7a8a 100644
Binary files a/AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Icon-1.png and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/Icon.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_108pt@2x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_108pt@2x.png
new file mode 100644
index 0000000000..660a9fa3d3
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_108pt@2x.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_24pt@2x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_24pt@2x.png
new file mode 100644
index 0000000000..8a2b5202bb
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_24pt@2x.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_27.5pt@2x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_27.5pt@2x.png
new file mode 100644
index 0000000000..57fe85f89f
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_27.5pt@2x.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@2x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@2x.png
new file mode 100644
index 0000000000..64f465126b
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@2x.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@3x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@3x.png
new file mode 100644
index 0000000000..c0e1042519
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@3x.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_40pt@2x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_40pt@2x.png
new file mode 100644
index 0000000000..42461280e5
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_40pt@2x.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_44pt@2x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_44pt@2x.png
new file mode 100644
index 0000000000..242f88c577
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_44pt@2x.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_50pt@2x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_50pt@2x.png
new file mode 100644
index 0000000000..428a927df3
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_50pt@2x.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_86pt@2x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_86pt@2x.png
new file mode 100644
index 0000000000..3d71febd9e
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_86pt@2x.png differ
diff --git a/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_98pt@2x.png b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_98pt@2x.png
new file mode 100644
index 0000000000..ad82e87ff7
Binary files /dev/null and b/AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_98pt@2x.png differ
diff --git a/Loop b/Loop
index a4568c46f9..f730851546 160000
--- a/Loop
+++ b/Loop
@@ -1 +1 @@
-Subproject commit a4568c46f930fae433737d7e2dd5ee41820db966
+Subproject commit f7308515460ff0c8f86876eda83a26532efc6420
diff --git a/Loop.xcworkspace/contents.xcworkspacedata b/Loop.xcworkspace/contents.xcworkspacedata
index ae393c390a..e3bc36b812 100644
--- a/Loop.xcworkspace/contents.xcworkspacedata
+++ b/Loop.xcworkspace/contents.xcworkspacedata
@@ -4,6 +4,12 @@
    <FileRef
       location = "group:LoopConfigOverride.xcconfig">
    </FileRef>
+   <FileRef
+      location = "group:AdditionalAssets.xcassets">
+   </FileRef>
+   <FileRef
+      location = "group:AdditionalWatchAssets.xcassets">
+   </FileRef>
    <FileRef
       location = "group:Loop/Loop.xcodeproj">
    </FileRef>
diff --git a/LoopConfigOverride.xcconfig b/LoopConfigOverride.xcconfig
index e11adb6cf7..fa11c72eb5 100644
--- a/LoopConfigOverride.xcconfig
+++ b/LoopConfigOverride.xcconfig
@@ -12,4 +12,4 @@ MAIN_APP_DISPLAY_NAME = Loop
 // Assets
 INCLUDED_SOURCE_FILE_NAMES = AdditionalAssets.xcassets
 
-//APPICON_NAME = CustomLoopIcon
+APPICON_NAME = CustomLoopIcon