diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index c379d3369..ae832cfb1 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -166,26 +166,40 @@
     <AndroidResource Include="Resources\drawable-hdpi\accessibility_step2.png" />
     <AndroidResource Include="Resources\drawable-hdpi\autofill_enable.png" />
     <AndroidResource Include="Resources\drawable-hdpi\autofill_use.png" />
+    <AndroidResource Include="Resources\drawable-hdpi\logo_legacy.png" />
+    <AndroidResource Include="Resources\drawable-hdpi\logo_white_legacy.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\accessibility_overlay.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\accessibility_permission.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\accessibility_step1.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\accessibility_step2.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\autofill_enable.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\autofill_use.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\logo_legacy.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\logo_white_legacy.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_overlay.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_permission.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_step1.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_step2.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\autofill_enable.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\autofill_use.png" />
-    <AndroidResource Include="Resources\drawable\accessibility_overlay.png" />
-    <AndroidResource Include="Resources\drawable\accessibility_permission.png" />
-    <AndroidResource Include="Resources\drawable\accessibility_step1.png" />
-    <AndroidResource Include="Resources\drawable\accessibility_step2.png" />
-    <AndroidResource Include="Resources\drawable\autofill_enable.png" />
-    <AndroidResource Include="Resources\drawable\autofill_use.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\logo_legacy.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\logo_white_legacy.png" />
+    <AndroidResource Include="Resources\drawable\card.xml" />
+    <AndroidResource Include="Resources\drawable\cog.xml" />
     <AndroidResource Include="Resources\drawable\icon.xml" />
     <AndroidResource Include="Resources\drawable\ic_launcher_foreground.xml" />
+    <AndroidResource Include="Resources\drawable\id.xml" />
+    <AndroidResource Include="Resources\drawable\lock.xml" />
+    <AndroidResource Include="Resources\drawable\login.xml" />
+    <AndroidResource Include="Resources\drawable\logo.xml" />
+    <AndroidResource Include="Resources\drawable\logo_white.xml" />
+    <AndroidResource Include="Resources\drawable\pencil.xml" />
+    <AndroidResource Include="Resources\drawable\plus.xml" />
+    <AndroidResource Include="Resources\drawable\refresh.xml" />
+    <AndroidResource Include="Resources\drawable\search.xml" />
+    <AndroidResource Include="Resources\drawable\shield.xml" />
+    <AndroidResource Include="Resources\drawable-v23\splash_screen.xml" />
+    <AndroidResource Include="Resources\drawable-v23\splash_screen_dark.xml" />
     <AndroidResource Include="Resources\layout\Tabbar.axml" />
     <AndroidResource Include="Resources\layout\Toolbar.axml" />
     <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
@@ -238,135 +252,15 @@
   <ItemGroup>
     <AndroidResource Include="Resources\layout\autofill_listitem.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\logo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\logo.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-hdpi\yubikey.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\yubikey.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\shield.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\yubikey.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\logo.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxhdpi\yubikey.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\pencil.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\pencil.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\pencil.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\pencil.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\pencil.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\slider_thumb.xml" />
   </ItemGroup>
@@ -376,78 +270,12 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\logo_white.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\logo_white.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\logo_white.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\cog.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\cog.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\cog.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\cog.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\cog.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\dimens.xml">
       <Generator>MSBuild:UpdateGeneratedFiles</Generator>
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\shield.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\shield.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\shield.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\shield.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\refresh_sm.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\refresh_sm.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\refresh_sm.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\refresh_sm.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\refresh_sm.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\CipherViewCell.axml">
       <Generator>MSBuild:UpdateGeneratedFiles</Generator>
