diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 737a71f41..75e19b684 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -28,14 +28,14 @@
             android:id="@+id/scroll_to_bottom_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="12dp"
             android:layout_alignParentEnd="true"
             android:layout_alignBottom="@+id/messages_view"
             android:alpha="0.85"
             app:backgroundTint="?attr/color_background_primary"
             android:src="?attr/icon_scroll_down"
             app:fabSize="mini"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            app:useCompatPadding="true"/>
 
         <eu.siacs.conversations.ui.widget.UnreadCountCustomView
             android:id="@+id/unread_count_custom_view"
@@ -43,6 +43,8 @@
             android:layout_height="?attr/IconSize"
             android:layout_alignTop="@+id/scroll_to_bottom_button"
             android:layout_alignEnd="@+id/scroll_to_bottom_button"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
             android:elevation="8dp"
             android:visibility="gone"
             app:backgroundColor="?attr/unread_count" />