diff --git a/.gitignore b/.gitignore
index 4fbc17318..290cb88bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@ local.properties
 .idea/compiler.xml
 smali/assets/version.properties
 app/src/main/assets/version.properties
-smali/build/resources.zip
\ No newline at end of file
+smali/build/resources.zip
+*.idsig
diff --git a/smali/res/layout/toolbar_search_expanded.xml b/smali/res/layout/toolbar_search_expanded.xml
index 937e3f13c..57326188a 100644
--- a/smali/res/layout/toolbar_search_expanded.xml
+++ b/smali/res/layout/toolbar_search_expanded.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.vtosters.lite.ui.FullWidthLinearLayout android:theme="?actionBarTheme" android:gravity="center" android:orientation="horizontal" android:paddingRight="2.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <EditText android:textSize="16.0dip" android:textColorHint="?text_primary" android:id="@id/search_input" android:background="@null" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:hint="@string/search" android:singleLine="true" android:layout_weight="1.0" android:inputType="textFilter|textCapSentences|textNoSuggestions" android:imeOptions="actionSearch" android:textCursorDrawable="?searchViewCursorDrawable" />
+    <EditText android:textSize="16.0dip" android:textColorHint="?header_text" android:id="@id/search_input" android:background="@null" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:hint="@string/search" android:singleLine="true" android:layout_weight="1.0" android:inputType="textFilter|textCapSentences|textNoSuggestions" android:imeOptions="actionSearch" android:textCursorDrawable="?searchViewCursorDrawable" />
     <ImageView android:id="@id/search_clear" android:background="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_cancel_24" android:scaleType="center" android:tint="?icon_secondary" />
     <ImageView android:id="@id/search_voice" android:background="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_voice_24" android:scaleType="center" android:tint="?icon_secondary" />
     <ImageView android:id="@id/search_done" android:background="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_check_24" android:scaleType="center" android:tint="?icon_secondary" />
