diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
index 4d5b7c649c..d009f619e5 100644
--- a/drape_frontend/backend_renderer.cpp
+++ b/drape_frontend/backend_renderer.cpp
@@ -69,11 +69,13 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
       ScreenBase const & screen = msg->GetScreen();
       TTilesCollection const & tiles = msg->GetTiles();
       m_readManager->UpdateCoverage(screen, tiles);
-      storage::TIndex cnt;
-      if (!tiles.empty() && (*tiles.begin()).m_zoomLevel > scales::GetUpperWorldScale())
-        cnt = m_model.FindCountry(screen.ClipRect().Center());
 
-      gui::DrapeGui::Instance().SetCountryIndex(cnt);
+      gui::CountryStatusHelper & helper = gui::DrapeGui::Instance().GetCountryStatusHelper();
+      if (!tiles.empty() && (*tiles.begin()).m_zoomLevel > scales::GetUpperWorldScale())
+        m_model.UpdateCountryIndex(helper.GetCountryIndex(), screen.ClipRect().Center());
+      else
+        helper.Clear();
+
       break;
     }
   case Message::Resize:
@@ -138,6 +140,22 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
       m_batchersPool->ReleaseBatcher(key);
       break;
     }
+  case Message::StorageInfoUpdated:
+    {
+      ref_ptr<StorageInfoUpdatedMessage> msg = static_cast<ref_ptr<StorageInfoUpdatedMessage>>(message);
+      gui::CountryStatusHelper & helper = gui::DrapeGui::Instance().GetCountryStatusHelper();
+      if (msg->IsCurrentCountry())
+      {
+        helper.SetStorageInfo(msg->GetStorageInfo());
+      }
+      else
+      {
+        // check if country is current
+        if (helper.GetCountryIndex() == msg->GetStorageInfo().m_countryIndex)
+          helper.SetStorageInfo(msg->GetStorageInfo());
+      }
+      break;
+    }
   case Message::StopRendering:
     {
       ProcessStopRenderingMessage();
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index 23c3dd96e0..917850a025 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -48,7 +48,6 @@ DrapeEngine::DrapeEngine(Params const & params)
   gui::DrapeGui & guiSubsystem = gui::DrapeGui::Instance();
   guiSubsystem.Init(scaleFn, gnLvlFn);
   guiSubsystem.SetLocalizator(bind(&StringsBundle::GetString, params.m_stringsBundle.get(), _1));
-  guiSubsystem.SetStorageAccessor(params.m_storageAccessor);
 
   ConnectDownloadFn(gui::CountryStatusHelper::BUTTON_TYPE_MAP, params.m_model.GetDownloadMapHandler());
   ConnectDownloadFn(gui::CountryStatusHelper::BUTTON_TYPE_MAP_ROUTING, params.m_model.GetDownloadMapRoutingHandler());
@@ -169,4 +168,11 @@ void DrapeEngine::ModelViewChangedGuiThread(ScreenBase const & screen)
     p.second(screen);
 }
 
+void DrapeEngine::SetStorageInfo(gui::StorageInfo const & info, bool isCurrentCountry)
+{
+  m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
+                                  make_unique_dp<StorageInfoUpdatedMessage>(info, isCurrentCountry),
+                                  MessagePriority::Normal);
+}
+
 } // namespace df
diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp
index 97792fb7d0..e19a607c81 100644
--- a/drape_frontend/drape_engine.hpp
+++ b/drape_frontend/drape_engine.hpp
@@ -7,6 +7,8 @@
 #include "drape/pointers.hpp"
 #include "drape/texture_manager.hpp"
 
+#include "drape_gui/country_status_helper.hpp"
+
 #include "geometry/screenbase.hpp"
 
 #include "base/strings_bundle.hpp"
@@ -15,7 +17,6 @@
 #include "std/mutex.hpp"
 
 namespace dp { class OGLContextFactory; }
