diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 20cd70a972..a47863ab99 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -1553,17 +1553,17 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             LayoutInflater inflater = LayoutInflater.from(getContext());
             View dview = inflater.inflate(R.layout.dialog_first, null);
-            Button btnBatteryInfo = dview.findViewById(R.id.btnBatteryInfo);
-            Button btnReformatInfo = dview.findViewById(R.id.btnReformatInfo);
+            ImageButton ibBatteryInfo = dview.findViewById(R.id.ibBatteryInfo);
+            ImageButton ibReformatInfo = dview.findViewById(R.id.ibReformatInfo);
 
-            btnBatteryInfo.setOnClickListener(new View.OnClickListener() {
+            ibBatteryInfo.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     Helper.viewFAQ(v.getContext(), 39);
                 }
             });
 
-            btnReformatInfo.setOnClickListener(new View.OnClickListener() {
+            ibReformatInfo.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     Helper.viewFAQ(v.getContext(), 35);
diff --git a/app/src/main/res/layout/dialog_ask_again.xml b/app/src/main/res/layout/dialog_ask_again.xml
index bd865b2b65..0444301006 100644
--- a/app/src/main/res/layout/dialog_ask_again.xml
+++ b/app/src/main/res/layout/dialog_ask_again.xml
@@ -30,6 +30,7 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
+            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvMessage"
diff --git a/app/src/main/res/layout/dialog_certificate.xml b/app/src/main/res/layout/dialog_certificate.xml
index d480efc493..c0a22c6425 100644
--- a/app/src/main/res/layout/dialog_certificate.xml
+++ b/app/src/main/res/layout/dialog_certificate.xml
@@ -106,6 +106,7 @@
             android:layout_height="24dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_info"
+            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintBottom_toBottomOf="@id/tvSubjectTitle"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_deepl.xml b/app/src/main/res/layout/dialog_deepl.xml
index fdbe37133a..bf59b63db9 100644
--- a/app/src/main/res/layout/dialog_deepl.xml
+++ b/app/src/main/res/layout/dialog_deepl.xml
@@ -29,6 +29,7 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
+            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvDeepL"
diff --git a/app/src/main/res/layout/dialog_first.xml b/app/src/main/res/layout/dialog_first.xml
index 0a4558d6da..b21f538f5b 100644
--- a/app/src/main/res/layout/dialog_first.xml
+++ b/app/src/main/res/layout/dialog_first.xml
@@ -55,14 +55,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSyncNote" />
 
-        <Button
-            android:id="@+id/btnBatteryInfo"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_info"
+        <ImageButton
+            android:id="@+id/ibBatteryInfo"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/title_info"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
+            android:tint="?attr/colorAccent"
+            android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvBattery" />
+            app:layout_constraintTop_toBottomOf="@id/tvBattery"
+            app:srcCompat="@drawable/twotone_info_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvReformat"
@@ -73,16 +78,21 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnBatteryInfo" />
+            app:layout_constraintTop_toBottomOf="@id/ibBatteryInfo" />
 
-        <Button
-            android:id="@+id/btnReformatInfo"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_info"
+        <ImageButton
+            android:id="@+id/ibReformatInfo"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/title_info"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
+            android:tint="?attr/colorAccent"
+            android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvReformat" />
+            app:layout_constraintTop_toBottomOf="@id/tvReformat"
+            app:srcCompat="@drawable/twotone_info_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDesign"
@@ -93,7 +103,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnReformatInfo" />
+            app:layout_constraintTop_toBottomOf="@id/ibReformatInfo" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvJunk"
diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml
index 537264d974..23e6e6a24b 100644
--- a/app/src/main/res/layout/dialog_junk.xml
+++ b/app/src/main/res/layout/dialog_junk.xml
@@ -35,9 +35,13 @@
 
         <ImageButton
             android:id="@+id/ibInfoProvider"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_info"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
+            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvJunkHint"
@@ -110,9 +114,13 @@
 
         <ImageButton
             android:id="@+id/ibInfoFilter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_info"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
+            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/cbJunkFilter"
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index a29efd85dc..e353763def 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -30,6 +30,7 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
+            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"