diff --git a/iphone/Maps/Bookmarks/Catalog/BookmarksLoadedViewController.xib b/iphone/Maps/Bookmarks/Catalog/BookmarksLoadedViewController.xib
index a666f914f1..7d1e9fa163 100644
--- a/iphone/Maps/Bookmarks/Catalog/BookmarksLoadedViewController.xib
+++ b/iphone/Maps/Bookmarks/Catalog/BookmarksLoadedViewController.xib
@@ -28,7 +28,7 @@ succesfully downloaded</string>
                     <color key="textColor" white="0.0" alpha="0.86124785958904104" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <nil key="highlightedColor"/>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="guide_downloaded_title"/>
+                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="bookmarks_downloaded_title"/>
                         <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
                         <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
                     </userDefinedRuntimeAttributes>
@@ -41,7 +41,7 @@ new places from the list</string>
                     <color key="textColor" white="0.0" alpha="0.54045376712328763" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <nil key="highlightedColor"/>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="guide_downloaded_subtitle"/>
+                        <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="bookmarks_downloaded_subtitle"/>
                         <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
                         <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
                     </userDefinedRuntimeAttributes>
@@ -51,6 +51,7 @@ new places from the list</string>
                     <color key="backgroundColor" red="0.11767578125" green="0.58980089430000004" blue="0.94108072916666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="45" id="EAx-L2-t3K"/>
+                        <constraint firstAttribute="width" constant="190" id="PZ2-T2-ELY"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                     <state key="normal" title="View on map"/>
@@ -72,6 +73,7 @@ new places from the list</string>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="azM-lz-wDm">
                     <rect key="frame" x="35" y="207" width="190" height="45"/>
                     <constraints>
+                        <constraint firstAttribute="width" constant="190" id="K10-vw-dM5"/>
                         <constraint firstAttribute="height" constant="45" id="LMT-F8-gcD"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
index d8d35c6744..a723be49a0 100644
--- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
@@ -9,6 +9,7 @@ final class CatalogWebViewController: WebViewController {
   var statSent = false
   var backButton: UIBarButtonItem!
   var fwdButton: UIBarButtonItem!
+  var toolbar = UIToolbar()
 
   @objc init() {
     super.init(url: MWMBookmarksManager.catalogFrontendUrl()!, title: L("guides"))!
@@ -55,14 +56,22 @@ final class CatalogWebViewController: WebViewController {
     progressImageView.centerYAnchor.constraint(equalTo: progressView.centerYAnchor).isActive = true
     progressView.widthAnchor.constraint(equalToConstant: 48).isActive = true
     progressView.heightAnchor.constraint(equalToConstant: 48).isActive = true
+
+    view.addSubview(toolbar)
+    toolbar.translatesAutoresizingMaskIntoConstraints = false
+    toolbar.leftAnchor.constraint(equalTo: view.leftAnchor).isActive = true
+    toolbar.rightAnchor.constraint(equalTo: view.rightAnchor).isActive = true
+    toolbar.topAnchor.constraint(equalTo: progressView.bottomAnchor, constant: 8).isActive = true
+
     if #available(iOS 11, *) {
+      toolbar.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor).isActive = true
       progressView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 8).isActive = true
-      progressView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor, constant: -8).isActive = true
     } else {
+      toolbar.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
       progressView.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 8).isActive = true
-      progressView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: -8).isActive = true
     }
 
+
     rotateProgress()
     updateProgress()
     navigationItem.leftBarButtonItem = UIBarButtonItem(image: #imageLiteral(resourceName: "ic_catalog_close"), style: .plain, target: self, action: #selector(goBack))
@@ -72,8 +81,7 @@ final class CatalogWebViewController: WebViewController {
     super.viewWillAppear(animated)
     let fixedSpace = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil)
     fixedSpace.width = 20
-    self.setToolbarItems([backButton, fixedSpace, fwdButton], animated: true)
-    self.navigationController?.setToolbarHidden(false, animated: animated)
+    toolbar.setItems([backButton, fixedSpace, fwdButton], animated: true)
   }
 
   override func viewDidAppear(_ animated: Bool) {
@@ -83,11 +91,6 @@ final class CatalogWebViewController: WebViewController {
     }
   }
 
-  override func viewWillDisappear(_ animated: Bool) {
-    super.viewWillDisappear(animated)
-    self.navigationController?.setToolbarHidden(true, animated: animated)
-  }
-
   override func webView(_ webView: WKWebView,
                         decidePolicyFor navigationAction: WKNavigationAction,
                         decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
diff --git a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift
index f33d0024cb..58a3872f8b 100644
--- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift
@@ -47,6 +47,7 @@ class DownloadedBookmarksViewController: MWMViewController {
                                                verticalFittingPriority: .defaultLow)
     f.size = s
     bottomView.frame = f
+    tableView.refresh()
   }
 
   @IBAction func onDownloadBookmarks(_ sender: Any) {
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index bc0cabffe8..5dd8b6443b 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -434,9 +434,9 @@ BOOL gIsFirstMyPositionMode = YES;
         GetFramework().ShowBookmarkCategory(categoryId);
       };
       alert.onCancelBlock = ^{
-        [self dismissViewControllerAnimated:YES completion:nil];
+        [self.navigationController dismissViewControllerAnimated:YES completion:nil];
       };
-      [self presentViewController:alert animated:YES completion:nil];
+      [self.navigationController presentViewController:alert animated:YES completion:nil];
       return;
     }
   }