diff --git a/smali/res/drawable-v21/vkui_bg_button_white.xml b/smali/res/drawable-v21/vkui_bg_button_white.xml
index a544c5d2e..d912734ea 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="?accent" />
+                    <solid android:color="?header_text" />
                     <corners android:radius="@dimen/vkui_button_corner_big_radius" />
                 </shape>
             </item>
@@ -12,7 +12,7 @@
     </item>
     <item>
         <shape>
-            <solid android:color="?accent" />
+            <solid android:color="?header_text" />
             <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 56b597095..e76a7bf8f 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="?accent" />
+            <solid android:color="?header_text" />
             <corners android:radius="@dimen/vkui_button_corner_big_radius" />
         </shape>
     </item>
diff --git a/smali/res/layout/attachpicker_fragment_documents.xml b/smali/res/layout/attachpicker_fragment_documents.xml
index 97c452588..d6761cdfe 100644
--- a/smali/res/layout/attachpicker_fragment_documents.xml
+++ b/smali/res/layout/attachpicker_fragment_documents.xml
@@ -35,9 +35,9 @@
             android:background="?header_alternate_background"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            app:tabIndicatorColor="?accent"
-            app:tabSelectedTextColor="?accent"
-            app:tabTextColor="@color/azure_100_muted" />
+            app:tabIndicatorColor="?header_tab_active_indicator"
+            app:tabSelectedTextColor="?header_tab_active_text"
+            app:tabTextColor="?header_tab_inactive_text" />
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v4.view.ViewPager
diff --git a/smali/res/layout/catalog_fragment.xml b/smali/res/layout/catalog_fragment.xml
index 93c83dd2a..9c10d29b2 100644
--- a/smali/res/layout/catalog_fragment.xml
+++ b/smali/res/layout/catalog_fragment.xml
@@ -24,11 +24,11 @@
             android:layout_width="wrap_content"
             android:layout_height="48.0dip"
             app:tabGravity="fill"
-            app:tabIndicatorColor="?accent"
+            app:tabIndicatorColor="?header_tab_active_indicator"
             app:tabMaxWidth="0.0dip"
             app:tabMode="scrollable"
-            app:tabSelectedTextColor="?text_primary"
-            app:tabTextColor="?text_secondary"
+            app:tabSelectedTextColor="?header_tab_active_text"
+            app:tabTextColor="?header_tab_inactive_text"
             style="@style/CatalogTabLayout" />
     </android.support.design.widget.AppBarLayout>
 
diff --git a/smali/res/layout/fave_tab_fragment.xml b/smali/res/layout/fave_tab_fragment.xml
index e529e00e3..9552c7bad 100644
--- a/smali/res/layout/fave_tab_fragment.xml
+++ b/smali/res/layout/fave_tab_fragment.xml
@@ -29,7 +29,7 @@
 
                 <TextView
                     android:textSize="20.0sp"
-                    android:textColor="?text_primary"
+                    android:textColor="?header_text"
                     android:id="@id/title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
 
                 <TextView
                     android:textSize="14.0sp"
-                    android:textColor="?text_secondary"
+                    android:textColor="?header_text"
                     android:ellipsize="end"
                     android:id="@id/subtitle"
                     android:visibility="gone"
@@ -55,11 +55,11 @@
             android:layout_width="wrap_content"
             android:layout_height="48.0dip"
             app:tabGravity="fill"
-            app:tabIndicatorColor="?accent"
+            app:tabIndicatorColor="?header_tab_active_indicator"
             app:tabMaxWidth="0.0dip"
             app:tabMode="scrollable"
-            app:tabSelectedTextColor="?text_primary"
-            app:tabTextColor="?text_secondary" />
+            app:tabSelectedTextColor="?header_tab_active_text"
+            app:tabTextColor="?header_tab_inactive_text" />
     </android.support.design.widget.AppBarLayout>
 
     <ProgressBar
diff --git a/smali/res/layout/feed_likes_filter_view.xml b/smali/res/layout/feed_likes_filter_view.xml
index c06206d1e..0fd1ba414 100644
--- a/smali/res/layout/feed_likes_filter_view.xml
+++ b/smali/res/layout/feed_likes_filter_view.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <android.support.design.widget.TabLayout
-        android:background="?background_content"
+        android:background="?header_background"
         android:id="@id/feed_likes_tablayout"
         android:layout_width="fill_parent"
         android:layout_height="@dimen/feed_likes_filter_height"
@@ -14,12 +14,12 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tabBackground="?background_content"
+        app:tabBackground="?header_background"
         app:tabGravity="fill"
-        app:tabIndicatorColor="?accent"
+        app:tabIndicatorColor="?header_tab_active_indicator"
         app:tabMaxWidth="0.0dip"
         app:tabMode="scrollable"
-        app:tabSelectedTextColor="?accent"
+        app:tabSelectedTextColor="?header_tab_active_text"
         app:tabTextAppearance="@style/FeedLikesTabStyle"
-        app:tabTextColor="?text_primary" />
+        app:tabTextColor="?header_tab_inactive_text" />
 </merge>
\ No newline at end of file
diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml
index 3fca514c8..8d584d118 100644
--- a/smali/res/values/styles.xml
+++ b/smali/res/values/styles.xml
@@ -3657,7 +3657,7 @@
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">48.0dip</item>
         <item name="tabGravity">fill</item>
-        <item name="tabIndicatorColor">?header_tab_active_text</item>
+        <item name="tabIndicatorColor">?header_tab_active_indicator</item>
         <item name="tabIndicatorHeight">2.5dip</item>
         <item name="tabMaxWidth">0.0dip</item>
         <item name="tabMode">fixed</item>