diff --git a/app/src/main/res/layout-v21/drawer_list.xml b/app/src/main/res/layout-v21/drawer_list.xml
index 47236053d..6a756d1f5 100644
--- a/app/src/main/res/layout-v21/drawer_list.xml
+++ b/app/src/main/res/layout-v21/drawer_list.xml
@@ -22,13 +22,15 @@
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
         android:background="?attr/colorPrimary"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         android:elevation="8dp"
-        android:saveEnabled="false"/>
+        android:saveEnabled="false"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-v21/drawer_list_rv.xml b/app/src/main/res/layout-v21/drawer_list_rv.xml
index 7e01e8b42..fb6dc287a 100644
--- a/app/src/main/res/layout-v21/drawer_list_rv.xml
+++ b/app/src/main/res/layout-v21/drawer_list_rv.xml
@@ -22,13 +22,15 @@
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
         android:background="?attr/colorPrimary"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         android:elevation="8dp"
-        android:saveEnabled="false"/>
+        android:saveEnabled="false"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-v21/scene_toolbar.xml b/app/src/main/res/layout-v21/scene_toolbar.xml
index 6423b2fe3..62790b1e4 100644
--- a/app/src/main/res/layout-v21/scene_toolbar.xml
+++ b/app/src/main/res/layout-v21/scene_toolbar.xml
@@ -22,12 +22,14 @@
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
         android:background="?attr/colorPrimary"
+        android:elevation="8dp"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        android:elevation="8dp"/>
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
     <FrameLayout
         android:id="@+id/content_panel"
diff --git a/app/src/main/res/layout/drawer_list.xml b/app/src/main/res/layout/drawer_list.xml
index 7a86cb00c..aaa0da322 100644
--- a/app/src/main/res/layout/drawer_list.xml
+++ b/app/src/main/res/layout/drawer_list.xml
@@ -22,12 +22,14 @@
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
         android:background="?attr/colorPrimary"
+        android:saveEnabled="false"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        android:saveEnabled="false"/>
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/drawer_list_rv.xml b/app/src/main/res/layout/drawer_list_rv.xml
index d80938d60..29db7037d 100644
--- a/app/src/main/res/layout/drawer_list_rv.xml
+++ b/app/src/main/res/layout/drawer_list_rv.xml
@@ -22,12 +22,14 @@
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
         android:background="?attr/colorPrimary"
+        android:saveEnabled="false"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        android:saveEnabled="false"/>
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/scene_toolbar.xml b/app/src/main/res/layout/scene_toolbar.xml
index feaf24301..7640351d1 100644
--- a/app/src/main/res/layout/scene_toolbar.xml
+++ b/app/src/main/res/layout/scene_toolbar.xml
@@ -22,11 +22,13 @@
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
         android:background="?attr/colorPrimary"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
     <FrameLayout
         android:id="@+id/content_panel"