diff --git a/android/app/src/main/res/drawable-anydpi-v24/notifications_icon.xml b/android/app/src/main/res/drawable-anydpi-v24/notifications_icon.xml
deleted file mode 100644
index 21b574637..000000000
--- a/android/app/src/main/res/drawable-anydpi-v24/notifications_icon.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.15715303"
-      android:scaleY="0.15715303"
-      android:translateX="0.96"
-      android:translateY="0.96">
-    <path
-        android:pathData="M130.9,0a50.8,50.8 0,0 0,-34.2 18c-0.5,-0.2 -1,-1 -1,-1.7a7,7 0,0 0,-3.5 -6.8,7.8 7.8,0 0,0 -10.6,3.3c-0.5,0.8 -1.3,1.3 -2,1 -0.8,0 -1.5,-0.8 -1.5,-1.5 -0.5,-2.5 -2,-4.5 -4.3,-5.5 -4.8,-2 -9.8,0.8 -10.6,5.3 -0.3,0.8 -0.8,1.5 -1.5,1.5 -0.8,0.3 -1.5,-0.3 -2,-1a8,8 0,0 0,-6.5 -3.8,8 8,0 0,0 -7.8,7.3v0.6c0,0.8 -0.5,1.5 -1,1.8L44,18.5C35.8,7.7 15.6,-2.2 5.6,1c-8.1,2.8 -4.3,42.6 4,53.4 1.5,2 2.8,3.5 3.8,4.5 -0.3,0.8 -1,1.5 -1.8,1.5 -1.3,0 -2.5,0.5 -3.5,1.3a7.7,7.7 0,0 0,3 13.4c0.8,0.3 1.5,1 1.5,1.8s-0.5,1.8 -1.3,2c-1,0.5 -2,1 -2.8,2 -4,5.8 0,12.3 5.5,12.3a2,2 0,0 1,1.8 1.3c0.3,0.8 0.3,1.5 -0.5,2a6.5,6.5 0,0 0,-2 5.5c0.3,2.8 2,5.3 4.8,6.5 1.5,0.8 3,0.8 4.5,0.5 0.8,-0.3 1.5,0 2,0.8 0.5,0.5 0.5,1.5 0.3,2 -0.8,1.5 -1,3.3 -0.5,5a7.7,7.7 0,0 0,5.5 5.5c2.5,0.5 4.3,-0.3 5.5,-0.8 0.5,-0.3 -3.3,9 -6,15.4 -0.8,2 1.3,4.3 3.5,3.3 8.3,-3.8 22.2,-10.3 22.2,-9.8 0.5,5.3 6.5,9 12.3,5.3 1.3,-0.8 2,-2.3 2.3,-3.5 0.3,-0.8 1,-1.5 2,-1.5s1.8,0.5 2,1.5c0.3,1.3 0.8,2.3 1.8,3 5.8,4.5 12.3,0.8 12.8,-4.8a2,2 0,0 1,1.3 -1.8c0.8,-0.3 1.5,0 2,0.5a7.6,7.6 0,0 0,5.3 2.5c2.5,0 5,-1.3 6.5,-3.8 1,-1.5 1.3,-3 1,-5 0,-0.8 0.3,-1.5 0.8,-2s1.5,-0.5 2,0c1.5,0.8 3.3,1.3 5,0.8 2.8,-0.5 5,-2.8 5.8,-5.3 0.5,-1.8 0.3,-3.5 -0.5,-5.3 -0.3,-0.8 -0.3,-1.5 0.3,-2s1.3,-0.8 2,-0.8c1.8,0.3 3.3,0.3 4.8,-0.5 2.3,-1 3.8,-3 4.3,-5.5a7,7 0,0 0,-2 -6.5c-0.5,-0.5 -0.8,-1.3 -0.5,-2 0.3,-0.7 1,-1.3 1.8,-1.3 1.8,0 3.8,-0.5 5,-2a7.6,7.6 0,0 0,-2.5 -12.6c-0.8,-0.3 -1.3,-1 -1.3,-2s0.7,-1.6 1.5,-1.6c1.5,-0.3 2.8,-1 3.8,-2 4,-5.3 0.8,-11.8 -4.5,-12.6 -0.8,0 -1.5,-0.8 -1.5,-1.5v-0.5c0.8,-0.8 1.5,-1.8 2.5,-3.3 8,-10.8 11.8,-50.6 3.8,-53.7 -1.3,-0.5 -2.6,-0.7 -4.1,-0.7zM16.3,12.2c4.6,0.1 11,3 15.5,6.7 -0.7,0.8 -1.2,1.8 -1.5,2.8a7,7 0,0 0,0 4.5c0.3,0.7 0,1.5 -0.5,2s-1.2,0.8 -2,0.5c-1.5,-0.6 -3,-0.8 -4.5,-0.3 -2.7,0.8 -5,3 -5.5,5.8 -0.3,2 0,4 1.3,5.8 0.3,0.5 0.5,1.2 0,2l-0.8,0.8c-1.8,-0.3 -3,-1 -4,-2.5 -4.6,-6.3 -5.4,-26.2 -1,-27.7 1,-0.3 1.9,-0.4 3,-0.4zM123.9,12.4c1,0 2,0 2.9,0.4 4.5,1.5 3.7,21.4 -0.8,27.7 -0.8,1 -1.8,1.7 -2.8,2 -0.5,0 -0.7,-0.5 -1,-0.8 -0.5,-0.5 -0.5,-1.5 0,-2a7,7 0,0 0,1.3 -4c0.3,-1.8 -0.5,-3.5 -1.5,-4.8a7,7 0,0 0,-5.8 -3c-1,0 -2,0 -3,0.5 -0.7,0.3 -1.5,0 -2,-0.5s-0.8,-1.2 -0.5,-2a7,7 0,0 0,0 -4.5c-0.2,-1.3 -0.7,-2.1 -1.8,-2.6a27.6,27.6 0,0 1,15 -6.4zM40.2,64.4a9.3,9.3 0,0 1,9.3 9.4,9.3 9.3,0 0,1 -9.3,9.3 9.3,9.3 0,0 1,-9.3 -9.3,9.3 9.3,0 0,1 9.3,-9.3zM100.9,64.4a9.3,9.3 0,0 1,9.3 9.4,9.3 9.3,0 0,1 -9.3,9.3 9.3,9.3 0,0 1,-9.3 -9.3,9.3 9.3,0 0,1 9.3,-9.3zM70.7,70c4.6,0 9.3,1.2 9.3,3.9a9.3,9.3 0,1 1,-18.6 0c0,-2.5 4.6,-3.9 9.3,-3.9z"
-        android:fillColor="#4d3f92"/>
-  </group>
-</vector>
diff --git a/android/app/src/main/res/drawable-hdpi/android12splash.png b/android/app/src/main/res/drawable-hdpi/android12splash.png
new file mode 100644
index 000000000..f6ae6153e
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
index 965713319..f6ae6153e 100644
Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/android12splash.png b/android/app/src/main/res/drawable-mdpi/android12splash.png
new file mode 100644
index 000000000..69a8a0d54
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
index f4c0bdb92..69a8a0d54 100644
Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/android/app/src/main/res/drawable-night-hdpi/android12splash.png
new file mode 100644
index 000000000..f6ae6153e
Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/android/app/src/main/res/drawable-night-mdpi/android12splash.png
new file mode 100644
index 000000000..69a8a0d54
Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
new file mode 100644
index 000000000..70f8839f7
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
new file mode 100644
index 000000000..e72e0fefe
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
new file mode 100644
index 000000000..00445e742
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/android12splash.png b/android/app/src/main/res/drawable-xhdpi/android12splash.png
new file mode 100644
index 000000000..70f8839f7
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
index dafa3b707..70f8839f7 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxhdpi/android12splash.png
new file mode 100644
index 000000000..e72e0fefe
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
index b627f5280..e72e0fefe 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
new file mode 100644
index 000000000..00445e742
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
index 0d1d2a74d..00445e742 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable/ic_launcher_monochrome.xml b/android/app/src/main/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index f0b10e7d6..000000000
--- a/android/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="vector"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:pathData="M 74.512 31.256 C 70.963 31.181 65.49 34.076 62.945 37.361 C 62.776 37.26 62.607 37.024 62.607 36.754 C 62.654 36.297 62.567 35.836 62.357 35.428 C 62.147 35.02 61.823 34.68 61.424 34.453 C 61.012 34.233 60.548 34.127 60.082 34.145 C 59.615 34.162 59.162 34.302 58.768 34.553 C 58.373 34.803 58.052 35.154 57.838 35.568 C 57.669 35.839 57.399 36.01 57.162 35.908 C 56.892 35.908 56.654 35.637 56.654 35.4 C 56.485 34.555 55.979 33.877 55.201 33.539 C 53.578 32.863 51.886 33.81 51.615 35.332 C 51.514 35.603 51.344 35.84 51.107 35.84 C 50.837 35.941 50.601 35.739 50.432 35.502 C 50.199 35.124 49.878 34.808 49.494 34.584 C 49.111 34.36 48.676 34.234 48.232 34.217 C 47.566 34.231 46.928 34.49 46.441 34.945 C 45.955 35.401 45.654 36.021 45.596 36.686 L 45.596 36.889 C 45.596 37.159 45.427 37.397 45.258 37.498 L 45.156 37.498 C 42.349 33.845 35.517 30.495 32.135 31.611 C 29.395 32.558 30.679 46.021 33.486 49.674 C 33.994 50.35 34.433 50.857 34.771 51.195 C 34.67 51.466 34.435 51.703 34.164 51.703 C 33.724 51.703 33.319 51.872 32.98 52.143 C 32.484 52.553 32.155 53.132 32.061 53.77 C 31.967 54.407 32.112 55.057 32.469 55.594 C 32.826 56.13 33.37 56.515 33.994 56.674 C 34.265 56.775 34.502 57.013 34.502 57.283 C 34.502 57.554 34.333 57.891 34.063 57.959 C 33.724 58.128 33.386 58.298 33.115 58.637 C 31.762 60.598 33.114 62.797 34.975 62.797 C 35.108 62.802 35.237 62.846 35.346 62.924 C 35.454 63.002 35.537 63.111 35.584 63.236 C 35.685 63.507 35.685 63.743 35.414 63.912 C 35.164 64.148 34.973 64.439 34.855 64.762 C 34.738 65.085 34.698 65.43 34.738 65.771 C 34.84 66.719 35.414 67.565 36.361 67.971 C 36.869 68.241 37.375 68.242 37.883 68.141 C 38.153 68.039 38.391 68.14 38.561 68.41 C 38.73 68.579 38.73 68.917 38.662 69.086 C 38.392 69.593 38.323 70.202 38.492 70.777 C 38.609 71.224 38.843 71.634 39.17 71.961 C 39.497 72.288 39.906 72.522 40.354 72.639 C 41.199 72.808 41.807 72.536 42.213 72.367 C 42.382 72.266 41.097 75.445 40.184 77.576 C 39.913 78.253 40.623 79.03 41.367 78.691 C 44.174 77.406 48.875 75.208 48.875 75.377 C 49.044 77.17 51.073 78.455 53.035 77.17 C 53.475 76.899 53.713 76.392 53.814 75.986 C 53.916 75.716 54.152 75.479 54.49 75.479 C 54.828 75.479 55.098 75.648 55.166 75.986 C 55.267 76.426 55.437 76.765 55.775 77.002 C 57.737 78.524 59.936 77.271 60.105 75.377 C 60.111 75.243 60.154 75.114 60.232 75.006 C 60.311 74.898 60.42 74.816 60.545 74.77 C 60.815 74.668 61.052 74.768 61.221 74.938 C 61.449 75.19 61.726 75.396 62.033 75.541 C 62.341 75.686 62.674 75.768 63.014 75.783 C 63.859 75.783 64.706 75.344 65.213 74.498 C 65.551 73.991 65.652 73.483 65.551 72.807 C 65.551 72.536 65.651 72.3 65.82 72.131 C 65.989 71.962 66.329 71.962 66.498 72.131 C 67.005 72.401 67.613 72.571 68.187 72.402 C 69.135 72.233 69.88 71.455 70.15 70.609 C 70.319 70.001 70.251 69.425 69.98 68.816 C 69.879 68.546 69.879 68.31 70.082 68.141 C 70.285 67.972 70.523 67.869 70.76 67.869 C 71.369 67.971 71.875 67.97 72.383 67.699 C 73.161 67.361 73.667 66.685 73.836 65.84 C 73.919 65.446 73.902 65.037 73.783 64.652 C 73.665 64.268 73.45 63.919 73.16 63.641 C 72.991 63.472 72.889 63.202 72.99 62.965 C 73.092 62.728 73.329 62.525 73.6 62.525 C 74.208 62.525 74.885 62.357 75.291 61.85 C 75.712 61.45 75.986 60.919 76.066 60.344 C 76.147 59.769 76.031 59.184 75.736 58.684 C 75.442 58.183 74.987 57.797 74.445 57.588 C 74.175 57.486 74.006 57.248 74.006 56.91 C 74.006 56.606 74.243 56.369 74.514 56.369 C 75.021 56.268 75.461 56.032 75.799 55.693 C 77.152 53.901 76.068 51.702 74.275 51.432 C 74.005 51.432 73.77 51.161 73.77 50.924 L 73.77 50.756 C 74.04 50.485 74.277 50.146 74.615 49.639 C 77.355 45.986 78.606 32.525 75.9 31.477 C 75.486 31.337 75.019 31.267 74.512 31.256 Z M 35.707 35.379 C 37.284 35.409 39.47 36.384 40.996 37.633 C 40.759 37.903 40.59 38.242 40.488 38.58 C 40.321 39.074 40.321 39.608 40.488 40.102 C 40.59 40.338 40.487 40.608 40.318 40.777 C 40.149 40.946 39.913 41.049 39.643 40.947 C 39.135 40.744 38.628 40.677 38.121 40.846 C 37.208 41.116 36.429 41.86 36.26 42.807 C 36.198 43.146 36.206 43.495 36.281 43.832 C 36.357 44.169 36.498 44.489 36.699 44.77 C 36.801 44.939 36.868 45.175 36.699 45.445 L 36.43 45.717 C 35.821 45.615 35.414 45.378 35.076 44.871 C 33.52 42.74 33.249 36.009 34.771 35.502 C 34.962 35.439 35.173 35.4 35.4 35.385 C 35.5 35.378 35.602 35.377 35.707 35.379 Z M 72.209 35.438 C 72.311 35.437 72.411 35.441 72.508 35.449 C 72.729 35.467 72.937 35.505 73.127 35.568 C 74.649 36.076 74.377 42.807 72.855 44.937 C 72.585 45.276 72.246 45.514 71.908 45.615 C 71.739 45.615 71.672 45.445 71.57 45.344 C 71.401 45.175 71.401 44.837 71.57 44.668 C 71.852 44.273 72.005 43.8 72.01 43.314 C 72.111 42.706 71.84 42.131 71.502 41.691 C 71.282 41.376 70.99 41.118 70.648 40.941 C 70.307 40.765 69.926 40.673 69.541 40.676 C 69.203 40.676 68.866 40.677 68.527 40.846 C 68.291 40.947 68.019 40.845 67.85 40.676 C 67.68 40.507 67.58 40.271 67.682 40 C 67.849 39.507 67.849 38.972 67.682 38.479 C 67.614 38.039 67.444 37.767 67.072 37.598 C 68.626 36.349 70.681 35.443 72.209 35.438 Z M 43.836 53.055 C 44.164 53.055 44.493 53.106 44.809 53.209 C 45.44 53.414 45.991 53.814 46.381 54.352 C 46.771 54.889 46.982 55.537 46.982 56.201 C 46.982 57.035 46.65 57.836 46.061 58.426 C 45.471 59.016 44.67 59.346 43.836 59.346 C 43.002 59.346 42.203 59.016 41.613 58.426 C 41.023 57.836 40.691 57.035 40.691 56.201 C 40.691 55.537 40.901 54.889 41.291 54.352 C 41.681 53.814 42.234 53.414 42.865 53.209 C 43.181 53.106 43.508 53.055 43.836 53.055 Z M 64.367 53.055 C 65.201 53.055 66 53.387 66.59 53.977 C 67.18 54.566 67.512 55.367 67.512 56.201 C 67.512 56.865 67.302 57.512 66.912 58.049 C 66.522 58.586 65.969 58.986 65.338 59.191 C 64.706 59.397 64.026 59.397 63.395 59.191 C 62.763 58.986 62.213 58.586 61.822 58.049 C 61.432 57.512 61.221 56.865 61.221 56.201 C 61.221 55.367 61.553 54.566 62.143 53.977 C 62.732 53.387 63.533 53.055 64.367 53.055 Z M 54.152 54.895 C 55.725 54.882 57.297 55.305 57.297 56.201 C 57.297 57.035 56.967 57.836 56.377 58.426 C 55.787 59.016 54.986 59.346 54.152 59.346 C 53.318 59.346 52.517 59.016 51.928 58.426 C 51.338 57.836 51.006 57.035 51.006 56.201 C 51.006 55.356 52.58 54.907 54.152 54.895 Z"
-        android:fillColor="#4d3f92"/>
-</vector>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 1084c2408..000000000
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 54dd74b56..b729d12ce 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 6fc0dcbfb..6b2fd5a7c 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index dd6dcadac..06eda9ce7 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index ea5d85515..a195b46a8 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 8d4f59224..6c985b40f 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
new file mode 100644
index 000000000..2d5909b1b
--- /dev/null
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowSplashScreenBackground">#000000</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 7c806c658..0398fe499 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -5,6 +5,7 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
new file mode 100644
index 000000000..91a829037
--- /dev/null
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowSplashScreenIconBackgroundColor">#ffffff</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowSplashScreenBackground">#ffffff</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index fb1434bfe..7fc056697 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index c1316a046..493fb3513 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 614e86e70..e9c4d17b9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index 6470c4af2..ab4429505 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 67e871887..8cf5ce575 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index 82f590cb4..86e41866e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 82e64450f..6bcd5d232 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 614e86e70..e9c4d17b9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 4cea61db8..8141557d9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index a526a33e4..0f2d72950 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
index bbf764529..dbf799aed 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
index cd6906568..ba9df85e5 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
index f3dd408e3..8af071a64 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
index 37766e74a..de18f87b2 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index a526a33e4..0f2d72950 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index a21531ac0..9ebcb0e3c 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
index 477aa9700..70b48abfd 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
index 9d3aaf7db..934a88022 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index f02c1af0d..0aadee9b8 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index ba0bc949a..d422c92ba 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index 93bc65236..9662850c0 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
index fa3132785..9f447e1b3 100644
--- a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
@@ -6,43 +6,12 @@
       "scale" : "1x"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "darkbackground.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png
