diff --git a/AppShared/Assets.xcassets/AccentColor.colorset/Contents.json b/AppShared/Assets.xcassets/AccentColor.colorset/Contents.json
index eb87897..d90b065 100644
--- a/AppShared/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/AppShared/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -1,6 +1,10 @@
 {
   "colors" : [
     {
+      "color" : {
+        "platform" : "universal",
+        "reference" : "systemOrangeColor"
+      },
       "idiom" : "universal"
     }
   ],
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/Contents.json b/AppShared/Assets.xcassets/AppIcon.appiconset/Contents.json
index 1d63b70..300f117 100644
--- a/AppShared/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/AppShared/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,61 +1,175 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "platform" : "ios",
+      "filename" : "notification40.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "notification60.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "settings58.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "settings87.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "spotlight80.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "spotlight120.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iphone120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iphone180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "ipadNotification20.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "ipadNotification40.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "ipadSettings29.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "ipadSettings58.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "ipadSpotlight40.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "ipadSpotlight80.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "ipad76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "ipad152.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "ipadPro167.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "appstore1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
       "size" : "1024x1024"
     },
     {
+      "filename" : "mac16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
+      "filename" : "mac32.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
+      "filename" : "mac32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
+      "filename" : "mac64.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
+      "filename" : "mac128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
+      "filename" : "mac256.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
+      "filename" : "mac256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
+      "filename" : "mac512.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
+      "filename" : "mac512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
+      "filename" : "mac1024.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"
     },
     {
+      "filename" : "mac1024 1.png",
       "idiom" : "universal",
       "platform" : "watchos",
       "size" : "1024x1024"
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/appstore1024.png b/AppShared/Assets.xcassets/AppIcon.appiconset/appstore1024.png
new file mode 100644
index 0000000..f146d8e
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/appstore1024.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/ipad152.png b/AppShared/Assets.xcassets/AppIcon.appiconset/ipad152.png
new file mode 100644
index 0000000..0c295b6
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/ipad152.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/ipad76.png b/AppShared/Assets.xcassets/AppIcon.appiconset/ipad76.png
new file mode 100644
index 0000000..d9ea49d
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/ipad76.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/ipadNotification20.png b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadNotification20.png
new file mode 100644
index 0000000..ab2fba2
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadNotification20.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/ipadNotification40.png b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadNotification40.png
new file mode 100644
index 0000000..4723e5c
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadNotification40.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/ipadPro167.png b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadPro167.png
new file mode 100644
index 0000000..f01b02c
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadPro167.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSettings29.png b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSettings29.png
new file mode 100644
index 0000000..d5e294d
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSettings29.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSettings58.png b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSettings58.png
new file mode 100644
index 0000000..94dc12b
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSettings58.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSpotlight40.png b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSpotlight40.png
new file mode 100644
index 0000000..4723e5c
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSpotlight40.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSpotlight80.png b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSpotlight80.png
new file mode 100644
index 0000000..a2c8e7f
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/ipadSpotlight80.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/iphone120.png b/AppShared/Assets.xcassets/AppIcon.appiconset/iphone120.png
new file mode 100644
index 0000000..dd48fc5
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/iphone120.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/iphone180.png b/AppShared/Assets.xcassets/AppIcon.appiconset/iphone180.png
new file mode 100644
index 0000000..357d2eb
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/iphone180.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/mac1024 1.png b/AppShared/Assets.xcassets/AppIcon.appiconset/mac1024 1.png
new file mode 100644
index 0000000..0c76558
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/mac1024 1.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/mac1024.png b/AppShared/Assets.xcassets/AppIcon.appiconset/mac1024.png
new file mode 100644
index 0000000..0c76558
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/mac1024.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/mac128.png b/AppShared/Assets.xcassets/AppIcon.appiconset/mac128.png
new file mode 100644
index 0000000..9a11c01
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/mac128.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/mac16.png b/AppShared/Assets.xcassets/AppIcon.appiconset/mac16.png
new file mode 100644
index 0000000..4ddba5d
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/mac16.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/mac256.png b/AppShared/Assets.xcassets/AppIcon.appiconset/mac256.png
new file mode 100644
index 0000000..94dd09c
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/mac256.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/mac32.png b/AppShared/Assets.xcassets/AppIcon.appiconset/mac32.png
new file mode 100644
index 0000000..4da53ab
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/mac32.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/mac512.png b/AppShared/Assets.xcassets/AppIcon.appiconset/mac512.png
new file mode 100644
index 0000000..e187cce
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/mac512.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/mac64.png b/AppShared/Assets.xcassets/AppIcon.appiconset/mac64.png
new file mode 100644
index 0000000..b647f18
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/mac64.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/notification40.png b/AppShared/Assets.xcassets/AppIcon.appiconset/notification40.png
new file mode 100644
index 0000000..4723e5c
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/notification40.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/notification60.png b/AppShared/Assets.xcassets/AppIcon.appiconset/notification60.png
new file mode 100644
index 0000000..f3cfcf1
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/notification60.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/settings58.png b/AppShared/Assets.xcassets/AppIcon.appiconset/settings58.png
new file mode 100644
index 0000000..94dc12b
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/settings58.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/settings87.png b/AppShared/Assets.xcassets/AppIcon.appiconset/settings87.png
new file mode 100644
index 0000000..3a7c5ac
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/settings87.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/spotlight120.png b/AppShared/Assets.xcassets/AppIcon.appiconset/spotlight120.png
new file mode 100644
index 0000000..dd48fc5
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/spotlight120.png differ
diff --git a/AppShared/Assets.xcassets/AppIcon.appiconset/spotlight80.png b/AppShared/Assets.xcassets/AppIcon.appiconset/spotlight80.png
new file mode 100644
index 0000000..a2c8e7f
Binary files /dev/null and b/AppShared/Assets.xcassets/AppIcon.appiconset/spotlight80.png differ