diff --git a/app/src/main/java/be/digitalia/fosdem/adapters/EventsAdapter.kt b/app/src/main/java/be/digitalia/fosdem/adapters/EventsAdapter.kt
index bafc0f6..85a8265 100644
--- a/app/src/main/java/be/digitalia/fosdem/adapters/EventsAdapter.kt
+++ b/app/src/main/java/be/digitalia/fosdem/adapters/EventsAdapter.kt
@@ -100,7 +100,7 @@ class EventsAdapter constructor(context: Context, owner: LifecycleOwner, private
             this.event = event
 
             title.text = event.title
-            val bookmarkDrawable = if (isBookmarked) AppCompatResources.getDrawable(context, R.drawable.ic_bookmark_24dp) else null
+            val bookmarkDrawable = if (isBookmarked) AppCompatResources.getDrawable(context, R.drawable.ic_bookmark_white_24dp) else null
             TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(title, null, null, bookmarkDrawable, null)
             title.contentDescription = if (isBookmarked) {
                 context.getString(R.string.in_bookmarks_content_description, event.title ?: "")
diff --git a/app/src/main/java/be/digitalia/fosdem/adapters/TrackScheduleAdapter.kt b/app/src/main/java/be/digitalia/fosdem/adapters/TrackScheduleAdapter.kt
index 7508a31..376363f 100644
--- a/app/src/main/java/be/digitalia/fosdem/adapters/TrackScheduleAdapter.kt
+++ b/app/src/main/java/be/digitalia/fosdem/adapters/TrackScheduleAdapter.kt
@@ -129,7 +129,7 @@ class TrackScheduleAdapter(context: Context, private val listener: EventClickLis
 
             time.text = event.startTime?.let { timeDateFormat.format(it) }
             title.text = event.title
-            val bookmarkDrawable = if (isBookmarked) AppCompatResources.getDrawable(context, R.drawable.ic_bookmark_24dp) else null
+            val bookmarkDrawable = if (isBookmarked) AppCompatResources.getDrawable(context, R.drawable.ic_bookmark_white_24dp) else null
             TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(title, null, null, bookmarkDrawable, null)
             title.contentDescription = if (isBookmarked) {
                 context.getString(R.string.in_bookmarks_content_description, event.title ?: "")
diff --git a/app/src/main/res/drawable/asld_bookmark_24dp.xml b/app/src/main/res/drawable/asld_bookmark_24dp.xml
index 0fbcb86..9a77783 100644
--- a/app/src/main/res/drawable/asld_bookmark_24dp.xml
+++ b/app/src/main/res/drawable/asld_bookmark_24dp.xml
@@ -2,7 +2,7 @@
 <animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/selected"
-        android:drawable="@drawable/ic_bookmark_24dp"
+        android:drawable="@drawable/ic_bookmark_white_24dp"
         android:state_selected="true" />
     <item
         android:id="@+id/unselected"
diff --git a/app/src/main/res/drawable/ic_access_time_18dp.xml b/app/src/main/res/drawable/ic_access_time_white_18dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_access_time_18dp.xml
rename to app/src/main/res/drawable/ic_access_time_white_18dp.xml
index 1dcb2d4..7eb62b1 100644
--- a/app/src/main/res/drawable/ic_access_time_18dp.xml
+++ b/app/src/main/res/drawable/ic_access_time_white_18dp.xml
@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="18dp"
         android:height="18dp"
-        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_bookmark_24dp.xml b/app/src/main/res/drawable/ic_bookmark_white_24dp.xml
similarity index 87%
rename from app/src/main/res/drawable/ic_bookmark_24dp.xml
rename to app/src/main/res/drawable/ic_bookmark_white_24dp.xml
index 4e6bc98..dea608a 100644
--- a/app/src/main/res/drawable/ic_bookmark_24dp.xml
+++ b/app/src/main/res/drawable/ic_bookmark_white_24dp.xml
@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_place_18dp.xml b/app/src/main/res/drawable/ic_place_white_18dp.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_place_18dp.xml
rename to app/src/main/res/drawable/ic_place_white_18dp.xml
index 9d90a7f..7812686 100644
--- a/app/src/main/res/drawable/ic_place_18dp.xml
+++ b/app/src/main/res/drawable/ic_place_white_18dp.xml
@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="18dp"
         android:height="18dp"
-        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/layout/fragment_event_details.xml b/app/src/main/res/layout/fragment_event_details.xml
index 36070e4..afa0b41 100644
--- a/app/src/main/res/layout/fragment_event_details.xml
+++ b/app/src/main/res/layout/fragment_event_details.xml
@@ -61,7 +61,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                app:drawableStartCompat="@drawable/ic_access_time_18dp"
+                app:drawableStartCompat="@drawable/ic_access_time_white_18dp"
                 tools:text="Day 1 (Saturday), 09:30 - 09:55" />
 
             <TextView
@@ -70,7 +70,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:saveEnabled="false"
-                app:drawableStartCompat="@drawable/ic_place_18dp"
+                app:drawableStartCompat="@drawable/ic_place_white_18dp"
                 tools:text="Janson (Building J)" />
 
             <TextView
diff --git a/app/src/main/res/layout/item_event.xml b/app/src/main/res/layout/item_event.xml
index c987ef3..c3f77bc 100644
--- a/app/src/main/res/layout/item_event.xml
+++ b/app/src/main/res/layout/item_event.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.internal.ForegroundLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -31,6 +32,7 @@
         android:textAlignment="viewStart"
         android:textAppearance="?textAppearanceHeadline6"
         android:textSize="18sp"
+        app:drawableTint="?colorControlNormal"
         tools:text="Welcome to FOSDEM 2015" />
 
     <TextView
diff --git a/app/src/main/res/layout/item_schedule_event.xml b/app/src/main/res/layout/item_schedule_event.xml
index 5946a36..4ec8a45 100644
--- a/app/src/main/res/layout/item_schedule_event.xml
+++ b/app/src/main/res/layout/item_schedule_event.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -39,6 +40,7 @@
         android:textAlignment="viewStart"
         android:textAppearance="?textAppearanceHeadline6"
         android:textSize="18sp"
+        app:drawableTint="?colorControlNormal"
         tools:text="Welcome to FOSDEM 2015" />
 
     <TextView
diff --git a/app/src/main/res/menu/main_navigation.xml b/app/src/main/res/menu/main_navigation.xml
index f9eb6c8..12f53d5 100644
--- a/app/src/main/res/menu/main_navigation.xml
+++ b/app/src/main/res/menu/main_navigation.xml
@@ -9,7 +9,7 @@
             android:title="@string/menu_tracks" />
         <item
             android:id="@+id/menu_bookmarks"
-            android:icon="@drawable/ic_bookmark_24dp"
+            android:icon="@drawable/ic_bookmark_white_24dp"
             android:title="@string/menu_bookmarks" />
         <item
             android:id="@+id/menu_live"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d8e5086..dc9c78e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -87,6 +87,7 @@
         <item name="android:gravity">start|center_vertical</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:drawablePadding">8dp</item>
+        <item name="drawableTint">?colorControlNormal</item>
     </style>
 
     <style name="Header">