diff --git a/android/res/layout-land/onmap_downloader.xml b/android/res/layout-land/onmap_downloader.xml
index 7485642e2a..6a3e8c259b 100644
--- a/android/res/layout-land/onmap_downloader.xml
+++ b/android/res/layout-land/onmap_downloader.xml
@@ -109,8 +109,7 @@
         <ImageView
           android:id="@+id/icon"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:src="@drawable/ic_brand_megafon_green"/>
+          android:layout_height="wrap_content"/>
         <TextView
           android:id="@id/text"
           android:layout_width="wrap_content"
@@ -118,8 +117,7 @@
           android:layout_marginTop="@dimen/margin_half"
           android:gravity="center"
           android:textAppearance="@style/MwmTextAppearance.Body4"
-          android:textColor="?android:textColorPrimary"
-          android:text="@string/banner_megafon_banner_message"/>
+          android:textColor="?android:textColorPrimary"/>
         <Button
           android:id="@+id/banner_button"
           android:layout_width="match_parent"
@@ -134,8 +132,6 @@
           android:fontFamily="@string/robotoMedium"
           android:textAllCaps="false"
           android:textSize="@dimen/text_size_body_3"
-          android:text="@string/banner_megafon_banner_button"
-          android:background="@drawable/button_megafon"
           style="?android:attr/borderlessButtonStyle"
           android:textColor="@color/white_primary"
           android:lines="1"
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index 1ef02e905c..d6ac91b778 100644
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -221,4 +221,8 @@
 
   <color name="elevation_profile_dot_enabled">#FF9600</color>
   <color name="elevation_profile">#1E96F0</color>
