diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java
index 99e6c1e1d..07287b8c3 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java
@@ -143,16 +143,20 @@ public class ThemesCore {
 //        }
 
         if (isCachedAccents()) {
-            if (!ThemesUtils.isDarkTheme()) {
-                return (themedColors.get(attrID) != 0
-                        && ACCENT_THEME_ONLY_MILK_DARK.get(attrID, true)
-                        && ACCENT_THEME_ONLY_NOMILK_LIGHT.get(attrID, true));
+            if (ThemesUtils.isDarkTheme()) {
+                return (themedColors.get(attrID) != 0 && (
+                        ThemesUtils.isMilkshake() ?
+                        ACCENT_THEME_ONLY_MILK_DARK.get(attrID, true) :
+                        ACCENT_THEME_ONLY_NOMILK.get(attrID, true)));
             } else {
-                return (themedColors.get(attrID) != 0
-                        && ACCENT_THEME_ONLY_MILK_LIGHT.get(attrID, true)
-                        && ACCENT_THEME_ONLY_NOMILK_LIGHT.get(attrID, true));
+                return (themedColors.get(attrID) != 0 && ACCENT_THEME_ONLY_LIGHT.get(attrID, true) && (
+                        ThemesUtils.isMilkshake() ?
+                        ACCENT_THEME_ONLY_MILK_LIGHT.get(attrID, true) :
+                        ACCENT_THEME_ONLY_NOMILK_LIGHT.get(attrID, true)));
             }
-        } else return themedColors.get(attrID) != 0;
+        } else {
+            return themedColors.get(attrID) != 0;
+        }
     }
 
     public static void clear() {