diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
index 8547b6a05d..5b0f220a3a 100644
--- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
@@ -20,7 +20,7 @@ struct CatalogCategoryInfo {
 final class CatalogWebViewController: WebViewController {
   let progressBgView = UIVisualEffectView(effect:
     UIBlurEffect(style: UIColor.isNightMode() ? .light : .dark))
-  let progressView = MWMActivityIndicator()
+  let progressView = ActivityIndicator()
   let numberOfTasksLabel = UILabel()
   let loadingIndicator = UIActivityIndicatorView(activityIndicatorStyle: .gray)
   let pendingTransactionsHandler = InAppPurchase.pendingTransactionsHandler()
diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard
index b00e2bb998..8fa743576c 100644
--- a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard
+++ b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Yad-RH-i8M">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Yad-RH-i8M">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -45,7 +45,7 @@
                                                     <color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Ai-cK-Fh3" customClass="MWMActivityIndicator">
+                                                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Ai-cK-Fh3" customClass="ActivityIndicator" customModule="maps_me" customModuleProvider="target">
                                                     <rect key="frame" x="335" y="16" width="24" height="24"/>
                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
@@ -183,7 +183,7 @@
                                                     <color key="textColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lF2-pc-Qo7" customClass="MWMActivityIndicator">
+                                                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lF2-pc-Qo7" customClass="ActivityIndicator" customModule="maps_me" customModuleProvider="target">
                                                     <rect key="frame" x="335" y="16" width="24" height="24"/>
                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
@@ -778,7 +778,7 @@ upload photos and more</string>
                                             <action selector="cancelButtonPressed:" destination="FPL-Dh-v8t" eventType="touchUpInside" id="Dcz-Ke-Dqs"/>
                                         </connections>
                                     </button>
-                                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="osb-Nl-1fT" customClass="MWMActivityIndicator">
+                                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="osb-Nl-1fT" customClass="ActivityIndicator" customModule="maps_me" customModuleProvider="target">
                                         <rect key="frame" x="155.5" y="143" width="24" height="24"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift
index 308326b603..80f54905fc 100644
--- a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift
+++ b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift
@@ -6,7 +6,7 @@ final class EditOnWebViewController: MWMViewController {
   weak var delegate: EditOnWebViewControllerDelegate?
   var category: MWMCategory!
   
-  @IBOutlet weak var activityIndicator: MWMActivityIndicator! {
+  @IBOutlet weak var activityIndicator: ActivityIndicator! {
     didSet {
       activityIndicator.tintColor = UIColor.white()
     }
diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h
index 8f89a0ce84..dedefa9a55 100644
--- a/iphone/Maps/Bridging-Header.h
+++ b/iphone/Maps/Bridging-Header.h
@@ -27,7 +27,6 @@
 #import "CoreNotificationWrapper.h"
 #import "DeepLinkHelper.h"
 #import "MapViewController.h"
-#import "MWMActivityIndicator.h"
 #import "MWMActivityViewController.h"
 #import "MWMAlertViewController.h"
 #import "MWMAuthorizationViewModel.h"
diff --git a/iphone/Maps/Categories/UIView+Animation.swift b/iphone/Maps/Categories/UIView+Animation.swift
index 5ffbd94561..82fb719701 100644
--- a/iphone/Maps/Categories/UIView+Animation.swift
+++ b/iphone/Maps/Categories/UIView+Animation.swift
@@ -20,4 +20,22 @@ extension UIView {
   @objc func animateConstraints(animations: @escaping () -> Void) {
     animateConstraints(duration: kDefaultAnimationDuration, animations: animations, completion: {})
   }
+
+  @objc func startRotation(_ duration: TimeInterval = 1.0) {
+    let rotationAnimation = CABasicAnimation(keyPath: "transform.rotation.z")
+    rotationAnimation.toValue = Double.pi * 2
+    rotationAnimation.duration = duration;
+    rotationAnimation.isCumulative = true;
+    rotationAnimation.repeatCount = Float.greatestFiniteMagnitude;
+    rotationAnimation.isRemovedOnCompletion = false
+    layer.add(rotationAnimation, forKey: "rotationAnimation")
+  }
+
+  @objc func stopRotation() {
+    layer.removeAnimation(forKey: "rotationAnimation")
+  }
+
+  @objc var isRotating: Bool {
+    return layer.animationKeys()?.contains("rotationAnimation") ?? false
+  }
 }
diff --git a/iphone/Maps/Classes/CustomViews/ActivityIndicator.swift b/iphone/Maps/Classes/CustomViews/ActivityIndicator.swift
new file mode 100644
index 0000000000..544229bb88
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/ActivityIndicator.swift
@@ -0,0 +1,33 @@
+class ActivityIndicator: UIView {
+  let spinner = UIImageView(image: UIImage(named: "ic_24px_spinner"))
+
+  override var intrinsicContentSize: CGSize {
+    return CGSize(width: 24, height: 24)
+  }
+
+  init() {
+    super.init(frame: CGRect(x: 0, y: 0, width: 24, height: 24))
+    setup()
+  }
+
+  override init(frame: CGRect) {
+    super.init(frame: frame)
+    setup()
+  }
+  
+  required init?(coder aDecoder: NSCoder) {
+    super.init(coder: aDecoder)
+    setup()
+  }
+
+  private func setup() {
+    addSubview(spinner)
+    NSLayoutConstraint.activate([
+      spinner.topAnchor.constraint(equalTo: topAnchor),
+      spinner.leftAnchor.constraint(equalTo: leftAnchor),
+      spinner.bottomAnchor.constraint(equalTo: bottomAnchor),
+      spinner.rightAnchor.constraint(equalTo: rightAnchor)
+      ])
+    startRotation()
+  }
+}
diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
index a67431e7dd..cf83f79e7e 100644
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
@@ -1,5 +1,6 @@
 #import "MWMCircularProgressView.h"
 #import "MWMCommon.h"
+#import "SwiftBridge.h"
 #import "UIImageView+Coloring.h"
 
 #include "std/map.hpp"
@@ -164,22 +165,14 @@ CGFloat angleWithProgress(CGFloat progress) { return 2.0 * M_PI * progress - M_P
     self.spinner.hidden = NO;
     self.backgroundLayer.hidden = self.progressLayer.hidden = YES;
   }
-  NSUInteger const animationImagesCount = 12;
-  NSMutableArray * animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
   NSString * postfix = ([UIColor isNightMode] && !self.isInvertColor) ||
                                (![UIColor isNightMode] && self.isInvertColor) ||
                                _spinnerBackgroundColor
                            ? @"dark"
                            : @"light";
-  for (NSUInteger i = 0; i < animationImagesCount; ++i)
-  {
-    UIImage * image =
-        [UIImage imageNamed:[NSString stringWithFormat:@"Spinner_%@_%@", @(i + 1), postfix]];
-    animationImages[i] = image;
-  }
-  self.spinner.animationDuration = 0.8;
-  self.spinner.animationImages = animationImages;
-  [self.spinner startAnimating];
+  UIImage * image = [UIImage imageNamed:[NSString stringWithFormat:@"Spinner_%@", postfix]];
+  self.spinner.image = image;
+  [self.spinner startRotation:1];
 }
 
 - (void)stopSpinner
@@ -188,7 +181,7 @@ CGFloat angleWithProgress(CGFloat progress) { return 2.0 * M_PI * progress - M_P
     return;
   self.spinner.hidden = YES;
   self.backgroundLayer.hidden = self.progressLayer.hidden = NO;
-  [self.spinner stopAnimating];
+  [self.spinner stopRotation];
 }
 
 #pragma mark - Animation
diff --git a/iphone/Maps/Classes/CustomViews/MWMActivityIndicator.h b/iphone/Maps/Classes/CustomViews/MWMActivityIndicator.h
deleted file mode 100644
index 0fee6c29f9..0000000000
--- a/iphone/Maps/Classes/CustomViews/MWMActivityIndicator.h
+++ /dev/null
@@ -1,7 +0,0 @@
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MWMActivityIndicator : UIView
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Classes/CustomViews/MWMActivityIndicator.m b/iphone/Maps/Classes/CustomViews/MWMActivityIndicator.m
deleted file mode 100644
index 80ecae0bc5..0000000000
--- a/iphone/Maps/Classes/CustomViews/MWMActivityIndicator.m
+++ /dev/null
@@ -1,55 +0,0 @@
-#import "MWMActivityIndicator.h"
-
-@interface MWMActivityIndicator ()
-
-@property(nonatomic, strong) UIImageView *spinner;
-
-@end
-
-@implementation MWMActivityIndicator
-
-- (instancetype)init {
-  return [self initWithFrame:CGRectMake(0, 0, 24.f, 24.f)];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-  self = [super initWithFrame:frame];
-  if (self) {
-    [self setup];
-  }
-
-  return self;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder {
-  self = [super initWithCoder:aDecoder];
-  if (self) {
-    [self setup];
-  }
-
-  return self;
-}
-
-- (void)setup {
-  _spinner = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ic_24px_spinner"]];
-  [self addSubview:_spinner];
-  [NSLayoutConstraint activateConstraints:@[
-                                            [_spinner.leftAnchor constraintEqualToAnchor:self.leftAnchor],
-                                            [_spinner.topAnchor constraintEqualToAnchor:self.topAnchor],
-                                            [_spinner.rightAnchor constraintEqualToAnchor:self.rightAnchor],
-                                            [_spinner.bottomAnchor constraintEqualToAnchor:self.bottomAnchor]
-                                            ]];
-  CABasicAnimation *rotationAnimation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
-  rotationAnimation.toValue = @(M_PI * 2);
-  rotationAnimation.duration = 1;
-  rotationAnimation.cumulative = true;
-  rotationAnimation.repeatCount = INT_MAX;
-
-  [_spinner.layer addAnimation:rotationAnimation forKey:@"rotationAnimation"];
-}
-
-- (CGSize)intrinsicContentSize {
-  return CGSizeMake(24.f, 24.f);
-}
-
-@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
index 9011dcf09c..b21ebc590b 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
@@ -5,6 +5,7 @@
 #import "MWMSettings.h"
 #import "MWMSideButtonsView.h"
 #import "Statistics.h"
+#import "SwiftBridge.h"
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
 #include "Framework.h"
@@ -84,14 +85,14 @@ NSArray<UIImage *> * animationImages(NSString * animationTemplate, NSUInteger im
 - (void)mwm_refreshUI
 {
   [self.sideView mwm_refreshUI];
-  [self.locationButton.imageView stopAnimating];
+  [self.locationButton.imageView stopRotation];
   [self refreshLocationButtonState:self.locationMode];
 }
 
 - (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode
 {
   UIButton * locBtn = self.locationButton;
-  [locBtn.imageView stopAnimating];
+  [locBtn.imageView stopRotation];
 
   NSArray<UIImage *> * images =
       ^NSArray<UIImage *> *(MWMMyPositionMode oldMode, MWMMyPositionMode newMode)
@@ -128,6 +129,7 @@ NSArray<UIImage *> * animationImages(NSString * animationTemplate, NSUInteger im
     locBtn.imageView.image = images.lastObject;
     [locBtn.imageView startAnimating];
   }
+  [locBtn.imageView stopRotation];
   [self refreshLocationButtonState:mode];
   self.locationMode = mode;
 }
@@ -137,7 +139,7 @@ NSArray<UIImage *> * animationImages(NSString * animationTemplate, NSUInteger im
 - (void)refreshLocationButtonState:(MWMMyPositionMode)state
 {
   dispatch_async(dispatch_get_main_queue(), ^{
-    if (self.locationButton.imageView.isAnimating)
+    if (self.locationButton.imageView.isRotating)
     {
       [self refreshLocationButtonState:state];
     }
@@ -148,12 +150,8 @@ NSArray<UIImage *> * animationImages(NSString * animationTemplate, NSUInteger im
       {
       case MWMMyPositionModePendingPosition:
       {
-        NSArray<UIImage *> * images = animationImages(@"btn_pending", 12);
-        locBtn.imageView.animationDuration = 1.2;
-        locBtn.imageView.animationImages = images;
-        locBtn.imageView.animationRepeatCount = 0;
-        locBtn.imageView.image = images.lastObject;
-        [locBtn.imageView startAnimating];
+        locBtn.imageName = @"btn_pending";
+        [locBtn.imageView startRotation:1];
         break;
       }
       case MWMMyPositionModeNotFollow:
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark.imageset/Contents.json
similarity index 100%
rename from iphone/Maps/Images.xcassets/Location/btn_pending_dark_1.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/Location/btn_pending_dark.imageset/Contents.json
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_1.imageset/btn_pending_dark_1.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark.imageset/btn_pending_dark_1.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/Location/btn_pending_dark_1.imageset/btn_pending_dark_1.png
rename to iphone/Maps/Images.xcassets/Location/btn_pending_dark.imageset/btn_pending_dark_1.png
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_1.imageset/btn_pending_dark_1@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark.imageset/btn_pending_dark_1@2x.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/Location/btn_pending_dark_1.imageset/btn_pending_dark_1@2x.png
rename to iphone/Maps/Images.xcassets/Location/btn_pending_dark.imageset/btn_pending_dark_1@2x.png
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_1.imageset/btn_pending_dark_1@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark.imageset/btn_pending_dark_1@3x.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/Location/btn_pending_dark_1.imageset/btn_pending_dark_1@3x.png
rename to iphone/Maps/Images.xcassets/Location/btn_pending_dark.imageset/btn_pending_dark_1@3x.png
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/Contents.json
deleted file mode 100644
index 82e5acf2cb..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_10.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_10@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_10@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10.png
deleted file mode 100644
index 2821a0a790..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10@2x.png
deleted file mode 100644
index 85bf881365..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10@3x.png
deleted file mode 100644
index c18dfe5542..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_10.imageset/btn_pending_dark_10@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/Contents.json
deleted file mode 100644
index e44891d436..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_11.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_11@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_11@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11.png
deleted file mode 100644
index 2af57ec2cf..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11@2x.png
deleted file mode 100644
index 3b7ce92fa0..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11@3x.png
deleted file mode 100644
index 88789237e2..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_11.imageset/btn_pending_dark_11@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/Contents.json
deleted file mode 100644
index 8c2610bdf7..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_12.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_12@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_12@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12.png
deleted file mode 100644
index 9bde09c4b3..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12@2x.png
deleted file mode 100644
index 81ca5c91a8..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12@3x.png
deleted file mode 100644
index 2f61d4345d..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_12.imageset/btn_pending_dark_12@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/Contents.json
deleted file mode 100644
index 67ceedae12..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_2.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_2@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_2@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2.png
deleted file mode 100644
index bd98799fb6..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2@2x.png
deleted file mode 100644
index bbe0c71c9f..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2@3x.png
deleted file mode 100644
index 754d362a89..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_2.imageset/btn_pending_dark_2@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/Contents.json
deleted file mode 100644
index a8e0969de2..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_3.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_3@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_3@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3.png
deleted file mode 100644
index 67f8b18587..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3@2x.png
deleted file mode 100644
index 7a5364ab0a..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3@3x.png
deleted file mode 100644
index 7ad61a2d52..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_3.imageset/btn_pending_dark_3@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/Contents.json
deleted file mode 100644
index 96606106f0..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_4.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_4@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_4@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4.png
deleted file mode 100644
index d18f7bf05d..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4@2x.png
deleted file mode 100644
index 74aa279010..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4@3x.png
deleted file mode 100644
index 96372ca9e8..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_4.imageset/btn_pending_dark_4@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/Contents.json
deleted file mode 100644
index 4b2aac48cf..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_5.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_5@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5.png
deleted file mode 100644
index 33f51b16f6..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5@2x.png
deleted file mode 100644
index a44ae35d62..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5@3x.png
deleted file mode 100644
index 179da184aa..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_5.imageset/btn_pending_dark_5@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/Contents.json
deleted file mode 100644
index c51b7c5b5c..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_6.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_6@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_6@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6.png
deleted file mode 100644
index f5a9e97eb0..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6@2x.png
deleted file mode 100644
index 4bfbe5f364..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6@3x.png
deleted file mode 100644
index 472b77c3c1..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_6.imageset/btn_pending_dark_6@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/Contents.json
deleted file mode 100644
index c52123a3d9..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_7.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_7@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_7@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7.png
deleted file mode 100644
index ba83d4796e..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7@2x.png
deleted file mode 100644
index 31e1db49f3..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7@3x.png
deleted file mode 100644
index 820a48d4a7..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_7.imageset/btn_pending_dark_7@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/Contents.json
deleted file mode 100644
index 2174b109eb..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_8.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_8@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_8@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8.png
deleted file mode 100644
index 71c88d54f7..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8@2x.png
deleted file mode 100644
index c8bdba2250..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8@3x.png
deleted file mode 100644
index 355b43f255..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_8.imageset/btn_pending_dark_8@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/Contents.json
deleted file mode 100644
index 7a1c2d8bc8..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_9.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_9@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_dark_9@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9.png
deleted file mode 100644
index a2c465681b..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9@2x.png
deleted file mode 100644
index 12573fb631..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9@3x.png
deleted file mode 100644
index 19ba3cf0a3..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_dark_9.imageset/btn_pending_dark_9@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light.imageset/Contents.json
similarity index 100%
rename from iphone/Maps/Images.xcassets/Location/btn_pending_light_1.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/Location/btn_pending_light.imageset/Contents.json
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_1.imageset/btn_pending_light_1.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light.imageset/btn_pending_light_1.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/Location/btn_pending_light_1.imageset/btn_pending_light_1.png
rename to iphone/Maps/Images.xcassets/Location/btn_pending_light.imageset/btn_pending_light_1.png
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_1.imageset/btn_pending_light_1@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light.imageset/btn_pending_light_1@2x.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/Location/btn_pending_light_1.imageset/btn_pending_light_1@2x.png
rename to iphone/Maps/Images.xcassets/Location/btn_pending_light.imageset/btn_pending_light_1@2x.png
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_1.imageset/btn_pending_light_1@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light.imageset/btn_pending_light_1@3x.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/Location/btn_pending_light_1.imageset/btn_pending_light_1@3x.png
rename to iphone/Maps/Images.xcassets/Location/btn_pending_light.imageset/btn_pending_light_1@3x.png
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/Contents.json
deleted file mode 100644
index 58818118c2..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_10.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_10@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_10@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10.png
deleted file mode 100644
index f6efde82ec..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10@2x.png
deleted file mode 100644
index 3f78d4f841..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10@3x.png
deleted file mode 100644
index 213e10707b..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_10.imageset/btn_pending_light_10@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/Contents.json
deleted file mode 100644
index 09eac6df23..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_11.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_11@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_11@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11.png
deleted file mode 100644
index 6c87f84c4a..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11@2x.png
deleted file mode 100644
index a71fdab43c..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11@3x.png
deleted file mode 100644
index 69ac62abef..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_11.imageset/btn_pending_light_11@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/Contents.json
deleted file mode 100644
index ceecc59f0c..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_12.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_12@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_12@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12.png
deleted file mode 100644
index 378ed6e178..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12@2x.png
deleted file mode 100644
index 6f85ccd237..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12@3x.png
deleted file mode 100644
index 7ef51eb524..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_12.imageset/btn_pending_light_12@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/Contents.json
deleted file mode 100644
index f5364fd8d3..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_2.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_2@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_2@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2.png
deleted file mode 100644
index 6467b21b1d..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2@2x.png
deleted file mode 100644
index 1e874920ff..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2@3x.png
deleted file mode 100644
index dbbfaf3467..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_2.imageset/btn_pending_light_2@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/Contents.json
deleted file mode 100644
index 8f2d15a5af..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_3.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_3@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_3@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3.png
deleted file mode 100644
index 3ed80634f6..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3@2x.png
deleted file mode 100644
index 9a350e7a55..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3@3x.png
deleted file mode 100644
index a059c77506..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_3.imageset/btn_pending_light_3@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/Contents.json
deleted file mode 100644
index 3ea9222179..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_4.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_4@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_4@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4.png
deleted file mode 100644
index 0c2f248406..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4@2x.png
deleted file mode 100644
index 30bce0d07f..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4@3x.png
deleted file mode 100644
index d4f8b5a5f1..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_4.imageset/btn_pending_light_4@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/Contents.json
deleted file mode 100644
index 32abda8dad..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_5.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_5@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5.png
deleted file mode 100644
index b889b7c79c..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5@2x.png
deleted file mode 100644
index ee6bdaae82..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5@3x.png
deleted file mode 100644
index c43b76828c..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_5.imageset/btn_pending_light_5@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/Contents.json
deleted file mode 100644
index c0318c2c49..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_6.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_6@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_6@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6.png
deleted file mode 100644
index 130d228da4..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6@2x.png
deleted file mode 100644
index b878e6765d..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6@3x.png
deleted file mode 100644
index 5f6e96b7cc..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_6.imageset/btn_pending_light_6@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/Contents.json
deleted file mode 100644
index 8b1728a909..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_7.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_7@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_7@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7.png
deleted file mode 100644
index 29946a539e..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7@2x.png
deleted file mode 100644
index 5e07939050..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7@3x.png
deleted file mode 100644
index 4f96c00364..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_7.imageset/btn_pending_light_7@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/Contents.json
deleted file mode 100644
index 11d22e377e..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_8.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_8@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_8@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8.png
deleted file mode 100644
index 815cea3c40..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8@2x.png
deleted file mode 100644
index 474538c6bf..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8@3x.png
deleted file mode 100644
index 9c85a14f1d..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_8.imageset/btn_pending_light_8@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/Contents.json
deleted file mode 100644
index 5a21991e9d..0000000000
--- a/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_9.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_9@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "btn_pending_light_9@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9.png
deleted file mode 100644
index 8422d98e3d..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9@2x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9@2x.png
deleted file mode 100644
index e3f9032ae8..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9@3x.png b/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9@3x.png
deleted file mode 100644
index 38564d9443..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location/btn_pending_light_9.imageset/btn_pending_light_9@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Contents.json
deleted file mode 100644
index 7fe0d6a09e..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_10_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_10_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_10_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark.png
deleted file mode 100644
index beead93f53..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark@2x.png
deleted file mode 100644
index 2a8746b38d..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark@3x.png
deleted file mode 100644
index 7ae131027d..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_dark.imageset/Spinner_10_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Contents.json
deleted file mode 100644
index 0d5e19b5fa..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_10_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_10_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_10_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light.png
deleted file mode 100644
index 9167d61930..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light@2x.png
deleted file mode 100644
index 4efef1a876..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light@3x.png
deleted file mode 100644
index a50767526e..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_10_light.imageset/Spinner_10_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Contents.json
deleted file mode 100644
index 2f8aae0436..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_11_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_11_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_11_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark.png
deleted file mode 100644
index 6283bbac03..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark@2x.png
deleted file mode 100644
index 0f11888906..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark@3x.png
deleted file mode 100644
index 36f08f8857..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_dark.imageset/Spinner_11_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Contents.json
deleted file mode 100644
index 837c6d60d9..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_11_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_11_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_11_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light.png
deleted file mode 100644
index 6f2007338f..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light@2x.png
deleted file mode 100644
index ad17d81904..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light@3x.png
deleted file mode 100644
index 3438ba4eed..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_11_light.imageset/Spinner_11_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Contents.json
deleted file mode 100644
index bbbce795b3..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_12_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_12_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_12_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark.png
deleted file mode 100644
index fc1b372c0f..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark@2x.png
deleted file mode 100644
index ece951a211..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark@3x.png
deleted file mode 100644
index 9dc25cb7dd..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_dark.imageset/Spinner_12_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Contents.json
deleted file mode 100644
index 26780d6614..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_12_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_12_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_12_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light.png
deleted file mode 100644
index de0b6b5dc4..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light@2x.png
deleted file mode 100644
index 4183a2e1a3..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light@3x.png
deleted file mode 100644
index d15349f167..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_12_light.imageset/Spinner_12_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Contents.json
deleted file mode 100644
index caca2cc99b..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_2_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_2_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_2_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark.png
deleted file mode 100644
index 9dc5eb6774..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark@2x.png
deleted file mode 100644
index 77dfd117ab..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark@3x.png
deleted file mode 100644
index 1c04531147..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_dark.imageset/Spinner_2_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Contents.json
deleted file mode 100644
index ddbe8cbe7a..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_2_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_2_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_2_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light.png
deleted file mode 100644
index dcd31a9933..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light@2x.png
deleted file mode 100644
index e7167c4411..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light@3x.png
deleted file mode 100644
index 4ffd35d30d..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Spinner_2_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Contents.json
deleted file mode 100644
index 38d9afb96f..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_3_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_3_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_3_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark.png
deleted file mode 100644
index 29af2c2bbe..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark@2x.png
deleted file mode 100644
index 8a3309ed61..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark@3x.png
deleted file mode 100644
index 413adf4cfa..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_dark.imageset/Spinner_3_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Contents.json
deleted file mode 100644
index 6b0ee8d7dd..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_3_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_3_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_3_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light.png
deleted file mode 100644
index f4efa27da3..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light@2x.png
deleted file mode 100644
index ef6a98d1a4..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light@3x.png
deleted file mode 100644
index 0848e5e089..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Spinner_3_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Contents.json
deleted file mode 100644
index 09c7a7c8fe..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_4_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_4_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_4_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark.png
deleted file mode 100644
index 1dd6bb543c..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark@2x.png
deleted file mode 100644
index 516b8d0d49..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark@3x.png
deleted file mode 100644
index e22d32d2e0..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_dark.imageset/Spinner_4_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Contents.json
deleted file mode 100644
index 45f46ae68f..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_4_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_4_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_4_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light.png
deleted file mode 100644
index 9a9ff62dcc..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light@2x.png
deleted file mode 100644
index 0a93dd5cf0..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light@3x.png
deleted file mode 100644
index 6b11a32fa0..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_4_light.imageset/Spinner_4_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Contents.json
deleted file mode 100644
index 942da78a03..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_5_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_5_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_5_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark.png
deleted file mode 100644
index d762530673..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark@2x.png
deleted file mode 100644
index 0f0fa8490c..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark@3x.png
deleted file mode 100644
index 785fc81bbb..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_dark.imageset/Spinner_5_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Contents.json
deleted file mode 100644
index 401c060586..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_5_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_5_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_5_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light.png
deleted file mode 100644
index 240614ef91..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light@2x.png
deleted file mode 100644
index 062ebe754e..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light@3x.png
deleted file mode 100644
index e9369217be..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_5_light.imageset/Spinner_5_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Contents.json
deleted file mode 100644
index 882968033c..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_6_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_6_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_6_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark.png
deleted file mode 100644
index 3d5e22e186..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark@2x.png
deleted file mode 100644
index cf6e92d3b5..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark@3x.png
deleted file mode 100644
index 9cbad533eb..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_dark.imageset/Spinner_6_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Contents.json
deleted file mode 100644
index aafd174076..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_6_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_6_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_6_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light.png
deleted file mode 100644
index c04f9f8242..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light@2x.png
deleted file mode 100644
index 8efbaf5246..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light@3x.png
deleted file mode 100644
index ce1cf1235e..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_6_light.imageset/Spinner_6_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Contents.json
deleted file mode 100644
index 52542d562f..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_7_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_7_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_7_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark.png
deleted file mode 100644
index 2a9f05cb64..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark@2x.png
deleted file mode 100644
index ec2c154a72..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark@3x.png
deleted file mode 100644
index 5669f76922..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_dark.imageset/Spinner_7_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Contents.json
deleted file mode 100644
index 2c309a0af6..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_7_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_7_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_7_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light.png
deleted file mode 100644
index 82714849c4..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light@2x.png
deleted file mode 100644
index 9435bda9b0..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light@3x.png
deleted file mode 100644
index 0e02309013..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_7_light.imageset/Spinner_7_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Contents.json
deleted file mode 100644
index 4d6e5c8ecc..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_8_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_8_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_8_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark.png
deleted file mode 100644
index 2a9f05cb64..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark@2x.png
deleted file mode 100644
index ec2c154a72..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark@3x.png
deleted file mode 100644
index 5669f76922..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_dark.imageset/Spinner_8_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Contents.json
deleted file mode 100644
index b417eed029..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_8_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_8_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_8_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light.png
deleted file mode 100644
index e25d94e1ee..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light@2x.png
deleted file mode 100644
index 6e6e2214c0..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light@3x.png
deleted file mode 100644
index 4d40ebe89f..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_8_light.imageset/Spinner_8_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Contents.json
deleted file mode 100644
index 781cbde87f..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_9_dark.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_9_dark@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_9_dark@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark.png
deleted file mode 100644
index fbcf8fe280..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark@2x.png
deleted file mode 100644
index efc43662a5..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark@3x.png
deleted file mode 100644
index 4020de81ef..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_dark.imageset/Spinner_9_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Contents.json
deleted file mode 100644
index 2ad0a396dd..0000000000
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_9_light.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_9_light@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Spinner_9_light@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light.png
deleted file mode 100644
index 15701cd19b..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light@2x.png
deleted file mode 100644
index cdd05d4d00..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light@3x.png
deleted file mode 100644
index fb17afc75e..0000000000
Binary files a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_9_light.imageset/Spinner_9_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_dark.imageset/Contents.json
similarity index 100%
rename from iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_dark.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_dark.imageset/Contents.json
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_dark.imageset/Spinner_1_dark.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_dark.imageset/Spinner_1_dark.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_dark.imageset/Spinner_1_dark.png
rename to iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_dark.imageset/Spinner_1_dark.png
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_dark.imageset/Spinner_1_dark@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_dark.imageset/Spinner_1_dark@2x.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_dark.imageset/Spinner_1_dark@2x.png
rename to iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_dark.imageset/Spinner_1_dark@2x.png
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_dark.imageset/Spinner_1_dark@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_dark.imageset/Spinner_1_dark@3x.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_dark.imageset/Spinner_1_dark@3x.png
rename to iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_dark.imageset/Spinner_1_dark@3x.png
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_light.imageset/Contents.json
similarity index 100%
rename from iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_light.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_light.imageset/Contents.json
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_light.imageset/Spinner_1_light.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_light.imageset/Spinner_1_light.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_light.imageset/Spinner_1_light.png
rename to iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_light.imageset/Spinner_1_light.png
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_light.imageset/Spinner_1_light@2x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_light.imageset/Spinner_1_light@2x.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_light.imageset/Spinner_1_light@2x.png
rename to iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_light.imageset/Spinner_1_light@2x.png
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_light.imageset/Spinner_1_light@3x.png b/iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_light.imageset/Spinner_1_light@3x.png
similarity index 100%
rename from iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_1_light.imageset/Spinner_1_light@3x.png
rename to iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_light.imageset/Spinner_1_light@3x.png
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 031dfb92ef..a480b8c827 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -370,7 +370,6 @@
 		4719A64E21A30C3B009F9AA7 /* PaidRouteStatistics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4719A64D21A30C3B009F9AA7 /* PaidRouteStatistics.swift */; };
 		471BBD942130390F00EB17C9 /* TutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471BBD932130390F00EB17C9 /* TutorialViewController.swift */; };
 		4726254921C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4726254821C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift */; };
-		47289E532209BE3D002ABFC0 /* MWMActivityIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 47289E522209BE3D002ABFC0 /* MWMActivityIndicator.m */; };
 		47289E5A2212DFFF002ABFC0 /* EditOnWebAlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47289E582212DFFF002ABFC0 /* EditOnWebAlertViewController.swift */; };
 		47289E5B2212DFFF002ABFC0 /* EditOnWebAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47289E592212DFFF002ABFC0 /* EditOnWebAlertViewController.xib */; };
 		472E3F472146BCD30020E412 /* SubscriptionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472E3F462146BCD30020E412 /* SubscriptionManager.swift */; };
@@ -400,6 +399,7 @@
 		4788739220EE326500F6826B /* VerticallyAlignedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4788739120EE326400F6826B /* VerticallyAlignedButton.swift */; };
 		4797A4DC226F4B2900D3A984 /* DeepLinkHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4797A4DB226F4B2900D3A984 /* DeepLinkHandler.swift */; };
 		4797A4E22270997E00D3A984 /* DeepLinkHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4797A4E12270997E00D3A984 /* DeepLinkHelper.mm */; };
+		479EE94A2292FB03009DEBA6 /* ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479EE9492292FB03009DEBA6 /* ActivityIndicator.swift */; };
 		47AEF8402231249E00D20538 /* categories_brands.txt in Resources */ = {isa = PBXBuildFile; fileRef = 47AEF83F2231249E00D20538 /* categories_brands.txt */; };
 		47B06DED21B696C20094CCAD /* GeoTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B06DEC21B696C20094CCAD /* GeoTracker.swift */; };
 		47B06DF021B697230094CCAD /* MWMGeoTrackerCore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47B06DEF21B697230094CCAD /* MWMGeoTrackerCore.mm */; };