diff --git a/smali/res/menu/fave_change_tags_menu.xml b/smali/res/menu/fave_change_tags_menu.xml
index 5de7a2089..ffb697e01 100644
--- a/smali/res/menu/fave_change_tags_menu.xml
+++ b/smali/res/menu/fave_change_tags_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_write_24" android:id="@id/tags_change" android:title="@string/fave_tags_change" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_write_24" android:id="@id/tags_change" android:title="@string/fave_tags_change" app:menuTint="?header_text" app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/fave_tab_menu.xml b/smali/res/menu/fave_tab_menu.xml
index ffc98d380..7f3f10d20 100644
--- a/smali/res/menu/fave_tab_menu.xml
+++ b/smali/res/menu/fave_tab_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_tag_24" android:id="@id/tags" android:title="@string/fave_tag_icon_title" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_tag_24" android:id="@id/tags" android:title="@string/fave_tag_icon_title" app:menuTint="?header_text" 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 6d4814f58..f700b5ebc 100644
--- a/smali/res/menu/good.xml
+++ b/smali/res/menu/good.xml
@@ -2,7 +2,7 @@
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:icon="@drawable/ic_market_28" android:id="@id/menu_cart" android:title="@string/market_cart" app:showAsAction="always" />
-    <item android:id="@id/menu_fave_add_or_remove" android:title="" app:menuTint="?text_primary" />
-    <item android:id="@id/copy_link" android:title="@string/copy_link" app:menuTint="?text_primary" />
-    <item android:id="@id/report" android:title="@string/report_content" app:menuTint="?text_primary" />
+    <item android:id="@id/menu_fave_add_or_remove" android:title="" app:menuTint="?header_text" />
+    <item android:id="@id/copy_link" android:title="@string/copy_link" app:menuTint="?header_text" />
+    <item android:id="@id/report" android:title="@string/report_content" app:menuTint="?header_text" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/left_menu.xml b/smali/res/menu/left_menu.xml
index 624a1ecc2..25da5db22 100644
--- a/smali/res/menu/left_menu.xml
+++ b/smali/res/menu/left_menu.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_newsfeed_24" android:id="@id/menu_newsfeed" android:title="@string/newsfeed" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_notification_24" android:id="@id/menu_feedback" android:title="@string/not_notifications" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_message_24" android:id="@id/menu_messages" android:title="@string/messages" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_search_24" android:id="@id/menu_search" android:title="@string/search" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_user_24" android:id="@id/menu_friends" android:title="@string/friends" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_users_24" android:id="@id/menu_groups" android:title="@string/menu_groups" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_camera_24" android:id="@id/menu_photos" android:title="@string/photos" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_music_24" android:id="@id/menu_audios" android:title="@string/music" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_video_24" android:id="@id/menu_videos" android:title="@string/videos" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_live_filter_24dp" android:id="@id/menu_lives" android:title="@string/sett_live" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_podcast_24" android:id="@id/menu_podcasts" android:title="@string/podcasts" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_games_24" android:id="@id/menu_games" android:title="@string/games" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_favorite_24" android:id="@id/menu_fave" android:title="@string/fave_title" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_menu_like_24" android:id="@id/menu_feed_likes" android:title="@string/sett_likes" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_document_24" android:id="@id/menu_documents" android:title="@string/docs" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_money_transfer_24" android:id="@id/menu_payments" android:title="@string/money_transfer_money_transfers" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_help_24" android:id="@id/menu_support" android:title="@string/help" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_money_circle_24" android:id="@id/menu_vk_pay" android:title="@string/vk_pay" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_services_24" android:id="@id/menu_vk_apps" android:title="@string/menu_apps" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_settings_24" android:id="@id/menu_settings" android:title="@string/menu_settings" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_newsfeed_24" android:id="@id/menu_newsfeed" android:title="@string/newsfeed" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_notification_24" android:id="@id/menu_feedback" android:title="@string/not_notifications" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_message_24" android:id="@id/menu_messages" android:title="@string/messages" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_search_24" android:id="@id/menu_search" android:title="@string/search" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_user_24" android:id="@id/menu_friends" android:title="@string/friends" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_users_24" android:id="@id/menu_groups" android:title="@string/menu_groups" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_camera_24" android:id="@id/menu_photos" android:title="@string/photos" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_music_24" android:id="@id/menu_audios" android:title="@string/music" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_video_24" android:id="@id/menu_videos" android:title="@string/videos" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_live_filter_24dp" android:id="@id/menu_lives" android:title="@string/sett_live" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_podcast_24" android:id="@id/menu_podcasts" android:title="@string/podcasts" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_games_24" android:id="@id/menu_games" android:title="@string/games" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_favorite_24" android:id="@id/menu_fave" android:title="@string/fave_title" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_menu_like_24" android:id="@id/menu_feed_likes" android:title="@string/sett_likes" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_document_24" android:id="@id/menu_documents" android:title="@string/docs" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_money_transfer_24" android:id="@id/menu_payments" android:title="@string/money_transfer_money_transfers" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_help_24" android:id="@id/menu_support" android:title="@string/help" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_money_circle_24" android:id="@id/menu_vk_pay" android:title="@string/vk_pay" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_services_24" android:id="@id/menu_vk_apps" android:title="@string/menu_apps" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_settings_24" android:id="@id/menu_settings" android:title="@string/menu_settings" app:menuTint="?header_text" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/market.xml b/smali/res/menu/market.xml
index 4f1ce1fd4..5f768ec1f 100644
--- a/smali/res/menu/market.xml
+++ b/smali/res/menu/market.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_menu_search" android:id="@id/search" android:title="@string/search" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_menu_search" android:id="@id/search" android:title="@string/search" android:showAsAction="always" app:menuTint="?header_text" 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 ac862e357..dfa3114a2 100644
--- a/smali/res/menu/price_filter.xml
+++ b/smali/res/menu/price_filter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_check_24" android:id="@id/ok" android:title="@string/ok" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_check_24" android:id="@id/ok" 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/replies.xml b/smali/res/menu/replies.xml
index 3405d7261..6a43ca46f 100644
--- a/smali/res/menu/replies.xml
+++ b/smali/res/menu/replies.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_settings_24" android:id="@id/filter" android:title="@string/filter" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_settings_24" android:id="@id/filter" android:title="@string/filter" android:showAsAction="always" app:menuTint="?header_text" app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/search.xml b/smali/res/menu/search.xml
index f3df73a8e..1bd4b0df6 100644
--- a/smali/res/menu/search.xml
+++ b/smali/res/menu/search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" app:menuTint="?header_text" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/videos.xml b/smali/res/menu/videos.xml
index 7a8b64bce..794455ee3 100644
--- a/smali/res/menu/videos.xml
+++ b/smali/res/menu/videos.xml
@@ -3,10 +3,10 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:icon="@drawable/ic_add_24" android:id="@id/add" android:title="@string/add" android:showAsAction="always" app:showAsAction="always">
         <menu>
