diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp
index db9955a750..ecd04d5042 100644
--- a/drape_frontend/stylist.cpp
+++ b/drape_frontend/stylist.cpp
@@ -17,15 +17,15 @@ namespace
 {
 enum Type
 {
-  Line      =               1,
-  Area      = Line       << 1,
-  Symbol    = Area       << 1,
-  Caption   = Symbol     << 1,
-  Circle    = Caption    << 1,
-  PathText  = Circle     << 1,
-  Waymarker = PathText   << 1,
-  Shield    = Waymarker  << 1,
-  CountOfType = PathText + 1
+  Line      = 1 << 0,
+  Area      = 1 << 1,
+  Symbol    = 1 << 2,
+  Caption   = 1 << 3,
+  Circle    = 1 << 4,
+  PathText  = 1 << 5,
+  Waymarker = 1 << 6,
+  Shield    = 1 << 7,
+  CountOfType = Shield + 1
 };
 
 inline drule::rule_type_t Convert(Type t)
@@ -52,7 +52,7 @@ inline bool IsTypeOf(drule::Key const & key, int flags)
   int currentFlag = Line;
   while (currentFlag < CountOfType)
   {
-    Type type = Type(flags & currentFlag);
+    Type const type = Type(flags & currentFlag);
     if (type != 0 && key.m_type == Convert(type))
       return true;
 
@@ -62,11 +62,6 @@ inline bool IsTypeOf(drule::Key const & key, int flags)
   return false;
 }
 
-bool IsMiddleTunnel(int const layer, double const depth)
-{
-  return layer != feature::LAYER_EMPTY && depth < 19000;
-}
-
 class Aggregator
 {
 public:
@@ -109,11 +104,23 @@ private:
   void ProcessKey(drule::Key const & key)
   {
     double depth = key.m_priority;
-    if (IsMiddleTunnel(m_depthLayer, depth) && IsTypeOf(key, Line))
+    if (m_depthLayer != feature::LAYER_EMPTY)
     {
-      double const layerPart = m_depthLayer * drule::layer_base_priority;
-      double const depthPart = fmod(depth, drule::layer_base_priority);
-      depth = layerPart + depthPart;
+      if (IsTypeOf(key, Line))
+      {
+        double const layerPart = m_depthLayer * drule::layer_base_priority;
+        double const depthPart = fmod(depth, drule::layer_base_priority);
+        depth = layerPart + depthPart;
+      }
+      else if (IsTypeOf(key, Area))
+      {
+        // Area styles have big negative priorities (like -15000), so just add layer correction.
+        depth += m_depthLayer * drule::layer_base_priority;
+      }
+      else
+      {
+        /// @todo Take into account depth-layer for "point-styles". Like priority in OverlayHandle?
+      }
     }
 
     drule::BaseRule const * const dRule = drule::rules().Find(key);
@@ -137,9 +144,6 @@ private:
   void Init()
   {
     m_depthLayer = m_f.GetLayer();
-    if (m_depthLayer == feature::LAYER_TRANSPARENT_TUNNEL)
-      m_depthLayer = feature::LAYER_EMPTY;
-
     if (m_geomType == feature::GeomType::Point)
       m_priorityModifier = (double)m_f.GetPopulation() / 7E9;
     else
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index c720f38281..55b596d8ef 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -935,11 +935,12 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
       {"layer", "*",
        [&params](string & /* k */, string & v) {
          // Get layer.
-         if (params.layer == 0)
+         if (params.layer == feature::LAYER_EMPTY)
          {
+           // atoi error value (0) should match empty layer constant.
+           static_assert(feature::LAYER_EMPTY == 0);
            params.layer = atoi(v.c_str());
-           int8_t const bound = 10;
-           params.layer = base::Clamp(params.layer, static_cast<int8_t>(-bound), bound);
+           params.layer = base::Clamp(params.layer, int8_t(feature::LAYER_LOW), int8_t(feature::LAYER_HIGH));
          }
        }},
   });
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 6bb27e3df0..ef91dbdff0 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -174,7 +174,7 @@ uint8_t CalculateHeader(size_t const typesCount, HeaderGeomType const headerGeom
   if (!params.name.IsEmpty())
     header |= HEADER_MASK_HAS_NAME;
 
-  if (params.layer != 0)
+  if (params.layer != LAYER_EMPTY)
     header |= HEADER_MASK_HAS_LAYER;
 
   header |= static_cast<uint8_t>(headerGeomType);
@@ -235,7 +235,7 @@ bool FeatureParamsBase::operator == (FeatureParamsBase const & rhs) const
 
 bool FeatureParamsBase::IsValid() const
 {
-  return layer > LAYER_LOW && layer < LAYER_HIGH;
+  return layer >= LAYER_LOW && layer <= LAYER_HIGH;
 }
 
 string FeatureParamsBase::DebugString() const
diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
index f5d4578555..804e1e3d51 100644
--- a/indexer/feature_data.hpp
+++ b/indexer/feature_data.hpp
@@ -43,14 +43,11 @@ namespace feature
 
   static constexpr int kMaxTypesCount = HEADER_MASK_TYPE + 1;
 
-  enum Layer
+  enum Layer : int8_t
   {
-    LAYER_LOW = -11,
-
+    LAYER_LOW = -10,
     LAYER_EMPTY = 0,
-    LAYER_TRANSPARENT_TUNNEL = 11,
-
-    LAYER_HIGH = 12
+    LAYER_HIGH = 10
   };
 
   class TypesHolder
@@ -143,7 +140,7 @@ struct FeatureParamsBase
   int8_t layer;
   uint8_t rank;
 
-  FeatureParamsBase() : layer(0), rank(0) {}
+  FeatureParamsBase() : layer(feature::LAYER_EMPTY), rank(0) {}
 
   void MakeZero();
 
diff --git a/qt/qt_common/map_widget.cpp b/qt/qt_common/map_widget.cpp
index e9a1a96bd4..45c869d9a1 100644
--- a/qt/qt_common/map_widget.cpp
+++ b/qt/qt_common/map_widget.cpp
@@ -320,6 +320,10 @@ void MapWidget::ShowInfoPopup(QMouseEvent * e, m2::PointD const & pt)
       }
     }
 
+    int const layer = ft.GetLayer();
+    if (layer != feature::LAYER_EMPTY)
+      addStringFn("Layer = " + std::to_string(layer));
+
     menu.addSeparator();
   }, m_framework.PtoG(pt));