diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 685a44a1de..7265ffacdf 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -117,10 +117,8 @@
     </style>
 
 	<style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
-        <item name="expandable_category_color">@color/group_background</item>
-		<!--<item name="android:actionDropDownStyle">@style/Widget.LightSpinner</item>-->
-		<!--<item name="actionDropDownStyle">@style/Widget.LightSpinner</item>-->
         <item name="reset_image">@drawable/ic_action_delete_light</item> <!--  @drawable/a_1_navigation_cancel_light -->
+        <item name="expandable_category_color">?android:attr/colorBackground</item>
         <item name="bottomToolBarColor">@color/tool_bar_color_light</item>
 		<item name="downloadButtonBackground">@drawable/download_light</item>
         <item name="pstsTabBackground">@color/actionbar_light_color</item>
@@ -129,14 +127,8 @@
         <item name="pstsTextColor">@color/color_white</item>
         <item name="android:actionModeBackground">@color/actionbar_light_color</item>
         <item name="actionModeBackground">@color/actionbar_light_color</item>
-		<item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
-		<item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
-		<item name="android:actionModeStyle">@style/WhiteActionMode</item>
-		<item name="actionModeStyle">@style/WhiteActionMode</item>
-		<item name="android:actionMenuTextColor">@color/color_white</item>
-		<item name="actionMenuTextColor">@color/color_white</item>
-		<item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
-		<item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
+        <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
+        <item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
 		<item name="card_bg">@drawable/bg_card_light</item>
 		<item name="ic_action_check">@drawable/ic_action_check_light</item>
 		<item name="ic_extension">@drawable/ic_extension_light</item>
@@ -151,6 +143,12 @@
 		<item name="ic_action_home2">@drawable/ic_action_home2_light</item>
 		<item name="ic_action_marker2">@drawable/ic_action_marker2_light</item>
         <item name="search_background">@color/search_background_dark</item>
+        <item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
+        <item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
+        <item name="android:actionModeStyle">@style/WhiteActionMode</item>
+        <item name="actionModeStyle">@style/WhiteActionMode</item>
+        <item name="android:actionMenuTextColor">@color/color_white</item>
+        <item name="actionMenuTextColor">@color/color_white</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -164,8 +162,8 @@
         <item name="pstsTextColor">@color/color_white</item>
         <item name="android:actionModeBackground">@color/actionbar_dark_color</item>
         <item name="actionModeBackground">@color/actionbar_dark_color</item>
-        <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
+        <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
 		<item name="card_bg">@drawable/bg_card_dark</item>
 		<item name="ic_action_check">@drawable/ic_action_check_dark</item>
 		<item name="ic_extension">@drawable/ic_extension_dark</item>
@@ -200,8 +198,6 @@
     <style name="Widget.Styled.ActionBarLight" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="background">@color/actionbar_light_color</item>
         <item name="android:background">@color/actionbar_light_color</item>
-        <item name="android:titleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
-        <item name="titleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
     </style>
 
     <style name="Widget.Styled.LightActionBarHeader" parent="@android:style/TextAppearance">