diff --git a/smali/res/layout/music_search_input_stub.xml b/smali/res/layout/music_search_input_stub.xml
index 8233a7b30..8544ad03a 100644
--- a/smali/res/layout/music_search_input_stub.xml
+++ b/smali/res/layout/music_search_input_stub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textColorHint="@color/music_text_hint"
+<TextView android:textColorHint="?header_text"
     android:gravity="center_vertical"
     android:paddingLeft="60.0dip"
     android:paddingRight="56.0dip"
diff --git a/smali/res/layout/music_user_music1.xml b/smali/res/layout/music_user_music1.xml
index e09504bab..7fb6d2939 100644
--- a/smali/res/layout/music_user_music1.xml
+++ b/smali/res/layout/music_user_music1.xml
@@ -32,7 +32,7 @@
                 android:layout_height="fill_parent"
                 android:src="@drawable/ic_back_24"
                 android:scaleType="centerInside"
-                android:tint="#ff909499"
+                android:tint="?header_text"
                 android:contentDescription="@string/music_talkback_go_back"
                 android:layout_marginStart="8.0dip"
                 style="@style/ActionButton.Gray" />
diff --git a/smali/res/layout/view_modern_search.xml b/smali/res/layout/view_modern_search.xml
index d67ef97e5..c8e883447 100644
--- a/smali/res/layout/view_modern_search.xml
+++ b/smali/res/layout/view_modern_search.xml
@@ -7,6 +7,7 @@
         android:orientation="horizontal"
         android:id="@id/search_box"
         android:background="@drawable/bg_modern_search"
+        android:backgroundTint="?background_content"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:layout_width="fill_parent"
@@ -20,12 +21,12 @@
             android:layout_height="48.0dip"
             android:src="@drawable/ic_back_24"
             android:scaleType="centerInside"
-            android:tint="?text_primary" />
+            android:tint="?header_text" />
 
         <com.vk.core.view.NoMenuEditText
             android:textSize="16.0dip"
             android:textColor="?header_text"
-            android:textColorHint="#ffaaaeb3"
+            android:textColorHint="?header_text_secondary"
             android:gravity="center_vertical"
             android:id="@id/query"
             android:background="@null"
@@ -42,7 +43,7 @@
         <TextView
             android:textSize="16.0dip"
             android:textColor="?header_text"
-            android:textColorHint="#ffaaaeb3"
+            android:textColorHint="?header_text_secondary"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:id="@id/query_static"
diff --git a/smali/res/values-v21/styles.xml b/smali/res/values-v21/styles.xml
index bc61c55cc..fe4eb8894 100644
--- a/smali/res/values-v21/styles.xml
+++ b/smali/res/values-v21/styles.xml
@@ -2,13 +2,13 @@
 <resources>
 
     <style name="ActionBarGrayTheme">
-        <item name="android:textColorPrimary">@color/attach_title</item>
-        <item name="android:textColorSecondary">@color/attach_title</item>
+        <item name="android:textColorPrimary">?header_text</item>
+        <item name="android:textColorSecondary">?header_text</item>
         <item name="android:selectableItemBackground">@drawable/highlight_toolbar</item>
         <item name="android:actionBarItemBackground">@drawable/highlight_icon_white_unbounded</item>
-        <item name="android:colorAccent">@color/attach_title</item>
-        <item name="colorAccent">@color/attach_title</item>
-        <item name="colorPrimary">#fffafafa</item>
+        <item name="android:colorAccent">?accent</item>
+        <item name="colorAccent">?accent</item>
+        <item name="colorPrimary">?header_background</item>
     </style>
 
     <style name="ActionBarSpinner" parent="@android:style/Widget.Material.Spinner" />
@@ -19,13 +19,13 @@
 
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="android:textColorPrimary">?header_text</item>
-        <item name="android:textColorSecondary">?header_tint</item>
+        <item name="android:textColorSecondary">?header_text</item>
         <item name="android:selectableItemBackground">@drawable/highlight_toolbar</item>
         <item name="android:actionBarItemBackground">@drawable/highlight_icon_white_unbounded</item>
         <item name="android:titleTextAppearance">@style/ToolbarTitle</item>