@@ -1400,8 +1400,6 @@
 		4719A64D21A30C3B009F9AA7 /* PaidRouteStatistics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaidRouteStatistics.swift; sourceTree = "<group>"; };
 		471BBD932130390F00EB17C9 /* TutorialViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TutorialViewController.swift; sourceTree = "<group>"; };
 		4726254821C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageDescriptionViewController.swift; sourceTree = "<group>"; };
-		47289E512209BE3D002ABFC0 /* MWMActivityIndicator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MWMActivityIndicator.h; path = CustomViews/MWMActivityIndicator.h; sourceTree = "<group>"; };
-		47289E522209BE3D002ABFC0 /* MWMActivityIndicator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MWMActivityIndicator.m; path = CustomViews/MWMActivityIndicator.m; sourceTree = "<group>"; };
 		47289E582212DFFF002ABFC0 /* EditOnWebAlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditOnWebAlertViewController.swift; sourceTree = "<group>"; };
 		47289E592212DFFF002ABFC0 /* EditOnWebAlertViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EditOnWebAlertViewController.xib; sourceTree = "<group>"; };
 		472E3F462146BCD30020E412 /* SubscriptionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionManager.swift; sourceTree = "<group>"; };
@@ -1439,6 +1437,7 @@
 		4797A4DB226F4B2900D3A984 /* DeepLinkHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLinkHandler.swift; sourceTree = "<group>"; };
 		4797A4E02270997E00D3A984 /* DeepLinkHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkHelper.h; sourceTree = "<group>"; };
 		4797A4E12270997E00D3A984 /* DeepLinkHelper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DeepLinkHelper.mm; sourceTree = "<group>"; };
+		479EE9492292FB03009DEBA6 /* ActivityIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ActivityIndicator.swift; path = CustomViews/ActivityIndicator.swift; sourceTree = "<group>"; };
 		47AEF83F2231249E00D20538 /* categories_brands.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = categories_brands.txt; path = ../../data/categories_brands.txt; sourceTree = "<group>"; };
 		47B06DEC21B696C20094CCAD /* GeoTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeoTracker.swift; sourceTree = "<group>"; };
 		47B06DEE21B697230094CCAD /* MWMGeoTrackerCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMGeoTrackerCore.h; sourceTree = "<group>"; };
@@ -3489,8 +3488,7 @@
 				34ABA60F1C2D17C200FE1BEC /* Login */,
 				34BC72091B0DECAE0012A34B /* MapViewControls */,
 				34AB65C41FC5AA320078E451 /* NavigationDashboard */,
