diff --git a/data/minsk-pass.dat b/data/minsk-pass.dat
index ff57b5e115..7537eda84b 100644
Binary files a/data/minsk-pass.dat and b/data/minsk-pass.dat differ
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 790f0220f3..f7263042b9 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -20,10 +20,14 @@ namespace pts
     CoordPointT const pt = Int64ToPoint(i);
     return m2::PointD(pt.first, pt.second);
   }
-  inline int64_t ToId(CoordPointT const & p)
+
+  struct Fpt2id
   {
-    return PointToInt64(p.first, p.second);
-  }
+    int64_t operator() (m2::PointD const & p)
+    {
+      return PointToInt64(p.x, p.y);
+    }
+  };
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -41,15 +45,16 @@ bool FeatureBuilder::IsGeometryClosed() const
 
 void FeatureBuilder::AddPoint(m2::PointD const & p)
 {
-  m_Geometry.push_back(pts::ToId(CoordPointT(p.x, p.y)));
+  m_Geometry.push_back(p);
   m_LimitRect.Add(p);
 }
 
 void FeatureBuilder::AddTriangle(m2::PointD const & a, m2::PointD const & b, m2::PointD const & c)
 {
-  m_Triangles.push_back(pts::ToId(CoordPointT(a.x, a.y)));
-  m_Triangles.push_back(pts::ToId(CoordPointT(b.x, b.y)));
-  m_Triangles.push_back(pts::ToId(CoordPointT(c.x, c.y)));
+  pts::Fpt2id fn;
+  m_Triangles.push_back(fn(a));
+  m_Triangles.push_back(fn(b));
+  m_Triangles.push_back(fn(c));
 }
 
 void FeatureBuilder::AddName(string const & name)
@@ -89,7 +94,7 @@ namespace
   bool is_equal(double d1, double d2)
   {
     //return my::AlmostEqual(d1, d2, 100000000);
-    return (fabs(d1 - d2) < 1.0E-6);
+    return (fabs(d1 - d2) < MercatorBounds::GetCellID2PointAbsEpsilon());
   }
   bool is_equal(m2::RectD const & r1, m2::RectD const & r2)
   {
@@ -102,11 +107,18 @@ namespace
 
 bool FeatureBuilder::operator == (FeatureBuilder const & fb) const
 {
+  if (m_Geometry.size() != fb.m_Geometry.size())
+    return false;
+
+  double const eps = MercatorBounds::GetCellID2PointAbsEpsilon();
+  for (size_t i = 0; i < m_Geometry.size(); ++i)
+    if (!m_Geometry[i].EqualDxDy(fb.m_Geometry[i], eps))
+      return false;
+
   return
       m_Types == fb.m_Types &&
       m_Layer == fb.m_Layer &&
       m_Name == fb.m_Name &&
-      m_Geometry == fb.m_Geometry &&
       m_Triangles == fb.m_Triangles &&
       is_equal(m_LimitRect, fb.m_LimitRect);
 }
@@ -157,16 +169,21 @@ void FeatureBuilder::Serialize(vector<char> & data) const
     sink.Write(&m_Name[0], m_Name.size());
   }
 
+  size_t const ptsCount = m_Geometry.size();
+  vector<int64_t> geom;
+  geom.reserve(ptsCount);
+  transform(m_Geometry.begin(), m_Geometry.end(), back_inserter(geom), pts::Fpt2id());
+
   // Serializing geometry.
-  if (m_Geometry.size() == 1)
+  if (ptsCount == 1)
   {
-    WriteVarInt(sink, m_Geometry[0]);
+    WriteVarInt(sink, geom[0]);
   }
   else
   {
-    WriteVarUint(sink, m_Geometry.size() - 1);
-    for (size_t i = 0; i < m_Geometry.size(); ++i)
-      WriteVarInt(sink, i == 0 ? m_Geometry[0] : m_Geometry[i] - m_Geometry[i-1]);
+    WriteVarUint(sink, ptsCount - 1);
+    for (size_t i = 0; i < ptsCount; ++i)
+      WriteVarInt(sink, i == 0 ? geom[0] : geom[i] - geom[i-1]);
   }
 
   // Serializing triangles.
@@ -184,8 +201,8 @@ void FeatureBuilder::Serialize(vector<char> & data) const
 bool FeatureBuilder::CheckCorrect(vector<char> const & data) const
 {
   vector<char> data1 = data;
-  FeatureGeom f;
-  f.DeserializeAndParse(data1);
+  FeatureGeom f(data1);
+
   FeatureBuilder fb;
   f.InitFeatureBuilder(fb);
 
@@ -356,12 +373,6 @@ void FeatureGeom::ParseAll() const
     ParseTriangles();
 }
 
