diff --git a/src/Kp2aBusinessLogicSdkStyle/Kp2aBusinessLogicSdkStyle.csproj b/src/Kp2aBusinessLogicSdkStyle/Kp2aBusinessLogicSdkStyle.csproj
index 9825a3c4..963dcb87 100644
--- a/src/Kp2aBusinessLogicSdkStyle/Kp2aBusinessLogicSdkStyle.csproj
+++ b/src/Kp2aBusinessLogicSdkStyle/Kp2aBusinessLogicSdkStyle.csproj
@@ -15,6 +15,7 @@
 	<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.7" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.49.1" />
     <PackageReference Include="Xamarin.AndroidX.Core" Version="1.13.1.5" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AndroidFileChooserBindingSdkStyle\AndroidFileChooserBindingSdkStyle.csproj" />
diff --git a/src/Kp2aBusinessLogicSdkStyle/database/edit/OnFinish.cs b/src/Kp2aBusinessLogicSdkStyle/database/edit/OnFinish.cs
index 383f402c..455e3a53 100644
--- a/src/Kp2aBusinessLogicSdkStyle/database/edit/OnFinish.cs
+++ b/src/Kp2aBusinessLogicSdkStyle/database/edit/OnFinish.cs
@@ -21,6 +21,7 @@ using Android.App;
 using Android.Content;
 using Android.OS;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 
 namespace keepass2android
 {
@@ -132,7 +133,7 @@ namespace keepass2android
 			    {
 			        try
 			        {
-			            AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
+			            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ctx);
 			            
 			            builder.SetMessage(message)
 			                .SetPositiveButton(Android.Resource.String.Ok, (sender, args) => ((Dialog)sender).Dismiss())
diff --git a/src/keepass2android-appSdkStyle/AppKilledInfo.cs b/src/keepass2android-appSdkStyle/AppKilledInfo.cs
index a7afd65a..d0d0aff5 100644
--- a/src/keepass2android-appSdkStyle/AppKilledInfo.cs
+++ b/src/keepass2android-appSdkStyle/AppKilledInfo.cs
@@ -9,6 +9,7 @@ using Android.OS;
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 using keepass2android_appSdkStyle;
 
 namespace keepass2android
@@ -23,7 +24,8 @@ namespace keepass2android
 			//we don't try to handle this better
 			//But at least explain to the user what happened!
 			((NotificationManager)GetSystemService(Context.NotificationService)).CancelAll();
-			AlertDialog.Builder b = new AlertDialog.Builder(this);
+			
+            MaterialAlertDialogBuilder b = new MaterialAlertDialogBuilder(this);
 			b.SetMessage(Resource.String.killed_by_os);
 			b.SetPositiveButton(Android.Resource.String.Ok, delegate
 			{
diff --git a/src/keepass2android-appSdkStyle/ChangeLog.cs b/src/keepass2android-appSdkStyle/ChangeLog.cs
index d060d8c2..07862a3b 100644
--- a/src/keepass2android-appSdkStyle/ChangeLog.cs
+++ b/src/keepass2android-appSdkStyle/ChangeLog.cs
@@ -17,6 +17,7 @@ using Android.Text.Util;
 using Android.Views;
 using Android.Webkit;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 using keepass2android_appSdkStyle;
 
 namespace keepass2android
@@ -25,7 +26,7 @@ namespace keepass2android
 	{
 		public static void ShowChangeLog(Context ctx, Action onDismiss)
 		{
-			AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog));
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ctx);
 			builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
 			List<string> changeLog = new List<string>{
                 BuildChangelogString(ctx, new List<int>{Resource.Array.ChangeLog_1_11,Resource.Array.ChangeLog_1_11_net}, "1.11"),
diff --git a/src/keepass2android-appSdkStyle/ConfigureChildDatabasesActivity.cs b/src/keepass2android-appSdkStyle/ConfigureChildDatabasesActivity.cs
index e76a02ef..82943d0f 100644
--- a/src/keepass2android-appSdkStyle/ConfigureChildDatabasesActivity.cs
+++ b/src/keepass2android-appSdkStyle/ConfigureChildDatabasesActivity.cs
@@ -16,6 +16,7 @@ using Android.Text;
 using Android.Util;
 using Android.Views;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 using keepass2android.database.edit;
 using KeePass.Util.Spr;
 using keepass2android_appSdkStyle;
@@ -288,7 +289,7 @@ namespace keepass2android
 
             FindViewById<Button>(Resource.Id.add_child_db_button).Click += (sender, args) =>
             {
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
                 builder.SetTitle(Resource.String.add_child_db);
 
                 List<string> items = new List<string>();
@@ -321,7 +322,7 @@ namespace keepass2android
                 
 
                 
-                AlertDialog dialog = builder.Create();
+                var dialog = builder.Create();
                 dialog.Show();
             };
         }
diff --git a/src/keepass2android-appSdkStyle/EntryActivity.cs b/src/keepass2android-appSdkStyle/EntryActivity.cs
index 4de9b52d..eee29e59 100644
--- a/src/keepass2android-appSdkStyle/EntryActivity.cs
+++ b/src/keepass2android-appSdkStyle/EntryActivity.cs
@@ -53,6 +53,7 @@ using keepass2android.fileselect;
 using KeeTrayTOTP.Libraries;
 using Boolean = Java.Lang.Boolean;
 using Android.Util;
+using Google.Android.Material.Dialog;
 using keepass2android_appSdkStyle;
 
 namespace keepass2android
@@ -604,7 +605,7 @@ namespace keepass2android
                 return;
             }
 
-            new AlertDialog.Builder(this)
+            new MaterialAlertDialogBuilder(this)
                 .SetTitle(Resource.String.post_notifications_dialog_title)
                 .SetMessage(Resource.String.post_notifications_dialog_message)
                 .SetNegativeButton(Resource.String.post_notifications_dialog_disable, (sender, args) =>
@@ -890,7 +891,7 @@ namespace keepass2android
 				{
 					Button btnSender = (Button)(sender);
 
-					AlertDialog.Builder builder = new AlertDialog.Builder(this);
+					MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
 					builder.SetTitle(GetString(Resource.String.SaveAttachmentDialog_title));
 					
 					builder.SetMessage(GetString(Resource.String.SaveAttachmentDialog_text));
@@ -1047,11 +1048,9 @@ namespace keepass2android
 			ViewGroup historyGroup = (ViewGroup)FindViewById(Resource.Id.previous_versions);
             int index = 0;
 			foreach (var previousVersion in Entry.History)
-			{
+            {
+                Button btn = (Button)LayoutInflater.Inflate(Resource.Layout.VersionHistoryButton, null);
 				
-
-
-                Button btn = new Button(this);
                 btn.Text = getDateTime(previousVersion.LastModificationTime);
 
 				//copy variable from outer scope for capturing it below.
diff --git a/src/keepass2android-appSdkStyle/ExportDatabaseActivity.cs b/src/keepass2android-appSdkStyle/ExportDatabaseActivity.cs
index 1799ca08..c926865d 100644
--- a/src/keepass2android-appSdkStyle/ExportDatabaseActivity.cs
+++ b/src/keepass2android-appSdkStyle/ExportDatabaseActivity.cs
@@ -5,6 +5,7 @@ using Android.Content;
 using Android.Content.PM;
 using Android.Util;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 using KeePass.DataExchange;
 using KeePass.DataExchange.Formats;
 using KeePassLib.Interfaces;
@@ -60,7 +61,7 @@ namespace keepass2android
         protected override void OnCreate(Android.OS.Bundle savedInstanceState)
 		{
 			base.OnCreate(savedInstanceState);
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
 			builder.SetTitle(Resource.String.export_fileformats_title);
 			builder.SetSingleChoiceItems(Resource.Array.export_fileformat_options, _fileFormatIndex,
 				delegate(object sender, DialogClickEventArgs args) { _fileFormatIndex = args.Which; });
diff --git a/src/keepass2android-appSdkStyle/FileSelectHelper.cs b/src/keepass2android-appSdkStyle/FileSelectHelper.cs
index c6fb01fd..e6b12ada 100644
--- a/src/keepass2android-appSdkStyle/FileSelectHelper.cs
+++ b/src/keepass2android-appSdkStyle/FileSelectHelper.cs
@@ -13,7 +13,7 @@ using Android.OS;
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
-
+using Google.Android.Material.Dialog;
 using Java.IO;
 using keepass2android.Io;
 using keepass2android_appSdkStyle;
@@ -62,7 +62,7 @@ namespace keepass2android
 		private void ShowSftpDialog(Activity activity, Util.FileSelectedHandler onStartBrowse, Action onCancel, string defaultPath)
 		{
 #if !EXCLUDE_JAVAFILESTORAGE && !NoNet
-			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity);
 			View dlgContents = activity.LayoutInflater.Inflate(Resource.Layout.sftpcredentials, null);
 			var ctx = activity.ApplicationContext;
             var fileStorage = new Keepass2android.Javafilestorage.SftpStorage(ctx);
@@ -312,7 +312,7 @@ namespace keepass2android
         private void ShowHttpDialog(Activity activity, Util.FileSelectedHandler onStartBrowse, Action onCancel, string defaultPath)
 		{
 #if !EXCLUDE_JAVAFILESTORAGE && !NoNet
-			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity);
 			View dlgContents = activity.LayoutInflater.Inflate(Resource.Layout.httpcredentials, null);
 		    if (!defaultPath.EndsWith(_schemeSeparator))
 		    {
@@ -353,7 +353,7 @@ namespace keepass2android
 		private void ShowFtpDialog(Activity activity, Util.FileSelectedHandler onStartBrowse, Action onCancel, string defaultPath)
 		{
 #if !NoNet
-			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity);
 			View dlgContents = activity.LayoutInflater.Inflate(Resource.Layout.ftpcredentials, null);
 		    if (!defaultPath.EndsWith(_schemeSeparator))
 		    {
@@ -411,7 +411,7 @@ namespace keepass2android
 		{
 #if !NoNet
             var settings = MegaFileStorage.GetAccountSettings(activity);
-			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity);
 			View dlgContents = activity.LayoutInflater.Inflate(Resource.Layout.megacredentials, null);
 			if (!defaultPath.EndsWith(_schemeSeparator))
             {
@@ -500,7 +500,7 @@ namespace keepass2android
 		private void ShowOwncloudDialog(Activity activity, Util.FileSelectedHandler onStartBrowse, Action onCancel, string defaultPath, string subtype)
 		{
 #if !EXCLUDE_JAVAFILESTORAGE && !NoNet
-			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity);
 			View dlgContents = activity.LayoutInflater.Inflate(Resource.Layout.owncloudcredentials, null);
 			builder.SetView(dlgContents);
 
@@ -561,7 +561,7 @@ namespace keepass2android
 
 		protected void ShowFilenameWarning(string fileName, Action onUserWantsToContinue, Action onUserWantsToCorrect)
 		{
-			new AlertDialog.Builder(_activity)
+			new MaterialAlertDialogBuilder(_activity)
 					.SetPositiveButton(Resource.String.Continue, delegate { onUserWantsToContinue(); })
 					.SetMessage(Resource.String.NoFilenameWarning)
 					.SetCancelable(false)
diff --git a/src/keepass2android-appSdkStyle/FileStorageSelectionActivity.cs b/src/keepass2android-appSdkStyle/FileStorageSelectionActivity.cs
index 887879a9..a956cbc4 100644
--- a/src/keepass2android-appSdkStyle/FileStorageSelectionActivity.cs
+++ b/src/keepass2android-appSdkStyle/FileStorageSelectionActivity.cs
@@ -13,6 +13,7 @@ using Android.Text;
 using Android.Util;
 using Android.Views;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 using keepass2android.Io;
 using keepass2android.view;
 using AlertDialog = Android.App.AlertDialog;
@@ -177,7 +178,7 @@ namespace keepass2android
 		    if (protocolId.Contains(","))
 		    {
                 //bring up a selection dialog to select the variant of the file storage
-		        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
 		        
 		        builder.SetItems(protocolId.Split(",").Select(singleProtocolId => App.Kp2a.GetStorageDisplayName(singleProtocolId)).ToArray(), 
 		            delegate(object sender, DialogClickEventArgs args)
@@ -200,7 +201,7 @@ namespace keepass2android
 				//set help:
 				string help = GetString((int)field.GetValue(null));
 
-				new AlertDialog.Builder(this)
+				new MaterialAlertDialogBuilder(this)
 					.SetTitle(GetString(Resource.String.app_name))
 					.SetMessage(help)
 					.SetPositiveButton(Android.Resource.String.Ok, (sender, args) => ReturnProtocol(protocolId))
diff --git a/src/keepass2android-appSdkStyle/FingerprintSetupActivity.cs b/src/keepass2android-appSdkStyle/FingerprintSetupActivity.cs
index e41f90a0..3e021449 100644
--- a/src/keepass2android-appSdkStyle/FingerprintSetupActivity.cs
+++ b/src/keepass2android-appSdkStyle/FingerprintSetupActivity.cs
@@ -12,6 +12,7 @@ using Android.Preferences;
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 using Java.Lang;
 using keepass2android_appSdkStyle;
 using KeePassLib.Keys;
@@ -169,7 +170,7 @@ namespace keepass2android
                 }
 			    catch (Exception e)
 			    {
-			        new AlertDialog.Builder(this)
+			        new MaterialAlertDialogBuilder(this)
 			            .SetTitle(GetString(Resource.String.ErrorOcurred))
 			            .SetMessage(GetString(Resource.String.FingerprintSetupFailed))
                         .SetCancelable(false)
diff --git a/src/keepass2android-appSdkStyle/GeneratePasswordActivity.cs b/src/keepass2android-appSdkStyle/GeneratePasswordActivity.cs
index 86467fbe..f4edd5bc 100644
--- a/src/keepass2android-appSdkStyle/GeneratePasswordActivity.cs
+++ b/src/keepass2android-appSdkStyle/GeneratePasswordActivity.cs
@@ -28,6 +28,7 @@ using Android.OS;
 using Android.Preferences;
 using Android.Views;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 using Java.Util;
 using keepass2android_appSdkStyle;
 using KeePassLib.Cryptography;
@@ -278,7 +279,7 @@ namespace keepass2android
                 .Click += (sender, args) =>
             {
                 var editText = new EditText(this);
-                new AlertDialog.Builder(this)
+                new MaterialAlertDialogBuilder(this)
                     .SetMessage(Resource.String.save_password_generation_profile_text)
                     .SetView(editText)
                     .SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) =>
diff --git a/src/keepass2android-appSdkStyle/GroupActivity.cs b/src/keepass2android-appSdkStyle/GroupActivity.cs
index 68d7bb61..bc7d51d0 100644
--- a/src/keepass2android-appSdkStyle/GroupActivity.cs
+++ b/src/keepass2android-appSdkStyle/GroupActivity.cs
@@ -33,6 +33,7 @@ using Android.Graphics;
 using Android.Graphics.Drawables;
 using Android.Preferences;
 using Android.Runtime;
+using Google.Android.Material.Dialog;
 using keepass2android.Io;
 using keepass2android_appSdkStyle;
 using KeePassLib.Security;
@@ -267,7 +268,7 @@ namespace keepass2android
 			}
 			if (templates.Count > 1)
 			{
-				new AlertDialog.Builder(this)
+				new MaterialAlertDialogBuilder(this)
 					.SetAdapter(new TemplateListAdapter(this, Android.Resource.Layout.SelectDialogItem,
 						Android.Resource.Id.Text1, templates),
 						(o, args) => { EntryEditActivity.Launch(this, Group, templates[args.Which].Uuid, AppTask); })
diff --git a/src/keepass2android-appSdkStyle/GroupBaseActivity.cs b/src/keepass2android-appSdkStyle/GroupBaseActivity.cs
index 11482b65..cceb00e4 100644
--- a/src/keepass2android-appSdkStyle/GroupBaseActivity.cs
+++ b/src/keepass2android-appSdkStyle/GroupBaseActivity.cs
@@ -542,7 +542,7 @@ namespace keepass2android
 		            {
                         //this exception was reported by many Huawei users
 		                Kp2aLog.LogUnexpectedError(e);
-		                new AlertDialog.Builder(this)
+		                new MaterialAlertDialogBuilder(this)
 		                    .SetTitle(Resource.String.autofill_enable)
 		                    .SetMessage(Resource.String.autofill_enable_failed)
 		                    .SetPositiveButton(Resource.String.Ok, (o, eventArgs) => { })
@@ -694,7 +694,7 @@ namespace keepass2android
                     }
                     catch (Exception e)
                     {
-                        new AlertDialog.Builder(this)
+                        new MaterialAlertDialogBuilder(this)
                             .SetTitle("Unexpected error")
                             .SetMessage(
                                 "Opening the settings failed. Please report this to crocoapps@gmail.com including information about your device vendor and OS. Please try to configure the notifications by long pressing a KP2A notification. Details: " + e.ToString())
@@ -1248,7 +1248,7 @@ namespace keepass2android
 
             int selectedBefore = sortOrderManager.GetCurrentSortOrderIndex();
 
-            new AlertDialog.Builder(this)
+            new MaterialAlertDialogBuilder(this)
                 .SetSingleChoiceItems(sortOptions.ToArray(), selectedBefore, (sender, args) =>
                     {
                         int selectedAfter = args.Which;
diff --git a/src/keepass2android-appSdkStyle/LockingActivity.cs b/src/keepass2android-appSdkStyle/LockingActivity.cs
index 99e0dc01..96ba4a43 100644
--- a/src/keepass2android-appSdkStyle/LockingActivity.cs
+++ b/src/keepass2android-appSdkStyle/LockingActivity.cs
@@ -21,6 +21,7 @@ using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.Runtime;
+using Google.Android.Material.Dialog;
 using keepass2android_appSdkStyle;
 
 namespace keepass2android
@@ -139,7 +140,7 @@ namespace keepass2android
 	        }
 	        if (promptToInstall)
 	        {
-	            AlertDialog.Builder b = new AlertDialog.Builder(this);
+	            MaterialAlertDialogBuilder b = new MaterialAlertDialogBuilder(this);
 	            string message = GetString(Resource.String.NoChallengeApp) + " " + GetString(Resource.String.PleaseInstallApp, new Java.Lang.Object[]{"ykDroid"});
 
 	            Intent yubichalIntent = new Intent("com.yubichallenge.NFCActivity.CHALLENGE");
diff --git a/src/keepass2android-appSdkStyle/PasswordActivity.cs b/src/keepass2android-appSdkStyle/PasswordActivity.cs
index a9d80aed..3909a526 100644
--- a/src/keepass2android-appSdkStyle/PasswordActivity.cs
+++ b/src/keepass2android-appSdkStyle/PasswordActivity.cs
@@ -43,6 +43,7 @@ using AndroidX.CoordinatorLayout.Widget;
 using AndroidX.Core.View;
 using AndroidX.DrawerLayout.Widget;
 using Google.Android.Material.AppBar;
+using Google.Android.Material.Dialog;
 using Java.Lang;
 using KeePassLib.Keys;
 using KeePassLib.Serialization;
@@ -727,7 +728,7 @@ namespace keepass2android
             {
                 if (!string.IsNullOrEmpty((string)btn.Tag))
                 {
-                    AlertDialog.Builder b = new AlertDialog.Builder(this);
+                    MaterialAlertDialogBuilder b = new MaterialAlertDialogBuilder(this);
                     b.SetTitle(Resource.String.fingerprint_prefs);
                     b.SetMessage(btn.Tag.ToString());
                     b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
@@ -2132,7 +2133,7 @@ namespace keepass2android
 				
 				if ((Message != null) && (Message.Length > 150)) //show long messages as dialog
 				{
-					new AlertDialog.Builder(_act).SetMessage(Message)
+					new MaterialAlertDialogBuilder(_act).SetMessage(Message)
 					                             .SetPositiveButton(Android.Resource.String.Ok,
 					                                                (sender, args) =>
 						                                                {
diff --git a/src/keepass2android-appSdkStyle/QuickUnlock.cs b/src/keepass2android-appSdkStyle/QuickUnlock.cs
index 6f2adfe1..1d7560f0 100644
--- a/src/keepass2android-appSdkStyle/QuickUnlock.cs
+++ b/src/keepass2android-appSdkStyle/QuickUnlock.cs
@@ -29,6 +29,7 @@ using Android.Runtime;
 
 using Android.Views.InputMethods;
 using Google.Android.Material.AppBar;
+using Google.Android.Material.Dialog;
 using keepass2android_appSdkStyle;
 using KeePassLib;
 using KeePassLib.Serialization;
@@ -409,7 +410,7 @@ namespace keepass2android
                 }
                 else
                 {
-                    AlertDialog.Builder b = new AlertDialog.Builder(this);
+                    MaterialAlertDialogBuilder b = new MaterialAlertDialogBuilder(this);
                     b.SetTitle(Resource.String.fingerprint_prefs);
                     b.SetMessage(btn.Tag.ToString());
                     b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/storagetype_grid_bg.xml b/src/keepass2android-appSdkStyle/Resources/drawable/storagetype_grid_bg.xml
index f43a6774..1330cc0f 100644
--- a/src/keepass2android-appSdkStyle/Resources/drawable/storagetype_grid_bg.xml
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/storagetype_grid_bg.xml
@@ -3,7 +3,7 @@
 	<item >
 		<shape android:shape="rectangle"  >
 			<corners android:radius="6dip" />
-			<solid android:color="#fff" />
+			<solid android:color="@color/md_theme_background" />
 		</shape>
 	</item>
 </selector>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/QuickUnlock.xml b/src/keepass2android-appSdkStyle/Resources/layout/QuickUnlock.xml
index 0bcdc6c6..c3b8fdfb 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/QuickUnlock.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/QuickUnlock.xml
@@ -48,7 +48,7 @@ android:fitsSystemWindows="true">
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_alignParentBottom="true"
-              android:layout_marginBottom="4sp"
+              android:layout_marginBottom="0sp"
               android:layout_marginLeft="16dp"
               android:textSize="10sp"
               android:text="/storage/emulated/0/keepass/keepass/database.kdbx" />
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/entry_edit.xml b/src/keepass2android-appSdkStyle/Resources/layout/entry_edit.xml
index 1e2b46aa..cb5edd47 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/entry_edit.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/entry_edit.xml
@@ -153,9 +153,8 @@
               <Button
                 android:id="@+id/add_advanced"
                 style="?attr/materialButtonOutlinedStyle"
-                app:icon="@drawable/baseline_add_24"
+                app:icon="@drawable/baseline_add_circle_outline_24"
                     
-    android:paddingLeft="8dp"
     android:layout_width="match_parent"
     android:layout_weight="1"
     android:layout_height="wrap_content"
@@ -164,7 +163,6 @@
             <Button
               style="?attr/materialButtonOutlinedStyle"
               android:id="@+id/configure_totp"
-              android:paddingLeft="8dp"
               android:layout_width="match_parent"
               android:layout_weight="1"
               android:layout_height="wrap_content"
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml b/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml
index 53efa0b7..c41b5619 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml
@@ -34,15 +34,17 @@
           android:orientation="horizontal"
           android:clickable="true"
           android:background="?android:attr/selectableItemBackground">
-        <Button
-          style="?attr/materialIconButtonStyle"
-          app:icon="@drawable/baseline_more_vert_24"
-            android:id="@+id/group_name_vdots"
-            android:layout_width="wrap_content"
-            android:layout_height="15dp"
-            
-            android:gravity="right|bottom"
-            android:layout_alignParentRight="true" />
+
+        <ImageView
+          android:id="@+id/group_name_vdots"  
+          android:layout_width="wrap_content"
+          android:layout_height="20dp"
+          android:paddingRight="12dp"
+          android:tint="@color/md_theme_primary"
+          android:src="@drawable/baseline_more_vert_24"
+          android:gravity="right|bottom"
+          android:layout_alignParentRight="true" />
+
         <TextView
             android:id="@+id/entry_group_name"
             android:layout_width="fill_parent"
@@ -81,7 +83,9 @@
         <ImageView
             android:id="@+id/username_vdots"  
             android:layout_width="wrap_content"
-            android:layout_height="15dp"
+            android:layout_height="20dp"
+            android:paddingRight="12dp"
+            android:tint="@color/md_theme_primary"
             android:src="@drawable/baseline_more_vert_24"
             android:gravity="right|bottom"
             android:layout_alignParentRight="true" />
@@ -123,7 +127,9 @@
         <ImageView
             android:id="@+id/url_vdots"
             android:layout_width="wrap_content"
-            android:layout_height="15dp"
+            android:layout_height="20dp"
+            android:paddingRight="12dp"
+            android:tint="@color/md_theme_primary"
             android:src="@drawable/baseline_more_vert_24"
             android:gravity="right|bottom"
             android:layout_alignParentRight="true" />
@@ -166,7 +172,9 @@
         <ImageView
             android:id="@+id/password_vdots"
             android:layout_width="wrap_content"
-            android:layout_height="15dp"
+            android:layout_height="20dp"
+            android:paddingRight="12dp"
+            android:tint="@color/md_theme_primary"
             android:src="@drawable/baseline_more_vert_24"
             android:gravity="right|bottom"
             android:layout_alignParentRight="true" />
@@ -216,7 +224,9 @@
         <ImageView
           android:id="@+id/totp_vdots"
           android:layout_width="wrap_content"
-          android:layout_height="15dp"
+          android:layout_height="20dp"
+          android:paddingRight="12dp"
+          android:tint="@color/md_theme_primary"
           android:src="@drawable/baseline_more_vert_24"
           android:gravity="right|bottom"
           android:layout_alignParentRight="true" />
@@ -278,7 +288,9 @@
         <ImageView
                   android:id="@+id/comment_vdots"
                   android:layout_width="wrap_content"
-                  android:layout_height="15dp"
+                  android:layout_height="20dp"
+                  android:paddingRight="12dp"
+                  android:tint="@color/md_theme_primary"
                   android:src="@drawable/baseline_more_vert_24"
                   android:gravity="right|bottom"
                   android:layout_alignParentRight="true" />
@@ -503,8 +515,7 @@
         android:orientation="vertical">
 
       <!-- previous versions-->
-      <TextView
-        
+      <TextView        
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:text="@string/entry_history"
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/password.xml b/src/keepass2android-appSdkStyle/Resources/layout/password.xml
index 5d0209b8..1068935f 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/password.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/password.xml
@@ -51,8 +51,8 @@
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_alignParentBottom="true"
-                  android:layout_marginBottom="4sp"
-                  android:layout_marginLeft="16dp"
+                  android:layout_marginBottom="0sp"
+                  android:layout_marginLeft="48dp"
                   android:textSize="10sp"
                   android:text="/storage/emulated/0/keepass/keepass/database.kdbx" />
               </RelativeLayout>
@@ -61,6 +61,7 @@
                   android:id="@+id/toolbar"
                   android:layout_width="match_parent"
                   android:layout_height="?attr/actionBarSize"
+                  android:layout_marginBottom="16sp"
                   app:layout_collapseMode="pin"/>
 
               </com.google.android.material.appbar.CollapsingToolbarLayout>
diff --git a/src/keepass2android-appSdkStyle/SelectStorageLocationActivity.cs b/src/keepass2android-appSdkStyle/SelectStorageLocationActivity.cs
index 022fc1a3..8f903183 100644
--- a/src/keepass2android-appSdkStyle/SelectStorageLocationActivity.cs
+++ b/src/keepass2android-appSdkStyle/SelectStorageLocationActivity.cs
@@ -3,6 +3,7 @@ using Android.App;
 using Android.Content;
 using Android.OS;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
 using keepass2android.Io;
@@ -156,7 +157,8 @@ namespace keepass2android
 
 		protected override void ShowAlertDialog(string message, EventHandler<DialogClickEventArgs> onOk, EventHandler<DialogClickEventArgs> onCancel)
 		{
-			new AlertDialog.Builder(this)
+			new 
+                    MaterialAlertDialogBuilder(this)
 					.SetPositiveButton(Android.Resource.String.Ok, onOk)
 					.SetMessage(message)
 					.SetCancelable(false)
diff --git a/src/keepass2android-appSdkStyle/Utils/Util.cs b/src/keepass2android-appSdkStyle/Utils/Util.cs
index d4a3f19f..d0dbad14 100644
--- a/src/keepass2android-appSdkStyle/Utils/Util.cs
+++ b/src/keepass2android-appSdkStyle/Utils/Util.cs
@@ -36,6 +36,7 @@ using Android.Hardware.Display;
 using Android.Util;
 using Android.Views.InputMethods;
 using AndroidX.Core.View.InputMethod;
+using Google.Android.Material.Dialog;
 using keepass2android_appSdkStyle;
 using KeePassLib;
 using KeePassLib.Security;
@@ -582,7 +583,7 @@ namespace keepass2android
 
 		public static void ShowFilenameDialog(Activity activity, Func<string, Dialog, bool> onOpen, Func<string, Dialog, bool> onCreate, Action onCancel, bool showBrowseButton, string defaultFilename, string detailsText, int requestCodeBrowse)
 		{
-			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity);
 			builder.SetView(activity.LayoutInflater.Inflate(Resource.Layout.file_selection_filename, null));
 			
 			if (onCancel != null)
@@ -646,7 +647,7 @@ namespace keepass2android
 		public static void QueryCredentials(IOConnectionInfo ioc, Action<IOConnectionInfo> afterQueryCredentials, Activity activity)
 		{
 			//Build dialog to query credentials:
-			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity);
 			builder.SetTitle(activity.GetString(Resource.String.credentials_dialog_title));
 			builder.SetPositiveButton(activity.GetString(Android.Resource.String.Ok), (dlgSender, dlgEvt) =>
 			{
diff --git a/src/keepass2android-appSdkStyle/app/App.cs b/src/keepass2android-appSdkStyle/app/App.cs
index 01adb604..83d2480a 100644
--- a/src/keepass2android-appSdkStyle/app/App.cs
+++ b/src/keepass2android-appSdkStyle/app/App.cs
@@ -34,6 +34,7 @@ using KeePassLib.Keys;
 using KeePassLib.Serialization;
 using Android.Preferences;
 using AndroidX.Core.Content;
+using Google.Android.Material.Dialog;
 #if !EXCLUDE_TWOFISH
 using TwofishCipher;
 #endif
@@ -472,7 +473,7 @@ namespace keepass2android
 
         private void AskForReload(Activity activity, Action<bool> actionOnResult)
 		{
-			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity);
 			builder.SetTitle(activity.GetString(Resource.String.AskReloadFile_title));
 
 			builder.SetMessage(activity.GetString(Resource.String.AskReloadFile));
@@ -592,7 +593,7 @@ namespace keepass2android
 			Handler handler = new Handler(Looper.MainLooper);
 			handler.Post(() =>
 				{
-					AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
+					MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ctx);
 					builder.SetTitle(GetResourceString(titleKey));
 
 					builder.SetMessage(GetResourceString(messageKey) + (messageSuffix != "" ? " " + messageSuffix : ""));
@@ -632,7 +633,7 @@ namespace keepass2android
 												 cancelHandlerWithShow);
 					}
 
-					AlertDialog dialog = builder.Create();
+					var dialog = builder.Create();
 					if (dismissHandler != null)
 					{
 						dialog.SetOnDismissListener(new Util.DismissListener(() => {
diff --git a/src/keepass2android-appSdkStyle/app/AppTask.cs b/src/keepass2android-appSdkStyle/app/AppTask.cs
index cd3029cf..1f795fcd 100644
--- a/src/keepass2android-appSdkStyle/app/AppTask.cs
+++ b/src/keepass2android-appSdkStyle/app/AppTask.cs
@@ -13,6 +13,7 @@ using KeePassLib.Utility;
 using KeeTrayTOTP.Libraries;
 using Android.Content.Res;
 using Android.Preferences;
+using Google.Android.Material.Dialog;
 using keepass2android_appSdkStyle;
 
 namespace keepass2android
@@ -495,7 +496,7 @@ namespace keepass2android
         /// </summary>
         public void AskAddUrlThenCompleteCreate(EntryActivity activity, string url, Thread notifyPluginsOnOpenThread)
         {
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity);
             builder.SetTitle(activity.GetString(Resource.String.AddUrlToEntryDialog_title));
 
             builder.SetMessage(activity.GetString(Resource.String.AddUrlToEntryDialog_text, new Java.Lang.Object[] { url }));
diff --git a/src/keepass2android-appSdkStyle/services/AutofillBase/ChooseForAutofillActivityBase.cs b/src/keepass2android-appSdkStyle/services/AutofillBase/ChooseForAutofillActivityBase.cs
index 06b0bd7a..c26417ea 100644
--- a/src/keepass2android-appSdkStyle/services/AutofillBase/ChooseForAutofillActivityBase.cs
+++ b/src/keepass2android-appSdkStyle/services/AutofillBase/ChooseForAutofillActivityBase.cs
@@ -11,6 +11,7 @@ using Java.Util;
 using keepass2android.services.AutofillBase.model;
 using System.Linq;
 using Android.Content.PM;
+using Google.Android.Material.Dialog;
 using keepass2android_appSdkStyle;
 using Kp2aAutofillParser;
 using AlertDialog = Android.App.AlertDialog;
@@ -64,7 +65,7 @@ namespace keepass2android.services.AutofillBase
                 Kp2aLog.Log("ChooseForAutofillActivityBase: ExtraDisplayWarning = " + warning);
                 if (warning != AutofillServiceBase.DisplayWarning.None)
                 {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
                     builder.SetTitle(this.GetString(Resource.String.AutofillWarning_title));
 
                     string appName = Intent.GetStringExtra(ExtraQueryPackageString);
diff --git a/src/keepass2android-appSdkStyle/settings/AppSettingsActivity.cs b/src/keepass2android-appSdkStyle/settings/AppSettingsActivity.cs
index 94dc4b59..71da0d88 100644
--- a/src/keepass2android-appSdkStyle/settings/AppSettingsActivity.cs
+++ b/src/keepass2android-appSdkStyle/settings/AppSettingsActivity.cs
@@ -43,6 +43,7 @@ using Preference = AndroidX.Preference.Preference;
 using PreferenceFragment = AndroidX.Preference.PreferenceFragment;
 using Toolbar = AndroidX.AppCompat.Widget.Toolbar;
 using Android.Views.Autofill;
+using Google.Android.Material.Dialog;
 using AlertDialog = AndroidX.AppCompat.App.AlertDialog;
 using String = System.String;
 using KeePassLib.Cryptography.Cipher;
@@ -238,7 +239,7 @@ namespace keepass2android
                         var newIoc = IoUtil.ImportFileToInternalDirectory(sourceIoc, Activity, App.Kp2a);
                         return () =>
                         {
-                            var builder = new AlertDialog.Builder(Activity);
+                            var builder = new MaterialAlertDialogBuilder(Activity);
                             builder
                                 .SetMessage(Resource.String.DatabaseFileMoved);
                             builder.SetPositiveButton(Android.Resource.String.Ok, (sender, args) =>
@@ -340,7 +341,7 @@ namespace keepass2android
                         return () =>
                         {
                             UpdateImportKeyfilePref();
-                            var builder = new AlertDialog.Builder(Activity);
+                            var builder = new MaterialAlertDialogBuilder(Activity);
                             builder
                                 .SetMessage(Resource.String.KeyfileMoved);
                             builder.SetPositiveButton(Android.Resource.String.Ok, (sender, args) => { });
@@ -494,7 +495,7 @@ namespace keepass2android
                 {
                     if ((bool)args.NewValue)
                     {
-                        new AlertDialog.Builder(ctx)
+                        new MaterialAlertDialogBuilder(ctx)
                             .SetTitle(ctx.GetString(AppNames.AppNameResource))
                             .SetCancelable(false)
                             .SetPositiveButton(Android.Resource.String.Ok, delegate (object o, DialogClickEventArgs eventArgs)
@@ -608,7 +609,7 @@ namespace keepass2android
             {
                 if (!(bool)e.NewValue)
                 {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(Activity);
+                    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(Activity);
                     builder.SetTitle(GetString(Resource.String.ClearOfflineCache_title));
 
                     builder.SetMessage(GetString(Resource.String.ClearOfflineCache_question));
@@ -934,7 +935,7 @@ namespace keepass2android
                         {
                             //this exception was reported by many Huawei users
                             Kp2aLog.LogUnexpectedError(e);
-                            new AlertDialog.Builder(Context)
+                            new MaterialAlertDialogBuilder(Context)
                                 .SetTitle(Resource.String.autofill_enable)
                                 .SetMessage(Resource.String.autofill_enable_failed)
                                 .SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => { })
diff --git a/src/keepass2android-appSdkStyle/views/Kp2aShortHelpView.cs b/src/keepass2android-appSdkStyle/views/Kp2aShortHelpView.cs
index e1d9ea6c..565cb79d 100644
--- a/src/keepass2android-appSdkStyle/views/Kp2aShortHelpView.cs
+++ b/src/keepass2android-appSdkStyle/views/Kp2aShortHelpView.cs
@@ -16,6 +16,7 @@ using Android.Text.Util;
 using Android.Util;
 using Android.Views;
 using Android.Widget;
+using Google.Android.Material.Dialog;
 using keepass2android_appSdkStyle;
 
 namespace keepass2android.views
@@ -78,7 +79,7 @@ namespace keepass2android.views
 					string title = Context.GetString(AppNames.AppNameResource);
 					if (!string.IsNullOrEmpty(TitleText))
 						title = TitleText;
-					new AlertDialog.Builder(Context)
+					new MaterialAlertDialogBuilder(Context)
 						.SetTitle(title)
 						.SetMessage(_helpText)
 						.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => { })