diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java
index 442f5f1c0..dfe03192c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java
@@ -46,6 +46,14 @@ public final class ConversationScrollToView extends FrameLayout {
     }
   }
 
+  public void setWallpaperEnabled(boolean hasWallpaper) {
+    if (hasWallpaper) {
+      scrollButton.setBackgroundResource(R.drawable.scroll_to_bottom_background_wallpaper);
+    } else {
+      scrollButton.setBackgroundResource(R.drawable.scroll_to_bottom_background_normal);
+    }
+  }
+
   public void setUnreadCountBackgroundTint(@ColorInt int tint) {
     unreadCount.getBackground().setColorFilter(new SimpleColorFilter(tint));
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index a49fe0b74..a0431a566 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -377,7 +377,11 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
       presentConversationMetadata(messageData.getMetadata());
     }));
 
-    disposables.add(conversationViewModel.getWallpaper().subscribe(w -> chatWallpaper = w.orElse(null)));
+    disposables.add(conversationViewModel.getWallpaper().subscribe(w -> {
+      chatWallpaper = w.orElse(null);
+      scrollToBottomButton.setWallpaperEnabled(w.isPresent());
+      scrollToMentionButton.setWallpaperEnabled(w.isPresent());
+    }));
 
     conversationViewModel.getShowMentionsButton().observe(getViewLifecycleOwner(), shouldShow -> {
       if (shouldShow) {
diff --git a/app/src/main/res/drawable/scroll_to_bottom_background.xml b/app/src/main/res/drawable/scroll_to_bottom_background_normal.xml
similarity index 71%
rename from app/src/main/res/drawable/scroll_to_bottom_background.xml
rename to app/src/main/res/drawable/scroll_to_bottom_background_normal.xml
index ea8e79870..e99262bbf 100644
--- a/app/src/main/res/drawable/scroll_to_bottom_background.xml
+++ b/app/src/main/res/drawable/scroll_to_bottom_background_normal.xml
@@ -1,5 +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" />
+    <solid android:color="@color/signal_colorSurface2" />
 </shape>
diff --git a/app/src/main/res/drawable-night/scroll_to_bottom_background.xml b/app/src/main/res/drawable/scroll_to_bottom_background_wallpaper.xml
similarity index 71%
rename from app/src/main/res/drawable-night/scroll_to_bottom_background.xml
rename to app/src/main/res/drawable/scroll_to_bottom_background_wallpaper.xml
index 8ea26a73f..6e59ee4aa 100644
--- a/app/src/main/res/drawable-night/scroll_to_bottom_background.xml
+++ b/app/src/main/res/drawable/scroll_to_bottom_background_wallpaper.xml
@@ -1,5 +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" />
+    <solid android:color="@color/signal_colorNeutral" />
 </shape>
diff --git a/app/src/main/res/layout/conversation_scroll_to.xml b/app/src/main/res/layout/conversation_scroll_to.xml
index 4e42dbed5..53378f079 100644
--- a/app/src/main/res/layout/conversation_scroll_to.xml
+++ b/app/src/main/res/layout/conversation_scroll_to.xml
@@ -11,7 +11,7 @@
         android:layout_height="32dp"
         android:layout_gravity="bottom|center"
         android:layout_marginBottom="4dp"
-        android:background="@drawable/scroll_to_bottom_background"
+        android:background="@drawable/scroll_to_bottom_background_normal"
         android:contentDescription="@string/conversation_fragment__scroll_to_the_bottom_content_description"
         android:elevation="1dp"
         android:scaleType="center"
diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml
index be60149ad..e8c33e2c3 100644
--- a/app/src/main/res/values-night/dark_colors.xml
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -102,7 +102,7 @@
 
     <color name="wallpaper_bubble_color">@color/signal_colorTransparentInverse4</color>
 
-    <color name="conversation_scroll_to_bottom_foreground_color">@color/core_white</color>
+    <color name="conversation_scroll_to_bottom_foreground_color">@color/signal_colorOnSurfaceVariant</color>
 
     <color name="conversation_list_selected_color">@color/signal_colorSurface2</color>
 
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
index 79f5b9447..ed8e468be 100644
--- a/app/src/main/res/values/light_colors.xml
+++ b/app/src/main/res/values/light_colors.xml
@@ -105,7 +105,7 @@
     <color name="wallpaper_bubble_color">@color/signal_colorTransparent4</color>
     <color name="sticky_header_foreground_wallpaper">@color/signal_colorNeutralVariantInverse</color>
 
-    <color name="conversation_scroll_to_bottom_foreground_color">@color/grey_600</color>
+    <color name="conversation_scroll_to_bottom_foreground_color">@color/signal_colorOnSurfaceVariant</color>
 
     <color name="conversation_list_selected_color">@color/signal_colorSurface2</color>