diff --git a/drape/drape_tests/dummy_texture.hpp b/drape/drape_tests/dummy_texture.hpp
index 445be79869..bff89c075c 100644
--- a/drape/drape_tests/dummy_texture.hpp
+++ b/drape/drape_tests/dummy_texture.hpp
@@ -6,6 +6,12 @@
 class DummyTexture : public dp::Texture
 {
 public:
+  dp::RefPointer<ResourceInfo> FindResource(Key const & key)
+  {
+    bool dummy = false;
+    return FindResource(key, dummy);
+  }
+
   virtual dp::RefPointer<ResourceInfo> FindResource(Key const & /*key*/, bool & /*newResource*/)
   {
     return dp::RefPointer<ResourceInfo>();
diff --git a/drape/drape_tests/font_texture_tests.cpp b/drape/drape_tests/font_texture_tests.cpp
index e048018fe7..8b93366832 100644
--- a/drape/drape_tests/font_texture_tests.cpp
+++ b/drape/drape_tests/font_texture_tests.cpp
@@ -58,6 +58,22 @@ namespace
     QPoint m_pen;
     QVector<QPair<QPoint, QImage> > m_images;
   };
+
+  class DummyGlyphIndex : public GlyphIndex
+  {
+    typedef GlyphIndex TBase;
+  public:
+    DummyGlyphIndex(m2::PointU size, RefPointer<GlyphManager> mng)
+      : TBase(size, mng)
+    {
+    }
+
+    RefPointer<Texture::ResourceInfo> MapResource(GlyphKey const & key)
+    {
+      bool dummy = false;
+      return TBase::MapResource(key, dummy);
+    }
+  };
 }
 
 UNIT_TEST(UploadingGlyphs)
@@ -76,25 +92,23 @@ UNIT_TEST(UploadingGlyphs)
   args.m_blacklist = "fonts_blacklist.txt";
   GetPlatform().GetFontNames(args.m_fonts);
 
-  bool dummy = false;
-
   GlyphManager mng(args);
-  GlyphIndex index(m2::PointU(64, 64), MakeStackRefPointer(&mng));
-  index.MapResource(GlyphKey(0x58), dummy);
-  index.MapResource(GlyphKey(0x59), dummy);
-  index.MapResource(GlyphKey(0x61), dummy);
+  DummyGlyphIndex index(m2::PointU(64, 64), MakeStackRefPointer(&mng));
+  index.MapResource(GlyphKey(0x58));
+  index.MapResource(GlyphKey(0x59));
+  index.MapResource(GlyphKey(0x61));
 
   DummyTexture tex;
   tex.Create(64, 64, dp::ALPHA, MakeStackRefPointer<void>(nullptr));
   EXPECTGL(glTexSubImage2D(_, _, _, _, _, _, _)).WillOnce(Invoke(&r, &UploadedRender::glMemoryToQImage));
   index.UploadResources(MakeStackRefPointer<Texture>(&tex));
 
-  index.MapResource(GlyphKey(0x68), dummy);
-  index.MapResource(GlyphKey(0x30), dummy);
-  index.MapResource(GlyphKey(0x62), dummy);
-  index.MapResource(GlyphKey(0x65), dummy);
-  index.MapResource(GlyphKey(0x400), dummy);
-  index.MapResource(GlyphKey(0x401), dummy);
+  index.MapResource(GlyphKey(0x68));
+  index.MapResource(GlyphKey(0x30));
+  index.MapResource(GlyphKey(0x62));
+  index.MapResource(GlyphKey(0x65));
+  index.MapResource(GlyphKey(0x400));
+  index.MapResource(GlyphKey(0x401));
   EXPECTGL(glTexSubImage2D(_, _, _, _, _, _, _)).WillOnce(Invoke(&r, &UploadedRender::glMemoryToQImage))
                                                 .WillOnce(Invoke(&r, &UploadedRender::glMemoryToQImage));
   index.UploadResources(MakeStackRefPointer<Texture>(&tex));
