diff --git a/src/keepass2android-appSdkStyle/EntryEditActivity.cs b/src/keepass2android-appSdkStyle/EntryEditActivity.cs
index 1c38ed65..694dd3f0 100644
--- a/src/keepass2android-appSdkStyle/EntryEditActivity.cs
+++ b/src/keepass2android-appSdkStyle/EntryEditActivity.cs
@@ -1356,7 +1356,7 @@ namespace keepass2android
 
 			//setup delete button:
 			var deleteButton = dlgView.FindViewById<Button>(Resource.Id.delete_extra);
-			deleteButton.SetCompoundDrawablesWithIntrinsicBounds(Resources.GetDrawable(Android.Resource.Drawable.IcMenuDelete), null, null, null);
+			deleteButton.SetCompoundDrawablesWithIntrinsicBounds(Resources.GetDrawable(Resource.Drawable.ic_menu_delete), null, null, null);
 			deleteButton.Click += (o, args) =>
 				{
 					DeleteAdvancedString(sender);
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/navigation_accept.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/navigation_accept.png
deleted file mode 100644
index 4942e4a6..00000000
Binary files a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/navigation_accept.png and /dev/null differ
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/opendb.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/opendb.png
deleted file mode 100644
index d9b8bc95..00000000
Binary files a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/opendb.png and /dev/null differ
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/rightarrow.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/rightarrow.png
deleted file mode 100644
index 866a4b66..00000000
Binary files a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/rightarrow.png and /dev/null differ
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots.png
deleted file mode 100644
index 5ba3357c..00000000
Binary files a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots.png and /dev/null differ
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots_bright.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots_bright.png
deleted file mode 100644
index 90926bbd..00000000
Binary files a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots_bright.png and /dev/null differ
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_account_circle_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_account_circle_24.xml
new file mode 100644
index 00000000..3285903d
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_account_circle_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,6c1.93,0 3.5,1.57 3.5,3.5S13.93,13 12,13s-3.5,-1.57 -3.5,-3.5S10.07,6 12,6zM12,20c-2.03,0 -4.43,-0.82 -6.14,-2.88C7.55,15.8 9.68,15 12,15s4.45,0.8 6.14,2.12C16.43,19.18 14.03,20 12,20z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_arrow_back_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_arrow_back_24.xml
new file mode 100644
index 00000000..438fded4
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_arrow_back_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_attachment_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_attachment_24.xml
new file mode 100644
index 00000000..d38e39ae
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_attachment_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_camera_alt_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_camera_alt_24.xml
new file mode 100644
index 00000000..8fab5ffa
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_camera_alt_24.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_check_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_check_24.xml
new file mode 100644
index 00000000..ef133c1c
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_check_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_close_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_close_24.xml
new file mode 100644
index 00000000..0af4b0d3
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_close_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_comment_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_comment_24.xml
new file mode 100644
index 00000000..f895ba1c
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_comment_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_create_new_folder_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_create_new_folder_24.xml
new file mode 100644
index 00000000..45d34cd8
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_create_new_folder_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_date_range_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_date_range_24.xml
new file mode 100644
index 00000000..d11665bd
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_date_range_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M9,11L7,11v2h2v-2zM13,11h-2v2h2v-2zM17,11h-2v2h2v-2zM19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,9h14v11z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_delete_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_delete_24.xml
new file mode 100644
index 00000000..93e97392
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_delete_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_explicit_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_explicit_24.xml
new file mode 100644
index 00000000..bb20cb25
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_explicit_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM15,9h-4v2h4v2h-4v2h4v2L9,17L9,7h6v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_help_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_help_24.xml
new file mode 100644
index 00000000..b21ba738
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_help_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_lock_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_lock_24.xml
new file mode 100644
index 00000000..540548be
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_lock_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_more_horiz_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_more_horiz_24.xml
new file mode 100644
index 00000000..9ea224e9
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_more_horiz_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_search_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_search_24.xml
new file mode 100644
index 00000000..fe51b803
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_search_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" 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/keepass2android-appSdkStyle/Resources/drawable/baseline_settings_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_settings_24.xml
new file mode 100644
index 00000000..bdb1b86b
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_settings_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_sort_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_sort_24.xml
new file mode 100644
index 00000000..46f93bb5
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_sort_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_vpn_key_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_vpn_key_24.xml
new file mode 100644
index 00000000..479c591e
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_vpn_key_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/configure_totp_dialog.xml b/src/keepass2android-appSdkStyle/Resources/layout/configure_totp_dialog.xml
index 05a82e7c..04cf9d22 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/configure_totp_dialog.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/configure_totp_dialog.xml
@@ -64,7 +64,7 @@
             android:id="@+id/totp_length" />
 
         <Button
-          android:drawableLeft="@android:drawable/ic_menu_camera"
+          android:drawableLeft="@drawable/baseline_camera_alt_24"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
           android:text="@string/totp_scan"
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml b/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml
index 99444cee..03015b81 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml
@@ -476,7 +476,7 @@
 			<Button android:id="@+id/btn_remove_history" 
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:drawableLeft="@android:drawable/ic_menu_delete"
+			android:drawableLeft="@drawable/baseline_delete_24"
 			android:text="@string/remove_history"
 			
 			/>
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/generate_password.xml b/src/keepass2android-appSdkStyle/Resources/layout/generate_password.xml
index add473d7..410d8353 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/generate_password.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/generate_password.xml
@@ -18,7 +18,7 @@
       android:layout_height="wrap_content"
       android:layout_alignParentLeft="true"
       android:text="@android:string/cancel"
-      android:drawableLeft="@android:drawable/ic_menu_close_clear_cancel"
+      android:drawableLeft="@drawable/baseline_close_24"
       style="@style/BottomBarButton" />
     <Button
       android:id="@+id/accept_button"
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/plugin_details.xml b/src/keepass2android-appSdkStyle/Resources/layout/plugin_details.xml
index d57b5ec9..c556deff 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/plugin_details.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/plugin_details.xml
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:paddingRight="20dp"
-                android:drawableLeft="@android:drawable/ic_menu_close_clear_cancel"
+                android:drawableLeft="@drawable/baseline_close_24"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:text="@string/deny" />
diff --git a/src/keepass2android-appSdkStyle/Resources/menu/fileselect.xml b/src/keepass2android-appSdkStyle/Resources/menu/fileselect.xml
index f78ea2c1..b3a358e1 100644
--- a/src/keepass2android-appSdkStyle/Resources/menu/fileselect.xml
+++ b/src/keepass2android-appSdkStyle/Resources/menu/fileselect.xml
@@ -20,12 +20,12 @@
     
     <item android:id="@+id/menu_about"
         android:title="@string/menu_about"
-        android:icon="@android:drawable/ic_menu_help"
+        android:icon="@drawable/baseline_help_24"
         app:showAsAction="ifRoom"
     />
     <item android:id="@+id/menu_app_settings"
         android:title="@string/menu_app_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
+        android:icon="@drawable/baseline_settings_24"
         app:showAsAction="ifRoom"  
     />
 </menu>
diff --git a/src/keepass2android-appSdkStyle/Resources/menu/group.xml b/src/keepass2android-appSdkStyle/Resources/menu/group.xml
index 598ecc31..3c173504 100644
--- a/src/keepass2android-appSdkStyle/Resources/menu/group.xml
+++ b/src/keepass2android-appSdkStyle/Resources/menu/group.xml
@@ -63,7 +63,7 @@
     />
 
   <item android:id="@+id/menu_sort"
-        android:icon="@android:drawable/ic_menu_sort_by_size"
+        android:icon="@drawable/baseline_sort_24"
         android:title="@string/sort_menu"
       app:showAsAction="never"
     />
diff --git a/src/keepass2android-appSdkStyle/services/OngoingNotificationsService.cs b/src/keepass2android-appSdkStyle/services/OngoingNotificationsService.cs
index 222e0cbd..5f2654c5 100644
--- a/src/keepass2android-appSdkStyle/services/OngoingNotificationsService.cs
+++ b/src/keepass2android-appSdkStyle/services/OngoingNotificationsService.cs
@@ -173,7 +173,7 @@ namespace keepass2android
 			// Default action is to show Kp2A
 			builder.SetContentIntent(GetSwitchToAppPendingIntent());
 			// Additional action to allow locking the database
-			builder.AddAction(Android.Resource.Drawable.IcLockLock, GetString(Resource.String.QuickUnlock_lockButton), 
+			builder.AddAction(Resource.Drawable.ic_action_lock, GetString(Resource.String.QuickUnlock_lockButton), 
 				PendingIntent.GetBroadcast(this, 0, new Intent(this, typeof(ApplicationBroadcastReceiver)).SetAction(Intents.CloseDatabase), Util.AddMutabilityFlag(PendingIntentFlags.UpdateCurrent, PendingIntentFlags.Immutable)));