diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/Amahi-logo.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/Amahi-logo.png
new file mode 100644
index 00000000000..d452b57b511
Binary files /dev/null and b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/Amahi-logo.png differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/Contents.json
similarity index 93%
rename from AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/Contents.json
rename to AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/Contents.json
index 80d3b53d7f2..07a5be1732e 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/Contents.json	
@@ -12,7 +12,7 @@
           "value" : "light"
         }
       ],
-      "filename" : "amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.png",
+      "filename" : "Amahi-logo.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/amahi-logo-white-font-eadfe8374fd0776c870126fbef1c89557662c05bf9813aa212fa22fa7b243369-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/amahi-logo-white-font-eadfe8374fd0776c870126fbef1c89557662c05bf9813aa212fa22fa7b243369-1.png
similarity index 100%
rename from AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/amahi-logo-white-font-eadfe8374fd0776c870126fbef1c89557662c05bf9813aa212fa22fa7b243369-1.png
rename to AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/amahi-logo-white-font-eadfe8374fd0776c870126fbef1c89557662c05bf9813aa212fa22fa7b243369-1.png
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/amahi-logo-white-font-eadfe8374fd0776c870126fbef1c89557662c05bf9813aa212fa22fa7b243369.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/amahi-logo-white-font-eadfe8374fd0776c870126fbef1c89557662c05bf9813aa212fa22fa7b243369.png
similarity index 100%
rename from AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/amahi-logo-white-font-eadfe8374fd0776c870126fbef1c89557662c05bf9813aa212fa22fa7b243369.png
rename to AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo Login.imageset/amahi-logo-white-font-eadfe8374fd0776c870126fbef1c89557662c05bf9813aa212fa22fa7b243369.png
diff --git a/AmahiAnywhere/AmahiAnywhere/Amahi Logo White Font.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo White Font.imageset/Amahi Logo White Font.png
similarity index 100%
rename from AmahiAnywhere/AmahiAnywhere/Amahi Logo White Font.png
rename to AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo White Font.imageset/Amahi Logo White Font.png
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo White Font.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo White Font.imageset/Contents.json
new file mode 100644
index 00000000000..dc376fa07bb
--- /dev/null
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi Logo White Font.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Amahi Logo White Font.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Amahi Logo White Font.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Amahi Logo White Font.png
new file mode 100644
index 00000000000..7e0e9eb4b06
Binary files /dev/null and b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Amahi Logo White Font.png differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Amahi-logo launch-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Amahi-logo launch-1.png
new file mode 100644
index 00000000000..d452b57b511
Binary files /dev/null and b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Amahi-logo launch-1.png differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Amahi-logo launch.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Amahi-logo launch.png
new file mode 100644
index 00000000000..d452b57b511
Binary files /dev/null and b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Amahi-logo launch.png differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Contents.json
new file mode 100644
index 00000000000..708884b57a4
--- /dev/null
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/Amahi-logo launch.imageset/Contents.json	
@@ -0,0 +1,83 @@
+{
+  "images" : [
+    {
+      "filename" : "Amahi-logo launch.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "Amahi-logo launch-1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Amahi Logo White Font.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.png
deleted file mode 100644
index 27835afde64..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.imageset/amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/Contents.json
index 44513b609eb..e7e0638373f 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/Contents.json
@@ -6,72 +6,10 @@
       "scale" : "1x"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "right arrow.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "arrowRightIcon.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/arrowRightIcon.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/arrowRightIcon.png
deleted file mode 100644
index 48a6959258d..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/arrowRightIcon.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/right arrow.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/right arrow.png
deleted file mode 100644
index 538bd5a2c5c..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/arrowRightIcon.imageset/right arrow.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/Contents.json
index 72675ba1c8d..514ead72230 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/Contents.json
@@ -5,79 +5,15 @@
       "idiom" : "universal",
       "scale" : "1x"
     },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "backIcon.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
     {
       "filename" : "backIcon@2x-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "backIcon@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
     {
       "filename" : "backIcon@3x-1.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "backIcon@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/backIcon.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/backIcon.png
deleted file mode 100644
index 0ebfafda169..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/backIcon.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/backIcon@2x.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/backIcon@2x.png
deleted file mode 100644
index 7d504c47515..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/backIcon@2x.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/backIcon@3x.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/backIcon@3x.png
deleted file mode 100644
index 0da6be7caf5..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/backIcon@3x.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/image.png
deleted file mode 100644
index 031f3579be3..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backIcon.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/15back.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/15back.png
deleted file mode 100644
index b12946ed6c8..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/15back.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/Contents.json
index 26965188c21..06aeea21e02 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/Contents.json
@@ -6,72 +6,10 @@
       "scale" : "1x"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "15back.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "backwardVideo-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/backwardVideo-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/backwardVideo-1.png
deleted file mode 100644
index af985e4fdbd..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/backwardVideo.imageset/backwardVideo-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/Contents.json
index c5090a536bf..c31de1d881a 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "closeButton.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "closeButton-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/closeButton-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/closeButton-1.png
deleted file mode 100644
index d688cf65b32..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/closeButton-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/image.png
deleted file mode 100644
index 58c43193f82..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/closeButton.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/Contents.json
index f5a02e2ad07..14dac8a679f 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/Contents.json
@@ -5,79 +5,15 @@
       "idiom" : "universal",
       "scale" : "1x"
     },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
     {
       "filename" : "ic_fast_forward_white_36pt_2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "ic_fast_forward_white_36pt_2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
     {
       "filename" : "ic_fast_forward_white_36pt_3x.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "ic_fast_forward_white_36pt_3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/ic_fast_forward_white_36pt_2x-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/ic_fast_forward_white_36pt_2x-1.png
deleted file mode 100644
index ad9097d5a13..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/ic_fast_forward_white_36pt_2x-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/ic_fast_forward_white_36pt_3x-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/ic_fast_forward_white_36pt_3x-1.png
deleted file mode 100644
index 9c401ccde09..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/ic_fast_forward_white_36pt_3x-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/image2x.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/image2x.png
deleted file mode 100644
index d06117fb37b..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/image2x.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/image3x.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/image3x.png
deleted file mode 100644
index 05b30bf0761..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastForwardIcon.imageset/image3x.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/Contents.json
index 1664e491f6c..e633bb39ad1 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/Contents.json
@@ -5,80 +5,15 @@
       "idiom" : "universal",
       "scale" : "1x"
     },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "ic_fast_rewind_white_36pt-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
     {
       "filename" : "ic_fast_rewind_white_36pt_2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "ic_fast_rewind_white_36pt_2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
     {
       "filename" : "ic_fast_rewind_white_36pt_3x.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "ic_fast_rewind_white_36pt_3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/ic_fast_rewind_white_36pt-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/ic_fast_rewind_white_36pt-1.png
deleted file mode 100644
index 3d754e27a64..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/ic_fast_rewind_white_36pt-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/ic_fast_rewind_white_36pt_2x-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/ic_fast_rewind_white_36pt_2x-1.png
deleted file mode 100644
index 12ff39ab480..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/ic_fast_rewind_white_36pt_2x-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/ic_fast_rewind_white_36pt_3x-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/ic_fast_rewind_white_36pt_3x-1.png
deleted file mode 100644
index 253833bbc36..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/ic_fast_rewind_white_36pt_3x-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/image.png
deleted file mode 100644
index c1ddb9a7991..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/image3x.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/image3x.png
deleted file mode 100644
index 1ff60fbe010..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/fastRewindIcon.imageset/image3x.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/Contents.json
index af99d6c04f0..c48b79af2f3 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/Contents.json
@@ -5,80 +5,15 @@
       "idiom" : "universal",
       "scale" : "1x"
     },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "forwardIcon-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
     {
       "filename" : "forwardIcon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "forwardIcon@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
     {
       "filename" : "forwardIcon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "forwardIcon@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/forwardIcon-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/forwardIcon-1.png
deleted file mode 100644
index 278268f7e61..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/forwardIcon-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/forwardIcon@2x-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/forwardIcon@2x-1.png
deleted file mode 100644
index 3d87a305bf7..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/forwardIcon@2x-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/forwardIcon@3x-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/forwardIcon@3x-1.png
deleted file mode 100644
index 8e2eb401caa..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/forwardIcon@3x-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/image2x.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/image2x.png
deleted file mode 100644
index c511739a359..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/image2x.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/image3x.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/image3x.png
deleted file mode 100644
index 7d4dd3218d2..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardIcon.imageset/image3x.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/Contents.json
index be01609b7ea..9ed123c4433 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/Contents.json
@@ -6,72 +6,10 @@
       "scale" : "1x"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image2x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "forwardVideo-1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/forwardVideo-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/forwardVideo-1.png
deleted file mode 100644
index ba5937a6048..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/forwardVideo-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/image2x.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/image2x.png
deleted file mode 100644
index eff84dbe5a3..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/forwardVideo.imageset/image2x.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/moreIcon.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/moreIcon.imageset/Contents.json
index bbdf23509e3..cb9372ea2c4 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/moreIcon.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/moreIcon.imageset/Contents.json
@@ -4,11 +4,53 @@
       "idiom" : "universal",
       "scale" : "1x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
     {
       "filename" : "ic_more_vert.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "image.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic_more_vert-1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "scale" : "3x"
@@ -20,10 +62,8 @@
           "value" : "light"
         }
       ],
-      "filename" : "image.png",
       "idiom" : "universal",
-      "scale" : "2x",
-      "unassigned" : true
+      "scale" : "3x"
     },
     {
       "appearances" : [
@@ -32,10 +72,8 @@
           "value" : "dark"
         }
       ],
-      "filename" : "ic_more_vert-1.png",
       "idiom" : "universal",
-      "scale" : "2x",
-      "unassigned" : true
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/Contents.json
index 1c98e9d1358..da76742bf98 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "nextButton.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "nextButton-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/image.png
deleted file mode 100644
index 5895eb25654..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/nextButton-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/nextButton-1.png
deleted file mode 100644
index 61665c9223b..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/nextButton.imageset/nextButton-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/Contents.json
index dff42396f7c..0ee11743269 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "pauseButton.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "pauseButton-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/image.png
deleted file mode 100644
index 27480d889a2..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/pauseButton-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/pauseButton-1.png
deleted file mode 100644
index 90e0bbcd3a6..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/pauseIcon.imageset/pauseButton-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/Contents.json
index b7c3d6a610f..2248c5ed0d7 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "playButton.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "playButton-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/image.png
deleted file mode 100644
index d231311c9aa..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/playButton-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/playButton-1.png
deleted file mode 100644
index a05a48abd7c..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/playIcon.imageset/playButton-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/Contents.json
index f574ff114ab..21f5d2b5e35 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "prevButton-1.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "prevButton.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/image.png
deleted file mode 100644
index fac7097066c..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/prevButton.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/prevButton.png
deleted file mode 100644
index a32fda5d963..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/prevButton.imageset/prevButton.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/Contents.json
index 89b0e5e6df3..1348cde982c 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "repeat.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "repeat-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/image.png
deleted file mode 100644
index 6514fe50100..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/repeat-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/repeat-1.png
deleted file mode 100644
index e299dd102ec..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeat.imageset/repeat-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/Contents.json
index 9d22eef6547..3252c8ca06d 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "repeatButton.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "repeatButton-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/image.png
deleted file mode 100644
index ba94ac6eff6..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/repeatButton-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/repeatButton-1.png
deleted file mode 100644
index 04cb0bc5e47..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatAll.imageset/repeatButton-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/Contents.json
index 5e48c3315f2..6c98df84aec 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "repeat1Button.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "repeat1Button-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/image.png
deleted file mode 100644
index 8988c06bd51..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/repeat1Button-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/repeat1Button-1.png
deleted file mode 100644
index 46d4b159fad..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/repeatCurrent.imageset/repeat1Button-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/Contents.json
index ec7ba61ff79..b0da47a4e52 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "shuffle.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "shuffle-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "shuffle-2.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/shuffle-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/shuffle-1.png
deleted file mode 100644
index 2a048badd5d..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/shuffle-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/shuffle-2.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/shuffle-2.png
deleted file mode 100644
index 2a048badd5d..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffle.imageset/shuffle-2.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/Contents.json
index c1f714abf22..c3d0162b0af 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/Contents.json
@@ -12,30 +12,6 @@
       "filename" : "shuffleButton.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "shuffleButton-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/image.png
deleted file mode 100644
index 2b30155b882..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/shuffleButton-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/shuffleButton-1.png
deleted file mode 100644
index 575db579d90..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/shuffleOn.imageset/shuffleButton-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/Contents.json
index 70fa13ee33a..e84909826a4 100644
--- a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/Contents.json
+++ b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/Contents.json
@@ -14,54 +14,6 @@
       "filename" : "modernSliderKnob@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image.png",
-      "idiom" : "universal",
-      "scale" : "2x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "modernSliderKnob@2x-1.png",
-      "idiom" : "universal",
-      "scale" : "2x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "filename" : "image3x.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "modernSliderKnob@3x-1.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "unassigned" : true
     }
   ],
   "info" : {
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/image.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/image.png
deleted file mode 100644
index ff6f844caff..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/image.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/image3x.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/image3x.png
deleted file mode 100644
index 8d2ab4d645e..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/image3x.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/modernSliderKnob@2x-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/modernSliderKnob@2x-1.png
deleted file mode 100644
index 10c3794d53a..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/modernSliderKnob@2x-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/modernSliderKnob@3x-1.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/modernSliderKnob@3x-1.png
deleted file mode 100644
index 83b18200943..00000000000
Binary files a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/sliderKnobIcon.imageset/modernSliderKnob@3x-1.png and /dev/null differ
diff --git a/AmahiAnywhere/AmahiAnywhere/Presentation/Files/FilesViewController+UICollectionViewDelegates.swift b/AmahiAnywhere/AmahiAnywhere/Presentation/Files/FilesViewController+UICollectionViewDelegates.swift
index 3aa25853b95..1e75e3e2a71 100644
--- a/AmahiAnywhere/AmahiAnywhere/Presentation/Files/FilesViewController+UICollectionViewDelegates.swift
+++ b/AmahiAnywhere/AmahiAnywhere/Presentation/Files/FilesViewController+UICollectionViewDelegates.swift
@@ -30,9 +30,10 @@ extension FilesViewController: UICollectionViewDataSource, UICollectionViewDeleg
                 completion?(nil)
             })
             LightboxConfig.CloseButton.textAttributes = [
-                           .font: UIFont.boldSystemFont(ofSize: 18),
-                           .foregroundColor: UIColor.blue
-                       ]
+                 .font: UIFont.boldSystemFont(ofSize: 18),
+                 .foregroundColor: UIColor.blue
+             ]
+
         }
         
         let serverFile = filteredFiles.getFileFromIndexPath(indexPath)
