diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java
index b482de522..a9cf806f2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java
@@ -1,7 +1,5 @@
 package org.joinmastodon.android.api.requests.oauth;
 
-import android.net.Uri;
-
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Application;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
index 6e2441c6a..e0e9eac0c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -6,6 +6,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -55,7 +56,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		setRetainInstance(true);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
 	}
 
 	@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
index 257b6c898..e0e3ade9f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -49,7 +49,8 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
 
-		setRetainInstance(true);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
 
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index bcfd3d76c..656e13a63 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -12,6 +12,7 @@ import android.content.res.Configuration;
 import android.graphics.Outline;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.view.Gravity;
@@ -123,7 +124,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		setRetainInstance(true);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
 
 		accountID=getArguments().getString("account");
 		if(getArguments().containsKey("profileAccount")){
@@ -435,7 +437,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		if(isOwnProfile && isInEditMode){
-			Button cancelButton=new Button(getActivity(), null, 0, R.style.Widget_Mastodon_Button_Secondary);
+			Button cancelButton=new Button(getActivity(), null, 0, R.style.Widget_Mastodon_Button_Secondary_LightOnDark);
 			cancelButton.setText(R.string.cancel);
 			cancelButton.setOnClickListener(v->exitEditMode());
 			FrameLayout wrap=new FrameLayout(getActivity());
diff --git a/mastodon/src/main/res/color/button_bg.xml b/mastodon/src/main/res/color/button_bg.xml
deleted file mode 100644
index a958d220f..000000000
--- a/mastodon/src/main/res/color/button_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonPrimary" android:state_enabled="true"/>
-	<item android:color="?colorButtonPrimary" android:alpha="0.5"/>
-</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml b/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml
new file mode 100644
index 000000000..ac32e4cf1
--- /dev/null
+++ b/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/gray_800" android:state_enabled="true"/>
+	<item android:color="@color/gray_300"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml b/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml
new file mode 100644
index 000000000..b79d382f0
--- /dev/null
+++ b/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/gray_100" android:state_enabled="true"/>
+	<item android:color="@color/gray_500"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_bg_secondary.xml b/mastodon/src/main/res/color/button_bg_secondary.xml
deleted file mode 100644
index 77c67e1e0..000000000
--- a/mastodon/src/main/res/color/button_bg_secondary.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonSecondary" android:state_enabled="true"/>
-	<item android:color="?colorButtonSecondary" android:alpha="0.5"/>
-</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml b/mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
new file mode 100644
index 000000000..79fd46559
--- /dev/null
+++ b/mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/gray_25" android:state_enabled="true"/>
+	<item android:color="@color/gray_100"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml b/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml
new file mode 100644
index 000000000..0f3e8a025
--- /dev/null
+++ b/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/gray_600" android:state_enabled="true"/>
+	<item android:color="@color/gray_300"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml b/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml
new file mode 100644
index 000000000..d9f2cb44b
--- /dev/null
+++ b/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/gray_50" android:state_enabled="true"/>
+	<item android:color="@color/gray_400"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_text_primary_light_on_dark.xml b/mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
new file mode 100644
index 000000000..a62f5c520
--- /dev/null
+++ b/mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/gray_800" android:state_enabled="true"/>
+	<item android:color="@color/gray_400"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml b/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml
new file mode 100644
index 000000000..a62f5c520
--- /dev/null
+++ b/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/gray_800" android:state_enabled="true"/>
+	<item android:color="@color/gray_400"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml b/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml
new file mode 100644
index 000000000..4a6b1e796
--- /dev/null
+++ b/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="@color/gray_50"/>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button.xml b/mastodon/src/main/res/drawable/bg_button_primary_dark_on_light.xml
similarity index 64%
rename from mastodon/src/main/res/drawable/bg_button.xml
rename to mastodon/src/main/res/drawable/bg_button_primary_dark_on_light.xml
index 2c1d1374c..337068d23 100644
--- a/mastodon/src/main/res/drawable/bg_button.xml
+++ b/mastodon/src/main/res/drawable/bg_button_primary_dark_on_light.xml
@@ -4,9 +4,8 @@
 		<ripple android:color="@color/highlight_over_dark">
 			<item>
 				<shape>
-					<solid android:color="@color/button_bg"/>
+					<solid android:color="@color/button_bg_primary_dark_on_light"/>
 					<corners android:radius="10dp"/>
-					<padding android:left="16dp" android:right="16dp" android:top="8dp" android:bottom="8dp"/>
 				</shape>
 			</item>
 		</ripple>
diff --git a/mastodon/src/main/res/drawable/bg_button_secondary.xml b/mastodon/src/main/res/drawable/bg_button_primary_light_on_dark.xml
similarity index 62%
rename from mastodon/src/main/res/drawable/bg_button_secondary.xml
rename to mastodon/src/main/res/drawable/bg_button_primary_light_on_dark.xml
index 13455930a..337068d23 100644
--- a/mastodon/src/main/res/drawable/bg_button_secondary.xml
+++ b/mastodon/src/main/res/drawable/bg_button_primary_light_on_dark.xml
@@ -4,9 +4,8 @@
 		<ripple android:color="@color/highlight_over_dark">
 			<item>
 				<shape>
-					<solid android:color="@color/button_bg_secondary"/>
+					<solid android:color="@color/button_bg_primary_dark_on_light"/>
 					<corners android:radius="10dp"/>
-					<padding android:left="16dp" android:right="16dp" android:top="8dp" android:bottom="8dp"/>
 				</shape>
 			</item>
 		</ripple>
diff --git a/mastodon/src/main/res/drawable/bg_button_secondary_dark_on_light.xml b/mastodon/src/main/res/drawable/bg_button_secondary_dark_on_light.xml
new file mode 100644
index 000000000..6867808cc
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_secondary_dark_on_light.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<ripple android:color="@color/highlight_over_dark">
+			<item>
+				<shape>
+					<solid android:color="@color/button_bg_secondary_dark_on_light"/>
+					<corners android:radius="10dp"/>
+				</shape>
+			</item>
+		</ripple>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_secondary_light_on_dark.xml b/mastodon/src/main/res/drawable/bg_button_secondary_light_on_dark.xml
new file mode 100644
index 000000000..f8d65731a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_secondary_light_on_dark.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<ripple android:color="@color/highlight_over_dark">
+			<item>
+				<shape>
+					<solid android:color="@color/button_bg_secondary_light_on_dark"/>
+					<corners android:radius="10dp"/>
+				</shape>
+			</item>
+		</ripple>
+	</item>
+</selector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml b/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
index a908ee9a0..74c6c0d8a 100644
--- a/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
+++ b/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
@@ -28,7 +28,7 @@
 			android:layout_marginEnd="16dp"
 			android:layout_marginBottom="24dp"
 			android:background="@drawable/bg_fab"
-			android:tint="@color/base"
+			android:tint="@color/fab_icon"
 			android:scaleType="center"
 			android:stateListAnimator="@animator/fab_shadow"
 			android:src="@drawable/ic_edit_34"/>
diff --git a/mastodon/src/main/res/values/attrs.xml b/mastodon/src/main/res/values/attrs.xml
index 307ec33ce..ca1ffd582 100644
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<attr name="colorButtonPrimary" format="color"/>
-	<attr name="colorButtonSecondary" format="color"/>
 	<attr name="colorButtonText" format="color"/>
 	<attr name="colorSecondary" format="color"/>
 	<attr name="colorBackgroundLight" format="color"/>
 	<attr name="colorBackgroundLightest" format="color"/>
 	<attr name="colorDarkIcon" format="color"/>
+	<attr name="secondaryButtonStyle" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/colors.xml b/mastodon/src/main/res/values/colors.xml
index 9a6baf2e1..2fe249a60 100644
--- a/mastodon/src/main/res/values/colors.xml
+++ b/mastodon/src/main/res/values/colors.xml
@@ -15,24 +15,21 @@
 	<color name="gray_50">#F9FAFB</color>
 	<color name="gray_100">#F2F4F7</color>
 	<color name="gray_200">#E4E7EC</color>
+	<color name="gray_300">#D0D5DD</color>
 	<color name="gray_400">#98A2B3</color>
 	<color name="gray_500">#667085</color>
 	<color name="gray_600">#475467</color>
+	<color name="gray_700">#344054</color>
 	<color name="gray_800">#282C37</color>
+	<color name="gray_800t">#CC282C37</color>
 	<color name="gray_900">#101828</color>
 
 	<color name="primary_700">#2B90D9</color>
 
-	<color name="gray_800_alpha50">#80282C37</color>
-	<color name="light_ui_action_button">#606984</color>
-
-	<color name="secondary">#E9EDF2</color>
-	<color name="base">#282C37</color>
-	<color name="text_secondary_alpha50">#80667085</color>
+	<color name="fab_icon">#282C37</color>
 	<color name="actionbar_bg">#FAFBFC</color>
-	<color name="navigation_bar_bg">#000</color>
+	<color name="navigation_bar_bg">#282C37</color>
 	<color name="highlight_over_dark">#80FFFFFF</color>
-	<color name="text_button">@color/gray_50</color>
 
 	<color name="favorite_selected">#FF9F0A</color>
 	<color name="boost_selected">#79BD9A</color>
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index ce85c63fc..be9f2a245 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -4,30 +4,30 @@
 		<!-- needed to disable scrim on API 29+ -->
 		<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
 		<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
-		<item name="android:windowLightStatusBar">true</item>
-		<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
-		<item name="android:windowBackground">@color/white</item>
-		<item name="android:statusBarColor">@color/actionbar_bg</item>
-		<item name="android:navigationBarColor">@color/navigation_bar_bg</item>
-		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
-		<item name="android:buttonStyle">@style/Widget.Mastodon.Button</item>
-		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
+
 		<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
 		<item name="android:splitMotionEvents">false</item>
 
-		<!-- colors -->
+		<!-- below depends on light/dark theme -->
+		<item name="android:buttonStyle">@style/Widget.Mastodon.Button.Primary_DarkOnLight</item>
+		<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_DarkOnLight</item>
 		<item name="android:colorAccent">@color/primary_700</item>
 		<item name="android:colorPrimary">@color/gray_800</item>
 		<item name="android:colorBackground">@color/gray_100</item>
 		<item name="android:textColorPrimary">@color/gray_800</item>
 		<item name="android:textColorSecondary">@color/gray_500</item>
-		<item name="colorButtonPrimary">@color/gray_800</item>
-		<item name="colorButtonSecondary">@color/gray_600</item>
 		<item name="colorButtonText">@color/gray_50</item>
 		<item name="colorSecondary">#E9EDF2</item>
 		<item name="colorBackgroundLight">@color/gray_50</item>
 		<item name="colorBackgroundLightest">@color/gray_25</item>
 		<item name="colorDarkIcon">@color/gray_900</item>
+		<item name="android:windowBackground">@color/white</item>
+		<item name="android:statusBarColor">@color/actionbar_bg</item>
+		<item name="android:navigationBarColor">@color/navigation_bar_bg</item>
+		<item name="android:windowLightStatusBar">true</item>
+		<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
+		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
+		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
 	</style>
 
 	<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">
@@ -49,15 +49,31 @@
 
 	<style name="Widget.Mastodon.Button" parent="android:Widget.Material.Button">
 		<item name="android:textAllCaps">false</item>
-		<item name="android:background">@drawable/bg_button</item>
 		<item name="android:textAppearance">@style/m3_label_large</item>
-		<item name="android:textColor">?colorButtonText</item>
 		<item name="android:minHeight">36dp</item>
 		<item name="android:minWidth">0px</item>
+		<item name="android:paddingLeft">16dp</item>
+		<item name="android:paddingRight">16dp</item>
 	</style>
 
-	<style name="Widget.Mastodon.Button.Secondary">
-		<item name="android:background">@drawable/bg_button_secondary</item>
+	<style name="Widget.Mastodon.Button.Primary_DarkOnLight">
+		<item name="android:background">@drawable/bg_button_primary_dark_on_light</item>
+		<item name="android:textColor">@color/button_text_primary_dark_on_light</item>
+	</style>
+
+	<style name="Widget.Mastodon.Button.Secondary_DarkOnLight">
+		<item name="android:background">@drawable/bg_button_secondary_dark_on_light</item>
+		<item name="android:textColor">@color/button_text_secondary_dark_on_light</item>
+	</style>
+
+	<style name="Widget.Mastodon.Button.Primary_LightOnDark">
+		<item name="android:background">@drawable/bg_button_primary_light_on_dark</item>
+		<item name="android:textColor">@color/button_text_primary_light_on_dark</item>
+	</style>
+
+	<style name="Widget.Mastodon.Button.Secondary_LightOnDark">
+		<item name="android:background">@drawable/bg_button_secondary_light_on_dark</item>
+		<item name="android:textColor">@color/button_text_secondary_light_on_dark</item>
 	</style>
 
 	<style name="Theme.Mastodon.Dialog.Alert" parent="android:Theme.Material.Light.Dialog.Alert">
@@ -72,13 +88,6 @@
 		<item name="android:colorBackground">@color/gray_100</item>
 		<item name="android:textColorPrimary">@color/gray_800</item>
 		<item name="android:textColorSecondary">@color/gray_500</item>
-		<item name="colorButtonPrimary">@color/gray_800</item>
-		<item name="colorButtonSecondary">@color/gray_600</item>
-		<item name="colorButtonText">@color/gray_50</item>
-		<item name="colorSecondary">#E9EDF2</item>
-		<item name="colorBackgroundLight">@color/gray_50</item>
-		<item name="colorBackgroundLightest">@color/gray_25</item>
-		<item name="colorDarkIcon">@color/gray_900</item>
 	</style>
 
 	<style name="Widget.Mastodon.ButtonBarButton" parent="android:Widget.Material.Button.Borderless">
@@ -141,6 +150,6 @@
 
 	<style name="m3_headline_small">
 		<item name="android:textSize">24dp</item>
-		<item name="android:textColor">@color/gray_800</item>
+		<item name="android:textColor">?android:textColorPrimary</item>
 	</style>
 </resources>
\ No newline at end of file