diff --git a/drape/drape_tests/stipple_pen_tests.cpp b/drape/drape_tests/stipple_pen_tests.cpp
index 556e9426bd..d682ce9f7c 100644
--- a/drape/drape_tests/stipple_pen_tests.cpp
+++ b/drape/drape_tests/stipple_pen_tests.cpp
@@ -35,6 +35,22 @@ namespace
            my::AlmostEqualULPs(r1.maxX(), r2.maxX()) &&
            my::AlmostEqualULPs(r1.maxY(), r2.maxY());
   }
+
+  class DummyStipplePenIndex : public StipplePenIndex
+  {
+    typedef StipplePenIndex TBase;
+  public:
+    DummyStipplePenIndex(m2::PointU const & size)
+      : TBase(size)
+    {
+    }
+
+    RefPointer<Texture::ResourceInfo> MapResource(StipplePenKey const & key)
+    {
+      bool dummy = false;
+      return TBase::MapResource(key, dummy);
+    }
+  };
 }
 
 UNIT_TEST(SimpleStipplePackTest)
@@ -396,7 +412,7 @@ UNIT_TEST(StippleMappingTest)
 {
   float const width = 512;
   float const height = 8;
-  StipplePenIndex index(m2::PointU(width, height));
+  DummyStipplePenIndex index(m2::PointU(width, height));
 
   StipplePenKey info;
   info.m_pattern.push_back(2);
@@ -404,25 +420,24 @@ UNIT_TEST(StippleMappingTest)
   info.m_pattern.push_back(10);
   info.m_pattern.push_back(10);
 
-  bool dummy = false;
-  RefPointer<Texture::ResourceInfo> r1 = index.MapResource(info, dummy);
+  RefPointer<Texture::ResourceInfo> r1 = index.MapResource(info);
   TEST(IsRectsEqual(r1->GetTexRect(), m2::RectF(1.0f   / width, 1.0f / height,
                                                 241.0f / width, 1.0f / height)), ());
 
-  RefPointer<Texture::ResourceInfo> r2 = index.MapResource(info, dummy);
+  RefPointer<Texture::ResourceInfo> r2 = index.MapResource(info);
   TEST(IsRectsEqual(r1->GetTexRect(), r2->GetTexRect()), ());
 
   info.m_pattern.clear();
   info.m_pattern.push_back(4);
   info.m_pattern.push_back(4);
-  r1 = index.MapResource(info, dummy);
+  r1 = index.MapResource(info);
   TEST(IsRectsEqual(r1->GetTexRect(), m2::RectF(1.0f   / width, 3.0f / height,
                                                 249.0f / width, 3.0f / height)), ());
 
   info.m_pattern.clear();
   info.m_pattern.push_back(3);
   info.m_pattern.push_back(20);
-  r1 = index.MapResource(info, dummy);
+  r1 = index.MapResource(info);
   TEST(IsRectsEqual(r1->GetTexRect(), m2::RectF(1.0f   / width, 5.0f / height,
                                                 254.0f / width, 5.0f / height)), ());
 
@@ -446,13 +461,13 @@ UNIT_TEST(StippleMappingTest)
   StipplePenKey secInfo;
   secInfo.m_pattern.push_back(20);
   secInfo.m_pattern.push_back(20);
-  RefPointer<Texture::ResourceInfo> r12 = index.MapResource(secInfo, dummy);
+  RefPointer<Texture::ResourceInfo> r12 = index.MapResource(secInfo);
   TEST(IsRectsEqual(r12->GetTexRect(), m2::RectF(1.0f   / width, 7.0f / height,
                                                  241.0f / width, 7.0f / height)), ());
 
   secInfo.m_pattern.push_back(10);
   secInfo.m_pattern.push_back(10);
-  r12 = index.MapResource(secInfo, dummy);
+  r12 = index.MapResource(secInfo);
   TEST(IsRectsEqual(r12->GetTexRect(), m2::RectF(257.0f / width, 1.0f / height,
                                                  497.0f / width, 1.0f / height)), ());
 
diff --git a/drape/drape_tests/texture_of_colors_tests.cpp b/drape/drape_tests/texture_of_colors_tests.cpp
index c4e81da19b..173b5d9bba 100644
--- a/drape/drape_tests/texture_of_colors_tests.cpp
+++ b/drape/drape_tests/texture_of_colors_tests.cpp
@@ -42,16 +42,32 @@ void InitOpenGLTextures(int const w, int const h)
   EXPECTGL(glTexParameter(gl_const::GLWrapS, gl_const::GLClampToEdge));
   EXPECTGL(glTexParameter(gl_const::GLWrapT, gl_const::GLClampToEdge));
 }
