diff --git a/app/src/main/res/values/style_blue.xml b/app/src/main/res/values/style_blue.xml
index ce6288b9e..32b3a8b35 100644
--- a/app/src/main/res/values/style_blue.xml
+++ b/app/src/main/res/values/style_blue.xml
@@ -31,6 +31,7 @@
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
         <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue</item>
         <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
+        <item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Blue</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
     </style>
@@ -45,14 +46,22 @@
         <item name="android:tint">@color/colorTextInverse</item>
     </style>
     <!-- Toolbar Home Blue -->
-    <style name="KeepassDXStyle.Toolbar.Home.Blue" parent="KeepassDXStyle.Blue">
+    <style name="KeepassDXStyle.Toolbar.Home.Blue" parent="KeepassDXStyle.Toolbar.Blue">
         <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
     </style>
     <!-- Special Toolbar Blue -->
     <style name="KeepassDXStyle.Toolbar.Special.Blue" parent="KeepassDXStyle.Toolbar.Blue">
-        <item name="actionMenuTextColor">@color/colorTextInverse</item>
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Blue</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Special.Blue" parent="KeepassDXStyle.Toolbar.Widget.Special">
         <item name="android:background">@color/blue_dark</item>
-        <item name="background">@color/blue_dark</item>
+    </style>
+    <!-- Action Toolbar Blue -->
+    <style name="KeepassDXStyle.Toolbar.Action.Blue" parent="KeepassDXStyle.Toolbar.Blue">
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Blue</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Action.Blue" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/blue</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog">
diff --git a/app/src/main/res/values/style_blue_night.xml b/app/src/main/res/values/style_blue_night.xml
index a80475ea8..852463329 100644
--- a/app/src/main/res/values/style_blue_night.xml
+++ b/app/src/main/res/values/style_blue_night.xml
@@ -31,9 +31,9 @@
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue.Night</item>
         <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue.Night</item>
         <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue.Night</item>
+        <item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Blue.Night</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
-        <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Blue.Night</item>
     </style>
     <!-- Toolbar Style Blue -->
     <style name="KeepassDXStyle.Toolbar.Blue.Night" parent="KeepassDXStyle.Blue.Night">
@@ -46,19 +46,22 @@
         <item name="android:tint">@color/colorTextInverse</item>
     </style>
     <!-- Toolbar Home Blue -->
-    <style name="KeepassDXStyle.Toolbar.Home.Blue.Night" parent="KeepassDXStyle.Blue.Night">
+    <style name="KeepassDXStyle.Toolbar.Home.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
         <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
     </style>
     <!-- Special Toolbar Blue -->
     <style name="KeepassDXStyle.Toolbar.Special.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
-        <item name="actionMenuTextColor">@color/colorTextInverse</item>
-        <item name="android:background">@color/blue_dark</item>
-        <item name="background">@color/blue_dark</item>
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Blue.Night</item>
     </style>
-    <!-- Contextual Action Bar Blue -->
-    <style name="KeepassDXStyle.ActionMode.Blue.Night" parent="@style/Widget.AppCompat.ActionMode">
+    <style name="KeepassDXStyle.Toolbar.Widget.Special.Blue.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
         <item name="android:background">@color/blue_dark</item>
-        <item name="background">@color/blue_dark</item>
+    </style>
+    <!-- Action Toolbar Blue -->
+    <style name="KeepassDXStyle.Toolbar.Action.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Blue.Night</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Action.Blue.Night" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/blue</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
diff --git a/app/src/main/res/values/style_clear.xml b/app/src/main/res/values/style_clear.xml
index 707ce6dea..59d06c8ef 100644
--- a/app/src/main/res/values/style_clear.xml
+++ b/app/src/main/res/values/style_clear.xml
@@ -33,7 +33,6 @@
         <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Clear</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
-        <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Clear</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Clear</item>
         <item name="cardBackgroundTransparentColor">@color/white_transparent</item>
     </style>
@@ -53,11 +52,6 @@
         <item name="android:background">@color/white</item>
         <item name="background">@color/white</item>
     </style>
-    <!-- Contextual Action Bar Clear -->
-    <style name="KeepassDXStyle.ActionMode.Clear" parent="@style/Widget.AppCompat.ActionMode">
-        <item name="android:background">@color/white</item>
-        <item name="background">@color/white</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog">
         <item name="colorAccent">#fefefe</item>