-        <item name="android:colorAccent">#ffffffff</item>
-        <item name="colorAccent">#ffffffff</item>
-        <item name="colorPrimary">@color/toolbar_blue_background</item>
+        <item name="android:colorAccent">?accent</item>
+        <item name="colorAccent">?accent</item>
+        <item name="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">?header_text</item>
@@ -41,7 +41,7 @@
         <item name="android:titleTextAppearance">@style/ToolbarTitle</item>
         <item name="android:colorAccent">?accent</item>
         <item name="colorAccent">?accent</item>
-        <item name="colorPrimary">@color/toolbar_milk_background</item>
+        <item name="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">@color/toolbar_milk_textColorSecondary</item>
@@ -53,7 +53,7 @@
         <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="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">?header_text</item>
diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml
index bdd9d496a..5cbe12e6d 100644
--- a/smali/res/values/styles.xml
+++ b/smali/res/values/styles.xml
@@ -30,7 +30,7 @@
         <item name="android:selectableItemBackground">@drawable/highlight_toolbar</item>
         <item name="android:actionBarItemBackground">@drawable/highlight_icon_white_unbounded</item>
         <item name="colorAccent">?header_text</item>
-        <item name="colorPrimary">@color/toolbar_blue_background</item>
+        <item name="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">?header_text</item>
@@ -54,17 +54,17 @@
         <item name="android:textColorPrimary">@color/toolbar_milk_textColorPrimary</item>
         <item name="android:textColorSecondary">@color/toolbar_milk_textColorSecondary</item>
         <item name="colorAccent">?accent</item>
-        <item name="colorPrimary">@color/toolbar_milk_background</item>
+        <item name="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">@color/toolbar_milk_textColorSecondary</item>
     </style>
 
     <style name="ActionBarTheme.White" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="android:textColorPrimary">@color/toolbar_white_textColorPrimary</item>
-        <item name="android:textColorSecondary">?header_text</item>
+        <item name="android:textColorPrimary">?header_text</item>
+        <item name="android:textColorSecondary">?header_text_secondary</item>
         <item name="colorAccent">?accent</item>
-        <item name="colorPrimary">@color/toolbar_white_background</item>
+        <item name="colorPrimary">?background_content</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">?header_text</item>
@@ -78,15 +78,15 @@
     <style name="ActionButton" parent="@style/Widget.AppCompat.Light.ActionButton" />
 
     <style name="ActionButton.Blue" parent="@style/ActionButton">
-        <item name="android:tint">@color/music_action_button_blue</item>
+        <item name="android:tint">?header_text</item>
     </style>
 
     <style name="ActionButton.Gray" parent="@style/ActionButton">
-        <item name="android:tint">@color/music_action_button_gray</item>
+        <item name="android:tint">?header_text</item>
     </style>
 
     <style name="ActionButton.White" parent="@style/ActionButton">
-        <item name="android:tint">@color/music_action_button_white</item>
+        <item name="android:tint">?header_text</item>
     </style>
 
     <style name="ActionOverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
@@ -2667,8 +2667,9 @@
     <style name="MusicSearch">
         <item name="android:textSize">16.0dip</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:textColorHint">@color/music_text_hint</item>
+        <item name="android:textColorHint">?header_text</item>
         <item name="android:background">@drawable/bg_modern_search</item>
+        <item name="android:backgroundTint">?background_content</item>
         <item name="android:maxLines">1</item>
     </style>
 
@@ -6339,7 +6340,7 @@
     <style name="VkIm.Theme.Search.Bg.VkApp" parent="@style/VkIm.Theme.Search.Bg">
         <item name="android:background">?background_content</item>
         <item name="android:text">@string/vkim_msg_search_hint</item>
-        <item name="android:textColor">?text_secondary</item>
+        <item name="android:textColor">?header_text</item>
     </style>
 
     <style name="VkIm.Theme.Search.Bg.VkMe" parent="@style/VkIm.Theme.Search.Bg">
@@ -6349,6 +6350,7 @@
 
     <style name="VkIm.Theme.Search.VkApp" parent="@style/VkIm.Theme.Search">
         <item name="search_bg">@drawable/bg_modern_search</item>
+        <item name="android:tint">?background_content</item>
     </style>
 
     <style name="VkIm.Theme.Search.VkMe" parent="@style/VkIm.Theme.Search">