diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.h b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.h
index 54b4f7eab5..9fec7f4309 100644
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.h
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.h
@@ -28,7 +28,7 @@ typedef NS_ENUM(NSInteger, MWMCircularProgressState)
 - (nonnull instancetype)init __attribute__((unavailable("init is not available")));
 - (nonnull instancetype)initWithParentView:(nonnull UIView *)parentView;
 - (void)reset;
-- (void)startSpinner;
+- (void)startSpinner:(BOOL)isInvert;
 - (void)stopSpinner;
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.mm
index de6d74a3e0..2217fa6145 100644
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.mm
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.mm
@@ -41,10 +41,10 @@
 
 #pragma mark - Spinner
 
-- (void)startSpinner
+- (void)startSpinner:(BOOL)isInvert
 {
   [self reset];
-  [self.rootView startSpinner];
+  [self.rootView startSpinner:isInvert];
 }
 
 - (void)stopSpinner
diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.h b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.h
index 3ae302650f..644986fe1b 100644
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.h
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.h
@@ -13,7 +13,7 @@
 - (void)animateFromValue:(CGFloat)fromValue toValue:(CGFloat)toValue;
 
 - (void)updatePath:(CGFloat)progress;
-- (void)startSpinner;
+- (void)startSpinner:(BOOL)isInvert;
 - (void)stopSpinner;
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
index 365b1089ab..113dbced89 100644
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
@@ -144,7 +144,7 @@ static inline CGFloat angleWithProgress(CGFloat progress)
 
 #pragma mark - Spinner
 
-- (void)startSpinner
+- (void)startSpinner:(BOOL)isInvert
 {
   if (!self.spinner.hidden)
     return;
@@ -154,9 +154,9 @@ static inline CGFloat angleWithProgress(CGFloat progress)
     self.backgroundLayer.hidden = self.progressLayer.hidden = YES;
     NSUInteger const animationImagesCount = 12;
     NSMutableArray * animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
+    NSString * postfix = ([UIColor isNightMode] && !isInvert) || (![UIColor isNightMode] && isInvert) ? @"dark" : @"light";
     for (NSUInteger i = 0; i < animationImagesCount; ++i)
-      animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"Spinner_%@_%@", @(i+1),
-                                                [UIColor isNightMode] ? @"dark" : @"light"]];
+      animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"Spinner_%@_%@", @(i+1), postfix]];
 
     self.spinner.animationImages = animationImages;
     [self.spinner startAnimating];
diff --git a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm
index 276fb30ad4..18b5a20482 100644
--- a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm
+++ b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm
@@ -121,7 +121,7 @@
   if (progress.state == MWMCircularProgressStateFailed)
   {
     activeMapLayout.RetryDownloading(self.currentCountryIndex);
-    [self.progressView startSpinner];
+    [self.progressView startSpinner:NO];
   }
   else
   {
@@ -138,7 +138,7 @@
   GetFramework().GetCountryTree().GetActiveMapLayout().DownloadMap(self.currentCountryIndex, MapOptions::MapWithCarRouting);
   self.progressView.progress = 0.0;
   [self showRequest];
-  [self.progressView startSpinner];
+  [self.progressView startSpinner:NO];
 }
 
 - (IBAction)selectMapTouchUpInside:(nonnull UIButton *)sender
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm
index b24cc0ed96..8b239cc71a 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm
@@ -98,7 +98,7 @@ using namespace osm;
 {
   self.spinnerView.hidden = NO;
   self.spinner = [[MWMCircularProgress alloc] initWithParentView:self.spinnerView];
-  [self.spinner startSpinner];
+  [self.spinner startSpinner:YES];
   self.loginTextField.enabled = NO;
   self.passwordTextField.enabled = NO;
   self.forgotButton.enabled = NO;
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
index 0d7c9bdbb2..4f681ca964 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
@@ -115,7 +115,7 @@ NSString * getVerifier(NSString * urlString)
 {
   self.spinnerView.hidden = NO;
   self.spinner = [[MWMCircularProgress alloc] initWithParentView:self.spinnerView];
-  [self.spinner startSpinner];
+  [self.spinner startSpinner:YES];
   self.webView.userInteractionEnabled = NO;
 }
 
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index be84ce0908..727220b5a7 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -265,7 +265,7 @@ extern NSString * const kTTSStatusWasChangedNotification;
   [self.routePreview selectProgress:progress];
   if (!self.delegate.isPossibleToBuildRoute)
     return;
-  [progress startSpinner];
+  [progress startSpinner:NO];
   [self.delegate buildRoute];
 }
 
@@ -336,7 +336,7 @@ extern NSString * const kTTSStatusWasChangedNotification;
   [self removePanel:self.nextTurnPanel];
 //  [self removePanel:self.lanesPanel];
   [self setupActualRoute];
-  [self.activeRouteTypeButton startSpinner];
+  [self.activeRouteTypeButton startSpinner:NO];
 }
 
 - (void)showStateReady