diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index de37c664e0..97e016209e 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -1965,7 +1965,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             return new AlertDialog.Builder(getContext())
-                    .setIcon(R.drawable.twotone_help_24)
                     .setMessage(R.string.title_issue)
                     .setPositiveButton(R.string.title_yes, new DialogInterface.OnClickListener() {
                         @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 834553fe8f..8ac26e1e93 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -632,7 +632,6 @@ public class FragmentBase extends Fragment {
     @RequiresApi(api = Build.VERSION_CODES.Q)
     private void handle(RecoverableSecurityException ex) {
         new AlertDialog.Builder(getContext())
-                .setIcon(R.drawable.twotone_help_24)
                 .setMessage(ex.getMessage())
                 .setPositiveButton(ex.getUserAction().getTitle(), new DialogInterface.OnClickListener() {
                     @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java
index dd61625b84..d602b7a97d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentContacts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java
@@ -458,7 +458,7 @@ public class FragmentContacts extends FragmentBase {
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             return new AlertDialog.Builder(getContext())
                     .setIcon(R.drawable.twotone_warning_24)
-                    .setMessage(getString(R.string.title_delete_contacts))
+                    .setTitle(getString(R.string.title_delete_contacts))
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6a9d6f7f1f..6e7317be61 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -7631,7 +7631,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                         }
 
                                         new AlertDialog.Builder(getContext())
-                                                .setIcon(R.drawable.twotone_info_24)
                                                 .setMessage(sb.toString())
                                                 .show();
                                     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index a8d05a2584..edd806a736 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -779,6 +779,7 @@ public class FragmentSetup extends FragmentBase {
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             return new AlertDialog.Builder(getContext())
                     .setIcon(R.drawable.twotone_info_24)
+                    .setTitle(R.string.title_setup_doze)
                     .setMessage(R.string.title_setup_doze_instructions)
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override