diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index f50b368a2..0a335c103 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -25,6 +25,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         android:textAppearance="@style/TextAppearance.Material3.ActionBar.Title"
+        android:textColor="?attr/drawer_title_color"
         android:text="@string/app_name" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a43eb799b..152459aba 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,6 +5,7 @@
     <attr name="textColorTertiary" format="color" />
 
     <attr name="drawer_header_color" format="color" />
+    <attr name="drawer_title_color" format="color" />
     <attr name="cardview_background_color" format="color" />
 
     <attr name="chart_deep_sleep" format="color" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c6768e368..03e88b183 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,11 +12,14 @@
         <item name="colorPrimaryContainer">@color/accent</item>
         <item name="colorOnPrimaryContainer">@android:color/white</item>
 
+        <item name="elevationOverlayEnabled">false</item>
+
         <item name="actionBarStyle">@style/GadgetbridgeTheme.RedActionBar</item>
         <item name="drawerArrowStyle">@style/GadgetbridgeTheme.DrawerButtonStyle</item>
         <item name="toolbarNavigationButtonStyle">@style/GadgetbridgeTheme.NavigationButtonStyle</item>
 
         <item name="drawer_header_color">?attr/colorPrimaryDark</item>
+        <item name="drawer_title_color">@android:color/white</item>
         <item name="cardview_background_color">@color/cardview_light_background</item>
         <item name="chart_deep_sleep">@color/chart_deep_sleep_light</item>
         <item name="chart_light_sleep">@color/chart_light_sleep_light</item>
@@ -40,9 +43,14 @@
         <item name="colorPrimaryContainer">@color/accent</item>
         <item name="colorOnPrimaryContainer">@android:color/white</item>
 
+        <item name="elevationOverlayEnabled">false</item>
+
         <item name="actionBarStyle">@style/GadgetbridgeTheme.RedActionBar</item>
+        <item name="drawerArrowStyle">@style/GadgetbridgeTheme.DrawerButtonStyle</item>
+        <item name="toolbarNavigationButtonStyle">@style/GadgetbridgeTheme.NavigationButtonStyle</item>
 
         <item name="drawer_header_color">?attr/colorPrimaryDark</item>
+        <item name="drawer_title_color">@android:color/white</item>
         <item name="cardview_background_color">@color/cardview_dark_background</item>
         <item name="chart_deep_sleep">@color/chart_deep_sleep_dark</item>
         <item name="chart_light_sleep">@color/chart_light_sleep_dark</item>
@@ -65,6 +73,7 @@
         <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
         <item name="drawer_header_color">?attr/colorSurface</item>
+        <item name="drawer_title_color">?attr/colorOnSurface</item>
         <item name="cardview_background_color">?attr/colorSurface</item>
         <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
     </style>
@@ -73,6 +82,7 @@
         <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
         <item name="drawer_header_color">?attr/colorSurface</item>
+        <item name="drawer_title_color">?attr/colorOnSurface</item>
         <item name="cardview_background_color">?attr/colorSurface</item>
         <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
     </style>