diff --git a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_cached_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-hdpi/ic_cached_black_24dp.png
deleted file mode 100644
index fdc38efc..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_cached_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_cloud_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-hdpi/ic_cloud_black_24dp.png
deleted file mode 100644
index c3445cb8..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_cloud_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index 4b5ab06e..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
deleted file mode 100644
index acf1ddf8..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_sync_disabled_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-hdpi/ic_sync_disabled_black_24dp.png
deleted file mode 100644
index 2a133937..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_sync_disabled_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_sync_problem_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-hdpi/ic_sync_problem_black_24dp.png
deleted file mode 100644
index bc8b1419..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_sync_problem_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_verified_user_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-hdpi/ic_verified_user_black_24dp.png
deleted file mode 100644
index 8ebb6db3..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-hdpi/ic_verified_user_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_cached_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-mdpi/ic_cached_black_24dp.png
deleted file mode 100644
index 83b946ad..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_cached_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_cloud_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-mdpi/ic_cloud_black_24dp.png
deleted file mode 100644
index 63310507..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_cloud_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index e0c9fe0e..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
deleted file mode 100644
index c59419c0..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_sync_disabled_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-mdpi/ic_sync_disabled_black_24dp.png
deleted file mode 100644
index 2c521e80..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_sync_disabled_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_sync_problem_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-mdpi/ic_sync_problem_black_24dp.png
deleted file mode 100644
index 4ee0ed9d..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_sync_problem_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_verified_user_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-mdpi/ic_verified_user_black_24dp.png
deleted file mode 100644
index f91b5d27..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-mdpi/ic_verified_user_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_cached_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_cached_black_24dp.png
deleted file mode 100644
index fa3099b2..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_cached_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_cloud_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_cloud_black_24dp.png
deleted file mode 100644
index b688b314..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_cloud_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index b706f0d0..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index e84e188a..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_sync_disabled_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_sync_disabled_black_24dp.png
deleted file mode 100644
index cdcaa719..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_sync_disabled_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_sync_problem_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_sync_problem_black_24dp.png
deleted file mode 100644
index 30b58ccd..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_sync_problem_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_verified_user_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_verified_user_black_24dp.png
deleted file mode 100644
index 31984b10..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xhdpi/ic_verified_user_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_cached_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_cached_black_24dp.png
deleted file mode 100644
index 7a9da901..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_cached_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_cloud_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_cloud_black_24dp.png
deleted file mode 100644
index 13c994e7..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_cloud_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index 3847a9fe..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index 3023ff8d..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_sync_disabled_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_sync_disabled_black_24dp.png
deleted file mode 100644
index 38a39d14..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_sync_disabled_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_sync_problem_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_sync_problem_black_24dp.png
deleted file mode 100644
index 49f0b828..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_sync_problem_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_verified_user_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_verified_user_black_24dp.png
deleted file mode 100644
index 70a9fc1b..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxhdpi/ic_verified_user_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_cached_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_cached_black_24dp.png
deleted file mode 100644
index cd0c7f50..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_cached_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_cloud_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_cloud_black_24dp.png
deleted file mode 100644
index 9ac14e86..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_cloud_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index c1e2a03a..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index 476d5c97..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_sync_disabled_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_sync_disabled_black_24dp.png
deleted file mode 100644
index 9cbd496f..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_sync_disabled_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_sync_problem_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_sync_problem_black_24dp.png
deleted file mode 100644
index f38dce1e..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_sync_problem_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_verified_user_black_24dp.png b/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_verified_user_black_24dp.png
deleted file mode 100644
index e1771b89..00000000
Binary files a/androidlibrary_lib/src/main/res/drawable-xxxhdpi/ic_verified_user_black_24dp.png and /dev/null differ
diff --git a/androidlibrary_lib/src/main/res/drawable/ic_cached_black_24dp.xml b/androidlibrary_lib/src/main/res/drawable/ic_cached_black_24dp.xml
new file mode 100644
index 00000000..013799bf
--- /dev/null
+++ b/androidlibrary_lib/src/main/res/drawable/ic_cached_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
+</vector>
diff --git a/androidlibrary_lib/src/main/res/drawable/ic_cloud_black_24dp.xml b/androidlibrary_lib/src/main/res/drawable/ic_cloud_black_24dp.xml
new file mode 100644
index 00000000..13c92115
--- /dev/null
+++ b/androidlibrary_lib/src/main/res/drawable/ic_cloud_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z" />
+</vector>
diff --git a/androidlibrary_lib/src/main/res/drawable/ic_info_outline_black_24dp.xml b/androidlibrary_lib/src/main/res/drawable/ic_info_outline_black_24dp.xml
new file mode 100644
index 00000000..bc8017c6
--- /dev/null
+++ b/androidlibrary_lib/src/main/res/drawable/ic_info_outline_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
+</vector>
diff --git a/androidlibrary_lib/src/main/res/drawable/ic_settings_black_24dp.xml b/androidlibrary_lib/src/main/res/drawable/ic_settings_black_24dp.xml
new file mode 100644
index 00000000..0285a5fa
--- /dev/null
+++ b/androidlibrary_lib/src/main/res/drawable/ic_settings_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
+</vector>
diff --git a/androidlibrary_lib/src/main/res/drawable/ic_sync_disabled_black_24dp.xml b/androidlibrary_lib/src/main/res/drawable/ic_sync_disabled_black_24dp.xml
new file mode 100644
index 00000000..80483bc4
--- /dev/null
+++ b/androidlibrary_lib/src/main/res/drawable/ic_sync_disabled_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10,6.35L10,4.26c-0.8,0.21 -1.55,0.54 -2.23,0.96l1.46,1.46c0.25,-0.12 0.5,-0.24 0.77,-0.33zM2.86,5.41l2.36,2.36C4.45,8.99 4,10.44 4,12c0,2.21 0.91,4.2 2.36,5.64L4,20h6v-6l-2.24,2.24C6.68,15.15 6,13.66 6,12c0,-1 0.25,-1.94 0.68,-2.77l8.08,8.08c-0.25,0.13 -0.5,0.25 -0.77,0.34v2.09c0.8,-0.21 1.55,-0.54 2.23,-0.96l2.36,2.36 1.27,-1.27L4.14,4.14 2.86,5.41zM20,4h-6v6l2.24,-2.24C17.32,8.85 18,10.34 18,12c0,1 -0.25,1.94 -0.68,2.77l1.46,1.46C19.55,15.01 20,13.56 20,12c0,-2.21 -0.91,-4.2 -2.36,-5.64L20,4z" />
+</vector>
diff --git a/androidlibrary_lib/src/main/res/drawable/ic_sync_problem_black_24dp.xml b/androidlibrary_lib/src/main/res/drawable/ic_sync_problem_black_24dp.xml
new file mode 100644
index 00000000..3b5499be
--- /dev/null
+++ b/androidlibrary_lib/src/main/res/drawable/ic_sync_problem_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,12c0,2.21 0.91,4.2 2.36,5.64L3,20h6v-6l-2.24,2.24C5.68,15.15 5,13.66 5,12c0,-2.61 1.67,-4.83 4,-5.65L9,4.26C5.55,5.15 3,8.27 3,12zM11,17h2v-2h-2v2zM21,4h-6v6l2.24,-2.24C18.32,8.85 19,10.34 19,12c0,2.61 -1.67,4.83 -4,5.65v2.09c3.45,-0.89 6,-4.01 6,-7.74 0,-2.21 -0.91,-4.2 -2.36,-5.64L21,4zM11,13h2L13,7h-2v6z" />
+</vector>
diff --git a/androidlibrary_lib/src/main/res/drawable/ic_verified_user_black_24dp.xml b/androidlibrary_lib/src/main/res/drawable/ic_verified_user_black_24dp.xml
new file mode 100644
index 00000000..0dc1abc3
--- /dev/null
+++ b/androidlibrary_lib/src/main/res/drawable/ic_verified_user_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z" />
+</vector>
diff --git a/androidlibrary_lib/src/main/res/values-night/colors.xml b/androidlibrary_lib/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..48dcfdc0
--- /dev/null
+++ b/androidlibrary_lib/src/main/res/values-night/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">@color/black</color>
+    <color name="colorPrimaryDark">@color/black</color>
+    <color name="colorOnPrimary">@color/white</color>
+</resources>
\ No newline at end of file
diff --git a/androidlibrary_lib/src/main/res/values/colors.xml b/androidlibrary_lib/src/main/res/values/colors.xml
index d809dedd..2abbad51 100644
--- a/androidlibrary_lib/src/main/res/values/colors.xml
+++ b/androidlibrary_lib/src/main/res/values/colors.xml
@@ -25,5 +25,10 @@ the License.
     <color name="solid_blue">#0000ff</color>
     <color name="solid_green">#f0f0</color>
     <color name="solid_yellow">#ffffff00</color>
