diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
index 61d72bf99..18db8bb1a 100644
--- a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
@@ -55,7 +55,7 @@ public class TrackIconUtils {
     private static final String SKATE_BOARDING = "SKATE_BOARDING";
     private static final String CLIMBING = "CLIMBING";
 
-    private static final int ACTIVITY_UNKNOWN_LOGO = R.drawable.ic_logo_white_24dp;
+    private static final int ACTIVITY_UNKNOWN_LOGO = R.drawable.ic_logo_24dp;
 
     private static final int[] AIRPLANE_LIST = new int[]{R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane};
     private static final int[] BIKE_LIST = new int[]{R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_road_biking, R.string.activity_type_track_cycling};
diff --git a/src/main/res/drawable/ic_activity_bike_24dp.xml b/src/main/res/drawable/ic_activity_bike_24dp.xml
index 90c7f7a77..8f1204881 100644
--- a/src/main/res/drawable/ic_activity_bike_24dp.xml
+++ b/src/main/res/drawable/ic_activity_bike_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_activity_boat_24dp.xml b/src/main/res/drawable/ic_activity_boat_24dp.xml
index 0979a4735..be6647fd5 100644
--- a/src/main/res/drawable/ic_activity_boat_24dp.xml
+++ b/src/main/res/drawable/ic_activity_boat_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_activity_climbing_24dp.xml b/src/main/res/drawable/ic_activity_climbing_24dp.xml
index f08cfc558..72110e3c9 100644
--- a/src/main/res/drawable/ic_activity_climbing_24dp.xml
+++ b/src/main/res/drawable/ic_activity_climbing_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
     <path
diff --git a/src/main/res/drawable/ic_activity_drive_24dp.xml b/src/main/res/drawable/ic_activity_drive_24dp.xml
index 26404bddb..11724c994 100644
--- a/src/main/res/drawable/ic_activity_drive_24dp.xml
+++ b/src/main/res/drawable/ic_activity_drive_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_activity_escooter_24dp.xml b/src/main/res/drawable/ic_activity_escooter_24dp.xml
index 4a7560e95..9179d5c06 100644
--- a/src/main/res/drawable/ic_activity_escooter_24dp.xml
+++ b/src/main/res/drawable/ic_activity_escooter_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="22dp"
     android:height="22dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
     <path
diff --git a/src/main/res/drawable/ic_activity_flight_24dp.xml b/src/main/res/drawable/ic_activity_flight_24dp.xml
index ed89038d2..845952176 100644
--- a/src/main/res/drawable/ic_activity_flight_24dp.xml
+++ b/src/main/res/drawable/ic_activity_flight_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_activity_inline_skating_24dp.xml b/src/main/res/drawable/ic_activity_inline_skating_24dp.xml
index 799fdf43e..85a10d7b1 100644
--- a/src/main/res/drawable/ic_activity_inline_skating_24dp.xml
+++ b/src/main/res/drawable/ic_activity_inline_skating_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
     <path
diff --git a/src/main/res/drawable/ic_activity_motorbike_24dp.xml b/src/main/res/drawable/ic_activity_motorbike_24dp.xml
index f0ef5ace2..6c65a97ff 100644
--- a/src/main/res/drawable/ic_activity_motorbike_24dp.xml
+++ b/src/main/res/drawable/ic_activity_motorbike_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
     <path
diff --git a/src/main/res/drawable/ic_activity_mtb_24dp.xml b/src/main/res/drawable/ic_activity_mtb_24dp.xml
index 0132d47d5..69837c1e8 100644
--- a/src/main/res/drawable/ic_activity_mtb_24dp.xml
+++ b/src/main/res/drawable/ic_activity_mtb_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
     <path
diff --git a/src/main/res/drawable/ic_activity_run_24dp.xml b/src/main/res/drawable/ic_activity_run_24dp.xml
index f22116361..c2db28ace 100644
--- a/src/main/res/drawable/ic_activity_run_24dp.xml
+++ b/src/main/res/drawable/ic_activity_run_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_activity_sailing_24dp.xml b/src/main/res/drawable/ic_activity_sailing_24dp.xml
index 7ee6d81f6..cba1121f4 100644
--- a/src/main/res/drawable/ic_activity_sailing_24dp.xml
+++ b/src/main/res/drawable/ic_activity_sailing_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
     <path
diff --git a/src/main/res/drawable/ic_activity_skateboarding_24dp.xml b/src/main/res/drawable/ic_activity_skateboarding_24dp.xml
index 9c930ae44..2d3aac9f3 100644
--- a/src/main/res/drawable/ic_activity_skateboarding_24dp.xml
+++ b/src/main/res/drawable/ic_activity_skateboarding_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
     <path
diff --git a/src/main/res/drawable/ic_activity_skiing_24dp.xml b/src/main/res/drawable/ic_activity_skiing_24dp.xml
index 2c8b51b0a..b84ae7691 100644
--- a/src/main/res/drawable/ic_activity_skiing_24dp.xml
+++ b/src/main/res/drawable/ic_activity_skiing_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
     <path
diff --git a/src/main/res/drawable/ic_activity_snowboarding_24dp.xml b/src/main/res/drawable/ic_activity_snowboarding_24dp.xml
index 7c3755275..a94cacbcb 100644
--- a/src/main/res/drawable/ic_activity_snowboarding_24dp.xml
+++ b/src/main/res/drawable/ic_activity_snowboarding_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
     <path
diff --git a/src/main/res/drawable/ic_activity_walk_24dp.xml b/src/main/res/drawable/ic_activity_walk_24dp.xml
index 93ecbe827..a15470dce 100644
--- a/src/main/res/drawable/ic_activity_walk_24dp.xml
+++ b/src/main/res/drawable/ic_activity_walk_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_add_a_photo_24dp.xml b/src/main/res/drawable/ic_add_a_photo_24dp.xml
index 375995c69..29802ab6e 100644
--- a/src/main/res/drawable/ic_add_a_photo_24dp.xml
+++ b/src/main/res/drawable/ic_add_a_photo_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@android:color/white"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/src/main/res/drawable/ic_add_photo_alternate_24dp.xml b/src/main/res/drawable/ic_add_photo_alternate_24dp.xml
index ad610fa67..56d4887d3 100644
--- a/src/main/res/drawable/ic_add_photo_alternate_24dp.xml
+++ b/src/main/res/drawable/ic_add_photo_alternate_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@android:color/white"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/src/main/res/drawable/ic_bluetooth_searching_24dp.xml b/src/main/res/drawable/ic_bluetooth_searching_24dp.xml
index 918521de0..4c2abc723 100644
--- a/src/main/res/drawable/ic_bluetooth_searching_24dp.xml
+++ b/src/main/res/drawable/ic_bluetooth_searching_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/src/main/res/drawable/ic_button_pause.xml b/src/main/res/drawable/ic_button_pause.xml
index 0bcf0da0e..675e69873 100644
--- a/src/main/res/drawable/ic_button_pause.xml
+++ b/src/main/res/drawable/ic_button_pause.xml
@@ -28,5 +28,5 @@
         android:name="fade_out_circle"
         android:fillAlpha="0.0"
         android:fillColor="#a31a1f"
-        android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123"></path>
+        android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123" />
 </vector>
diff --git a/src/main/res/drawable/ic_delete_forever_24dp.xml b/src/main/res/drawable/ic_delete_forever_24dp.xml
index cd7e70a6a..b339b888d 100644
--- a/src/main/res/drawable/ic_delete_forever_24dp.xml
+++ b/src/main/res/drawable/ic_delete_forever_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_dialog_error_24dp.xml b/src/main/res/drawable/ic_dialog_error_24dp.xml
index 1d14bc4ab..36c81d32a 100644
--- a/src/main/res/drawable/ic_dialog_error_24dp.xml
+++ b/src/main/res/drawable/ic_dialog_error_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_dialog_info_24dp.xml b/src/main/res/drawable/ic_dialog_info_24dp.xml
index e5a399d3c..e6336d1d2 100644
--- a/src/main/res/drawable/ic_dialog_info_24dp.xml
+++ b/src/main/res/drawable/ic_dialog_info_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_dialog_success_24dp.xml b/src/main/res/drawable/ic_dialog_success_24dp.xml
index 313720186..c78458fc7 100644
--- a/src/main/res/drawable/ic_dialog_success_24dp.xml
+++ b/src/main/res/drawable/ic_dialog_success_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_edit_24dp.xml b/src/main/res/drawable/ic_edit_24dp.xml
index ef358ff74..4e51bfdbc 100644
--- a/src/main/res/drawable/ic_edit_24dp.xml
+++ b/src/main/res/drawable/ic_edit_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_gps_fixed_24dp.xml b/src/main/res/drawable/ic_gps_fixed_24dp.xml
index 7224e3584..827f15f20 100644
--- a/src/main/res/drawable/ic_gps_fixed_24dp.xml
+++ b/src/main/res/drawable/ic_gps_fixed_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_gps_not_fixed_24dp.xml b/src/main/res/drawable/ic_gps_not_fixed_24dp.xml
index af77dcf23..b242c3df9 100644
--- a/src/main/res/drawable/ic_gps_not_fixed_24dp.xml
+++ b/src/main/res/drawable/ic_gps_not_fixed_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_gps_off_24dp.xml b/src/main/res/drawable/ic_gps_off_24dp.xml
index 98ac9b284..e6b592729 100644
--- a/src/main/res/drawable/ic_gps_off_24dp.xml
+++ b/src/main/res/drawable/ic_gps_off_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_gps_ready_animation.xml b/src/main/res/drawable/ic_gps_ready_animation.xml
index 0b9054fb7..510390340 100644
--- a/src/main/res/drawable/ic_gps_ready_animation.xml
+++ b/src/main/res/drawable/ic_gps_ready_animation.xml
@@ -5,7 +5,7 @@
             android:name="vector"
             android:width="24dp"
             android:height="24dp"
-            android:tint="#FFFFFF"
+            android:tint="?attr/colorControlNormal"
             android:viewportWidth="24"
             android:viewportHeight="24">
             <path
diff --git a/src/main/res/drawable/ic_logo_white_24dp.xml b/src/main/res/drawable/ic_logo_24dp.xml
similarity index 91%
rename from src/main/res/drawable/ic_logo_white_24dp.xml
rename to src/main/res/drawable/ic_logo_24dp.xml
index fa3681354..ac733f7af 100644
--- a/src/main/res/drawable/ic_logo_white_24dp.xml
+++ b/src/main/res/drawable/ic_logo_24dp.xml
@@ -2,6 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="100"
+    android:tint="?attr/colorControlNormal"
     android:viewportHeight="100">
     <path
         android:fillColor="#FFFFFF"
diff --git a/src/main/res/drawable/ic_map_24dp.xml b/src/main/res/drawable/ic_map_24dp.xml
index 4c033df9b..162dff5f8 100644
--- a/src/main/res/drawable/ic_map_24dp.xml
+++ b/src/main/res/drawable/ic_map_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_marker_add_24dp.xml b/src/main/res/drawable/ic_marker_add_24dp.xml
index 47a5500e5..e8cf7dbb4 100644
--- a/src/main/res/drawable/ic_marker_add_24dp.xml
+++ b/src/main/res/drawable/ic_marker_add_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_marker_show_24dp.xml b/src/main/res/drawable/ic_marker_show_24dp.xml
index 9455792b3..730537af2 100644
--- a/src/main/res/drawable/ic_marker_show_24dp.xml
+++ b/src/main/res/drawable/ic_marker_show_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_play_circle_24dp.xml b/src/main/res/drawable/ic_play_circle_24dp.xml
index 140cd484d..bf1b50e05 100644
--- a/src/main/res/drawable/ic_play_circle_24dp.xml
+++ b/src/main/res/drawable/ic_play_circle_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/src/main/res/drawable/ic_select_all_24dp.xml b/src/main/res/drawable/ic_select_all_24dp.xml
index 61f46ee8f..56adb23bc 100644
--- a/src/main/res/drawable/ic_select_all_24dp.xml
+++ b/src/main/res/drawable/ic_select_all_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_settings_24dp.xml b/src/main/res/drawable/ic_settings_24dp.xml
index bc30c52d8..bb9f0d83a 100644
--- a/src/main/res/drawable/ic_settings_24dp.xml
+++ b/src/main/res/drawable/ic_settings_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/src/main/res/drawable/ic_share_24dp.xml b/src/main/res/drawable/ic_share_24dp.xml
index 9dad7b85f..b4fad4b13 100644
--- a/src/main/res/drawable/ic_share_24dp.xml
+++ b/src/main/res/drawable/ic_share_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/drawable/ic_statistics_24dp.xml b/src/main/res/drawable/ic_statistics_24dp.xml
index 4c391a389..154255cdf 100644
--- a/src/main/res/drawable/ic_statistics_24dp.xml
+++ b/src/main/res/drawable/ic_statistics_24dp.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/src/main/res/values/styles_custom.xml b/src/main/res/values/styles_custom.xml
index d908342cc..6e56b9109 100644
--- a/src/main/res/values/styles_custom.xml
+++ b/src/main/res/values/styles_custom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!-- Generated with http://android-holo-colors.com -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <!-- TODO REMOVE ALL: override only things that are really important. -->
     <style name="AutoCompleteTextViewCustom" parent="Widget.AppCompat.AutoCompleteTextView">
         <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
         <item name="android:background">@drawable/edit_text_holo_dark</item>