diff --git a/app/src/main/res/drawable/scroll_to_bottom_background_dark.xml b/app/src/main/res/drawable/scroll_to_bottom_background_dark.xml
new file mode 100644
index 0000000000..8ea26a73fb
--- /dev/null
+++ b/app/src/main/res/drawable/scroll_to_bottom_background_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="@color/core_grey_65" />
+</shape>
diff --git a/app/src/main/res/drawable/scroll_to_bottom_background_light.xml b/app/src/main/res/drawable/scroll_to_bottom_background_light.xml
new file mode 100644
index 0000000000..ea8e798707
--- /dev/null
+++ b/app/src/main/res/drawable/scroll_to_bottom_background_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="@color/core_white" />
+</shape>
diff --git a/app/src/main/res/layout/conversation_fragment.xml b/app/src/main/res/layout/conversation_fragment.xml
index fadd2bccb3..bf82113024 100644
--- a/app/src/main/res/layout/conversation_fragment.xml
+++ b/app/src/main/res/layout/conversation_fragment.xml
@@ -53,10 +53,9 @@
             android:layout_marginBottom="20dp"
             android:padding="5dp"
             android:layout_gravity="bottom|end"
-            android:background="@drawable/circle_tintable"
-            android:tint="@color/grey_600"
+            android:background="?attr/conversation_scroll_to_bottom_background"
+            android:tint="?attr/conversation_scroll_to_bottom_foreground_color"
             android:elevation="1dp"
-            android:alpha="0.9"
             android:contentDescription="@string/conversation_fragment__scroll_to_the_bottom_content_description"
             android:src="@drawable/ic_scroll_down"/>
 </FrameLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 6eee232cfa..703ec8540e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -136,6 +136,8 @@
     <attr name="conversation_item_sticky_date_text_color" format="color" />
     <attr name="conversation_item_image_outline_color" format="color" />
     <attr name="conversation_item_reveal_viewed_background_color" format="color" />
+    <attr name="conversation_scroll_to_bottom_background" format="reference" />
+    <attr name="conversation_scroll_to_bottom_foreground_color" format="color" />
 
     <attr name="dialog_info_icon" format="reference" />
     <attr name="dialog_alert_icon" format="reference" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ffe2669e32..f093923454 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -307,6 +307,8 @@
         <item name="conversation_item_sticky_date_text_color">@color/core_grey_60</item>
         <item name="conversation_item_image_outline_color">@color/transparent_black_20</item>
         <item name="conversation_item_reveal_viewed_background_color">?conversation_background</item>
+        <item name="conversation_scroll_to_bottom_background">@drawable/scroll_to_bottom_background_light</item>
+        <item name="conversation_scroll_to_bottom_foreground_color">@color/grey_600</item>
 
         <item name="quick_camera_icon">@drawable/ic_camera_outline_24</item>
         <item name="quick_mic_icon">@drawable/ic_mic_outline_24</item>
@@ -566,6 +568,8 @@
         <item name="conversation_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="conversation_title_color">@color/transparent_white_90</item>
         <item name="conversation_subtitle_color">@color/transparent_white_80</item>
+        <item name="conversation_scroll_to_bottom_background">@drawable/scroll_to_bottom_background_dark</item>
+        <item name="conversation_scroll_to_bottom_foreground_color">@color/core_white</item>
 
         <item name="reactions_overlay_old_background">@drawable/reactions_old_background_dark</item>
         <item name="reactions_overlay_scrubber_background">@drawable/conversation_reaction_overlay_background_dark</item>