+
+class DummyColorPallete : public ColorPalette
+{
+  typedef ColorPalette TBase;
+public:
+  DummyColorPallete(m2::PointU const & size)
+    : TBase(size)
+  {
+  }
+
+  RefPointer<Texture::ResourceInfo> MapResource(ColorKey const & key)
+  {
+    bool dummy = false;
+    return TBase::MapResource(key, dummy);
+  }
+};
+
 }
 
 UNIT_TEST(ColorPalleteMappingTests)
 {
-  ColorPalette cp(m2::PointU(32, 16));
+  DummyColorPallete cp(m2::PointU(32, 16));
 
-  bool dummy = false;
-  RefPointer<Texture::ResourceInfo> info1 = cp.MapResource(dp::Color(0, 0, 0, 0), dummy);
-  RefPointer<Texture::ResourceInfo> info2 = cp.MapResource(dp::Color(1, 1, 1, 1), dummy);
-  RefPointer<Texture::ResourceInfo> info3 = cp.MapResource(dp::Color(0, 0, 0, 0), dummy);
+  RefPointer<Texture::ResourceInfo> info1 = cp.MapResource(dp::Color(0, 0, 0, 0));
+  RefPointer<Texture::ResourceInfo> info2 = cp.MapResource(dp::Color(1, 1, 1, 1));
+  RefPointer<Texture::ResourceInfo> info3 = cp.MapResource(dp::Color(0, 0, 0, 0));
 
   TEST_NOT_EQUAL(info1.GetRaw(), info2.GetRaw(), ());
   TEST_EQUAL(info1.GetRaw(), info3.GetRaw(), ());
@@ -63,10 +79,10 @@ UNIT_TEST(ColorPalleteMappingTests)
                                            1.0f / 32.0f, 1.0f / 16));
 
   for (int i = 2; i < 100; ++i)
-    cp.MapResource(dp::Color(i, i, i, i), dummy);
+    cp.MapResource(dp::Color(i, i, i, i));
 
-  TestRects(cp.MapResource(dp::Color(54, 54, 54, 54), dummy)->GetTexRect(), m2::RectF(13.0f / 32.0f, 7.0f / 16.0f,
-                                                                                      13.0f / 32.0f, 7.0f / 16.0f));
+  TestRects(cp.MapResource(dp::Color(54, 54, 54, 54))->GetTexRect(), m2::RectF(13.0f / 32.0f, 7.0f / 16.0f,
+                                                                               13.0f / 32.0f, 7.0f / 16.0f));
 }
 
 UNIT_TEST(ColorPalleteUploadingSingleRow)
@@ -77,17 +93,15 @@ UNIT_TEST(ColorPalleteUploadingSingleRow)
 
   DummyTexture texture;
   texture.Create(width, height, dp::RGBA8);
-  ColorPalette cp(m2::PointU(width, height));
+  DummyColorPallete cp(m2::PointU(width, height));
   cp.UploadResources(MakeStackRefPointer<Texture>(&texture));
 
