diff --git a/mastodon/src/main/res/drawable/bg_fab.xml b/mastodon/src/main/res/drawable/bg_fab.xml
index 320e3e279..00025992d 100644
--- a/mastodon/src/main/res/drawable/bg_fab.xml
+++ b/mastodon/src/main/res/drawable/bg_fab.xml
@@ -3,7 +3,7 @@
 	android:color="?android:colorControlHighlight">
 	<item>
 		<shape>
-			<solid android:color="?colorSecondary"/>
+			<solid android:color="?attr/colorComposeButtonBackground"/>
 			<corners android:radius="16dp"/>
 		</shape>
 	</item>
diff --git a/mastodon/src/main/res/drawable/ic_edit_34.xml b/mastodon/src/main/res/drawable/ic_edit_34.xml
deleted file mode 100644
index 9e7fa0dd1..000000000
--- a/mastodon/src/main/res/drawable/ic_edit_34.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="34dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="34dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_edit_28_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_edit_28_filled.xml
new file mode 100644
index 000000000..1510e850c
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_edit_28_filled.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M19.289 3.15c1.535-1.536 4.025-1.536 5.56 0 1.536 1.535 1.536 4.025 0 5.56l-1.54 1.54-5.56-5.56 1.54-1.54zm-2.6 2.6L4.502 17.937c-0.44 0.44-0.76 0.986-0.928 1.586l-1.547 5.525c-0.073 0.26 0 0.54 0.192 0.732 0.191 0.192 0.471 0.265 0.732 0.192l5.524-1.547c0.6-0.168 1.147-0.487 1.587-0.928L22.25 11.311l-5.56-5.56z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 7828f92be..a6afddd68 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -323,19 +323,7 @@
 			</LinearLayout>
 		</org.joinmastodon.android.ui.views.NestedRecyclerScrollView>
 
-		<ImageButton
-			android:id="@+id/fab"
-			android:layout_width="64dp"
-			android:layout_height="64dp"
-			android:layout_gravity="end|bottom"
-			android:layout_marginEnd="16dp"
-			android:layout_marginBottom="24dp"
-			android:background="@drawable/bg_fab"
-			android:tint="@color/fab_icon"
-			android:scaleType="center"
-			android:stateListAnimator="@animator/fab_shadow"
-			android:src="@drawable/ic_edit_34"/>
-
+		<ImageButton android:id="@+id/fab" style="@style/Widget.Mastodon.Button.Compose"/>
 	</FrameLayout>
 
 </me.grishka.appkit.views.RecursiveSwipeRefreshLayout>
\ 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 4dcdac756..1ed27ed70 100644
--- a/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
+++ b/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
@@ -20,19 +20,6 @@
 			android:layout_height="match_parent"
 			android:id="@+id/empty"/>
 
-		<ImageButton
-			android:id="@+id/fab"
-			android:layout_width="64dp"
-			android:layout_height="64dp"
-			android:layout_gravity="end|bottom"
-			android:layout_marginEnd="16dp"
-			android:layout_marginBottom="24dp"
-			android:background="@drawable/bg_fab"
-			android:tint="@color/fab_icon"
-			android:scaleType="center"
-			android:stateListAnimator="@animator/fab_shadow"
-			android:contentDescription="@string/new_post"
-			android:src="@drawable/ic_edit_34"/>
-
+		<ImageButton android:id="@+id/fab" style="@style/Widget.Mastodon.Button.Compose"/>
 	</FrameLayout>
 </me.grishka.appkit.views.RecursiveSwipeRefreshLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/attrs.xml b/mastodon/src/main/res/values/attrs.xml
index cb1c4d5ce..b170a87e2 100644
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -5,10 +5,13 @@
 	<attr name="colorBackgroundLight" format="color"/>
 	<attr name="colorBackgroundLightest" format="color"/>
 	<attr name="colorBackgroundPopup" format="color"/>
+	<attr name="colorComposeButtonBackground" format="color"/>
+	<attr name="colorComposeButton" format="color"/>
 	<attr name="colorDarkIcon" format="color"/>
 	<attr name="colorPollMostVoted" format="color"/>
 	<attr name="colorPollVoted" format="color"/>
 	<attr name="colorWindowBackground" format="color"/>
+	<attr name="composeButtonStyle" format="reference"/>
 	<attr name="secondaryButtonStyle" format="reference"/>
 	<attr name="buttonBackground" format="reference"/>
 	<attr name="colorAccentLight" format="color"/>
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 1af3e20fe..235c5f5a0 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -38,6 +38,9 @@
 		<item name="colorAccentLightest">?colorPrimary100</item>
 		<item name="profileHeaderBackground">?colorGray500</item>
 		<item name="toolbarBackground">?colorGray50</item>
+		<item name="colorComposeButtonBackground">?colorBackgroundPopup</item>
+		<item name="colorComposeButton">?android:textColorPrimary</item>
+		<item name="composeButtonStyle">@style/Widget.Mastodon.Button.Compose</item>
 
 		<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
 		<item name="android:editTextBackground">@drawable/bg_edittext_light</item>
@@ -132,6 +135,10 @@
 		<item name="colorSearchField">?colorGray700</item>
 		<item name="colorSearchHint">?colorGray300</item>
 		<item name="toolbarBackground">?colorGray800</item>
+		<item name="colorComposeButton">?colorPrimary700</item>
+		<item name="colorComposeButtonBackground">?colorGray100</item>
+
+		<item name="composeButtonStyle">@style/Widget.Mastodon.Button.Compose</item>
 
 		<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
 		<item name="android:editTextBackground">@drawable/bg_edittext_dark</item>
@@ -199,6 +206,8 @@
 		<item name="colorBackgroundLightest">@color/black</item>
 		<item name="colorBackgroundPopup">?colorGray900</item>
 		<item name="colorWindowBackground">@color/black</item>
+		<item name="colorComposeButton">?android:colorAccent</item>
+		<item name="colorComposeButtonBackground">?colorGray900</item>
 
 		<item name="colorM3Background">#000</item>
 		<!--		<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray900</item>-->
@@ -236,6 +245,20 @@
 		<item name="android:subtitleTextColor">?colorGray25</item>
 	</style>
 
+	<style name="Widget.Mastodon.Button.Compose">
+		<item name="android:layout_width">64dp</item>
+		<item name="android:layout_height">64dp</item>
+		<item name="android:layout_gravity">end|bottom</item>
+		<item name="android:layout_marginEnd">16dp</item>
+		<item name="android:layout_marginBottom">24dp</item>
+		<item name="android:background">@drawable/bg_fab</item>
+		<item name="android:scaleType">center</item>
+		<item name="android:tint">?colorComposeButton</item>
+		<item name="android:stateListAnimator">@animator/fab_shadow</item>
+		<item name="android:src">@drawable/ic_fluent_edit_28_filled</item>
+		<item name="android:contentDescription">@string/new_post</item>
+	</style>
+
 	<style name="Widget.Mastodon.Button" parent="android:Widget.Material.Button">
 		<item name="android:textAllCaps">false</item>
 		<item name="android:textAppearance">@style/m3_label_large</item>