diff --git a/app/src/main/res/values/style_red.xml b/app/src/main/res/values/style_red.xml
index ec7904342..bdc46dda8 100644
--- a/app/src/main/res/values/style_red.xml
+++ b/app/src/main/res/values/style_red.xml
@@ -27,10 +27,11 @@
         <item name="colorControlActivated">@color/orange</item>
         <item name="android:textColorPrimary">@color/red</item>
         <item name="android:textColorHintInverse">@color/red_lighter</item>
-        <item name="android:windowBackground">@color/background_night</item>
+        <item name="android:windowBackground">@color/background_light</item>
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
         <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red</item>
         <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Red</item>
+        <item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Red</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
     </style>
@@ -45,14 +46,22 @@
         <item name="android:tint">@color/colorTextInverse</item>
     </style>
     <!-- Toolbar Home Red -->
-    <style name="KeepassDXStyle.Toolbar.Home.Red" parent="KeepassDXStyle.Red">
+    <style name="KeepassDXStyle.Toolbar.Home.Red" parent="KeepassDXStyle.Toolbar.Red">
         <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
     </style>
     <!-- Special Toolbar Red -->
     <style name="KeepassDXStyle.Toolbar.Special.Red" parent="KeepassDXStyle.Toolbar.Red">
-        <item name="actionMenuTextColor">@color/colorTextInverse</item>
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Red</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Special.Red" parent="KeepassDXStyle.Toolbar.Widget.Special">
         <item name="android:background">@color/red_dark</item>
-        <item name="background">@color/red_dark</item>
+    </style>
+    <!-- Action Toolbar Red -->
+    <style name="KeepassDXStyle.Toolbar.Action.Red" parent="KeepassDXStyle.Toolbar.Red">
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Red</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Action.Red" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/red</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Light.Dialog">
diff --git a/app/src/main/res/values/style_red_night.xml b/app/src/main/res/values/style_red_night.xml
index ace500866..5a993e5eb 100644
--- a/app/src/main/res/values/style_red_night.xml
+++ b/app/src/main/res/values/style_red_night.xml
@@ -31,9 +31,9 @@
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red.Night</item>
         <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red.Night</item>
         <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Red.Night</item>
+        <item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Red.Night</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
-        <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Red.Night</item>
     </style>
     <!-- Toolbar Style Red -->
     <style name="KeepassDXStyle.Toolbar.Red.Night" parent="KeepassDXStyle.Red.Night">
@@ -46,18 +46,22 @@
         <item name="android:tint">@color/colorTextInverse</item>
     </style>
     <!-- Toolbar Home Red -->
-    <style name="KeepassDXStyle.Toolbar.Home.Red.Night" parent="KeepassDXStyle.Red.Night">
+    <style name="KeepassDXStyle.Toolbar.Home.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night">
         <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
     </style>
     <!-- Special Toolbar Red -->
     <style name="KeepassDXStyle.Toolbar.Special.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night">
-        <item name="android:background">@color/red_dark</item>
-        <item name="background">@color/red_dark</item>
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Red.Night</item>
     </style>
-    <!-- Contextual Action Bar Red -->
-    <style name="KeepassDXStyle.ActionMode.Red.Night" parent="@style/Widget.AppCompat.ActionMode">
-        <item name="android:background">@color/orange</item>
-        <item name="background">@color/orange</item>
+    <style name="KeepassDXStyle.Toolbar.Widget.Special.Red.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
+        <item name="android:background">@color/red_dark</item>
+    </style>
+    <!-- Action Toolbar Red -->
+    <style name="KeepassDXStyle.Toolbar.Action.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night">
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Red.Night</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Action.Red.Night" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/red</item>
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Red.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
diff --git a/app/src/main/res/values/style_white.xml b/app/src/main/res/values/style_white.xml
index be07e30b4..1f29c4aa4 100644
--- a/app/src/main/res/values/style_white.xml
+++ b/app/src/main/res/values/style_white.xml
@@ -35,7 +35,6 @@
         <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.White</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
-        <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.White</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.White</item>
         <item name="cardBackgroundTransparentColor">@color/white_transparent</item>
 
@@ -71,11 +70,6 @@
         <item name="android:background">@color/white</item>
         <item name="background">@color/white</item>
     </style>
-    <!-- Contextual Action Bar Dark -->
-    <style name="KeepassDXStyle.ActionMode.White" parent="@style/Widget.AppCompat.ActionMode">
-        <item name="android:background">@color/white</item>
-        <item name="background">@color/white</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog">
         <item name="colorAccent">@color/orange_dark</item>