diff --git a/app/src/main/res/layout-land/activity_tabs.xml b/app/src/main/res/layout-land/activity_tabs.xml
index 5e89c09b..8669fff3 100644
--- a/app/src/main/res/layout-land/activity_tabs.xml
+++ b/app/src/main/res/layout-land/activity_tabs.xml
@@ -37,6 +37,7 @@
         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">
 
diff --git a/app/src/main/res/layout/activity_empty.xml b/app/src/main/res/layout/activity_empty.xml
index c3087597..78fefb6f 100644
--- a/app/src/main/res/layout/activity_empty.xml
+++ b/app/src/main/res/layout/activity_empty.xml
@@ -26,10 +26,12 @@
     android:id="@+id/main"
     style="@style/CppMain"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
+        app:theme="?cpp_toolbar_theme"
         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 53564df5..71d32052 100644
--- a/app/src/main/res/layout/activity_tabs.xml
+++ b/app/src/main/res/layout/activity_tabs.xml
@@ -37,6 +37,7 @@
         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">
 
@@ -60,6 +61,6 @@
     <android.support.design.widget.FloatingActionButton
         app:layout_behavior="org.solovyev.android.calculator.view.PagerViewFabBehavior"
         android:id="@+id/fab"
-        style="@style/CppFab"/>
+        style="@style/CppFab" />
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attributes.xml b/app/src/main/res/values/attributes.xml
index 1432498d..a1a14f27 100644
--- a/app/src/main/res/values/attributes.xml
+++ b/app/src/main/res/values/attributes.xml
@@ -34,5 +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" />
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 694352f6..9f69cadf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -325,16 +325,12 @@
         <item name="android:padding">0dp</item>
     </style>
 
-    <style name="CppToolbar" parent="@style/Widget.AppCompat.Toolbar">
-        <item name="background">@color/cpp_material_actionbar</item>
-        <item name="backgroundStacked">@color/cpp_material_actionbar</item>
-        <item name="backgroundSplit">@color/cpp_material_actionbar</item>
+    <style name="CppToolbar" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:background">@color/cpp_material_actionbar</item>
     </style>
 
     <style name="CppToolbar.Light" parent="CppToolbar">
-        <item name="background">@color/cpp_material_actionbar_light</item>
-        <item name="backgroundStacked">@color/cpp_material_actionbar_light</item>
-        <item name="backgroundSplit">@color/cpp_material_actionbar_light</item>
+        <item name="android:background">@color/cpp_material_actionbar_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 8dbfd44d..84e6d22e 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -35,6 +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="android:listDivider">@drawable/divider_dark</item>
     </style>
@@ -61,6 +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="android:listDivider">@drawable/divider_dark</item>
     </style>
@@ -75,6 +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="android:listDivider">@drawable/divider_dark</item>
     </style>
@@ -92,6 +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="android:listDivider">@drawable/divider</item>
     </style>
@@ -111,6 +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="android:listDivider">@drawable/divider</item>
     </style>
@@ -125,6 +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="android:listDivider">@drawable/divider</item>
     </style>