diff --git a/OpenKeychain/src/main/res/drawable/fab_label_background.xml b/OpenKeychain/src/main/res/drawable/fab_label_background.xml
index 0d8c05b11..aa5e0a88e 100644
--- a/OpenKeychain/src/main/res/drawable/fab_label_background.xml
+++ b/OpenKeychain/src/main/res/drawable/fab_label_background.xml
@@ -1,6 +1,6 @@
-
+
-
\ No newline at end of file
+
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 9c41590db..83cf2d260 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -61,8 +61,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_qrcode_white_24dp"
- fab:fab_colorNormal="?attr/colorPrimary"
- fab:fab_colorPressed="?attr/colorPrimaryDark"
+ fab:fab_colorNormal="?attr/colorFab"
+ fab:fab_colorPressed="?attr/colorFabPressed"
fab:fab_title="Scan QR Code"
fab:fab_size="mini" />
@@ -71,8 +71,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_cloud_search_24dp"
- fab:fab_colorNormal="?attr/colorPrimary"
- fab:fab_colorPressed="?attr/colorPrimaryDark"
+ fab:fab_colorNormal="?attr/colorFab"
+ fab:fab_colorPressed="?attr/colorFabPressed"
fab:fab_title="Search Cloud"
fab:fab_size="mini" />
@@ -81,8 +81,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_folder_white_24dp"
- fab:fab_colorNormal="?attr/colorPrimary"
- fab:fab_colorPressed="?attr/colorPrimaryDark"
+ fab:fab_colorNormal="?attr/colorFab"
+ fab:fab_colorPressed="?attr/colorFabPressed"
fab:fab_title="Import from File"
fab:fab_size="mini" />
diff --git a/OpenKeychain/src/main/res/values/attrs.xml b/OpenKeychain/src/main/res/values/attrs.xml
index 27fba221a..7357221a2 100644
--- a/OpenKeychain/src/main/res/values/attrs.xml
+++ b/OpenKeychain/src/main/res/values/attrs.xml
@@ -3,6 +3,8 @@
+
+
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 38ac21e21..f943e0325 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -13,7 +13,6 @@
- #B2000000
#000000
#fafafa
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index e21e3749c..73a594ac4 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -23,7 +23,7 @@