diff --git a/AmahiAnywhere/AmahiAnywhere/Presentation/Recent Files/RecentFilesViewController+CollectionView.swift b/AmahiAnywhere/AmahiAnywhere/Presentation/Recent Files/RecentFilesViewController+CollectionView.swift
index a7cd1a4c258..6ce0a911fae 100644
--- a/AmahiAnywhere/AmahiAnywhere/Presentation/Recent Files/RecentFilesViewController+CollectionView.swift	
+++ b/AmahiAnywhere/AmahiAnywhere/Presentation/Recent Files/RecentFilesViewController+CollectionView.swift	
@@ -22,9 +22,9 @@ extension RecentFilesViewController: UICollectionViewDelegate, UICollectionViewD
                 completion?(nil)
             })
             LightboxConfig.CloseButton.textAttributes = [
-                           .font: UIFont.boldSystemFont(ofSize: 18),
-                           .foregroundColor: UIColor.blue
-                       ]
+                 .font: UIFont.boldSystemFont(ofSize: 18),
+                 .foregroundColor: UIColor.blue
+             ]
         }
         
         let recentFile = filteredRecentFiles[indexPath.item]
diff --git a/AmahiAnywhere/AmahiAnywhere/Presentation/Walkthrough/WalkthroughAmahiCell.xib b/AmahiAnywhere/AmahiAnywhere/Presentation/Walkthrough/WalkthroughAmahiCell.xib
index 91b1d01b0ee..16ae7f0a160 100644
--- a/AmahiAnywhere/AmahiAnywhere/Presentation/Walkthrough/WalkthroughAmahiCell.xib
+++ b/AmahiAnywhere/AmahiAnywhere/Presentation/Walkthrough/WalkthroughAmahiCell.xib
@@ -58,12 +58,17 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Amahi Logo White Font.png" translatesAutoresizingMaskIntoConstraints="NO" id="7pr-cD-Cbh">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Amahi Logo White Font" translatesAutoresizingMaskIntoConstraints="NO" id="7pr-cD-Cbh">
                                 <rect key="frame" x="155.5" y="30" width="200" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="ph2-0H-yXX"/>
                                     <constraint firstAttribute="width" constant="200" id="pp8-0l-YnZ"/>
                                 </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                        <real key="value" value="0.0"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/>