deleted file mode 100644
index 1b5df34e7..000000000
Binary files a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 00cabce83..f3387d4ae 100644
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -5,15 +5,48 @@
       "idiom" : "universal",
       "scale" : "1x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "LaunchImageDark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
     {
       "filename" : "LaunchImage@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "LaunchImageDark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
     {
       "filename" : "LaunchImage@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "LaunchImageDark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index f4c0bdb92..2b76b44dc 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index dafa3b707..a307b6793 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index b627f5280..282730d9a 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/splash.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/splash.png
new file mode 100644
index 000000000..7829287c6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/splash.png differ
diff --git a/web/favicon.png b/web/favicon.png
index e062b83e7..9583e5e97 100644
Binary files a/web/favicon.png and b/web/favicon.png differ
diff --git a/web/index.html b/web/index.html
index f63fe3bae..4e6f28e70 100644
--- a/web/index.html
+++ b/web/index.html
@@ -52,7 +52,6 @@
 
 <body>
   <script>
-    console.log("SERVICE WORKER VERSION: ", serviceWorkerVersion)
     window.addEventListener('load', function (ev) {
       // Download main.dart.js
       _flutter.loader.loadEntrypoint({
diff --git a/web/splash/img/dark-1x.png b/web/splash/img/dark-1x.png
index f4c0bdb92..66574aed8 100644
Binary files a/web/splash/img/dark-1x.png and b/web/splash/img/dark-1x.png differ
diff --git a/web/splash/img/dark-2x.png b/web/splash/img/dark-2x.png
index dafa3b707..5064d226c 100644
Binary files a/web/splash/img/dark-2x.png and b/web/splash/img/dark-2x.png differ
diff --git a/web/splash/img/dark-3x.png b/web/splash/img/dark-3x.png
index b627f5280..a66b9f972 100644
Binary files a/web/splash/img/dark-3x.png and b/web/splash/img/dark-3x.png differ
diff --git a/web/splash/img/dark-4x.png b/web/splash/img/dark-4x.png
index 0d1d2a74d..0c04404bb 100644
Binary files a/web/splash/img/dark-4x.png and b/web/splash/img/dark-4x.png differ
diff --git a/web/splash/img/light-1x.png b/web/splash/img/light-1x.png
index f4c0bdb92..66574aed8 100644
Binary files a/web/splash/img/light-1x.png and b/web/splash/img/light-1x.png differ
diff --git a/web/splash/img/light-2x.png b/web/splash/img/light-2x.png
index dafa3b707..5064d226c 100644
Binary files a/web/splash/img/light-2x.png and b/web/splash/img/light-2x.png differ
diff --git a/web/splash/img/light-3x.png b/web/splash/img/light-3x.png
index b627f5280..a66b9f972 100644
Binary files a/web/splash/img/light-3x.png and b/web/splash/img/light-3x.png differ
diff --git a/web/splash/img/light-4x.png b/web/splash/img/light-4x.png
index 0d1d2a74d..0c04404bb 100644
Binary files a/web/splash/img/light-4x.png and b/web/splash/img/light-4x.png differ