diff --git a/drape/stipple_pen_resource.cpp b/drape/stipple_pen_resource.cpp
index 537d39219d..9f1cdb78e9 100644
--- a/drape/stipple_pen_resource.cpp
+++ b/drape/stipple_pen_resource.cpp
@@ -123,8 +123,6 @@ void StipplePenRasterizator::Rasterize(void * buffer)
 
   pixels[0] = pixels[1];
   pixels[offset] = pixels[offset - 1];
-
-  memcpy(pixels + MAX_STIPPLE_PEN_LENGTH, pixels, MAX_STIPPLE_PEN_LENGTH);
 }
 
 ref_ptr<Texture::ResourceInfo> StipplePenIndex::ReserveResource(bool predefined, StipplePenKey const & key, bool & newResource)
diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
index a0885cb70c..60d1a5600d 100644
--- a/drape_frontend/backend_renderer.cpp
+++ b/drape_frontend/backend_renderer.cpp
@@ -200,6 +200,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
   case Message::InvalidateTextures:
     {
       m_texMng->Invalidate(VisualParams::Instance().GetResourcePostfix());
+      RecacheMyPosition();
       break;
     }
   case Message::StopRendering:
@@ -260,8 +261,13 @@ void BackendRenderer::InitGLDependentResource()
 
   m_texMng->Init(params);
 
-  drape_ptr<MyPositionShapeMessage> msg = make_unique_dp<MyPositionShapeMessage>(make_unique_dp<MyPosition>(m_texMng),
-                                                                                 make_unique_dp<SelectionShape>(m_texMng));
+  RecacheMyPosition();
+}
+
+void BackendRenderer::RecacheMyPosition()
+{
+  auto msg = make_unique_dp<MyPositionShapeMessage>(make_unique_dp<MyPosition>(m_texMng),
+                                                    make_unique_dp<SelectionShape>(m_texMng));
 
   m_commutator->PostMessage(ThreadsCommutator::RenderThread, move(msg), MessagePriority::High);
 }
diff --git a/drape_frontend/backend_renderer.hpp b/drape_frontend/backend_renderer.hpp
index 96964c69dc..faa545b65a 100644
--- a/drape_frontend/backend_renderer.hpp
+++ b/drape_frontend/backend_renderer.hpp
@@ -47,6 +47,7 @@ protected:
 private:
   void RecacheGui(gui::TWidgetsInitInfo const  & initInfo, gui::TWidgetsSizeInfo & sizeInfo);
   void RecacheCountryStatus();
+  void RecacheMyPosition();
 
   void AcceptMessage(ref_ptr<Message> message) override;
 
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index bf224e3012..c6028041b3 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -69,8 +69,10 @@ DrapeEngine::DrapeEngine(Params && params)
                                    frParams.m_texMng, params.m_model);
   m_backend = make_unique_dp<BackendRenderer>(brParams);
 
+  m_widgetsInfo = move(params.m_info);
+
   GuiRecacheMessage::Blocker blocker;
-  drape_ptr<GuiRecacheMessage> message( new GuiRecacheMessage(blocker, move(params.m_info), m_widgetSizes));
+  drape_ptr<GuiRecacheMessage> message(new GuiRecacheMessage(blocker, m_widgetsInfo, m_widgetSizes));
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread, move(message), MessagePriority::High);
   blocker.Wait();
 
@@ -169,9 +171,26 @@ void DrapeEngine::InvalidateRect(m2::RectD const & rect)
 
 void DrapeEngine::UpdateMapStyle()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<UpdateMapStyleMessage>(),
-                                  MessagePriority::High);
+  // Update map style.
+  {
+    UpdateMapStyleMessage::Blocker blocker;
+    m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
+                                    make_unique_dp<UpdateMapStyleMessage>(blocker),
+                                    MessagePriority::High);
+    blocker.Wait();
+  }
+
+  // Recache gui after updating of style.
+  {
+    GuiRecacheMessage::Blocker blocker;
+    drape_ptr<GuiRecacheMessage> message(new GuiRecacheMessage(blocker, m_widgetsInfo, m_widgetSizes));
+    m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread, move(message), MessagePriority::High);
+    blocker.Wait();
+
+    m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
+                                    make_unique_dp<GuiLayerLayoutMessage>(m_widgetsLayout),
+                                    MessagePriority::High);
+  }
 }
 
 void DrapeEngine::AddUserEvent(UserEvent const & e)
