diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
index 840496b44..ea9115a73 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
@@ -428,16 +428,6 @@ class NodesAdapter (
                     if (entry.containsAttachment()) View.VISIBLE else View.GONE
 
             // Assign colors
-            val backgroundColor = if (mShowEntryColors) entry.backgroundColor else null
-            if (!holder.container.isSelected) {
-                if (backgroundColor != null) {
-                    holder.container.setBackgroundColor(backgroundColor)
-                } else {
-                    holder.container.setBackgroundColor(Color.TRANSPARENT)
-                }
-            } else {
-                holder.container.setBackgroundColor(mColorSecondary)
-            }
             val foregroundColor = if (mShowEntryColors) entry.foregroundColor else null
             if (!holder.container.isSelected) {
                 if (foregroundColor != null) {
diff --git a/app/src/main/res/color/text_color_light.xml b/app/src/main/res/color/text_color_light.xml
index 83fbc9bbf..e8c759b37 100644
--- a/app/src/main/res/color/text_color_light.xml
+++ b/app/src/main/res/color/text_color_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:state_enabled="false" android:color="@color/white_grey_dark"/>
-    <item android:color="@color/grey_light"/>
+    <item android:color="?attr/colorOnSurface"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_night.xml b/app/src/main/res/color/text_color_night.xml
index b452f1fa0..fff825c9e 100644
--- a/app/src/main/res/color/text_color_night.xml
+++ b/app/src/main/res/color/text_color_night.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:state_enabled="false" android:color="@color/grey"/>
-    <item android:color="@color/white"/>
+    <item android:color="?attr/colorOnSurface"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/background_item_selection.xml b/app/src/main/res/drawable-v21/background_item_selection.xml
index e4690915a..146040bcf 100644
--- a/app/src/main/res/drawable-v21/background_item_selection.xml
+++ b/app/src/main/res/drawable-v21/background_item_selection.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true">
-        <shape>
-            <solid android:color="?attr/colorSecondary"/>
-        </shape>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:color="?android:attr/colorControlHighlight"
+    tools:targetApi="lollipop">
+    <item>
+        <selector>
+            <item android:state_selected="true">
+                <shape>
+                    <corners android:radius="25dp" />
+                    <solid android:color="?attr/colorSecondaryContainer"/>
+                </shape>
+            </item>
+            <item android:state_selected="false">
+                <shape>
+                    <corners android:radius="25dp" />
+                    <solid android:color="?attr/colorSurfaceContainer"/>
+                </shape>
+            </item>
+        </selector>
     </item>
-    <item android:state_selected="false">
-        <shape>
-            <solid android:color="@color/transparent"/>
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_item_selection.xml b/app/src/main/res/drawable/background_item_selection.xml
index eb60a1034..787e7c42e 100644
--- a/app/src/main/res/drawable/background_item_selection.xml
+++ b/app/src/main/res/drawable/background_item_selection.xml
@@ -2,11 +2,13 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <shape>
+            <corners android:radius="25dp" />
             <solid android:color="@color/white_grey_darker"/>
         </shape>
     </item>
     <item android:state_selected="false">
         <shape>
+            <corners android:radius="25dp" />
             <solid android:color="@color/transparent"/>
         </shape>
     </item>
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 639bf826e..7e65b045e 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -137,6 +137,7 @@
                     android:id="@+id/nodes_list_fragment_container"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:paddingTop="@dimen/selectable_margin_vertical"
                     android:background="?android:attr/windowBackground" />
             </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_main_credential.xml b/app/src/main/res/layout/activity_main_credential.xml
index 00fff407d..da9309d59 100644
--- a/app/src/main/res/layout/activity_main_credential.xml
+++ b/app/src/main/res/layout/activity_main_credential.xml
@@ -120,7 +120,7 @@
                     <com.google.android.material.card.MaterialCardView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        style="@style/KeepassDXStyle.Cardview.SurfaceContainer.High"
+                        style="@style/KeepassDXStyle.Cardview.SurfaceContainer"
                         android:layout_margin="16dp">
                         <com.kunzisoft.keepass.view.MainCredentialView
                             android:id="@+id/activity_password_credentials"
diff --git a/app/src/main/res/layout/fragment_group.xml b/app/src/main/res/layout/fragment_group.xml
index 6865057fd..bd0b607e0 100644
--- a/app/src/main/res/layout/fragment_group.xml
+++ b/app/src/main/res/layout/fragment_group.xml
@@ -32,7 +32,7 @@
 		<FrameLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:background="?attr/colorPrimary">
+			android:background="?attr/colorSurface">
 			<LinearLayout
 				android:id="@+id/title_block"
 				android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_nodes.xml b/app/src/main/res/layout/fragment_nodes.xml
index 117aba30d..a23e6c4f8 100644
--- a/app/src/main/res/layout/fragment_nodes.xml
+++ b/app/src/main/res/layout/fragment_nodes.xml
@@ -29,7 +29,6 @@
         android:scrollbarStyle="insideOverlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?android:attr/windowBackground"
         android:paddingBottom="?attr/actionBarSize"
         android:clipToPadding="false" />
     <LinearLayout
diff --git a/app/src/main/res/layout/item_file_info.xml b/app/src/main/res/layout/item_file_info.xml
index d319d907c..36d5a5330 100644
--- a/app/src/main/res/layout/item_file_info.xml
+++ b/app/src/main/res/layout/item_file_info.xml
@@ -213,7 +213,7 @@
                     android:src="@drawable/ic_content_delete_white_24dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:tint="?attr/colorOnSecondaryContainer"
+                    app:tint="?attr/colorOnSurface"
                     style="@style/KeepassDXStyle.ImageButton.OnSurface"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/item_list_nodes_entry.xml b/app/src/main/res/layout/item_list_nodes_entry.xml
index 7bfa59ca6..6d490ce84 100644
--- a/app/src/main/res/layout/item_list_nodes_entry.xml
+++ b/app/src/main/res/layout/item_list_nodes_entry.xml
@@ -24,15 +24,16 @@
     android:id="@+id/node_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    style="@style/KeepassDXStyle.Selectable.Item">
+    android:paddingVertical="@dimen/selectable_margin_vertical"
+    android:paddingHorizontal="@dimen/selectable_margin_horizontal">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
-        android:background="?android:attr/selectableItemBackground"
-        android:minHeight="48dp"
+        android:minHeight="@dimen/selectable_min_height"
+        style="@style/KeepassDXStyle.Selectable.Item"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -179,15 +180,5 @@
 
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="72dp"
-            android:layout_marginLeft="72dp"
-            android:layout_marginEnd="48dp"
-            android:layout_marginRight="48dp"
-            android:background="?android:attr/listDivider"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list_nodes_group.xml b/app/src/main/res/layout/item_list_nodes_group.xml
index e0a77bdf8..1ef6bde5f 100644
--- a/app/src/main/res/layout/item_list_nodes_group.xml
+++ b/app/src/main/res/layout/item_list_nodes_group.xml
@@ -24,19 +24,20 @@
     android:id="@+id/node_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    style="@style/KeepassDXStyle.Selectable.Item">
+    android:paddingVertical="@dimen/selectable_margin_vertical"
+    android:paddingHorizontal="@dimen/selectable_margin_horizontal">
 
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
-        android:minHeight="48dp"
+        android:minHeight="@dimen/selectable_min_height"
+        style="@style/KeepassDXStyle.Selectable.Item"
         app:layout_constraintWidth_percent="@dimen/content_percent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:background="?android:attr/selectableItemBackground" >
+        app:layout_constraintEnd_toEndOf="parent" >
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/node_icon"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bdc6eec81..6f6c4c911 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -142,10 +142,10 @@
     <color name="md_theme_light_errorContainer">#FFDAD6</color>
     <color name="md_theme_light_onError">#FFFFFF</color>
     <color name="md_theme_light_onErrorContainer">#410002</color>
-    <color name="md_theme_light_background">#FCFDF6</color>
+    <color name="md_theme_light_background">#F7FDF6</color>
     <color name="md_theme_light_onBackground">#1A1C19</color>
     <color name="md_theme_light_surface">#FCFDF6</color>
-    <color name="md_theme_light_onSurface">#1A1C19</color>
+    <color name="md_theme_light_onSurface">#3C423A</color>
     <color name="md_theme_light_surfaceVariant">#DEE5D8</color>
     <color name="md_theme_light_onSurfaceVariant">#424940</color>
     <color name="md_theme_light_outline">#72796F</color>
@@ -156,6 +156,7 @@
     <color name="md_theme_light_surfaceTint">#006E1C</color>
     <color name="md_theme_light_outlineVariant">#C2C9BD</color>
     <color name="md_theme_light_scrim">#000000</color>
+
     <color name="md_theme_dark_primary">#7DDC7A</color>
     <color name="md_theme_dark_onPrimary">#00390A</color>
     <color name="md_theme_dark_primaryContainer">#005313</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e991b4113..0e6f2a7e7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,7 +24,10 @@
     <dimen name="image_list_margin_horizontal">8dp</dimen>
     <dimen name="image_list_margin_vertical_back">15dp</dimen>
     <dimen name="image_preview_height">144dp</dimen>
-    <dimen name="button_margin">6dp</dimen>
+    <dimen name="button_margin">8dp</dimen>
+    <dimen name="selectable_margin_vertical">4dp</dimen>
+    <dimen name="selectable_margin_horizontal">8dp</dimen>
+    <dimen name="selectable_min_height">48dp</dimen>
     <dimen name="button_small_size">48dp</dimen>
     <dimen name="card_view_margin_horizontal">10dp</dimen>
     <dimen name="card_view_margin_vertical">5dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d59fa5e2b..97eceb984 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -37,13 +37,13 @@
 
         <item name="colorPrimary">@color/green</item>
         <item name="colorPrimaryDark">?attr/colorSurface</item>
-        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorPrimaryContainer">@color/green</item>
+        <item name="colorOnPrimaryContainer">@color/white</item>
         <item name="colorSecondary">@color/orange</item>
-        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
+        <item name="colorOnSecondary">@color/green_black_light</item>
+        <item name="colorSecondaryContainer">@color/orange</item>
+        <item name="colorOnSecondaryContainer">@color/green_black_light</item>
         <item name="colorTertiary">@color/md_theme_light_tertiary</item>
         <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
         <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
@@ -56,11 +56,11 @@
         <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
         <item name="colorSurface">@color/md_theme_light_surface</item>
         <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
-        <item name="colorSurfaceContainerLowest">#F7FAF6</item>
-        <item name="colorSurfaceContainerLow">#F0F8EF</item>
-        <item name="colorSurfaceContainer">#F1FBEF</item>
-        <item name="colorSurfaceContainerHigh">#E5F8E2</item>
-        <item name="colorSurfaceContainerHighest">#E0FADC</item>
+        <item name="colorSurfaceContainerLowest">#F2F6F1</item>
+        <item name="colorSurfaceContainerLow">#F2F8F1</item>
+        <item name="colorSurfaceContainer">#f2f8ed</item>
+        <item name="colorSurfaceContainerHigh">#EFF8E8</item>
+        <item name="colorSurfaceContainerHighest">#E9F4E0</item>
         <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
         <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
         <item name="colorOutline">@color/md_theme_light_outline</item>
@@ -71,7 +71,7 @@
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:fitsSystemWindows">false</item>
-        <item name="android:windowBackground">?attr/colorSurfaceContainerLowest</item>
+        <item name="android:windowBackground">#F9FBF8</item>
 
         <item name="android:imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
         <item name="imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
@@ -143,27 +143,52 @@
     <style name="KeepassDXStyle.Night.v14" parent="KeepassDXStyle.Night.Base" />
     <style name="KeepassDXStyle.Night.Base" parent="Theme.Material3.Dark">
 
+        <item name="colorPrimary">@color/green</item>
+        <item name="colorPrimaryDark">?attr/colorSurface</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorPrimaryContainer">@color/green</item>
+        <item name="colorOnPrimaryContainer">@color/white</item>
+        <item name="colorSecondary">@color/orange</item>
+        <item name="colorOnSecondary">@color/green_black_light</item>
+        <item name="colorSecondaryContainer">@color/orange</item>
+        <item name="colorOnSecondaryContainer">@color/green_black_light</item>
+        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
+        <item name="colorSurface">#1A251C</item>
+        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
+        <item name="colorSurfaceContainerLowest">#27332A</item>
+        <item name="colorSurfaceContainerLow">#223025</item>
+        <item name="colorSurfaceContainer">#212f24</item>
+        <item name="colorSurfaceContainerHigh">#1D2C21</item>
+        <item name="colorSurfaceContainerHighest">#1B2B1E</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
+        <item name="android:fitsSystemWindows">false</item>
+        <item name="android:windowBackground">?attr/colorSurfaceContainerHighest</item>
 
         <item name="android:imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
         <item name="imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
 
         <item name="android:checkboxStyle">@style/KeepassDXStyle.CheckBox</item>
 
-        <item name="colorPrimary">@color/green</item>
-        <item name="colorPrimaryDark">@color/green_dark</item>
-        <item name="colorPrimaryContainer">@color/green</item>
-
-        <item name="colorSecondary">@color/orange</item>
-        <item name="colorTertiary">@color/green_black_light</item>
-
-        <item name="colorSurface">@color/green_black</item>
-
         <item name="android:textAppearance">@style/KeepassDXStyle.TextAppearance</item>
         <item name="android:textAppearanceMedium">@style/KeepassDXStyle.TextAppearance</item>
 
-        <item name="android:windowBackground">@color/green_black</item>
         <item name="cardBackgroundTransparentColor">@color/grey_dark_transparent</item>
 
         <item name="android:textColor">@color/text_color_night</item>
@@ -355,6 +380,9 @@
         <item name="cardCornerRadius">@dimen/small_card_radius</item>
         <item name="cardBackgroundColor">?attr/colorSurfaceContainer</item>
     </style>
+    <style name="KeepassDXStyle.Cardview.SurfaceContainer" parent="KeepassDXStyle.Cardview">
+        <item name="cardBackgroundColor">?attr/colorSurfaceContainer</item>
+    </style>
     <style name="KeepassDXStyle.Cardview.SurfaceContainer.High" parent="KeepassDXStyle.Cardview">
         <item name="cardBackgroundColor">?attr/colorSurfaceContainerHigh</item>
     </style>
diff --git a/app/src/main/res/values/styles_classic.xml b/app/src/main/res/values/styles_classic.xml
index 13b52253f..528ad52e4 100644
--- a/app/src/main/res/values/styles_classic.xml
+++ b/app/src/main/res/values/styles_classic.xml
@@ -37,10 +37,7 @@
         <item name="android:textColorPrimary">@color/cyan_lightest</item>
         <item name="android:textColorHintInverse">@color/cyan_lightest</item>
         <item name="android:windowBackground">@color/white_darkest</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Clear</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Clear</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Clear</item>
-        <item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Clear</item>
+
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Clear</item>
@@ -60,28 +57,6 @@
         <item name="chipFilterBackgroundColor">@color/white_darkest</item>
         <item name="chipFilterBackgroundColorDisabled">@color/white_grey_lighter</item>
     </style>
-    <!-- Toolbar Style Clear -->
-    <style name="KeepassDXStyle.Toolbar.Clear" parent="KeepassDXStyle.Clear">
-        <item name="colorControlNormal">@color/grey_light</item>
-        <item name="android:textColorPrimary">@color/grey_light</item>
-        <item name="android:textColorSecondary">@color/grey_lighter</item>
-        <item name="android:tint">@color/grey_light</item>
-    </style>
-    <!-- Toolbar Popup menu -->
-    <style name="KeepassDXStyle.Toolbar.Popup.Clear" parent="KeepassDXStyle.Toolbar.Clear">
-        <item name="android:colorBackground">@color/white_grey_lighter</item>
-    </style>
-    <!-- Special Toolbar Clear -->
-    <style name="KeepassDXStyle.Toolbar.Special.Clear" parent="KeepassDXStyle.Toolbar.Clear">
-        <item name="android:background">@color/white_grey_lighter</item>
-    </style>
-    <!-- Action Toolbar Clear -->
-    <style name="KeepassDXStyle.Toolbar.Action.Clear" parent="KeepassDXStyle.Toolbar.Clear">
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Clear</item>
-    </style>
-    <style name="KeepassDXStyle.Toolbar.Widget.Action.Clear" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/white_grey_lighter</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog">
         <item name="colorSecondary">@color/cyan_lighter</item>
@@ -115,9 +90,6 @@
         <item name="android:textColorHintInverse">@color/cyan_lightest</item>
         <item name="android:textColorSecondaryInverse">@color/white_dark</item>
         <item name="android:windowBackground">@color/black</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Dark</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Dark</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Dark</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Dark</item>
@@ -129,24 +101,6 @@
         <item name="chipFilterBackgroundColor">@color/black_lighter</item>
         <item name="chipFilterBackgroundColorDisabled">@color/grey_darker</item>
     </style>
-    <!-- Toolbar Style Dark -->
-    <style name="KeepassDXStyle.Toolbar.Dark" parent="KeepassDXStyle.Dark">
-        <item name="colorControlNormal">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/grey_lighter</item>
-        <item name="android:tint">@color/white</item>
-    </style>
-    <!-- Special Toolbar Dark -->
-    <style name="KeepassDXStyle.Toolbar.Special.Dark" parent="KeepassDXStyle.Toolbar.Dark">
-        <item name="android:background">@color/black_light</item>
-    </style>
-    <!-- Action Toolbar Dark -->
-    <style name="KeepassDXStyle.Toolbar.Action.Dark" parent="KeepassDXStyle.Toolbar.Dark">
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Dark</item>
-    </style>
-    <style name="KeepassDXStyle.Toolbar.Widget.Action.Dark" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/grey_darker</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
         <item name="colorSecondary">@color/cyan_lighter</item>
diff --git a/app/src/main/res/values/styles_divine.xml b/app/src/main/res/values/styles_divine.xml
index b35efdef1..74d3b2a97 100644
--- a/app/src/main/res/values/styles_divine.xml
+++ b/app/src/main/res/values/styles_divine.xml
@@ -103,15 +103,6 @@
         <item name="chipFilterBackgroundColor">@color/grey_darker</item>
         <item name="chipFilterBackgroundColorDisabled">@color/black_light</item>
     </style>
-    <!-- Toolbar Style Black -->
-    <style name="KeepassDXStyle.Toolbar.Black" parent="KeepassDXStyle.Black">
-        <item name="colorControlNormal">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/grey_lighter</item>
-        <item name="android:editTextColor">@color/white</item>
-        <item name="android:textColorHint">@color/white</item>
-        <item name="android:tint">@color/white</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Black.Dialog" parent="KeepassDXStyle.Night.Dialog">
         <item name="colorSecondary">@color/orange_darker</item>
diff --git a/app/src/main/res/values/styles_kunzite.xml b/app/src/main/res/values/styles_kunzite.xml
index 72b537e7c..0ec038a8d 100644
--- a/app/src/main/res/values/styles_kunzite.xml
+++ b/app/src/main/res/values/styles_kunzite.xml
@@ -35,10 +35,6 @@
         <item name="android:textColorHintInverse">@color/purple_lighter</item>
         <item name="android:textColorSecondaryInverse">@color/purple_lighter</item>
         <item name="android:windowBackground">@color/white_purple</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Purple</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Purple</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Purple</item>
-        <item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Purple</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple</item>
@@ -50,31 +46,6 @@
         <item name="chipFilterBackgroundColor">@color/purple_light</item>
         <item name="chipFilterBackgroundColorDisabled">@color/purple</item>
     </style>
-    <!-- Toolbar Style Purple -->
-    <style name="KeepassDXStyle.Toolbar.Purple" parent="KeepassDXStyle.Purple">
-        <item name="colorControlActivated">@color/purple_lighter</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-        <item name="android:editTextColor">@color/white</item>
-        <item name="android:textColorHint">@color/purple_lighter</item>
-        <item name="android:tint">@color/white</item>
-    </style>
-    <!-- Toolbar Popup menu -->
-    <style name="KeepassDXStyle.Toolbar.Popup.Purple" parent="KeepassDXStyle.Toolbar.Purple">
-        <item name="android:colorBackground">@color/white_purple</item>
-    </style>
-    <!-- Special Toolbar Purple -->
-    <style name="KeepassDXStyle.Toolbar.Special.Purple" parent="KeepassDXStyle.Toolbar.Purple">
-        <item name="android:background">@color/purple_dark</item>
-    </style>
-    <!-- Action Toolbar Purple -->
-    <style name="KeepassDXStyle.Toolbar.Action.Purple" parent="KeepassDXStyle.Toolbar.Purple">
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Purple</item>
-    </style>
-    <style name="KeepassDXStyle.Toolbar.Widget.Action.Purple" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/purple</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Purple.Dialog" parent="KeepassDXStyle.Light.Dialog">
         <item name="colorSecondary">@color/red</item>
@@ -109,10 +80,6 @@
         <item name="android:textColorHintInverse">@color/purple_lighter</item>
         <item name="android:textColorSecondaryInverse">@color/purple_lighter</item>
         <item name="android:windowBackground">@color/black_purple_dark</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Purple.Dark</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Purple.Dark</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Purple.Dark</item>
-        <item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Purple.Dark</item>
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dark.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple.Dark</item>
@@ -124,31 +91,6 @@
         <item name="chipFilterBackgroundColor">@color/purple_dark</item>
         <item name="chipFilterBackgroundColorDisabled">@color/purple_darker</item>
     </style>
-    <!-- Toolbar Style Purple -->
-    <style name="KeepassDXStyle.Toolbar.Purple.Dark" parent="KeepassDXStyle.Purple.Dark">
-        <item name="colorControlActivated">@color/purple_lighter</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-        <item name="android:editTextColor">@color/white</item>
-        <item name="android:textColorHint">@color/purple_lighter</item>
-        <item name="android:tint">@color/white</item>
-    </style>
-    <!-- Toolbar Popup menu -->
-    <style name="KeepassDXStyle.Toolbar.Popup.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
-        <item name="android:colorBackground">@color/black_purple</item>
-    </style>
-    <!-- Special Toolbar Purple -->
-    <style name="KeepassDXStyle.Toolbar.Special.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
-        <item name="android:background">@color/black_purple</item>
-    </style>
-    <!-- Action Toolbar Purple -->
-    <style name="KeepassDXStyle.Toolbar.Action.Purple.Dark" parent="KeepassDXStyle.Toolbar.Purple.Dark">
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Purple.Dark</item>
-    </style>
-    <style name="KeepassDXStyle.Toolbar.Widget.Action.Purple.Dark" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/purple_darker</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Purple.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">
         <item name="colorSecondary">@color/red</item>
diff --git a/app/src/main/res/values/styles_moon.xml b/app/src/main/res/values/styles_moon.xml
index cb2bbebdb..6ed3db322 100644
--- a/app/src/main/res/values/styles_moon.xml
+++ b/app/src/main/res/values/styles_moon.xml
@@ -35,9 +35,7 @@
         <item name="android:textColorHintInverse">@color/blue_white_dark</item>
         <item name="android:textColorSecondaryInverse">@color/blue_white_dark</item>
         <item name="android:windowBackground">@color/blue_white</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Blue</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Blue</item>
+
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Blue</item>
@@ -48,27 +46,6 @@
         <item name="chipFilterBackgroundColor">@color/blue_light</item>
         <item name="chipFilterBackgroundColorDisabled">@color/blue</item>
     </style>
-    <!-- Toolbar Style Blue -->
-    <style name="KeepassDXStyle.Toolbar.Blue" parent="KeepassDXStyle.Blue">
-        <item name="colorControlActivated">@color/blue_white_dark</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-        <item name="android:editTextColor">@color/white</item>
-        <item name="android:textColorHint">@color/blue_white_dark</item>
-        <item name="android:tint">@color/white</item>
-    </style>
-    <!-- Special Toolbar Blue -->
-    <style name="KeepassDXStyle.Toolbar.Special.Blue" parent="KeepassDXStyle.Toolbar.Blue">
-        <item name="android: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">
         <item name="colorSecondary">@color/blue_white_dark</item>
@@ -100,9 +77,7 @@
         <item name="android:textColorHintInverse">@color/blue_white_dark</item>
         <item name="android:textColorSecondaryInverse">@color/blue_white_dark</item>
         <item name="android:windowBackground">@color/blue_black_dark</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Blue.Night</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Blue.Night</item>
-        <item name="toolbarActionStyle">@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="cardViewStyle">@style/KeepassDXStyle.Cardview.Blue.Night</item>
@@ -113,27 +88,6 @@
         <item name="chipFilterBackgroundColor">@color/blue_light</item>
         <item name="chipFilterBackgroundColorDisabled">@color/blue</item>
     </style>
-    <!-- Toolbar Style Blue -->
-    <style name="KeepassDXStyle.Toolbar.Blue.Night" parent="KeepassDXStyle.Blue.Night">
-        <item name="colorControlActivated">@color/blue_white_dark</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-        <item name="android:editTextColor">@color/white</item>
-        <item name="android:textColorHint">@color/blue_white_dark</item>
-        <item name="android:tint">@color/white</item>
-    </style>
-    <!-- Special Toolbar Blue -->
-    <style name="KeepassDXStyle.Toolbar.Special.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
-        <item name="android: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">
         <item name="colorSecondary">@color/blue_white_dark</item>
diff --git a/app/src/main/res/values/styles_reply.xml b/app/src/main/res/values/styles_reply.xml
index 45baa00f2..89c4fadd6 100644
--- a/app/src/main/res/values/styles_reply.xml
+++ b/app/src/main/res/values/styles_reply.xml
@@ -35,10 +35,7 @@
         <item name="android:textColorHintInverse">@color/reply_orange</item>
         <item name="android:textColorSecondaryInverse">@color/reply_orange</item>
         <item name="android:windowBackground">@color/reply_blue_lighter</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Reply</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Reply</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Reply</item>
-        <item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Reply</item>
+
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Reply.Light</item>
@@ -49,31 +46,6 @@
         <item name="chipFilterBackgroundColor">@color/reply_orange</item>
         <item name="chipFilterBackgroundColorDisabled">@color/reply_blue_light</item>
     </style>
-    <!-- Toolbar Style Reply -->
-    <style name="KeepassDXStyle.Toolbar.Reply" parent="KeepassDXStyle.Reply">
-        <item name="colorControlActivated">@color/reply_blue_light</item>
-        <item name="colorControlNormal">@color/reply_blue_lighter</item>
-        <item name="android:textColorPrimary">@color/reply_blue_light</item>
-        <item name="android:textColorSecondary">@color/reply_orange_light</item>
-        <item name="android:editTextColor">@color/reply_blue_light</item>
-        <item name="android:textColorHint">@color/reply_orange_light</item>
-        <item name="android:tint">@color/reply_blue_light</item>
-    </style>
-    <!-- Toolbar Popup menu -->
-    <style name="KeepassDXStyle.Toolbar.Popup.Reply" parent="KeepassDXStyle.Toolbar.Reply">
-        <item name="android:colorBackground">@color/reply_blue_lighter</item>
-    </style>
-    <!-- Special Toolbar Reply -->
-    <style name="KeepassDXStyle.Toolbar.Special.Reply" parent="KeepassDXStyle.Toolbar.Reply">
-        <item name="android:background">@color/reply_blue_dark</item>
-    </style>
-    <!-- Action Toolbar Reply -->
-    <style name="KeepassDXStyle.Toolbar.Action.Reply" parent="KeepassDXStyle.Toolbar.Reply">
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Reply</item>
-    </style>
-    <style name="KeepassDXStyle.Toolbar.Widget.Action.Reply" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/reply_blue_dark</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Reply.Dialog" parent="KeepassDXStyle.Light.Dialog">
         <item name="colorSecondary">@color/reply_orange</item>
@@ -109,10 +81,7 @@
         <item name="android:textColorHintInverse">@color/reply_blue_light</item>
         <item name="android:textColorSecondaryInverse">@color/reply_blue_light</item>
         <item name="android:windowBackground">@color/reply_black</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Reply.Night</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Reply.Night</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Reply.Night</item>
-        <item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Reply.Night</item>
+
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Reply.Night</item>
@@ -124,31 +93,6 @@
         <item name="chipFilterBackgroundColor">@color/reply_orange</item>
         <item name="chipFilterBackgroundColorDisabled">@color/reply_blue_light</item>
     </style>
-    <!-- Toolbar Style Reply -->
-    <style name="KeepassDXStyle.Toolbar.Reply.Night" parent="KeepassDXStyle.Reply.Night">
-        <item name="colorControlActivated">@color/reply_blue_light</item>
-        <item name="colorControlNormal">@color/reply_blue_lighter</item>
-        <item name="android:textColorPrimary">@color/reply_blue_light</item>
-        <item name="android:textColorSecondary">@color/reply_orange_light</item>
-        <item name="android:editTextColor">@color/reply_blue_light</item>
-        <item name="android:textColorHint">@color/reply_orange_light</item>
-        <item name="android:tint">@color/reply_blue_light</item>
-    </style>
-    <!-- Toolbar Popup menu -->
-    <style name="KeepassDXStyle.Toolbar.Popup.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
-        <item name="android:colorBackground">@color/reply_black</item>
-    </style>
-    <!-- Special Toolbar Reply -->
-    <style name="KeepassDXStyle.Toolbar.Special.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
-        <item name="android:background">@color/reply_black</item>
-    </style>
-    <!-- Action Toolbar Reply -->
-    <style name="KeepassDXStyle.Toolbar.Action.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Reply.Night</item>
-    </style>
-    <style name="KeepassDXStyle.Toolbar.Widget.Action.Reply.Night" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/reply_blue_dark</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Reply.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
         <item name="colorSecondary">@color/reply_blue_lighter</item>
diff --git a/app/src/main/res/values/styles_simple.xml b/app/src/main/res/values/styles_simple.xml
index dff9ecaa9..e9cd73644 100644
--- a/app/src/main/res/values/styles_simple.xml
+++ b/app/src/main/res/values/styles_simple.xml
@@ -37,10 +37,7 @@
         <item name="android:textColorPrimary">@color/grey</item>
         <item name="android:textColorHintInverse">@color/grey</item>
         <item name="android:windowBackground">@color/white_slight</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Simple</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Simple</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Simple</item>
-        <item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Simple</item>
+
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Simple</item>
@@ -60,28 +57,6 @@
         <item name="chipFilterBackgroundColor">@color/blue_white</item>
         <item name="chipFilterBackgroundColorDisabled">@color/white_dark</item>
     </style>
-    <!-- Toolbar Style Simple -->
-    <style name="KeepassDXStyle.Toolbar.Simple" parent="KeepassDXStyle.Simple">
-        <item name="colorControlNormal">@color/grey_light</item>
-        <item name="android:textColorPrimary">@color/grey_light</item>
-        <item name="android:textColorSecondary">@color/grey_lighter</item>
-        <item name="android:tint">@color/grey_light</item>
-    </style>
-    <!-- Toolbar Popup menu -->
-    <style name="KeepassDXStyle.Toolbar.Popup.Simple" parent="KeepassDXStyle.Toolbar.Simple">
-        <item name="android:colorBackground">@color/white</item>
-    </style>
-    <!-- Special Toolbar Simple -->
-    <style name="KeepassDXStyle.Toolbar.Special.Simple" parent="KeepassDXStyle.Toolbar.Simple">
-        <item name="android:background">@color/white_slight</item>
-    </style>
-    <!-- Action Toolbar Simple -->
-    <style name="KeepassDXStyle.Toolbar.Action.Simple" parent="KeepassDXStyle.Toolbar.Simple">
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Simple</item>
-    </style>
-    <style name="KeepassDXStyle.Toolbar.Widget.Action.Simple" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/white_slight</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Simple.Dialog" parent="KeepassDXStyle.Light.Dialog">
         <item name="colorSecondary">@color/blue_deep</item>
@@ -115,9 +90,7 @@
         <item name="android:textColorHintInverse">@color/white</item>
         <item name="android:textColorSecondaryInverse">@color/white_dark</item>
         <item name="android:windowBackground">@color/grey_slight</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Simple.Night</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Simple.Night</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Simple.Night</item>
+
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Simple.Night</item>
@@ -129,24 +102,6 @@
         <item name="chipFilterBackgroundColor">@color/grey_black_slight</item>
         <item name="chipFilterBackgroundColorDisabled">@color/grey_darker</item>
     </style>
-    <!-- Toolbar Style Night -->
-    <style name="KeepassDXStyle.Toolbar.Simple.Night" parent="KeepassDXStyle.Simple.Night">
-        <item name="colorControlNormal">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/grey_lighter</item>
-        <item name="android:tint">@color/white</item>
-    </style>
-    <!-- Special Toolbar Night -->
-    <style name="KeepassDXStyle.Toolbar.Special.Simple.Night" parent="KeepassDXStyle.Toolbar.Simple.Night">
-        <item name="android:background">@color/grey_slight</item>
-    </style>
-    <!-- Action Toolbar Night -->
-    <style name="KeepassDXStyle.Toolbar.Action.Simple.Night" parent="KeepassDXStyle.Toolbar.Simple.Night">
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Simple.Night</item>
-    </style>
-    <style name="KeepassDXStyle.Toolbar.Widget.Action.Simple.Night" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/grey_slight</item>
-    </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Simple.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
         <item name="colorSecondary">@color/blue_slight</item>
diff --git a/app/src/main/res/values/styles_sun.xml b/app/src/main/res/values/styles_sun.xml
index 39ff8702f..db101ce86 100644
--- a/app/src/main/res/values/styles_sun.xml
+++ b/app/src/main/res/values/styles_sun.xml
@@ -35,9 +35,7 @@
         <item name="android:textColorHintInverse">@color/red_lightest</item>
         <item name="android:textColorSecondaryInverse">@color/red_lightest</item>
         <item name="android:windowBackground">@color/red_white_light</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Red</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Red</item>
-        <item name="toolbarActionStyle">@style/KeepassDXStyle.Toolbar.Action.Red</item>
+
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
         <item name="alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Red</item>
@@ -48,27 +46,6 @@
         <item name="chipFilterBackgroundColor">@color/red_lighter</item>
         <item name="chipFilterBackgroundColorDisabled">@color/red</item>
     </style>
-    <!-- Toolbar Style Red -->
-    <style name="KeepassDXStyle.Toolbar.Red" parent="KeepassDXStyle.Red">
-        <item name="colorControlActivated">@color/red_lightest</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-        <item name="android:editTextColor">@color/white</item>
-        <item name="android:textColorHint">@color/red_lightest</item>
-        <item name="android:tint">@color/white</item>
-    </style>
-    <!-- Special Toolbar Red -->
-    <style name="KeepassDXStyle.Toolbar.Special.Red" parent="KeepassDXStyle.Toolbar.Red">
-        <item name="android: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">
         <item name="colorSecondary">@color/red</item>
@@ -99,9 +76,7 @@
         <item name="android:textColorHintInverse">@color/red_lightest</item>
         <item name="android:textColorSecondaryInverse">@color/red_lightest</item>
         <item name="android:windowBackground">@color/red_black_dark</item>
-        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Red.Night</item>
-        <item name="toolbarSpecialStyle">@style/KeepassDXStyle.Toolbar.Special.Red.Night</item>
-        <item name="toolbarActionStyle">@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="cardViewStyle">@style/KeepassDXStyle.Cardview.Red.Night</item>
@@ -112,27 +87,6 @@
         <item name="chipFilterBackgroundColor">@color/red_lighter</item>
         <item name="chipFilterBackgroundColorDisabled">@color/red</item>
     </style>
-    <!-- Toolbar Style Red -->
-    <style name="KeepassDXStyle.Toolbar.Red.Night" parent="KeepassDXStyle.Red.Night">
-        <item name="colorControlActivated">@color/red_lightest</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-        <item name="android:editTextColor">@color/white</item>
-        <item name="android:textColorHint">@color/red_lightest</item>
-        <item name="android:tint">@color/white</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>
-    </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">
         <item name="colorSecondary">@color/red</item>