diff --git a/drape/color.hpp b/drape/color.hpp
index 72d0ca1abc..75cd292a06 100644
--- a/drape/color.hpp
+++ b/drape/color.hpp
@@ -57,10 +57,10 @@ Color Extract(uint32_t xrgb, uint8_t a);
 inline string DebugPrint(Color const & c)
 {
   ostringstream out;
-  out << "R = " << c.GetRed()
-      << "G = " << c.GetGreen()
-      << "B = " << c.GetBlue()
-      << "A = " << c.GetAlpha();
+  out << "[R = " << static_cast<uint32_t>(c.GetRed())
+      << ", G = " << static_cast<uint32_t>(c.GetGreen())
+      << ", B = " << static_cast<uint32_t>(c.GetBlue())
+      << ", A = " << static_cast<uint32_t>(c.GetAlpha()) << "]";
   return out.str();
 }
 
diff --git a/drape/glyph_generator.cpp b/drape/glyph_generator.cpp
index bd235cb3ef..c693dd695b 100644
--- a/drape/glyph_generator.cpp
+++ b/drape/glyph_generator.cpp
@@ -19,11 +19,7 @@ GlyphGenerator::~GlyphGenerator()
 
   // Here we have to wait for active tasks completion,
   // because they capture 'this' pointer.
-  m_activeTasks.FinishAll();
-
-  std::lock_guard<std::mutex> lock(m_mutex);
-  for (auto & data : m_queue)
-    data.DestroyGlyph();
+  FinishGeneration();
 }
 
 bool GlyphGenerator::IsSuspended() const
@@ -32,6 +28,17 @@ bool GlyphGenerator::IsSuspended() const
   return m_glyphsCounter == 0;
 }
 
+void GlyphGenerator::FinishGeneration()
+{
+  m_activeTasks.FinishAll();
+
+  std::lock_guard<std::mutex> lock(m_mutex);
+  for (auto & data : m_queue)
+    data.DestroyGlyph();
+
+  m_glyphsCounter = 0;
+}
+
 void GlyphGenerator::RegisterListener(ref_ptr<GlyphGenerator::Listener> listener)
 {
   std::lock_guard<std::mutex> lock(m_mutex);
diff --git a/drape/glyph_generator.hpp b/drape/glyph_generator.hpp
index 43380841ce..76943fede4 100644
--- a/drape/glyph_generator.hpp
+++ b/drape/glyph_generator.hpp
@@ -74,6 +74,8 @@ public:
   void GenerateGlyphs(ref_ptr<Listener> listener, GlyphGenerationDataArray && generationData);
   bool IsSuspended() const;
 
+  void FinishGeneration();
+
 private:
   void OnTaskFinished(ref_ptr<Listener> listener, std::shared_ptr<GenerateGlyphTask> const & task);
 
diff --git a/drape/hw_texture.cpp b/drape/hw_texture.cpp
index 759615c7b3..b6b13a0e02 100644
--- a/drape/hw_texture.cpp
+++ b/drape/hw_texture.cpp
@@ -176,8 +176,8 @@ void OpenGLHWTexture::Create(Params const & params, ref_ptr<void> data)
     GLFunctions::glBindBuffer(0, gl_const::GLPixelBufferWrite);
   }
 
-  GLFunctions::glFlush();
   GLFunctions::glBindTexture(0);
+  GLFunctions::glFlush();
 }
 
 void OpenGLHWTexture::UploadData(uint32_t x, uint32_t y, uint32_t width, uint32_t height,
@@ -208,6 +208,11 @@ drape_ptr<HWTexture> OpenGLHWTextureAllocator::CreateTexture()
   return make_unique_dp<OpenGLHWTexture>();
 }
 
+void OpenGLHWTextureAllocator::Flush()
+{
+  GLFunctions::glFlush();
+}
+
 drape_ptr<HWTextureAllocator> CreateAllocator()
 {
   if (GLFunctions::CurrentApiVersion == dp::ApiVersion::OpenGLES3)
diff --git a/drape/hw_texture.hpp b/drape/hw_texture.hpp
index b44ba6ab4e..6afdf17f67 100644
--- a/drape/hw_texture.hpp
+++ b/drape/hw_texture.hpp
@@ -92,7 +92,7 @@ class OpenGLHWTextureAllocator : public HWTextureAllocator
 {
 public:
   drape_ptr<HWTexture> CreateTexture() override;
-  void Flush() override {}
+  void Flush() override;
 };
 
 ref_ptr<HWTextureAllocator> GetDefaultAllocator();
diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp
index 8cdc0983e8..aed36a3ade 100644
--- a/drape/texture_manager.cpp
+++ b/drape/texture_manager.cpp
@@ -23,7 +23,6 @@
 
 namespace dp
 {
-
 uint32_t const kMaxTextureSize = 1024;
 uint32_t const kStippleTextureWidth = 512;
 uint32_t const kMinStippleTextureHeight = 64;
@@ -250,6 +249,9 @@ void TextureManager::Release()
   m_glyphTextures.clear();
 
   m_glyphManager.reset();
+
+  m_glyphGenerator->FinishGeneration();
+  m_nothingToUpload.test_and_set();
 }
 
 bool TextureManager::UpdateDynamicTextures()
@@ -547,6 +549,8 @@ void TextureManager::Init(Params const & params)
     else
       m_glyphGroups.push_back(GlyphGroup(start, end));
   });
+
+  m_nothingToUpload.clear();
 }
 
 void TextureManager::OnSwitchMapStyle()
diff --git a/drape/texture_manager.hpp b/drape/texture_manager.hpp
index faded6a29d..836ef808ec 100644
--- a/drape/texture_manager.hpp
+++ b/drape/texture_manager.hpp
@@ -256,5 +256,4 @@ private:
   std::atomic_flag m_nothingToUpload;
   std::mutex m_calcGlyphsMutex;
 };
-
-} // namespace dp
+}  // namespace dp
diff --git a/drape_frontend/base_renderer.cpp b/drape_frontend/base_renderer.cpp
index 9865ced5c7..b46e1836ea 100644
--- a/drape_frontend/base_renderer.cpp
+++ b/drape_frontend/base_renderer.cpp
@@ -76,7 +76,7 @@ void BaseRenderer::SetRenderingEnabled(bool const isEnabled)
   };
 
   {
-    lock_guard<mutex> lock(m_completionHandlerMutex);
+    std::lock_guard<mutex> lock(m_completionHandlerMutex);
     m_renderingEnablingCompletionHandler = std::move(handler);
   }
 
@@ -132,6 +132,7 @@ void BaseRenderer::CheckRenderingEnabled()
 
     m_wasNotified = false;
 
+    bool needCreateContext = false;
     if (!m_selfThread.GetRoutine()->IsCancelled())
     {
       // here rendering is enabled again
@@ -140,8 +141,7 @@ void BaseRenderer::CheckRenderingEnabled()
       if (m_wasContextReset)
       {
         m_wasContextReset = false;
-        DisableMessageFiltering();
-        OnContextCreate();
+        needCreateContext = true;
       }
       else
       {
@@ -151,6 +151,12 @@ void BaseRenderer::CheckRenderingEnabled()
     // notify initiator-thread about rendering enabling
     // m_renderingEnablingCompletionHandler will be setup before awakening of this thread
     Notify();
+
+    if (needCreateContext)
+    {
+      DisableMessageFiltering();
+      OnContextCreate();
+    }
   }
 }