diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp
index d477559584..b59b228b0d 100644
--- a/indexer/classificator.cpp
+++ b/indexer/classificator.cpp
@@ -121,12 +121,13 @@ void ClassifObject::ConcatChildNames(string & s) const
 // Classificator implementation
 /////////////////////////////////////////////////////////////////////////////////////////
 
+namespace
+{
 Classificator & classif(MapStyle mapStyle)
 {
-  size_t const index = static_cast<size_t>(mapStyle);
-  ASSERT_LESS(index, MapStyleCount, ());
   static Classificator c[MapStyleCount];
-  return c[index];
+  return c[mapStyle];
+}
 }
 
 Classificator & classif()
diff --git a/indexer/classificator.hpp b/indexer/classificator.hpp
index 02550168f5..2db65bb822 100644
--- a/indexer/classificator.hpp
+++ b/indexer/classificator.hpp
@@ -226,5 +226,4 @@ public:
   string GetReadableObjectName(uint32_t type) const;
 };
 
-Classificator & classif(MapStyle mapStyle);
 Classificator & classif();
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index 242a299bdb..42b32d1cc6 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -45,10 +45,16 @@ namespace classificator
     LOG(LDEBUG, ("Reading of classificator started"));
 
     Platform & p = GetPlatform();
+    StyleReader & reader = GetStyleReader();
 
-    ReadCommon(p.GetReader("classificator.txt"), p.GetReader("types.txt"));
+    for (auto style : { MapStyleLight, MapStyleDark, MapStyleClear })
+    {
+      reader.SetCurrentStyle(style);
 
-    drule::LoadRules();
+      ReadCommon(p.GetReader("classificator.txt"), p.GetReader("types.txt"));
+
+      drule::LoadRules();
+    }
 
     LOG(LDEBUG, ("Reading of classificator finished"));
   }
diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 06b1aef206..6fae8f7937 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -185,12 +185,13 @@ void RulesHolder::ResizeCaches(size_t s)
   ForEachRule(bind(&BaseRule::CheckCacheSize, _4, s));
 }
 
+namespace
+{
 RulesHolder & rules(MapStyle mapStyle)
 {
-  size_t const index = static_cast<size_t>(mapStyle);
-  ASSERT_LESS(index, MapStyleCount, ());
   static RulesHolder h[MapStyleCount];
-  return h[index];
+  return h[mapStyle];
+}
 }
 
 RulesHolder & rules()
diff --git a/indexer/drawing_rules.hpp b/indexer/drawing_rules.hpp
index 27fcabf70a..6870cb869e 100644
--- a/indexer/drawing_rules.hpp
+++ b/indexer/drawing_rules.hpp
@@ -122,7 +122,6 @@ namespace drule
     void InitBackgroundColors(ContainerProto const & cp);
   };
 
-  RulesHolder & rules(MapStyle mapStyle);
   RulesHolder & rules();
 
   void LoadRules();