diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index d03f099cab..9bfe68e103 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -574,6 +574,7 @@ namespace drule {
 
     virtual double GetTextHeight() const { return m_params.get<5>().m_v; }
     virtual int GetColor() const { return m_params.get<6>().m_v; }
+    virtual int GetStrokeColor() const {return m_params.get<8>().m_v; }
 
     static string arrKeys[9];
   };
diff --git a/indexer/drawing_rules.hpp b/indexer/drawing_rules.hpp
index d3b5f1c10c..fc13f422cc 100644
--- a/indexer/drawing_rules.hpp
+++ b/indexer/drawing_rules.hpp
@@ -55,6 +55,7 @@ namespace drule
     //@}
 
     virtual unsigned char GetAlpha () const { return 255; }
+    virtual int GetStrokeColor() const {return -1;}
     virtual double GetWidth() const { return -1; }
     virtual void GetPattern(vector<double> &, double &) const {}
     virtual void GetSymbol(string &) const {}
diff --git a/map/drawer_yg.cpp b/map/drawer_yg.cpp
index 7d49d972a5..0e99b37df1 100644
--- a/map/drawer_yg.cpp
+++ b/map/drawer_yg.cpp
@@ -203,6 +203,7 @@ void DrawerYG::drawArea(vector<m2::PointD> const & pts, rule_ptr_t pRule, int de
 
 namespace
 {
+  double const min_text_height_filtered = 4;
   double const min_text_height = 12;      // 8
 //  double const min_text_height_mask = 9.99; // 10
 }
@@ -219,6 +220,11 @@ uint8_t DrawerYG::get_pathtext_font_size(rule_ptr_t pRule) const
   return my::rounds(max(h, min_text_height) * m_visualScale);
 }
 
+bool DrawerYG::filter_text_size(rule_ptr_t pRule) const
+{
+  return pRule->GetTextHeight() * m_scale <= min_text_height_filtered;
+}
+
 void DrawerYG::drawText(m2::PointD const & pt, string const & name, rule_ptr_t pRule, int depth)
 {
   yg::Color textColor(pRule->GetColor() == -1 ? yg::Color(0, 0, 0, 0) : yg::Color::fromXRGB(pRule->GetColor(), pRule->GetAlpha()));
@@ -227,13 +233,14 @@ void DrawerYG::drawText(m2::PointD const & pt, string const & name, rule_ptr_t p
   if (textColor == yg::Color(255, 255, 255, 255))
     textColor = yg::Color(0, 0, 0, 0);
 
-  m_pScreen->drawText(
+  if (!filter_text_size(pRule))
+    m_pScreen->drawText(
       pt,
       0.0,
       get_text_font_size(pRule),
       textColor,
       name,
-      true,
+      pRule->GetStrokeColor() != -1,
       yg::Color(255, 255, 255, 255),
       depth,
       false,
@@ -369,6 +376,9 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, di::DrawRule const * rules, size
         {
           for (list<di::PathInfo>::const_iterator i = pInfo->m_pathes.begin(); i != pInfo->m_pathes.end(); ++i)
           {
+            if (filter_text_size(pRule))
+              continue;
+
             uint8_t const fontSize = get_pathtext_font_size(pRule);
 
             list<m2::RectD> & lst = m_pathsOrg[pInfo->m_name];
diff --git a/map/drawer_yg.hpp b/map/drawer_yg.hpp
index 1fd6b71a69..3f5c726dd2 100644
--- a/map/drawer_yg.hpp
+++ b/map/drawer_yg.hpp
@@ -67,6 +67,7 @@ class DrawerYG
 
   uint8_t get_text_font_size(rule_ptr_t pRule) const;
   uint8_t get_pathtext_font_size(rule_ptr_t pRule) const;
+  bool filter_text_size(rule_ptr_t pRule) const;
 
   typedef map<string, list<m2::RectD> > org_map_t;
   org_map_t m_pathsOrg;