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">
-
-
+
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 @@
-
-
-
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 @@
+
+
+
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 @@
-
-
+
\ 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"/>
-
-
+
\ 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 @@
+
+
+
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 @@
- ?colorPrimary100
- ?colorGray500
- ?colorGray50
+ - ?colorBackgroundPopup
+ - ?android:textColorPrimary
+ - @style/Widget.Mastodon.Button.Compose
- @drawable/bg_button_primary_dark_on_light
- @drawable/bg_edittext_light
@@ -132,6 +135,10 @@
- ?colorGray700
- ?colorGray300
- ?colorGray800
+ - ?colorPrimary700
+ - ?colorGray100
+
+ - @style/Widget.Mastodon.Button.Compose
- @drawable/bg_button_primary_light_on_dark
- @drawable/bg_edittext_dark
@@ -199,6 +206,8 @@
- @color/black
- ?colorGray900
- @color/black
+ - ?android:colorAccent
+ - ?colorGray900
- #000
@@ -236,6 +245,20 @@
- ?colorGray25
+
+