-namespace gui { class StorageAccessor; }
 
 namespace df
 {
@@ -31,13 +32,11 @@ public:
   {
     Params(ref_ptr<dp::OGLContextFactory> factory,
            ref_ptr<StringsBundle> stringBundle,
-           ref_ptr<gui::StorageAccessor> storageAccessor,
            Viewport const & viewport,
            MapDataProvider const & model,
            double vs)
       : m_factory(factory)
       , m_stringsBundle(stringBundle)
-      , m_storageAccessor(storageAccessor)
       , m_viewport(viewport)
       , m_model(model)
       , m_vs(vs)
@@ -46,7 +45,6 @@ public:
 
     ref_ptr<dp::OGLContextFactory> m_factory;
     ref_ptr<StringsBundle> m_stringsBundle;
-    ref_ptr<gui::StorageAccessor> m_storageAccessor;
     Viewport m_viewport;
     MapDataProvider m_model;
     double m_vs;
@@ -75,6 +73,8 @@ public:
 
   void SetRenderingEnabled(bool const isEnabled);
 
+  void SetStorageInfo(gui::StorageInfo const & info, bool isCurrentCountry);
+
 private:
   void AddUserEvent(UserEvent const & e);
   void ModelViewChanged(ScreenBase const & screen);
diff --git a/drape_frontend/map_data_provider.cpp b/drape_frontend/map_data_provider.cpp
index 340095a4e3..ce195f7f4d 100644
--- a/drape_frontend/map_data_provider.cpp
+++ b/drape_frontend/map_data_provider.cpp
@@ -5,14 +5,14 @@ namespace df
 
 MapDataProvider::MapDataProvider(TReadIDsFn const & idsReader,
                                  TReadFeaturesFn const & featureReader,
-                                 TResolveCountryFn const & countryResolver,
+                                 TUpdateCountryIndexFn const & countryIndexUpdater,
                                  TIsCountryLoadedFn const & isCountryLoadedFn,
                                  TDownloadFn const & downloadMapHandler,
                                  TDownloadFn const & downloadMapRoutingHandler,
                                  TDownloadFn const & downloadRetryHandler)
   : m_featureReader(featureReader)
   , m_idsReader(idsReader)
-  , m_countryResolver(countryResolver)
+  , m_countryIndexUpdater(countryIndexUpdater)
   , m_isCountryLoadedFn(isCountryLoadedFn)
   , m_downloadMapHandler(downloadMapHandler)
   , m_downloadMapRoutingHandler(downloadMapRoutingHandler)
@@ -30,9 +30,9 @@ void MapDataProvider::ReadFeatures(TReadCallback<FeatureType> const & fn, vector
   m_featureReader(fn, ids);
 }
 
-storage::TIndex MapDataProvider::FindCountry(m2::PointF const & pt)
+void MapDataProvider::UpdateCountryIndex(storage::TIndex const & currentIndex, m2::PointF const & pt)
 {
-  return m_countryResolver(pt);
+  m_countryIndexUpdater(currentIndex, pt);
 }
 
 MapDataProvider::TIsCountryLoadedFn const & MapDataProvider::GetIsCountryLoadedFn() const
diff --git a/drape_frontend/map_data_provider.hpp b/drape_frontend/map_data_provider.hpp
index ddd20f06cc..7a3bad2ddc 100644
--- a/drape_frontend/map_data_provider.hpp
+++ b/drape_frontend/map_data_provider.hpp
@@ -17,13 +17,13 @@ public:
   template <typename T> using TReadCallback = function<void (T const &)>;
   using TReadFeaturesFn = function<void (TReadCallback<FeatureType> const & , vector<FeatureID> const &)>;
   using TReadIDsFn = function<void (TReadCallback<FeatureID> const & , m2::RectD const &, int)>;
-  using TResolveCountryFn = function<storage::TIndex (m2::PointF const &)>;
+  using TUpdateCountryIndexFn = function<void (storage::TIndex const & , m2::PointF const &)>;
   using TIsCountryLoadedFn = function<bool (m2::PointD const & pt)>;
   using TDownloadFn = function<void (storage::TIndex const & countryIndex)>;
 
   MapDataProvider(TReadIDsFn const & idsReader,
                   TReadFeaturesFn const & featureReader,
-                  TResolveCountryFn const & countryResolver,
+                  TUpdateCountryIndexFn const & countryIndexUpdater,
                   TIsCountryLoadedFn const & isCountryLoadedFn,
                   TDownloadFn const & downloadMapHandler,
                   TDownloadFn const & downloadMapRoutingHandler,
@@ -32,7 +32,7 @@ public:
   void ReadFeaturesID(TReadCallback<FeatureID> const & fn, m2::RectD const & r, int scale) const;
   void ReadFeatures(TReadCallback<FeatureType> const & fn, vector<FeatureID> const & ids) const;
 
-  storage::TIndex FindCountry(m2::PointF const & pt);
+  void UpdateCountryIndex(storage::TIndex const & currentIndex, m2::PointF const & pt);
   TIsCountryLoadedFn const & GetIsCountryLoadedFn() const;
 
   TDownloadFn const & GetDownloadMapHandler() const;
@@ -42,7 +42,7 @@ public:
 private:
   TReadFeaturesFn m_featureReader;
   TReadIDsFn m_idsReader;
-  TResolveCountryFn m_countryResolver;
+  TUpdateCountryIndexFn m_countryIndexUpdater;
   TIsCountryLoadedFn m_isCountryLoadedFn;
   TDownloadFn m_downloadMapHandler;
   TDownloadFn m_downloadMapRoutingHandler;
diff --git a/drape_frontend/message.hpp b/drape_frontend/message.hpp
index fc2d5ed877..21583078d1 100644
--- a/drape_frontend/message.hpp
+++ b/drape_frontend/message.hpp
@@ -24,6 +24,7 @@ public:
     GuiLayerRecached,
     GuiRecache,
     MyPositionShape,
+    StorageInfoUpdated,
     StopRendering
   };
 
diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp
index 54d4ff7b08..36426c5f7d 100644
--- a/drape_frontend/message_subclasses.hpp
+++ b/drape_frontend/message_subclasses.hpp
@@ -9,6 +9,7 @@
 #include "geometry/rect2d.hpp"
 #include "geometry/screenbase.hpp"
 
+#include "drape_gui/country_status_helper.hpp"
 #include "drape_gui/layer_render.hpp"
 #include "drape_gui/skin.hpp"
 
@@ -246,6 +247,23 @@ private:
   gui::Skin::ElementName m_elements;
 };
 
+class StorageInfoUpdatedMessage : public Message
+{
+public:
+  StorageInfoUpdatedMessage(gui::StorageInfo const & info, bool isCurrentCountry)
+    : m_storageInfo(info)
+    , m_isCurrentCountry(isCurrentCountry)
+  {}
+
+  Type GetType() const override { return Message::StorageInfoUpdated;}
+  gui::StorageInfo const & GetStorageInfo() const { return m_storageInfo; }
+  bool IsCurrentCountry() const { return m_isCurrentCountry; }
+
+private:
+  gui::StorageInfo m_storageInfo;
+  bool m_isCurrentCountry;
+};
+
 class MyPositionShapeMessage : public Message
 {
 public:
diff --git a/drape_gui/country_status_helper.cpp b/drape_gui/country_status_helper.cpp
index d3a26eb33e..031da6191d 100644
--- a/drape_gui/country_status_helper.cpp
+++ b/drape_gui/country_status_helper.cpp
@@ -1,8 +1,6 @@
 #include "country_status_helper.hpp"
 #include "drape_gui.hpp"
 
-#include "storage/index.hpp"
-
 #include "base/stl_add.hpp"
 #include "base/string_utils.hpp"
 #include "base/string_format.hpp"
@@ -70,20 +68,12 @@ CountryStatusHelper::CountryStatusHelper()
 {
 }
 
-void CountryStatusHelper::SetStorageAccessor(ref_ptr<StorageAccessor> accessor)
+void CountryStatusHelper::SetStorageInfo(StorageInfo const & storageInfo)
 {
-  m_accessor = accessor;
-}
-
-void CountryStatusHelper::SetCountryIndex(storage::TIndex const & index)
-{
-  ASSERT(m_accessor != nullptr, ());
-  if (m_accessor->GetCountryIndex() == index)
-    return;
+  m_storageInfo = storageInfo;
 
   CountryStatusHelper::ECountryState state = CountryStatusHelper::COUNTRY_STATE_LOADED;
-  m_accessor->SetCountryIndex(index);
-  switch(m_accessor->GetCountryStatus())
+  switch(m_storageInfo.m_countryStatus)
   {
   case storage::TStatus::ENotDownloaded:
     state = CountryStatusHelper::COUNTRY_STATE_EMPTY;
@@ -105,10 +95,15 @@ void CountryStatusHelper::SetCountryIndex(storage::TIndex const & index)
   SetState(state);
 }
 
+void CountryStatusHelper::Clear()
+{
+  m_storageInfo = StorageInfo();
+  SetState(COUNTRY_STATE_LOADED);
+}
+
 storage::TIndex CountryStatusHelper::GetCountryIndex() const
 {
-  ASSERT(m_accessor != nullptr, ());
-  return m_accessor->GetCountryIndex();
+  return m_storageInfo.m_countryIndex;
 }
 
 void CountryStatusHelper::SetState(ECountryState state)
@@ -148,7 +143,7 @@ void CountryStatusHelper::GetProgressInfo(string & alphabet, size_t & maxLength)
 
 string CountryStatusHelper::GetProgressValue() const
 {
-  return strings::to_string(m_accessor->GetDownloadProgress()) + "%";
+  return strings::to_string(m_storageInfo.m_downloadProgress) + "%";
 }
 
 void CountryStatusHelper::FillControlsForState()
@@ -177,7 +172,7 @@ void CountryStatusHelper::FillControlsForState()
 void CountryStatusHelper::FillControlsForEmpty()
 {
   ASSERT(m_controls.empty(), ());
-  m_controls.push_back(MakeLabel(m_accessor->GetCurrentCountryName()));
+  m_controls.push_back(MakeLabel(m_storageInfo.m_currentCountryName));
   m_controls.push_back(MakeButton(FormatDownloadMap(), BUTTON_TYPE_MAP));
   m_controls.push_back(MakeButton(FormatDownloadMapRouting(), BUTTON_TYPE_MAP_ROUTING));
 }
@@ -198,7 +193,7 @@ void CountryStatusHelper::FillControlsForLoading()
     m_controls.push_back(MakeLabel(firstLabel));
   }
 
-  m_controls.push_back(MakeLabel(m_accessor->GetCurrentCountryName()));
+  m_controls.push_back(MakeLabel(m_storageInfo.m_currentCountryName));
   m_controls.push_back(MakeProgress());
 
   if (secondPos + 1 < text.size())
@@ -226,7 +221,7 @@ string CountryStatusHelper::FormatDownloadMap()
 {
   size_t size;
   string units;
-  FormatMapSize(m_accessor->GetMapSize(), units, size);
+  FormatMapSize(m_storageInfo.m_mapSize, units, size);
   return strings::Format(GetLocalizedString(DownloadMapButtonID), size, units);
 }
 
@@ -234,18 +229,18 @@ string CountryStatusHelper::FormatDownloadMapRouting()
 {
   size_t size;
   string units;
-  FormatMapSize(m_accessor->GetMapSize() + m_accessor->GetRoutingSize(), units, size);
+  FormatMapSize(m_storageInfo.m_mapSize + m_storageInfo.m_routingSize, units, size);
   return strings::Format(GetLocalizedString(DownloadMapRoutingButtonID), size, units);
 }
 
 string CountryStatusHelper::FormatInQueueMap()
 {
-  return strings::Format(GetLocalizedString(InQueueID), m_accessor->GetCurrentCountryName());
+  return strings::Format(GetLocalizedString(InQueueID), m_storageInfo.m_currentCountryName);
 }
 
 string CountryStatusHelper::FormatFailed()
 {
-  return strings::Format(GetLocalizedString(DownloadingFailedID), m_accessor->GetCurrentCountryName());
+  return strings::Format(GetLocalizedString(DownloadingFailedID), m_storageInfo.m_currentCountryName);
 }
 
 string CountryStatusHelper::FormatTryAgain()
diff --git a/drape_gui/country_status_helper.hpp b/drape_gui/country_status_helper.hpp
index 4a63549e53..57a79ba81a 100644
--- a/drape_gui/country_status_helper.hpp
+++ b/drape_gui/country_status_helper.hpp
@@ -2,17 +2,26 @@
 
 #include "drape/pointers.hpp"
 
+#include "storage/index.hpp"
+#include "storage/storage_defines.hpp"
+
 #include "base/buffer_vector.hpp"
 
 #include "std/atomic.hpp"
 #include "std/string.hpp"
 
-namespace storage { struct TIndex; }
-
 namespace gui
 {
 
-class StorageAccessor;
+struct StorageInfo
+{
+  storage::TIndex m_countryIndex = storage::TIndex::INVALID;
+  storage::TStatus m_countryStatus = storage::TStatus::EUnknown;
+  string m_currentCountryName;
+  size_t m_mapSize = 0;
+  size_t m_routingSize = 0;
+  size_t m_downloadProgress = 0;
+};
 
 class CountryStatusHelper
 {
@@ -50,11 +59,10 @@ public:
 
   CountryStatusHelper();
 
-  void SetStorageAccessor(ref_ptr<StorageAccessor> accessor);
-  void SetCountryIndex(storage::TIndex const & index);
-  storage::TIndex GetCountryIndex() const;
+  void SetStorageInfo(StorageInfo const & storageInfo);
+  void Clear();
 
-  void SetState(ECountryState state);
+  storage::TIndex GetCountryIndex() const;
   ECountryState GetState() const;
   /// CountryStatusHandle work on FrontendRenderer and call this function to check "is visible"
   /// or state has already changed.
@@ -82,10 +90,11 @@ private:
   string FormatFailed();
   string FormatTryAgain();
 
-private:
-  atomic<ECountryState> m_state;
+  void SetState(ECountryState state);
+
+  ECountryState m_state;
   buffer_vector<Control, 4> m_controls;
-  ref_ptr<StorageAccessor> m_accessor;
+  StorageInfo m_storageInfo;
 };
 
 }  // namespace gui
diff --git a/drape_gui/drape_gui.cpp b/drape_gui/drape_gui.cpp
index d0ce482a0a..dffeb3d5c7 100644
--- a/drape_gui/drape_gui.cpp
+++ b/drape_gui/drape_gui.cpp
@@ -7,11 +7,6 @@
 namespace gui
 {
 
-void StorageAccessor::SetStatusChangedCallback(TSlotFn const & fn)
-{
-  m_statusChanged = fn;
-}
-
 struct DrapeGui::Impl
 {
   DrapeGui::TScaleFactorFn m_scaleFn;
@@ -103,23 +98,6 @@ string DrapeGui::GetLocalizedString(string const & stringID) const
   return m_impl->m_localizeFn(stringID);
 }
 
-void DrapeGui::SetStorageAccessor(ref_ptr<StorageAccessor> accessor)
-{
-  ASSERT(m_impl != nullptr, ());
-  accessor->SetStatusChangedCallback([this]
-  {
-    EmitRecacheSignal(Skin::CountryStatus);
-  });
-
-  CountryStatusHelper & cntHelpet = GetCountryStatusHelperImpl();
-  cntHelpet.SetStorageAccessor(accessor);
-}
-
-void DrapeGui::SetCountryIndex(storage::TIndex const & index)
-{
-  GetCountryStatusHelperImpl().SetCountryIndex(index);
-}
-
 RulerHelper & DrapeGui::GetRulerHelperImpl()
 {
   ASSERT(m_impl != nullptr, ());
diff --git a/drape_gui/drape_gui.hpp b/drape_gui/drape_gui.hpp
index 0916a3b4e8..7e7fcea5d0 100644
--- a/drape_gui/drape_gui.hpp
+++ b/drape_gui/drape_gui.hpp
@@ -20,27 +20,6 @@ namespace gui
 class RulerHelper;
 class CountryStatusHelper;
 
-class StorageAccessor
-{
-public:
-  using TSlotFn = function<void ()>;
-
-  virtual ~StorageAccessor() {}
-  virtual string GetCurrentCountryName() const = 0;
-  virtual size_t GetMapSize() const = 0;
-  virtual size_t GetRoutingSize() const = 0;
-  virtual size_t GetDownloadProgress() const  = 0;
-
-  virtual void SetCountryIndex(storage::TIndex const & index) = 0;
-  virtual storage::TIndex GetCountryIndex() const = 0;
-  virtual storage::TStatus GetCountryStatus() const = 0;
-
-  void SetStatusChangedCallback(TSlotFn const & fn);
-
-protected:
-  TSlotFn m_statusChanged;
-};
-
 class DrapeGui
 {
 public:
@@ -57,11 +36,8 @@ public:
 
   void Init(TScaleFactorFn const & scaleFn, TGeneralizationLevelFn const & gnLvlFn);
   void SetLocalizator(TLocalizeStringFn const & fn);
-  void SetStorageAccessor(ref_ptr<gui::StorageAccessor> accessor);
   void Destroy();
 
-  void SetCountryIndex(storage::TIndex const & index);
-
   double GetScaleFactor();
   int GetGeneralization(ScreenBase const & screen);
   string GetLocalizedString(string const & stringID) const;
diff --git a/drape_gui/drape_gui_tests/drape_gui_tests.pro b/drape_gui/drape_gui_tests/drape_gui_tests.pro
index 6a8ca6f8e1..6ad33ed352 100644
--- a/drape_gui/drape_gui_tests/drape_gui_tests.pro
+++ b/drape_gui/drape_gui_tests/drape_gui_tests.pro
@@ -3,7 +3,7 @@ CONFIG += console warn_on
 CONFIG -= app_bundle
 TEMPLATE = app
 
-DEPENDENCIES = drape drape_gui coding platform base fribidi expat
+DEPENDENCIES = drape drape_gui storage coding platform base fribidi expat
 ROOT_DIR = ../..
 include($$ROOT_DIR/common.pri)
 
diff --git a/drape_head/drape_head.pro b/drape_head/drape_head.pro
index 920b0ffec8..2d9a256d71 100644
--- a/drape_head/drape_head.pro
+++ b/drape_head/drape_head.pro
@@ -1,6 +1,6 @@
 # Head project for drape develop and debuging
 ROOT_DIR = ..
-DEPENDENCIES = map drape_frontend drape_gui anim drape indexer platform geometry coding base \
+DEPENDENCIES = map drape_frontend drape_gui anim drape indexer storage platform geometry coding base \
                freetype expat protobuf jansson fribidi tomcrypt
 
 include($$ROOT_DIR/common.pri)
diff --git a/map/active_maps_layout.cpp b/map/active_maps_layout.cpp
index 90f3572e6f..3fe2417e5b 100644
--- a/map/active_maps_layout.cpp
+++ b/map/active_maps_layout.cpp
@@ -23,17 +23,13 @@ bool ActiveMapsLayout::Item::IsEqual(Item const & item) const
 ActiveMapsLayout::ActiveMapsLayout(Framework & framework)
   : m_framework(framework)
 {
-#ifndef OMIM_OS_DESKTOP
   m_subscribeSlotID = GetStorage().Subscribe(bind(&ActiveMapsLayout::StatusChangedCallback, this, _1),
                                              bind(&ActiveMapsLayout::ProgressChangedCallback, this, _1, _2));
-#endif
 }
 
 ActiveMapsLayout::~ActiveMapsLayout()
 {
-#ifndef OMIM_OS_DESKTOP
   GetStorage().Unsubscribe(m_subscribeSlotID);
-#endif
 }
 
 void ActiveMapsLayout::Init(vector<TLocalFilePtr> const & files)
diff --git a/map/active_maps_layout.hpp b/map/active_maps_layout.hpp
index a315a59398..2bd088d223 100644
--- a/map/active_maps_layout.hpp
+++ b/map/active_maps_layout.hpp
@@ -35,6 +35,7 @@ public:
   class ActiveMapsListener
   {
   public:
+    virtual ~ActiveMapsListener(){}
     /// if some country been inserted than oldGroup == newGroup, and oldPosition == -1
     /// if some country been deleted than oldGroup == newGroup, and newPosition == -1
     /// if group of country been changed. than oldGroup != newGroup, oldPosition >= 0 and newPosition >= 0
diff --git a/map/framework.cpp b/map/framework.cpp
index 226778b5de..44ddbb2214 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -180,7 +180,7 @@ Framework::Framework()
 {
   m_activeMaps.reset(new ActiveMapsLayout(*this));
   m_globalCntTree = storage::CountryTree(m_activeMaps);
-  m_storageAccessor = make_unique_dp<StorageBridge>(m_activeMaps);
+  m_storageBridge = make_unique_dp<StorageBridge>(m_activeMaps, bind(&Framework::UpdateStorageInfo, this, _1, _2));
 
   // Restore map style before classificator loading
   int mapStyle = MapStyleLight;
@@ -273,11 +273,10 @@ Framework::Framework()
 
 Framework::~Framework()
 {
-  // m_drapeEngine must be destroyed before m_storageAccessor
   m_drapeEngine.reset();
 
+  m_storageBridge.reset();
   m_activeMaps.reset();
-  m_storageAccessor.reset();
   m_model.SetOnMapDeregisteredCallback(nullptr);
 }
 
@@ -873,6 +872,34 @@ void Framework::OnDownloadRetryCallback(storage::TIndex const & countryIndex)
   m_activeMaps->RetryDownloading(countryIndex);
 }
 
+void Framework::OnUpdateCountryIndex(storage::TIndex const & currentIndex, m2::PointF const & pt)
+{
+  storage::TIndex newCountryIndex = GetCountryIndex(m2::PointD(pt));
+  if (currentIndex != newCountryIndex)
+    UpdateStorageInfo(newCountryIndex, true /* isCurrentCountry */);
+}
+
+void Framework::UpdateStorageInfo(storage::TIndex const & countryIndex, bool isCurrentCountry)
+{
+  ASSERT(m_activeMaps != nullptr, ());
+  ASSERT(m_drapeEngine != nullptr, ());
+
+  gui::StorageInfo storageInfo;
+
+  storageInfo.m_countryIndex = countryIndex;
+  storageInfo.m_currentCountryName = m_activeMaps->GetFormatedCountryName(countryIndex);
+  storageInfo.m_mapSize = m_activeMaps->GetRemoteCountrySizes(countryIndex).first;
+  storageInfo.m_routingSize = m_activeMaps->GetRemoteCountrySizes(countryIndex).second;
+  storageInfo.m_countryStatus = m_activeMaps->GetCountryStatus(countryIndex);
+  if (storageInfo.m_countryStatus == storage::TStatus::EDownloading)
+  {
+    storage::LocalAndRemoteSizeT progress = m_activeMaps->GetDownloadableCountrySize(countryIndex);
+    storageInfo.m_downloadProgress = progress.first * 100 / progress.second;
+  }
+
+  m_drapeEngine->SetStorageInfo(storageInfo, isCurrentCountry);
+}
+
 void Framework::MemoryWarning()
 {
   LOG(LINFO, ("MemoryWarning"));
@@ -1286,7 +1313,7 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
 {
   using TReadIDsFn = df::MapDataProvider::TReadIDsFn;
   using TReadFeaturesFn = df::MapDataProvider::TReadFeaturesFn;
-  using TResolveCountryFn = df::MapDataProvider::TResolveCountryFn;
+  using TUpdateCountryIndexFn = df::MapDataProvider::TUpdateCountryIndexFn;
   using TIsCountryLoadedFn = df::MapDataProvider::TIsCountryLoadedFn;
   using TDownloadFn = df::MapDataProvider::TDownloadFn;
 
@@ -1300,9 +1327,9 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
     m_model.ReadFeatures(fn, ids);
   };
 
-  TResolveCountryFn resolveCountry = [this](m2::PointF const & pt) -> TIndex
+  TUpdateCountryIndexFn updateCountryIndex = [this](storage::TIndex const & currentIndex, m2::PointF const & pt)
   {
-    return GetCountryIndex(m2::PointD(pt));
+    GetPlatform().RunOnGuiThread(bind(&Framework::OnUpdateCountryIndex, this, currentIndex, pt));
   };
 
   TIsCountryLoadedFn isCountryLoadedFn = bind(&Framework::IsCountryLoaded, this, _1);
@@ -1324,9 +1351,8 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
 
   df::DrapeEngine::Params p(contextFactory,
                             make_ref(&m_stringsBundle),
-                            make_ref(m_storageAccessor),
                             df::Viewport(0, 0, w, h),
-                            df::MapDataProvider(idReadFn, featureReadFn, resolveCountry, isCountryLoadedFn,
+                            df::MapDataProvider(idReadFn, featureReadFn, updateCountryIndex, isCountryLoadedFn,
                                                 downloadMapFn, downloadMapRoutingFn, downloadRetryFn),
                             vs);
 
diff --git a/map/framework.hpp b/map/framework.hpp
index 8efebf6649..ff0ebeb3c4 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -57,7 +57,7 @@ class CountryInfoGetter;
 namespace anim { class Controller; }
 namespace routing { namespace turns{ class Settings; } }
 
-namespace gui { class StorageAccessor; }
+class StorageBridge;
 
 /// Uncomment line to make fixed position settings and
 /// build version for screenshots.
@@ -87,8 +87,6 @@ class Framework
 #endif
 
 protected:
-  friend class BenchmarkEngine;
-
   StringsBundle m_stringsBundle;
 
   // The order matters here: storage::CountryInfoGetter must be
@@ -104,7 +102,7 @@ protected:
 
   typedef vector<BookmarkCategory *>::iterator CategoryIter;
 
-  drape_ptr<gui::StorageAccessor> m_storageAccessor;
+  drape_ptr<StorageBridge> m_storageBridge;
   drape_ptr<df::DrapeEngine> m_drapeEngine;
 
   using TDrapeFunction = function<void (df::DrapeEngine *)>;
@@ -122,7 +120,6 @@ protected:
   storage::Storage m_storage;
   shared_ptr<storage::ActiveMapsLayout> m_activeMaps;
   storage::CountryTree m_globalCntTree;
-  unique_ptr<anim::Controller> m_animController;
   InformationDisplay m_informationDisplay;
 
   /// How many pixels around touch point are used to get bookmark or POI
@@ -302,6 +299,9 @@ private:
   void OnDownloadMapRoutingCallback(storage::TIndex const & countryIndex);
   void OnDownloadRetryCallback(storage::TIndex const & countryIndex);
 
+  void OnUpdateCountryIndex(storage::TIndex const & currentIndex, m2::PointF const & pt);
+  void UpdateStorageInfo(storage::TIndex const & countryIndex, bool isCurrentCountry);
+
 public:
   using TSearchRequest = search::QuerySaver::TSearchRequest;
 
diff --git a/map/storage_bridge.cpp b/map/storage_bridge.cpp
index 9c7e604b11..fe9767df10 100644
--- a/map/storage_bridge.cpp
+++ b/map/storage_bridge.cpp
@@ -2,53 +2,17 @@
 
 using namespace storage;
 
-StorageBridge::StorageBridge(shared_ptr<storage::ActiveMapsLayout> activeMaps)
+StorageBridge::StorageBridge(shared_ptr<storage::ActiveMapsLayout> activeMaps, TOnChangedHandler const & handler)
   : m_activeMaps(activeMaps)
+  , m_handler(handler)
 {
+  ASSERT(m_activeMaps != nullptr, ());
+  m_slot = m_activeMaps->AddListener(this);
 }
 
-string StorageBridge::GetCurrentCountryName() const
+StorageBridge::~StorageBridge()
 {
-  ASSERT(m_currentIndex != TIndex(), ());
-  return m_activeMaps->GetFormatedCountryName(m_currentIndex);
-}
-
-size_t StorageBridge::GetMapSize() const
-{
-  ASSERT(m_currentIndex != TIndex(), ());
-  return m_activeMaps->GetRemoteCountrySizes(m_currentIndex).first;
-}
-
-size_t StorageBridge::GetRoutingSize() const
-{
-  ASSERT(m_currentIndex != TIndex(), ());
-  return m_activeMaps->GetRemoteCountrySizes(m_currentIndex).second;
-}
-
-size_t StorageBridge::GetDownloadProgress() const
-{
-  if (m_progress.second == 0)
-    return 0;
-
-  return m_progress.first * 100 / m_progress.second;
-}
-
-void StorageBridge::SetCountryIndex(storage::TIndex const & index)
-{
-  m_currentIndex = index;
-}
-
-storage::TIndex StorageBridge::GetCountryIndex() const
-{
-  return m_currentIndex;
-}
-
-storage::TStatus StorageBridge::GetCountryStatus() const
-{
-  if (m_currentIndex == TIndex())
-    return TStatus::EOnDisk;
-
-  return m_activeMaps->GetCountryStatus(m_currentIndex);
+  m_activeMaps->RemoveListener(m_slot);
 }
 
 void StorageBridge::CountryGroupChanged(ActiveMapsLayout::TGroup const & oldGroup, int oldPosition,
@@ -65,8 +29,7 @@ void StorageBridge::CountryStatusChanged(ActiveMapsLayout::TGroup const & group,
 {
   UNUSED_VALUE(oldStatus);
   UNUSED_VALUE(newStatus);
-  if (m_activeMaps->GetCoreIndex(group, position) == m_currentIndex && m_statusChanged)
-    m_statusChanged();
+  ReportChanges(group, position);
 }
 
 void StorageBridge::CountryOptionsChanged(ActiveMapsLayout::TGroup const & group, int position,
@@ -81,6 +44,15 @@ void StorageBridge::CountryOptionsChanged(ActiveMapsLayout::TGroup const & group
 void StorageBridge::DownloadingProgressUpdate(ActiveMapsLayout::TGroup const & group, int position,
                                               LocalAndRemoteSizeT const & progress)
 {
-  if (m_activeMaps->GetCoreIndex(group, position) == m_currentIndex)
-    m_progress = progress;
+  UNUSED_VALUE(progress);
+  ReportChanges(group, position);
+}
+
+void StorageBridge::ReportChanges(ActiveMapsLayout::TGroup const & group, int position)
+{
+  storage::TIndex countryIndex = m_activeMaps->GetCoreIndex(group, position);
+
+  // here we can not be sure if the country is current, so let check it later
+  if (m_handler != nullptr)
+    m_handler(countryIndex, false /* isCurrentCountry */);
 }
diff --git a/map/storage_bridge.hpp b/map/storage_bridge.hpp
index e0ab642e4e..a0a26bf518 100644
--- a/map/storage_bridge.hpp
+++ b/map/storage_bridge.hpp
@@ -7,21 +7,13 @@
 #include "storage/index.hpp"
 #include "storage/storage_defines.hpp"
 
-/// Provide access to Storage in DrapeGui subsystem. Need to CountryStatus buttons
-class StorageBridge : public gui::StorageAccessor
-                    , public storage::ActiveMapsLayout::ActiveMapsListener
+class StorageBridge : public storage::ActiveMapsLayout::ActiveMapsListener
 {
 public:
-  StorageBridge(shared_ptr<storage::ActiveMapsLayout> activeMaps);
+  using TOnChangedHandler = function<void(storage::TIndex const & /*countryIndex*/, bool /*isCurrentCountry*/)>;
 
-  string GetCurrentCountryName() const override;
-  size_t GetMapSize() const override;
-  size_t GetRoutingSize() const override;
-  size_t GetDownloadProgress() const override;
-
-  void SetCountryIndex(storage::TIndex const & index) override;
-  storage::TIndex GetCountryIndex() const override;
-  storage::TStatus GetCountryStatus() const override;
+  StorageBridge(shared_ptr<storage::ActiveMapsLayout> activeMaps, TOnChangedHandler const & handler);
+  ~StorageBridge() override;
 
   void CountryGroupChanged(storage::ActiveMapsLayout::TGroup const & oldGroup, int oldPosition,
                            storage::ActiveMapsLayout::TGroup const & newGroup, int newPosition) override;
@@ -33,7 +25,10 @@ public:
                                  storage::LocalAndRemoteSizeT const & progress) override;
 
 private:
-  storage::TIndex m_currentIndex;
   shared_ptr<storage::ActiveMapsLayout> m_activeMaps;
-  storage::LocalAndRemoteSizeT m_progress;
+  TOnChangedHandler m_handler;
+  int m_slot;
+
+  void ReportChanges(storage::ActiveMapsLayout::TGroup const & group, int position);
 };
+