-				47289E512209BE3D002ABFC0 /* MWMActivityIndicator.h */,
-				47289E522209BE3D002ABFC0 /* MWMActivityIndicator.m */,
+				479EE9492292FB03009DEBA6 /* ActivityIndicator.swift */,
 			);
 			name = "Custom Views";
 			sourceTree = "<group>";
@@ -5291,10 +5289,10 @@
 				F6E2FE731E097BA00083EBEC /* MWMOpeningHours.mm in Sources */,
 				47E3C7312111F4C2008B3B27 /* CoverVerticalPresentationAnimator.swift in Sources */,
 				F6D67CDC2062B9C00032FD38 /* BCCreateCategoryAlert.swift in Sources */,
-				47289E532209BE3D002ABFC0 /* MWMActivityIndicator.m in Sources */,
 				F6E2FF601E097BA00083EBEC /* MWMSettingsViewController.mm in Sources */,
 				F6E2FE2B1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.mm in Sources */,
 				34AB66891FC5AA330078E451 /* NavigationControlView.swift in Sources */,
+				479EE94A2292FB03009DEBA6 /* ActivityIndicator.swift in Sources */,
 				34AB661D1FC5AA330078E451 /* MWMTaxiPreviewDataSource.mm in Sources */,
 				F69CE8D61E5C49B4002B5881 /* PPHotelCarouselCell.swift in Sources */,
 				47B9065321C7FA400079C85E /* MWMImageCache.m in Sources */,
