diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml
index 272714f1d..5d62b3b2f 100644
--- a/app/src/main/res/layout/activity_entry_edit.xml
+++ b/app/src/main/res/layout/activity_entry_edit.xml
@@ -69,9 +69,6 @@
         android:id="@+id/entry_edit_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:theme="@style/Widget.MaterialComponents.BottomAppBar"
-        android:backgroundTint="?attr/colorAccent"
-        app:backgroundTint="?attr/colorAccent"
         app:fabAlignmentMode="center"
         app:hideOnScroll="false"
         app:layout_scrollFlags="scroll|enterAlways"
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 9583a4777..a8f7c5d34 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -156,8 +156,7 @@
         android:layout_height="?attr/actionBarSize"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:theme="?attr/actionToolbarAppearance"
-        android:background="?attr/colorAccent" />
+        style="?attr/actionToolbarAppearance" />
 
     <include
         layout="@layout/view_button_lock"
diff --git a/app/src/main/res/values/style_black.xml b/app/src/main/res/values/style_black.xml
index 7c4cef5db..9c954faa4 100644
--- a/app/src/main/res/values/style_black.xml
+++ b/app/src/main/res/values/style_black.xml
@@ -31,7 +31,6 @@
         <item name="android:windowBackground">@color/background_dark</item>
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
         <item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Black</item>
-        <item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Black</item>
diff --git a/app/src/main/res/values/style_blue.xml b/app/src/main/res/values/style_blue.xml
index 34f399a6c..a903c68e4 100644
--- a/app/src/main/res/values/style_blue.xml
+++ b/app/src/main/res/values/style_blue.xml
@@ -30,7 +30,6 @@
         <item name="android:windowBackground">@color/background_light</item>
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
         <item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
-        <item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action.Blue</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Blue</item>
     </style>
     <!-- Toolbar Style Blue -->
diff --git a/app/src/main/res/values/style_dark.xml b/app/src/main/res/values/style_dark.xml
index 4aa3d5734..146d15a30 100644
--- a/app/src/main/res/values/style_dark.xml
+++ b/app/src/main/res/values/style_dark.xml
@@ -30,7 +30,6 @@
         <item name="android:windowBackground">@color/background_dark</item>
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Dark</item>
         <item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Dark</item>
-        <item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Dark</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Dark</item>
diff --git a/app/src/main/res/values/style_purple.xml b/app/src/main/res/values/style_purple.xml
index d0a899d1c..f94a7524e 100644
--- a/app/src/main/res/values/style_purple.xml
+++ b/app/src/main/res/values/style_purple.xml
@@ -31,7 +31,6 @@
         <item name="android:windowBackground">@color/background_purple</item>
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple</item>
         <item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple</item>
-        <item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action.Purple</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Purple</item>
diff --git a/app/src/main/res/values/style_red.xml b/app/src/main/res/values/style_red.xml
index 61ed7f04e..f1409cddb 100644
--- a/app/src/main/res/values/style_red.xml
+++ b/app/src/main/res/values/style_red.xml
@@ -30,7 +30,6 @@
         <item name="android:windowBackground">@color/background_night</item>
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
         <item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Red</item>
-        <item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Red</item>
     </style>
     <!-- Toolbar Style Red -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f535e51f2..a648a4ab4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -76,8 +76,11 @@
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item>
         <item name="toolbarPopupAppearance">@style/KeepassDXStyle.Light.Toolbar.Popup</item>
         <item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Light</item>
-        <item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item>
+        <item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action</item>
+        <item name="bottomAppBarStyle">@style/KeepassDXStyle.Toolbar.Bottom</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode</item>
+        <item name="android:actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
+        <item name="actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
         <!-- CollapsingToolbarLayout -->
         <item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
         <item name="collapsedTitleTextAppearance">@style/KeepassDXStyle.Collapsed.Title</item>
@@ -129,8 +132,11 @@
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item>
         <item name="toolbarPopupAppearance">@style/KeepassDXStyle.Night.Toolbar.Popup</item>
         <item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Night</item>
-        <item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item>
+        <item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action</item>
+        <item name="bottomAppBarStyle">@style/KeepassDXStyle.Toolbar.Bottom</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode</item>
+        <item name="android:actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
+        <item name="actionOverflowButtonStyle">@style/KeepassDXStyle.Toolbar.Overflow</item>
         <!-- CollapsingToolbarLayout -->
         <item name="expandedTitleTextAppearance">@style/KeepassDXStyle.Expanded.Title</item>
         <item name="collapsedTitleTextAppearance">@style/KeepassDXStyle.Collapsed.Title</item>
@@ -158,7 +164,7 @@
         <item name="android:activityCloseExitAnimation">@anim/slide_out_right</item>
     </style>
 
-    <!-- Toolbar Style Light Green -->
+    <!-- Toolbar Style Light -->
     <style name="KeepassDXStyle.Toolbar.Light" parent="KeepassDXStyle.Light.v21">
         <item name="colorControlNormal">@color/colorTextInverse</item>
         <item name="android:textColorPrimary">@color/colorTextInverse</item>
@@ -168,7 +174,7 @@
         <item name="android:tint">@color/colorTextInverse</item>
     </style>
 
-    <!-- Toolbar Style Night Green -->
+    <!-- Toolbar Style Night -->
     <style name="KeepassDXStyle.Toolbar.Night" parent="KeepassDXStyle.Night.v21">
         <item name="colorControlNormal">@color/colorTextInverse</item>
         <item name="android:textColorPrimary">@color/colorTextInverse</item>
@@ -178,6 +184,34 @@
         <item name="android:tint">@color/colorTextInverse</item>
     </style>
 
+    <style name="KeepassDXStyle.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textColor">@color/colorTextInverse</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Subtitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
+        <item name="android:textColor">@color/colorTextInverse</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Overflow" parent="Widget.AppCompat.Light.ActionButton.Overflow">
+        <item name="android:tint">@color/colorTextInverse</item>
+        <item name="tint">@color/colorTextInverse</item>
+    </style>
+
+    <!-- Action Style -->
+    <style name="KeepassDXStyle.Toolbar.Action" parent="Widget.AppCompat.Toolbar">
+        <item name="titleTextAppearance">@style/KeepassDXStyle.Toolbar.Title</item>
+        <item name="subtitleTextAppearance">@style/KeepassDXStyle.Toolbar.Subtitle</item>
+        <item name="android:background">?attr/colorAccent</item>
+    </style>
+
+    <!-- Bottom Toolbar Style -->
+    <style name="KeepassDXStyle.Toolbar.Bottom" parent="Widget.MaterialComponents.BottomAppBar">
+        <item name="titleTextAppearance">@style/KeepassDXStyle.Toolbar.Title</item>
+        <item name="subtitleTextAppearance">@style/KeepassDXStyle.Toolbar.Subtitle</item>
+        <item name="android:textColorSecondary">@color/colorTextInverse</item>
+        <item name="backgroundTint">?attr/colorAccent</item>
+        <item name="android:background">?attr/colorAccent</item>
+        <item name="background">?attr/colorAccent</item>
+    </style>
+
     <!-- Special Toolbar Light Style -->
     <style name="KeepassDXStyle.Toolbar.Special.Light" parent="KeepassDXStyle.Toolbar.Light">
         <item name="android:background">@color/green_dark</item>