diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 677a4388cb1551389cbbb38cb4560578e1222f18..c65a93e4f9bc085ce6c8598e60c9f22dee3c6eb0 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -503,7 +503,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="?attr/icon_alpha"
-                        android:background="?android:selectableItemBackground"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_remove"
                         android:visibility="visible" />
@@ -548,7 +548,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="?attr/icon_alpha"
-                        android:background="?android:selectableItemBackground"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         android:contentDescription="@string/copy_otr_clipboard_description"
                         android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_copy"
@@ -600,7 +600,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:alpha="?attr/icon_alpha"
-                            android:background="?android:selectableItemBackground"
+                            android:background="?attr/selectableItemBackgroundBorderless"
                             android:contentDescription="@string/copy_omemo_clipboard_description"
                             android:padding="@dimen/image_button_padding"
                             android:src="?attr/icon_copy"
@@ -611,7 +611,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:alpha="?attr/icon_alpha"
-                            android:background="?android:selectableItemBackground"
+                            android:background="?attr/selectableItemBackgroundBorderless"
                             android:contentDescription="@string/regenerate_omemo_key"
                             android:padding="@dimen/image_button_padding"
                             android:src="?attr/icon_refresh"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 32883b89f032304d89562916c7fe364f8d04b31a..88604c9700413e15dbfd7cd6e0b22e0865a30089 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -80,7 +80,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:alpha="?attr/icon_alpha"
-                        android:background="?android:selectableItemBackground"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_edit_body"/>
                 </RelativeLayout>
@@ -111,7 +111,7 @@
                         android:layout_centerVertical="true"
                         android:layout_gravity="center_horizontal"
                         android:alpha="?attr/icon_alpha"
-                        android:background="?android:selectableItemBackground"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_settings"/>
                 </RelativeLayout>
@@ -141,7 +141,7 @@
                         android:layout_centerVertical="true"
                         android:layout_gravity="center_horizontal"
                         android:alpha="?attr/icon_alpha"
-                        android:background="?android:selectableItemBackground"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_notifications"/>
                 </RelativeLayout>
diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index 63b38f949d07aa06c648b2510ad1e5b6a6ea6f95..cb7fc1a21d84ebee6b0d96d2b385ec017b4b1cec 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -43,7 +43,7 @@
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:background="?android:selectableItemBackground"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="@dimen/image_button_padding"
         android:alpha="?attr/icon_alpha"
         android:src="?attr/icon_remove"/>
diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml
index b689d10089f9fb44cb89dcf99981765a9cf73d30..8bc8f3f7bd59eee83ecfb6bb488a1b93c86400ab 100644
--- a/src/main/res/values-v21/dimens.xml
+++ b/src/main/res/values-v21/dimens.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<dimen name="elv_undo_bottom_offset">63dp</dimen> <!-- 48dp + 15dp -->
-	<dimen name="image_button_padding">12dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 81c98a79c19121bd34667bbeb413b8daf3ef5af5..a18f770d15760be784941afa2cce3374ba411a07 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
 	<dimen name="activity_horizontal_margin">8dp</dimen>
 	<dimen name="activity_vertical_margin">8dp</dimen>
 	<dimen name="infocard_padding">16dp</dimen>
-	<dimen name="image_button_padding">8dp</dimen>
+	<dimen name="image_button_padding">12dp</dimen>
 	<dimen name="fineprint_size">11sp</dimen>
 	<dimen name="audio_player_width">224dp</dimen>
 	<dimen name="swipe_handle_size">32dp</dimen>