diff --git a/smali/res/drawable-v21/picker_btn_blue.xml b/smali/res/drawable-v21/picker_btn_blue.xml
index 01ff29464..5519549ef 100644
--- a/smali/res/drawable-v21/picker_btn_blue.xml
+++ b/smali/res/drawable-v21/picker_btn_blue.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/picker_blue_pressed"
+<ripple android:color="?accent"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
diff --git a/smali/res/drawable-v21/picker_btn_blue_circle.xml b/smali/res/drawable-v21/picker_btn_blue_circle.xml
index 9efaf0866..fca300d77 100644
--- a/smali/res/drawable-v21/picker_btn_blue_circle.xml
+++ b/smali/res/drawable-v21/picker_btn_blue_circle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/picker_blue_pressed"
+<ripple android:color="?accent"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <selector>
diff --git a/smali/res/drawable-v21/picker_btn_blue_round.xml b/smali/res/drawable-v21/picker_btn_blue_round.xml
index 6f24429e3..c18bd90fe 100644
--- a/smali/res/drawable-v21/picker_btn_blue_round.xml
+++ b/smali/res/drawable-v21/picker_btn_blue_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/picker_blue_pressed"
+<ripple android:color="?accent"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
diff --git a/smali/res/drawable/picker_btn_blue.xml b/smali/res/drawable/picker_btn_blue.xml
index 0d34b135a..102634cb8 100644
--- a/smali/res/drawable/picker_btn_blue.xml
+++ b/smali/res/drawable/picker_btn_blue.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <solid android:color="@color/picker_blue_pressed" />
+            <solid android:color="?accent" />
         </shape>
     </item>
     <item>
diff --git a/smali/res/drawable/picker_btn_blue_circle.xml b/smali/res/drawable/picker_btn_blue_circle.xml
index f959541c8..3650c12a1 100644
--- a/smali/res/drawable/picker_btn_blue_circle.xml
+++ b/smali/res/drawable/picker_btn_blue_circle.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="oval">
-            <solid android:color="@color/picker_blue_pressed" />
+            <solid android:color="?accent" />
         </shape>
     </item>
     <item>
diff --git a/smali/res/drawable/picker_btn_blue_round.xml b/smali/res/drawable/picker_btn_blue_round.xml
index 5185005cf..07010a5e4 100644
--- a/smali/res/drawable/picker_btn_blue_round.xml
+++ b/smali/res/drawable/picker_btn_blue_round.xml
@@ -3,7 +3,7 @@
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <corners android:radius="10000.0dip" />
-            <solid android:color="@color/picker_blue_pressed" />
+            <solid android:color="?accent" />
         </shape>
     </item>
     <item>
diff --git a/smali/res/layout/fragment_attach_gallery.xml b/smali/res/layout/fragment_attach_gallery.xml
index a1e6bcca9..b24f8f084 100644
--- a/smali/res/layout/fragment_attach_gallery.xml
+++ b/smali/res/layout/fragment_attach_gallery.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <android.support.design.widget.AppBarLayout
-        android:background="?header_alternate_background"
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="?actionBarSize"
         style="@style/VKAppBar">
diff --git a/smali/res/layout/layout_sharing_footer_actions.xml b/smali/res/layout/layout_sharing_footer_actions.xml
index 6c692fb60..da4bb2a3b 100644
--- a/smali/res/layout/layout_sharing_footer_actions.xml
+++ b/smali/res/layout/layout_sharing_footer_actions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.vk.sharing.view.SharingActionsView android:orientation="horizontal"
     android:id="@id/sharing_actions_container"
-    android:background="@color/pale_grey"
+    android:background="?tabbar_background"
     android:paddingLeft="4.0dip"
     android:paddingTop="8.0dip"
     android:paddingRight="4.0dip"
diff --git a/smali/res/layout/search_params_groups.xml b/smali/res/layout/search_params_groups.xml
index 5d0afef93..3e50b63ca 100644
--- a/smali/res/layout/search_params_groups.xml
+++ b/smali/res/layout/search_params_groups.xml
@@ -3,11 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ScrollView
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fillViewport="true">
 
         <com.vtosters.lite.ui.ConstrainedLinearLayout
+            android:background="?background_content"
             android:gravity="center_horizontal"
             android:layout_gravity="center_horizontal"
             android:orientation="vertical"
@@ -103,11 +105,11 @@
 
     <TextView
         android:textSize="16.0sp"
-        android:textColor="#ffffffff"
+        android:textColor="?header_text"
         android:gravity="center"
         android:layout_gravity="bottom"
         android:id="@id/tv_apply_params"
-        android:background="@drawable/picker_btn_blue"
+        android:background="?tabbar_background"
         android:layout_width="fill_parent"
         android:layout_height="48.0dip"
         android:text="@string/discover_search_show_result"
diff --git a/smali/res/layout/search_params_people.xml b/smali/res/layout/search_params_people.xml
index c8bf8167a..8fbde4f30 100644
--- a/smali/res/layout/search_params_people.xml
+++ b/smali/res/layout/search_params_people.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ScrollView
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fillViewport="true">
@@ -15,6 +16,7 @@
             android:paddingRight="@dimen/standard_list_item_padding"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:background="?background_content"
             app:max_width="400.0dip">
 
             <include layout="@layout/discover_search_header" />
@@ -147,11 +149,11 @@
 
     <TextView
         android:textSize="16.0sp"
-        android:textColor="#ffffffff"
+        android:textColor="?header_text"
         android:gravity="center"
         android:layout_gravity="bottom"
         android:id="@id/tv_apply_params"
-        android:background="@drawable/picker_btn_blue"
+        android:background="?tabbar_background"
         android:layout_width="fill_parent"
         android:layout_height="48.0dip"
         android:text="@string/discover_search_show_result"
diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml
index 8d584d118..b6ce8501e 100644
--- a/smali/res/values/styles.xml
+++ b/smali/res/values/styles.xml
@@ -8016,7 +8016,7 @@
     </style>
 
     <style name="Widget.Design.BottomSheet.Modal" parent="@android:style/Widget">
-        <item name="android:background">?android:colorBackground</item>
+        <item name="android:background">?background_content</item>
         <item name="behavior_hideable">true</item>
         <item name="behavior_peekHeight">auto</item>
         <item name="behavior_skipCollapsed">false</item>
diff --git a/smali/smali/com/vk/sharing/view/SharingActionsView$a.smali b/smali/smali/com/vk/sharing/view/SharingActionsView$a.smali
index a1a714752..601d4d6a5 100644
--- a/smali/smali/com/vk/sharing/view/SharingActionsView$a.smali
+++ b/smali/smali/com/vk/sharing/view/SharingActionsView$a.smali
@@ -203,11 +203,7 @@
     invoke-virtual {v0, v1}, Landroid/text/TextPaint;->setTextSize(F)V
 
     .line 180
-    iget-object v0, p0, Lcom/vk/sharing/view/SharingActionsView$a;->l:Landroid/text/TextPaint;
-
-    const v1, 0x7f0600ab
-
-    invoke-static {p1, v1}, Landroid/support/v4/content/ContextCompat;->c(Landroid/content/Context;I)I
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getHeaderText()I
 
     move-result v1