-  bool dummy = false;
-
   {
-    cp.MapResource(dp::Color(0xFF, 0, 0, 0), dummy);
-    cp.MapResource(dp::Color(0, 0xFF, 0, 0), dummy);
-    cp.MapResource(dp::Color(0, 0, 0xFF, 0), dummy);
-    cp.MapResource(dp::Color(0, 0, 0, 0xFF), dummy);
-    cp.MapResource(dp::Color(0xAA, 0xBB, 0xCC, 0xDD), dummy);
+    cp.MapResource(dp::Color(0xFF, 0, 0, 0));
+    cp.MapResource(dp::Color(0, 0xFF, 0, 0));
+    cp.MapResource(dp::Color(0, 0, 0xFF, 0));
+    cp.MapResource(dp::Color(0, 0, 0, 0xFF));
+    cp.MapResource(dp::Color(0xAA, 0xBB, 0xCC, 0xDD));
 
     uint8_t memoryEtalon[] =
     {
@@ -109,11 +123,11 @@ UNIT_TEST(ColorPalleteUploadingSingleRow)
   }
 
   {
-    cp.MapResource(dp::Color(0xFF, 0xAA, 0, 0), dummy);
-    cp.MapResource(dp::Color(0xAA, 0xFF, 0, 0), dummy);
-    cp.MapResource(dp::Color(0xAA, 0, 0xFF, 0), dummy);
-    cp.MapResource(dp::Color(0xAA, 0, 0, 0xFF), dummy);
-    cp.MapResource(dp::Color(0x00, 0xBB, 0xCC, 0xDD), dummy);
+    cp.MapResource(dp::Color(0xFF, 0xAA, 0, 0));
+    cp.MapResource(dp::Color(0xAA, 0xFF, 0, 0));
+    cp.MapResource(dp::Color(0xAA, 0, 0xFF, 0));
+    cp.MapResource(dp::Color(0xAA, 0, 0, 0xFF));
+    cp.MapResource(dp::Color(0x00, 0xBB, 0xCC, 0xDD));
 
     uint8_t memoryEtalon[] =
     {
@@ -146,17 +160,15 @@ UNIT_TEST(ColorPalleteUploadingPartialyRow)
   DummyTexture texture;
   dp::ColorKey key(dp::Color(0, 0, 0, 0));
   texture.Create(width, height, dp::RGBA8);
-  ColorPalette cp(m2::PointU(width, height));
-
-  bool dummy = false;
+  DummyColorPallete cp(m2::PointU(width, height));
 
   {
-    cp.MapResource(dp::Color(0xFF, 0, 0, 0), dummy);
-    cp.MapResource(dp::Color(0xFF, 0xFF, 0, 0), dummy);
-    cp.MapResource(dp::Color(0xFF, 0xFF, 0xFF, 0), dummy);
-    cp.MapResource(dp::Color(0xFF, 0xFF, 0xFF, 0xFF), dummy);
-    cp.MapResource(dp::Color(0, 0, 0, 0xFF), dummy);
-    cp.MapResource(dp::Color(0, 0, 0xFF, 0xFF), dummy);
+    cp.MapResource(dp::Color(0xFF, 0, 0, 0));
+    cp.MapResource(dp::Color(0xFF, 0xFF, 0, 0));
+    cp.MapResource(dp::Color(0xFF, 0xFF, 0xFF, 0));
+    cp.MapResource(dp::Color(0xFF, 0xFF, 0xFF, 0xFF));
+    cp.MapResource(dp::Color(0, 0, 0, 0xFF));
+    cp.MapResource(dp::Color(0, 0, 0xFF, 0xFF));
 
     uint8_t memoryEtalon[] =
     {
@@ -178,10 +190,10 @@ UNIT_TEST(ColorPalleteUploadingPartialyRow)
   }
 
   {
-    cp.MapResource(dp::Color(0xAA, 0, 0, 0), dummy);
-    cp.MapResource(dp::Color(0xAA, 0xAA, 0, 0), dummy);
-    cp.MapResource(dp::Color(0xAA, 0xAA, 0xAA, 0), dummy);
-    cp.MapResource(dp::Color(0xAA, 0xAA, 0xAA, 0xAA), dummy);
+    cp.MapResource(dp::Color(0xAA, 0, 0, 0));
+    cp.MapResource(dp::Color(0xAA, 0xAA, 0, 0));
+    cp.MapResource(dp::Color(0xAA, 0xAA, 0xAA, 0));
+    cp.MapResource(dp::Color(0xAA, 0xAA, 0xAA, 0xAA));
 
     uint8_t memoryEtalon1[] =
     {
@@ -223,14 +235,12 @@ UNIT_TEST(ColorPalleteUploadingMultipyRow)
   DummyTexture texture;
   dp::ColorKey key(dp::Color(0, 0, 0, 0));
   texture.Create(width, height, dp::RGBA8);
-  ColorPalette cp(m2::PointU(width, height));
+  DummyColorPallete cp(m2::PointU(width, height));
   cp.SetIsDebug(true);
 
-  bool dummy = false;
-
   {
-    cp.MapResource(dp::Color(0xFF, 0, 0, 0), dummy);
-    cp.MapResource(dp::Color(0xAA, 0, 0, 0), dummy);
+    cp.MapResource(dp::Color(0xFF, 0, 0, 0));
+    cp.MapResource(dp::Color(0xAA, 0, 0, 0));
 
     uint8_t memoryEtalon[] =
     {
@@ -247,13 +257,13 @@ UNIT_TEST(ColorPalleteUploadingMultipyRow)
   }
 
   {
-    cp.MapResource(dp::Color(0xCC, 0, 0, 0), dummy);
-    cp.MapResource(dp::Color(0xFF, 0xFF, 0, 0), dummy);
-    cp.MapResource(dp::Color(0xFF, 0xFF, 0xFF, 0), dummy);
-    cp.MapResource(dp::Color(0xFF, 0xFF, 0xFF, 0xFF), dummy);
-    cp.MapResource(dp::Color(0, 0, 0, 0xFF), dummy);
-    cp.MapResource(dp::Color(0, 0, 0xFF, 0xFF), dummy);
-    cp.MapResource(dp::Color(0, 0, 0xAA, 0xAA), dummy);
+    cp.MapResource(dp::Color(0xCC, 0, 0, 0));
+    cp.MapResource(dp::Color(0xFF, 0xFF, 0, 0));
+    cp.MapResource(dp::Color(0xFF, 0xFF, 0xFF, 0));
+    cp.MapResource(dp::Color(0xFF, 0xFF, 0xFF, 0xFF));
+    cp.MapResource(dp::Color(0, 0, 0, 0xFF));
+    cp.MapResource(dp::Color(0, 0, 0xFF, 0xFF));
+    cp.MapResource(dp::Color(0, 0, 0xAA, 0xAA));
 
     uint8_t memoryEtalon1[] =
     {
diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp
index bc5733f67c..6d3b378a1e 100644
--- a/drape/texture_manager.cpp
+++ b/drape/texture_manager.cpp
@@ -101,10 +101,9 @@ uint32_t TextureManager::StippleRegion::GetPatternPixelLength() const
 
 void TextureManager::UpdateDynamicTextures()
 {
-  if (!m_hasPendingUpdates)
+  if (m_nothingToUpload.test_and_set())
     return;
 
-  m_hasPendingUpdates = false;
   m_colorTexture->UpdateState();
   m_stipplePenTexture->UpdateState();
   for_each(m_glyphGroups.begin(), m_glyphGroups.end(), [](GlyphGroup & g)
@@ -126,11 +125,17 @@ void TextureManager::AllocateGlyphTexture(TextureManager::GlyphGroup & group) co
 
 void TextureManager::GetRegionBase(RefPointer<Texture> tex, TextureManager::BaseRegion & region, Texture::Key const & key)
 {
-  bool dummy = false;
-  region.SetResourceInfo(tex->FindResource(key, dummy));
+  bool isNew = false;
+  region.SetResourceInfo(tex->FindResource(key, isNew));
   region.SetTexture(tex);
   ASSERT(region.IsValid(), ());
-  m_hasPendingUpdates |= dummy;
+  if (isNew)
+    m_nothingToUpload.clear();
+}
+
+TextureManager::TextureManager()
+{
+  m_nothingToUpload.test_and_set();
 }
 
 void TextureManager::Init(Params const & params)
diff --git a/drape/texture_manager.hpp b/drape/texture_manager.hpp
index 798212a9b2..e171ad7faa 100644
--- a/drape/texture_manager.hpp
+++ b/drape/texture_manager.hpp
@@ -7,6 +7,8 @@
 #include "drape/texture.hpp"
 #include "drape/glyph_manager.hpp"
 
+#include "../std/atomic.hpp"
+
 namespace dp
 {
 
@@ -64,6 +66,8 @@ public:
     GlyphManager::Params m_glyphMngParams;
   };
 
+  TextureManager();
+
   void Init(Params const & params);
   void Release();
   void GetSymbolRegion(string const & symbolName, SymbolRegion & region);
@@ -108,7 +112,7 @@ private:
   buffer_vector<GlyphGroup, 64> m_glyphGroups;
   buffer_vector<MasterPointer<Texture>, 4> m_hybridGlyphGroups;
 
-  volatile bool m_hasPendingUpdates = false;
+  atomic_flag m_nothingToUpload;
 };
 
 } // namespace dp