+
+  <color name="tinkoff_button">#FFDD2D</color>
+  <color name="mts_button">#E30611</color>
+  <color name="skyeng_button">#4287DF</color>
 </resources>
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategy.java b/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategy.java
index 4151a26c7d..8b7ce02838 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategy.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategy.java
@@ -7,6 +7,6 @@ import androidx.annotation.NonNull;
 
 interface DownloaderBannerConfigStrategy
 {
-  void ConfigureView(@NonNull View parent, @IdRes int iconViewId, @IdRes int messageViewId,
+  void configureView(@NonNull View parent, @IdRes int iconViewId, @IdRes int messageViewId,
                      @IdRes int buttonViewId);
 }
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyDefault.java b/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyDefault.java
index 069697ea75..43070ab0dd 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyDefault.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyDefault.java
@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 class DownloaderBannerConfigStrategyDefault implements DownloaderBannerConfigStrategy
 {
   @Override
-  public void ConfigureView(@NonNull View parent, @IdRes int iconViewId, @IdRes int messageViewId,
+  public void configureView(@NonNull View parent, @IdRes int iconViewId, @IdRes int messageViewId,
                             @IdRes int buttonViewId)
   {
   }
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyPartner.java b/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyPartner.java
index 5c54af42ce..41a8c04616 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyPartner.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderBannerConfigStrategyPartner.java
@@ -5,6 +5,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
@@ -13,19 +14,19 @@ import androidx.annotation.StringRes;
 class DownloaderBannerConfigStrategyPartner implements DownloaderBannerConfigStrategy
 {
   @DrawableRes
-  private int mIcon;
+  private final int mIcon;
   @StringRes
-  private int mMessage;
+  private final int mMessage;
   @StringRes
-  private int mButtonText;
-  @ColorInt
-  private int mButtonTextColor;
-  @ColorInt
-  private int mButtonColor;
+  private final int mButtonText;
+  @ColorRes
+  private final int mButtonTextColor;
+  @ColorRes
+  private final int mButtonColor;
 
   DownloaderBannerConfigStrategyPartner(@DrawableRes int icon, @StringRes int message,
-                                        @StringRes int buttonText, @ColorInt int buttonTextColor,
-                                        @ColorInt int buttonColor)
+                                        @StringRes int buttonText, @ColorRes int buttonTextColor,
+                                        @ColorRes int buttonColor)
   {
     mIcon = icon;
     mMessage = message;
@@ -35,7 +36,7 @@ class DownloaderBannerConfigStrategyPartner implements DownloaderBannerConfigStr
   }
 
   @Override
-  public void ConfigureView(@NonNull View parent, @IdRes int iconViewId, @IdRes int messageViewId,
+  public void configureView(@NonNull View parent, @IdRes int iconViewId, @IdRes int messageViewId,
                             @IdRes int buttonViewId)
   {
     ImageView icon = parent.findViewById(iconViewId);
@@ -44,7 +45,7 @@ class DownloaderBannerConfigStrategyPartner implements DownloaderBannerConfigStr
     message.setText(mMessage);
     TextView button = parent.findViewById(buttonViewId);
     button.setText(mButtonText);
-    button.setTextColor(mButtonTextColor);
-    button.setBackgroundColor(mButtonColor);
+    button.setTextColor(button.getResources().getColor(mButtonTextColor));
+    button.setBackgroundColor(button.getResources().getColor(mButtonColor));
   }
 }
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderBannerType.java b/android/src/com/mapswithme/maps/downloader/DownloaderBannerType.java
index 227923fa69..2870fd5413 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderBannerType.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderBannerType.java
@@ -12,8 +12,8 @@ enum DownloaderBannerType implements StatisticValueConverter<String>
   TINKOFF_AIRLINES(new DownloaderBannerConfigStrategyPartner(R.drawable.ic_logo_tinkoff,
                                                              R.string.tinkoff_allairlines_map_downloader_title,
                                                              R.string.tinkoff_allairlines_map_downloader_cta_button,
-                                                             Color.parseColor("#000000"),
-                                                             Color.parseColor("#FFDD2D")))
+                                                             R.color.black_primary,
+                                                             R.color.tinkoff_button))
   {
     @NonNull
     @Override
@@ -25,8 +25,8 @@ enum DownloaderBannerType implements StatisticValueConverter<String>
   TINKOFF_INSURANCE(new DownloaderBannerConfigStrategyPartner(R.drawable.ic_logo_tinkoff,
                                                               R.string.tinkoff_insurance_map_downloader_title,
                                                               R.string.tinkoff_insurance_map_downloader_cta_button,
-                                                              Color.parseColor("#000000"),
-                                                              Color.parseColor("#FFDD2D")))
+                                                              R.color.black_primary,
+                                                              R.color.tinkoff_button))
   {
     @NonNull
     @Override
@@ -38,8 +38,8 @@ enum DownloaderBannerType implements StatisticValueConverter<String>
   MTS(new DownloaderBannerConfigStrategyPartner(R.drawable.ic_logo_mts,
                                                 R.string.mts_map_downloader_title,
                                                 R.string.mts_map_downloader_cta_button,
-                                                Color.parseColor("#FFFFFF"),
-                                                Color.parseColor("#E30611")))
+                                                R.color.white_primary,
+                                                R.color.mts_button))
   {
     @NonNull
     @Override
@@ -51,8 +51,8 @@ enum DownloaderBannerType implements StatisticValueConverter<String>
   SKYENG(new DownloaderBannerConfigStrategyPartner(R.drawable.ic_logo_skyeng,
                                                    R.string.skyeng_map_downloader_title,
                                                    R.string.skyeng_map_downloader_cta_button,
-                                                   Color.parseColor("#FFFFFF"),
-                                                   Color.parseColor("#4287DF")))
+                                                   R.color.white_primary,
+                                                   R.color.skyeng_button))
   {
     @NonNull
     @Override
diff --git a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
index 246f77de97..1e05765498 100644
--- a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
+++ b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
@@ -290,7 +290,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
     boolean hasCatalogPromo = mPromoBanner.getType() == DownloaderBannerType.BOOKMARK_CATALOG;
 
     View bannerView = hasCatalogPromo ? mCatalogCallToActionContainer : mBannerContainer;
-    mPromoBanner.getType().getViewConfigStrategy().ConfigureView(bannerView, R.id.icon, R.id.text,
+    mPromoBanner.getType().getViewConfigStrategy().configureView(bannerView, R.id.icon, R.id.text,
                                                                  R.id.banner_button);
     UiUtils.showIf(!hasCatalogPromo, mBannerContainer);
     UiUtils.showIf(hasCatalogPromo, mCatalogCallToActionContainer);
diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
index d68b063fa5..41fe01a287 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
@@ -44,7 +44,7 @@ ads::Banner getPromoBanner(std::string const &mwmId) {
   std::vector<ads::Banner> banners;
   auto const pos = GetFramework().GetCurrentPosition();
   if (pos) {
-    banners = GetFramework().GetAdsEngine().GetDownloadOnMapBanners(mwmId, *pos, languages::GetCurrentNorm());
+    banners = GetFramework().GetAdsEngine().GetDownloadOnMapBanners(mwmId, *pos, "ru");//languages::GetCurrentNorm());
   }
 
   if (banners.empty())
diff --git a/iphone/Maps/Classes/Widgets/PartnerBannerViewController.swift b/iphone/Maps/Classes/Widgets/PartnerBannerViewController.swift
index 65d0caf6e2..ffc1d98d11 100644
--- a/iphone/Maps/Classes/Widgets/PartnerBannerViewController.swift
+++ b/iphone/Maps/Classes/Widgets/PartnerBannerViewController.swift
@@ -1,9 +1,9 @@
 @objc
 final class PartnerBannerViewController: MWMDownloadBannerViewController {
 
-  @IBOutlet weak var icon: UIImageView!
-  @IBOutlet weak var message: UILabel!
-  @IBOutlet weak var button: UIButton!
+  @IBOutlet var icon: UIImageView!
+  @IBOutlet var message: UILabel!
+  @IBOutlet var button: UIButton!
   
   var bannerType: MWMBannerType = .none
   
@@ -14,10 +14,10 @@ final class PartnerBannerViewController: MWMDownloadBannerViewController {
   override func viewDidLoad() {
     let iconImage = { () -> UIImage in
       switch self.bannerType {
-       case .tinkoffAllAirlines: return #imageLiteral(resourceName: "ic_logo_tinkoff")
-       case .tinkoffInsurance: return #imageLiteral(resourceName: "ic_logo_tinkoff")
-       case .mts: return #imageLiteral(resourceName: "ic_logo_mts")
-       case .skyeng: return #imageLiteral(resourceName: "ic_logo_skyeng")
+       case .tinkoffAllAirlines: return UIImage(named: "ic_logo_tinkoff")!
+       case .tinkoffInsurance: return UIImage(named: "ic_logo_tinkoff")!
+       case .mts: return UIImage(named: "ic_logo_mts")!
+       case .skyeng: return UIImage(named: "ic_logo_skyeng")!
        default: fatalError()
        }
      }
@@ -42,22 +42,12 @@ final class PartnerBannerViewController: MWMDownloadBannerViewController {
        }
      }
      
-     let buttonBackgroundColor = { () -> UIColor in
+     let getStyleName = { () -> String in
       switch self.bannerType {
-       case .tinkoffAllAirlines: return UIColor.init(fromHexString: "FFDD2D")
-       case .tinkoffInsurance: return UIColor.init(fromHexString: "FFDD2D")
-       case .mts: return UIColor.init(fromHexString: "E30611")
-       case .skyeng: return UIColor.init(fromHexString: "4287DF")
-       default: fatalError()
-       }
-     }
-     
-     let buttonTextColor = { () -> UIColor in
-      switch self.bannerType {
-       case .tinkoffAllAirlines: return .black
-       case .tinkoffInsurance: return .black
-       case .mts: return .white
-       case .skyeng: return .white
+       case .tinkoffAllAirlines: return "Tinkoff"
+       case .tinkoffInsurance: return "Tinkoff"
+       case .mts: return "Mts"
+       case .skyeng: return "Skyeng"
        default: fatalError()
        }
      }
@@ -65,7 +55,6 @@ final class PartnerBannerViewController: MWMDownloadBannerViewController {
      icon.image = iconImage()
      message.text = messageString()
      button.localizedText = buttonString()
-     button.backgroundColor = buttonBackgroundColor()
-     button.titleLabel?.textColor = buttonTextColor()
+     button.styleName = getStyleName()
 }
 }
diff --git a/iphone/Maps/Classes/Widgets/PartnerBannerViewController.xib b/iphone/Maps/Classes/Widgets/PartnerBannerViewController.xib
index 0122c8aeca..20af30d4cc 100644
--- a/iphone/Maps/Classes/Widgets/PartnerBannerViewController.xib
+++ b/iphone/Maps/Classes/Widgets/PartnerBannerViewController.xib
@@ -44,12 +44,6 @@
                     <state key="normal" title="Гудбай!">
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                            <integer key="value" value="14"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="clipsToBounds" value="YES"/>
-                    </userDefinedRuntimeAttributes>
                     <variation key="default">
                         <mask key="constraints">
                             <exclude reference="rwA-i2-tVJ"/>
diff --git a/iphone/Maps/Core/Theme/MainTheme.swift b/iphone/Maps/Core/Theme/MainTheme.swift
index 58e44249b0..b7246ac119 100644
--- a/iphone/Maps/Core/Theme/MainTheme.swift
+++ b/iphone/Maps/Core/Theme/MainTheme.swift
@@ -10,6 +10,7 @@ class MainTheme: Theme {
     self.registerStyleSheet(AuthStyleSheet.self)
     self.registerStyleSheet(SubscriptionsStyleSheet.self)
     self.registerStyleSheet(PlacePageStyleSheet.self)
+    self.registerStyleSheet(PartnersStyleSheet.self)
   }
 }
 
diff --git a/iphone/Maps/Core/Theme/ParntersStyleSheet.swift b/iphone/Maps/Core/Theme/ParntersStyleSheet.swift
new file mode 100644
index 0000000000..bac378fe2b
--- /dev/null
+++ b/iphone/Maps/Core/Theme/ParntersStyleSheet.swift
@@ -0,0 +1,28 @@
+class PartnersStyleSheet: IStyleSheet {
+  static func register(theme: Theme, colors: IColors, fonts: IFonts) {
+    theme.add(styleName: "Tinkoff") { (s) -> (Void) in
+      s.backgroundColor = UIColor(fromHexString: "FFDD2D")
+      s.fontColor = .black
+      s.font = fonts.semibold14
+      s.cornerRadius = 14
+      s.clip = true
+    }
+
+    theme.add(styleName: "Mts") { (s) -> (Void) in
+      s.backgroundColor = UIColor(fromHexString: "E30611")
+      s.fontColor = .white
+      s.font = fonts.semibold14
+      s.cornerRadius = 14
+      s.clip = true
+    }
+    
+    theme.add(styleName: "Skyeng") { (s) -> (Void) in
+      s.backgroundColor = UIColor(fromHexString: "4287DF")
+      s.fontColor = .white
+      s.font = fonts.semibold14
+      s.cornerRadius = 14
+      s.clip = true
+    }
+  }
+}
+
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 407dc489a1..a48d38f127 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -296,6 +296,7 @@
 		3D1958EB213804B6009A83EC /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1958EA213804B6009A83EC /* libmetrics.a */; };
 		3DB1C57122D5DDA60097EC4C /* PromoAfterBookingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3DB1C57022D5DDA60097EC4C /* PromoAfterBookingViewController.xib */; };
 		3DBD7B9F242363E500ED9FE8 /* PartnerBannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B9E242363E500ED9FE8 /* PartnerBannerViewController.swift */; };
+		3DBD7BE42425015C00ED9FE8 /* ParntersStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BE32425015C00ED9FE8 /* ParntersStyleSheet.swift */; };
 		3DE1762422D614B8000214FF /* PromoAfterBookingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DE1762322D614B8000214FF /* PromoAfterBookingViewController.swift */; };
 		3DEE1AEB21F72CD300054A91 /* MWMPowerManagmentViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3DEE1AEA21F72CD300054A91 /* MWMPowerManagmentViewController.mm */; };
 		3DF9C22B207CC14A00DA0793 /* taxi_places in Resources */ = {isa = PBXBuildFile; fileRef = 3DF9C22A207CC14A00DA0793 /* taxi_places */; };
@@ -1369,6 +1370,7 @@
 		3D1958EA213804B6009A83EC /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3DB1C57022D5DDA60097EC4C /* PromoAfterBookingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PromoAfterBookingViewController.xib; sourceTree = "<group>"; };
 		3DBD7B9E242363E500ED9FE8 /* PartnerBannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartnerBannerViewController.swift; sourceTree = "<group>"; };
+		3DBD7BE32425015C00ED9FE8 /* ParntersStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParntersStyleSheet.swift; sourceTree = "<group>"; };
 		3DDB4BC31DAB98F000F4D021 /* libpartners_api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpartners_api.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libpartners_api.a"; sourceTree = "<group>"; };
 		3DE1762322D614B8000214FF /* PromoAfterBookingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromoAfterBookingViewController.swift; sourceTree = "<group>"; };
 		3DEE1AE921F72CD300054A91 /* MWMPowerManagmentViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMPowerManagmentViewController.h; sourceTree = "<group>"; };
@@ -3723,6 +3725,7 @@
 				994AEC3323AB7B410079B81F /* DiscoveryStyleSheet.swift */,
 				999FC12A23ABB4B800B0E6F9 /* FontStyleSheet.swift */,
 				99A614D423C8911A00D8D8D0 /* AuthStyleSheet.swift */,
