diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
index 87da6babc..2478f6031 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
@@ -1,5 +1,6 @@
 package ru.vtosters.lite.utils;
 
+import static android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
 import static ru.vtosters.lite.utils.Globals.getContext;
 import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.color_grishka;
@@ -14,6 +15,7 @@ import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.v7.widget.Toolbar;
+import android.view.View;
 import android.view.Window;
 import android.widget.ImageButton;
 
@@ -57,6 +59,23 @@ public class Themes {
         return getContext().getResources().getIdentifier("VkIm.Theme.VkApp.Amoled", "style", getContext().getPackageName());
     }
 
+    public static void setStatusBarTheme(View getview) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            getview.setSystemUiVisibility(getview.getSystemUiVisibility() + getNeededColorStatusbar());
+        }
+    }
+
+    public static int getNeededColorStatusbar() {
+        if (VKThemeHelper.d() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            return 8192;
+        }
+        return 0;
+    }
+
+    public static int getNeededColorStatusbarFix() {
+        return VKThemeHelper.d() ? 8192 : 0;
+    }
+
     public static VKTheme getDarkTheme() {
         switch (getPrefsValue("darktheme")) {
             case "amoled":
diff --git a/smali/smali_classes2/com/vtosters/lite/ui/h/NavigationDelegateLeftMenu.smali b/smali/smali_classes2/com/vtosters/lite/ui/h/NavigationDelegateLeftMenu.smali
index a9d2d6780..493f08c69 100644
--- a/smali/smali_classes2/com/vtosters/lite/ui/h/NavigationDelegateLeftMenu.smali
+++ b/smali/smali_classes2/com/vtosters/lite/ui/h/NavigationDelegateLeftMenu.smali
@@ -628,7 +628,9 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result v0
 
     .line 158
     invoke-virtual {p1, v0}, Landroid/view/View;->setSystemUiVisibility(I)V
diff --git a/smali/smali_classes3/com/vk/core/extensions/FragmentExt.smali b/smali/smali_classes3/com/vk/core/extensions/FragmentExt.smali
index a013a1a8b..4d0e06212 100644
--- a/smali/smali_classes3/com/vk/core/extensions/FragmentExt.smali
+++ b/smali/smali_classes3/com/vk/core/extensions/FragmentExt.smali
@@ -31,7 +31,9 @@
 
     move-result p0
 
-    or-int/lit16 p0, p0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result p0
 
     invoke-virtual {p1, p0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
@@ -62,7 +64,9 @@
 
     move-result p0
 
-    or-int/lit16 p0, p0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result p0
 
     invoke-virtual {p1, p0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
@@ -74,7 +78,9 @@
 
     move-result p0
 
-    and-int/lit16 p0, p0, -0x2001
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result p0
 
     invoke-virtual {p1, p0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
diff --git a/smali/smali_classes3/com/vk/extensions/ActivityExt.smali b/smali/smali_classes3/com/vk/extensions/ActivityExt.smali
index c70cb909a..a29eab63f 100644
--- a/smali/smali_classes3/com/vk/extensions/ActivityExt.smali
+++ b/smali/smali_classes3/com/vk/extensions/ActivityExt.smali
@@ -79,7 +79,9 @@
 
     move-result v0
 
-    or-int/lit16 v0, v0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result v0
 
     invoke-virtual {p0, v0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
diff --git a/smali/smali_classes4/com/vk/music/AudioPlayerActivity.smali b/smali/smali_classes4/com/vk/music/AudioPlayerActivity.smali
index 36d08c408..c1936e2f9 100644
--- a/smali/smali_classes4/com/vk/music/AudioPlayerActivity.smali
+++ b/smali/smali_classes4/com/vk/music/AudioPlayerActivity.smali
@@ -126,7 +126,9 @@
 
     move-result v1
 
-    or-int/lit16 v1, v1, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbarFix()I
+
+    move-result v1
 
     .line 68
     invoke-virtual {v0, v1}, Lcom/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout;->setSystemUiVisibility(I)V
diff --git a/smali/smali_classes4/com/vk/poll/fragments/PollEditorFragment.smali b/smali/smali_classes4/com/vk/poll/fragments/PollEditorFragment.smali
index 414602728..3cc6d57ee 100644
--- a/smali/smali_classes4/com/vk/poll/fragments/PollEditorFragment.smali
+++ b/smali/smali_classes4/com/vk/poll/fragments/PollEditorFragment.smali
@@ -4601,7 +4601,9 @@
 
     move-result p2
 
-    add-int/lit16 p2, p2, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result p2
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setSystemUiVisibility(I)V
 
diff --git a/smali/smali_classes5/com/vk/wall/thread/CommentThreadFragment.smali b/smali/smali_classes5/com/vk/wall/thread/CommentThreadFragment.smali
index d81a0ea15..f570d9457 100644
--- a/smali/smali_classes5/com/vk/wall/thread/CommentThreadFragment.smali
+++ b/smali/smali_classes5/com/vk/wall/thread/CommentThreadFragment.smali
@@ -763,7 +763,9 @@
 
     move-result v0
 
-    add-int/lit16 v0, v0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result v0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setSystemUiVisibility(I)V