diff --git a/app/src/main/res/color/action_foreground.xml b/app/src/main/res/color/action_foreground.xml
new file mode 100644
index 0000000000..6a7997b452
--- /dev/null
+++ b/app/src/main/res/color/action_foreground.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="?attr/colorActionForegroundDisabled" android:state_enabled="false" />
+    <item android:color="?attr/colorActionForeground" />
+</selector>
diff --git a/app/src/main/res/color/bottomnav_foreground.xml b/app/src/main/res/color/bottomnav_foreground.xml
deleted file mode 100644
index e06e1683de..0000000000
--- a/app/src/main/res/color/bottomnav_foreground.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="@color/colorActionForegroundDisabled" android:state_enabled="false" />
-    <item android:color="@color/colorActionForeground" />
-</selector>
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index 5273940ae2..38d21c1088 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -48,9 +48,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_compose"
-        app:backgroundTint="?attr/colorAccent"
+        app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/baseline_edit_24" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -59,8 +59,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
-        app:backgroundTint="?attr/colorAccent"
+        app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/baseline_add_24" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_answer.xml b/app/src/main/res/layout/fragment_answer.xml
index dafcdef6ac..02dfd42eff 100644
--- a/app/src/main/res/layout/fragment_answer.xml
+++ b/app/src/main/res/layout/fragment_answer.xml
@@ -73,8 +73,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
-        app:itemIconTint="@color/bottomnav_foreground"
-        app:itemTextColor="@color/bottomnav_foreground"
+        app:itemIconTint="@color/action_foreground"
+        app:itemTextColor="@color/action_foreground"
         app:labelVisibilityMode="labeled"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_answers.xml b/app/src/main/res/layout/fragment_answers.xml
index 5c209860aa..6181ebbfe5 100644
--- a/app/src/main/res/layout/fragment_answers.xml
+++ b/app/src/main/res/layout/fragment_answers.xml
@@ -48,8 +48,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
-        app:backgroundTint="?attr/colorAccent"
+        app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/baseline_add_24" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 9f0eac9c63..3a06ba1f2f 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -416,9 +416,9 @@
         android:id="@+id/edit_bar"
         android:layout_width="match_parent"
         android:layout_height="36dp"
-        android:background="?attr/colorSeparator"
-        app:itemIconTint="@color/bottomnav_foreground"
-        app:itemTextColor="@color/bottomnav_foreground"
+        android:background="?attr/colorActionBackground"
+        app:itemIconTint="@color/action_foreground"
+        app:itemTextColor="@color/action_foreground"
         app:labelVisibilityMode="unlabeled"
         app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
         app:layout_constraintEnd_toEndOf="parent"
@@ -430,8 +430,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
-        app:itemIconTint="@color/bottomnav_foreground"
-        app:itemTextColor="@color/bottomnav_foreground"
+        app:itemIconTint="@color/action_foreground"
+        app:itemTextColor="@color/action_foreground"
         app:labelVisibilityMode="labeled"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml
index c6c9bb2a61..1a831c3c5a 100644
--- a/app/src/main/res/layout/fragment_folders.xml
+++ b/app/src/main/res/layout/fragment_folders.xml
@@ -128,9 +128,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
-        app:backgroundTint="?attr/colorAccent"
+        app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/baseline_create_new_folder_24" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -139,7 +139,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_compose"
         app:backgroundTint="@color/colorError"
         app:srcCompat="@drawable/baseline_warning_24" />
diff --git a/app/src/main/res/layout/fragment_identities.xml b/app/src/main/res/layout/fragment_identities.xml
index c779d0adf7..88f90397c4 100644
--- a/app/src/main/res/layout/fragment_identities.xml
+++ b/app/src/main/res/layout/fragment_identities.xml
@@ -48,8 +48,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
-        app:backgroundTint="?attr/colorAccent"
+        app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/baseline_add_24" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index b4f303c8bb..488ccd4860 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -182,7 +182,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|bottom"
                 android:layout_margin="@dimen/fab_padding"
-                android:tint="@color/colorActionForeground"
+                android:tint="?attr/colorFabForeground"
+                app:backgroundTint="?attr/colorFabBackground"
                 app:layout_constraintBottom_toTopOf="@+id/sbThread"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:srcCompat="@drawable/baseline_reply_24" />
@@ -263,8 +264,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="36dp"
                 android:background="?attr/colorPrimary"
-                app:itemIconTint="@color/bottomnav_foreground"
-                app:itemTextColor="@color/bottomnav_foreground"
+                app:itemIconTint="@color/action_foreground"
+                app:itemTextColor="@color/action_foreground"
                 app:labelVisibilityMode="unlabeled"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -310,9 +311,9 @@
         android:layout_gravity="end|bottom"
         android:layout_marginEnd="@dimen/fab_padding"
         android:layout_marginBottom="90dp"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_more"
-        app:backgroundTint="?attr/colorAccent"
+        app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/baseline_more_vert_24" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -321,9 +322,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_search_server"
-        app:backgroundTint="?attr/colorAccent"
+        app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/baseline_youtube_searched_for_24" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -332,9 +333,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_compose"
-        app:backgroundTint="?attr/colorAccent"
+        app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/baseline_edit_24" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -343,7 +344,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_compose"
         app:backgroundTint="@color/colorError"
         app:srcCompat="@drawable/baseline_warning_24" />
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index bb8ae1aec5..59621eb40e 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -671,8 +671,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
-        app:itemIconTint="@color/bottomnav_foreground"
-        app:itemTextColor="@color/bottomnav_foreground"
+        app:itemIconTint="@color/action_foreground"
+        app:itemTextColor="@color/action_foreground"
         app:labelVisibilityMode="labeled"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_rules.xml b/app/src/main/res/layout/fragment_rules.xml