+    <color name="dark_blue">#5f000040</color>
+
+    <color name="colorPrimary">@color/white</color>
+    <color name="colorPrimaryDark">@color/white</color>
+    <color name="colorOnPrimary">@color/black</color>
 
 </resources>
diff --git a/androidlibrary_lib/src/main/res/values/theme.xml b/androidlibrary_lib/src/main/res/values/theme.xml
index 0d9a2773..fd908885 100644
--- a/androidlibrary_lib/src/main/res/values/theme.xml
+++ b/androidlibrary_lib/src/main/res/values/theme.xml
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- ActionBar style -->
     <style name="OdkActionBar"
         parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="displayOptions">useLogo|showHome|showTitle</item>
-        <item name="background">@color/white</item>
+        <item name="background">@color/colorPrimary</item>
         <item name="logo">@drawable/app_logo</item>
+        <item name="android:textColor">@color/colorOnPrimary</item>
+        <item name="android:itemBackground">@color/colorOnPrimary</item>
     </style>
 
-    <style name="Opendatakit" parent="Theme.AppCompat.Light">
+    <style name="Opendatakit" parent="Theme.AppCompat.DayNight">
         <item name="android:scrollbarThumbHorizontal">@drawable/thumb</item>
         <item name="android:scrollbarThumbVertical">@drawable/thumb</item>
         <item name="android:scrollbarSize">2.5mm</item>
         <item name="android:scrollbarAlwaysDrawVerticalTrack">true</item>
         <item name="android:scrollbarAlwaysDrawHorizontalTrack">true</item>
+        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
         <item name="actionBarStyle">@style/OdkActionBar</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>