diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml
index 93f4eda35..e96c41ab3 100644
--- a/app/src/main/res/layout/activity_entry.xml
+++ b/app/src/main/res/layout/activity_entry.xml
@@ -67,7 +67,6 @@
android:layout_height="?attr/actionBarSize"
android:background="@color/transparent"
android:theme="?attr/toolbarAppearance"
- app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_collapseMode="pin"
tools:targetApi="lollipop">
diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml
index 31577bb3a..61dc71f3f 100644
--- a/app/src/main/res/layout/activity_entry_edit.xml
+++ b/app/src/main/res/layout/activity_entry_edit.xml
@@ -38,7 +38,6 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="?attr/toolbarSpecialAppearance"
- app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_constraintTop_toTopOf="parent" />
@@ -70,7 +69,6 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="?attr/toolbarActionAppearance"
- app:popupTheme="?attr/toolbarPopupAppearance"
android:layout_gravity="bottom" />
+ android:theme="?attr/toolbarHomeAppearance" />
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 478175321..e7bd96282 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -30,7 +30,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/toolbarSpecialAppearance"
- app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml
index 4f7ddb2c0..88cde8f97 100644
--- a/app/src/main/res/layout/activity_password.xml
+++ b/app/src/main/res/layout/activity_password.xml
@@ -32,7 +32,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/toolbarSpecialAppearance"
- app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d8b7d31c5..2c22042c0 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -19,7 +19,6 @@
-->
-
diff --git a/app/src/main/res/values/style_black.xml b/app/src/main/res/values/style_black.xml
index f965001a7..0a211fba8 100644
--- a/app/src/main/res/values/style_black.xml
+++ b/app/src/main/res/values/style_black.xml
@@ -30,7 +30,6 @@
- @color/green_light
- @color/background_dark
- @style/KeepassDXStyle.Toolbar.Black
- - @style/KeepassDXStyle.Toolbar.Popup.Black
- @style/KeepassDXStyle.Toolbar.Home.Black
- @style/KeepassDXStyle.Toolbar.Special.Black
- @style/KeepassDXStyle.Black.Dialog
@@ -52,7 +51,7 @@
- @style/KeepassDXStyle.Toolbar.Navigation.Tinted
-
diff --git a/app/src/main/res/values/style_purple.xml b/app/src/main/res/values/style_purple.xml
index ea59b328b..89bbaebc9 100644
--- a/app/src/main/res/values/style_purple.xml
+++ b/app/src/main/res/values/style_purple.xml
@@ -30,9 +30,10 @@
- @color/purple_lighter
- @color/background_purple
- @style/KeepassDXStyle.Toolbar.Purple
- - @style/KeepassDXStyle.Toolbar.Popup.Purple
- @style/KeepassDXStyle.Toolbar.Home.Purple
- @style/KeepassDXStyle.Toolbar.Special.Purple
+ - @style/KeepassDXStyle.Toolbar.Action.Purple
+ - @style/KeepassDXStyle.Toolbar.Popup.Purple
- @style/KeepassDXStyle.Purple.Dialog
- @style/KeepassDXStyle.Purple.Dialog
- @style/KeepassDXStyle.Cardview.Purple
@@ -48,20 +49,29 @@
- @color/purple_lighter
- @color/colorTextInverse
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f564c54a0..f1c23207c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -76,7 +76,6 @@
- @style/Widget.AppCompat.Toolbar
- @style/KeepassDXStyle.Toolbar.Light
- - @style/KeepassDXStyle.Toolbar.Popup.Light
- @style/KeepassDXStyle.Toolbar.Home.Light
- @style/KeepassDXStyle.Toolbar.Special.Light
- @style/KeepassDXStyle.Toolbar.Action.Light
@@ -133,7 +132,6 @@
- @style/Widget.AppCompat.Toolbar
- @style/KeepassDXStyle.Toolbar.Night
- - @style/KeepassDXStyle.Toolbar.Popup.Night
- @style/KeepassDXStyle.Toolbar.Home.Night
- @style/KeepassDXStyle.Toolbar.Special.Night
- @style/KeepassDXStyle.Toolbar.Action.Night
@@ -176,22 +174,31 @@
- @color/colorTextInverse
-
-
-
+
+
+
+
+
@@ -201,26 +208,15 @@
-
-
-
-
-
-