diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
index 0440afc54..04fd4ea56 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
@@ -126,6 +126,13 @@ public class Themes {
         return new RecoloredDrawable(drawable, getAccentColor());
     }
 
+    public static Drawable recolorDrawableToolbar(Drawable drawable) {
+        if (drawable == null) {
+            return null;
+        }
+        return new RecoloredDrawable(drawable, getHeaderText());
+    }
+
     public static ColorStateList recolorCSL(ColorStateList colorStateList) {
         if (colorStateList == null) {
             return null;
diff --git a/smali/res/drawable-v21/picker_white_ripple_unbounded.xml b/smali/res/drawable-v21/picker_white_ripple_unbounded.xml
index cef0def7b..ccec1c4ac 100644
--- a/smali/res/drawable-v21/picker_white_ripple_unbounded.xml
+++ b/smali/res/drawable-v21/picker_white_ripple_unbounded.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="#30ffffff"
+<ripple android:color="?header_text"
     xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/smali/res/drawable/toolbar_white_text_cursor_drawable.xml b/smali/res/drawable/toolbar_white_text_cursor_drawable.xml
index 235aa16e7..4bcf19b20 100644
--- a/smali/res/drawable/toolbar_white_text_cursor_drawable.xml
+++ b/smali/res/drawable/toolbar_white_text_cursor_drawable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/toolbar_white_textColorSecondary" />
+    <solid android:color="?header_text" />
     <size android:width="1.0dip" />
 </shape>
\ No newline at end of file
diff --git a/smali/res/layout/catalog_search_parameters_view.xml b/smali/res/layout/catalog_search_parameters_view.xml
index b201498af..874830893 100644
--- a/smali/res/layout/catalog_search_parameters_view.xml
+++ b/smali/res/layout/catalog_search_parameters_view.xml
@@ -20,7 +20,7 @@
             android:layout_height="56.0dip"
             android:src="@drawable/ic_search_params_24"
             android:scaleType="centerInside"
-            android:tint="?accent"
+            android:tint="?header_text"
             android:contentDescription="@null" />
 
         <LinearLayout
diff --git a/smali/res/layout/discover_fragment.xml b/smali/res/layout/discover_fragment.xml
index 6625e2741..a13a3c63d 100644
--- a/smali/res/layout/discover_fragment.xml
+++ b/smali/res/layout/discover_fragment.xml
@@ -36,6 +36,7 @@
                     android:background="@drawable/picker_white_ripple_unbounded"
                     android:layout_width="48.0dip"
                     android:layout_height="48.0dip"
+                    android:tint="?header_text"
                     android:src="@drawable/ic_friend_add_24"
                     android:scaleType="centerInside" />
 
diff --git a/smali/res/layout/fragment_parametrized_search.xml b/smali/res/layout/fragment_parametrized_search.xml
index 4f740b526..32a6dc132 100644
--- a/smali/res/layout/fragment_parametrized_search.xml
+++ b/smali/res/layout/fragment_parametrized_search.xml
@@ -32,7 +32,7 @@
                 android:layout_height="56.0dip"
                 android:src="@drawable/ic_search_params_24"
                 android:scaleType="centerInside"
-                android:tint="?button_outline_border" />
+                android:tint="?header_text" />
 
             <LinearLayout
                 android:layout_gravity="center"
diff --git a/smali/res/layout/gateways_fragment.xml b/smali/res/layout/gateways_fragment.xml
index 3e75ce6ad..90092f42e 100644
--- a/smali/res/layout/gateways_fragment.xml
+++ b/smali/res/layout/gateways_fragment.xml
@@ -36,6 +36,7 @@
                     android:background="@drawable/picker_white_ripple_unbounded"
                     android:layout_width="48.0dip"
                     android:layout_height="48.0dip"
+                    android:tint="?header_text"
                     android:src="@drawable/ic_friend_add_24"
                     android:scaleType="centerInside" />
 
diff --git a/smali/res/layout/recover_search.xml b/smali/res/layout/recover_search.xml
index daecf95eb..309a27907 100644
--- a/smali/res/layout/recover_search.xml
+++ b/smali/res/layout/recover_search.xml
@@ -54,7 +54,7 @@
                         android:layout_height="56.0dip"
                         android:src="@drawable/ic_search_params_24"
                         android:scaleType="centerInside"
-                        android:tint="#ff528bcc" />
+                        android:tint="?header_text" />
 
                     <LinearLayout
                         android:layout_gravity="center"
diff --git a/smali/res/layout/view_modern_search.xml b/smali/res/layout/view_modern_search.xml
index a17a81faa..3e71400e0 100644
--- a/smali/res/layout/view_modern_search.xml
+++ b/smali/res/layout/view_modern_search.xml
@@ -64,7 +64,7 @@
             android:layout_height="40.0dip"
             android:src="@drawable/ic_search_params_24"
             android:scaleType="centerInside"
-            android:tint="#ff909499" />
+            android:tint="?header_text" />
 
         <ImageView
             android:layout_gravity="center_vertical"
diff --git a/smali/res/layout/vkim_chat_settings_title_avatar.xml b/smali/res/layout/vkim_chat_settings_title_avatar.xml
index 6245be619..4770a9b23 100644
--- a/smali/res/layout/vkim_chat_settings_title_avatar.xml
+++ b/smali/res/layout/vkim_chat_settings_title_avatar.xml
@@ -42,9 +42,10 @@
 
         <EditText
             android:textSize="16.0sp"
-            android:textColor="#ff2c2d2e"
+            android:textColor="?text_primary"
             android:id="@id/title"
             android:background="@drawable/vkui_bg_field_nonfocusable"
+            android:backgroundTint="?background_page"
             android:paddingTop="13.0dip"
             android:paddingBottom="11.0dip"
             android:fadingEdgeLength="6.0dip"
diff --git a/smali/res/menu/add.xml b/smali/res/menu/add.xml
index f20b2d27b..666406973 100644
--- a/smali/res/menu/add.xml
+++ b/smali/res/menu/add.xml
@@ -3,6 +3,7 @@
     <item
         android:icon="@drawable/ic_add_24"
         android:id="@id/add"
+        android:tint="?header_text"
         android:title="@string/add"
         android:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/board_topic_view_fragment.xml b/smali/res/menu/board_topic_view_fragment.xml
index b51824b25..77197a9b7 100644
--- a/smali/res/menu/board_topic_view_fragment.xml
+++ b/smali/res/menu/board_topic_view_fragment.xml
@@ -3,6 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@id/copy_link"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/copy_link"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/close.xml b/smali/res/menu/close.xml
index 77cf9f472..b98383ef6 100644
--- a/smali/res/menu/close.xml
+++ b/smali/res/menu/close.xml
@@ -4,6 +4,8 @@
     <item
         android:icon="@drawable/ic_temp_close"
         android:id="@id/close"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/close"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/communities_add.xml b/smali/res/menu/communities_add.xml
index 232797a95..4e2528833 100644
--- a/smali/res/menu/communities_add.xml
+++ b/smali/res/menu/communities_add.xml
@@ -6,5 +6,8 @@
         android:id="@id/add"
         android:title="@string/action_create_group"
         android:showAsAction="always"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/documents.xml b/smali/res/menu/documents.xml
index bab508bfa..cca05672c 100644
--- a/smali/res/menu/documents.xml
+++ b/smali/res/menu/documents.xml
@@ -5,6 +5,8 @@
         android:icon="@drawable/ic_add_24"
         android:id="@id/documents_add"
         android:visible="false"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/add"
         android:showAsAction="always"
         app:showAsAction="always" />
@@ -12,6 +14,8 @@
         android:icon="@drawable/ic_search_24"
         android:id="@id/documents_search"
         android:visible="false"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/add"
         android:showAsAction="always"
         app:showAsAction="always" />
diff --git a/smali/res/menu/fave_tab_menu.xml b/smali/res/menu/fave_tab_menu.xml
index 64c1da6f3..e25ba2cae 100644
--- a/smali/res/menu/fave_tab_menu.xml
+++ b/smali/res/menu/fave_tab_menu.xml
@@ -6,5 +6,7 @@
         android:id="@id/tags"
         android:title="@string/fave_tag_icon_title"
         app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/friends.xml b/smali/res/menu/friends.xml
index c36bde997..4ce493bb7 100644
--- a/smali/res/menu/friends.xml
+++ b/smali/res/menu/friends.xml
@@ -5,6 +5,8 @@
         android:icon="@drawable/ic_add_24"
         android:id="@id/friends_add"
         android:title="@string/add"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:showAsAction="always"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/good.xml b/smali/res/menu/good.xml
index 0fb9bc225..bb5a1606c 100644
--- a/smali/res/menu/good.xml
+++ b/smali/res/menu/good.xml
@@ -4,6 +4,8 @@
     <item
         android:icon="@drawable/ic_market_28"
         android:id="@id/menu_cart"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/market_cart"
         app:showAsAction="always" />
     <item
diff --git a/smali/res/menu/live_tabs_menu.xml b/smali/res/menu/live_tabs_menu.xml
index f4e5ca304..412ea0b7d 100644
--- a/smali/res/menu/live_tabs_menu.xml
+++ b/smali/res/menu/live_tabs_menu.xml
@@ -4,6 +4,9 @@
     <item
         android:icon="@drawable/ic_add_24"
         android:id="@id/tags"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         android:title="@string/camera_ui_live_start"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/menu_done.xml b/smali/res/menu/menu_done.xml
index 47df36855..c8daafdd0 100644
--- a/smali/res/menu/menu_done.xml
+++ b/smali/res/menu/menu_done.xml
@@ -5,6 +5,7 @@
         android:icon="@drawable/ic_done_24"
         android:id="@id/done"
         android:title="@string/save"
-        app:iconTint="?im_app_icon_toolbar"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/menu_fragment.xml b/smali/res/menu/menu_fragment.xml
index 416799241..146292bd9 100644
--- a/smali/res/menu/menu_fragment.xml
+++ b/smali/res/menu/menu_fragment.xml
@@ -4,6 +4,9 @@
     <item
         android:icon="@drawable/ic_settings_24"
         android:id="@id/menu_settings"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         android:title="@string/menu_settings"
         android:showAsAction="always"
         app:showAsAction="always" />
diff --git a/smali/res/menu/poll_viewer.xml b/smali/res/menu/poll_viewer.xml
index e46aa1872..e348e952b 100644
--- a/smali/res/menu/poll_viewer.xml
+++ b/smali/res/menu/poll_viewer.xml
@@ -4,6 +4,8 @@
     <item
         android:icon="@drawable/ic_write_24"
         android:id="@id/edit"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/edit"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/price_filter.xml b/smali/res/menu/price_filter.xml
index ad2427f5b..ef59575b2 100644
--- a/smali/res/menu/price_filter.xml
+++ b/smali/res/menu/price_filter.xml
@@ -4,8 +4,9 @@
     <item
         android:icon="@drawable/ic_check_24"
         android:id="@id/ok"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/ok"
         android:showAsAction="always"
-        app:menuTint="?header_text"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/profile.xml b/smali/res/menu/profile.xml
index 6704dfb32..900b08283 100644
--- a/smali/res/menu/profile.xml
+++ b/smali/res/menu/profile.xml
@@ -7,18 +7,24 @@
     <item
         android:icon="@drawable/vkui_ic_voip_call_24"
         android:id="@id/call"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:visible="false"
         android:title="@string/voip_call_user"
         app:showAsAction="always" />
     <item
         android:icon="@drawable/vkui_ic_voip_call_video_24"
         android:id="@id/call_video"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:visible="false"
         android:title="@string/voip_call_user"
         app:showAsAction="always" />
     <item
         android:icon="@drawable/ic_settings_24"
         android:id="@id/edit_group"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/edit_group"
         android:showAsAction="always"
         app:showAsAction="always" />
diff --git a/smali/res/menu/profile_edit.xml b/smali/res/menu/profile_edit.xml
index 0c8f70642..a7b5e9e77 100644
--- a/smali/res/menu/profile_edit.xml
+++ b/smali/res/menu/profile_edit.xml
@@ -4,6 +4,8 @@
     <item
         android:icon="@drawable/ic_check_24"
         android:id="@id/save"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/save"
         android:showAsAction="always"
         app:showAsAction="always" />
diff --git a/smali/res/menu/sms_dialogs_menu.xml b/smali/res/menu/sms_dialogs_menu.xml
index 0ccb3453b..0fe254df1 100644
--- a/smali/res/menu/sms_dialogs_menu.xml
+++ b/smali/res/menu/sms_dialogs_menu.xml
@@ -4,6 +4,8 @@
     <item
         android:icon="@drawable/libverify_ic_delete_white"
         android:id="@id/history_clear"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/notification_history_clear"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/videos.xml b/smali/res/menu/videos.xml
index 8a7103167..0a9ca5be0 100644
--- a/smali/res/menu/videos.xml
+++ b/smali/res/menu/videos.xml
@@ -4,6 +4,9 @@
     <item
         android:icon="@drawable/ic_add_24"
         android:id="@id/add"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         android:title="@string/add"
         android:showAsAction="always"
         app:showAsAction="always">
diff --git a/smali/res/menu/vkim_account_edit.xml b/smali/res/menu/vkim_account_edit.xml
index 53250d6e6..e0eb782a3 100644
--- a/smali/res/menu/vkim_account_edit.xml
+++ b/smali/res/menu/vkim_account_edit.xml
@@ -4,6 +4,9 @@
     <item
         android:icon="@drawable/ic_done_24_menu"
         android:id="@id/save"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         android:title="@string/vkim_accessibility_save"
         android:contentDescription="@string/vkim_accessibility_save"
         app:showAsAction="always" />
diff --git a/smali/res/menu/vkim_dialog_header_info_v2.xml b/smali/res/menu/vkim_dialog_header_info_v2.xml
index acc7e8a9f..c5e1333d8 100644
--- a/smali/res/menu/vkim_dialog_header_info_v2.xml
+++ b/smali/res/menu/vkim_dialog_header_info_v2.xml
@@ -7,21 +7,27 @@
             android:id="@id/call"
             android:visible="false"
             android:title="@string/vkim_msg_header_menu_call"
-            app:iconTint="?header_tint"
+            app:menuTint="?header_text"
+            android:tint="?header_text"
+            app:iconTint="?header_text"
             app:showAsAction="always" />
         <item
             android:icon="?im_ic_voip_call_video"
             android:id="@id/call_video"
             android:visible="false"
             android:title="@string/vkim_msg_header_menu_call"
-            app:iconTint="?header_tint"
+            app:menuTint="?header_text"
+            android:tint="?header_text"
+            app:iconTint="?header_text"
             app:showAsAction="always" />
         <item
             android:icon="@drawable/vkim_ic_more_vertical_24"
             android:id="@id/more"
             android:visible="false"
             android:title="@string/vkim_toolbar_more_options"
-            app:iconTint="?header_tint"
+            app:menuTint="?header_text"
+            android:tint="?header_text"
+            app:iconTint="?header_text"
             app:showAsAction="always" />
     </group>
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/vkim_dialogs_header.xml b/smali/res/menu/vkim_dialogs_header.xml
index ac8d053be..ed52d5858 100644
--- a/smali/res/menu/vkim_dialogs_header.xml
+++ b/smali/res/menu/vkim_dialogs_header.xml
@@ -5,6 +5,8 @@
         android:icon="@drawable/vkim_ic_search"
         android:id="@id/action_search"
         android:title="@string/vkim_dialogs_header_search"
-        app:iconTint="?im_app_icon_toolbar"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/vkim_dialogs_list_header.xml b/smali/res/menu/vkim_dialogs_list_header.xml
index 876b03740..21e1081fb 100644
--- a/smali/res/menu/vkim_dialogs_list_header.xml
+++ b/smali/res/menu/vkim_dialogs_list_header.xml
@@ -6,13 +6,17 @@
         android:id="@id/im_dialogs_create"
         android:title="@string/vkim_accessibility_create_dialog"
         android:showAsAction="always"
-        app:iconTint="?im_app_icon_toolbar"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         app:showAsAction="always" />
     <item
         android:icon="@drawable/ic_search_24"
         android:id="@id/im_dialogs_search"
         android:title="@string/search"
         android:showAsAction="always"
-        app:iconTint="?im_app_icon_toolbar"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/vkim_dialogs_list_header_new.xml b/smali/res/menu/vkim_dialogs_list_header_new.xml
index ff1b7396f..533df1a45 100644
--- a/smali/res/menu/vkim_dialogs_list_header_new.xml
+++ b/smali/res/menu/vkim_dialogs_list_header_new.xml
@@ -6,7 +6,9 @@
         android:id="@id/im_dialogs_search"
         android:title="@string/search"
         android:showAsAction="always"
-        app:iconTint="?header_tint"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         app:showAsAction="always" />
     <item
         android:icon="@drawable/ic_logo_vk_outline_28"
@@ -14,6 +16,8 @@
         android:visible="false"
         android:title="@string/vkim_accessibility_back_to_vk_app"
         android:showAsAction="always"
-        app:iconTint="?header_tint"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
+        app:iconTint="?header_text"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/vkim_menu_contacts.xml b/smali/res/menu/vkim_menu_contacts.xml
index 6484f02ef..d0bda5bba 100644
--- a/smali/res/menu/vkim_menu_contacts.xml
+++ b/smali/res/menu/vkim_menu_contacts.xml
@@ -5,6 +5,8 @@
         android:icon="@drawable/ic_search_theme_tinted"
         android:id="@id/vkim_search_menu"
         android:visible="true"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/search"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/vkim_menu_done.xml b/smali/res/menu/vkim_menu_done.xml
index cd1ad4ec5..0ba795c47 100644
--- a/smali/res/menu/vkim_menu_done.xml
+++ b/smali/res/menu/vkim_menu_done.xml
@@ -5,6 +5,7 @@
         android:icon="@drawable/ic_done_24"
         android:id="@id/vkim_done"
         android:title="@string/vkim_ok"
-        app:iconTint="?im_app_icon_toolbar"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/vkim_menu_search.xml b/smali/res/menu/vkim_menu_search.xml
index 6484f02ef..d0bda5bba 100644
--- a/smali/res/menu/vkim_menu_search.xml
+++ b/smali/res/menu/vkim_menu_search.xml
@@ -5,6 +5,8 @@
         android:icon="@drawable/ic_search_theme_tinted"
         android:id="@id/vkim_search_menu"
         android:visible="true"
+        app:menuTint="?header_text"
+        android:tint="?header_text"
         android:title="@string/search"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/values-v21/styles.xml b/smali/res/values-v21/styles.xml
index 10fb3eadb..823c2b0bb 100644
--- a/smali/res/values-v21/styles.xml
+++ b/smali/res/values-v21/styles.xml
@@ -48,15 +48,15 @@
     </style>
 
     <style name="ActionBarTheme.White" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="android:textColorPrimary">@color/toolbar_white_textColorPrimary</item>
-        <item name="android:textColorSecondary">@color/toolbar_white_textColorSecondary</item>
+        <item name="android:textColorPrimary">?text_primary</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
         <item name="android:titleTextAppearance">@style/ToolbarTitle</item>
         <item name="android:colorAccent">?accent</item>
         <item name="colorAccent">?accent</item>
         <item name="colorPrimary">@color/toolbar_white_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse">
@@ -248,7 +248,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
         <item name="android:selectableItemBackground">@drawable/highlight</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionMenuTextColor">?header_text</item>
         <item name="android:actionBarDivider">@null</item>
         <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
         <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
@@ -309,7 +309,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
         <item name="android:selectableItemBackground">@drawable/highlight</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionMenuTextColor">?header_text</item>
         <item name="android:actionBarDivider">@null</item>
         <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
         <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
@@ -371,7 +371,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
         <item name="android:selectableItemBackground">@drawable/highlight</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionMenuTextColor">?header_text</item>
         <item name="android:actionBarDivider">@null</item>
         <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
         <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
@@ -540,7 +540,7 @@
         <item name="statusBarColorFront">@color/toolbar_white_statusBarColorFront</item>
         <item name="tabBarBorderReference">@drawable/tab_bar_white_border</item>
         <item name="tabBarTheme">@style/TabBarTheme</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="BaseStyleNoTitle" parent="@android:style/Theme.Material.Light">
@@ -581,7 +581,7 @@
         <item name="android:layout_margin">0.0dip</item>
         <item name="android:backgroundDimEnabled">false</item>
         <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="GradientActionBarSubtitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
@@ -628,7 +628,7 @@
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:windowElevation">0.0px</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="PickerFullScreenNoStatusDialog" parent="@style/Theme.AppCompat.Light.Dialog">
@@ -654,7 +654,7 @@
         <item name="colorAccent">@color/picker_blue</item>
         <item name="colorPrimary">@color/picker_blue</item>
         <item name="colorPrimaryDark">@color/picker_blue</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="Platform.AppCompat" parent="@style/Platform.V21.AppCompat" />
diff --git a/smali/res/values-v22/styles.xml b/smali/res/values-v22/styles.xml
index 1856bfbd9..c3a6e7948 100644
--- a/smali/res/values-v22/styles.xml
+++ b/smali/res/values-v22/styles.xml
@@ -19,7 +19,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
         <item name="android:selectableItemBackground">@drawable/highlight</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionMenuTextColor">?header_text</item>
         <item name="android:actionBarDivider">@null</item>
         <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
         <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
@@ -72,7 +72,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
         <item name="android:selectableItemBackground">@drawable/highlight</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionMenuTextColor">?header_text</item>
         <item name="android:actionBarDivider">@null</item>
         <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
         <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
@@ -126,7 +126,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
         <item name="android:selectableItemBackground">@drawable/highlight</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionMenuTextColor">?header_text</item>
         <item name="android:actionBarDivider">@null</item>
         <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
         <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
diff --git a/smali/res/values-v23/styles.xml b/smali/res/values-v23/styles.xml
index 533ed1abc..e151961cb 100644
--- a/smali/res/values-v23/styles.xml
+++ b/smali/res/values-v23/styles.xml
@@ -62,7 +62,7 @@
         <item name="statusBarColorFront">@color/toolbar_white_statusBarColorFront</item>
         <item name="tabBarBorderReference">@drawable/tab_bar_white_border</item>
         <item name="tabBarTheme">@style/TabBarTheme</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="CardView" parent="@style/Base.CardView">
diff --git a/smali/res/values/colors.xml b/smali/res/values/colors.xml
index 3157b17e4..66613cbc5 100644
--- a/smali/res/values/colors.xml
+++ b/smali/res/values/colors.xml
@@ -508,7 +508,7 @@
     <color name="toolbar_milk_textColorPrimary">#ff444547</color>
     <color name="toolbar_milk_textColorSecondary">#ff909499</color>
     <color name="toolbar_white_background">@color/white_with_FixAndroidBug</color>
-    <color name="toolbar_white_searchViewTextColorHint">@color/toolbar_white_textColorSecondary
+    <color name="toolbar_white_searchViewTextColorHint">?header_text
     </color>
     <color name="toolbar_white_statusBarColorBack">@color/white_with_FixAndroidBug</color>
     <color name="toolbar_white_statusBarColorFront">#45bbbbbb</color>
diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml
index 0403f4ac8..ee786aab2 100644
--- a/smali/res/values/styles.xml
+++ b/smali/res/values/styles.xml
@@ -50,12 +50,12 @@
 
     <style name="ActionBarTheme.White" parent="@style/ThemeOverlay.AppCompat.ActionBar">
         <item name="android:textColorPrimary">@color/toolbar_white_textColorPrimary</item>
-        <item name="android:textColorSecondary">@color/toolbar_white_textColorSecondary</item>
+        <item name="android:textColorSecondary">?header_text</item>
         <item name="colorAccent">?accent</item>
         <item name="colorPrimary">@color/toolbar_white_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
@@ -178,7 +178,7 @@
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="searchViewCursorDrawable">@drawable/toolbar_milk_text_cursor_drawable</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="AvatarPickerStyle" parent="@style/TransparentTheme">
@@ -1374,7 +1374,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
         <item name="android:selectableItemBackground">@drawable/highlight</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionMenuTextColor">?header_text</item>
         <item name="android:actionBarDivider">@null</item>
         <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
         <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
@@ -1708,7 +1708,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
         <item name="android:selectableItemBackground">@drawable/highlight</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionMenuTextColor">?header_text</item>
         <item name="android:actionBarDivider">@null</item>
         <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
         <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
@@ -1750,7 +1750,7 @@
     </style>
 
     <style name="BasePickerTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="BaseStyle" parent="@style/BaseTheme">
@@ -1768,7 +1768,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
         <item name="android:selectableItemBackground">@drawable/highlight</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionMenuTextColor">?header_text</item>
         <item name="android:actionBarDivider">@null</item>
         <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
         <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
@@ -1948,7 +1948,7 @@
         <item name="statusBarColorFront">@color/toolbar_white_statusBarColorFront</item>
         <item name="tabBarBorderReference">@drawable/tab_bar_white_border</item>
         <item name="tabBarTheme">@style/TabBarTheme</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="BaseStyle.WhiteToolbar.Messages" parent="@style/BaseStyle.WhiteToolbar">
@@ -2268,7 +2268,7 @@
         <item name="android:layout_gravity">center</item>
         <item name="android:layout_margin">0.0dip</item>
         <item name="android:backgroundDimEnabled">false</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="GameText">
@@ -2780,7 +2780,7 @@
         <item name="colorAccent">#ffffffff</item>
         <item name="colorPrimary">@color/picker_blue</item>
         <item name="colorPrimaryDark">@color/picker_blue</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="PickerDialogAnimation">
@@ -2802,7 +2802,7 @@
         <item name="android:layout_margin">0.0dip</item>
         <item name="android:backgroundDimEnabled">false</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
-        <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
+        <item name="toolbarIconsColor">?header_text</item>
     </style>
 
     <style name="PickerFullScreenNoStatusDialog" parent="@style/Theme.AppCompat.Light.Dialog">