-            <item android:icon="@drawable/ic_camera_24" android:id="@id/add_new_video" android:title="@string/add_video_new" app:menuTint="?text_primary" />
-            <item android:icon="@drawable/ic_gallery_24" android:id="@id/add_existed" android:title="@string/add_video_existing" app:menuTint="?text_primary" />
-            <item android:icon="@drawable/ic_link_24" android:id="@id/add_link" android:title="@string/video_add_link" app:menuTint="?text_primary" />
-            <item android:icon="@drawable/ic_create_folder_24" android:id="@id/add_album" android:title="@string/create_album" app:menuTint="?text_primary" />
+            <item android:icon="@drawable/ic_camera_24" android:id="@id/add_new_video" android:title="@string/add_video_new" app:menuTint="?header_text" />
+            <item android:icon="@drawable/ic_gallery_24" android:id="@id/add_existed" android:title="@string/add_video_existing" app:menuTint="?header_text" />
+            <item android:icon="@drawable/ic_link_24" android:id="@id/add_link" android:title="@string/video_add_link" app:menuTint="?header_text" />
+            <item android:icon="@drawable/ic_create_folder_24" android:id="@id/add_album" android:title="@string/create_album" app:menuTint="?header_text" />
         </menu>
     </item>
 </menu>
\ No newline at end of file
diff --git a/smali/res/values-v21/styles.xml b/smali/res/values-v21/styles.xml
index ab3327ed6..3f3c7190b 100644
--- a/smali/res/values-v21/styles.xml
+++ b/smali/res/values-v21/styles.xml
@@ -11,7 +11,7 @@
     </style>
     <style name="ActionBarSpinner" parent="@android:style/Widget.Material.Spinner" />
     <style name="ActionBarSubtitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
-        <item name="android:textColor">#80ffffff</item>
+        <item name="android:textColor">?header_text</item>
     </style>
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="android:textColorPrimary">?header_text</item>
@@ -53,7 +53,7 @@
     </style>
     <style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse">
         <item name="android:textSize">18.0dip</item>
-        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColor">?header_text</item>
     </style>
     <style name="Base.TextAppearance.AppCompat" parent="@android:style/TextAppearance.Material" />
     <style name="Base.TextAppearance.AppCompat.Body1" parent="@android:style/TextAppearance.Material.Body1" />
@@ -423,13 +423,13 @@
         <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
     </style>
     <style name="GradientActionBarSubtitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
-        <item name="android:textColor">#b0ffffff</item>
+        <item name="android:textColor">?header_text</item>
         <item name="android:shadowColor">#26000000</item>
         <item name="android:shadowDy">@integer/s1dip</item>
         <item name="android:shadowRadius">@integer/s2dip</item>
     </style>
     <style name="GradientActionBarTitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse">
-        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColor">?header_text</item>
         <item name="android:shadowColor">#26000000</item>
         <item name="android:shadowDy">@integer/s1dip</item>
         <item name="android:shadowRadius">@integer/s2dip</item>
diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml
index 95f3913a6..11210713e 100644
--- a/smali/res/values/styles.xml
+++ b/smali/res/values/styles.xml
@@ -17,7 +17,7 @@
         <item name="android:background">@drawable/spinner_ab_holo_dark</item>
     </style>
     <style name="ActionBarSubtitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse">
-        <item name="android:textColor">#80ffffff</item>
+        <item name="android:textColor">?header_text</item>
     </style>
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="android:textColorPrimary">?header_text</item>
@@ -51,7 +51,7 @@
     </style>
     <style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
         <item name="android:textSize">18.0dip</item>
-        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColor">?header_text</item>
     </style>
     <style name="ActionButton" parent="@style/Widget.AppCompat.Light.ActionButton" />
     <style name="ActionButton.Blue" parent="@style/ActionButton">
@@ -1636,13 +1636,13 @@
         <item name="android:fontFamily">@string/font_family_medium</item>
     </style>
     <style name="GradientActionBarSubtitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse">
-        <item name="android:textColor">#b0ffffff</item>
+        <item name="android:textColor">?header_text</item>
         <item name="android:shadowColor">#26000000</item>
         <item name="android:shadowDy">@integer/s1dip</item>
         <item name="android:shadowRadius">@integer/s2dip</item>
     </style>
     <style name="GradientActionBarTitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
-        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColor">?header_text</item>
         <item name="android:shadowColor">#26000000</item>
         <item name="android:shadowDy">@integer/s1dip</item>
         <item name="android:shadowRadius">@integer/s2dip</item>