diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
index 8ee63064fb..56fd386875 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
@@ -14,12 +14,13 @@ static CGFloat const kDividerTopConstant = -8.;
 
 @interface MWMDefaultAlert ()
 
-@property (weak, nonatomic) IBOutlet UILabel * messageLabel;
-@property (weak, nonatomic) IBOutlet UIButton * rightButton;
-@property (weak, nonatomic) IBOutlet UIButton * leftButton;
-@property (weak, nonatomic) IBOutlet UILabel * titleLabel;
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint * rightButtonWidth;
-@property (copy, nonatomic) TMWMVoidBlock leftButtonAction;
+@property(weak, nonatomic) IBOutlet UILabel * messageLabel;
+@property(weak, nonatomic) IBOutlet UIButton * rightButton;
+@property(weak, nonatomic) IBOutlet UIButton * leftButton;
+@property(weak, nonatomic) IBOutlet UILabel * titleLabel;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * rightButtonWidth;
+@property(copy, nonatomic) TMWMVoidBlock leftButtonAction;
+@property(copy, nonatomic, readwrite) TMWMVoidBlock rightButtonAction;
 @property(weak, nonatomic) IBOutlet NSLayoutConstraint * dividerTop;
 
 @property(copy, nonatomic) NSString * statisticsEvent;
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert_Protected.h b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert_Protected.h
index 2e8439ef30..a6585fe7a6 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert_Protected.h
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert_Protected.h
@@ -9,6 +9,6 @@
                             rightButtonAction:(nullable TMWMVoidBlock)action
                               statisticsEvent:(nonnull NSString *)statisticsEvent;
 
-@property(copy, nonatomic, nullable) TMWMVoidBlock rightButtonAction;
+@property(copy, nonatomic, readonly, nullable) TMWMVoidBlock rightButtonAction;
 
 @end
diff --git a/iphone/Maps/Classes/MWMBasePlacePageView.mm b/iphone/Maps/Classes/MWMBasePlacePageView.mm
index ffb3308d27..a3830df112 100644
--- a/iphone/Maps/Classes/MWMBasePlacePageView.mm
+++ b/iphone/Maps/Classes/MWMBasePlacePageView.mm
@@ -769,7 +769,7 @@ using namespace storage;
     [MWMStorage downloadNode:countryId alertController:avc onSuccess:nil];
     break;
   case NodeStatus::Undefined:
-  case NodeStatus::Error: [MWMStorage retryDownloadNode:countryId]; break;
+  case NodeStatus::Error: [MWMStorage retryDownloadNode:countryId alertController:avc]; break;
   case NodeStatus::OnDiskOutOfDate: [MWMStorage updateNode:countryId alertController:avc]; break;
   case NodeStatus::Downloading:
   case NodeStatus::InQueue: [MWMStorage cancelDownloadNode:countryId]; break;
diff --git a/iphone/Maps/Classes/MWMPlacePageManager.mm b/iphone/Maps/Classes/MWMPlacePageManager.mm
index 1abe3825df..0ab3ec0a94 100644
--- a/iphone/Maps/Classes/MWMPlacePageManager.mm
+++ b/iphone/Maps/Classes/MWMPlacePageManager.mm
@@ -76,7 +76,7 @@
   case NodeStatus::NotDownloaded:
   case NodeStatus::Partly: [MWMStorage downloadNode:countryId alertController:avc onSuccess:nil]; break;
   case NodeStatus::Undefined:
-  case NodeStatus::Error: [MWMStorage retryDownloadNode:countryId]; break;
+  case NodeStatus::Error: [MWMStorage retryDownloadNode:countryId alertController:avc]; break;
   case NodeStatus::OnDiskOutOfDate: [MWMStorage updateNode:countryId alertController:avc]; break;
   case NodeStatus::Downloading:
   case NodeStatus::InQueue: [MWMStorage cancelDownloadNode:countryId]; break;
diff --git a/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
index 62e18dc934..db0ec4f251 100644
--- a/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
+++ b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
@@ -673,7 +673,7 @@ using namespace mwm;
           kStatScenario : kStatDownload
         }];
   self.skipCountryEventProcessing = YES;
-  [MWMStorage retryDownloadNode:countryId];
+  [MWMStorage retryDownloadNode:countryId alertController:self.alertController];
   self.skipCountryEventProcessing = NO;
   [self processCountryEvent:countryId];
 }
diff --git a/iphone/Maps/Classes/Storage/MWMStorage.h b/iphone/Maps/Classes/Storage/MWMStorage.h
index 2545e74be6..52779669e6 100644
--- a/iphone/Maps/Classes/Storage/MWMStorage.h
+++ b/iphone/Maps/Classes/Storage/MWMStorage.h
@@ -5,7 +5,8 @@
 @interface MWMStorage : NSObject
 
 + (void)downloadNode:(storage::TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController onSuccess:(TMWMVoidBlock)onSuccess;
-+ (void)retryDownloadNode:(storage::TCountryId const &)countryId;
++ (void)retryDownloadNode:(storage::TCountryId const &)countryId
+          alertController:(MWMAlertViewController *)alertController;
 + (void)updateNode:(storage::TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController;
 + (void)deleteNode:(storage::TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController;
 + (void)cancelDownloadNode:(storage::TCountryId const &)countryId;
diff --git a/iphone/Maps/Classes/Storage/MWMStorage.mm b/iphone/Maps/Classes/Storage/MWMStorage.mm
index d8e445b114..b8e505529d 100644
--- a/iphone/Maps/Classes/Storage/MWMStorage.mm
+++ b/iphone/Maps/Classes/Storage/MWMStorage.mm
@@ -31,8 +31,12 @@ using namespace storage;
 }
 
 + (void)retryDownloadNode:(TCountryId const &)countryId
+          alertController:(MWMAlertViewController *)alertController
 {
-  GetFramework().GetStorage().RetryDownloadNode(countryId);
+  [self checkConnectionAndPerformAction:[countryId] {
+    GetFramework().GetStorage().RetryDownloadNode(countryId);
+  }
+                        alertController:alertController];
 }
 
 + (void)updateNode:(TCountryId const &)countryId
diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
index abcf942e0c..1a6d91fc95 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
@@ -203,7 +203,8 @@ using namespace storage;
             kStatScenario : kStatDownload
           }];
     [self showInQueue];
-    [MWMStorage retryDownloadNode:self->m_countryId];
+    [MWMStorage retryDownloadNode:self->m_countryId
+                  alertController:self.controller.alertController];
   };
   auto const cancelBlock = ^{
     [Statistics logEvent:kStatDownloaderDownloadCancel withParameters:@{kStatFrom : kStatMap}];
@@ -292,7 +293,7 @@ using namespace storage;
             kStatScenario : kStatDownload
           }];
     [self showInQueue];
-    [MWMStorage retryDownloadNode:m_countryId];
+    [MWMStorage retryDownloadNode:m_countryId alertController:self.controller.alertController];
   }
   else
   {