@@ -94,6 +99,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="Amahi Logo White Font.png" width="172.55999755859375" height="59"/>
+        <image name="Amahi Logo White Font" width="719" height="246"/>
     </resources>
 </document>
diff --git a/AmahiAnywhere/AmahiAnywhere/StoryBoards/Base.lproj/LaunchScreen.storyboard b/AmahiAnywhere/AmahiAnywhere/StoryBoards/Base.lproj/LaunchScreen.storyboard
index 92f2efe0320..40c5fcbeeb0 100644
--- a/AmahiAnywhere/AmahiAnywhere/StoryBoards/Base.lproj/LaunchScreen.storyboard
+++ b/AmahiAnywhere/AmahiAnywhere/StoryBoards/Base.lproj/LaunchScreen.storyboard
@@ -19,7 +19,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G0h-hK-ya7" userLabel="AmahiLogo">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                                 <subviews>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964" translatesAutoresizingMaskIntoConstraints="NO" id="9zu-Ir-slx">
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Amahi-logo launch" translatesAutoresizingMaskIntoConstraints="NO" id="9zu-Ir-slx">
                                         <rect key="frame" x="67" y="327" width="240" height="156"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     </imageView>
@@ -43,6 +43,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964" width="719" height="246"/>
+        <image name="Amahi-logo launch" width="713" height="246"/>
     </resources>
 </document>
