Once again: Colors and header image

OpenKeychain/src/main/res/layout/drawer_custom_header.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:background="@color/colorPrimary">
+    android:background="@color/primary">
 
     <TextView
         android:layout_width="wrap_content"

OpenKeychain/src/main/res/layout/key_list_fragment.xml

@@ -52,8 +52,8 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        fab:fab_addButtonColorNormal="@color/fab"
-        fab:fab_addButtonColorPressed="@color/fab_pressed"
+        fab:fab_addButtonColorNormal="@color/primary"
+        fab:fab_addButtonColorPressed="@color/primary_dark"
         fab:fab_addButtonSize="normal"
         fab:fab_addButtonPlusIconColor="@color/icons"
         fab:fab_expandDirection="up"
@@ -67,8 +67,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fab:fab_icon="@drawable/qrcode"
-            fab:fab_colorNormal="@color/fab"
-            fab:fab_colorPressed="@color/fab_pressed"
+            fab:fab_colorNormal="@color/primary"
+            fab:fab_colorPressed="@color/primary_dark"
             fab:fab_title="Scan QR Code"
             fab:fab_size="mini" />
 
@@ -77,8 +77,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fab:fab_icon="@drawable/ic_cloud_search_24px"
-            fab:fab_colorNormal="@color/fab"
-            fab:fab_colorPressed="@color/fab_pressed"
+            fab:fab_colorNormal="@color/primary"
+            fab:fab_colorPressed="@color/primary_dark"
             fab:fab_title="Search Cloud"
             fab:fab_size="mini" />
 
@@ -87,8 +87,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fab:fab_icon="@drawable/ic_folder_white_24dp"
-            fab:fab_colorNormal="@color/fab"
-            fab:fab_colorPressed="@color/fab_pressed"
+            fab:fab_colorNormal="@color/primary"
+            fab:fab_colorPressed="@color/primary_dark"
             fab:fab_title="Import from File"
             fab:fab_size="mini" />