+				3DBD7BE32425015C00ED9FE8 /* ParntersStyleSheet.swift */,
 			);
 			path = Theme;
 			sourceTree = "<group>";
@@ -5324,6 +5327,7 @@
 				F653CE191C71F62700A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */,
 				340475621E081A4600C92850 /* MWMNetworkPolicy+UI.m in Sources */,
 				F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.m in Sources */,
+				3DBD7BE42425015C00ED9FE8 /* ParntersStyleSheet.swift in Sources */,
 				F6E2FF631E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */,
 				342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */,
 				47E3C7292111E614008B3B27 /* FadeInAnimatedTransitioning.swift in Sources */,
diff --git a/map/download_on_map_ads_delegate.cpp b/map/download_on_map_ads_delegate.cpp
index 5de9ae5b0c..d86e33d69c 100644
--- a/map/download_on_map_ads_delegate.cpp
+++ b/map/download_on_map_ads_delegate.cpp
@@ -17,27 +17,27 @@ storage::CountryId DownloadOnMapDelegate::GetCountryId(m2::PointD const & pos)
   return m_countryInfoGetter.GetRegionCountryId(pos);
 }
 
-storage::CountriesVec DownloadOnMapDelegate::GetTopmostNodesFor(storage::CountryId const & mwmId) const
+storage::CountriesVec DownloadOnMapDelegate::GetTopmostNodesFor(storage::CountryId const & countryId) const
 {
   storage::CountriesVec countries;
-  m_storage.GetTopmostNodesFor(mwmId, countries);
+  m_storage.GetTopmostNodesFor(countryId, countries);
   return countries;
 }
 
-std::string DownloadOnMapDelegate::GetMwmTopCityGeoId(storage::CountryId const & mwmId) const
+std::string DownloadOnMapDelegate::GetLinkForCountryId(storage::CountryId const & countryId) const
 {
   auto const & cities = m_storage.GetMwmTopCityGeoIds();
-  auto const it = cities.find(mwmId);
+  auto const it = cities.find(countryId);
 
   if (it == cities.cend())
     return {};
 
-  return strings::to_string(it->second.GetEncodedId());
-}
+  auto const cityGeoId = strings::to_string(it->second.GetEncodedId());
 
-std::string DownloadOnMapDelegate::GetLinkForGeoId(std::string const & id) const
-{
-  return m_promoApi.GetLinkForDownloader(id);
+  if (!cityGeoId.empty())
+    return {};
+
+  return m_promoApi.GetLinkForDownloader(countryId);
 }
 
 bool DownloadOnMapDelegate::IsAdsRemoved() const
diff --git a/map/download_on_map_ads_delegate.hpp b/map/download_on_map_ads_delegate.hpp
index a3b36313d3..42952a5c8b 100644
--- a/map/download_on_map_ads_delegate.hpp
+++ b/map/download_on_map_ads_delegate.hpp
@@ -27,9 +27,8 @@ public:
 
   // DownloadOnMapContainer::Delegate overrides:
   storage::CountryId GetCountryId(m2::PointD const & pos) override;
-  storage::CountriesVec GetTopmostNodesFor(storage::CountryId const & mwmId) const override;
-  std::string GetMwmTopCityGeoId(storage::CountryId const & mwmId) const override;
-  std::string GetLinkForGeoId(std::string const & id) const override;
+  storage::CountriesVec GetTopmostNodesFor(storage::CountryId const & countryId) const override;
+  std::string GetLinkForCountryId(storage::CountryId const & countryId) const override;
 
 private:
   storage::CountryInfoGetter const & m_countryInfoGetter;
@@ -37,4 +36,4 @@ private:
   promo::Api const & m_promoApi;
   Purchase const & m_purchase;
 };
-}  // namespace ads
\ No newline at end of file
+}  // namespace ads
diff --git a/partners_api/ads/ads_base.cpp b/partners_api/ads/ads_base.cpp
index 761eef1954..4360704936 100644
--- a/partners_api/ads/ads_base.cpp
+++ b/partners_api/ads/ads_base.cpp
@@ -85,25 +85,25 @@ DownloadOnMapContainer::DownloadOnMapContainer(Delegate & delegate)
 {
 }
 
