diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/Contents.json b/ShipShape/Assets.xcassets/AppIcon.appiconset/Contents.json
index dfcf466..9664bf6 100644
--- a/ShipShape/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ShipShape/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,169 +1,91 @@
 {
   "images" : [
     {
-      "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" : "Icon-Light-1024×1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     },
     {
-      "filename" : "ipadPro167.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Icon-Dark-1024×1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     },
     {
-      "filename" : "appstore1024.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "Icon-Tinted-1024×1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "size" : "1024x1024"
     },
     {
-      "filename" : "mac16.png",
+      "filename" : "Icon-Mac-16x16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "mac32.png",
+      "filename" : "Icon-Mac-32x32.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
-      "filename" : "mac32.png",
+      "filename" : "Icon-Mac-32x32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
-      "filename" : "mac64.png",
+      "filename" : "Icon-Mac-64x64.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
-      "filename" : "mac128.png",
+      "filename" : "Icon-Mac-128x128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
-      "filename" : "mac256.png",
+      "filename" : "Icon-Mac-256x256.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
-      "filename" : "mac256.png",
+      "filename" : "Icon-Mac-256x256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
-      "filename" : "mac512.png",
+      "filename" : "Icon-Mac-512x512.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "mac512.png",
+      "filename" : "Icon-Mac-512x512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "mac1024.png",
+      "filename" : "Icon-Mac-1024×1024.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"
diff --git "a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Dark-1024\303\2271024.png" "b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Dark-1024\303\2271024.png"
new file mode 100644
index 0000000..bd06a8e
Binary files /dev/null and "b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Dark-1024\303\2271024.png" differ
diff --git "a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Light-1024\303\2271024.png" "b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Light-1024\303\2271024.png"
new file mode 100644
index 0000000..f056f82
Binary files /dev/null and "b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Light-1024\303\2271024.png" differ
diff --git "a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-1024\303\2271024.png" "b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-1024\303\2271024.png"
new file mode 100644
index 0000000..4c6125d
Binary files /dev/null and "b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-1024\303\2271024.png" differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-128x128.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-128x128.png
new file mode 100644
index 0000000..489c3ac
Binary files /dev/null and b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-128x128.png differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-16x16.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-16x16.png
new file mode 100644
index 0000000..4bc3d6d
Binary files /dev/null and b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-16x16.png differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-256x256.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-256x256.png
new file mode 100644
index 0000000..cecfc12
Binary files /dev/null and b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-256x256.png differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-32x32.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-32x32.png
new file mode 100644
index 0000000..0da1cb0
Binary files /dev/null and b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-32x32.png differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-512x512.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-512x512.png
new file mode 100644
index 0000000..6fbc69b
Binary files /dev/null and b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-512x512.png differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-64x64.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-64x64.png
new file mode 100644
index 0000000..ae6e698
Binary files /dev/null and b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Mac-64x64.png differ
diff --git "a/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Tinted-1024\303\2271024.png" "b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Tinted-1024\303\2271024.png"
new file mode 100644
index 0000000..5ea8f2d
Binary files /dev/null and "b/ShipShape/Assets.xcassets/AppIcon.appiconset/Icon-Tinted-1024\303\2271024.png" differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/appstore1024.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/appstore1024.png
deleted file mode 100644
index 5c132e2..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/appstore1024.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipad152.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/ipad152.png
deleted file mode 100644
index a0f8893..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipad152.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipad76.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/ipad76.png
deleted file mode 100644
index 351774d..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipad76.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadNotification20.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadNotification20.png
deleted file mode 100644
index 755899b..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadNotification20.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadNotification40.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadNotification40.png
deleted file mode 100644
index 754b6b0..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadNotification40.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadPro167.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadPro167.png
deleted file mode 100644
index 7064b3e..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadPro167.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSettings29.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSettings29.png
deleted file mode 100644
index 0ec6db2..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSettings29.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSettings58.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSettings58.png
deleted file mode 100644
index fa4519d..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSettings58.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSpotlight40.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSpotlight40.png
deleted file mode 100644
index 754b6b0..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSpotlight40.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSpotlight80.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSpotlight80.png
deleted file mode 100644
index 169b721..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/ipadSpotlight80.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/iphone120.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/iphone120.png
deleted file mode 100644
index 2df3ec9..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/iphone120.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/iphone180.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/iphone180.png
deleted file mode 100644
index 0079eb3..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/iphone180.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac1024.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/mac1024.png
deleted file mode 100644
index 625fbc0..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac1024.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac128.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/mac128.png
deleted file mode 100644
index bc95c55..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac128.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac16.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/mac16.png
deleted file mode 100644
index fe8d44a..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac16.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac256.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/mac256.png
deleted file mode 100644
index 3b0de74..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac256.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac32.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/mac32.png
deleted file mode 100644
index ddd72c9..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac32.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac512.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/mac512.png
deleted file mode 100644
index 054cf42..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac512.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac64.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/mac64.png
deleted file mode 100644
index f2c4d5d..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/mac64.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/notification40.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/notification40.png
deleted file mode 100644
index 754b6b0..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/notification40.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/notification60.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/notification60.png
deleted file mode 100644
index 76ca8fb..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/notification60.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/settings58.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/settings58.png
deleted file mode 100644
index fa4519d..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/settings58.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/settings87.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/settings87.png
deleted file mode 100644
index dc57b8e..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/settings87.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/spotlight120.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/spotlight120.png
deleted file mode 100644
index 2df3ec9..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/spotlight120.png and /dev/null differ
diff --git a/ShipShape/Assets.xcassets/AppIcon.appiconset/spotlight80.png b/ShipShape/Assets.xcassets/AppIcon.appiconset/spotlight80.png
deleted file mode 100644
index 169b721..0000000
Binary files a/ShipShape/Assets.xcassets/AppIcon.appiconset/spotlight80.png and /dev/null differ