diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index b108aaf5f..35a0208a4 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -154,8 +154,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -190,57 +228,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -283,69 +270,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -400,21 +333,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -532,24 +450,6 @@
Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
MSBuild:UpdateGeneratedFiles
diff --git a/src/Android/Resources/drawable-hdpi/accessibility_overlay.png b/src/Android/Resources/drawable-hdpi/accessibility_overlay.png
index 3295567b7..ba42e9d4b 100644
Binary files a/src/Android/Resources/drawable-hdpi/accessibility_overlay.png and b/src/Android/Resources/drawable-hdpi/accessibility_overlay.png differ
diff --git a/src/Android/Resources/drawable-hdpi/accessibility_permission.png b/src/Android/Resources/drawable-hdpi/accessibility_permission.png
index 2670894cd..4ea9736d7 100644
Binary files a/src/Android/Resources/drawable-hdpi/accessibility_permission.png and b/src/Android/Resources/drawable-hdpi/accessibility_permission.png differ
diff --git a/src/Android/Resources/drawable-hdpi/accessibility_step1.png b/src/Android/Resources/drawable-hdpi/accessibility_step1.png
index 41d78e056..0e248a721 100644
Binary files a/src/Android/Resources/drawable-hdpi/accessibility_step1.png and b/src/Android/Resources/drawable-hdpi/accessibility_step1.png differ
diff --git a/src/Android/Resources/drawable-hdpi/accessibility_step2.png b/src/Android/Resources/drawable-hdpi/accessibility_step2.png
index 4a7bebe21..9ed205409 100644
Binary files a/src/Android/Resources/drawable-hdpi/accessibility_step2.png and b/src/Android/Resources/drawable-hdpi/accessibility_step2.png differ
diff --git a/src/Android/Resources/drawable-hdpi/autofill_enable.png b/src/Android/Resources/drawable-hdpi/autofill_enable.png
index 98aaca06f..61c5f81cc 100644
Binary files a/src/Android/Resources/drawable-hdpi/autofill_enable.png and b/src/Android/Resources/drawable-hdpi/autofill_enable.png differ
diff --git a/src/Android/Resources/drawable-hdpi/autofill_use.png b/src/Android/Resources/drawable-hdpi/autofill_use.png
index 604a7d66f..fb79c6a67 100644
Binary files a/src/Android/Resources/drawable-hdpi/autofill_use.png and b/src/Android/Resources/drawable-hdpi/autofill_use.png differ
diff --git a/src/Android/Resources/drawable-hdpi/icon.png b/src/Android/Resources/drawable-hdpi/icon.png
deleted file mode 100644
index 8b4107e4a..000000000
Binary files a/src/Android/Resources/drawable-hdpi/icon.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/accessibility_overlay.png b/src/Android/Resources/drawable-xhdpi/accessibility_overlay.png
index 99d8a5f26..3b1889280 100644
Binary files a/src/Android/Resources/drawable-xhdpi/accessibility_overlay.png and b/src/Android/Resources/drawable-xhdpi/accessibility_overlay.png differ
diff --git a/src/Android/Resources/drawable-xhdpi/accessibility_permission.png b/src/Android/Resources/drawable-xhdpi/accessibility_permission.png
index 4d7d74f6a..942fa729c 100644
Binary files a/src/Android/Resources/drawable-xhdpi/accessibility_permission.png and b/src/Android/Resources/drawable-xhdpi/accessibility_permission.png differ
diff --git a/src/Android/Resources/drawable-xhdpi/accessibility_step1.png b/src/Android/Resources/drawable-xhdpi/accessibility_step1.png
index 310c3cf21..994b5c72c 100644
Binary files a/src/Android/Resources/drawable-xhdpi/accessibility_step1.png and b/src/Android/Resources/drawable-xhdpi/accessibility_step1.png differ
diff --git a/src/Android/Resources/drawable-xhdpi/accessibility_step2.png b/src/Android/Resources/drawable-xhdpi/accessibility_step2.png
index a292c86d1..4d8d92d08 100644
Binary files a/src/Android/Resources/drawable-xhdpi/accessibility_step2.png and b/src/Android/Resources/drawable-xhdpi/accessibility_step2.png differ
diff --git a/src/Android/Resources/drawable-xhdpi/autofill_enable.png b/src/Android/Resources/drawable-xhdpi/autofill_enable.png
index 2f9da2210..f3fd1dd03 100644
Binary files a/src/Android/Resources/drawable-xhdpi/autofill_enable.png and b/src/Android/Resources/drawable-xhdpi/autofill_enable.png differ
diff --git a/src/Android/Resources/drawable-xhdpi/autofill_use.png b/src/Android/Resources/drawable-xhdpi/autofill_use.png
index 5e6c6d7ac..d3ff23feb 100644
Binary files a/src/Android/Resources/drawable-xhdpi/autofill_use.png and b/src/Android/Resources/drawable-xhdpi/autofill_use.png differ
diff --git a/src/Android/Resources/drawable-xhdpi/icon.png b/src/Android/Resources/drawable-xhdpi/icon.png
deleted file mode 100644
index fcd1018f5..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/accessibility_overlay.png b/src/Android/Resources/drawable-xxhdpi/accessibility_overlay.png
index 582b5866b..e355c12f4 100644
Binary files a/src/Android/Resources/drawable-xxhdpi/accessibility_overlay.png and b/src/Android/Resources/drawable-xxhdpi/accessibility_overlay.png differ
diff --git a/src/Android/Resources/drawable-xxhdpi/accessibility_permission.png b/src/Android/Resources/drawable-xxhdpi/accessibility_permission.png
index 9d0ac722c..7d91c5d4c 100644
Binary files a/src/Android/Resources/drawable-xxhdpi/accessibility_permission.png and b/src/Android/Resources/drawable-xxhdpi/accessibility_permission.png differ
diff --git a/src/Android/Resources/drawable-xxhdpi/accessibility_step1.png b/src/Android/Resources/drawable-xxhdpi/accessibility_step1.png
index 21726dc30..e6c119689 100644
Binary files a/src/Android/Resources/drawable-xxhdpi/accessibility_step1.png and b/src/Android/Resources/drawable-xxhdpi/accessibility_step1.png differ
diff --git a/src/Android/Resources/drawable-xxhdpi/accessibility_step2.png b/src/Android/Resources/drawable-xxhdpi/accessibility_step2.png
index 347e54214..b774085a6 100644
Binary files a/src/Android/Resources/drawable-xxhdpi/accessibility_step2.png and b/src/Android/Resources/drawable-xxhdpi/accessibility_step2.png differ
diff --git a/src/Android/Resources/drawable-xxhdpi/autofill_enable.png b/src/Android/Resources/drawable-xxhdpi/autofill_enable.png
index c39e06f4d..24636a2ee 100644
Binary files a/src/Android/Resources/drawable-xxhdpi/autofill_enable.png and b/src/Android/Resources/drawable-xxhdpi/autofill_enable.png differ
diff --git a/src/Android/Resources/drawable-xxhdpi/autofill_use.png b/src/Android/Resources/drawable-xxhdpi/autofill_use.png
index 43b64bcde..538ff52ae 100644
Binary files a/src/Android/Resources/drawable-xxhdpi/autofill_use.png and b/src/Android/Resources/drawable-xxhdpi/autofill_use.png differ
diff --git a/src/Android/Resources/drawable-xxhdpi/icon.png b/src/Android/Resources/drawable-xxhdpi/icon.png
deleted file mode 100644
index b16b09f43..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/icon.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/icon.png b/src/Android/Resources/drawable-xxxhdpi/icon.png
deleted file mode 100644
index 6fa399d2a..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/icon.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/accessibility_notification.png b/src/Android/Resources/drawable/accessibility_notification.png
deleted file mode 100644
index b9ad63cc7..000000000
Binary files a/src/Android/Resources/drawable/accessibility_notification.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/accessibility_notification_icon.png b/src/Android/Resources/drawable/accessibility_notification_icon.png
deleted file mode 100644
index 792f5f44a..000000000
Binary files a/src/Android/Resources/drawable/accessibility_notification_icon.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/accessibility_overlay.png b/src/Android/Resources/drawable/accessibility_overlay.png
new file mode 100644
index 000000000..39ff1136d
Binary files /dev/null and b/src/Android/Resources/drawable/accessibility_overlay.png differ
diff --git a/src/Android/Resources/drawable/accessibility_permission.png b/src/Android/Resources/drawable/accessibility_permission.png
new file mode 100644
index 000000000..2432355f0
Binary files /dev/null and b/src/Android/Resources/drawable/accessibility_permission.png differ
diff --git a/src/Android/Resources/drawable/accessibility_step1.png b/src/Android/Resources/drawable/accessibility_step1.png
index 745102ae2..57057e947 100644
Binary files a/src/Android/Resources/drawable/accessibility_step1.png and b/src/Android/Resources/drawable/accessibility_step1.png differ
diff --git a/src/Android/Resources/drawable/accessibility_step2.png b/src/Android/Resources/drawable/accessibility_step2.png
index 2bfabb9c6..4e8078fed 100644
Binary files a/src/Android/Resources/drawable/accessibility_step2.png and b/src/Android/Resources/drawable/accessibility_step2.png differ
diff --git a/src/Android/Resources/drawable/autofill_enable.png b/src/Android/Resources/drawable/autofill_enable.png
index 43fb8da9d..f096a3bd1 100644
Binary files a/src/Android/Resources/drawable/autofill_enable.png and b/src/Android/Resources/drawable/autofill_enable.png differ
diff --git a/src/Android/Resources/drawable/autofill_use.png b/src/Android/Resources/drawable/autofill_use.png
index 4a9016bf4..3de6f83d2 100644
Binary files a/src/Android/Resources/drawable/autofill_use.png and b/src/Android/Resources/drawable/autofill_use.png differ
diff --git a/src/Android/Resources/drawable/ic_launcher_foreground.xml b/src/Android/Resources/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..38bf3858c
--- /dev/null
+++ b/src/Android/Resources/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
diff --git a/src/Android/Resources/drawable/icon.png b/src/Android/Resources/drawable/icon.png
deleted file mode 100644
index b2634a56c..000000000
Binary files a/src/Android/Resources/drawable/icon.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/icon.xml b/src/Android/Resources/drawable/icon.xml
new file mode 100644
index 000000000..256a65f9c
--- /dev/null
+++ b/src/Android/Resources/drawable/icon.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/src/Android/Resources/mipmap-anydpi-v26/ic_launcher.xml b/src/Android/Resources/mipmap-anydpi-v26/ic_launcher.xml
index 036d09bc5..7353dbd1f 100644
--- a/src/Android/Resources/mipmap-anydpi-v26/ic_launcher.xml
+++ b/src/Android/Resources/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml b/src/Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml
index 036d09bc5..7353dbd1f 100644
--- a/src/Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/src/Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/Android/Resources/mipmap-hdpi/ic_launcher.png b/src/Android/Resources/mipmap-hdpi/ic_launcher.png
index 0beee6782..448c9e4bb 100644
Binary files a/src/Android/Resources/mipmap-hdpi/ic_launcher.png and b/src/Android/Resources/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/Android/Resources/mipmap-hdpi/ic_launcher_foreground.png b/src/Android/Resources/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index bcee8cd20..000000000
Binary files a/src/Android/Resources/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/src/Android/Resources/mipmap-hdpi/ic_launcher_round.png b/src/Android/Resources/mipmap-hdpi/ic_launcher_round.png
index f10d882b7..4cff5ce7d 100644
Binary files a/src/Android/Resources/mipmap-hdpi/ic_launcher_round.png and b/src/Android/Resources/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/src/Android/Resources/mipmap-mdpi/ic_launcher.png b/src/Android/Resources/mipmap-mdpi/ic_launcher.png
index c8e0b89f8..2ba14a01d 100644
Binary files a/src/Android/Resources/mipmap-mdpi/ic_launcher.png and b/src/Android/Resources/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/Android/Resources/mipmap-mdpi/ic_launcher_foreground.png b/src/Android/Resources/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index ce0dba231..000000000
Binary files a/src/Android/Resources/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/src/Android/Resources/mipmap-mdpi/ic_launcher_round.png b/src/Android/Resources/mipmap-mdpi/ic_launcher_round.png
index 3b4c2cbd8..e60e8f300 100644
Binary files a/src/Android/Resources/mipmap-mdpi/ic_launcher_round.png and b/src/Android/Resources/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/src/Android/Resources/mipmap-xhdpi/ic_launcher.png b/src/Android/Resources/mipmap-xhdpi/ic_launcher.png
index c0e0aaa3d..9267c3b7c 100644
Binary files a/src/Android/Resources/mipmap-xhdpi/ic_launcher.png and b/src/Android/Resources/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/src/Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 0cfe8dd9f..000000000
Binary files a/src/Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/src/Android/Resources/mipmap-xhdpi/ic_launcher_round.png b/src/Android/Resources/mipmap-xhdpi/ic_launcher_round.png
index 60779903c..997e1edd1 100644
Binary files a/src/Android/Resources/mipmap-xhdpi/ic_launcher_round.png and b/src/Android/Resources/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/src/Android/Resources/mipmap-xxhdpi/ic_launcher.png b/src/Android/Resources/mipmap-xxhdpi/ic_launcher.png
index dbfd0c72b..de43334f0 100644
Binary files a/src/Android/Resources/mipmap-xxhdpi/ic_launcher.png and b/src/Android/Resources/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/src/Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 875f522ca..000000000
Binary files a/src/Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/src/Android/Resources/mipmap-xxhdpi/ic_launcher_round.png b/src/Android/Resources/mipmap-xxhdpi/ic_launcher_round.png
index 51632713f..671b13f73 100644
Binary files a/src/Android/Resources/mipmap-xxhdpi/ic_launcher_round.png and b/src/Android/Resources/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/src/Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/src/Android/Resources/mipmap-xxxhdpi/ic_launcher.png
index 96e3ca59e..8929e0da0 100644
Binary files a/src/Android/Resources/mipmap-xxxhdpi/ic_launcher.png and b/src/Android/Resources/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/src/Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 87b9570a3..000000000
Binary files a/src/Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/src/Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/src/Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png
index e2dcc0990..99519d0bc 100644
Binary files a/src/Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png and b/src/Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png differ