diff --git a/OpenKeychain/src/main/res/drawable/cardview_header.xml b/OpenKeychain/src/main/res/drawable/cardview_header.xml
index ff08f9fe3..213c78277 100644
--- a/OpenKeychain/src/main/res/drawable/cardview_header.xml
+++ b/OpenKeychain/src/main/res/drawable/cardview_header.xml
@@ -6,6 +6,6 @@
android:height="1dp"
android:width="1000dp" />
-
+
diff --git a/OpenKeychain/src/main/res/drawable/fab_label_background.xml b/OpenKeychain/src/main/res/drawable/fab_label_background.xml
index aa5e0a88e..b2d5954d8 100644
--- a/OpenKeychain/src/main/res/drawable/fab_label_background.xml
+++ b/OpenKeychain/src/main/res/drawable/fab_label_background.xml
@@ -1,6 +1,7 @@
-
+
+
-
+
diff --git a/OpenKeychain/src/main/res/drawable/section_header_light.xml b/OpenKeychain/src/main/res/drawable/section_header_light.xml
new file mode 100644
index 000000000..a47a57ce3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/section_header_light.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/OpenKeychain/src/main/res/values/attrs.xml b/OpenKeychain/src/main/res/values/attrs.xml
index 5c570e62b..b36c6ae3e 100644
--- a/OpenKeychain/src/main/res/values/attrs.xml
+++ b/OpenKeychain/src/main/res/values/attrs.xml
@@ -3,19 +3,20 @@
-
+
-
+
+
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 73a594ac4..c5710dadf 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 3bdbf811d..4fc4ea1f5 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -9,9 +9,11 @@
- #2196f3
- #1976d2
- - #b2000000
- #fafafa
+
+ - @drawable/fab_label_background
+
- #70ffffff
- #ffffff
- #ffffff
@@ -19,12 +21,15 @@
- #2196f3
- #33cccccc
- #cecbce
- - #808080
- #ffffff
+
+ - @drawable/cardview_header
- #000000
- #212121
- #808080
+
+ - @drawable/section_header_light
- true
@@ -42,9 +47,11 @@
- #2196f3
- #1976d2
- - #b2000000
- #fafafa
+
+ - @drawable/fab_label_background
+
- #70ffffff
- #ffffff
- #ffffff
@@ -52,12 +59,15 @@
- #2196f3
- #33cccccc
- #303030
- - #808080
- #505050
+
+ - @drawable/cardview_header
- #ffffff
- #d0d0d0
- #808080
+
+ - @drawable/section_header_dark
- #268bd2