diff --git a/src/Android/Resources/drawable-hdpi/card.png b/src/Android/Resources/drawable-hdpi/card.png
deleted file mode 100644
index 9428a9850..000000000
Binary files a/src/Android/Resources/drawable-hdpi/card.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/cog.png b/src/Android/Resources/drawable-hdpi/cog.png
deleted file mode 100644
index 649d3d273..000000000
Binary files a/src/Android/Resources/drawable-hdpi/cog.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/id.png b/src/Android/Resources/drawable-hdpi/id.png
deleted file mode 100644
index 17d6bef8b..000000000
Binary files a/src/Android/Resources/drawable-hdpi/id.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/lock.png b/src/Android/Resources/drawable-hdpi/lock.png
deleted file mode 100644
index 2ddeb2707..000000000
Binary files a/src/Android/Resources/drawable-hdpi/lock.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/login.png b/src/Android/Resources/drawable-hdpi/login.png
deleted file mode 100644
index 3d55ef007..000000000
Binary files a/src/Android/Resources/drawable-hdpi/login.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/logo.png b/src/Android/Resources/drawable-hdpi/logo_legacy.png
similarity index 100%
rename from src/Android/Resources/drawable-hdpi/logo.png
rename to src/Android/Resources/drawable-hdpi/logo_legacy.png
diff --git a/src/Android/Resources/drawable-hdpi/logo_white.png b/src/Android/Resources/drawable-hdpi/logo_white_legacy.png
similarity index 100%
rename from src/Android/Resources/drawable-hdpi/logo_white.png
rename to src/Android/Resources/drawable-hdpi/logo_white_legacy.png
diff --git a/src/Android/Resources/drawable-hdpi/pencil.png b/src/Android/Resources/drawable-hdpi/pencil.png
deleted file mode 100644
index 67e5b2115..000000000
Binary files a/src/Android/Resources/drawable-hdpi/pencil.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/plus.png b/src/Android/Resources/drawable-hdpi/plus.png
deleted file mode 100644
index 02557510f..000000000
Binary files a/src/Android/Resources/drawable-hdpi/plus.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/refresh.png b/src/Android/Resources/drawable-hdpi/refresh.png
deleted file mode 100644
index 2aca6f31f..000000000
Binary files a/src/Android/Resources/drawable-hdpi/refresh.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/refresh_sm.png b/src/Android/Resources/drawable-hdpi/refresh_sm.png
deleted file mode 100644
index 172499a19..000000000
Binary files a/src/Android/Resources/drawable-hdpi/refresh_sm.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/search.png b/src/Android/Resources/drawable-hdpi/search.png
deleted file mode 100644
index 91fd9365a..000000000
Binary files a/src/Android/Resources/drawable-hdpi/search.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-hdpi/shield.png b/src/Android/Resources/drawable-hdpi/shield.png
deleted file mode 100644
index cb08cd858..000000000
Binary files a/src/Android/Resources/drawable-hdpi/shield.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-v23/splash_screen.xml b/src/Android/Resources/drawable-v23/splash_screen.xml
new file mode 100644
index 000000000..2b50133a9
--- /dev/null
+++ b/src/Android/Resources/drawable-v23/splash_screen.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+TODO: When API 23 becomes our new minimum, replace 'splash_screen.xml' in 'drawable' with this version, and delete
+ all versions of 'logo_legacy.png' and 'logo_white_legacy.png'. The bitmaps only exist due to a bug in API <23 where
+ vector drawables used in layer-lists (our splash screen) stretch to fill the full height of the parent.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="@color/lightgray"/>
+    </item>
+    <item
+        android:drawable="@drawable/logo"
+        android:tileMode="disabled"
+        android:gravity="center"/>
+</layer-list>
diff --git a/src/Android/Resources/drawable-v23/splash_screen_dark.xml b/src/Android/Resources/drawable-v23/splash_screen_dark.xml
new file mode 100644
index 000000000..6f58c12e0
--- /dev/null
+++ b/src/Android/Resources/drawable-v23/splash_screen_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+TODO: When API 23 becomes our new minimum, replace 'splash_screen_dark.xml' in 'drawable' with this version, and delete
+ all versions of 'logo_legacy.png' and 'logo_white_legacy.png'. The bitmaps only exist due to a bug in API <23 where
+ vector drawables used in layer-lists (our splash screen) stretch to fill the full height of the parent.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="@color/darkgray"/>
+    </item>
+    <item
+        android:drawable="@drawable/logo_white"
+        android:tileMode="disabled"
+        android:gravity="center"/>
+</layer-list>
diff --git a/src/Android/Resources/drawable-xhdpi/card.png b/src/Android/Resources/drawable-xhdpi/card.png
deleted file mode 100644
index 82b8562ee..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/card.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/cog.png b/src/Android/Resources/drawable-xhdpi/cog.png
deleted file mode 100644
index 4e9a8e664..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/cog.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/id.png b/src/Android/Resources/drawable-xhdpi/id.png
deleted file mode 100644
index 210999141..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/id.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/lock.png b/src/Android/Resources/drawable-xhdpi/lock.png
deleted file mode 100644
index 1164fc7a2..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/lock.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/login.png b/src/Android/Resources/drawable-xhdpi/login.png
deleted file mode 100644
index 21dd4e395..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/login.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/logo_legacy.png b/src/Android/Resources/drawable-xhdpi/logo_legacy.png
new file mode 100644
index 000000000..b8d376492
Binary files /dev/null and b/src/Android/Resources/drawable-xhdpi/logo_legacy.png differ
diff --git a/src/Android/Resources/drawable-xhdpi/logo_white_legacy.png b/src/Android/Resources/drawable-xhdpi/logo_white_legacy.png
new file mode 100644
index 000000000..d3d9f5805
Binary files /dev/null and b/src/Android/Resources/drawable-xhdpi/logo_white_legacy.png differ
diff --git a/src/Android/Resources/drawable-xhdpi/pencil.png b/src/Android/Resources/drawable-xhdpi/pencil.png
deleted file mode 100644
index a89b0a8d5..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/pencil.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/plus.png b/src/Android/Resources/drawable-xhdpi/plus.png
deleted file mode 100644
index 5f7ff860c..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/plus.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/refresh.png b/src/Android/Resources/drawable-xhdpi/refresh.png
deleted file mode 100644
index 4a8a083a6..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/refresh.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/refresh_sm.png b/src/Android/Resources/drawable-xhdpi/refresh_sm.png
deleted file mode 100644
index e918e245a..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/refresh_sm.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/search.png b/src/Android/Resources/drawable-xhdpi/search.png
deleted file mode 100644
index 311a43c88..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/search.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xhdpi/shield.png b/src/Android/Resources/drawable-xhdpi/shield.png
deleted file mode 100644
index 4335f98f9..000000000
Binary files a/src/Android/Resources/drawable-xhdpi/shield.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/card.png b/src/Android/Resources/drawable-xxhdpi/card.png
deleted file mode 100644
index beb3a564a..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/card.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/cog.png b/src/Android/Resources/drawable-xxhdpi/cog.png
deleted file mode 100644
index 25275ebd5..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/cog.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/id.png b/src/Android/Resources/drawable-xxhdpi/id.png
deleted file mode 100644
index c930f693d..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/id.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/lock.png b/src/Android/Resources/drawable-xxhdpi/lock.png
deleted file mode 100644
index 9a360d4dd..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/lock.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/login.png b/src/Android/Resources/drawable-xxhdpi/login.png
deleted file mode 100644
index 7c733d6e3..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/login.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/logo.png b/src/Android/Resources/drawable-xxhdpi/logo_legacy.png
similarity index 100%
rename from src/Android/Resources/drawable-xxhdpi/logo.png
rename to src/Android/Resources/drawable-xxhdpi/logo_legacy.png
diff --git a/src/Android/Resources/drawable-xxhdpi/logo_white.png b/src/Android/Resources/drawable-xxhdpi/logo_white_legacy.png
similarity index 100%
rename from src/Android/Resources/drawable-xxhdpi/logo_white.png
rename to src/Android/Resources/drawable-xxhdpi/logo_white_legacy.png
diff --git a/src/Android/Resources/drawable-xxhdpi/pencil.png b/src/Android/Resources/drawable-xxhdpi/pencil.png
deleted file mode 100644
index eecd53526..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/pencil.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/plus.png b/src/Android/Resources/drawable-xxhdpi/plus.png
deleted file mode 100644
index 169ee2f8a..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/plus.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/refresh.png b/src/Android/Resources/drawable-xxhdpi/refresh.png
deleted file mode 100644
index 3bb43ee16..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/refresh.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/refresh_sm.png b/src/Android/Resources/drawable-xxhdpi/refresh_sm.png
deleted file mode 100644
index 8beb7fd56..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/refresh_sm.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/search.png b/src/Android/Resources/drawable-xxhdpi/search.png
deleted file mode 100644
index 5389f6929..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/search.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxhdpi/shield.png b/src/Android/Resources/drawable-xxhdpi/shield.png
deleted file mode 100644
index be79eb5ec..000000000
Binary files a/src/Android/Resources/drawable-xxhdpi/shield.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/card.png b/src/Android/Resources/drawable-xxxhdpi/card.png
deleted file mode 100644
index 8cfa031f6..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/card.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/cog.png b/src/Android/Resources/drawable-xxxhdpi/cog.png
deleted file mode 100644
index e69a10fca..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/cog.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/id.png b/src/Android/Resources/drawable-xxxhdpi/id.png
deleted file mode 100644
index d05a33229..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/id.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/lock.png b/src/Android/Resources/drawable-xxxhdpi/lock.png
deleted file mode 100644
index f7d7e1274..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/lock.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/login.png b/src/Android/Resources/drawable-xxxhdpi/login.png
deleted file mode 100644
index d2ed61aa8..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/login.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/pencil.png b/src/Android/Resources/drawable-xxxhdpi/pencil.png
deleted file mode 100644
index 169a91e17..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/pencil.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/plus.png b/src/Android/Resources/drawable-xxxhdpi/plus.png
deleted file mode 100644
index d081b363b..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/plus.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/refresh.png b/src/Android/Resources/drawable-xxxhdpi/refresh.png
deleted file mode 100644
index a13ab5445..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/refresh.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/refresh_sm.png b/src/Android/Resources/drawable-xxxhdpi/refresh_sm.png
deleted file mode 100644
index 46ec1d43f..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/refresh_sm.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/search.png b/src/Android/Resources/drawable-xxxhdpi/search.png
deleted file mode 100644
index 40829cb12..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/search.png and /dev/null differ
diff --git a/src/Android/Resources/drawable-xxxhdpi/shield.png b/src/Android/Resources/drawable-xxxhdpi/shield.png
deleted file mode 100644
index 98de1da5f..000000000
Binary files a/src/Android/Resources/drawable-xxxhdpi/shield.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/accessibility_overlay.png b/src/Android/Resources/drawable/accessibility_overlay.png
deleted file mode 100644
index 39ff1136d..000000000
Binary files a/src/Android/Resources/drawable/accessibility_overlay.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/accessibility_permission.png b/src/Android/Resources/drawable/accessibility_permission.png
deleted file mode 100644
index 2432355f0..000000000
Binary files a/src/Android/Resources/drawable/accessibility_permission.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/accessibility_step1.png b/src/Android/Resources/drawable/accessibility_step1.png
deleted file mode 100644
index 57057e947..000000000
Binary files a/src/Android/Resources/drawable/accessibility_step1.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/accessibility_step2.png b/src/Android/Resources/drawable/accessibility_step2.png
deleted file mode 100644
index 4e8078fed..000000000
Binary files a/src/Android/Resources/drawable/accessibility_step2.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/autofill_enable.png b/src/Android/Resources/drawable/autofill_enable.png
deleted file mode 100644
index f096a3bd1..000000000
Binary files a/src/Android/Resources/drawable/autofill_enable.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/autofill_use.png b/src/Android/Resources/drawable/autofill_use.png
deleted file mode 100644
index 3de6f83d2..000000000
Binary files a/src/Android/Resources/drawable/autofill_use.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/card.png b/src/Android/Resources/drawable/card.png
deleted file mode 100644
index c7f2ecae7..000000000
Binary files a/src/Android/Resources/drawable/card.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/card.xml b/src/Android/Resources/drawable/card.xml
new file mode 100644
index 000000000..8a0b07bfc
--- /dev/null
+++ b/src/Android/Resources/drawable/card.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="2048"
+    android:viewportHeight="2048">
+    <path
+        android:fillColor="#FF777777"
+        android:pathData="M1824,256C1868,256 1905.67,271.67 1937,303C1968.33,334.33 1984,372 1984,416L1984,1632C1984,1676 1968.33,1713.67 1937,1745C1905.67,1776.33 1868,1792 1824,1792L224,1792C180,1792 142.33,1776.33 111,1745C79.67,1713.67 64,1676 64,1632L64,416C64,372 79.67,334.33 111,303C142.33,271.67 180,256 224,256L1824,256ZM224,384C215.33,384 207.83,387.17 201.5,393.5C195.17,399.83 192,407.33 192,416L192,640L1856,640L1856,416C1856,407.33 1852.83,399.83 1846.5,393.5C1840.17,387.17 1832.67,384 1824,384L224,384ZM1824,1664C1832.67,1664 1840.17,1660.83 1846.5,1654.5C1852.83,1648.17 1856,1640.67 1856,1632L1856,1024L192,1024L192,1632C192,1640.67 195.17,1648.17 201.5,1654.5C207.83,1660.83 215.33,1664 224,1664L1824,1664ZM320,1536L320,1408L576,1408L576,1536L320,1536ZM704,1536L704,1408L1088,1408L1088,1536L704,1536Z" />
+</vector>
diff --git a/src/Android/Resources/drawable/cog.png b/src/Android/Resources/drawable/cog.png
deleted file mode 100644
index 53510c0cd..000000000
Binary files a/src/Android/Resources/drawable/cog.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/cog.xml b/src/Android/Resources/drawable/cog.xml
new file mode 100644
index 000000000..a7a5a37ce
--- /dev/null
+++ b/src/Android/Resources/drawable/cog.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1792"
+    android:viewportHeight="1792">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M1152,896q0,-106 -75,-181t-181,-75 -181,75 -75,181 75,181 181,75 181,-75 75,-181zM1664,787v222q0,12 -8,23t-20,13l-185,28q-19,54 -39,91 35,50 107,138 10,12 10,25t-9,23q-27,37 -99,108t-94,71q-12,0 -26,-9l-138,-108q-44,23 -91,38 -16,136 -29,186 -7,28 -36,28h-222q-14,0 -24.5,-8.5t-11.5,-21.5l-28,-184q-49,-16 -90,-37l-141,107q-10,9 -25,9 -14,0 -25,-11 -126,-114 -165,-168 -7,-10 -7,-23 0,-12 8,-23 15,-21 51,-66.5t54,-70.5q-27,-50 -41,-99l-183,-27q-13,-2 -21,-12.5t-8,-23.5v-222q0,-12 8,-23t19,-13l186,-28q14,-46 39,-92 -40,-57 -107,-138 -10,-12 -10,-24 0,-10 9,-23 26,-36 98.5,-107.5t94.5,-71.5q13,0 26,10l138,107q44,-23 91,-38 16,-136 29,-186 7,-28 36,-28h222q14,0 24.5,8.5t11.5,21.5l28,184q49,16 90,37l142,-107q9,-9 24,-9 13,0 25,10 129,119 165,170 7,8 7,22 0,12 -8,23 -15,21 -51,66.5t-54,70.5q26,50 41,98l183,28q13,2 21,12.5t8,23.5z" />
+</vector>
diff --git a/src/Android/Resources/drawable/id.png b/src/Android/Resources/drawable/id.png
deleted file mode 100644
index 7bdd35a10..000000000
Binary files a/src/Android/Resources/drawable/id.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/id.xml b/src/Android/Resources/drawable/id.xml
new file mode 100644
index 000000000..8ad10d3d2
--- /dev/null
+++ b/src/Android/Resources/drawable/id.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="2048"
+    android:viewportHeight="2048">
+    <path
+        android:fillColor="#FF777777"
+        android:pathData="M896,1340C896,1376.67 885.5,1407.83 864.5,1433.5C843.5,1459.17 818.33,1472 789,1472L363,1472C333.67,1472 308.5,1459.17 287.5,1433.5C266.5,1407.83 256,1376.67 256,1340C256,1304 258.5,1270.5 263.5,1239.5C268.5,1208.5 276.67,1178.5 288,1149.5C299.33,1120.5 316.33,1097.67 339,1081C361.67,1064.33 388.67,1056 420,1056C462.67,1098.67 514.67,1120 576,1120C637.33,1120 689.33,1098.67 732,1056C763.33,1056 790.33,1064.33 813,1081C835.67,1097.67 852.67,1120.5 864,1149.5C875.33,1178.5 883.5,1208.5 888.5,1239.5C893.5,1270.5 896,1304 896,1340ZM768,896C768,949.33 749.33,994.67 712,1032C674.67,1069.33 629.33,1088 576,1088C522.67,1088 477.33,1069.33 440,1032C402.67,994.67 384,949.33 384,896C384,842.67 402.67,797.33 440,760C477.33,722.67 522.67,704 576,704C629.33,704 674.67,722.67 712,760C749.33,797.33 768,842.67 768,896ZM1792,1312L1792,1376C1792,1385.33 1789,1393 1783,1399C1777,1405 1769.33,1408 1760,1408L1056,1408C1046.67,1408 1039,1405 1033,1399C1027,1393 1024,1385.33 1024,1376L1024,1312C1024,1302.67 1027,1295 1033,1289C1039,1283 1046.67,1280 1056,1280L1760,1280C1769.33,1280 1777,1283 1783,1289C1789,1295 1792,1302.67 1792,1312ZM1408,1056L1408,1120C1408,1129.33 1405,1137 1399,1143C1393,1149 1385.33,1152 1376,1152L1056,1152C1046.67,1152 1039,1149 1033,1143C1027,1137 1024,1129.33 1024,1120L1024,1056C1024,1046.67 1027,1039 1033,1033C1039,1027 1046.67,1024 1056,1024L1376,1024C1385.33,1024 1393,1027 1399,1033C1405,1039 1408,1046.67 1408,1056ZM1792,1056L1792,1120C1792,1129.33 1789,1137 1783,1143C1777,1149 1769.33,1152 1760,1152L1568,1152C1558.67,1152 1551,1149 1545,1143C1539,1137 1536,1129.33 1536,1120L1536,1056C1536,1046.67 1539,1039 1545,1033C1551,1027 1558.67,1024 1568,1024L1760,1024C1769.33,1024 1777,1027 1783,1033C1789,1039 1792,1046.67 1792,1056ZM1792,800L1792,864C1792,873.33 1789,881 1783,887C1777,893 1769.33,896 1760,896L1056,896C1046.67,896 1039,893 1033,887C1027,881 1024,873.33 1024,864L1024,800C1024,790.67 1027,783 1033,777C1039,771 1046.67,768 1056,768L1760,768C1769.33,768 1777,771 1783,777C1789,783 1792,790.67 1792,800ZM1920,1632L1920,512L128,512L128,1632C128,1640.67 131.17,1648.17 137.5,1654.5C143.83,1660.83 151.33,1664 160,1664L1888,1664C1896.67,1664 1904.17,1660.83 1910.5,1654.5C1916.83,1648.17 1920,1640.67 1920,1632ZM2048,416L2048,1632C2048,1676 2032.33,1713.67 2001,1745C1969.67,1776.33 1932,1792 1888,1792L160,1792C116,1792 78.33,1776.33 47,1745C15.67,1713.67 0,1676 0,1632L0,416C0,372 15.67,334.33 47,303C78.33,271.67 116,256 160,256L1888,256C1932,256 1969.67,271.67 2001,303C2032.33,334.33 2048,372 2048,416Z" />
+</vector>
diff --git a/src/Android/Resources/drawable/lock.png b/src/Android/Resources/drawable/lock.png
deleted file mode 100644
index 18be15d35..000000000
Binary files a/src/Android/Resources/drawable/lock.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/lock.xml b/src/Android/Resources/drawable/lock.xml
new file mode 100644
index 000000000..492570d76
--- /dev/null
+++ b/src/Android/Resources/drawable/lock.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1792"
+    android:viewportHeight="1792">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M640,768h512v-192q0,-106 -75,-181t-181,-75 -181,75 -75,181v192zM1472,864v576q0,40 -28,68t-68,28h-960q-40,0 -68,-28t-28,-68v-576q0,-40 28,-68t68,-28h32v-192q0,-184 132,-316t316,-132 316,132 132,316v192h32q40,0 68,28t28,68z" />
+</vector>
diff --git a/src/Android/Resources/drawable/login.png b/src/Android/Resources/drawable/login.png
deleted file mode 100644
index f2c39b02e..000000000
Binary files a/src/Android/Resources/drawable/login.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/login.xml b/src/Android/Resources/drawable/login.xml
new file mode 100644
index 000000000..1c0811a19
--- /dev/null
+++ b/src/Android/Resources/drawable/login.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1792"
+    android:viewportHeight="1792">
+    <path
+        android:fillColor="#FF777777"
+        android:pathData="M896,128q209,0 385.5,103t279.5,279.5 103,385.5 -103,385.5 -279.5,279.5 -385.5,103 -385.5,-103 -279.5,-279.5 -103,-385.5 103,-385.5 279.5,-279.5 385.5,-103zM1170,649q-2,1 -9.5,9.5t-13.5,9.5q2,0 4.5,-5t5,-11 3.5,-7q6,-7 22,-15 14,-6 52,-12 34,-8 51,11 -2,-2 9.5,-13t14.5,-12q3,-2 15,-4.5t15,-7.5l2,-22q-12,1 -17.5,-7t-6.5,-21q0,2 -6,8 0,-7 -4.5,-8t-11.5,1 -9,1q-10,-3 -15,-7.5t-8,-16.5 -4,-15q-2,-5 -9.5,-11t-9.5,-10q-1,-2 -2.5,-5.5t-3,-6.5 -4,-5.5 -5.5,-2.5 -7,5 -7.5,10 -4.5,5q-3,-2 -6,-1.5t-4.5,1 -4.5,3 -5,3.5q-3,2 -8.5,3t-8.5,2q15,-5 -1,-11 -10,-4 -16,-3 9,-4 7.5,-12t-8.5,-14h5q-1,-4 -8.5,-8.5t-17.5,-8.5 -13,-6q-8,-5 -34,-9.5t-33,-0.5q-5,6 -4.5,10.5t4,14 3.5,12.5q1,6 -5.5,13t-6.5,12q0,7 14,15.5t10,21.5q-3,8 -16,16t-16,12q-5,8 -1.5,18.5t10.5,16.5q2,2 1.5,4t-3.5,4.5 -5.5,4 -6.5,3.5l-3,2q-11,5 -20.5,-6t-13.5,-26q-7,-25 -16,-30 -23,-8 -29,1 -5,-13 -41,-26 -25,-9 -58,-4 6,-1 0,-15 -7,-15 -19,-12 3,-6 4,-17.5t1,-13.5q3,-13 12,-23 1,-1 7,-8.5t9.5,-13.5 0.5,-6q35,4 50,-11 5,-5 11.5,-17t10.5,-17q9,-6 14,-5.5t14.5,5.5 14.5,5q14,1 15.5,-11t-7.5,-20q12,1 3,-17 -4,-7 -8,-9 -12,-4 -27,5 -8,4 2,8 -1,-1 -9.5,10.5t-16.5,17.5 -16,-5q-1,-1 -5.5,-13.5t-9.5,-13.5q-8,0 -16,15 3,-8 -11,-15t-24,-8q19,-12 -8,-27 -7,-4 -20.5,-5t-19.5,4q-5,7 -5.5,11.5t5,8 10.5,5.5 11.5,4 8.5,3q14,10 8,14 -2,1 -8.5,3.5t-11.5,4.5 -6,4q-3,4 0,14t-2,14q-5,-5 -9,-17.5t-7,-16.5q7,9 -25,6l-10,-1q-4,0 -16,2t-20.5,1 -13.5,-8q-4,-8 0,-20 1,-4 4,-2 -4,-3 -11,-9.5t-10,-8.5q-46,15 -94,41 6,1 12,-1 5,-2 13,-6.5t10,-5.5q34,-14 42,-7l5,-5q14,16 20,25 -7,-4 -30,-1 -20,6 -22,12 7,12 5,18 -4,-3 -11.5,-10t-14.5,-11 -15,-5q-16,0 -22,1 -146,80 -235,222 7,7 12,8 4,1 5,9t2.5,11 11.5,-3q9,8 3,19 1,-1 44,27 19,17 21,21 3,11 -10,18 -1,-2 -9,-9t-9,-4q-3,5 0.5,18.5t10.5,12.5q-7,0 -9.5,16t-2.5,35.5 -1,23.5l2,1q-3,12 5.5,34.5t21.5,19.5q-13,3 20,43 6,8 8,9 3,2 12,7.5t15,10 10,10.5q4,5 10,22.5t14,23.5q-2,6 9.5,20t10.5,23q-1,0 -2.5,1t-2.5,1q3,7 15.5,14t15.5,13q1,3 2,10t3,11 8,2q2,-20 -24,-62 -15,-25 -17,-29 -3,-5 -5.5,-15.5t-4.5,-14.5q2,0 6,1.5t8.5,3.5 7.5,4 2,3q-3,7 2,17.5t12,18.5 17,19 12,13q6,6 14,19.5t0,13.5q9,0 20,10.5t17,19.5q5,8 8,26t5,24q2,7 8.5,13.5t12.5,9.5l16,8 13,7q5,2 18.5,10.5t21.5,11.5q10,4 16,4t14.5,-2.5 13.5,-3.5q15,-2 29,15t21,21q36,19 55,11 -2,1 0.5,7.5t8,15.5 9,14.5 5.5,8.5q5,6 18,15t18,15q6,-4 7,-9 -3,8 7,20t18,10q14,-3 14,-32 -31,15 -49,-18 0,-1 -2.5,-5.5t-4,-8.5 -2.5,-8.5 0,-7.5 5,-3q9,0 10,-3.5t-2,-12.5 -4,-13q-1,-8 -11,-20t-12,-15q-5,9 -16,8t-16,-9q0,1 -1.5,5.5t-1.5,6.5q-13,0 -15,-1 1,-3 2.5,-17.5t3.5,-22.5q1,-4 5.5,-12t7.5,-14.5 4,-12.5 -4.5,-9.5 -17.5,-2.5q-19,1 -26,20 -1,3 -3,10.5t-5,11.5 -9,7q-7,3 -24,2t-24,-5q-13,-8 -22.5,-29t-9.5,-37q0,-10 2.5,-26.5t3,-25 -5.5,-24.5q3,-2 9,-9.5t10,-10.5q2,-1 4.5,-1.5t4.5,0 4,-1.5 3,-6q-1,-1 -4,-3 -3,-3 -4,-3 7,3 28.5,-1.5t27.5,1.5q15,11 22,-2 0,-1 -2.5,-9.5t-0.5,-13.5q5,27 29,9 3,3 15.5,5t17.5,5q3,2 7,5.5t5.5,4.5 5,-0.5 8.5,-6.5q10,14 12,24 11,40 19,44 7,3 11,2t4.5,-9.5 0,-14 -1.5,-12.5l-1,-8v-18l-1,-8q-15,-3 -18.5,-12t1.5,-18.5 15,-18.5q1,-1 8,-3.5t15.5,-6.5 12.5,-8q21,-19 15,-35 7,0 11,-9 -1,0 -5,-3t-7.5,-5 -4.5,-2q9,-5 2,-16 5,-3 7.5,-11t7.5,-10q9,12 21,2 8,-8 1,-16 5,-7 20.5,-10.5t18.5,-9.5q7,2 8,-2t1,-12 3,-12q4,-5 15,-9t13,-5l17,-11q3,-4 0,-4 18,2 31,-11 10,-11 -6,-20 3,-6 -3,-9.5t-15,-5.5q3,-1 11.5,-0.5t10.5,-1.5q15,-10 -7,-16 -17,-5 -43,12zM1007,1526q206,-36 351,-189 -3,-3 -12.5,-4.5t-12.5,-3.5q-18,-7 -24,-8 1,-7 -2.5,-13t-8,-9 -12.5,-8 -11,-7q-2,-2 -7,-6t-7,-5.5 -7.5,-4.5 -8.5,-2 -10,1l-3,1q-3,1 -5.5,2.5t-5.5,3 -4,3 0,2.5q-21,-17 -36,-22 -5,-1 -11,-5.5t-10.5,-7 -10,-1.5 -11.5,7q-5,5 -6,15t-2,13q-7,-5 0,-17.5t2,-18.5q-3,-6 -10.5,-4.5t-12,4.5 -11.5,8.5 -9,6.5 -8.5,5.5 -8.5,7.5q-3,4 -6,12t-5,11q-2,-4 -11.5,-6.5t-9.5,-5.5q2,10 4,35t5,38q7,31 -12,48 -27,25 -29,40 -4,22 12,26 0,7 -8,20.5t-7,21.5q0,6 2,16z" />
+</vector>
diff --git a/src/Android/Resources/drawable/logo.png b/src/Android/Resources/drawable/logo.png
deleted file mode 100644
index 33ced5b12..000000000
Binary files a/src/Android/Resources/drawable/logo.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/logo.xml b/src/Android/Resources/drawable/logo.xml
new file mode 100644
index 000000000..d5fad38dc
--- /dev/null
+++ b/src/Android/Resources/drawable/logo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="290dp"
+    android:height="47.894737dp"
+    android:viewportWidth="551"
+    android:viewportHeight="91">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M64.171,49.343C64.171,64.036 39.203,76.695 39.203,76.695L39.203,13.681L64.171,13.681L64.171,49.343ZM72.024,5.997C71.354,5.327 70.562,4.992 69.647,4.992L8.76,4.992C7.844,4.992 7.051,5.327 6.382,5.997C5.713,6.666 5.378,7.459 5.378,8.375L5.378,48.966C5.378,51.995 5.967,54.999 7.148,57.976C8.329,60.954 9.791,63.596 11.535,65.905C13.279,68.213 15.358,70.458 17.772,72.643C20.185,74.828 22.413,76.642 24.457,78.087C26.5,79.53 28.632,80.897 30.852,82.183C33.072,83.469 34.649,84.341 35.583,84.799C36.516,85.258 37.265,85.61 37.829,85.856C38.252,86.067 38.71,86.173 39.203,86.173C39.695,86.173 40.154,86.067 40.577,85.856C41.141,85.61 41.89,85.258 42.823,84.799C43.756,84.341 45.334,83.469 47.554,82.183C49.773,80.897 51.905,79.53 53.948,78.087C55.992,76.642 58.22,74.828 60.635,72.643C63.047,70.458 65.127,68.213 66.872,65.905C68.615,63.596 70.077,60.954 71.258,57.976C72.438,54.999 73.028,51.995 73.028,48.966L73.028,8.375C73.028,7.459 72.693,6.666 72.024,5.997M171.176,4.244C166.546,4.244 162.792,7.847 162.792,12.293L162.792,12.962C162.792,17.407 166.546,21.011 171.176,21.011C175.806,21.011 179.56,17.407 179.56,12.962L179.56,12.293C179.56,7.847 175.806,4.244 171.176,4.244M543.073,78.16C541.8,78.16 540.768,77.128 540.768,75.856L540.768,45.007C540.768,39.865 539.687,36.127 537.524,33.791C535.361,31.455 532.005,30.287 527.461,30.287C521.346,30.287 516.872,31.832 514.035,34.92C511.197,38.008 509.778,43.016 509.778,49.944L509.778,75.856C509.778,77.128 508.747,78.16 507.474,78.16L507.427,78.16C506.155,78.16 505.123,77.128 505.123,75.856L505.123,29.143C505.123,27.983 506.063,27.042 507.223,27.042C508.281,27.042 509.173,27.828 509.307,28.877L509.966,34.049L510.249,34.049C513.571,28.72 519.481,26.055 527.977,26.055C539.577,26.055 545.378,32.279 545.378,44.724L545.378,75.856C545.378,77.128 544.345,78.16 543.073,78.16M471.546,30.193C466.624,30.193 462.673,31.815 459.696,35.06C456.716,38.305 454.976,42.984 454.476,49.098L486.077,49.098C486.077,43.173 484.792,38.54 482.22,35.201C479.65,31.863 476.091,30.193 471.546,30.193M472.91,79.101C465.48,79.101 459.687,76.812 455.533,72.235C451.379,67.657 449.302,61.247 449.302,53.001C449.302,44.85 451.308,38.322 455.322,33.414C459.335,28.508 464.743,26.055 471.546,26.055C477.566,26.055 482.315,28.156 485.796,32.356C489.275,36.557 491.015,42.263 491.015,49.474L491.015,53.236L454.194,53.236C454.256,60.259 455.893,65.62 459.108,69.319C462.321,73.019 466.921,74.868 472.91,74.868C475.826,74.868 478.388,74.665 480.599,74.257C482.195,73.963 484.098,73.423 486.307,72.638C487.615,72.174 488.993,73.133 488.993,74.521C488.993,75.344 488.486,76.08 487.722,76.388C485.322,77.355 483.081,78.032 480.999,78.418C478.552,78.873 475.856,79.101 472.91,79.101M413.657,30.287C408.076,30.287 403.882,32.247 401.077,36.165C398.27,40.085 396.868,45.775 396.868,53.236C396.868,67.72 402.496,74.962 413.751,74.962C419.518,74.962 423.751,73.285 426.448,69.93C429.143,66.576 430.492,61.043 430.492,53.33L430.492,52.531C430.492,44.63 429.168,38.948 426.518,35.484C423.869,32.02 419.582,30.287 413.657,30.287M413.657,26.055C417.355,26.055 420.553,26.729 423.25,28.077C425.946,29.425 428.359,31.73 430.492,34.99L430.774,34.99C430.586,31.039 430.492,27.168 430.492,23.374L430.492,7.291C430.492,6.019 431.524,4.987 432.796,4.987C434.069,4.987 435.1,6.019 435.1,7.291L435.1,76.517C435.1,77.425 434.365,78.16 433.458,78.16C432.645,78.16 431.955,77.566 431.834,76.762L430.868,70.354L430.492,70.354C426.604,76.185 421.023,79.101 413.751,79.101C406.697,79.101 401.303,76.906 397.573,72.517C393.842,68.128 391.977,61.732 391.977,53.33C391.977,44.489 393.827,37.734 397.526,33.062C401.225,28.391 406.603,26.055 413.657,26.055M378.945,26.055C380.416,26.055 381.959,26.156 383.575,26.359C384.843,26.518 385.7,27.74 385.449,28.993C385.212,30.182 384.068,30.935 382.873,30.74C381.41,30.501 379.913,30.381 378.381,30.381C374.023,30.381 370.449,32.231 367.659,35.93C364.868,39.63 363.473,44.301 363.473,49.944L363.473,75.832C363.473,77.118 362.431,78.16 361.146,78.16C359.86,78.16 358.818,77.118 358.818,75.832L358.818,29.068C358.818,27.949 359.725,27.042 360.843,27.042C361.922,27.042 362.811,27.887 362.867,28.965L363.238,36.259L363.568,36.259C365.668,32.497 367.91,29.857 370.293,28.336C372.674,26.815 375.559,26.055 378.945,26.055M320.413,74.868C325.868,74.868 330.171,73.309 333.321,70.189C336.472,67.07 338.047,62.736 338.047,57.186L338.047,52.154L329.113,52.531C321.933,52.876 316.815,53.996 313.758,55.893C310.702,57.79 309.173,60.745 309.173,64.758C309.173,67.955 310.153,70.441 312.113,72.211C314.072,73.983 316.838,74.868 320.413,74.868M340.816,78.16C339.902,78.16 339.126,77.489 338.995,76.584L338.047,70.072L337.671,70.072C335.1,73.363 332.46,75.691 329.748,77.055C327.035,78.418 323.83,79.101 320.13,79.101C315.114,79.101 311.212,77.815 308.421,75.244C305.945,72.964 304.568,69.906 304.289,66.07C303.92,60.995 306.062,55.968 310.26,53.093C314.421,50.244 320.501,48.74 328.502,48.58L338.236,48.298L338.236,44.912C338.236,40.053 337.249,36.385 335.273,33.908C333.298,31.432 330.116,30.193 325.727,30.193C321.618,30.193 317.38,31.185 313.011,33.169C311.902,33.672 310.595,33.186 310.114,32.067C309.64,30.965 310.154,29.677 311.262,29.218C316.195,27.172 321.079,26.149 325.916,26.149C331.527,26.149 335.72,27.607 338.495,30.522C341.269,33.438 342.656,37.984 342.656,44.16L342.656,76.32C342.656,77.336 341.833,78.16 340.816,78.16M282.146,78.16C280.795,78.16 279.596,77.291 279.176,76.007L268.688,43.971C267.966,41.652 267.043,38.251 265.914,33.767L265.631,33.767L264.644,37.247L262.527,44.066L251.86,76.024C251.435,77.3 250.24,78.16 248.896,78.16C247.501,78.16 246.275,77.236 245.891,75.894L232.74,29.93C232.326,28.483 233.412,27.042 234.918,27.042L235.174,27.042C236.193,27.042 237.086,27.722 237.357,28.704L245.081,56.669C246.993,64.005 248.247,69.398 248.843,72.846L249.125,72.846C250.975,65.51 252.323,60.635 253.17,58.22L263.031,29.032C263.433,27.843 264.548,27.042 265.804,27.042C267.074,27.042 268.2,27.862 268.589,29.072L277.953,58.127C280.21,65.495 281.589,70.37 282.09,72.752L282.373,72.752C282.624,70.715 283.878,65.26 286.135,56.386L293.494,28.725C293.757,27.733 294.656,27.042 295.682,27.042C297.174,27.042 298.259,28.46 297.868,29.9L285.398,75.853C285.028,77.215 283.792,78.16 282.381,78.16L282.146,78.16ZM215.546,67.673C217.676,67.673 220.17,67.278 223.025,66.485C223.802,66.269 224.574,66.849 224.574,67.656L224.574,75.892C224.574,76.383 224.285,76.835 223.83,77.019C220.397,78.406 216.255,79.101 211.407,79.101C205.67,79.101 201.492,77.651 198.875,74.75C196.256,71.851 194.948,67.501 194.948,61.7L194.948,36.353L189.301,36.353C188.628,36.353 188.082,35.807 188.082,35.134L188.082,30.459C188.082,30.352 188.137,30.254 188.229,30.198L195.983,25.49L199.825,15.186C200.003,14.709 200.458,14.392 200.967,14.392L208.071,14.392C208.745,14.392 209.291,14.938 209.291,15.612L209.291,25.585L223.4,25.585C223.737,25.585 224.01,25.858 224.01,26.195L224.01,35.134C224.01,35.807 223.464,36.353 222.791,36.353L209.291,36.353L209.291,61.7C209.291,63.739 209.862,65.244 211.007,66.215C212.151,67.188 213.664,67.673 215.546,67.673M176.518,78.16L165.834,78.16C164.823,78.16 164.004,77.341 164.004,76.331L164.004,27.414C164.004,26.404 164.823,25.585 165.834,25.585L176.518,25.585C177.528,25.585 178.347,26.404 178.347,27.414L178.347,76.331C178.347,77.341 177.528,78.16 176.518,78.16M128.355,36.071C124.811,36.071 122.225,37.161 120.595,39.34C118.965,41.519 118.118,45.116 118.056,50.132L118.056,51.684C118.056,57.327 118.894,61.372 120.571,63.817C122.248,66.262 124.905,67.485 128.543,67.485C131.489,67.485 133.833,66.13 135.573,63.417C137.313,60.706 138.183,56.763 138.183,51.591C138.183,46.417 137.305,42.538 135.549,39.951C133.793,37.364 131.395,36.071 128.355,36.071M132.963,24.597C139.171,24.597 144.029,27.019 147.541,31.863C151.052,36.706 152.808,43.345 152.808,51.778C152.808,60.463 150.998,67.188 147.377,71.952C143.755,76.718 138.825,79.101 132.587,79.101C126.41,79.101 121.567,76.86 118.056,72.376L117.068,72.376L115.138,77.031C114.855,77.715 114.188,78.16 113.448,78.16L105.542,78.16C104.531,78.16 103.713,77.341 103.713,76.331L103.713,6.816C103.713,5.806 104.531,4.987 105.542,4.987L116.227,4.987C117.237,4.987 118.056,5.806 118.056,6.816L118.056,22.01C118.056,24.174 117.868,27.638 117.491,32.404L118.056,32.404C121.41,27.199 126.379,24.597 132.963,24.597" />
+</vector>
diff --git a/src/Android/Resources/drawable/logo_white.png b/src/Android/Resources/drawable/logo_white.png
deleted file mode 100644
index b5856a638..000000000
Binary files a/src/Android/Resources/drawable/logo_white.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/logo_white.xml b/src/Android/Resources/drawable/logo_white.xml
new file mode 100644
index 000000000..3b6f12b8b
--- /dev/null
+++ b/src/Android/Resources/drawable/logo_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="290dp"
+    android:height="47.894737dp"
+    android:viewportWidth="551"
+    android:viewportHeight="91">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M64.171,49.343C64.171,64.036 39.203,76.695 39.203,76.695L39.203,13.681L64.171,13.681L64.171,49.343ZM72.024,5.997C71.354,5.327 70.562,4.992 69.647,4.992L8.76,4.992C7.844,4.992 7.051,5.327 6.382,5.997C5.713,6.666 5.378,7.459 5.378,8.375L5.378,48.966C5.378,51.995 5.967,54.999 7.148,57.976C8.329,60.954 9.791,63.596 11.535,65.905C13.279,68.213 15.358,70.458 17.772,72.643C20.185,74.828 22.413,76.642 24.457,78.087C26.5,79.53 28.632,80.897 30.852,82.183C33.072,83.469 34.649,84.341 35.583,84.799C36.516,85.258 37.265,85.61 37.829,85.856C38.252,86.067 38.71,86.173 39.203,86.173C39.695,86.173 40.154,86.067 40.577,85.856C41.141,85.61 41.89,85.258 42.823,84.799C43.756,84.341 45.334,83.469 47.554,82.183C49.773,80.897 51.905,79.53 53.948,78.087C55.992,76.642 58.22,74.828 60.635,72.643C63.047,70.458 65.127,68.213 66.872,65.905C68.615,63.596 70.077,60.954 71.258,57.976C72.438,54.999 73.028,51.995 73.028,48.966L73.028,8.375C73.028,7.459 72.693,6.666 72.024,5.997M171.176,4.244C166.546,4.244 162.792,7.847 162.792,12.293L162.792,12.962C162.792,17.407 166.546,21.011 171.176,21.011C175.806,21.011 179.56,17.407 179.56,12.962L179.56,12.293C179.56,7.847 175.806,4.244 171.176,4.244M543.073,78.16C541.8,78.16 540.768,77.128 540.768,75.856L540.768,45.007C540.768,39.865 539.687,36.127 537.524,33.791C535.361,31.455 532.005,30.287 527.461,30.287C521.346,30.287 516.872,31.832 514.035,34.92C511.197,38.008 509.778,43.016 509.778,49.944L509.778,75.856C509.778,77.128 508.747,78.16 507.474,78.16L507.427,78.16C506.155,78.16 505.123,77.128 505.123,75.856L505.123,29.143C505.123,27.983 506.063,27.042 507.223,27.042C508.281,27.042 509.173,27.828 509.307,28.877L509.966,34.049L510.249,34.049C513.571,28.72 519.481,26.055 527.977,26.055C539.577,26.055 545.378,32.279 545.378,44.724L545.378,75.856C545.378,77.128 544.345,78.16 543.073,78.16M471.546,30.193C466.624,30.193 462.673,31.815 459.696,35.06C456.716,38.305 454.976,42.984 454.476,49.098L486.077,49.098C486.077,43.173 484.792,38.54 482.22,35.201C479.65,31.863 476.091,30.193 471.546,30.193M472.91,79.101C465.48,79.101 459.687,76.812 455.533,72.235C451.379,67.657 449.302,61.247 449.302,53.001C449.302,44.85 451.308,38.322 455.322,33.414C459.335,28.508 464.743,26.055 471.546,26.055C477.566,26.055 482.315,28.156 485.796,32.356C489.275,36.557 491.015,42.263 491.015,49.474L491.015,53.236L454.194,53.236C454.256,60.259 455.893,65.62 459.108,69.319C462.321,73.019 466.921,74.868 472.91,74.868C475.826,74.868 478.388,74.665 480.599,74.257C482.195,73.963 484.098,73.423 486.307,72.638C487.615,72.174 488.993,73.133 488.993,74.521C488.993,75.344 488.486,76.08 487.722,76.388C485.322,77.355 483.081,78.032 480.999,78.418C478.552,78.873 475.856,79.101 472.91,79.101M413.657,30.287C408.076,30.287 403.882,32.247 401.077,36.165C398.27,40.085 396.868,45.775 396.868,53.236C396.868,67.72 402.496,74.962 413.751,74.962C419.518,74.962 423.751,73.285 426.448,69.93C429.143,66.576 430.492,61.043 430.492,53.33L430.492,52.531C430.492,44.63 429.168,38.948 426.518,35.484C423.869,32.02 419.582,30.287 413.657,30.287M413.657,26.055C417.355,26.055 420.553,26.729 423.25,28.077C425.946,29.425 428.359,31.73 430.492,34.99L430.774,34.99C430.586,31.039 430.492,27.168 430.492,23.374L430.492,7.291C430.492,6.019 431.524,4.987 432.796,4.987C434.069,4.987 435.1,6.019 435.1,7.291L435.1,76.517C435.1,77.425 434.365,78.16 433.458,78.16C432.645,78.16 431.955,77.566 431.834,76.762L430.868,70.354L430.492,70.354C426.604,76.185 421.023,79.101 413.751,79.101C406.697,79.101 401.303,76.906 397.573,72.517C393.842,68.128 391.977,61.732 391.977,53.33C391.977,44.489 393.827,37.734 397.526,33.062C401.225,28.391 406.603,26.055 413.657,26.055M378.945,26.055C380.416,26.055 381.959,26.156 383.575,26.359C384.843,26.518 385.7,27.74 385.449,28.993C385.212,30.182 384.068,30.935 382.873,30.74C381.41,30.501 379.913,30.381 378.381,30.381C374.023,30.381 370.449,32.231 367.659,35.93C364.868,39.63 363.473,44.301 363.473,49.944L363.473,75.832C363.473,77.118 362.431,78.16 361.146,78.16C359.86,78.16 358.818,77.118 358.818,75.832L358.818,29.068C358.818,27.949 359.725,27.042 360.843,27.042C361.922,27.042 362.811,27.887 362.867,28.965L363.238,36.259L363.568,36.259C365.668,32.497 367.91,29.857 370.293,28.336C372.674,26.815 375.559,26.055 378.945,26.055M320.413,74.868C325.868,74.868 330.171,73.309 333.321,70.189C336.472,67.07 338.047,62.736 338.047,57.186L338.047,52.154L329.113,52.531C321.933,52.876 316.815,53.996 313.758,55.893C310.702,57.79 309.173,60.745 309.173,64.758C309.173,67.955 310.153,70.441 312.113,72.211C314.072,73.983 316.838,74.868 320.413,74.868M340.816,78.16C339.902,78.16 339.126,77.489 338.995,76.584L338.047,70.072L337.671,70.072C335.1,73.363 332.46,75.691 329.748,77.055C327.035,78.418 323.83,79.101 320.13,79.101C315.114,79.101 311.212,77.815 308.421,75.244C305.945,72.964 304.568,69.906 304.289,66.07C303.92,60.995 306.062,55.968 310.26,53.093C314.421,50.244 320.501,48.74 328.502,48.58L338.236,48.298L338.236,44.912C338.236,40.053 337.249,36.385 335.273,33.908C333.298,31.432 330.116,30.193 325.727,30.193C321.618,30.193 317.38,31.185 313.011,33.169C311.902,33.672 310.595,33.186 310.114,32.067C309.64,30.965 310.154,29.677 311.262,29.218C316.195,27.172 321.079,26.149 325.916,26.149C331.527,26.149 335.72,27.607 338.495,30.522C341.269,33.438 342.656,37.984 342.656,44.16L342.656,76.32C342.656,77.336 341.833,78.16 340.816,78.16M282.146,78.16C280.795,78.16 279.596,77.291 279.176,76.007L268.688,43.971C267.966,41.652 267.043,38.251 265.914,33.767L265.631,33.767L264.644,37.247L262.527,44.066L251.86,76.024C251.435,77.3 250.24,78.16 248.896,78.16C247.501,78.16 246.275,77.236 245.891,75.894L232.74,29.93C232.326,28.483 233.412,27.042 234.918,27.042L235.174,27.042C236.193,27.042 237.086,27.722 237.357,28.704L245.081,56.669C246.993,64.005 248.247,69.398 248.843,72.846L249.125,72.846C250.975,65.51 252.323,60.635 253.17,58.22L263.031,29.032C263.433,27.843 264.548,27.042 265.804,27.042C267.074,27.042 268.2,27.862 268.589,29.072L277.953,58.127C280.21,65.495 281.589,70.37 282.09,72.752L282.373,72.752C282.624,70.715 283.878,65.26 286.135,56.386L293.494,28.725C293.757,27.733 294.656,27.042 295.682,27.042C297.174,27.042 298.259,28.46 297.868,29.9L285.398,75.853C285.028,77.215 283.792,78.16 282.381,78.16L282.146,78.16ZM215.546,67.673C217.676,67.673 220.17,67.278 223.025,66.485C223.802,66.269 224.574,66.849 224.574,67.656L224.574,75.892C224.574,76.383 224.285,76.835 223.83,77.019C220.397,78.406 216.255,79.101 211.407,79.101C205.67,79.101 201.492,77.651 198.875,74.75C196.256,71.851 194.948,67.501 194.948,61.7L194.948,36.353L189.301,36.353C188.628,36.353 188.082,35.807 188.082,35.134L188.082,30.459C188.082,30.352 188.137,30.254 188.229,30.198L195.983,25.49L199.825,15.186C200.003,14.709 200.458,14.392 200.967,14.392L208.071,14.392C208.745,14.392 209.291,14.938 209.291,15.612L209.291,25.585L223.4,25.585C223.737,25.585 224.01,25.858 224.01,26.195L224.01,35.134C224.01,35.807 223.464,36.353 222.791,36.353L209.291,36.353L209.291,61.7C209.291,63.739 209.862,65.244 211.007,66.215C212.151,67.188 213.664,67.673 215.546,67.673M176.518,78.16L165.834,78.16C164.823,78.16 164.004,77.341 164.004,76.331L164.004,27.414C164.004,26.404 164.823,25.585 165.834,25.585L176.518,25.585C177.528,25.585 178.347,26.404 178.347,27.414L178.347,76.331C178.347,77.341 177.528,78.16 176.518,78.16M128.355,36.071C124.811,36.071 122.225,37.161 120.595,39.34C118.965,41.519 118.118,45.116 118.056,50.132L118.056,51.684C118.056,57.327 118.894,61.372 120.571,63.817C122.248,66.262 124.905,67.485 128.543,67.485C131.489,67.485 133.833,66.13 135.573,63.417C137.313,60.706 138.183,56.763 138.183,51.591C138.183,46.417 137.305,42.538 135.549,39.951C133.793,37.364 131.395,36.071 128.355,36.071M132.963,24.597C139.171,24.597 144.029,27.019 147.541,31.863C151.052,36.706 152.808,43.345 152.808,51.778C152.808,60.463 150.998,67.188 147.377,71.952C143.755,76.718 138.825,79.101 132.587,79.101C126.41,79.101 121.567,76.86 118.056,72.376L117.068,72.376L115.138,77.031C114.855,77.715 114.188,78.16 113.448,78.16L105.542,78.16C104.531,78.16 103.713,77.341 103.713,76.331L103.713,6.816C103.713,5.806 104.531,4.987 105.542,4.987L116.227,4.987C117.237,4.987 118.056,5.806 118.056,6.816L118.056,22.01C118.056,24.174 117.868,27.638 117.491,32.404L118.056,32.404C121.41,27.199 126.379,24.597 132.963,24.597" />
+</vector>
diff --git a/src/Android/Resources/drawable/pencil.png b/src/Android/Resources/drawable/pencil.png
deleted file mode 100644
index 0d7d0e8ff..000000000
Binary files a/src/Android/Resources/drawable/pencil.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/pencil.xml b/src/Android/Resources/drawable/pencil.xml
new file mode 100644
index 000000000..6c86b9cb8
--- /dev/null
+++ b/src/Android/Resources/drawable/pencil.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1792"
+    android:viewportHeight="1792">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M491,1536l91,-91 -235,-235 -91,91v107h128v128h107zM1014,608q0,-22 -22,-22 -10,0 -17,7l-542,542q-7,7 -7,17 0,22 22,22 10,0 17,-7l542,-542q7,-7 7,-17zM960,416l416,416 -832,832h-416v-416zM1643,512q0,53 -37,90l-166,166 -416,-416 166,-165q36,-38 90,-38 53,0 91,38l235,234q37,39 37,91z" />
+</vector>
diff --git a/src/Android/Resources/drawable/plus.png b/src/Android/Resources/drawable/plus.png
deleted file mode 100644
index e2f51af54..000000000
Binary files a/src/Android/Resources/drawable/plus.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/plus.xml b/src/Android/Resources/drawable/plus.xml
new file mode 100644
index 000000000..3ee9e23a9
--- /dev/null
+++ b/src/Android/Resources/drawable/plus.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/src/Android/Resources/drawable/refresh.png b/src/Android/Resources/drawable/refresh.png
deleted file mode 100644
index cf6119d48..000000000
Binary files a/src/Android/Resources/drawable/refresh.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/refresh.xml b/src/Android/Resources/drawable/refresh.xml
new file mode 100644
index 000000000..9a8945502
--- /dev/null
+++ b/src/Android/Resources/drawable/refresh.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M82.292,41.269C77.427,37.45 71.296,35.172 64.638,35.172C48.838,35.172 36.011,47.999 36.011,63.799C36.011,79.599 48.838,92.426 64.638,92.426C74.998,92.426 84.08,86.911 89.105,78.66C89.198,78.504 89.351,78.394 89.527,78.353C89.704,78.313 89.889,78.346 90.04,78.446C92.453,80.028 101.659,86.07 104.243,87.765C104.622,88.014 104.732,88.52 104.491,88.903C96.08,102.14 81.286,110.933 64.454,110.933C38.295,110.933 17.057,89.695 17.057,63.537C17.057,37.378 38.295,16.14 64.454,16.14C77.501,16.14 89.324,21.423 97.899,29.965L106.199,23.954C106.758,23.549 107.496,23.486 108.116,23.791C108.736,24.095 109.137,24.718 109.158,25.408C109.406,33.597 110.018,53.82 110.255,61.641C110.277,62.353 109.945,63.03 109.368,63.448C108.792,63.867 108.046,63.973 107.376,63.732C99.85,61.027 80.127,53.94 72.734,51.283C72.175,51.082 71.773,50.589 71.69,50.001C71.606,49.413 71.855,48.827 72.336,48.479L82.292,41.269Z" />
+</vector>
diff --git a/src/Android/Resources/drawable/refresh_sm.png b/src/Android/Resources/drawable/refresh_sm.png
deleted file mode 100644
index 4516f067e..000000000
Binary files a/src/Android/Resources/drawable/refresh_sm.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/search.png b/src/Android/Resources/drawable/search.png
deleted file mode 100644
index 6604d7662..000000000
Binary files a/src/Android/Resources/drawable/search.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/search.xml b/src/Android/Resources/drawable/search.xml
new file mode 100644
index 000000000..6a5ca808f
--- /dev/null
+++ b/src/Android/Resources/drawable/search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/src/Android/Resources/drawable/shield.png b/src/Android/Resources/drawable/shield.png
deleted file mode 100644
index 3d7981449..000000000
Binary files a/src/Android/Resources/drawable/shield.png and /dev/null differ
diff --git a/src/Android/Resources/drawable/shield.xml b/src/Android/Resources/drawable/shield.xml
new file mode 100644
index 000000000..e07e63eb8
--- /dev/null
+++ b/src/Android/Resources/drawable/shield.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1792"
+    android:viewportHeight="1792">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M1344,960v-640h-448v1137q119,-63 213,-137 235,-184 235,-360zM1536,192v768q0,86 -33.5,170.5t-83,150 -118,127.5 -126.5,103 -121,77.5 -89.5,49.5 -42.5,20q-12,6 -26,6t-26,-6q-16,-7 -42.5,-20t-89.5,-49.5 -121,-77.5 -126.5,-103 -118,-127.5 -83,-150 -33.5,-170.5v-768q0,-26 19,-45t45,-19h1152q26,0 45,19t19,45z" />
+</vector>
diff --git a/src/Android/Resources/drawable/splash_screen.xml b/src/Android/Resources/drawable/splash_screen.xml
index 34a08d168..aaf7619dc 100644
--- a/src/Android/Resources/drawable/splash_screen.xml
+++ b/src/Android/Resources/drawable/splash_screen.xml
@@ -4,6 +4,6 @@
     <color android:color="@color/lightgray"/>
   </item>
   <item>