index 6343a092f3..428e624a15 100644
--- a/app/src/main/res/layout/fragment_rules.xml
+++ b/app/src/main/res/layout/fragment_rules.xml
@@ -48,8 +48,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        android:tint="@color/colorActionForeground"
+        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
-        app:backgroundTint="?attr/colorAccent"
+        app:backgroundTint="?attr/colorFabBackground"
         app:srcCompat="@drawable/baseline_add_24" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 9fe9c23943..3a29721864 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -9,9 +9,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
-        android:background="?attr/colorSeparator"
-        app:itemIconTint="@color/bottomnav_foreground"
-        app:itemTextColor="@color/bottomnav_foreground"
+        android:background="?attr/colorActionBackground"
+        app:itemIconTint="@color/action_foreground"
+        app:itemTextColor="@color/action_foreground"
         app:labelVisibilityMode="labeled"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -24,8 +24,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="6dp"
+        android:backgroundTint="?attr/colorActionBackground"
         android:contentDescription="@string/title_decrypt"
-        android:tint="@color/bottomnav_foreground"
+        android:tint="@color/action_foreground"
         app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
         app:layout_constraintTop_toBottomOf="@id/bnvActions"
         app:srcCompat="@drawable/baseline_no_encryption_24" />
@@ -36,8 +37,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="6dp"
+        android:backgroundTint="?attr/colorActionBackground"
         android:contentDescription="@string/title_legend_show_unsubscribe"
-        android:tint="@color/bottomnav_foreground"
+        android:tint="@color/action_foreground"
         app:layout_constraintEnd_toStartOf="@+id/ibImages"
         app:layout_constraintTop_toBottomOf="@id/bnvActions"
         app:srcCompat="@drawable/baseline_unsubscribe_24" />
@@ -48,8 +50,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="6dp"
+        android:backgroundTint="?attr/colorActionBackground"
         android:contentDescription="@string/title_legend_show_images"
-        android:tint="@color/bottomnav_foreground"
+        android:tint="@color/action_foreground"
         app:layout_constraintEnd_toStartOf="@+id/ibFull"
         app:layout_constraintTop_toBottomOf="@id/bnvActions"
         app:srcCompat="@drawable/baseline_image_24" />
@@ -59,8 +62,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
+        android:backgroundTint="?attr/colorActionBackground"
         android:contentDescription="@string/title_legend_show_full"
-        android:tint="@color/bottomnav_foreground"
+        android:tint="@color/action_foreground"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/bnvActions"
         app:srcCompat="@drawable/baseline_fullscreen_24" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1a4ad110a2..e840d5a03a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,6 +21,7 @@
 
     <color name="colorActionForeground">#fff</color>
     <color name="colorActionForegroundDisabled">#ccc</color>
+    <color name="colorActionBackground">#ccc</color>
 
     <color name="colorWidgetForeground">#fff</color>
     <color name="colorWidgetBackground">#7f000000</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 09649e2edc..25ab8f3085 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,6 +7,11 @@
     <attr name="colorDrawerText" format="reference" />
     <attr name="colorDrawerBackground" format="reference" />
     <attr name="colorCardBackground" format="reference" />
+    <attr name="colorActionForeground" format="reference" />
+    <attr name="colorActionForegroundDisabled" format="reference" />
+    <attr name="colorActionBackground" format="reference" />
+    <attr name="colorFabForeground" format="reference" />
+    <attr name="colorFabBackground" format="reference" />
     <attr name="colorToastForeground" format="reference" />
     <attr name="colorToastBackground" format="reference" />
     <attr name="activatableItemBackground" format="reference" />
@@ -29,6 +34,13 @@
 
         <item name="colorCardBackground">@color/lightColorCardBackground</item>
 
+        <item name="colorActionForeground">@color/colorActionForeground</item>
+        <item name="colorActionForegroundDisabled">@color/colorActionForegroundDisabled</item>
+        <item name="colorActionBackground">@color/colorActionBackground</item>
+
+        <item name="colorFabForeground">@android:color/white</item>
+        <item name="colorFabBackground">@color/colorAccent</item>
+
         <item name="colorToastForeground">@android:color/white</item>
         <item name="colorToastBackground">@color/colorPrimaryDark</item>
 
@@ -64,6 +76,9 @@
 
         <item name="colorCardBackground">@color/darkColorCardBackground</item>
 
+        <item name="colorFabForeground">@android:color/white</item>
+        <item name="colorFabBackground">@color/colorAccent</item>
+
         <item name="colorToastForeground">@android:color/white</item>
         <item name="colorToastBackground">@color/colorPrimaryDark</item>
 
@@ -97,6 +112,8 @@
 
         <item name="colorUnread">@color/greyAccent</item>
 
+        <item name="colorFabBackground">@color/greyAccent</item>
+
         <item name="colorToastForeground">@android:color/white</item>
         <item name="colorToastBackground">@color/greyAccent</item>
     </style>
@@ -110,6 +127,10 @@
         <item name="colorUnread">@color/greyAccent</item>
         <item name="colorSeparator">@color/greyPrimary</item>
 
+        <item name="colorActionBackground">@color/greyPrimary</item>
+
+        <item name="colorFabBackground">@color/greyAccent</item>
+
         <item name="colorToastForeground">@android:color/white</item>
         <item name="colorToastBackground">@color/greyAccent</item>