-void FeatureGeom::DeserializeAndParse(vector<char> & data, uint32_t offset)
-{
-  Deserialize(data, offset);
-  ParseAll();
-}
-
 string FeatureGeom::DebugString() const
 {
   ParseAll();
@@ -388,8 +399,3 @@ void FeatureGeom::InitFeatureBuilder(FeatureBuilder & fb) const
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // FeatureGeomRef implementation
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-
-FeatureGeomRef::FeatureGeomRef(vector<char> & data, uint32_t offset)
-{
-  Deserialize(data, offset);
-}
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index 12d09cc078..7094eb707a 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -15,6 +15,7 @@ class FeatureBuilder
 {
 public:
   FeatureBuilder();
+
   void AddName(string const & name);
   void AddPoint(m2::PointD const & p);
   void AddTriangle(m2::PointD const & a, m2::PointD const & b, m2::PointD const & c);
@@ -54,9 +55,12 @@ private:
   int32_t m_Layer;
   string m_Name;
   vector<uint32_t> m_Types;
-  vector<int64_t> m_Geometry;
-  vector<int64_t> m_Triangles;
+
   m2::RectD m_LimitRect;
+
+  vector<m2::PointD> m_Geometry;  // store points as is for further processing
+
+  vector<int64_t> m_Triangles;
 };
 
 class FeatureBase
@@ -200,9 +204,6 @@ public:
     return base_type::GetLimitRect();
   }
 
-  void ParseAll() const;
-  void DeserializeAndParse(vector<char> & data, uint32_t offset = 0);
-
   inline uint32_t GetGeometrySize() const
   {
     if (!m_bGeometryParsed)
@@ -252,22 +253,24 @@ public:
     f.EndPrimitive();
   }
 
-private:
-
-  mutable vector<m2::PointD> m_Geometry;
-  mutable vector<m2::PointD> m_Triangles;
+protected:
 
   void ParseGeometry() const;
   void ParseTriangles() const;
+
+  void ParseAll() const;
+
+  mutable vector<m2::PointD> m_Geometry;
+  mutable vector<m2::PointD> m_Triangles;
 };
 
-class FeatureGeomRef : public FeatureBase
+class FeatureGeomRef : public FeatureGeom
 {
-  typedef FeatureBase base_type;
+  typedef FeatureGeom base_type;
 
 public:
   FeatureGeomRef() {}
-  FeatureGeomRef(vector<char> & data, uint32_t offset = 0);
+  FeatureGeomRef(vector<char> & data, uint32_t offset = 0) : base_type(data, offset) {}
 };
 
 inline string debug_print(FeatureGeom const & f)
diff --git a/map/countries.hpp b/map/countries.hpp
index 18dcd02e88..891833c832 100644
--- a/map/countries.hpp
+++ b/map/countries.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include "../base/base.hpp"
 
 #include "../std/string.hpp"
 #include "../std/vector.hpp"
diff --git a/platform/qtplatform.cpp b/platform/qtplatform.cpp
index 26672de153..965dd47ef4 100644
--- a/platform/qtplatform.cpp
+++ b/platform/qtplatform.cpp
@@ -49,15 +49,10 @@ static char const * sRequiredResourcesList[] =
   "classificator.txt",
   "drawing_rules.bin",
   "basic.skn",
+  "basic_highres.skn",
   "visibility.txt",
   "symbols_24.png",
-  "dejavusans_8.png",
-  "dejavusans_10.png",
-  "dejavusans_12.png",
-  "dejavusans_14.png",
-  "dejavusans_16.png",
-  "dejavusans_20.png",
-  "dejavusans_24.png"
+  "symbols_48.png"
 };
 
 #ifdef OMIM_OS_MAC
diff --git a/qt/main.cpp b/qt/main.cpp
index ce74c6e29f..d6c6d126bb 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -47,7 +47,7 @@ namespace
     InitializeFinalize()
     {
       // App runs without error console under win32.
-      m_errFile = ::freopen("mapswithme.log", "w", stderr);
+      m_errFile = ::freopen("D:/mapswithme.log", "w", stderr);
       my::g_LogLevel = my::LDEBUG;
 
       //_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_DELAY_FREE_MEM_DF);
diff --git a/yg/resource_manager.hpp b/yg/resource_manager.hpp
index f080b10b7d..dbe037ea67 100644
--- a/yg/resource_manager.hpp
+++ b/yg/resource_manager.hpp
@@ -20,7 +20,7 @@ namespace yg
     class Storage;
   }
 
-  class GlyphInfo;
+  struct GlyphInfo;
 
   class ResourceManager
   {