diff --git a/smali/res/drawable-v21/vkui_bg_button_white.xml b/smali/res/drawable-v21/vkui_bg_button_white.xml
index d912734ea..22e1f1a47 100644
--- a/smali/res/drawable-v21/vkui_bg_button_white.xml
+++ b/smali/res/drawable-v21/vkui_bg_button_white.xml
@@ -4,7 +4,7 @@
         <ripple android:color="@color/overlay">
             <item>
                 <shape>
-                    <solid android:color="?header_text" />
+                    <solid android:color="?header_background" />
                     <corners android:radius="@dimen/vkui_button_corner_big_radius" />
                 </shape>
             </item>
@@ -12,7 +12,7 @@
     </item>
     <item>
         <shape>
-            <solid android:color="?header_text" />
+            <solid android:color="?header_background" />
             <corners android:radius="@dimen/vkui_button_corner_big_radius" />
         </shape>
     </item>
diff --git a/smali/res/drawable/vkui_bg_button_white.xml b/smali/res/drawable/vkui_bg_button_white.xml
index e76a7bf8f..2fe3df110 100644
--- a/smali/res/drawable/vkui_bg_button_white.xml
+++ b/smali/res/drawable/vkui_bg_button_white.xml
@@ -14,7 +14,7 @@
     </item>
     <item>
         <shape>
-            <solid android:color="?header_text" />
+            <solid android:color="?header_background" />
             <corners android:radius="@dimen/vkui_button_corner_big_radius" />
         </shape>
     </item>
diff --git a/smali/res/layout-sw600dp/music_user_music1.xml b/smali/res/layout-sw600dp/music_user_music1.xml
index e19a7afd1..92f957c6a 100644
--- a/smali/res/layout-sw600dp/music_user_music1.xml
+++ b/smali/res/layout-sw600dp/music_user_music1.xml
@@ -41,7 +41,7 @@
             android:layout_height="48.0dip"
             app:tabBackground="@drawable/music_tab_bg"
             app:tabGravity="center"
-            app:tabIndicatorColor="@color/white" />
+            app:tabIndicatorColor="?header_tab_active_indicator" />
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v4.view.ViewPager
diff --git a/smali/res/layout/music_user_music1.xml b/smali/res/layout/music_user_music1.xml
index 8da8e4210..e09504bab 100644
--- a/smali/res/layout/music_user_music1.xml
+++ b/smali/res/layout/music_user_music1.xml
@@ -45,7 +45,7 @@
             android:minHeight="48.0dip"
             app:tabBackground="@drawable/music_tab_bg"
             app:tabGravity="fill"
-            app:tabIndicatorColor="@color/white"
+            app:tabIndicatorColor="?header_tab_active_indicator"
             app:tabMaxWidth="0.0dip"
             app:tabMode="fixed" />
     </android.support.design.widget.AppBarLayout>
diff --git a/smali/res/menu/store.xml b/smali/res/menu/store.xml
index ce541ecf9..d4a5de8f8 100644
--- a/smali/res/menu/store.xml
+++ b/smali/res/menu/store.xml
@@ -4,6 +4,7 @@
     <item
         android:icon="@drawable/ic_settings_24"
         android:id="@id/settings"
+        app:menuTint="?header_text"
         android:title="@string/menu_settings"
         android:showAsAction="always"
         app:showAsAction="always" />
diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml
index b6ce8501e..edb103e57 100644
--- a/smali/res/values/styles.xml
+++ b/smali/res/values/styles.xml
@@ -4341,7 +4341,7 @@
     </style>
 
     <style name="VKUIButton.White" parent="@style/VKUIButton">
-        <item name="android:textColor">@color/vkui_white_button_text</item>
+        <item name="android:textColor">?header_text</item>
         <item name="android:background">@drawable/vkui_bg_button_white</item>
     </style>