@@ -371,8 +390,9 @@ void DrapeEngine::RemoveRoute(bool deactivateFollowing)
 
 void DrapeEngine::SetWidgetLayout(gui::TWidgetsLayoutInfo && info)
 {
+  m_widgetsLayout = move(info);
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<GuiLayerLayoutMessage>(move(info)),
+                                  make_unique_dp<GuiLayerLayoutMessage>(m_widgetsLayout),
                                   MessagePriority::Normal);
 }
 
diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp
index cd99302a52..32710b37d7 100644
--- a/drape_frontend/drape_engine.hpp
+++ b/drape_frontend/drape_engine.hpp
@@ -137,7 +137,9 @@ private:
   TTapEventInfoFn m_tapListener;
   TUserPositionChangedFn m_userPositionChangedFn;
 
+  gui::TWidgetsInitInfo m_widgetsInfo;
   gui::TWidgetsSizeInfo m_widgetSizes;
+  gui::TWidgetsLayoutInfo m_widgetsLayout;
 };
 
 } // namespace df
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index 4bc9129574..978182da6d 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -333,25 +333,43 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
 
   case Message::UpdateMapStyle:
     {
+      // Clear tile tree.
       m_tileTree->Invalidate();
 
+      // Get new tiles.
       TTilesCollection tiles;
       ScreenBase screen = m_userEventStream.GetCurrentScreen();
       ResolveTileKeys(screen.ClipRect(), tiles);
 
+      // Clear all graphics.
       m_renderGroups.clear();
       m_deferredRenderGroups.clear();
 
+      // Invalidate read manager.
       m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
                                 make_unique_dp<InvalidateReadManagerRectMessage>(tiles),
                                 MessagePriority::Normal);
 
+      // Invalidate textures and wait for completion.
       BaseBlockingMessage::Blocker blocker;
       m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
                                 make_unique_dp<InvalidateTexturesMessage>(blocker),
                                 MessagePriority::Normal);
       blocker.Wait();
 
+      // Invalidate route.
+      auto const & routeData = m_routeRenderer->GetRouteData();
+      if (routeData != nullptr)
+      {
+        auto recacheRouteMsg = make_unique_dp<AddRouteMessage>(routeData->m_sourcePolyline,
+                                                               routeData->m_sourceTurns,
+                                                               routeData->m_color);
+        m_routeRenderer->Clear(true /* keepDistanceFromBegin */);
+        m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, move(recacheRouteMsg),
+                                  MessagePriority::Normal);
+      }
+
+      // Request new tiles.
       m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
                                 make_unique_dp<UpdateReadManagerMessage>(screen, move(tiles)),
                                 MessagePriority::Normal);
diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp
index 92c16b3b0c..5ecb2fe5c1 100644
--- a/drape_frontend/message_subclasses.hpp
+++ b/drape_frontend/message_subclasses.hpp
@@ -268,9 +268,9 @@ private:
 class GuiRecacheMessage : public BaseBlockingMessage
 {
 public:
-  GuiRecacheMessage(Blocker & blocker, gui::TWidgetsInitInfo && initInfo, gui::TWidgetsSizeInfo & resultInfo)
+  GuiRecacheMessage(Blocker & blocker, gui::TWidgetsInitInfo const & initInfo, gui::TWidgetsSizeInfo & resultInfo)
     : BaseBlockingMessage(blocker)
-    , m_initInfo(move(initInfo))
+    , m_initInfo(initInfo)
     , m_sizeInfo(resultInfo)
   {
   }
@@ -287,10 +287,9 @@ private:
 class GuiLayerLayoutMessage : public Message
 {
 public:
-  GuiLayerLayoutMessage(gui::TWidgetsLayoutInfo && info)
-    : m_layoutInfo(move(info))
-  {
-  }
+  GuiLayerLayoutMessage(gui::TWidgetsLayoutInfo const & info)
+    : m_layoutInfo(info)
+  {}
 
   Type GetType() const override { return GuiLayerLayout; }
 
@@ -569,9 +568,13 @@ private:
   drape_ptr<RouteData> m_routeData;
 };
 
-class UpdateMapStyleMessage : public Message
+class UpdateMapStyleMessage : public BaseBlockingMessage
 {
 public:
+  UpdateMapStyleMessage(Blocker & blocker)
+    : BaseBlockingMessage(blocker)
+  {}
+
   Type GetType() const override { return Message::UpdateMapStyle; }
 };
 
diff --git a/drape_frontend/route_builder.cpp b/drape_frontend/route_builder.cpp
index e98df18f6d..ca3c27db24 100644
--- a/drape_frontend/route_builder.cpp
+++ b/drape_frontend/route_builder.cpp
@@ -9,7 +9,7 @@ RouteBuilder::RouteBuilder(RouteBuilder::TFlushRouteFn const & flushRouteFn)
   : m_flushRouteFn(flushRouteFn)
 {}
 
-void RouteBuilder::Build(m2::PolylineD const & routePolyline,  vector<double> const & turns,
+void RouteBuilder::Build(m2::PolylineD const & routePolyline, vector<double> const & turns,
                          dp::Color const & color, ref_ptr<dp::TextureManager> textures)
 {
   CommonViewParams params;
@@ -17,7 +17,9 @@ void RouteBuilder::Build(m2::PolylineD const & routePolyline,  vector<double> co
 
   drape_ptr<RouteData> routeData = make_unique_dp<RouteData>();
   routeData->m_color = color;
-  RouteShape(routePolyline, turns, params).Draw(textures, *routeData.get());
+  routeData->m_sourcePolyline = routePolyline;
+  routeData->m_sourceTurns = turns;
+  RouteShape(params).Draw(textures, *routeData.get());
 
   if (m_flushRouteFn != nullptr)
     m_flushRouteFn(move(routeData));
diff --git a/drape_frontend/route_renderer.cpp b/drape_frontend/route_renderer.cpp
index efaf37aadf..9d75c2a7b3 100644
--- a/drape_frontend/route_renderer.cpp
+++ b/drape_frontend/route_renderer.cpp
@@ -291,12 +291,19 @@ void RouteRenderer::SetRouteData(drape_ptr<RouteData> && routeData, ref_ptr<dp::
   m_distanceFromBegin = 0.0;
 }
 
-void RouteRenderer::Clear()
+drape_ptr<RouteData> const & RouteRenderer::GetRouteData() const
+{
+  return m_routeData;
+}
+
+void RouteRenderer::Clear(bool keepDistanceFromBegin)
 {
   m_routeData.reset();
   m_arrowBorders.clear();
   m_routeSegments.clear();
-  m_distanceFromBegin = 0.0;
+
+  if (!keepDistanceFromBegin)
+    m_distanceFromBegin = 0.0;
 }
 
 void RouteRenderer::UpdateDistanceFromBegin(double distanceFromBegin)
diff --git a/drape_frontend/route_renderer.hpp b/drape_frontend/route_renderer.hpp
index b19de637c2..0a6d10d550 100644
--- a/drape_frontend/route_renderer.hpp
+++ b/drape_frontend/route_renderer.hpp
@@ -44,8 +44,9 @@ public:
                         dp::UniformValuesStorage const & commonUniforms);
 
   void SetRouteData(drape_ptr<RouteData> && routeData, ref_ptr<dp::GpuProgramManager> mng);
+  drape_ptr<RouteData> const & GetRouteData() const;
 
-  void Clear();
+  void Clear(bool keepDistanceFromBegin = false);
 
   void UpdateDistanceFromBegin(double distanceFromBegin);
 
diff --git a/drape_frontend/route_shape.cpp b/drape_frontend/route_shape.cpp
index 83b8ae2cc5..4fa030c5ca 100644
--- a/drape_frontend/route_shape.cpp
+++ b/drape_frontend/route_shape.cpp
@@ -141,11 +141,8 @@ vector<m2::PointD> CalculatePoints(m2::PolylineD const & polyline, double start,
 
 }
 
-RouteShape::RouteShape(m2::PolylineD const & polyline,  vector<double> const & turns,
-                       CommonViewParams const & params)
+RouteShape::RouteShape(CommonViewParams const & params)
   : m_params(params)
-  , m_polyline(polyline)
-  , m_turns(turns)
 {}
 
 void RouteShape::PrepareGeometry(bool isRoute, vector<m2::PointD> const & path,
@@ -291,7 +288,7 @@ void RouteShape::CacheEndOfRouteSign(ref_ptr<dp::TextureManager> mng, RouteData
   m2::RectF const & texRect = symbol.GetTexRect();
   m2::PointF halfSize = m2::PointF(symbol.GetPixelSize()) * 0.5f;
 
-  glsl::vec2 const pos = glsl::ToVec2(m_polyline.Back());
+  glsl::vec2 const pos = glsl::ToVec2(routeData.m_sourcePolyline.Back());
   glsl::vec3 const pivot = glsl::vec3(pos.x, pos.y, m_params.m_depth);
   gpu::SolidTexturingVertex data[4]=
   {
@@ -327,14 +324,15 @@ void RouteShape::Draw(ref_ptr<dp::TextureManager> textures, RouteData & routeDat
     TGeometryBuffer geometry;
     TGeometryBuffer joinsGeometry;
     vector<RouteJoinBounds> bounds;
-    PrepareGeometry(true /* isRoute */, m_polyline.GetPoints(), geometry, joinsGeometry, bounds, routeData.m_length);
+    PrepareGeometry(true /* isRoute */, routeData.m_sourcePolyline.GetPoints(),
+                    geometry, joinsGeometry, bounds, routeData.m_length);
 
     dp::GLState state = dp::GLState(gpu::ROUTE_PROGRAM, dp::GLState::GeometryLayer);
     BatchGeometry(state, geometry, joinsGeometry, routeData.m_route);
   }
 
   // arrows geometry
-  if (!m_turns.empty())
+  if (!routeData.m_sourceTurns.empty())
   {
     dp::TextureManager::SymbolRegion region;
     GetArrowTextureRegion(textures, region);
@@ -343,13 +341,13 @@ void RouteShape::Draw(ref_ptr<dp::TextureManager> textures, RouteData & routeDat
     dp::GLState state = dp::GLState(gpu::ROUTE_ARROW_PROGRAM, dp::GLState::GeometryLayer);
     state.SetColorTexture(region.GetTexture());
 
-    ClipArrowToSegments(m_turns, routeData);
+    ClipArrowToSegments(routeData.m_sourceTurns, routeData);
     for (auto & renderProperty : routeData.m_arrows)
     {
       TGeometryBuffer geometry;
       TGeometryBuffer joinsGeometry;
-      vector<m2::PointD> points = CalculatePoints(m_polyline, renderProperty->m_start, renderProperty->m_end);
-      ASSERT_LESS_OR_EQUAL(points.size(), m_polyline.GetSize(), ());
+      vector<m2::PointD> points = CalculatePoints(routeData.m_sourcePolyline, renderProperty->m_start, renderProperty->m_end);
+      ASSERT_LESS_OR_EQUAL(points.size(), routeData.m_sourcePolyline.GetSize(), ());
       PrepareGeometry(false /* isRoute */, points, geometry, joinsGeometry, renderProperty->m_joinsBounds, routeData.m_length);
       BatchGeometry(state, geometry, joinsGeometry, renderProperty->m_arrow);
     }
diff --git a/drape_frontend/route_shape.hpp b/drape_frontend/route_shape.hpp
index d8cfe9d325..5061360ef7 100644
--- a/drape_frontend/route_shape.hpp
+++ b/drape_frontend/route_shape.hpp
@@ -42,6 +42,8 @@ struct ArrowRenderProperty
 
 struct RouteData
 {
+  m2::PolylineD m_sourcePolyline;
+  vector<double> m_sourceTurns;
   dp::Color m_color;
   m2::RectF m_arrowTextureRect;
   double m_length;
@@ -53,8 +55,7 @@ struct RouteData
 class RouteShape
 {
 public:
-  RouteShape(m2::PolylineD const & polyline,  vector<double> const & turns,
-             CommonViewParams const & params);
+  RouteShape(CommonViewParams const & params);
   void Draw(ref_ptr<dp::TextureManager> textures, RouteData & routeData);
 
 private:
@@ -69,8 +70,6 @@ private:
                      TGeometryBuffer & joinsGeometry, RouteRenderProperty & property);
 
   CommonViewParams m_params;
-  m2::PolylineD m_polyline;
-  vector<double> m_turns;
 };
 
 } // namespace df
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 4752f43c77..0a5cd5615d 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -84,6 +84,7 @@ void BookmarkManager::InitBookmarks()
   {
     BookmarkCategory * cat = *it;
     BookmarkCategory::Guard guard(*cat);
+    guard.m_controller.Update();
   }
 }
 
diff --git a/map/framework.cpp b/map/framework.cpp
index 5ecc52d25b..74307cea26 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1256,14 +1256,7 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
   m_drapeEngine->SetMyPositionModeListener(m_myPositionListener);
   m_drapeEngine->InvalidateMyPosition();
 
-  m_bmManager.InitBookmarks();
-
-  vector<UserMarkType> types = { UserMarkType::SEARCH_MARK, UserMarkType::API_MARK, UserMarkType::DEBUG_MARK };
-  for (size_t typeIndex = 0; typeIndex < types.size(); typeIndex++)
-  {
-    UserMarkControllerGuard guard(m_bmManager, types[typeIndex]);
-    guard.m_controller.Update();
-  }
+  InvalidateUserMarks();
 
   // In case of the engine reinitialization simulate the last tap to show selection mark.
   if (m_lastTapEvent != nullptr)
@@ -1299,6 +1292,8 @@ void Framework::SetMapStyle(MapStyle mapStyle)
   drule::LoadRules();
   CallDrapeFunction(bind(&df::DrapeEngine::UpdateMapStyle, _1));
 
+  InvalidateUserMarks();
+
   alohalytics::TStringMap details {{"mapStyle", strings::to_string(static_cast<int>(mapStyle))}};
   alohalytics::Stats::Instance().LogEvent("MapStyle_Changed", details);
 }
@@ -1591,6 +1586,18 @@ bool Framework::HasActiveUserMark()
   return m_drapeEngine->GetSelectedObject() != df::SelectionShape::OBJECT_EMPTY;
 }
 
+void Framework::InvalidateUserMarks()
+{
+  m_bmManager.InitBookmarks();
+
+  vector<UserMarkType> types = { UserMarkType::SEARCH_MARK, UserMarkType::API_MARK, UserMarkType::DEBUG_MARK };
+  for (size_t typeIndex = 0; typeIndex < types.size(); typeIndex++)
+  {
+    UserMarkControllerGuard guard(m_bmManager, types[typeIndex]);
+    guard.m_controller.Update();
+  }
+}
+
 void Framework::OnTapEvent(m2::PointD pxPoint, bool isLong, bool isMyPosition, FeatureID feature)
 {
   // Back up last tap event to recover selection in case of Drape reinitialization.
diff --git a/map/framework.hpp b/map/framework.hpp
index 8a06d06abb..7c069f95aa 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -255,6 +255,7 @@ public:
   void ActivateUserMark(UserMark const * mark, bool needAnim);
   void DeactivateUserMark();
   bool HasActiveUserMark();
+  void InvalidateUserMarks();
   PoiMarkPoint * GetAddressMark(m2::PointD const & globalPoint) const;
 
   using TActivateCallbackFn = function<void (unique_ptr<UserMarkCopy> mark)>;