diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index 3cf994fef5..3561164487 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -87,11 +87,11 @@ public class FragmentRule extends FragmentBase {
 
     private EditText etSender;
     private CheckBox cbSender;
-    private ImageView ivSender;
+    private ImageView ibSender;
 
     private EditText etRecipient;
     private CheckBox cbRecipient;
-    private ImageView ivRecipient;
+    private ImageView ibRecipient;
 
     private EditText etSubject;
     private CheckBox cbSubject;
@@ -190,11 +190,11 @@ public class FragmentRule extends FragmentBase {
 
         etSender = view.findViewById(R.id.etSender);
         cbSender = view.findViewById(R.id.cbSender);
-        ivSender = view.findViewById(R.id.ivSender);
+        ibSender = view.findViewById(R.id.ibSender);
 
         etRecipient = view.findViewById(R.id.etRecipient);
         cbRecipient = view.findViewById(R.id.cbRecipient);
-        ivRecipient = view.findViewById(R.id.ivRecipient);
+        ibRecipient = view.findViewById(R.id.ibRecipient);
 
         etSubject = view.findViewById(R.id.etSubject);
         cbSubject = view.findViewById(R.id.cbSubject);
@@ -240,7 +240,7 @@ public class FragmentRule extends FragmentBase {
         grpAnswer = view.findViewById(R.id.grpAnswer);
         grpAutomation = view.findViewById(R.id.grpAutomation);
 
-        ivSender.setOnClickListener(new View.OnClickListener() {
+        ibSender.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent pick = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
@@ -251,7 +251,7 @@ public class FragmentRule extends FragmentBase {
             }
         });
 
-        ivRecipient.setOnClickListener(new View.OnClickListener() {
+        ibRecipient.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent pick = new Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Email.CONTENT_URI);
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index 37ba21f463..d0f5eb3cb0 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -143,16 +143,17 @@
                 android:hint="@string/title_optional"
                 android:inputType="textEmailAddress"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                app:layout_constraintEnd_toStartOf="@+id/ivSender"
+                app:layout_constraintEnd_toStartOf="@+id/ibSender"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/cbSender" />
 
-            <ImageView
-                android:id="@+id/ivSender"
+            <ImageButton
+                android:id="@+id/ibSender"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/title_legend_pick"
                 app:layout_constraintBottom_toBottomOf="@id/etSender"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -207,16 +208,17 @@
                 android:hint="@string/title_optional"
                 android:inputType="textEmailAddress"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                app:layout_constraintEnd_toStartOf="@+id/ivRecipient"
+                app:layout_constraintEnd_toStartOf="@+id/ibRecipient"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/cbRecipient" />
 
-            <ImageView
-                android:id="@+id/ivRecipient"
+            <ImageButton
+                android:id="@+id/ibRecipient"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/title_legend_pick"
                 app:layout_constraintBottom_toBottomOf="@id/etRecipient"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -613,8 +615,8 @@
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="
                 tvFolder,tvName,etName,tvOrder,etOrder,cbEnabled,cbStop,
-                vSeparatorSender,tvSender,cbSender,etSender,ivSender,tvAndSender,
-                vSeparatorRecipient,tvRecipient,cbRecipient,etRecipient,ivRecipient,tvAndRecipient,
+                vSeparatorSender,tvSender,cbSender,etSender,ibSender,tvAndSender,
+                vSeparatorRecipient,tvRecipient,cbRecipient,etRecipient,ibRecipient,tvAndRecipient,
                 vSeparatorSubject,tvSubject,cbSubject,etSubject,tvAndSubject,
                 vSeparatorHeader,tvHeader,cbHeader,etHeader,tvAndHeader,
                 vSeparatorSchedule,spScheduleDayStart,spScheduleDayEnd,tvScheduleHourStart,tvScheduleHourEnd,