diff --git a/src/main/res/layout/fragment.xml b/src/main/res/layout/fragment.xml
index 34bf5fd..c107a21 100644
--- a/src/main/res/layout/fragment.xml
+++ b/src/main/res/layout/fragment.xml
@@ -17,7 +17,7 @@
       android:id="@+id/toolbar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:popupTheme="@style/Theme.Toolbar.Popup" />
+      android:popupTheme="@style/Theme.Main.Toolbar.Popup" />
 
     <FrameLayout
       android:id="@+id/toolbar_extra"
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index e6f7182..1839bce 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+  <color name="background_light">#fffafafa</color>
   <color name="primary_light">#ff262c38</color>
   <color name="primary_dark_light">#ff21242b</color>
   <color name="accent_default_light">#ff1976d2</color>
   <color name="error_default_light">#ffff1d18</color>
+  <color name="background_dark">#ff111111</color>
   <color name="primary_dark">#ff262c38</color>
   <color name="primary_dark_dark">#ff21242b</color>
   <color name="accent_default_dark">#ff47a2fc</color>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index eb5ed2a..17b3fe6 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -4,7 +4,8 @@
   <style name="Theme.Main.Light" parent="@android:style/Theme.Material.Light.DarkActionBar">
     <item name="android:windowActionBar">false</item>
     <item name="android:windowNoTitle">true</item>
-    <item name="android:colorBackground">#fffafafa</item>
+    <item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
+    <item name="android:colorBackground">@color/background_light</item>
     <item name="android:colorPrimary">@color/primary_light</item>
     <item name="android:colorPrimaryDark">@color/primary_dark_light</item>
     <item name="android:colorAccent">@color/accent_light</item>
@@ -15,7 +16,8 @@
   <style name="Theme.Main.Dark" parent="@android:style/Theme.Material">
     <item name="android:windowActionBar">false</item>
     <item name="android:windowNoTitle">true</item>
-    <item name="android:colorBackground">#ff111111</item>
+    <item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
+    <item name="android:colorBackground">@color/background_dark</item>
     <item name="android:colorPrimary">@color/primary_dark</item>
     <item name="android:colorPrimaryDark">@color/primary_dark_dark</item>
     <item name="android:colorAccent">@color/accent_dark</item>
@@ -23,7 +25,13 @@
     <item name="colorError">@color/error_dark</item>
   </style>
 
-  <style name="Theme.Toolbar.Popup" parent="Theme.Main.Dark">
+  <style name="Widget.Main.Toolbar" parent="@android:style/Widget.Material.Toolbar">
+    <!-- Fixes invalid text style on Samsung devices -->
+    <item name="android:titleTextAppearance">@android:style/TextAppearance.Material.Widget.Toolbar.Title</item>
+    <item name="android:subtitleTextAppearance">@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle</item>
+  </style>
+
+  <style name="Theme.Main.Toolbar.Popup" parent="Theme.Main.Dark">
     <item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
   </style>