diff --git a/AmahiAnywhere/AmahiAnywhere/StoryBoards/Base.lproj/Main.storyboard b/AmahiAnywhere/AmahiAnywhere/StoryBoards/Base.lproj/Main.storyboard
index fa9a410a737..a5237be27e6 100644
--- a/AmahiAnywhere/AmahiAnywhere/StoryBoards/Base.lproj/Main.storyboard
+++ b/AmahiAnywhere/AmahiAnywhere/StoryBoards/Base.lproj/Main.storyboard
@@ -118,7 +118,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="dnj-cA-cdc">
                                         <rect key="frame" x="0.0" y="0.0" width="335" height="209"/>
                                         <subviews>
-                                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964" translatesAutoresizingMaskIntoConstraints="NO" id="g1P-zr-2vs">
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Amahi Logo Login" translatesAutoresizingMaskIntoConstraints="NO" id="g1P-zr-2vs">
                                                 <rect key="frame" x="0.0" y="0.0" width="335" height="67"/>
                                             </imageView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="32" translatesAutoresizingMaskIntoConstraints="NO" id="MRw-dg-epc">
@@ -358,7 +358,7 @@
             <objects>
                 <viewController storyboardIdentifier="ServerViewController" id="Dbq-Bw-ca9" customClass="ServerViewController" customModule="AmahiAnywhere" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="LDY-OA-sHr">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available HDAs: " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="atT-2S-a7r">