-std::string DownloadOnMapContainer::GetBanner(storage::CountryId const & mwmId,
+std::string DownloadOnMapContainer::GetBanner(storage::CountryId const & countryId,
                                               m2::PointD const & userPos,
                                               std::string const & userLanguage) const
 {
-  if (!HasBanner(mwmId, userPos, userLanguage))
+  if (!HasBanner(countryId, userPos, userLanguage))
     return {};
 
   return GetBannerInternal();
 }
 
-bool DownloadOnMapContainer::HasBanner(storage::CountryId const & downloadMwmId,
+bool DownloadOnMapContainer::HasBanner(storage::CountryId const & countryId,
                                        m2::PointD const & userPos,
                                        std::string const & userLanguage) const
 {
   auto const userPosMwm = m_delegate.GetCountryId(userPos);
   auto userPosCountries = m_delegate.GetTopmostNodesFor(userPosMwm);
   userPosCountries.push_back(userPosMwm);
-  auto downloadMwmCountries = m_delegate.GetTopmostNodesFor(downloadMwmId);
-  downloadMwmCountries.push_back(downloadMwmId);
+  auto downloadMwmCountries = m_delegate.GetTopmostNodesFor(countryId);
+  downloadMwmCountries.push_back(countryId);
 
   return !std::any_of(userPosCountries.begin(), userPosCountries.end(),
                       [this](auto const & id) { return IsUserPosCountryExcluded(id); }) &&
diff --git a/partners_api/ads/ads_base.hpp b/partners_api/ads/ads_base.hpp
index 8e6a7faf6b..1639e8d271 100644
--- a/partners_api/ads/ads_base.hpp
+++ b/partners_api/ads/ads_base.hpp
@@ -92,22 +92,21 @@ public:
     virtual ~Delegate() = default;
 
     virtual storage::CountryId GetCountryId(m2::PointD const & pos) = 0;
-    virtual storage::CountriesVec GetTopmostNodesFor(storage::CountryId const & mwmId) const = 0;
-    virtual std::string GetMwmTopCityGeoId(storage::CountryId const & mwmId) const = 0;
-    virtual std::string GetLinkForGeoId(std::string const & id) const = 0;
+    virtual storage::CountriesVec GetTopmostNodesFor(storage::CountryId const & countryId) const = 0;
+    virtual std::string GetLinkForCountryId(storage::CountryId const & countryId) const = 0;
   };
 
-  DownloadOnMapContainer(Delegate & delegate);
+  explicit DownloadOnMapContainer(Delegate & delegate);
   virtual ~DownloadOnMapContainer() = default;
 
-  virtual std::string GetBanner(storage::CountryId const & mwmId, m2::PointD const & userPos,
+  virtual std::string GetBanner(storage::CountryId const & countryId, m2::PointD const & userPos,
                                 std::string const & userLanguage) const;
 
 protected:
   Delegate & m_delegate;
 
 private:
-  virtual bool HasBanner(storage::CountryId const & mwmId, m2::PointD const & userPos,
+  virtual bool HasBanner(storage::CountryId const & countryId, m2::PointD const & userPos,
                          std::string const & userLanguage) const;
   virtual std::string GetBannerInternal() const;
 
diff --git a/partners_api/ads/ads_utils.cpp b/partners_api/ads/ads_utils.cpp
index 20d8060618..2f10e337d7 100644
--- a/partners_api/ads/ads_utils.cpp
+++ b/partners_api/ads/ads_utils.cpp
@@ -10,16 +10,15 @@ void WithSupportedLanguages::AppendSupportedUserLanguages(
   for (auto const & language : languages)
   {
     int8_t const langIndex = StringUtf8Multilang::GetLangIndex(language);
-    if (langIndex == StringUtf8Multilang::kUnsupportedLanguageCode)
-      continue;
-    m_supportedUserLanguages.insert(langIndex);
+    if (langIndex != StringUtf8Multilang::kUnsupportedLanguageCode)
+      m_supportedUserLanguages.insert(langIndex);
   }
 }
 
 bool WithSupportedLanguages::IsLanguageSupported(std::string const & lang) const
 {
-  auto const userLangCode = StringUtf8Multilang::GetLangIndex(lang);
-  return m_supportedUserLanguages.find(userLangCode) != m_supportedUserLanguages.end();
+  auto const langIndex = StringUtf8Multilang::GetLangIndex(lang);
+  return m_supportedUserLanguages.find(langIndex) != m_supportedUserLanguages.end();
 }
 
 void WithSupportedCountries::AppendSupportedCountries(
diff --git a/partners_api/ads/bookmark_catalog_ads.cpp b/partners_api/ads/bookmark_catalog_ads.cpp
index 1c4e7ac0f7..133bde992d 100644
--- a/partners_api/ads/bookmark_catalog_ads.cpp
+++ b/partners_api/ads/bookmark_catalog_ads.cpp
@@ -7,14 +7,10 @@ BookmarkCatalog::BookmarkCatalog(Delegate & delegate)
 {
 }
 
-std::string BookmarkCatalog::GetBanner(storage::CountryId const & mwmId, m2::PointD const & userPos,
+std::string BookmarkCatalog::GetBanner(storage::CountryId const & countryId,
+                                       m2::PointD const & userPos,
                                        std::string const & userLanguage) const
 {
-  auto const cityGeoId = m_delegate.GetMwmTopCityGeoId(mwmId);
-
-  if (!cityGeoId.empty())
-    return m_delegate.GetLinkForGeoId(cityGeoId);
-
-  return {};
+  return m_delegate.GetLinkForCountryId(countryId);
 }
 }  // namespace ads
diff --git a/partners_api/ads/bookmark_catalog_ads.hpp b/partners_api/ads/bookmark_catalog_ads.hpp
index f2b5038ccb..9d27e1b375 100644
--- a/partners_api/ads/bookmark_catalog_ads.hpp
+++ b/partners_api/ads/bookmark_catalog_ads.hpp
@@ -7,9 +7,9 @@ namespace ads
 class BookmarkCatalog : public DownloadOnMapContainer
 {
 public:
-  BookmarkCatalog(Delegate & delegate);
+  explicit BookmarkCatalog(Delegate & delegate);
 
-  std::string GetBanner(storage::CountryId const & mwmId, m2::PointD const & userPos,
+  std::string GetBanner(storage::CountryId const & countryId, m2::PointD const & userPos,
                         std::string const & userLanguage) const override;
 };
 }  // namespace ads
diff --git a/partners_api/ads/facebook_ads.cpp b/partners_api/ads/facebook_ads.cpp
index 19b2c59ab5..7bc4e1dfa3 100644
--- a/partners_api/ads/facebook_ads.cpp
+++ b/partners_api/ads/facebook_ads.cpp
@@ -4,13 +4,13 @@ namespace
 {
 #if defined(OMIM_OS_IPHONE)
   auto const kSingleBannerIdForAllTypes = "185237551520383_3000232483354195";
-  auto const kSearchbannerId = "185237551520383_3000236913353752";
+  auto const kSearchBannerId = "185237551520383_3000236913353752";
 #elif defined(OMIM_OS_ANDROID)
   auto const kSingleBannerIdForAllTypes = "185237551520383_1450325641678228";
-  auto const kSearchbannerId = "185237551520383_1384653791578747";
+  auto const kSearchBannerId = "185237551520383_1384653791578747";
 #else
   auto const kSingleBannerIdForAllTypes = "dummy";
-  auto const kSearchbannerId = "dummy";
+  auto const kSearchBannerId = "dummy";
 #endif
 }  // namespace
 
@@ -23,7 +23,7 @@ std::string FacebookPoi::GetBannerForOtherTypes() const
 
 std::string FacebookSearch::GetBanner() const
 {
-  return kSearchbannerId;
+  return kSearchBannerId;
 }
 
 bool FacebookSearch::HasBanner() const
diff --git a/partners_api/ads/mts_ads.hpp b/partners_api/ads/mts_ads.hpp
index f38dfa6e19..a4acff8276 100644
--- a/partners_api/ads/mts_ads.hpp
+++ b/partners_api/ads/mts_ads.hpp
@@ -7,7 +7,7 @@ namespace ads
 class Mts : public DownloadOnMapContainer
 {
 public:
-  Mts(Delegate & delegate);
+  explicit Mts(Delegate & delegate);
 
 private:
   std::string GetBannerInternal() const override;
diff --git a/partners_api/ads/skyeng_ads.cpp b/partners_api/ads/skyeng_ads.cpp
index ecc33989b3..14735af288 100644
--- a/partners_api/ads/skyeng_ads.cpp
+++ b/partners_api/ads/skyeng_ads.cpp
@@ -5,262 +5,262 @@ namespace
 std::initializer_list<std::string> const kSupportedLanguages = {"ru"};
 
 std::initializer_list<storage::CountryId> const kSupportedCountries = {
-  "Russia_Tatarstan",
-  "Russia_Voronezh Oblast",
-  "Russia_Tver Oblast",
-  "Russia_Tula Oblast",
-  "Russia_Kaliningrad Oblast",
-  "Russia_Smolensk Oblast",
-  "Russia_Bashkortostan",
-  "Russia_Stavropol Krai",
-  "Russia_Nizhny Novgorod Oblast",
-  "Russia_Samara Oblast",
-  "Russia_Chelyabinsk Oblast",
-  "Russia_Vladimir Oblast",
-  "Russia_Pskov Oblast",
-  "Russia_Novosibirsk Oblast",
-  "Russia_Kaluga Oblast",
-  "Russia_Yaroslavl Oblast",
-  "Russia_Novgorod Oblast",
-  "Russia_Lipetsk Oblast",
-  "Russia_Volgograd Oblast",
-  "Russia_Republic of Karelia_South",
-  "Russia_Perm Krai_South",
-  "Russia_Krasnoyarsk Krai_South",
-  "Russia_Saratov Oblast",
-  "Russia_Ryazan Oblast",
-  "Russia_Primorsky Krai",
-  "Russia_Kabardino-Balkaria",
-  "Russia_North Ossetia-Alania",
-  "Russia_Bryansk Oblast",
-  "Russia_Irkutsk Oblast",
-  "Russia_Ulyanovsk Oblast",
-  "Russia_Vologda Oblast",
-  "Russia_Kursk Oblast",
-  "Russia_Orenburg Oblast",
-  "Russia_Belgorod Oblast",
-  "Russia_Tyumen Oblast",
-  "Russia_Kemerov Oblast",
-  "Russia_Murmansk Oblast",
-  "Russia_Yugra_Surgut",
-  "Russia_Oryol Oblast",
+  "Ireland_Connacht",
+  "Ireland_Leinster",
+  "Ireland_Munster",
+  "Ireland_Northern Counties",
   "Russia_Altai Krai",
-  "Russia_Omsk Oblast",
-  "Russia_Sverdlovsk Oblast_North",
-  "Russia_Karachay-Cherkessia",
-  "Russia_Khabarovsk Krai",
-  "Russia_Udmurt Republic",
-  "Russia_Chuvashia",
-  "Russia_Republic of Dagestan",
-  "Russia_Penza Oblast",
-  "Russia_Arkhangelsk Oblast_Central",
-  "Russia_Tambov Oblast",
-  "Russia_Ivanovo Oblast",
-  "Russia_Kostroma Oblast",
-  "Russia_Kirov Oblast",
-  "Russia_Republic of Kalmykia",
-  "Russia_Tomsk Oblast",
-  "Russia_Kurgan Oblast",
-  "Russia_Astrakhan Oblast",
-  "Russia_Republic of Mordovia",
-  "Russia_Republic of Karelia_North",
-  "Russia_Mari El",
-  "Russia_Perm Krai_North",
-  "Russia_Buryatia",
-  "Russia_Komi Republic",
-  "Russia_Sakhalin Oblast",
   "Russia_Altai Republic",
-  "Russia_Ingushetia",
-  "Russia_Yugra_Khanty",
-  "Russia_Chechen Republic",
-  "Russia_Yamalo-Nenets Autonomous Okrug",
-  "Russia_Sakha Republic",
-  "Russia_Kamchatka Krai",
   "Russia_Amur Oblast",
-  "Russia_Zabaykalsky Krai",
-  "Russia_Khakassia",
+  "Russia_Arkhangelsk Oblast_Central",
   "Russia_Arkhangelsk Oblast_North",
-  "Russia_Krasnoyarsk Krai_North",
-  "Russia_Jewish Autonomous Oblast",
-  "Russia_Magadan Oblast",
-  "Russia_Nenets Autonomous Okrug",
-  "Russia_Tuva",
+  "Russia_Astrakhan Oblast",
+  "Russia_Bashkortostan",
+  "Russia_Belgorod Oblast",
+  "Russia_Bryansk Oblast",
+  "Russia_Buryatia",
+  "Russia_Chechen Republic",
+  "Russia_Chelyabinsk Oblast",
   "Russia_Chukotka Autonomous Okrug",
-  "US_Wyoming",
-  "US_Wisconsin_North",
-  "US_Wisconsin_Milwaukee",
-  "US_Wisconsin_Madison",
-  "US_Wisconsin_Eau Claire",
-  "US_West Virginia",
-  "US_Washington_Yakima",
-  "US_Washington_Seattle",
-  "US_Washington_Coast",
-  "US_Virginia_Roanoke",
-  "US_Virginia_Richmond",
-  "US_Virginia_Norfolk",
-  "US_Virginia_Lynchburg",
-  "US_Virginia_Alexandria",
-  "US_Vermont",
-  "US_Utah_South",
-  "US_Utah_North",
-  "US_United States Minor Outlying Islands",
-  "US_Texas_West",
-  "US_Texas_Wako",
-  "US_Texas_Victoria",
-  "US_Texas_Tyler",
-  "US_Texas_Southwest",
-  "US_Texas_San Antonio",
-  "US_Texas_Lubbock",
-  "US_Texas_Houston",
-  "US_Texas_Dallas",
-  "US_Texas_Austin",
-  "US_Texas_Amarillo",
-  "US_Tennessee_West",
-  "US_Tennessee_East",
-  "US_South Dakota",
-  "US_South Carolina_Florence",
-  "US_South Carolina_Columbia",
-  "US_South Carolina_Charleston",
-  "US_Rhode Island",
-  "US_Puerto Rico",
-  "US_Pennsylvania_Scranton",
-  "US_Pennsylvania_Reading",
-  "US_Pennsylvania_Pittsburgh",
-  "US_Pennsylvania_Central",
-  "US_Oregon_West",
-  "US_Oregon_Portland",
-  "US_Oregon_Eugene",
-  "US_Oklahoma_West",
-  "US_Oklahoma_Tulsa",
-  "US_Oklahoma_Oklahoma",
-  "US_Oklahoma_East",
-  "US_Ohio_Toledo",
-  "US_Ohio_Columbus",
-  "US_Ohio_Cleveland",
-  "US_Ohio_Cincinnati",
-  "US_North Dakota_Minot",
-  "US_North Dakota_East",
-  "US_North Dakota_Bismarck",
-  "US_North Carolina_Wilson",
-  "US_North Carolina_Wilmington",
-  "US_North Carolina_Raleigh",
-  "US_North Carolina_Greensboro",
-  "US_North Carolina_Charlotte",
-  "US_North Carolina_Asheville",
-  "US_New York_West",
-  "US_New York_North",
-  "US_New York_New York",
-  "US_New York_East",
-  "US_New Mexico_Roswell",
-  "US_New Mexico_Albuquerque",
-  "US_New Jersey_South",
-  "US_New Jersey_North",
-  "US_New Hampshire",
-  "US_Nevada",
-  "US_Nebraska_West",
-  "US_Nebraska_East",
-  "US_Montana_West",
-  "US_Montana_East",
-  "US_Missouri_St Louis",
-  "US_Missouri_Springfield",
-  "US_Missouri_Kansas",
-  "US_Missouri_East",
-  "US_Mississippi_North",
-  "US_Mississippi_Gulfport",
-  "US_Minnesota_Saint Cloud",
-  "US_Minnesota_Rochester",
-  "US_Minnesota_North",
-  "US_Minnesota_Minneapolis",
-  "US_Michigan_North",
-  "US_Michigan_Lansing",
-  "US_Michigan_Grand Rapids",
-  "US_Michigan_Detroit",
-  "US_Massachusetts_West",
-  "US_Massachusetts_Southeastern",
-  "US_Massachusetts_Plymouth",
-  "US_Massachusetts_Central",
-  "US_Massachusetts_Boston",
+  "Russia_Chuvashia",
+  "Russia_Ingushetia",
+  "Russia_Irkutsk Oblast",
+  "Russia_Ivanovo Oblast",
+  "Russia_Jewish Autonomous Oblast",
+  "Russia_Kabardino-Balkaria",
+  "Russia_Kaliningrad Oblast",
+  "Russia_Kaluga Oblast",
+  "Russia_Kamchatka Krai",
+  "Russia_Karachay-Cherkessia",
+  "Russia_Kemerov Oblast",
+  "Russia_Khabarovsk Krai",
+  "Russia_Khakassia",
+  "Russia_Kirov Oblast",
+  "Russia_Komi Republic",
+  "Russia_Kostroma Oblast",
+  "Russia_Krasnoyarsk Krai_North",
+  "Russia_Krasnoyarsk Krai_South",
+  "Russia_Kurgan Oblast",
+  "Russia_Kursk Oblast",
+  "Russia_Lipetsk Oblast",
+  "Russia_Magadan Oblast",
+  "Russia_Mari El",
+  "Russia_Murmansk Oblast",
+  "Russia_Nenets Autonomous Okrug",
+  "Russia_Nizhny Novgorod Oblast",
+  "Russia_North Ossetia-Alania",
+  "Russia_Novgorod Oblast",
+  "Russia_Novosibirsk Oblast",
+  "Russia_Omsk Oblast",
+  "Russia_Orenburg Oblast",
+  "Russia_Oryol Oblast",
+  "Russia_Penza Oblast",
+  "Russia_Perm Krai_North",
+  "Russia_Perm Krai_South",
+  "Russia_Primorsky Krai",
+  "Russia_Pskov Oblast",
+  "Russia_Republic of Dagestan",
+  "Russia_Republic of Kalmykia",
+  "Russia_Republic of Karelia_North",
+  "Russia_Republic of Karelia_South",
+  "Russia_Republic of Mordovia",
+  "Russia_Ryazan Oblast",
+  "Russia_Sakha Republic",
+  "Russia_Sakhalin Oblast",
+  "Russia_Samara Oblast",
+  "Russia_Saratov Oblast",
+  "Russia_Smolensk Oblast",
+  "Russia_Stavropol Krai",
+  "Russia_Sverdlovsk Oblast_North",
+  "Russia_Tambov Oblast",
+  "Russia_Tatarstan",
+  "Russia_Tomsk Oblast",
+  "Russia_Tula Oblast",
+  "Russia_Tuva",
+  "Russia_Tver Oblast",
+  "Russia_Tyumen Oblast",
+  "Russia_Udmurt Republic",
+  "Russia_Ulyanovsk Oblast",
+  "Russia_Vladimir Oblast",
+  "Russia_Volgograd Oblast",
+  "Russia_Vologda Oblast",
+  "Russia_Voronezh Oblast",
+  "Russia_Yamalo-Nenets Autonomous Okrug",
+  "Russia_Yaroslavl Oblast",
+  "Russia_Yugra_Khanty",
+  "Russia_Yugra_Surgut",
+  "Russia_Zabaykalsky Krai",
+  "UK_England_East Midlands",
+  "UK_England_East of England_Essex",
+  "UK_England_East of England_Norfolk",
+  "UK_England_Greater London",
+  "UK_England_North East England",
+  "UK_England_North West England_Lancaster",
+  "UK_England_North West England_Manchester",
+  "UK_England_South East_Brighton",
+  "UK_England_South East_Oxford",
+  "UK_England_South West England_Bristol",
+  "UK_England_South West England_Cornwall",
+  "UK_England_West Midlands",
+  "UK_England_Yorkshire and the Humber",
+  "UK_Northern Ireland",
+  "UK_Scotland_North",
+  "UK_Scotland_South",
+  "UK_Wales",
+  "US_Alabama_Birmingham",
+  "US_Alabama_Montgomery",
+  "US_Alaska",
+  "US_Arizona_Flagstaff",
+  "US_Arizona_Phoenix",
+  "US_Arizona_Tucson",
+  "US_Arkansas_North",
+  "US_Arkansas_South",
+  "US_California_Bakersfield_Bakersfield",
+  "US_California_Bakersfield_Lancaster",
+  "US_California_Chico",
+  "US_California_LA",
+  "US_California_LA North",
+  "US_California_Redding",
+  "US_California_Sacramento_Fresno",
+  "US_California_Sacramento_Sacramento",
+  "US_California_Sacramento_Stockton",
+  "US_California_San Diego",
+  "US_California_Santa_Clara_Palo Alto",
+  "US_California_Santa_Clara_Santa Cruz",
+  "US_Colorado_Aspen",
+  "US_Colorado_Denver",
+  "US_Colorado_South",
+  "US_Connecticut",
+  "US_Delaware",
+  "US_Florida_Gainesville",
+  "US_Florida_Jacksonville",
+  "US_Florida_Miami",
+  "US_Florida_Orlando",
+  "US_Florida_Tampa",
+  "US_Georgia_Atlanta",
+  "US_Georgia_Macon",
+  "US_Georgia_North",
+  "US_Georgia_South",
+  "US_Guam",
+  "US_Hawaii",
+  "US_Idaho_North",
+  "US_Idaho_South",
+  "US_Illinois_Chickago",
+  "US_Illinois_Elgin",
+  "US_Illinois_Rockford",
+  "US_Illinois_South",
+  "US_Illinois_Springfield",
+  "US_Indiana_Evansville",
+  "US_Indiana_Indianapolis",
+  "US_Indiana_North",
+  "US_Iowa_Des Moines",
+  "US_Iowa_Waterloo",
+  "US_Iowa_West",
+  "US_Kansas_East",
+  "US_Kansas_West",
+  "US_Kansas_Wichita",
+  "US_Kentucky_East",
+  "US_Kentucky_Louisville",
+  "US_Kentucky_West",
+  "US_Louisiana_Central",
+  "US_Louisiana_New Orleans",
+  "US_Maine",
   "US_Maryland_Baltimore",
   "US_Maryland_and_DC",
-  "US_Maine",
-  "US_Louisiana_New Orleans",
-  "US_Louisiana_Central",
-  "US_Kentucky_West",
-  "US_Kentucky_Louisville",
-  "US_Kentucky_East",
-  "US_Kansas_Wichita",
-  "US_Kansas_West",
-  "US_Kansas_East",
-  "US_Iowa_West",
-  "US_Iowa_Waterloo",
-  "US_Iowa_Des Moines",
-  "US_Indiana_North",
-  "US_Indiana_Indianapolis",
-  "US_Indiana_Evansville",
-  "US_Illinois_Springfield",
-  "US_Illinois_South",
-  "US_Illinois_Rockford",
-  "US_Illinois_Elgin",
-  "US_Illinois_Chickago",
-  "US_Idaho_South",
-  "US_Idaho_North",
-  "US_Hawaii",
-  "US_Guam",
-  "US_Georgia_South",
-  "US_Georgia_North",
-  "US_Georgia_Macon",
-  "US_Georgia_Atlanta",
-  "US_Florida_Tampa",
-  "US_Florida_Orlando",
-  "US_Florida_Miami",
-  "US_Florida_Jacksonville",
-  "US_Florida_Gainesville",
-  "US_Delaware",
-  "US_Connecticut",
-  "US_Colorado_South",
-  "US_Colorado_Denver",
-  "US_Colorado_Aspen",
-  "US_California_Santa_Clara_Santa Cruz",
-  "US_California_Santa_Clara_Palo Alto",
-  "US_California_San Diego",
-  "US_California_Sacramento_Stockton",
-  "US_California_Sacramento_Sacramento",
-  "US_California_Sacramento_Fresno",
-  "US_California_Redding",
-  "US_California_LA North",
-  "US_California_LA",
-  "US_California_Chico",
-  "US_California_Bakersfield_Lancaster",
-  "US_California_Bakersfield_Bakersfield",
-  "US_Arkansas_South",
-  "US_Arkansas_North",
-  "US_Arizona_Tucson",
-  "US_Arizona_Phoenix",
-  "US_Arizona_Flagstaff",
-  "US_Alaska",
-  "US_Alabama_Montgomery",
-  "US_Alabama_Birmingham",
-  "UK_Wales",
-  "UK_Scotland_South",
-  "UK_Scotland_North",
-  "UK_Northern Ireland",
-  "UK_England_Yorkshire and the Humber",
-  "UK_England_West Midlands",
-  "UK_England_South West England_Cornwall",
-  "UK_England_South West England_Bristol",
-  "UK_England_South East_Oxford",
-  "UK_England_South East_Brighton",
-  "UK_England_North West England_Manchester",
-  "UK_England_North West England_Lancaster",
-  "UK_England_North East England",
-  "UK_England_Greater London",
-  "UK_England_East of England_Norfolk",
-  "UK_England_East of England_Essex",
-  "UK_England_East Midlands",
-  "Ireland_Northern Counties",
-  "Ireland_Munster",
-  "Ireland_Leinster",
-  "Ireland_Connacht"
+  "US_Massachusetts_Boston",
+  "US_Massachusetts_Central",
+  "US_Massachusetts_Plymouth",
+  "US_Massachusetts_Southeastern",
+  "US_Massachusetts_West",
+  "US_Michigan_Detroit",
+  "US_Michigan_Grand Rapids",
+  "US_Michigan_Lansing",
+  "US_Michigan_North",
+  "US_Minnesota_Minneapolis",
+  "US_Minnesota_North",
+  "US_Minnesota_Rochester",
+  "US_Minnesota_Saint Cloud",
+  "US_Mississippi_Gulfport",
+  "US_Mississippi_North",
+  "US_Missouri_East",
+  "US_Missouri_Kansas",
+  "US_Missouri_Springfield",
+  "US_Missouri_St Louis",
+  "US_Montana_East",
+  "US_Montana_West",
+  "US_Nebraska_East",
+  "US_Nebraska_West",
+  "US_Nevada",
+  "US_New Hampshire",
+  "US_New Jersey_North",
+  "US_New Jersey_South",
+  "US_New Mexico_Albuquerque",
+  "US_New Mexico_Roswell",
+  "US_New York_East",
+  "US_New York_New York",
+  "US_New York_North",
+  "US_New York_West",
+  "US_North Carolina_Asheville",
+  "US_North Carolina_Charlotte",
+  "US_North Carolina_Greensboro",
+  "US_North Carolina_Raleigh",
+  "US_North Carolina_Wilmington",
+  "US_North Carolina_Wilson",
+  "US_North Dakota_Bismarck",
+  "US_North Dakota_East",
+  "US_North Dakota_Minot",
+  "US_Ohio_Cincinnati",
+  "US_Ohio_Cleveland",
+  "US_Ohio_Columbus",
+  "US_Ohio_Toledo",
+  "US_Oklahoma_East",
+  "US_Oklahoma_Oklahoma",
+  "US_Oklahoma_Tulsa",
+  "US_Oklahoma_West",
+  "US_Oregon_Eugene",
+  "US_Oregon_Portland",
+  "US_Oregon_West",
+  "US_Pennsylvania_Central",
+  "US_Pennsylvania_Pittsburgh",
+  "US_Pennsylvania_Reading",
+  "US_Pennsylvania_Scranton",
+  "US_Puerto Rico",
+  "US_Rhode Island",
+  "US_South Carolina_Charleston",
+  "US_South Carolina_Columbia",
+  "US_South Carolina_Florence",
+  "US_South Dakota",
+  "US_Tennessee_East",
+  "US_Tennessee_West",
+  "US_Texas_Amarillo",
+  "US_Texas_Austin",
+  "US_Texas_Dallas",
+  "US_Texas_Houston",
+  "US_Texas_Lubbock",
+  "US_Texas_San Antonio",
+  "US_Texas_Southwest",
+  "US_Texas_Tyler",
+  "US_Texas_Victoria",
+  "US_Texas_Wako",
+  "US_Texas_West",
+  "US_United States Minor Outlying Islands",
+  "US_Utah_North",
+  "US_Utah_South",
+  "US_Vermont",
+  "US_Virginia_Alexandria",
+  "US_Virginia_Lynchburg",
+  "US_Virginia_Norfolk",
+  "US_Virginia_Richmond",
+  "US_Virginia_Roanoke",
+  "US_Washington_Coast",
+  "US_Washington_Seattle",
+  "US_Washington_Yakima",
+  "US_West Virginia",
+  "US_Wisconsin_Eau Claire",
+  "US_Wisconsin_Madison",
+  "US_Wisconsin_Milwaukee",
+  "US_Wisconsin_North",
+  "US_Wyoming"
 };
 }  // namespace
 
diff --git a/partners_api/ads/skyeng_ads.hpp b/partners_api/ads/skyeng_ads.hpp
index fd794d8805..cb20e232dd 100644
--- a/partners_api/ads/skyeng_ads.hpp
+++ b/partners_api/ads/skyeng_ads.hpp
@@ -7,7 +7,7 @@ namespace ads
 class Skyeng : public DownloadOnMapContainer
 {
 public:
-  Skyeng(Delegate & delegate);
+  explicit Skyeng(Delegate & delegate);
 
 private:
   std::string GetBannerInternal() const override;
diff --git a/partners_api/ads/tinkoff_allairlines_ads.cpp b/partners_api/ads/tinkoff_allairlines_ads.cpp
index aa8a6d870d..0226222b50 100644
--- a/partners_api/ads/tinkoff_allairlines_ads.cpp
+++ b/partners_api/ads/tinkoff_allairlines_ads.cpp
@@ -5,177 +5,177 @@ namespace
 std::initializer_list<std::string> const kSupportedLanguages = {"ru"};
 
 std::initializer_list<storage::CountryId> const kSupportedCountries = {
-  "Germany",
-  "Poland",
-  "Ukraine",
-  "Turkey",
-  "Finland",
-  "Belarus",
-  "China",
-  "Japan",
-  "Thailand",
-  "India",
-  "Switzerland",
-  "Norway",
-  "Belgium",
-  "Sweden",
-  "Georgia",
-  "Kazakhstan",
-  "South Ossetia",
-  "Armenia",
-  "Egypt",
-  "Argentina",
-  "Mongolia",
-  "Uzbekistan",
-  "Cambodia",
-  "Liechtenstein",
-  "Iceland",
-  "Myanmar",
-  "Taiwan",
-  "Saudi Arabia",
-  "Macedonia",
-  "Chile",
-  "Peru",
-  "Kyrgyzstan",
-  "Turkmenistan",
-  "Syria",
-  "Seychelles",
-  "Oman",
-  "Gibraltar",
-  "Pakistan",
-  "Qatar",
-  "Venezuela",
-  "New Zealand South",
-  "New Zealand North",
-  "Tajikistan",
-  "Colombia",
-  "Nagorno-Karabakh",
-  "The Bahamas",
-  "Republic of Kosovo",
-  "Antarctica",
-  "Iraq",
-  "North Korea",
-  "Laos",
-  "Mauritius",
-  "Algeria",
-  "British Indian Ocean Territory",
   "Afghanistan",
-  "Ecuador",
-  "Bahrain",
-  "Sudan",
-  "Jamaica",
-  "Zimbabwe",
-  "Zambia",
-  "Yemen",
-  "Lebanon",
-  "Bolivia",
-  "Kuwait",
-  "Greenland",
-  "Kenya",
-  "Vanuatu",
-  "Panama",
-  "Uruguay",
-  "Madagascar",
-  "Tokelau",
-  "Haiti",
-  "Cameroon",
-  "Dominica",
-  "Faroe Islands",
-  "Costa Rica",
-  "Papua New Guinea",
-  "United States Virgin Islands",
-  "Congo-Kinshasa",
-  "Tonga",
-  "Uganda",
-  "Belize",
-  "Swaziland",
-  "Tuvalu",
-  "Nigeria",
-  "Namibia",
-  "South Sudan",
-  "Paraguay",
-  "Campo de Hielo Sur",
-  "The Gambia",
-  "Honduras",
-  "Cayman Islands",
-  "South Georgia and the South Sandwich Islands",
-  "Botswana",
-  "Bangladesh",
-  "Kingdom of Lesotho",
-  "Libya",
-  "Caribisch Nederland",
-  "Turks and Caicos Islands",
-  "Solomon Islands",
-  "East Timor",
-  "Senegal",
-  "Mali",
-  "Cape Verde",
-  "Barbados",
-  "Bermuda",
-  "Antigua and Barbuda",
-  "Martinique",
-  "Nauru",
-  "Saint Martin",
-  "Fiji",
-  "Guadeloupe",
-  "Jersey",
-  "Guernsey",
-  "Ethiopia",
-  "Grenada",
-  "Burundi",
-  "Sao Tome and Principe",
-  "Saint Lucia",
-  "Palau",
-  "Rwanda",
-  "Central African Republic",
-  "Nicaragua",
-  "Kiribati",
-  "Bhutan",
-  "Falkland Islands",
-  "Guatemala",
-  "Guinea-Bissau",
+  "Algeria",
+  "Angola",
   "Anguilla",
-  "Somalia",
-  "Pitcairn Islands",
-  "Mauritania",
-  "Montserrat",
-  "Niger",
-  "Liberia",
-  "Saint Kitts and Nevis",
-  "British Virgin Islands",
-  "Djibouti",
-  "Samoa",
-  "Saint Vincent and the Grenadines",
-  "Chad",
-  "Eritrea",
-  "Sierra Leone",
-  "Mozambique",
+  "Antarctica",
+  "Antigua and Barbuda",
+  "Argentina",
+  "Armenia",
+  "Bahrain",
+  "Bangladesh",
+  "Barbados",
+  "Belarus",
+  "Belgium",
+  "Belize",
   "Benin",
+  "Bermuda",
+  "Bhutan",
+  "Bolivia",
+  "Botswana",
+  "British Indian Ocean Territory",
+  "British Virgin Islands",
+  "Brunei",
+  "Burkina Faso",
+  "Burundi",
+  "Cambodia",
+  "Cameroon",
+  "Campo de Hielo Sur",
+  "Cape Verde",
+  "Caribisch Nederland",
+  "Cayman Islands",
+  "Central African Republic",
+  "Chad",
+  "Chile",
+  "China",
+  "Colombia",
+  "Comoros",
+  "Congo-Brazzaville",
+  "Congo-Kinshasa",
+  "Cook Islands",
+  "Costa Rica",
+  "Cote dIvoire",
+  "Djibouti",
+  "Dominica",
+  "East Timor",
+  "Ecuador",
+  "Egypt",
+  "El Salvador",
+  "Equatorial Guinea",
+  "Eritrea",
+  "Ethiopia",
+  "Falkland Islands",
+  "Faroe Islands",
+  "Federated States of Micronesia",
+  "Fiji",
+  "Finland",
+  "Gabon",
+  "Georgia",
+  "Germany",
+  "Ghana",
+  "Gibraltar",
+  "Greenland",
+  "Grenada",
+  "Guadeloupe",
+  "Guatemala",
+  "Guernsey",
+  "Guinea",
+  "Guinea-Bissau",
+  "Guyana",
+  "Haiti",
+  "Honduras",
+  "Iceland",
+  "India",
+  "Iraq",
+  "Isle of Man",
+  "Jamaica",
+  "Japan",
+  "Jersey",
+  "Kazakhstan",
+  "Kenya",
+  "Kingdom of Lesotho",
+  "Kiribati",
+  "Kuwait",
+  "Kyrgyzstan",
+  "Laos",
+  "Lebanon",
+  "Liberia",
+  "Libya",
+  "Liechtenstein",
+  "Macedonia",
+  "Madagascar",
+  "Malawi",
+  "Mali",
+  "Marshall Islands",
+  "Martinique",
+  "Mauritania",
+  "Mauritius",
+  "Mongolia",
+  "Montserrat",
+  "Mozambique",
+  "Myanmar",
+  "Nagorno-Karabakh",
+  "Namibia",
+  "Nauru",
+  "New Zealand North",
+  "New Zealand South",
+  "Nicaragua",
+  "Niger",
+  "Nigeria",
+  "Niue",
+  "North Korea",
+  "Norway",
+  "Oman",
+  "Pakistan",
+  "Palau",
+  "Panama",
+  "Papua New Guinea",
+  "Paraguay",
+  "Peru",
+  "Pitcairn Islands",
+  "Poland",
+  "Qatar",
+  "Republic of Kosovo",
+  "Rwanda",
+  "Sahrawi Arab Democratic Republic",
   "Saint Barthelemy",
   "Saint Helena Ascension and Tristan da Cunha",
-  "Marshall Islands",
-  "Brunei",
-  "Isle of Man",
-  "Guinea",
-  "Federated States of Micronesia",
-  "Niue",
-  "Comoros",
-  "Sahrawi Arab Democratic Republic",
-  "Congo-Brazzaville",
-  "Angola",
-  "Cook Islands",
+  "Saint Kitts and Nevis",
+  "Saint Lucia",
+  "Saint Martin",
+  "Saint Vincent and the Grenadines",
+  "Samoa",
+  "Sao Tome and Principe",
+  "Saudi Arabia",
+  "Senegal",
+  "Seychelles",
+  "Sierra Leone",
+  "Solomon Islands",
+  "Somalia",
+  "South Georgia and the South Sandwich Islands",
+  "South Ossetia",
+  "South Sudan",
+  "Sudan",
   "Suriname",
-  "Malawi",
-  "Willis Island",
-  "Trinidad and Tobago",
-  "Gabon",
+  "Swaziland",
+  "Sweden",
+  "Switzerland",
+  "Syria",
+  "Taiwan",
+  "Tajikistan",
+  "Thailand",
+  "The Bahamas",
+  "The Gambia",
   "Togo",
-  "Equatorial Guinea",
-  "Guyana",
-  "Burkina Faso",
-  "El Salvador",
-  "Ghana",
-  "Cote dIvoire"
+  "Tokelau",
+  "Tonga",
+  "Trinidad and Tobago",
+  "Turkey",
+  "Turkmenistan",
+  "Turks and Caicos Islands",
+  "Tuvalu",
+  "Uganda",
+  "Ukraine",
+  "United States Virgin Islands",
+  "Uruguay",
+  "Uzbekistan",
+  "Vanuatu",
+  "Venezuela",
+  "Willis Island",
+  "Yemen",
+  "Zambia",
+  "Zimbabwe"
 };
 
 std::initializer_list<storage::CountryId> const kSupportedUserPosCountries = {"Russian Federation"};
diff --git a/partners_api/ads/tinkoff_allairlines_ads.hpp b/partners_api/ads/tinkoff_allairlines_ads.hpp
index 5eeb3745e1..9d13f598ca 100644
--- a/partners_api/ads/tinkoff_allairlines_ads.hpp
+++ b/partners_api/ads/tinkoff_allairlines_ads.hpp
@@ -7,7 +7,7 @@ namespace ads
 class TinkoffAllAirlines : public DownloadOnMapContainer
 {
 public:
-  TinkoffAllAirlines(Delegate & delegate);
+  explicit  TinkoffAllAirlines(Delegate & delegate);
 
 private:
   std::string GetBannerInternal() const override;
diff --git a/partners_api/ads/tinkoff_insurance_ads.cpp b/partners_api/ads/tinkoff_insurance_ads.cpp
index a266151612..d9a92bc2d5 100644
--- a/partners_api/ads/tinkoff_insurance_ads.cpp
+++ b/partners_api/ads/tinkoff_insurance_ads.cpp
@@ -5,65 +5,65 @@ namespace
 std::initializer_list<std::string> const kSupportedLanguages = {"ru"};
 
 std::initializer_list<storage::CountryId> const kSupportedCountries = {
-  "France",
-  "Spain",
-  "Czech",
-  "Crimea",
-  "Netherlands",
-  "Austria",
-  "Greece",
-  "Slovakia",
-  "Estonia",
-  "Hungary",
-  "Lithuania",
   "Abkhazia",
-  "Portugal",
-  "Latvia",
-  "Cyprus",
-  "Romania",
-  "Slovenia",
-  "Indonesia",
-  "Canada",
-  "Vietnam",
-  "United Arab Emirates",
-  "Montenegro",
-  "Croatia",
-  "Bulgaria",
-  "Denmark",
-  "South Korea",
-  "Brazil",
-  "Mexico",
-  "Philippines",
-  "Israel",
-  "South Africa",
-  "Azerbaijan",
-  "Serbia",
-  "Australia",
-  "Bosnia and Herzegovina",
-  "Morocco",
-  "Tunisia",
-  "Sri Lanka",
-  "Cuba",
-  "Iran",
-  "French Polynesia",
-  "Nepal",
-  "Ireland",
-  "Malaysia",
-  "Wallis and Futuna",
-  "San Marino",
-  "Monaco",
-  "Moldova",
-  "Singapore",
-  "Dominican Republic",
-  "Malta",
-  "Jordan",
-  "Palestine",
-  "Jerusalem",
-  "Maldives",
+  "Albania",
   "Andorra",
-  "Tanzania",
+  "Australia",
+  "Austria",
+  "Azerbaijan",
+  "Bosnia and Herzegovina",
+  "Brazil",
+  "Bulgaria",
+  "Canada",
+  "Crimea",
+  "Croatia",
+  "Cuba",
+  "Cyprus",
+  "Czech",
+  "Denmark",
+  "Dominican Republic",
+  "Estonia",
+  "France",
+  "French Polynesia",
+  "Greece",
+  "Hungary",
+  "Indonesia",
+  "Iran",
+  "Ireland",
+  "Israel",
+  "Jerusalem",
+  "Jordan",
+  "Latvia",
+  "Lithuania",
   "Luxembourg",
-  "Albania"
+  "Malaysia",
+  "Maldives",
+  "Malta",
+  "Mexico",
+  "Moldova",
+  "Monaco",
+  "Montenegro",
+  "Morocco",
+  "Nepal",
+  "Netherlands",
+  "Palestine",
+  "Philippines",
+  "Portugal",
+  "Romania",
+  "San Marino",
+  "Serbia",
+  "Singapore",
+  "Slovakia",
+  "Slovenia",
+  "South Africa",
+  "South Korea",
+  "Spain",
+  "Sri Lanka",
+  "Tanzania",
+  "Tunisia",
+  "United Arab Emirates",
+  "Vietnam",
+  "Wallis and Futuna"
 };
 
 std::initializer_list<storage::CountryId> const kSupportedUserPosCountries = {"Russian Federation"};
diff --git a/partners_api/ads/tinkoff_insurance_ads.hpp b/partners_api/ads/tinkoff_insurance_ads.hpp
index 2082e06505..4903e517a7 100644
--- a/partners_api/ads/tinkoff_insurance_ads.hpp
+++ b/partners_api/ads/tinkoff_insurance_ads.hpp
@@ -7,7 +7,7 @@ namespace ads
 class TinkoffInsurance : public DownloadOnMapContainer
 {
 public:
-  TinkoffInsurance(Delegate & delegate);
+  explicit TinkoffInsurance(Delegate & delegate);
 
 private:
   std::string GetBannerInternal() const override;
diff --git a/partners_api/partners_api_tests/ads_engine_tests.cpp b/partners_api/partners_api_tests/ads_engine_tests.cpp
index b6e5662345..3eaeed9010 100644
--- a/partners_api/partners_api_tests/ads_engine_tests.cpp
+++ b/partners_api/partners_api_tests/ads_engine_tests.cpp
@@ -23,8 +23,7 @@ public:
   // ads::DownloadOnMapContainer::Delegate
   storage::CountryId GetCountryId(m2::PointD const & pos) override { return {}; }
   storage::CountriesVec GetTopmostNodesFor(storage::CountryId const & mwmId) const override { return {}; };
-  std::string GetMwmTopCityGeoId(storage::CountryId const & mwmId) const override { return {}; };
-  std::string GetLinkForGeoId(std::string const & id) const override { return {}; };
+  std::string GetLinkForCountryId(storage::CountryId const & countryId) const override { return {}; };
 };
 
 void CheckCountAndTypes(std::vector<ads::Banner> const & banners)
diff --git a/partners_api/partners_api_tests/bookmark_catalog_ads_tests.cpp b/partners_api/partners_api_tests/bookmark_catalog_ads_tests.cpp
index fce2554417..49ee0c199f 100644
--- a/partners_api/partners_api_tests/bookmark_catalog_ads_tests.cpp
+++ b/partners_api/partners_api_tests/bookmark_catalog_ads_tests.cpp
@@ -10,26 +10,12 @@ UNIT_TEST(BokmarkCatalogAds_GetBanner)
   ads::BookmarkCatalog catalogAds(delegate);
 
   {
-    delegate.SetTopCityGeoId("123");
-    delegate.SetLinkForGeoId("123");
+    delegate.SetLinkForCountryId("123");
     auto const banner = catalogAds.GetBanner("", {}, "");
     TEST(!banner.empty(), ());
   }
   {
-    delegate.SetTopCityGeoId("123");
-    delegate.SetLinkForGeoId("");
-    auto const banner = catalogAds.GetBanner("", {}, "");
-    TEST(banner.empty(), ());
-  }
-  {
-    delegate.SetTopCityGeoId("");
-    delegate.SetLinkForGeoId("123");
-    auto const banner = catalogAds.GetBanner("", {}, "");
-    TEST(banner.empty(), ());
-  }
-  {
-    delegate.SetTopCityGeoId("");
-    delegate.SetLinkForGeoId("");
+    delegate.SetLinkForCountryId("");
     auto const banner = catalogAds.GetBanner("", {}, "");
     TEST(banner.empty(), ());
   }
diff --git a/partners_api/partners_api_tests/download_on_map_container_delegate.hpp b/partners_api/partners_api_tests/download_on_map_container_delegate.hpp
index 3c3f5db48e..c94a97b58e 100644
--- a/partners_api/partners_api_tests/download_on_map_container_delegate.hpp
+++ b/partners_api/partners_api_tests/download_on_map_container_delegate.hpp
@@ -16,8 +16,10 @@ public:
   {
     m_topmostNodes = topmostNodes;
   }
-  void SetTopCityGeoId(std::string const & topCityGeoId) { m_topCityGeoId = topCityGeoId; }
-  void SetLinkForGeoId(std::string const & linkForGeoId) { m_linkForGeoId = linkForGeoId; }
+  void SetLinkForCountryId(std::string const & linkForCountryId)
+  {
+    m_linkForCountryId = linkForCountryId;
+  }
 
   // ads::DownloadOnMapContainer::Delegate
   storage::CountryId GetCountryId(m2::PointD const & pos) override { return m_countryId; }
@@ -25,16 +27,13 @@ public:
   {
     return m_topmostNodes;
   }
-  std::string GetMwmTopCityGeoId(storage::CountryId const & mwmId) const override
+  std::string GetLinkForCountryId(storage::CountryId const & countryId) const override
   {
-    return m_topCityGeoId;
+    return m_linkForCountryId;
   }
 
-  std::string GetLinkForGeoId(std::string const & id) const override { return m_linkForGeoId; }
-
 private:
   storage::CountryId m_countryId;
   storage::CountriesVec m_topmostNodes;
-  std::string m_topCityGeoId;
-  std::string m_linkForGeoId;
+  std::string m_linkForCountryId;
 };