diff --git a/iphone/Maps/UI/Discovery/DiscoveryOnlineTemplateCell.swift b/iphone/Maps/UI/Discovery/DiscoveryOnlineTemplateCell.swift
index 533bc53dd2..a4b4d5e768 100644
--- a/iphone/Maps/UI/Discovery/DiscoveryOnlineTemplateCell.swift
+++ b/iphone/Maps/UI/Discovery/DiscoveryOnlineTemplateCell.swift
@@ -8,13 +8,7 @@ final class DiscoveryOnlineTemplateCell: MWMTableViewCell {
   @IBOutlet private weak var spinner: UIImageView! {
     didSet {
       let postfix = UIColor.isNightMode() ? "_dark" : "_light"
-      let animationImagesCount = 12
-      var images = Array<UIImage>()
-      for i in 1...animationImagesCount {
-        images.append(UIImage(named: "Spinner_\(i)" + postfix)!)
-      }
-      spinner.animationDuration = 0.8
-      spinner.animationImages = images
+      spinner.image = UIImage(named: "Spinner" + postfix)
     }
   }
 
@@ -34,7 +28,7 @@ final class DiscoveryOnlineTemplateCell: MWMTableViewCell {
 
     spinner.isHidden = !needSpinner
     if (needSpinner) {
-      spinner.startAnimating()
+      spinner.startRotation()
     }
     self.tap = tap
   }
diff --git a/iphone/Maps/UI/Discovery/DiscoverySpinnerCell.swift b/iphone/Maps/UI/Discovery/DiscoverySpinnerCell.swift
index 57a9159342..38cae390c5 100644
--- a/iphone/Maps/UI/Discovery/DiscoverySpinnerCell.swift
+++ b/iphone/Maps/UI/Discovery/DiscoverySpinnerCell.swift
@@ -3,20 +3,14 @@ final class DiscoverySpinnerCell: MWMTableViewCell {
   @IBOutlet private weak var spinner: UIImageView! {
     didSet {
       let postfix = UIColor.isNightMode() ? "_dark" : "_light"
-      let animationImagesCount = 12
-      var images = Array<UIImage>()
-      for i in 1...animationImagesCount {
-        images.append(UIImage(named: "Spinner_\(i)" + postfix)!)
-      }
-      spinner.animationDuration = 0.8
-      spinner.animationImages = images
-      spinner.startAnimating()
+      spinner.image = UIImage(named: "Spinner" + postfix)
+      spinner.startRotation()
     }
   }
 
   override func prepareForReuse() {
-    if !spinner.isAnimating {
-      spinner.startAnimating()
+    if !spinner.isRotating {
+      spinner.startRotation()
     }
   }
 }
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm
index 5eded88af2..d12bfa2069 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm
@@ -169,24 +169,14 @@ NSString * const kTextViewContentSizeKeyPath = @"contentSize";
 - (void)startSpinner
 {
   self.editButton.hidden = YES;
-  NSUInteger const animationImagesCount = 12;
-  NSMutableArray * animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
   NSString * postfix = [UIColor isNightMode] ? @"dark" : @"light";
-  for (NSUInteger i = 0; i < animationImagesCount; ++i)
-  {
-    UIImage * image =
-        [UIImage imageNamed:[NSString stringWithFormat:@"Spinner_%@_%@", @(i + 1), postfix]];
-    animationImages[i] = image;
-  }
-  self.spinner.animationDuration = 0.8;
-  self.spinner.animationImages = animationImages;
-  self.spinner.hidden = NO;
-  [self.spinner startAnimating];
+  self.spinner.image = [UIImage imageNamed:[NSString stringWithFormat:@"Spinner_%@", postfix]];
+  [self.spinner startRotation:1];
 }
 
 - (void)stopSpinner
 {
-  [self.spinner stopAnimating];
+  [self.spinner stopRotation];
   self.editButton.hidden = NO;
   self.spinner.hidden = YES;
 }