@@ -545,7 +545,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="SettingsViewController" automaticallyAdjustsScrollViewInsets="NO" id="teI-x8-nnt" customClass="SettingsViewController" customModule="AmahiAnywhere" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" indicatorStyle="black" bouncesZoom="NO" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="lKs-ES-BcF">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                         <color key="separatorColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -642,7 +642,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="ConnectionViewController" automaticallyAdjustsScrollViewInsets="NO" id="Mr0-gg-hDA" customClass="ConnectionViewController" customModule="AmahiAnywhere" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="LUY-ls-ZtF">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="secondarySystemBackgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1553,7 +1553,7 @@
             <objects>
                 <viewController id="gwW-ua-gcL" customClass="RecentFilesViewController" customModule="AmahiAnywhere" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Y6Y-Pz-rkA">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tLj-rv-YNE">
@@ -1805,7 +1805,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="amahi-logo-a36008f915e1ad5efaaf8e468ac614d888ece91aca11db69666e2055f1307964" width="719" height="246"/>
+        <image name="Amahi Logo Login" width="719" height="246"/>
         <image name="arrowDownIcon" width="15.666666984558105" height="9"/>
         <image name="arrowRightIcon" width="562" height="562"/>
         <image name="brokenIcon" width="28" height="28"/>
diff --git a/AmahiAnywhere/AmahiAnywhere/StoryBoards/VideoPlayer.storyboard b/AmahiAnywhere/AmahiAnywhere/StoryBoards/VideoPlayer.storyboard
index fe8464c2f56..634aafd87ac 100644
--- a/AmahiAnywhere/AmahiAnywhere/StoryBoards/VideoPlayer.storyboard
+++ b/AmahiAnywhere/AmahiAnywhere/StoryBoards/VideoPlayer.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>