diff --git a/app/src/main/res/layout-land/activity_tabs.xml b/app/src/main/res/layout-land/activity_tabs.xml
index 8669fff3..4d0c5ee4 100644
--- a/app/src/main/res/layout-land/activity_tabs.xml
+++ b/app/src/main/res/layout-land/activity_tabs.xml
@@ -37,12 +37,12 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <android.support.design.widget.AppBarLayout
-        app:theme="?cpp_toolbar_theme"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
+            style="?cpp_toolbar_style"
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
             app:layout_scrollFlags="snap">
diff --git a/app/src/main/res/layout/activity_empty.xml b/app/src/main/res/layout/activity_empty.xml
index 78fefb6f..96f472fa 100644
--- a/app/src/main/res/layout/activity_empty.xml
+++ b/app/src/main/res/layout/activity_empty.xml
@@ -26,12 +26,11 @@
     android:id="@+id/main"
     style="@style/CppMain"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
-        app:theme="?cpp_toolbar_theme"
+        style="?cpp_toolbar_style"
         android:layout_height="?actionBarSize"
         android:layout_width="match_parent" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_tabs.xml b/app/src/main/res/layout/activity_tabs.xml
index 71d32052..9274a841 100644
--- a/app/src/main/res/layout/activity_tabs.xml
+++ b/app/src/main/res/layout/activity_tabs.xml
@@ -37,18 +37,19 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <android.support.design.widget.AppBarLayout
-        app:theme="?cpp_toolbar_theme"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
+            style="?cpp_toolbar_style"
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
             app:layout_scrollFlags="scroll|enterAlways" />
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tabs"
+            style="?cpp_toolbar_style"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:overScrollMode="never"
diff --git a/app/src/main/res/values/attributes.xml b/app/src/main/res/values/attributes.xml
index a1a14f27..c85fefb3 100644
--- a/app/src/main/res/values/attributes.xml
+++ b/app/src/main/res/values/attributes.xml
@@ -34,6 +34,6 @@
     <attr name="cpp_text_color" format="reference" />
     <attr name="cpp_text_color_error" format="reference" />
     <attr name="cpp_card_style" format="reference" />
-    <attr name="cpp_toolbar_theme" format="reference" />
+    <attr name="cpp_toolbar_style" format="reference" />
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 19fef6e7..9b3385d4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -326,12 +326,15 @@
         <item name="android:padding">0dp</item>
     </style>
 
-    <style name="CppToolbar" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+    <style name="CppToolbar" parent="@style/Widget.AppCompat.Toolbar">
         <item name="android:background">@color/cpp_material_actionbar</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
     </style>
 
     <style name="CppToolbar.Light" parent="CppToolbar">
         <item name="android:background">@color/cpp_material_actionbar_light</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
     <style name="CppAd">
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 84e6d22e..3c854695 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -35,7 +35,7 @@
         <item name="cpp_text_color">@color/cpp_text</item>
         <item name="cpp_text_color_error">@color/cpp_text_error</item>
         <item name="cpp_card_style">@style/CardView.Dark</item>
-        <item name="cpp_toolbar_theme">@style/CppToolbar</item>
+        <item name="cpp_toolbar_style">@style/CppToolbar</item>
 
         <item name="android:listDivider">@drawable/divider_dark</item>
     </style>
@@ -62,7 +62,7 @@
         <item name="cpp_fab_bg">@color/grey_900</item>
         <item name="cpp_text_color">@color/cpp_text</item>
         <item name="cpp_text_color_error">@color/cpp_text_error</item>
-        <item name="cpp_toolbar_theme">@style/CppToolbar</item>
+        <item name="cpp_toolbar_style">@style/CppToolbar</item>
 
         <item name="android:listDivider">@drawable/divider_dark</item>
     </style>
@@ -77,7 +77,7 @@
         <item name="cpp_fab_bg">@color/grey_900</item>
         <item name="cpp_text_color">@color/cpp_text</item>
         <item name="cpp_text_color_error">@color/cpp_text_error</item>
-        <item name="cpp_toolbar_theme">@style/CppToolbar</item>
+        <item name="cpp_toolbar_style">@style/CppToolbar</item>
 
         <item name="android:listDivider">@drawable/divider_dark</item>
     </style>
@@ -95,7 +95,7 @@
         <item name="cpp_text_color">@color/cpp_text_inverse</item>
         <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
         <item name="cpp_card_style">@style/CardView.Light</item>
-        <item name="cpp_toolbar_theme">@style/CppToolbar.Light</item>
+        <item name="cpp_toolbar_style">@style/CppToolbar.Light</item>
 
         <item name="android:listDivider">@drawable/divider</item>
     </style>
@@ -115,7 +115,7 @@
         <item name="cpp_fab_bg">@color/cpp_material_light</item>
         <item name="cpp_text_color">@color/cpp_text_inverse</item>
         <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
-        <item name="cpp_toolbar_theme">@style/CppToolbar.Light</item>
+        <item name="cpp_toolbar_style">@style/CppToolbar.Light</item>
 
         <item name="android:listDivider">@drawable/divider</item>
     </style>
@@ -130,7 +130,7 @@
         <item name="cpp_fab_bg">@color/cpp_material_light</item>
         <item name="cpp_text_color">@color/cpp_text_inverse</item>
         <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
-        <item name="cpp_toolbar_theme">@style/CppToolbar.Light</item>
+        <item name="cpp_toolbar_style">@style/CppToolbar.Light</item>
 
         <item name="android:listDivider">@drawable/divider</item>
     </style>