diff --git a/iphone/Maps/Categories/UIViewController+Navigation.m b/iphone/Maps/Categories/UIViewController+Navigation.m
index 1bb4b57da..bec88e1cb 100644
--- a/iphone/Maps/Categories/UIViewController+Navigation.m
+++ b/iphone/Maps/Categories/UIViewController+Navigation.m
@@ -17,11 +17,7 @@ static CGFloat const kButtonExtraWidth = 16.0;
 
 - (UIBarButtonItem *)buttonWithImage:(UIImage *)image action:(SEL)action
 {
-  UIButton * button = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, image.size.width + kButtonExtraWidth, image.size.height)];
-  [button setImage:image forState:UIControlStateNormal];
-  [button matchInterfaceOrientation];
-  [button addTarget:self action:action forControlEvents:UIControlEventTouchUpInside];
-  return [[UIBarButtonItem alloc] initWithCustomView:button];
+  return [[UIBarButtonItem alloc] initWithImage:image style:UIBarButtonItemStylePlain target:self action:action];
 }
 
 - (NSArray<UIBarButtonItem *> *)alignedNavBarButtonItems:(NSArray<UIBarButtonItem *> *)items
diff --git a/iphone/Maps/UI/Downloader/DownloadMapsViewController.swift b/iphone/Maps/UI/Downloader/DownloadMapsViewController.swift
index 159a6073b..4ecd47395 100644
--- a/iphone/Maps/UI/Downloader/DownloadMapsViewController.swift
+++ b/iphone/Maps/UI/Downloader/DownloadMapsViewController.swift
@@ -80,7 +80,7 @@ class DownloadMapsViewController: MWMViewController {
     tableView.registerNib(cell: MWMMapDownloaderButtonTableViewCell.self)
     title = dataSource.title
     if mode == .downloaded {
-      let addMapsButton = button(with: UIImage(named: "ic_nav_bar_add"), action: #selector(onAddMaps))
+      let addMapsButton = button(with: UIImage(systemName: "plus"), action: #selector(onAddMaps))
       navigationItem.rightBarButtonItem = addMapsButton
     }
     noMapsContainer.isHidden = !dataSource.isEmpty || Storage.shared().downloadInProgress()