-    <bitmap android:src="@drawable/logo" android:tileMode="disabled" android:gravity="center"/>
+    <bitmap android:src="@drawable/logo_legacy" android:tileMode="disabled" android:gravity="center"/>
   </item>
 </layer-list>
diff --git a/src/Android/Resources/drawable/splash_screen_dark.xml b/src/Android/Resources/drawable/splash_screen_dark.xml
index b2bbd3e17..502fb7ac2 100644
--- a/src/Android/Resources/drawable/splash_screen_dark.xml
+++ b/src/Android/Resources/drawable/splash_screen_dark.xml
@@ -4,6 +4,6 @@
     <color android:color="@color/darkgray"/>
   </item>
   <item>
-    <bitmap android:src="@drawable/logo_white" android:tileMode="disabled" android:gravity="center"/>
+    <bitmap android:src="@drawable/logo_white_legacy" android:tileMode="disabled" android:gravity="center"/>
   </item>
 </layer-list>
diff --git a/src/Android/Resources/drawable/yubikey.png b/src/Android/Resources/drawable/yubikey.png
deleted file mode 100644
index 2c1d91cb6..000000000
Binary files a/src/Android/Resources/drawable/yubikey.png and /dev/null differ
diff --git a/src/Android/Tiles/GeneratorTileService.cs b/src/Android/Tiles/GeneratorTileService.cs
index e32691ca3..5a0058270 100644
--- a/src/Android/Tiles/GeneratorTileService.cs
+++ b/src/Android/Tiles/GeneratorTileService.cs
@@ -15,7 +15,7 @@ using Java.Lang;
 namespace Bit.Droid.Tile
 {
     [Service(Permission = Android.Manifest.Permission.BindQuickSettingsTile, Label = "@string/PasswordGenerator",
-        Icon = "@drawable/refresh_sm")]
+        Icon = "@drawable/refresh")]
     [IntentFilter(new string[] { ActionQsTile })]
     [Register("com.x8bit.bitwarden.GeneratorTileService")]
     public class GeneratorTileService : TileService