diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 7df9a9c51e..60eae1a634 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4660,12 +4660,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             } else {
                 boolean disable_tracking = prefs.getBoolean("disable_tracking", true);
 
-                ImageView ivInfo = dview.findViewById(R.id.ivInfo);
+                TextView tvTracking = dview.findViewById(R.id.tvTracking);
                 Group grpTracking = dview.findViewById(R.id.grpTracking);
 
                 grpTracking.setVisibility(disable_tracking ? View.VISIBLE : View.GONE);
 
-                ivInfo.setOnClickListener(new View.OnClickListener() {
+                tvTracking.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         Helper.viewFAQ(v.getContext(), 82);
diff --git a/app/src/main/res/layout/dialog_show_images.xml b/app/src/main/res/layout/dialog_show_images.xml
index 09554cd79f..c2e5833fe5 100644
--- a/app/src/main/res/layout/dialog_show_images.xml
+++ b/app/src/main/res/layout/dialog_show_images.xml
@@ -36,25 +36,17 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:layout_marginTop="12dp"
-            android:layout_marginEnd="12dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:drawableEnd="@drawable/twotone_info_24"
+            android:drawablePadding="6dp"
             android:text="@string/title_ask_show_image_hint"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
             android:textStyle="italic"
-            app:layout_constraintEnd_toStartOf="@+id/ivInfo"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/ivTracking"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
 
-        <eu.faircode.email.FixedImageButton
-            android:id="@+id/ivInfo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            app:layout_constraintBottom_toBottomOf="@+id/tvTracking"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tvTracking"
-            app:srcCompat="@drawable/twotone_info_24" />
-
         <CheckBox
             android:id="@+id/cbNotAgainSender"
             android:layout_width="wrap_content"
@@ -90,6 +82,6 @@
             android:id="@+id/grpTracking"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="ivTracking,tvTracking,ivInfo" />
+            app:constraint_referenced_ids="ivTracking,tvTracking" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file