diff --git a/mastodon/src/main/java/org/joinmastodon/android/utils/ElevationOnScrollListener.java b/mastodon/src/main/java/org/joinmastodon/android/utils/ElevationOnScrollListener.java
index 7fabbafd2..94c38166f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/utils/ElevationOnScrollListener.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/utils/ElevationOnScrollListener.java
@@ -94,9 +94,9 @@ public class ElevationOnScrollListener extends RecyclerView.OnScrollListener imp
 			if(fragmentRootLayout!=null){
 				int color;
 				if(isAtTop){
-					color=UiUtils.getThemeColor(context, R.attr.colorM3Background);
+					color=UiUtils.getThemeColor(context, R.attr.toolbarBackground);
 				}else{
-					color=UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.colorM3Background), UiUtils.getThemeColor(context, R.attr.colorM3Primary), 0.07843137f);
+					color=UiUtils.alphaBlendColors(UiUtils.getThemeColor(context, R.attr.toolbarBackground), UiUtils.getThemeColor(context, R.attr.colorWindowBackground), 0.07843137f);
 				}
 				anims.add(ObjectAnimator.ofArgb(fragmentRootLayout, "statusBarColor", color));
 			}
diff --git a/mastodon/src/main/res/drawable/bg_onboarding_panel.xml b/mastodon/src/main/res/drawable/bg_onboarding_panel.xml
index a6b2c10ae..e959cc39c 100644
--- a/mastodon/src/main/res/drawable/bg_onboarding_panel.xml
+++ b/mastodon/src/main/res/drawable/bg_onboarding_panel.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 	<item>
-		<color android:color="?colorM3Background"/>
+		<color android:color="?colorWindowBackground"/>
 	</item>
 	<item android:id="@+id/color_overlay">
-		<color android:color="?colorM3Primary"/>
+		<color android:color="?toolbarBackground"/>
 	</item>
 </layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_onboarding_rules.xml b/mastodon/src/main/res/layout/fragment_onboarding_rules.xml
index 2f1b2da91..9994b2e84 100644
--- a/mastodon/src/main/res/layout/fragment_onboarding_rules.xml
+++ b/mastodon/src/main/res/layout/fragment_onboarding_rules.xml
@@ -15,6 +15,7 @@
 		android:id="@+id/button_bar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:visibility="gone"
 		android:orientation="vertical">
 
 		<Button