diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 97d51e05..4d75150e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -210,10 +210,10 @@
 
         <activity-alias
             android:name=".activities.SplashActivity.Green"
-            android:enabled="false"
+            android:enabled="true"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher_green"
-            android:roundIcon="@mipmap/ic_launcher_green"
+            android:icon="@mipmap/ic_launcher"
+            android:roundIcon="@mipmap/ic_launcher"
             android:targetActivity=".activities.SplashActivity">
 
             <intent-filter>
@@ -280,10 +280,10 @@
 
         <activity-alias
             android:name=".activities.SplashActivity.Orange"
-            android:enabled="true"
+            android:enabled="false"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher"
-            android:roundIcon="@mipmap/ic_launcher"
+            android:icon="@mipmap/ic_launcher_orange"
+            android:roundIcon="@mipmap/ic_launcher_orange"
             android:targetActivity=".activities.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 00000000..e9f72d85
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/kotlin/org/fossify/keyboard/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/keyboard/activities/SimpleActivity.kt
index ecda1b0b..77575117 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/activities/SimpleActivity.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/activities/SimpleActivity.kt
@@ -14,12 +14,12 @@ open class SimpleActivity : BaseSimpleActivity() {
         R.mipmap.ic_launcher_light_blue,
         R.mipmap.ic_launcher_cyan,
         R.mipmap.ic_launcher_teal,
-        R.mipmap.ic_launcher_green,
+        R.mipmap.ic_launcher,
         R.mipmap.ic_launcher_light_green,
         R.mipmap.ic_launcher_lime,
         R.mipmap.ic_launcher_yellow,
         R.mipmap.ic_launcher_amber,
-        R.mipmap.ic_launcher,
+        R.mipmap.ic_launcher_orange,
         R.mipmap.ic_launcher_deep_orange,
         R.mipmap.ic_launcher_brown,
         R.mipmap.ic_launcher_blue_grey,
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..86cdacaa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="512" android:viewportHeight="512">
+    <path android:fillColor="#ffffff" android:pathData="M171.2 330.2q-8.74 0-14.97-6.23T150 309V203q0-8.74 6.23-14.97t14.97-6.23h169.6q8.74 0 14.97 6.23T362 203v106q0 8.74-6.23 14.97-6.22 6.23-14.97 6.23zm0-21.2h169.6V203H171.2zm53-10.6h63.6q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.05-3.05-7.55-3.05h-63.6q-4.51 0-7.55 3.05-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm-53 10.6V203zm21.2-74.2q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.05-3.05-7.55-3.05-4.51 0-7.55 3.05-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.04-3.05-7.55-3.05t-7.55 3.05q-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.04-3.05-7.55-3.05t-7.55 3.05q-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.04 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.05-3.05-7.55-3.05-4.51 0-7.55 3.05-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.04-3.05-7.55-3.05t-7.55 3.05Q309 219.7 309 224.2q0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm-127.2 31.8q4.51 0 7.55-3.05Q203 260.51 203 256t-3.05-7.55q-3.05-3.05-7.55-3.05-4.51 0-7.55 3.05-3.05 3.04-3.05 7.55t3.05 7.55q3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.04-3.05-7.55-3.05t-7.55 3.05q-3.05 3.04-3.05 7.55t3.05 7.55q3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.04-3.05-7.55-3.05t-7.55 3.05q-3.05 3.04-3.05 7.55t3.05 7.55q3.04 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.05-3.05-7.55-3.05-4.51 0-7.55 3.05-3.05 3.04-3.05 7.55t3.05 7.55q3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.04-3.05-7.55-3.05t-7.55 3.05Q309 251.49 309 256t3.05 7.55q3.05 3.05 7.55 3.05z" android:strokeWidth="0.265"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml
index 7391986d..35f18c8e 100644
--- a/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -1,4 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
-    <path android:fillColor="#FFFFFFFF" android:fillType="evenOdd" android:pathData="M35.96 42.14h36.3v22.69h-36.3zm-0.34-4.53H72.5c2.31 0 4.2 1.89 4.2 4.2v23.36c0 2.31-1.89 4.2-4.2 4.2H35.62c-2.31 0-4.2-1.89-4.2-4.2V41.81c0-2.31 1.89-4.2 4.2-4.2z"/>
-    <path android:fillColor="#FFFFFFFF" android:pathData="M42.72 44.37h-4.54V49h4.54zm6.85 0h-4.54V49h4.54zm6.78 0h-4.54V49h4.54zm6.82 0h-4.54V49h4.54zm6.78 0h-4.54V49h4.54zm-27.23 6.85h-4.54v4.63h4.54zm6.85 0h-4.54v4.63h4.54zm13.61 6.76h-18.2v4.63h18.19zm-0.01-6.76h-4.54v4.63h4.54zm6.78 0h-4.54v4.63h4.54zm-13.6 0h-4.54v4.63h4.54z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="108dp" android:viewportHeight="512" android:viewportWidth="512" android:width="108dp">
+    <path android:fillColor="#ffffff" android:pathData="M171.2 330.2q-8.74 0-14.97-6.23T150 309V203q0-8.74 6.23-14.97t14.97-6.23h169.6q8.74 0 14.97 6.23T362 203v106q0 8.74-6.23 14.97-6.22 6.23-14.97 6.23zm0-21.2h169.6V203H171.2zm53-10.6h63.6q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.05-3.05-7.55-3.05h-63.6q-4.51 0-7.55 3.05-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm-53 10.6V203zm21.2-74.2q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.05-3.05-7.55-3.05-4.51 0-7.55 3.05-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.04-3.05-7.55-3.05t-7.55 3.05q-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.04-3.05-7.55-3.05t-7.55 3.05q-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.04 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.05-3.05-7.55-3.05-4.51 0-7.55 3.05-3.05 3.05-3.05 7.55 0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.05 3.05-7.55 0-4.51-3.05-7.55-3.04-3.05-7.55-3.05t-7.55 3.05Q309 219.7 309 224.2q0 4.51 3.05 7.55 3.05 3.05 7.55 3.05zm-127.2 31.8q4.51 0 7.55-3.05Q203 260.51 203 256t-3.05-7.55q-3.05-3.05-7.55-3.05-4.51 0-7.55 3.05-3.05 3.04-3.05 7.55t3.05 7.55q3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.04-3.05-7.55-3.05t-7.55 3.05q-3.05 3.04-3.05 7.55t3.05 7.55q3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.04-3.05-7.55-3.05t-7.55 3.05q-3.05 3.04-3.05 7.55t3.05 7.55q3.04 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.05-3.05-7.55-3.05-4.51 0-7.55 3.05-3.05 3.04-3.05 7.55t3.05 7.55q3.05 3.05 7.55 3.05zm31.8 0q4.51 0 7.55-3.05 3.05-3.04 3.05-7.55t-3.05-7.55q-3.04-3.05-7.55-3.05t-7.55 3.05Q309 251.49 309 256t3.05 7.55q3.05 3.05 7.55 3.05z" android:strokeWidth="0.265"/>
 </vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 07f9120c..c78bee3b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/md_orange_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml
index b9bf82a7..7b4ef572 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_amber.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_amber_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml
index fe4c0f72..c8173849 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_blue_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml
index 794a0ba8..e5ae9a17 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_grey.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_blue_grey_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml
index 213d4eca..6c1d2603 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_brown_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml
index 9958c2c4..cc384dc6 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_cyan.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_cyan_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml
index 8390cf09..5250a44f 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_orange.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_deep_orange_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml
index 80e20d58..81ba15b5 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_deep_purple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_deep_purple_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml
index 968374cf..c0477c1e 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_grey_black.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_grey_black" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml
index 791c1a46..20f9f44a 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_indigo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_indigo_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml
index c559382f..dd752f85 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_blue.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_light_blue_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml
index cb8e9f0f..eee16d21 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_green.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_light_green_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml
index 77975833..cfe22da4 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_lime.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_lime_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml
similarity index 60%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml
index b73af9bd..af5af0b1 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/md_green_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <background android:drawable="@color/md_orange_700" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml
index a6163778..00a28a52 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_pink.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_pink_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml
index c0ce2da8..8c55541a 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_purple_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml
index 64e53a68..f500e3c1 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_red_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml
index 17b0961f..64fd7f8b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_teal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_teal_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml
index 044ebd10..74726f57 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_yellow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_yellow_700" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 0d46e857..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 00000000..cf9d9f5a
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png
deleted file mode 100644
index 7d0922b6..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp
new file mode 100644
index 00000000..92108483
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_amber.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png
deleted file mode 100644
index 9f71105f..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp
new file mode 100644
index 00000000..c438d267
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png
deleted file mode 100644
index fa6d07f5..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp
new file mode 100644
index 00000000..59963999
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_grey.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png
deleted file mode 100644
index d55b0766..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp
new file mode 100644
index 00000000..7788718f
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_brown.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png
deleted file mode 100644
index 8c4f3020..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp
new file mode 100644
index 00000000..8c16afcb
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_cyan.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png
deleted file mode 100644
index 2a02f9e7..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp
new file mode 100644
index 00000000..52a4f371
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_orange.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png
deleted file mode 100644
index 16b8b165..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp
new file mode 100644
index 00000000..c76da45c
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_deep_purple.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_green.png
deleted file mode 100644
index bed21448..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png
deleted file mode 100644
index 93b720b4..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp
new file mode 100644
index 00000000..49afe420
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_grey_black.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png
deleted file mode 100644
index 813e4982..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp
new file mode 100644
index 00000000..1dc53e79
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_indigo.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png
deleted file mode 100644
index f541fc12..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp
new file mode 100644
index 00000000..be9707cc
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_blue.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png
deleted file mode 100644
index e2ab6cf1..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp
new file mode 100644
index 00000000..474b6f00
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_light_green.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png
deleted file mode 100644
index 9fe2b65a..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp
new file mode 100644
index 00000000..1becb01d
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_lime.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp
new file mode 100644
index 00000000..1dc4f944
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png
deleted file mode 100644
index 4d6c06ad..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp
new file mode 100644
index 00000000..cac3e411
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_pink.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png
deleted file mode 100644
index 21c8f78b..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp
new file mode 100644
index 00000000..46a9963a
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png b/app/src/main/res/mipmap-hdpi/ic_launcher_red.png
deleted file mode 100644
index f3349e22..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp
new file mode 100644
index 00000000..a6a73a7c
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_red.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png
deleted file mode 100644
index a1ee3c57..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp
new file mode 100644
index 00000000..b91b43da
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_teal.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png
deleted file mode 100644
index c2da855f..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp
new file mode 100644
index 00000000..ad4091e1
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_yellow.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 00000000..1d586d34
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp
new file mode 100644
index 00000000..1cd2cd9e
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_amber.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp
new file mode 100644
index 00000000..4faac274
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp
new file mode 100644
index 00000000..84a57200
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_grey.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp
new file mode 100644
index 00000000..dd71fb6c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_brown.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp
new file mode 100644
index 00000000..b128ae4b
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_cyan.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp
new file mode 100644
index 00000000..ad923515
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_orange.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp
new file mode 100644
index 00000000..f175b311
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_deep_purple.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp
new file mode 100644
index 00000000..8e716a01
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_grey_black.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp
new file mode 100644
index 00000000..fc16a328
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_indigo.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp
new file mode 100644
index 00000000..914420c6
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_blue.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp
new file mode 100644
index 00000000..b366cd4a
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_light_green.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp
new file mode 100644
index 00000000..ded869a6
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_lime.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp
new file mode 100644
index 00000000..9f0cbb24
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp
new file mode 100644
index 00000000..f0f8c2fb
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_pink.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp
new file mode 100644
index 00000000..6603201c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp
new file mode 100644
index 00000000..e80cbcc8
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_red.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp
new file mode 100644
index 00000000..ad016741
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_teal.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp
new file mode 100644
index 00000000..d87f6810
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_yellow.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index aa81b4d0..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 00000000..2cd2eb7a
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png
deleted file mode 100644
index cbe79a8e..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp
new file mode 100644
index 00000000..b92f447f
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_amber.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png
deleted file mode 100644
index 1dad038f..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp
new file mode 100644
index 00000000..8d8ff286
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png
deleted file mode 100644
index 838212c6..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp
new file mode 100644
index 00000000..3fbff8d5
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_grey.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png
deleted file mode 100644
index 685e4155..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp
new file mode 100644
index 00000000..5aad56f5
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_brown.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png
deleted file mode 100644
index e1220b32..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp
new file mode 100644
index 00000000..bbd9bfd6
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_cyan.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png
deleted file mode 100644
index 8e1364ab..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp
new file mode 100644
index 00000000..6bf884d5
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_orange.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png
deleted file mode 100644
index 092763dc..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp
new file mode 100644
index 00000000..0efffd22
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_deep_purple.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png
deleted file mode 100644
index 26ac6e6c..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png
deleted file mode 100644
index d090e9b4..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp
new file mode 100644
index 00000000..7c441308
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_grey_black.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png
deleted file mode 100644
index 317104a7..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp
new file mode 100644
index 00000000..ed23d99c
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_indigo.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png
deleted file mode 100644
index 3362292b..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp
new file mode 100644
index 00000000..fce075a0
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_blue.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png
deleted file mode 100644
index cffae3b9..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp
new file mode 100644
index 00000000..490d40ba
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_green.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png
deleted file mode 100644
index 78967864..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp
new file mode 100644
index 00000000..e23b7574
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_lime.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp
new file mode 100644
index 00000000..6b5a22cd
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png
deleted file mode 100644
index a2ea52a9..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp
new file mode 100644
index 00000000..7db9e18b
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_pink.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png
deleted file mode 100644
index 9ffcd32d..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp
new file mode 100644
index 00000000..6a97ee8f
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png
deleted file mode 100644
index b929dc49..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp
new file mode 100644
index 00000000..666021fe
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png
deleted file mode 100644
index da024c79..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp
new file mode 100644
index 00000000..b00dceca
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_teal.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png
deleted file mode 100644
index 6c79f584..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp
new file mode 100644
index 00000000..be28ddbd
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_yellow.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 73688023..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..3fb27187
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png
deleted file mode 100644
index f310baea..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp
new file mode 100644
index 00000000..73805ba2
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_amber.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png
deleted file mode 100644
index 59cf6d41..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp
new file mode 100644
index 00000000..1a42f727
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png
deleted file mode 100644
index e7ab3cd9..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp
new file mode 100644
index 00000000..725233b1
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_grey.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png
deleted file mode 100644
index 3c7c66fd..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp
new file mode 100644
index 00000000..90142c02
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_brown.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png
deleted file mode 100644
index bf4b00c1..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp
new file mode 100644
index 00000000..8f881b14
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_cyan.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png
deleted file mode 100644
index 27174151..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp
new file mode 100644
index 00000000..7381b37a
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_orange.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png
deleted file mode 100644
index ed90a292..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp
new file mode 100644
index 00000000..7b187b1b
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_deep_purple.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png
deleted file mode 100644
index 084635aa..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png
deleted file mode 100644
index ccddea33..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp
new file mode 100644
index 00000000..ed4dbf3b
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_grey_black.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png
deleted file mode 100644
index 5f0d1263..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp
new file mode 100644
index 00000000..8426f2b0
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_indigo.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png
deleted file mode 100644
index dba64210..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp
new file mode 100644
index 00000000..802841e1
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_blue.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png
deleted file mode 100644
index d39cc689..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp
new file mode 100644
index 00000000..8a63fb55
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_green.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png
deleted file mode 100644
index 9cb74788..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp
new file mode 100644
index 00000000..1c8f22e5
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_lime.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp
new file mode 100644
index 00000000..d497d0dc
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png
deleted file mode 100644
index dc7427d8..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp
new file mode 100644
index 00000000..ebda8eba
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_pink.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png
deleted file mode 100644
index 3fb9db96..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp
new file mode 100644
index 00000000..819f92e9
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png
deleted file mode 100644
index df617c53..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp
new file mode 100644
index 00000000..8aec7494
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png
deleted file mode 100644
index cf2c87f6..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp
new file mode 100644
index 00000000..5fb86a22
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_teal.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png
deleted file mode 100644
index 43960bc4..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp
new file mode 100644
index 00000000..edf747d9
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_yellow.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 30a40c74..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..ebe741fd
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png
deleted file mode 100644
index c63a1372..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp
new file mode 100644
index 00000000..e932e928
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_amber.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png
deleted file mode 100644
index 3bcfc51a..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp
new file mode 100644
index 00000000..4896b935
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png
deleted file mode 100644
index 201ef21e..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp
new file mode 100644
index 00000000..f01b4c9a
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_grey.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png
deleted file mode 100644
index fee928d5..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp
new file mode 100644
index 00000000..f1760d9e
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png
deleted file mode 100644
index fa61e8e8..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp
new file mode 100644
index 00000000..1de139f7
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_cyan.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png
deleted file mode 100644
index 2d0d4d2d..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp
new file mode 100644
index 00000000..65d72784
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_orange.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png
deleted file mode 100644
index f457635a..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp
new file mode 100644
index 00000000..8d6fee1b
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_deep_purple.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png
deleted file mode 100644
index 655bf40c..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png
deleted file mode 100644
index 064c28ff..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp
new file mode 100644
index 00000000..ed966191
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_grey_black.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png
deleted file mode 100644
index 52c9e26f..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp
new file mode 100644
index 00000000..d2338db7
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_indigo.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png
deleted file mode 100644
index f67c2241..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp
new file mode 100644
index 00000000..2bd830f8
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_blue.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png
deleted file mode 100644
index c850634a..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp
new file mode 100644
index 00000000..9076b94f
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_green.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png
deleted file mode 100644
index f981ba1b..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp
new file mode 100644
index 00000000..0115bfc9
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lime.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp
new file mode 100644
index 00000000..18d7e376
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png
deleted file mode 100644
index 031e7ccf..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp
new file mode 100644
index 00000000..eaf703b7
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_pink.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png
deleted file mode 100644
index 0227447e..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp
new file mode 100644
index 00000000..67d898d4
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png
deleted file mode 100644
index 417c9b3c..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp
new file mode 100644
index 00000000..aa1eb6bf
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png
deleted file mode 100644
index e4ada093..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp
new file mode 100644
index 00000000..f37b9766
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_teal.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png
deleted file mode 100644
index 91645586..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp
new file mode 100644
index 00000000..528ee99a
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_yellow.webp differ
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 00000000..07fea199
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#106D20</color>
+</resources>
\ No newline at end of file
diff --git a/graphics/app_icon.png b/graphics/app_icon.png
deleted file mode 100644
index d00451ef..00000000
Binary files a/graphics/app_icon.png and /dev/null differ
diff --git a/graphics/background.svg b/graphics/background.svg
deleted file mode 100644
index 3bbeebd8..00000000
--- a/graphics/background.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="512" height="512" viewBox="0 0 512 512" version="1.1" id="svg1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><defs
-     id="defs1" />
-    <path id="rect1" style="fill:#106d20;fill-opacity:1" d="M 0,0 H 512 V 512 H 0 Z" /></svg>
diff --git a/graphics/featureGraphic.xcf b/graphics/featureGraphic.xcf
deleted file mode 100644
index 615636cb..00000000
Binary files a/graphics/featureGraphic.xcf and /dev/null differ
diff --git a/graphics/foreground.svg b/graphics/foreground.svg
new file mode 100644
index 00000000..4b551f54
--- /dev/null
+++ b/graphics/foreground.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg height="512" id="svg1" version="1.1" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg" xml:space="preserve"><defs
+     id="defs1" />
+    <g id="layer1"><path
+       style="fill:#ffffff;stroke-width:0.265"
+       d="m 171.2,330.2 q -8.745,0 -14.9725,-6.2275 Q 150,317.745 150,309 V 203 q 0,-8.745 6.2275,-14.9725 Q 162.455,181.8 171.2,181.8 h 169.6 q 8.745,0 14.9725,6.2275 Q 362,194.255 362,203 v 106 q 0,8.745 -6.2275,14.9725 Q 349.545,330.2 340.8,330.2 Z m 0,-21.2 H 340.8 V 203 H 171.2 Z m 53,-10.6 h 63.6 q 4.505,0 7.5525,-3.0475 3.0475,-3.0475 3.0475,-7.5525 0,-4.505 -3.0475,-7.5525 Q 292.305,277.2 287.8,277.2 h -63.6 q -4.505,0 -7.5525,3.0475 -3.0475,3.0475 -3.0475,7.5525 0,4.505 3.0475,7.5525 3.0475,3.0475 7.5525,3.0475 z m -53,10.6 V 203 Z m 21.2,-74.2 q 4.505,0 7.5525,-3.0475 Q 203,228.705 203,224.2 q 0,-4.505 -3.0475,-7.5525 Q 196.905,213.6 192.4,213.6 q -4.505,0 -7.5525,3.0475 -3.0475,3.0475 -3.0475,7.5525 0,4.505 3.0475,7.5525 3.0475,3.0475 7.5525,3.0475 z m 31.8,0 q 4.505,0 7.5525,-3.0475 3.0475,-3.0475 3.0475,-7.5525 0,-4.505 -3.0475,-7.5525 Q 228.705,213.6 224.2,213.6 q -4.505,0 -7.5525,3.0475 -3.0475,3.0475 -3.0475,7.5525 0,4.505 3.0475,7.5525 3.0475,3.0475 7.5525,3.0475 z m 31.8,0 q 4.505,0 7.5525,-3.0475 3.0475,-3.0475 3.0475,-7.5525 0,-4.505 -3.0475,-7.5525 Q 260.505,213.6 256,213.6 q -4.505,0 -7.5525,3.0475 -3.0475,3.0475 -3.0475,7.5525 0,4.505 3.0475,7.5525 Q 251.495,234.8 256,234.8 Z m 31.8,0 q 4.505,0 7.5525,-3.0475 3.0475,-3.0475 3.0475,-7.5525 0,-4.505 -3.0475,-7.5525 Q 292.305,213.6 287.8,213.6 q -4.505,0 -7.5525,3.0475 -3.0475,3.0475 -3.0475,7.5525 0,4.505 3.0475,7.5525 3.0475,3.0475 7.5525,3.0475 z m 31.8,0 q 4.505,0 7.5525,-3.0475 3.0475,-3.0475 3.0475,-7.5525 0,-4.505 -3.0475,-7.5525 Q 324.105,213.6 319.6,213.6 q -4.505,0 -7.5525,3.0475 Q 309,219.695 309,224.2 q 0,4.505 3.0475,7.5525 3.0475,3.0475 7.5525,3.0475 z m -127.2,31.8 q 4.505,0 7.5525,-3.0475 Q 203,260.505 203,256 q 0,-4.505 -3.0475,-7.5525 Q 196.905,245.4 192.4,245.4 q -4.505,0 -7.5525,3.0475 Q 181.8,251.495 181.8,256 q 0,4.505 3.0475,7.5525 3.0475,3.0475 7.5525,3.0475 z m 31.8,0 q 4.505,0 7.5525,-3.0475 Q 234.8,260.505 234.8,256 q 0,-4.505 -3.0475,-7.5525 Q 228.705,245.4 224.2,245.4 q -4.505,0 -7.5525,3.0475 Q 213.6,251.495 213.6,256 q 0,4.505 3.0475,7.5525 3.0475,3.0475 7.5525,3.0475 z m 31.8,0 q 4.505,0 7.5525,-3.0475 Q 266.6,260.505 266.6,256 q 0,-4.505 -3.0475,-7.5525 Q 260.505,245.4 256,245.4 q -4.505,0 -7.5525,3.0475 Q 245.4,251.495 245.4,256 q 0,4.505 3.0475,7.5525 Q 251.495,266.6 256,266.6 Z m 31.8,0 q 4.505,0 7.5525,-3.0475 Q 298.4,260.505 298.4,256 q 0,-4.505 -3.0475,-7.5525 Q 292.305,245.4 287.8,245.4 q -4.505,0 -7.5525,3.0475 Q 277.2,251.495 277.2,256 q 0,4.505 3.0475,7.5525 3.0475,3.0475 7.5525,3.0475 z m 31.8,0 q 4.505,0 7.5525,-3.0475 Q 330.2,260.505 330.2,256 q 0,-4.505 -3.0475,-7.5525 Q 324.105,245.4 319.6,245.4 q -4.505,0 -7.5525,3.0475 Q 309,251.495 309,256 q 0,4.505 3.0475,7.5525 3.0475,3.0475 7.5525,3.0475 z"
+       id="path1-1" /></g></svg>
diff --git a/graphics/icon.png b/graphics/icon.png
deleted file mode 100644
index 2bc9a710..00000000
Binary files a/graphics/icon.png and /dev/null differ
diff --git a/graphics/icon.svg b/graphics/icon.svg
new file mode 100644
index 00000000..6f8d3fa5
--- /dev/null
+++ b/graphics/icon.svg
@@ -0,0 +1,4 @@
+<svg height="24" viewBox="0 -960 960 960" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M160-200q-33 0-56.5-23.5T80-280v-400q0-33 23.5-56.5T160-760h640q33 0 56.5 23.5T880-680v400q0 33-23.5 56.5T800-200H160Zm0-80h640v-400H160v400Zm200-40h240q17 0 28.5-11.5T640-360q0-17-11.5-28.5T600-400H360q-17 0-28.5 11.5T320-360q0 17 11.5 28.5T360-320Zm-200 40v-400 400Zm80-280q17 0 28.5-11.5T280-600q0-17-11.5-28.5T240-640q-17 0-28.5 11.5T200-600q0 17 11.5 28.5T240-560Zm120 0q17 0 28.5-11.5T400-600q0-17-11.5-28.5T360-640q-17 0-28.5 11.5T320-600q0 17 11.5 28.5T360-560Zm120 0q17 0 28.5-11.5T520-600q0-17-11.5-28.5T480-640q-17 0-28.5 11.5T440-600q0 17 11.5 28.5T480-560Zm120 0q17 0 28.5-11.5T640-600q0-17-11.5-28.5T600-640q-17 0-28.5 11.5T560-600q0 17 11.5 28.5T600-560Zm120 0q17 0 28.5-11.5T760-600q0-17-11.5-28.5T720-640q-17 0-28.5 11.5T680-600q0 17 11.5 28.5T720-560ZM240-440q17 0 28.5-11.5T280-480q0-17-11.5-28.5T240-520q-17 0-28.5 11.5T200-480q0 17 11.5 28.5T240-440Zm120 0q17 0 28.5-11.5T400-480q0-17-11.5-28.5T360-520q-17 0-28.5 11.5T320-480q0 17 11.5 28.5T360-440Zm120 0q17 0 28.5-11.5T520-480q0-17-11.5-28.5T480-520q-17 0-28.5 11.5T440-480q0 17 11.5 28.5T480-440Zm120 0q17 0 28.5-11.5T640-480q0-17-11.5-28.5T600-520q-17 0-28.5 11.5T560-480q0 17 11.5 28.5T600-440Zm120 0q17 0 28.5-11.5T760-480q0-17-11.5-28.5T720-520q-17 0-28.5 11.5T680-480q0 17 11.5 28.5T720-440Z" />
+</svg>
diff --git a/graphics/icon.xcf b/graphics/icon.xcf
deleted file mode 100644
index 5fbe3544..00000000
Binary files a/graphics/icon.xcf and /dev/null differ
diff --git a/graphics/square.png b/graphics/square.png
deleted file mode 100644
index 7f78e05f..00000000
Binary files a/graphics/square.png and /dev/null differ
diff --git a/graphics/square.xcf b/graphics/square.xcf
deleted file mode 100644
index fc608e28..00000000
Binary files a/graphics/square.xcf and /dev/null differ