diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib
index a6cf7ef4ab..5733af89d0 100644
--- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib
+++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -53,7 +53,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HgY-nM-JMn">
-                            <rect key="frame" x="16" y="13" width="42" height="21"/>
+                            <rect key="frame" x="16" y="13.5" width="42" height="21"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
@@ -123,7 +123,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BbP-rE-XH6">
-                            <rect key="frame" x="16" y="13" width="343" height="21"/>
+                            <rect key="frame" x="16" y="13.5" width="343" height="21"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift
index 67cd9a9949..5ffe97e082 100644
--- a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift
+++ b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift
@@ -299,7 +299,7 @@ final class BookmarksSharingViewController: MWMTableViewController {
   }
   
   private func performAfterValidation(anchor: UIView, action: @escaping MWMVoidBlock) {
-    if MWMFrameworkHelper.isNetworkConnected() {
+    if FrameworkHelper.isNetworkConnected() {
       signup(anchor: anchor, onComplete: { success in
         if success {
           action()
diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h
index dedefa9a55..ab6de79bb0 100644
--- a/iphone/Maps/Bridging-Header.h
+++ b/iphone/Maps/Bridging-Header.h
@@ -10,6 +10,7 @@
 #import "MyTrackerSDK/MRMyTracker.h"
 #import "Pushwoosh/PushNotificationManager.h"
 #import "UIKit/UIKit.h"
+#import "CarPlay/CarPlay.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 #import "MPNativeAd+MWM.h"
@@ -82,9 +83,17 @@
 #import "UIViewController+Navigation.h"
 #import "WebViewController.h"
 #import "MWMCategory.h"
+#import "MWMCarPlayBookmarkObject.h"
 #import "MWMCatalogCommon.h"
 #import "MWMEye.h"
 #import "MWMPurchaseManager.h"
 #import "MWMPurchaseValidation.h"
 #import "MWMTag.h"
 #import "MWMTagGroup.h"
+#import "EAGLView.h"
+#import "MWMCarPlaySearchService.h"
+#import "MWMCarPlaySearchResultObject.h"
+#import "MWMRoutingManager.h"
+#import "MWMRouterResultCode.h"
+#import "MWMLocationModeListener.h"
+#import "MWMSpeedCameraManagerMode.h"
diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.h b/iphone/Maps/Categories/UIColor+MapsMeColor.h
index c185ff608a..aec24dcf99 100644
--- a/iphone/Maps/Categories/UIColor+MapsMeColor.h
+++ b/iphone/Maps/Categories/UIColor+MapsMeColor.h
@@ -48,6 +48,11 @@
 + (UIColor *)ratingLightGreen;
 + (UIColor *)ratingGreen;
 + (UIColor *)border;
++ (UIColor *)speedLimitRed;
++ (UIColor *)speedLimitGeen;
++ (UIColor *)speedLimitWhite;
++ (UIColor *)speedLimitLightGray;
++ (UIColor *)speedLimitDarkGray;
 
 + (UIColor *)colorWithName:(NSString *)colorName;
 + (UIColor *)colorFromHexString:(NSString *)hexString;
diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.mm b/iphone/Maps/Categories/UIColor+MapsMeColor.mm
index 41fdc37e91..6af1b83914 100644
--- a/iphone/Maps/Categories/UIColor+MapsMeColor.mm
+++ b/iphone/Maps/Categories/UIColor+MapsMeColor.mm
@@ -374,4 +374,25 @@ UIColor * color(SEL cmd)
 + (UIColor *)facebookButtonBackgroundDisabled {
   return [self.facebookButtonBackground colorWithAlphaComponent:alpha70];
 }
+
++ (UIColor *)speedLimitRed {
+  return [UIColor colorWithRed:scaled(224) green:scaled(31) blue:scaled(31) alpha:alpha100];
+}
+
++ (UIColor *)speedLimitGeen {
+  return [UIColor colorWithRed:scaled(1) green:scaled(104) blue:scaled(44) alpha:alpha100];
+}
+
++ (UIColor *)speedLimitWhite {
+  return [UIColor colorWithRed:scaled(255) green:scaled(255) blue:scaled(255) alpha:alpha80];
+}
+
++ (UIColor *)speedLimitLightGray {
+  return [UIColor colorWithRed:scaled(0) green:scaled(0) blue:scaled(0) alpha:alpha20];
+}
+
++ (UIColor *)speedLimitDarkGray {
+  return [UIColor colorWithRed:scaled(51) green:scaled(51) blue:scaled(50) alpha:alpha100];
+}
+
 @end
diff --git a/iphone/Maps/Categories/UIColorRoutines.h b/iphone/Maps/Categories/UIColorRoutines.h
index 51743fb630..14db7b05d9 100644
--- a/iphone/Maps/Categories/UIColorRoutines.h
+++ b/iphone/Maps/Categories/UIColorRoutines.h
@@ -1,5 +1,6 @@
 static CGFloat const alpha04 = 0.04;
 static CGFloat const alpha12 = 0.12;
+static CGFloat const alpha20 = 0.20;
 static CGFloat const alpha26 = 0.26;
 static CGFloat const alpha30 = 0.3;
 static CGFloat const alpha32 = 0.32;
diff --git a/iphone/Maps/Classes/CarPlay/CPConstants.swift b/iphone/Maps/Classes/CarPlay/CPConstants.swift
new file mode 100644
index 0000000000..05da9b8506
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/CPConstants.swift
@@ -0,0 +1,38 @@
+import Foundation
+
+struct CPConstants {
+  struct TemplateKey {
+    static let map = "map_type"
+    static let alert = "alert_type"
+    static let list = "list_type"
+  }
+  struct TemplateType {
+    static let main = "main"
+    static let navigation = "navigation"
+    static let preview = "preview"
+    static let previewAccepted = "preview_accepted"
+    static let previewSettings = "preview_settings"
+    static let redirectRoute = "redirect_route"
+    static let restoreRoute = "restore_route"
+    static let downloadMap = "download_map"
+  }
+  
+  struct ListItemType {
+    static let history = "history"
+    static let bookmarks = "bookmarks"
+    static let bookmarkLists = "bookmark_lists"
+    static let searchResults = "search_results"
+  }
+  
+  struct Maneuvers {
+    static let primary = "primary"
+    static let secondary = "secondary"
+  }
+  
+  struct Trip {
+    static let start = "start_point"
+    static let end = "end_point"
+    static let errorCode = "error_code"
+    static let missedCountries = "countries"
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/CPViewPortState.swift b/iphone/Maps/Classes/CarPlay/CPViewPortState.swift
new file mode 100644
index 0000000000..ed0759f8ec
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/CPViewPortState.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+enum CPViewPortState: Int {
+  case `default`
+  case preview
+  case navigation
+}
diff --git a/iphone/Maps/Classes/CarPlay/CarPlayRouter.swift b/iphone/Maps/Classes/CarPlay/CarPlayRouter.swift
new file mode 100644
index 0000000000..1249b275bb
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/CarPlayRouter.swift
@@ -0,0 +1,347 @@
+import CarPlay
+import Contacts
+
+@available(iOS 12.0, *)
+protocol CarPlayRouterListener: class {
+  func didCreateRoute(routeInfo: RouteInfo,
+                      trip: CPTrip)
+  func didUpdateRouteInfo(_ routeInfo: RouteInfo, forTrip trip: CPTrip)
+  func didFailureBuildRoute(forTrip trip: CPTrip, code: RouterResultCode, countries: [String])
+  func routeDidFinish(_ trip: CPTrip)
+}
+
+
+@available(iOS 12.0, *)
+@objc(MWMCarPlayRouter)
+final class CarPlayRouter: NSObject {
+  private let listenerContainer: ListenerContainer<CarPlayRouterListener>
+  private var routeSession: CPNavigationSession?
+  private var initialSpeedCamSettings: SpeedCameraManagerMode
+  var currentTrip: CPTrip? {
+    return routeSession?.trip
+  }
+  var previewTrip: CPTrip?
+  var speedCameraMode: SpeedCameraManagerMode {
+    return RoutingManager.routingManager.speedCameraMode
+  }
+  
+  override init() {
+    listenerContainer = ListenerContainer<CarPlayRouterListener>()
+    initialSpeedCamSettings = RoutingManager.routingManager.speedCameraMode
+    super.init()
+  }
+  
+  func addListener(_ listener: CarPlayRouterListener) {
+    listenerContainer.addListener(listener)
+  }
+  
+  func removeListener(_ listener: CarPlayRouterListener) {
+    listenerContainer.removeListener(listener)
+  }
+  
+  func subscribeToEvents() {
+    RoutingManager.routingManager.add(self)
+  }
+  
+  func unsubscribeFromEvents() {
+    RoutingManager.routingManager.remove(self)
+  }
+  
+  func completeRouteAndRemovePoints() {
+    let manager = RoutingManager.routingManager
+    manager.stopRoutingAndRemoveRoutePoints(true)
+    manager.deleteSavedRoutePoints()
+    manager.apply(routeType: .vehicle)
+    previewTrip = nil
+  }
+  
+  func rebuildRoute() {
+    guard let trip = previewTrip else { return }
+    do {
+      try RoutingManager.routingManager.buildRoute()
+    } catch let error as NSError {
+      listenerContainer.forEach({
+        let code = RouterResultCode(rawValue: UInt(error.code)) ?? .internalError
+        $0.didFailureBuildRoute(forTrip: trip, code: code, countries: [])
+      })
+    }
+  }
+  
+  func buildRoute(trip: CPTrip) {
+    completeRouteAndRemovePoints()
+    previewTrip = trip
+    guard let info = trip.userInfo as? [String: MWMRoutePoint] else {
+      listenerContainer.forEach({
+        $0.didFailureBuildRoute(forTrip: trip, code: .routeNotFound, countries: [])
+      })
+      return
+    }
+    guard let startPoint = info[CPConstants.Trip.start],
+      let endPoint = info[CPConstants.Trip.end] else {
+        listenerContainer.forEach({
+          var code: RouterResultCode!
+          if info[CPConstants.Trip.end] == nil {
+            code = .endPointNotFound
+          } else {
+            code = .startPointNotFound
+          }
+          $0.didFailureBuildRoute(forTrip: trip, code: code, countries: [])
+        })
+        return
+    }
+    
+    let manager = RoutingManager.routingManager
+    manager.add(routePoint: startPoint)
+    manager.add(routePoint: endPoint)
+    
+    do {
+      try manager.buildRoute()
+    } catch let error as NSError {
+      listenerContainer.forEach({
+        let code = RouterResultCode(rawValue: UInt(error.code)) ?? .internalError
+        $0.didFailureBuildRoute(forTrip: trip, code: code, countries: [])
+      })
+    }
+  }
+  
+  func updateStartPointAndRebuild(trip: CPTrip) {
+    let manager = RoutingManager.routingManager
+    previewTrip = trip
+    guard let info = trip.userInfo as? [String: MWMRoutePoint] else {
+      listenerContainer.forEach({
+        $0.didFailureBuildRoute(forTrip: trip, code: .routeNotFound, countries: [])
+      })
+      return
+    }
+    guard let startPoint = info[CPConstants.Trip.start] else {
+        listenerContainer.forEach({
+          $0.didFailureBuildRoute(forTrip: trip, code: .startPointNotFound, countries: [])
+        })
+        return
+    }
+    manager.add(routePoint: startPoint)
+    manager.apply(routeType: .vehicle)
+    do {
+      try manager.buildRoute()
+    } catch let error as NSError {
+      listenerContainer.forEach({
+        let code = RouterResultCode(rawValue: UInt(error.code)) ?? .internalError
+        $0.didFailureBuildRoute(forTrip: trip, code: code, countries: [])
+      })
+    }
+  }
+  
+  func startRoute() {
+    let manager = RoutingManager.routingManager
+    manager.startRoute()
+  }
+  
+  func setupCarPlaySpeedCameraMode() {
+    if case .auto = initialSpeedCamSettings {
+      RoutingManager.routingManager.speedCameraMode = .always
+    }
+  }
+  
+  func setupInitialSpeedCameraMode() {
+    RoutingManager.routingManager.speedCameraMode = initialSpeedCamSettings
+  }
+  
+  func updateSpeedCameraMode(_ mode: SpeedCameraManagerMode) {
+    initialSpeedCamSettings = mode
+    RoutingManager.routingManager.speedCameraMode = mode
+  }
+  
+  func restoreTripPreviewOnCarplay(beforeRootTemplateDidAppear: Bool) {
+    guard MWMRouter.isRestoreProcessCompleted() else {
+      DispatchQueue.main.async { [weak self] in
+        self?.restoreTripPreviewOnCarplay(beforeRootTemplateDidAppear: false)
+      }
+      return
+    }
+    let manager = RoutingManager.routingManager
+    MWMRouter.hideNavigationMapControls()
+    guard manager.isRoutingActive,
+      let startPoint = manager.startPoint,
+      let endPoint = manager.endPoint else {
+        completeRouteAndRemovePoints()
+        return
+    }
+    let trip = createTrip(startPoint: startPoint,
+                          endPoint: endPoint,
+                          routeInfo: manager.routeInfo)
+    previewTrip = trip
+    if manager.type != .vehicle {
+      CarPlayService.shared.showRecoverRouteAlert(trip: trip, isTypeCorrect: false)
+      return
+    }
+    if !startPoint.isMyPosition {
+      CarPlayService.shared.showRecoverRouteAlert(trip: trip, isTypeCorrect: true)
+      return
+    }
+    if beforeRootTemplateDidAppear {
+      CarPlayService.shared.preparedToPreviewTrips = [trip]
+    } else {
+      CarPlayService.shared.preparePreview(trips: [trip])
+    }
+  }
+  
+  func restoredNavigationSession() -> (CPTrip, RouteInfo)? {
+    let manager = RoutingManager.routingManager
+    if manager.isOnRoute,
+      manager.type == .vehicle,
+      let startPoint = manager.startPoint,
+      let endPoint = manager.endPoint,
+      let routeInfo = manager.routeInfo {
+      MWMRouter.hideNavigationMapControls()
+      let trip = createTrip(startPoint: startPoint,
+                            endPoint: endPoint,
+                            routeInfo: routeInfo)
+      previewTrip = trip
+      return (trip, routeInfo)
+    }
+    return nil
+  }
+}
+
+// MARK: - Navigation session management
+@available(iOS 12.0, *)
+extension CarPlayRouter {
+  func startNavigationSession(forTrip trip: CPTrip, template: CPMapTemplate) {
+    routeSession = template.startNavigationSession(for: trip)
+    routeSession?.pauseTrip(for: .loading, description: nil)
+    updateUpcomingManeuvers()
+  }
+  
+  func cancelTrip() {
+    routeSession?.cancelTrip()
+    routeSession = nil
+    completeRouteAndRemovePoints()
+  }
+  
+  func finishTrip() {
+    routeSession?.finishTrip()
+    routeSession = nil
+    completeRouteAndRemovePoints()
+  }
+  
+  func updateUpcomingManeuvers() {
+    let maneuvers = createUpcomingManeuvers()
+    routeSession?.upcomingManeuvers = maneuvers
+  }
+  
+  private func createUpcomingManeuvers() -> [CPManeuver] {
+    guard let routeInfo = RoutingManager.routingManager.routeInfo else {
+      return []
+    }
+    var maneuvers = [CPManeuver]()
+    let primaryManeuver = CPManeuver()
+    primaryManeuver.userInfo = CPConstants.Maneuvers.primary
+    primaryManeuver.instructionVariants = [routeInfo.streetName]
+    if let imageName = routeInfo.turnImageName,
+      let symbol = UIImage(named: imageName) {
+      primaryManeuver.symbolSet = CPImageSet(lightContentImage: symbol,
+                                             darkContentImage: symbol)
+    }
+    if let distance = Double(routeInfo.distanceToTurn) {
+      let measurement = Measurement(value: distance,
+                                    unit: routeInfo.turnUnits)
+      let estimates = CPTravelEstimates(distanceRemaining: measurement,
+                                        timeRemaining: 0.0)
+      primaryManeuver.initialTravelEstimates = estimates
+    }
+    maneuvers.append(primaryManeuver)
+    if let imageName = routeInfo.nextTurnImageName,
+      let symbol = UIImage(named: imageName) {
+      let secondaryManeuver = CPManeuver()
+      secondaryManeuver.userInfo = CPConstants.Maneuvers.secondary
+      secondaryManeuver.instructionVariants = [L("then_turn")]
+      secondaryManeuver.symbolSet = CPImageSet(lightContentImage: symbol,
+                                               darkContentImage: symbol)
+      maneuvers.append(secondaryManeuver)
+    }
+    return maneuvers
+  }
+  
+  func createTrip(startPoint: MWMRoutePoint, endPoint: MWMRoutePoint, routeInfo: RouteInfo? = nil) -> CPTrip {
+    let startPlacemark = MKPlacemark(coordinate: CLLocationCoordinate2D(latitude: startPoint.latitude,
+                                                                        longitude: startPoint.longitude))
+    let endPlacemark = MKPlacemark(coordinate: CLLocationCoordinate2D(latitude: endPoint.latitude,
+                                                                      longitude: endPoint.longitude),
+                                   addressDictionary: [CNPostalAddressStreetKey: endPoint.subtitle])
+    let startItem = MKMapItem(placemark: startPlacemark)
+    let endItem = MKMapItem(placemark: endPlacemark)
+    endItem.name = endPoint.title
+    
+    let routeChoice = CPRouteChoice(summaryVariants: [" "], additionalInformationVariants: [], selectionSummaryVariants: [])
+    routeChoice.userInfo = routeInfo
+    
+    let trip = CPTrip(origin: startItem, destination: endItem, routeChoices: [routeChoice])
+    trip.userInfo = [CPConstants.Trip.start: startPoint, CPConstants.Trip.end: endPoint]
+    return trip
+  }
+}
+
+// MARK: - RoutingManagerListener implementation
+@available(iOS 12.0, *)
+extension CarPlayRouter: RoutingManagerListener {
+  func updateCameraInfo(isCameraOnRoute: Bool, speedLimit limit: String?) {
+    CarPlayService.shared.updateCameraUI(isCameraOnRoute: isCameraOnRoute, speedLimit: limit)
+  }
+  
+  func processRouteBuilderEvent(with code: RouterResultCode, countries: [String]) {
+    guard let trip = previewTrip else {
+      return
+    }
+    switch code {
+    case .noError, .hasWarnings:
+      let manager = RoutingManager.routingManager
+      if manager.isRouteFinished {
+        listenerContainer.forEach({
+          $0.routeDidFinish(trip)
+        })
+        return
+      }
+      if let info = manager.routeInfo {
+        previewTrip?.routeChoices.first?.userInfo = info
+        if routeSession == nil {
+          listenerContainer.forEach({
+            $0.didCreateRoute(routeInfo: info,
+                              trip: trip)
+          })
+        } else {
+          listenerContainer.forEach({
+            $0.didUpdateRouteInfo(info, forTrip: trip)
+          })
+        }
+      }
+    default:
+      listenerContainer.forEach({
+        $0.didFailureBuildRoute(forTrip: trip, code: code, countries: countries)
+      })
+    }
+  }
+  
+  func didLocationUpdate(_ notifications: [String]) {
+    guard let trip = previewTrip else { return }
+    
+    let manager = RoutingManager.routingManager
+    if manager.isRouteFinished {
+      listenerContainer.forEach({
+        $0.routeDidFinish(trip)
+      })
+      return
+    }
+    
+    guard let routeInfo = manager.routeInfo,
+      manager.isRoutingActive else { return }
+    listenerContainer.forEach({
+      $0.didUpdateRouteInfo(routeInfo, forTrip: trip)
+    })
+    
+    let tts = MWMTextToSpeech.tts()!
+    if manager.isOnRoute && tts.active {
+      tts.playTurnNotifications(notifications)
+      tts.playWarningSound()
+    }
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/CarPlayService.swift b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
new file mode 100644
index 0000000000..8ce2268db4
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
@@ -0,0 +1,685 @@
+import CarPlay
+import Contacts
+
+@available(iOS 12.0, *)
+@objc(MWMCarPlayService)
+final class CarPlayService: NSObject {
+  @objc static let shared = CarPlayService()
+  @objc var isCarplayActivated: Bool = false
+  private var searchService: CarPlaySearchService?
+  private var router: CarPlayRouter?
+  private var window: CPWindow?
+  private var interfaceController: CPInterfaceController?
+  private var sessionConfiguration: CPSessionConfiguration?
+  var currentPositionMode: MWMMyPositionMode = .pendingPosition
+  var isSpeedCamActivated: Bool {
+    set {
+      router?.updateSpeedCameraMode(newValue ? .always: .never)
+    }
+    get {
+      let mode: SpeedCameraManagerMode = router?.speedCameraMode ?? .never
+      return mode == .always ? true : false
+    }
+  }
+  var isKeyboardLimited: Bool {
+    return sessionConfiguration?.limitedUserInterfaces.contains(.keyboard) ?? false
+  }
+  private var carplayVC: CarPlayMapViewController? {
+    return window?.rootViewController as? CarPlayMapViewController
+  }
+  private var rootMapTemplate: CPMapTemplate? {
+    return interfaceController?.rootTemplate as? CPMapTemplate
+  }
+  var preparedToPreviewTrips: [CPTrip] = []
+  
+  @objc func setup(window: CPWindow, interfaceController: CPInterfaceController) {
+    isCarplayActivated = true
+    self.window = window
+    self.interfaceController = interfaceController
+    self.interfaceController?.delegate = self
+    sessionConfiguration = CPSessionConfiguration(delegate: self)
+    searchService = CarPlaySearchService()
+    let router = CarPlayRouter()
+    router.addListener(self)
+    router.subscribeToEvents()
+    router.setupCarPlaySpeedCameraMode()
+    self.router = router
+    MWMRouter.unsubscribeFromEvents()
+    applyRootViewController()
+    if let sessionData = router.restoredNavigationSession() {
+      applyNavigationRootTemplate(trip: sessionData.0, routeInfo: sessionData.1)
+    } else {
+      applyBaseRootTemplate()
+      router.restoreTripPreviewOnCarplay(beforeRootTemplateDidAppear: true)
+    }
+    ThemeManager.invalidate()
+  }
+  
+  @objc func destroy() {
+    if let carplayVC = carplayVC {
+      carplayVC.removeMapView()
+    }
+    MapViewController.shared()?.disableCarPlayRepresentation()
+    MapViewController.shared()?.remove(self)
+    router?.removeListener(self)
+    router?.unsubscribeFromEvents()
+    router?.setupInitialSpeedCameraMode()
+    MWMRouter.subscribeToEvents()
+    isCarplayActivated = false
+    if router?.currentTrip != nil {
+      MWMRouter.showNavigationMapControls()
+    } else if router?.previewTrip != nil {
+      MWMRouter.rebuild(withBestRouter: true)
+    }
+    searchService = nil
+    router = nil
+    sessionConfiguration = nil
+    interfaceController = nil
+    ThemeManager.invalidate()
+  }
+  
+  @objc func interfaceStyle() -> UIUserInterfaceStyle {
+    if let window = window,
+      window.traitCollection.userInterfaceIdiom == .carPlay {
+      return window.traitCollection.userInterfaceStyle
+    }
+    return .unspecified
+  }
+  
+  private func applyRootViewController() {
+    guard let window = window else { return }
+    let carplaySotyboard = UIStoryboard.instance(.carPlay)
+    let carplayVC = carplaySotyboard.instantiateInitialViewController() as! CarPlayMapViewController
+    window.rootViewController = carplayVC
+    if let mapVC = MapViewController.shared() {
+      currentPositionMode = mapVC.currentPositionMode
+      mapVC.enableCarPlayRepresentation()
+      carplayVC.addMapView(mapVC.mapView, mapButtonSafeAreaLayoutGuide: window.mapButtonSafeAreaLayoutGuide)
+      mapVC.add(self)
+    }
+  }
+  
+  private func applyBaseRootTemplate() {
+    let mapTemplate = MapTemplateBuilder.buildBaseTemplate(positionMode: currentPositionMode)
+    mapTemplate.mapDelegate = self
+    interfaceController?.setRootTemplate(mapTemplate, animated: true)
+  }
+  
+  private func applyNavigationRootTemplate(trip: CPTrip, routeInfo: RouteInfo) {
+    let mapTemplate = MapTemplateBuilder.buildNavigationTemplate()
+    mapTemplate.mapDelegate = self
+    interfaceController?.setRootTemplate(mapTemplate, animated: true)
+    router?.startNavigationSession(forTrip: trip, template: mapTemplate)
+    if let estimates = createEstimates(routeInfo: routeInfo) {
+      mapTemplate.updateEstimates(estimates, for: trip)
+    }
+    
+    if let carplayVC = carplayVC {
+      carplayVC.updateCurrentSpeed(routeInfo.speed)
+      carplayVC.showSpeedControl()
+    }
+  }
+  
+  func pushTemplate(_ templateToPush: CPTemplate, animated: Bool) {
+    if let interfaceController = interfaceController {
+      switch templateToPush {
+      case let list as CPListTemplate:
+        list.delegate = self
+      case let search as CPSearchTemplate:
+        search.delegate = self
+      case let map as CPMapTemplate:
+        map.mapDelegate = self
+      default:
+        break
+      }
+      interfaceController.pushTemplate(templateToPush, animated: animated)
+    }
+  }
+  
+  func popTemplate(animated: Bool) {
+    interfaceController?.popTemplate(animated: animated)
+  }
+  
+  func cancelCurrentTrip() {
+    router?.cancelTrip()
+    if let carplayVC = carplayVC {
+      carplayVC.hideSpeedControl()
+    }
+    updateMapTemplateUIToBase()
+  }
+  
+  func updateCameraUI(isCameraOnRoute: Bool, speedLimit limit: String?) {
+    if let carplayVC = carplayVC {
+      let speedLimit = limit == nil ? nil : Int(limit!)
+      carplayVC.updateCameraInfo(isCameraOnRoute: isCameraOnRoute, speedLimit: speedLimit)
+    }
+  }
+  
+  func updateMapTemplateUIToBase() {
+    guard let mapTemplate = rootMapTemplate else {
+        return
+    }
+    MapTemplateBuilder.configureBaseUI(mapTemplate: mapTemplate)
+    if currentPositionMode == .pendingPosition {
+      mapTemplate.leadingNavigationBarButtons = []
+    } else if currentPositionMode == .follow || currentPositionMode == .followAndRotate {
+      MapTemplateBuilder.setupDestinationButton(mapTemplate: mapTemplate)
+    } else {
+      MapTemplateBuilder.setupRecenterButton(mapTemplate: mapTemplate)
+    }
+    updateVisibleViewPortState(.default)
+  }
+  
+  func updateMapTemplateUIToTripFinished(_ trip: CPTrip) {
+    guard let mapTemplate = rootMapTemplate else {
+        return
+    }
+    mapTemplate.leadingNavigationBarButtons = []
+    mapTemplate.trailingNavigationBarButtons = []
+    mapTemplate.mapButtons = []
+    let doneAction = CPAlertAction(title: L("done"), style: .cancel) { [unowned self] _ in
+      self.updateMapTemplateUIToBase()
+    }
+    var subtitle = ""
+    if let locationName = trip.destination.name {
+      subtitle = locationName
+    }
+    if let address = trip.destination.placemark.addressDictionary?[CNPostalAddressStreetKey] as? String {
+      subtitle = subtitle + "\n" + address
+    }
+    
+    let alert = CPNavigationAlert(titleVariants: [L("trip_finished")],
+                                  subtitleVariants: [subtitle],
+                                  imageSet: nil,
+                                  primaryAction: doneAction,
+                                  secondaryAction: nil,
+                                  duration: 0)
+    mapTemplate.present(navigationAlert: alert, animated: true)
+  }
+  
+  func updateVisibleViewPortState(_ state: CPViewPortState) {
+    guard let carplayVC = carplayVC else {
+      return
+    }
+    carplayVC.updateVisibleViewPortState(state)
+  }
+  
+  func updateRouteAfterChangingSettings() {
+    router?.rebuildRoute()
+  }
+  
+  @objc func showNoMapAlert() {
+    guard let mapTemplate = interfaceController?.topTemplate as? CPMapTemplate,
+      let info = mapTemplate.userInfo as? MapInfo,
+      info.type == CPConstants.TemplateType.main else {
+      return
+    }
+    let alert = CPAlertTemplate(titleVariants: [L("download_map_carplay")], actions: [])
+    alert.userInfo = [CPConstants.TemplateKey.alert: CPConstants.TemplateType.downloadMap]
+    interfaceController?.dismissTemplate(animated: true)
+    interfaceController?.presentTemplate(alert, animated: true)
+  }
+  
+  @objc func hideNoMapAlert() {
+    if let presentedTemplate = interfaceController?.presentedTemplate,
+      let info = presentedTemplate.userInfo as? [String: String],
+      let alertType = info[CPConstants.TemplateKey.alert],
+      alertType == CPConstants.TemplateType.downloadMap {
+      interfaceController?.dismissTemplate(animated: true)
+    }
+  }
+}
+
+// MARK: - CPInterfaceControllerDelegate implementation
+@available(iOS 12.0, *)
+extension CarPlayService: CPInterfaceControllerDelegate {
+  func templateWillAppear(_ aTemplate: CPTemplate, animated: Bool) {
+    guard let info = aTemplate.userInfo as? MapInfo else {
+        return
+    }
+    switch info.type {
+    case CPConstants.TemplateType.main:
+      updateVisibleViewPortState(.default)
+    case CPConstants.TemplateType.preview:
+      updateVisibleViewPortState(.preview)
+    case CPConstants.TemplateType.navigation:
+      updateVisibleViewPortState(.navigation)
+    case CPConstants.TemplateType.previewSettings:
+      aTemplate.userInfo = MapInfo(type: CPConstants.TemplateType.preview)
+    default:
+      break
+    }
+  }
+  
+  func templateDidAppear(_ aTemplate: CPTemplate, animated: Bool) {
+    guard let mapTemplate = aTemplate as? CPMapTemplate,
+      let info = aTemplate.userInfo as? MapInfo else {
+        return
+    }
+    if !preparedToPreviewTrips.isEmpty && info.type == CPConstants.TemplateType.main {
+      preparePreview(trips: preparedToPreviewTrips)
+      preparedToPreviewTrips = []
+      return
+    }
+    
+    if info.type == CPConstants.TemplateType.preview, let trips = info.trips {
+      showPreview(mapTemplate: mapTemplate, trips: trips)
+    }
+  }
+  
+  func templateWillDisappear(_ aTemplate: CPTemplate, animated: Bool) {
+    guard let info = aTemplate.userInfo as? MapInfo else {
+        return
+    }
+    if info.type == CPConstants.TemplateType.preview {
+      router?.completeRouteAndRemovePoints()
+    }
+  }
+  
+  func templateDidDisappear(_ aTemplate: CPTemplate, animated: Bool) {
+    guard !preparedToPreviewTrips.isEmpty,
+      let info = aTemplate.userInfo as? [String: String],
+      let alertType = info[CPConstants.TemplateKey.alert],
+      alertType == CPConstants.TemplateType.redirectRoute ||
+        alertType == CPConstants.TemplateType.restoreRoute else {
+        return
+    }
+    preparePreview(trips: preparedToPreviewTrips)
+    preparedToPreviewTrips = []
+  }
+}
+
+// MARK: - CPSessionConfigurationDelegate implementation
+@available(iOS 12.0, *)
+extension CarPlayService: CPSessionConfigurationDelegate {
+  func sessionConfiguration(_ sessionConfiguration: CPSessionConfiguration,
+                            limitedUserInterfacesChanged limitedUserInterfaces: CPLimitableUserInterface) {
+    
+  }
+}
+
+// MARK: - CPMapTemplateDelegate implementation
+@available(iOS 12.0, *)
+extension CarPlayService: CPMapTemplateDelegate {
+  public func mapTemplateDidShowPanningInterface(_ mapTemplate: CPMapTemplate) {
+    MapTemplateBuilder.configurePanUI(mapTemplate: mapTemplate)
+    FrameworkHelper.stopLocationFollow()
+  }
+  
+  public func mapTemplateWillDismissPanningInterface(_ mapTemplate: CPMapTemplate) {
+    if let info = mapTemplate.userInfo as? MapInfo,
+      info.type == CPConstants.TemplateType.navigation {
+      MapTemplateBuilder.configureNavigationUI(mapTemplate: mapTemplate)
+    } else {
+      MapTemplateBuilder.configureBaseUI(mapTemplate: mapTemplate)
+    }
+    FrameworkHelper.switchMyPositionMode()
+  }
+  
+  func mapTemplate(_ mapTemplate: CPMapTemplate, panEndedWith direction: CPMapTemplate.PanDirection) {
+    var offset = UIOffset(horizontal: 0.0, vertical: 0.0)
+    let offsetStep: CGFloat = 0.25
+    if direction.contains(.up) { offset.vertical -= offsetStep }
+    if direction.contains(.down) { offset.vertical += offsetStep }
+    if direction.contains(.left) { offset.horizontal += offsetStep }
+    if direction.contains(.right) { offset.horizontal -= offsetStep }
+    FrameworkHelper.moveMap(offset)
+  }
+  
+  func mapTemplate(_ mapTemplate: CPMapTemplate, panWith direction: CPMapTemplate.PanDirection) {
+    var offset = UIOffset(horizontal: 0.0, vertical: 0.0)
+    let offsetStep: CGFloat = 0.1
+    if direction.contains(.up) { offset.vertical -= offsetStep }
+    if direction.contains(.down) { offset.vertical += offsetStep }
+    if direction.contains(.left) { offset.horizontal += offsetStep }
+    if direction.contains(.right) { offset.horizontal -= offsetStep }
+    FrameworkHelper.moveMap(offset)
+  }
+  
+  func mapTemplate(_ mapTemplate: CPMapTemplate, startedTrip trip: CPTrip, using routeChoice: CPRouteChoice) {
+    guard let info = routeChoice.userInfo as? RouteInfo else {
+      if let info = routeChoice.userInfo as? [String: Any],
+        let code = info[CPConstants.Trip.errorCode] as? RouterResultCode,
+        let countries = info[CPConstants.Trip.missedCountries] as? [String] {
+        showErrorAlert(code: code, countries: countries)
+      }
+      return
+    }
+    mapTemplate.userInfo = MapInfo(type: CPConstants.TemplateType.previewAccepted)
+    mapTemplate.hideTripPreviews()
+    
+    guard let router = router,
+      let interfaceController = interfaceController,
+      let rootMapTemplate = rootMapTemplate else {
+        return
+    }
+    
+    MapTemplateBuilder.configureNavigationUI(mapTemplate: rootMapTemplate)
+    interfaceController.popToRootTemplate(animated: false)
+    
+    router.startNavigationSession(forTrip: trip, template: rootMapTemplate)
+    router.startRoute()
+    if let estimates = createEstimates(routeInfo: info) {
+      rootMapTemplate.updateEstimates(estimates, for: trip)
+    }
+    
+    if let carplayVC = carplayVC {
+      carplayVC.updateCurrentSpeed(info.speed)
+      carplayVC.showSpeedControl()
+    }
+    updateVisibleViewPortState(.navigation)
+  }
+  
+  func mapTemplate(_ mapTemplate: CPMapTemplate, displayStyleFor maneuver: CPManeuver) -> CPManeuverDisplayStyle {
+    if let type = maneuver.userInfo as? String,
+      type == CPConstants.Maneuvers.secondary {
+      return .trailingSymbol
+    }
+    return .leadingSymbol
+  }
+  
+  func mapTemplate(_ mapTemplate: CPMapTemplate,
+                   selectedPreviewFor trip: CPTrip,
+                   using routeChoice: CPRouteChoice) {
+    guard let previewTrip = router?.previewTrip, previewTrip == trip else {
+      applyUndefinedEstimates(template: mapTemplate, trip: trip)
+      router?.buildRoute(trip: trip)
+      return
+    }
+    guard let info = routeChoice.userInfo as? RouteInfo,
+      let estimates = createEstimates(routeInfo: info) else {
+      applyUndefinedEstimates(template: mapTemplate, trip: trip)
+      return
+    }
+    mapTemplate.updateEstimates(estimates, for: trip)
+  }
+}
+
+
+// MARK: - CPListTemplateDelegate implementation
+@available(iOS 12.0, *)
+extension CarPlayService: CPListTemplateDelegate {
+  func listTemplate(_ listTemplate: CPListTemplate, didSelect item: CPListItem, completionHandler: @escaping () -> Void) {
+    if let userInfo = item.userInfo as? ListItemInfo {
+      switch userInfo.type {
+      case CPConstants.ListItemType.history:
+        let locale = window?.textInputMode?.primaryLanguage ?? "en"
+        guard let searchService = searchService else {
+          completionHandler()
+          return
+        }
+        searchService.searchText(item.text ?? "", forInputLocale: locale, completionHandler: { [weak self] results in
+          guard let self = self else { return }
+          let template = ListTemplateBuilder.buildListTemplate(for: .searchResults(results: results))
+          completionHandler()
+          self.pushTemplate(template, animated: true)
+        })
+      case CPConstants.ListItemType.bookmarkLists where userInfo.metadata is CategoryInfo:
+        let metadata = userInfo.metadata as! CategoryInfo
+        let template = ListTemplateBuilder.buildListTemplate(for: .bookmarks(category: metadata.category))
+        completionHandler()
+        pushTemplate(template, animated: true)
+      case CPConstants.ListItemType.bookmarks where userInfo.metadata is BookmarkInfo:
+        let metadata = userInfo.metadata as! BookmarkInfo
+        let bookmark = MWMCarPlayBookmarkObject(bookmarkId: metadata.bookmarkId)
+        preparePreview(forBookmark: bookmark)
+        completionHandler()
+      case CPConstants.ListItemType.searchResults where userInfo.metadata is SearchResultInfo:
+        let metadata = userInfo.metadata as! SearchResultInfo
+        preparePreviewForSearchResults(selectedRow: metadata.originalRow)
+        completionHandler()
+      default:
+        completionHandler()
+      }
+    }
+  }
+}
+
+// MARK: - CPSearchTemplateDelegate implementation
+@available(iOS 12.0, *)
+extension CarPlayService: CPSearchTemplateDelegate {
+  func searchTemplate(_ searchTemplate: CPSearchTemplate, updatedSearchText searchText: String, completionHandler: @escaping ([CPListItem]) -> Void) {
+    let locale = window?.textInputMode?.primaryLanguage ?? "en"
+    guard let searchService = searchService else {
+      completionHandler([])
+      return
+    }
+    searchService.searchText(searchText, forInputLocale: locale, completionHandler: { results in
+      var items = [CPListItem]()
+      for object in results {
+        let item = CPListItem(text: object.title, detailText: object.address)
+        item.userInfo = ListItemInfo(type: CPConstants.ListItemType.searchResults,
+                                     metadata: SearchResultInfo(originalRow: object.originalRow))
+        items.append(item)
+      }
+      completionHandler(items)
+    })
+  }
+  
+  func searchTemplate(_ searchTemplate: CPSearchTemplate, selectedResult item: CPListItem, completionHandler: @escaping () -> Void) {
+    searchService?.saveLastQuery()
+    if let info = item.userInfo as? ListItemInfo,
+      let metadata = info.metadata as? SearchResultInfo {
+      preparePreviewForSearchResults(selectedRow: metadata.originalRow)
+    }
+    completionHandler()
+  }
+}
+
+// MARK: - CarPlayRouterListener implementation
+@available(iOS 12.0, *)
+extension CarPlayService: CarPlayRouterListener {
+  func didCreateRoute(routeInfo: RouteInfo, trip: CPTrip) {
+    guard let currentTemplate = interfaceController?.topTemplate as? CPMapTemplate,
+      let info = currentTemplate.userInfo as? MapInfo,
+      info.type == CPConstants.TemplateType.preview else {
+        return
+    }
+    if let estimates = createEstimates(routeInfo: routeInfo) {
+      currentTemplate.updateEstimates(estimates, for: trip)
+    }
+  }
+  
+  func didUpdateRouteInfo(_ routeInfo: RouteInfo, forTrip trip: CPTrip) {
+    if let carplayVC = carplayVC {
+      carplayVC.updateCurrentSpeed(routeInfo.speed)
+    }
+    guard let router = router,
+      let template = rootMapTemplate else {
+        return
+    }
+    router.updateUpcomingManeuvers()
+    if let estimates = createEstimates(routeInfo: routeInfo) {
+      template.updateEstimates(estimates, for: trip)
+    }
+    trip.routeChoices.first?.userInfo = routeInfo
+  }
+  
+  func didFailureBuildRoute(forTrip trip: CPTrip, code: RouterResultCode, countries: [String]) {
+    guard let template = interfaceController?.topTemplate as? CPMapTemplate else { return }
+    trip.routeChoices.first?.userInfo = [CPConstants.Trip.errorCode: code, CPConstants.Trip.missedCountries: countries]
+    applyUndefinedEstimates(template: template, trip: trip)
+  }
+  
+  func routeDidFinish(_ trip: CPTrip) {
+    if router?.currentTrip == nil { return }
+    router?.finishTrip()
+    if let carplayVC = carplayVC {
+      carplayVC.hideSpeedControl()
+    }
+    updateMapTemplateUIToTripFinished(trip)
+  }
+}
+
+// MARK: - LocationModeListener implementation
+@available(iOS 12.0, *)
+extension CarPlayService: LocationModeListener {
+  func processMyPositionStateModeEvent(_ mode: MWMMyPositionMode) {
+    currentPositionMode = mode
+    guard let rootMapTemplate = rootMapTemplate,
+      let info = rootMapTemplate.userInfo as? MapInfo,
+      info.type == CPConstants.TemplateType.main else {
+        return
+    }
+    switch mode {
+    case .follow, .followAndRotate:
+      MapTemplateBuilder.setupDestinationButton(mapTemplate: rootMapTemplate)
+    case .notFollow:
+      if !rootMapTemplate.isPanningInterfaceVisible {
+        MapTemplateBuilder.setupRecenterButton(mapTemplate: rootMapTemplate)
+      }
+    default:
+      break
+    }
+  }
+}
+
+// MARK: - Alerts and Trip Previews
+@available(iOS 12.0, *)
+extension CarPlayService {
+  func preparePreviewForSearchResults(selectedRow row: Int) {
+    var results = searchService?.lastResults ?? []
+    if let currentItemIndex = results.firstIndex(where: { $0.originalRow == row }) {
+      let item = results.remove(at: currentItemIndex)
+      results.insert(item, at: 0)
+    } else {
+      results.insert(MWMCarPlaySearchResultObject(forRow: row), at: 0)
+    }
+    if let router = router,
+      let startPoint = MWMRoutePoint(lastLocationAndType: .start,
+                                     intermediateIndex: 0) {
+      let endPoints = results.compactMap({ MWMRoutePoint(cgPoint: $0.mercatorPoint,
+                                                         title: $0.title,
+                                                         subtitle: $0.address,
+                                                         type: .finish,
+                                                         intermediateIndex: 0) })
+      let trips = endPoints.map({ router.createTrip(startPoint: startPoint, endPoint: $0) })
+      if router.currentTrip == nil {
+        preparePreview(trips: trips)
+      } else {
+        showRerouteAlert(trips: trips)
+      }
+    }
+  }
+  
+  func preparePreview(forBookmark bookmark: MWMCarPlayBookmarkObject) {
+    if let router = router,
+      let startPoint = MWMRoutePoint(lastLocationAndType: .start,
+                                      intermediateIndex: 0),
+      let endPoint = MWMRoutePoint(cgPoint: bookmark.mercatorPoint,
+                                   title: bookmark.prefferedName,
+                                   subtitle: bookmark.address,
+                                   type: .finish,
+                                   intermediateIndex: 0) {
+      let trip = router.createTrip(startPoint: startPoint, endPoint: endPoint)
+      if router.currentTrip == nil {
+        preparePreview(trips: [trip])
+      } else {
+        showRerouteAlert(trips: [trip])
+      }
+    }
+  }
+  
+  func preparePreview(trips: [CPTrip]) {
+    let mapTemplate = MapTemplateBuilder.buildTripPreviewTemplate(forTrips: trips)
+    pushTemplate(mapTemplate, animated: false)
+  }
+  
+  func showPreview(mapTemplate: CPMapTemplate, trips: [CPTrip]) {
+    let tripTextConfig = CPTripPreviewTextConfiguration(startButtonTitle: L("trip_start"),
+                                                        additionalRoutesButtonTitle: nil,
+                                                        overviewButtonTitle: nil)
+    mapTemplate.showTripPreviews(trips, textConfiguration: tripTextConfig)
+  }
+  
+  func createEstimates(routeInfo: RouteInfo) -> CPTravelEstimates? {
+    if let distance = Double(routeInfo.targetDistance) {
+      let measurement = Measurement(value: distance,
+                                    unit: routeInfo.targetUnits)
+      let estimates = CPTravelEstimates(distanceRemaining: measurement,
+                                        timeRemaining: routeInfo.timeToTarget)
+      return estimates
+    }
+    return nil
+  }
+  
+  func applyUndefinedEstimates(template: CPMapTemplate, trip: CPTrip) {
+    let measurement = Measurement(value: -1,
+                                  unit: UnitLength.meters)
+    let estimates = CPTravelEstimates(distanceRemaining: measurement,
+                                      timeRemaining: -1)
+    template.updateEstimates(estimates, for: trip)
+  }
+  
+  func showRerouteAlert(trips: [CPTrip]) {
+    let yesAction = CPAlertAction(title: L("redirect_route_yes"), style: .default, handler: { [unowned self] _ in
+      self.router?.cancelTrip()
+      self.updateMapTemplateUIToBase()
+      self.preparedToPreviewTrips = trips
+      self.interfaceController?.dismissTemplate(animated: true)
+    })
+    let noAction = CPAlertAction(title: L("redirect_route_no"), style: .cancel, handler: { [unowned self] _ in
+      self.interfaceController?.dismissTemplate(animated: true)
+    })
+    let alert = CPAlertTemplate(titleVariants: [L("redirect_route_alert")], actions: [noAction, yesAction])
+    alert.userInfo = [CPConstants.TemplateKey.alert: CPConstants.TemplateType.redirectRoute]
+    interfaceController?.presentTemplate(alert, animated: true)
+  }
+  
+  func showKeyboardAlert() {
+    let okAction = CPAlertAction(title: L("ok"), style: .default, handler: { [unowned self] _ in
+      self.interfaceController?.dismissTemplate(animated: true)
+    })
+    let alert = CPAlertTemplate(titleVariants: [L("keyboard_availability_alert")], actions: [okAction])
+    interfaceController?.presentTemplate(alert, animated: true)
+  }
+  
+  func showErrorAlert(code: RouterResultCode, countries: [String]) {
+    var titleVariants = [String]()
+    switch code {
+    case .noCurrentPosition:
+      titleVariants = ["\(L("dialog_routing_check_gps_carplay"))"]
+    case .startPointNotFound:
+      titleVariants = ["\(L("dialog_routing_change_start_carplay"))"]
+    case .endPointNotFound:
+      titleVariants = ["\(L("dialog_routing_change_end_carplay"))"]
+    case .routeNotFoundRedressRouteError, .routeNotFound, .inconsistentMWMandRoute:
+      titleVariants = ["\(L("dialog_routing_unable_locate_route_carplay"))"]
+    case .routeFileNotExist, .fileTooOld, .needMoreMaps, .pointsInDifferentMWM:
+      titleVariants = ["\(L("dialog_routing_download_files_carplay"))"]
+    case .internalError:
+      titleVariants = ["\(L("dialog_routing_system_error_carplay"))"]
+    default:
+      return
+    }
+    
+    let okAction = CPAlertAction(title: L("ok"), style: .cancel, handler: { [unowned self] _ in
+      self.interfaceController?.dismissTemplate(animated: true)
+    })
+    let alert = CPAlertTemplate(titleVariants: titleVariants, actions: [okAction])
+    interfaceController?.presentTemplate(alert, animated: true)
+  }
+  
+  func showRecoverRouteAlert(trip: CPTrip, isTypeCorrect: Bool) {
+    let yesAction = CPAlertAction(title: L("ok"), style: .default, handler: { [unowned self] _ in
+      var info = trip.userInfo as? [String: MWMRoutePoint]
+      
+      if let startPoint = MWMRoutePoint(lastLocationAndType: .start,
+                                        intermediateIndex: 0) {
+        info?[CPConstants.Trip.start] = startPoint
+      }
+      trip.userInfo = info
+      self.preparedToPreviewTrips = [trip]
+      self.router?.updateStartPointAndRebuild(trip: trip)
+      self.interfaceController?.dismissTemplate(animated: true)
+    })
+    let noAction = CPAlertAction(title: L("cancel"), style: .cancel, handler: { [unowned self] _ in
+      self.router?.completeRouteAndRemovePoints()
+      self.interfaceController?.dismissTemplate(animated: true)
+    })
+    let title = isTypeCorrect ? L("dialog_routing_rebuild_from_current_location_carplay") : L("dialog_routing_rebuild_for_vehicle_carplay")
+    let alert = CPAlertTemplate(titleVariants: [title], actions: [noAction, yesAction])
+    alert.userInfo = [CPConstants.TemplateKey.alert: CPConstants.TemplateType.restoreRoute]
+    interfaceController?.presentTemplate(alert, animated: true)
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.h b/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.h
new file mode 100644
index 0000000000..e4976f46c9
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.h
@@ -0,0 +1,13 @@
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MWMCarPlayBookmarkObject : NSObject
+@property(assign, nonatomic, readonly) MWMMarkID bookmarkId;
+@property(strong, nonatomic, readonly) NSString *prefferedName;
+@property(strong, nonatomic, readonly) NSString *address;
+@property(assign, nonatomic, readonly) CLLocationCoordinate2D coordinate;
+@property(assign, nonatomic, readonly) CGPoint mercatorPoint;
+
+- (instancetype)initWithBookmarkId:(MWMMarkID)bookmarkId;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.mm b/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.mm
new file mode 100644
index 0000000000..6386ea8a22
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.mm
@@ -0,0 +1,31 @@
+#import "MWMCarPlayBookmarkObject.h"
+#include "Framework.h"
+#include "geometry/mercator.hpp"
+
+@interface MWMCarPlayBookmarkObject()
+@property(assign, nonatomic, readwrite) MWMMarkID bookmarkId;
+@property(strong, nonatomic, readwrite) NSString *prefferedName;
+@property(strong, nonatomic, readwrite) NSString *address;
+@property(assign, nonatomic, readwrite) CLLocationCoordinate2D coordinate;
+@property(assign, nonatomic, readwrite) CGPoint mercatorPoint;
+@end
+
+@implementation MWMCarPlayBookmarkObject
+
+- (instancetype)initWithBookmarkId:(MWMMarkID)bookmarkId {
+  self = [super init];
+  if (self) {
+    self.bookmarkId = bookmarkId;
+    auto const & bm = GetFramework().GetBookmarkManager();
+    Bookmark const * bookmark = bm.GetBookmark(bookmarkId);
+    self.prefferedName = @(bookmark->GetPreferredName().c_str());
+    auto const pivot = bookmark->GetPivot();
+    self.mercatorPoint = CGPointMake(pivot.x, pivot.y);
+    auto const & address = GetFramework().GetAddressAtPoint(pivot);
+    self.address = @(address.FormatAddress().c_str());
+    auto const location = MercatorBounds::ToLatLon(pivot);
+    self.coordinate = CLLocationCoordinate2DMake(location.m_lat, location.m_lon);
+  }
+  return self;
+}
+@end
diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.h b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.h
new file mode 100644
index 0000000000..a875301cb6
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.h
@@ -0,0 +1,13 @@
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MWMCarPlaySearchResultObject : NSObject
+@property(assign, nonatomic, readonly) NSInteger originalRow;
+@property(strong, nonatomic, readonly) NSString *title;
+@property(strong, nonatomic, readonly) NSString *address;
+@property(assign, nonatomic, readonly) CLLocationCoordinate2D coordinate;
+@property(assign, nonatomic, readonly) CGPoint mercatorPoint;
+
+- (instancetype)initForRow:(NSInteger)row;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm
new file mode 100644
index 0000000000..ff8cd3615a
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm
@@ -0,0 +1,42 @@
+#import "MWMCarPlaySearchResultObject.h"
+#import "MWMSearch.h"
+#include "platform/localization.hpp"
+#include "search/result.hpp"
+#include "map/everywhere_search_callback.hpp"
+
+@interface MWMCarPlaySearchResultObject()
+@property(assign, nonatomic, readwrite) NSInteger originalRow;
+@property(strong, nonatomic, readwrite) NSString *title;
+@property(strong, nonatomic, readwrite) NSString *address;
+@property(assign, nonatomic, readwrite) CLLocationCoordinate2D coordinate;
+@property(assign, nonatomic, readwrite) CGPoint mercatorPoint;
+@end
+
+@implementation MWMCarPlaySearchResultObject
+
+- (instancetype)initForRow:(NSInteger)row {
+  self = [super init];
+  if (self) {
+    self.originalRow = row;
+    NSInteger containerIndex = [MWMSearch containerIndexWithRow:row];
+    MWMSearchItemType type = [MWMSearch resultTypeWithRow:row];
+    if (type == MWMSearchItemTypeRegular) {
+      auto const & result = [MWMSearch resultWithContainerIndex:containerIndex];
+      NSString *localizedTypeName = @"";
+      if (result.GetResultType() == search::Result::Type::Feature) {
+        auto const readableType = classif().GetReadableObjectName(result.GetFeatureType());
+        localizedTypeName = @(platform::GetLocalizedTypeName(readableType).c_str());
+      }
+      self.title = result.GetString().empty() ? localizedTypeName : @(result.GetString().c_str());
+      self.address = @(result.GetAddress().c_str());
+      auto const pivot = result.GetFeatureCenter();
+      self.mercatorPoint = CGPointMake(pivot.x, pivot.y);
+      auto const location = MercatorBounds::ToLatLon(pivot);
+      self.coordinate = CLLocationCoordinate2DMake(location.m_lat, location.m_lon);
+      return self;
+    }
+  }
+  return nil;
+}
+
+@end
diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.h b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.h
new file mode 100644
index 0000000000..1a6f308fc5
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.h
@@ -0,0 +1,17 @@
+NS_ASSUME_NONNULL_BEGIN
+@class MWMCarPlaySearchResultObject;
+
+API_AVAILABLE(ios(12.0))
+NS_SWIFT_NAME(CarPlaySearchService)
+@interface MWMCarPlaySearchService : NSObject
+@property(strong, nonatomic, readonly) NSArray<MWMCarPlaySearchResultObject *> *lastResults;
+
+- (instancetype)init;
+
+- (void)searchText:(NSString *)text
+    forInputLocale:(NSString *)inputLocale
+ completionHandler:(void (^)(NSArray<MWMCarPlaySearchResultObject *> *searchResults))completionHandler;
+- (void)saveLastQuery;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.mm b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.mm
new file mode 100644
index 0000000000..aadb11eab8
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.mm
@@ -0,0 +1,60 @@
+#import "MWMCarPlaySearchService.h"
+#import "MWMCarPlaySearchResultObject.h"
+#import "MWMSearch.h"
+#import <CarPlay/CarPlay.h>
+
+API_AVAILABLE(ios(12.0))
+@interface MWMCarPlaySearchService ()<MWMSearchObserver>
+@property(strong, nonatomic, nullable) void (^completionHandler)(NSArray<MWMCarPlaySearchResultObject *> *searchResults);
+@property(strong, nonatomic, nullable) NSString *lastQuery;
+@property(strong, nonatomic, nullable) NSString *inputLocale;
+@property(strong, nonatomic, readwrite) NSArray<MWMCarPlaySearchResultObject *> *lastResults;
+
+@end
+
+@implementation MWMCarPlaySearchService
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    [MWMSearch addObserver:self];
+    self.lastResults = @[];
+  }
+  return self;
+}
+
+- (void)searchText:(NSString *)text
+    forInputLocale:(NSString *)inputLocale
+ completionHandler:(void (^)(NSArray<MWMCarPlaySearchResultObject *> *searchResults))completionHandler {
+  self.lastQuery = text;
+  self.inputLocale = inputLocale;
+  self.lastResults = @[];
+  self.completionHandler = completionHandler;
+  [MWMSearch searchQuery:text forInputLocale:inputLocale];
+}
+
+- (void)saveLastQuery {
+  if (self.lastQuery != nil && self.inputLocale != nil) {
+    [MWMSearch saveQuery:self.lastQuery forInputLocale:self.inputLocale];
+  }
+}
+
+#pragma mark - MWMSearchObserver
+
+- (void)onSearchCompleted {
+  void (^completionHandler)(NSArray<MWMCarPlaySearchResultObject *> *searchResults) = self.completionHandler;
+  if (completionHandler == nil) { return; }
+  
+  NSMutableArray<MWMCarPlaySearchResultObject *> *results = [NSMutableArray array];
+  NSInteger count = [MWMSearch resultsCount];
+  for (NSInteger row = 0; row < count; row++) {
+    MWMCarPlaySearchResultObject *result = [[MWMCarPlaySearchResultObject alloc] initForRow:row];
+    if (result != nil) { [results addObject:result]; }
+  }
+  
+  self.lastResults = results;
+  completionHandler(results);
+  self.completionHandler = nil;
+}
+
+@end
diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift
new file mode 100644
index 0000000000..9bf3e7d21f
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift	
@@ -0,0 +1,129 @@
+import CarPlay
+
+@available(iOS 12.0, *)
+final class ListTemplateBuilder {
+  enum ListTemplateType {
+    case history
+    case bookmarkLists
+    case bookmarks(category: MWMCategory)
+    case searchResults(results: [MWMCarPlaySearchResultObject])
+  }
+  
+  enum BarButtonType {
+    case bookmarks
+    case search
+  }
+  
+  // MARK: - CPListTemplate bilder
+  class func buildListTemplate(for type: ListTemplateType) -> CPListTemplate {
+    var title = ""
+    var trailingNavigationBarButtons = [CPBarButton]()
+    switch type {
+    case .history:
+      title = L("pick_destination")
+      let bookmarksButton = buildBarButton(type: .bookmarks) { _ in
+        let listTemplate = ListTemplateBuilder.buildListTemplate(for: .bookmarkLists)
+        CarPlayService.shared.pushTemplate(listTemplate, animated: true)
+      }
+      let searchButton = buildBarButton(type: .search) { _ in
+        if CarPlayService.shared.isKeyboardLimited {
+          CarPlayService.shared.showKeyboardAlert()
+        } else {
+          let searchTemplate = SearchTemplateBuilder.buildSearchTemplate()
+          CarPlayService.shared.pushTemplate(searchTemplate, animated: true)
+        }
+      }
+      trailingNavigationBarButtons = [searchButton, bookmarksButton]
+    case .bookmarkLists:
+      title = L("bookmarks")
+    case .searchResults:
+      title = L("search_results")
+    case .bookmarks(let category):
+      title = category.title
+    }
+    let template = CPListTemplate(title: title, sections: [])
+    template.trailingNavigationBarButtons = trailingNavigationBarButtons
+    obtainResources(for: type, template: template)
+    return template
+  }
+  
+  private class func obtainResources(for type: ListTemplateType, template: CPListTemplate) {
+    switch type {
+    case .history:
+      obtainHistory(template: template)
+    case .bookmarks(let category):
+      obtainBookmarks(template: template, categoryId: category.categoryId)
+    case .bookmarkLists:
+      obtainCategories(template: template)
+    case .searchResults(let results):
+      convertSearchResults(results, template: template)
+    }
+  }
+  
+  private class func obtainHistory(template: CPListTemplate) {
+    let searchQueries = FrameworkHelper.obtainLastSearchQueries() ?? []
+    let items = searchQueries.map({ (text) -> CPListItem in
+      let item = CPListItem(text: text, detailText: nil, image: UIImage(named: "ic_carplay_recent"))
+      item.userInfo = ListItemInfo(type: CPConstants.ListItemType.history,
+                                   metadata: nil)
+      return item
+    })
+    let section = CPListSection(items: items)
+    template.updateSections([section])
+  }
+  
+  private class func obtainCategories(template: CPListTemplate) {
+    let bookmarkManager = MWMBookmarksManager.shared()
+    let categories = bookmarkManager.userCategories()
+    let items: [CPListItem] = categories.compactMap({ category in
+      if category.bookmarksCount == 0 { return nil }
+      let placesString = String(format: L("bookmarks_places"), category.bookmarksCount)
+      let item = CPListItem(text: category.title, detailText: placesString)
+      item.userInfo = ListItemInfo(type: CPConstants.ListItemType.bookmarkLists,
+                                   metadata: CategoryInfo(category: category))
+      return item
+    })
+    let section = CPListSection(items: items)
+    template.updateSections([section])
+  }
+  
+  private class func obtainBookmarks(template: CPListTemplate, categoryId: MWMMarkGroupID) {
+    let bookmarkManager = MWMBookmarksManager.shared()
+    let bookmarks = bookmarkManager.bookmarks(forCategory: categoryId)
+    let items = bookmarks.map({ (bookmark) -> CPListItem in
+      let item = CPListItem(text: bookmark.prefferedName, detailText: bookmark.address)
+      item.userInfo = ListItemInfo(type: CPConstants.ListItemType.bookmarks,
+                                   metadata: BookmarkInfo(categoryId: categoryId,
+                                                          bookmarkId: bookmark.bookmarkId))
+      return item
+    })
+    let section = CPListSection(items: items)
+    template.updateSections([section])
+  }
+  
+  private class func convertSearchResults(_ results: [MWMCarPlaySearchResultObject], template: CPListTemplate) {
+    var items = [CPListItem]()
+    for object in results {
+      let item = CPListItem(text: object.title, detailText: object.address)
+      item.userInfo = ListItemInfo(type: CPConstants.ListItemType.searchResults,
+                                   metadata: SearchResultInfo(originalRow: object.originalRow))
+      items.append(item)
+    }
+    let section = CPListSection(items: items)
+    template.updateSections([section])
+  }
+  
+  // MARK: - CPBarButton builder
+  private class func buildBarButton(type: BarButtonType, action: ((CPBarButton) -> Void)?) -> CPBarButton {
+    switch type {
+    case .bookmarks:
+      let button = CPBarButton(type: .image, handler: action)
+      button.image = UIImage(named: "ic_carplay_bookmark")
+      return button
+    case .search:
+      let button = CPBarButton(type: .image, handler: action)
+      button.image = UIImage(named: "ic_carplay_keyboard")
+      return button
+    }
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift
new file mode 100644
index 0000000000..76f8baf8bd
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift	
@@ -0,0 +1,197 @@
+import CarPlay
+
+@available(iOS 12.0, *)
+final class MapTemplateBuilder {
+  enum MapButtonType {
+    case startPanning
+    case zoomIn
+    case zoomOut
+  }
+  enum BarButtonType {
+    case dismissPaning
+    case destination
+    case recenter
+    case settings
+    case mute
+    case unmute
+    case redirectRoute
+    case endRoute
+  }
+  // MARK: - CPMapTemplate builders
+  class func buildBaseTemplate(positionMode: MWMMyPositionMode) -> CPMapTemplate {
+    let mapTemplate = CPMapTemplate()
+    mapTemplate.hidesButtonsWithNavigationBar = false
+    configureBaseUI(mapTemplate: mapTemplate)
+    if positionMode == .pendingPosition {
+      mapTemplate.leadingNavigationBarButtons = []
+    } else if positionMode == .follow || positionMode == .followAndRotate {
+      setupDestinationButton(mapTemplate: mapTemplate)
+    } else {
+      setupRecenterButton(mapTemplate: mapTemplate)
+    }
+    return mapTemplate
+  }
+  
+  class func buildNavigationTemplate() -> CPMapTemplate {
+    let mapTemplate = CPMapTemplate()
+    mapTemplate.hidesButtonsWithNavigationBar = false
+    configureNavigationUI(mapTemplate: mapTemplate)
+    return mapTemplate
+  }
+  
+  class func buildTripPreviewTemplate(forTrips trips: [CPTrip]) -> CPMapTemplate {
+    let mapTemplate = CPMapTemplate()
+    mapTemplate.userInfo = MapInfo(type: CPConstants.TemplateType.preview, trips: trips)
+    mapTemplate.mapButtons = []
+    mapTemplate.leadingNavigationBarButtons = []
+    let settingsButton = buildBarButton(type: .settings) { _ in
+      mapTemplate.userInfo = MapInfo(type: CPConstants.TemplateType.previewSettings)
+      let gridTemplate = SettingsTemplateBuilder.buildGridTemplate()
+      CarPlayService.shared.pushTemplate(gridTemplate, animated: true)
+    }
+    mapTemplate.trailingNavigationBarButtons = [settingsButton]
+    return mapTemplate
+  }
+  
+  // MARK: - MapTemplate UI configs
+  class func configureBaseUI(mapTemplate: CPMapTemplate) {
+    mapTemplate.userInfo = MapInfo(type: CPConstants.TemplateType.main)
+    let panningButton = buildMapButton(type: .startPanning) { _ in
+      mapTemplate.showPanningInterface(animated: true)
+    }
+    let zoomInButton = buildMapButton(type: .zoomIn) { _ in
+      FrameworkHelper.zoomMap(.in)
+    }
+    let zoomOutButton = buildMapButton(type: .zoomOut) { _ in
+      FrameworkHelper.zoomMap(.out)
+    }
+    mapTemplate.mapButtons = [panningButton, zoomInButton, zoomOutButton]
+    
+    let settingsButton = buildBarButton(type: .settings) { _ in
+      let gridTemplate = SettingsTemplateBuilder.buildGridTemplate()
+      CarPlayService.shared.pushTemplate(gridTemplate, animated: true)
+    }
+    mapTemplate.trailingNavigationBarButtons = [settingsButton]
+  }
+  
+  class func configurePanUI(mapTemplate: CPMapTemplate) {
+    let zoomInButton = buildMapButton(type: .zoomIn) { _ in
+      FrameworkHelper.zoomMap(.in)
+    }
+    let zoomOutButton = buildMapButton(type: .zoomOut) { _ in
+      FrameworkHelper.zoomMap(.out)
+    }
+    mapTemplate.mapButtons = [zoomInButton, zoomOutButton]
+    
+    let doneButton = buildBarButton(type: .dismissPaning) { _ in
+      mapTemplate.dismissPanningInterface(animated: true)
+    }
+    mapTemplate.leadingNavigationBarButtons = []
+    mapTemplate.trailingNavigationBarButtons = [doneButton]
+  }
+  
+  class func configureNavigationUI(mapTemplate: CPMapTemplate) {
+    mapTemplate.userInfo = MapInfo(type: CPConstants.TemplateType.navigation)
+    let panningButton = buildMapButton(type: .startPanning) { _ in
+      mapTemplate.showPanningInterface(animated: true)
+    }
+    mapTemplate.mapButtons = [panningButton]
+    setupMuteAndRedirectButtons(template: mapTemplate)
+    let endButton = buildBarButton(type: .endRoute) { _ in
+      CarPlayService.shared.cancelCurrentTrip()
+    }
+    mapTemplate.trailingNavigationBarButtons = [endButton]
+  }
+  
+  // MARK: - Conditional navigation buttons
+  class func setupDestinationButton(mapTemplate: CPMapTemplate) {
+    let destinationButton = buildBarButton(type: .destination) { _ in
+      let listTemplate = ListTemplateBuilder.buildListTemplate(for: .history)
+      CarPlayService.shared.pushTemplate(listTemplate, animated: true)
+    }
+    mapTemplate.leadingNavigationBarButtons = [destinationButton]
+  }
+  
+  class func setupRecenterButton(mapTemplate: CPMapTemplate) {
+    let recenterButton = buildBarButton(type: .recenter) { _ in
+      FrameworkHelper.switchMyPositionMode()
+    }
+    mapTemplate.leadingNavigationBarButtons = [recenterButton]
+  }
+  
+  private class func setupMuteAndRedirectButtons(template: CPMapTemplate) {
+    let muteButton = buildBarButton(type: .mute) { _ in
+      MWMTextToSpeech.setTTSEnabled(false)
+      setupUnmuteAndRedirectButtons(template: template)
+    }
+    let redirectButton = buildBarButton(type: .redirectRoute) { _ in
+      let listTemplate = ListTemplateBuilder.buildListTemplate(for: .history)
+      CarPlayService.shared.pushTemplate(listTemplate, animated: true)
+    }
+    template.leadingNavigationBarButtons = [muteButton, redirectButton]
+  }
+  
+  private class func setupUnmuteAndRedirectButtons(template: CPMapTemplate) {
+    let unmuteButton = buildBarButton(type: .unmute) { _ in
+      MWMTextToSpeech.setTTSEnabled(true)
+      setupMuteAndRedirectButtons(template: template)
+    }
+    let redirectButton = buildBarButton(type: .redirectRoute) { _ in
+      let listTemplate = ListTemplateBuilder.buildListTemplate(for: .history)
+      CarPlayService.shared.pushTemplate(listTemplate, animated: true)
+    }
+    template.leadingNavigationBarButtons = [unmuteButton, redirectButton]
+  }
+  
+  // MARK: - CPMapButton builder
+  private class func buildMapButton(type: MapButtonType, action: ((CPMapButton) -> Void)?) -> CPMapButton {
+    let button = CPMapButton(handler: action)
+    switch type {
+    case .startPanning:
+      button.image = UIImage(named: "btn_carplay_pan_light")
+    case .zoomIn:
+      button.image = UIImage(named: "btn_zoom_in_light")
+    case .zoomOut:
+      button.image = UIImage(named: "btn_zoom_out_light")
+    }
+    return button
+  }
+  
+  // MARK: - CPBarButton builder
+  private class func buildBarButton(type: BarButtonType, action: ((CPBarButton) -> Void)?) -> CPBarButton {
+    switch type {
+    case .dismissPaning:
+      let button = CPBarButton(type: .text, handler: action)
+      button.title = L("done")
+      return button
+    case .destination:
+      let button = CPBarButton(type: .text, handler: action)
+      button.title = L("pick_destination")
+      return button
+    case .recenter:
+      let button = CPBarButton(type: .text, handler: action)
+      button.title = L("follow_my_position")
+      return button
+    case .settings:
+      let button = CPBarButton(type: .image, handler: action)
+      button.image = UIImage(named: "ic_carplay_settings")
+      return button
+    case .mute:
+      let button = CPBarButton(type: .image, handler: action)
+      button.image = UIImage(named: "ic_carplay_unmuted")
+      return button
+    case .unmute:
+      let button = CPBarButton(type: .image, handler: action)
+      button.image = UIImage(named: "ic_carplay_muted")
+      return button
+    case .redirectRoute:
+      let button = CPBarButton(type: .image, handler: action)
+      button.image = UIImage(named: "ic_carplay_redirect_route")
+      return button
+    case .endRoute:
+      let button = CPBarButton(type: .text, handler: action)
+      button.title = L("navigation_stop_button").capitalized
+      return button
+    }
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/SearchTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/SearchTemplateBuilder.swift
new file mode 100644
index 0000000000..7554896a10
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/SearchTemplateBuilder.swift	
@@ -0,0 +1,10 @@
+import CarPlay
+
+@available(iOS 12.0, *)
+final class SearchTemplateBuilder {
+  // MARK: - CPSearchTemplate builder
+  class func buildSearchTemplate() -> CPSearchTemplate {
+    let template = CPSearchTemplate()
+    return template
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift
new file mode 100644
index 0000000000..15286cc9da
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift	
@@ -0,0 +1,86 @@
+import CarPlay
+
+@available(iOS 12.0, *)
+final class SettingsTemplateBuilder {
+  // MARK: - CPGridTemplate builder
+  class func buildGridTemplate() -> CPGridTemplate {
+    let actions = SettingsTemplateBuilder.buildGridButtons()
+    let gridTemplate = CPGridTemplate(title: L("settings"),
+                                      gridButtons: actions)
+    
+    return gridTemplate
+  }
+  
+  private class func buildGridButtons() -> [CPGridButton] {
+    let options = RoutingOptions()
+    return [createUnpavedButton(options: options),
+            createTollButton(options: options),
+            createFerryButton(options: options),
+            createTrafficButton(),
+            createSpeedcamButton()]
+  }
+  
+  // MARK: - CPGridButton builders
+  private class func createTollButton(options: RoutingOptions) -> CPGridButton {
+    var tollIconName = "ic_carplay_toll"
+    if options.avoidToll { tollIconName += "_active" }
+    let tollButton = CPGridButton(titleVariants: [L("avoid_tolls")],
+                                  image: UIImage(named: tollIconName)!) { _ in
+                                    options.avoidToll = !options.avoidToll
+                                    options.save()
+                                    CarPlayService.shared.updateRouteAfterChangingSettings()
+                                    CarPlayService.shared.popTemplate(animated: true)
+    }
+    return tollButton
+  }
+  
+  private class func createUnpavedButton(options: RoutingOptions) -> CPGridButton {
+    var unpavedIconName = "ic_carplay_unpaved"
+    if options.avoidDirty { unpavedIconName += "_active" }
+    let unpavedButton = CPGridButton(titleVariants: [L("avoid_unpaved")],
+                                     image: UIImage(named: unpavedIconName)!) { _ in
+                                      options.avoidDirty = !options.avoidDirty
+                                      options.save()
+                                      CarPlayService.shared.updateRouteAfterChangingSettings()
+                                      CarPlayService.shared.popTemplate(animated: true)
+    }
+    return unpavedButton
+  }
+  
+  private class func createFerryButton(options: RoutingOptions) -> CPGridButton {
+    var ferryIconName = "ic_carplay_ferry"
+    if options.avoidFerry { ferryIconName += "_active" }
+    let ferryButton = CPGridButton(titleVariants: [L("avoid_ferry")],
+                                   image: UIImage(named: ferryIconName)!) { _ in
+                                    options.avoidFerry = !options.avoidFerry
+                                    options.save()
+                                    CarPlayService.shared.updateRouteAfterChangingSettings()
+                                    CarPlayService.shared.popTemplate(animated: true)
+    }
+    return ferryButton
+  }
+  
+  private class func createTrafficButton() -> CPGridButton {
+    var trafficIconName = "ic_carplay_trafficlight"
+    let isTrafficEnabled = MWMTrafficManager.trafficEnabled()
+    if isTrafficEnabled { trafficIconName += "_active" }
+    let trafficButton = CPGridButton(titleVariants: [L("button_layer_traffic")],
+                                     image: UIImage(named: trafficIconName)!) { _ in
+                                      MWMTrafficManager.setTrafficEnabled(!isTrafficEnabled)
+                                      CarPlayService.shared.popTemplate(animated: true)
+    }
+    return trafficButton
+  }
+  
+  private class func createSpeedcamButton() -> CPGridButton {
+    var speedcamIconName = "ic_carplay_speedcam"
+    let isSpeedCamActivated = CarPlayService.shared.isSpeedCamActivated
+    if isSpeedCamActivated { speedcamIconName += "_active" }
+    let speedButton = CPGridButton(titleVariants: [L("speedcams_alert_title")],
+                                   image: UIImage(named: speedcamIconName)!) { _ in
+                                    CarPlayService.shared.isSpeedCamActivated = !isSpeedCamActivated
+                                    CarPlayService.shared.popTemplate(animated: true)
+    }
+    return speedButton
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/Templates Data/BookmarkInfo.swift b/iphone/Maps/Classes/CarPlay/Templates Data/BookmarkInfo.swift
new file mode 100644
index 0000000000..f37d4df31b
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Templates Data/BookmarkInfo.swift	
@@ -0,0 +1,9 @@
+struct BookmarkInfo: InfoMetadata {
+  let categoryId: UInt64
+  let bookmarkId: UInt64
+
+  init(categoryId: UInt64, bookmarkId: UInt64) {
+    self.categoryId = categoryId
+    self.bookmarkId = bookmarkId
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/Templates Data/CategoryInfo.swift b/iphone/Maps/Classes/CarPlay/Templates Data/CategoryInfo.swift
new file mode 100644
index 0000000000..0d5254eb02
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Templates Data/CategoryInfo.swift	
@@ -0,0 +1,7 @@
+struct CategoryInfo: InfoMetadata {
+  let category: MWMCategory
+  
+  init(category: MWMCategory) {
+    self.category = category
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/Templates Data/ListItemInfo.swift b/iphone/Maps/Classes/CarPlay/Templates Data/ListItemInfo.swift
new file mode 100644
index 0000000000..60f1513212
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Templates Data/ListItemInfo.swift	
@@ -0,0 +1,13 @@
+@available(iOS 12.0, *)
+protocol InfoMetadata {}
+
+@available(iOS 12.0, *)
+struct ListItemInfo {
+  let type: String
+  let metadata: InfoMetadata?
+  
+  init(type: String, metadata: InfoMetadata?) {
+    self.type = type
+    self.metadata = metadata
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/Templates Data/MapInfo.swift b/iphone/Maps/Classes/CarPlay/Templates Data/MapInfo.swift
new file mode 100644
index 0000000000..2940a09d14
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Templates Data/MapInfo.swift	
@@ -0,0 +1,10 @@
+@available(iOS 12.0, *)
+struct MapInfo {
+  let type: String
+  let trips: [CPTrip]?
+  
+  init(type: String, trips: [CPTrip]? = nil) {
+    self.type = type
+    self.trips = trips
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/Templates Data/RouteInfo.swift b/iphone/Maps/Classes/CarPlay/Templates Data/RouteInfo.swift
new file mode 100644
index 0000000000..3180c815e5
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Templates Data/RouteInfo.swift	
@@ -0,0 +1,50 @@
+@objc(MWMRouteInfo)
+class RouteInfo: NSObject {
+  let timeToTarget: TimeInterval
+  let targetDistance: String
+  let targetUnits: UnitLength
+  let distanceToTurn: String
+  let streetName: String
+  let turnUnits: UnitLength
+  let turnImageName: String?
+  let nextTurnImageName: String?
+  let speed: Int
+  let roundExitNumber: Int
+  
+  @objc init(timeToTarget: TimeInterval,
+             targetDistance: String,
+             targetUnits: String,
+             distanceToTurn: String,
+             streetName: String,
+             turnUnits: String,
+             turnImageName: String?,
+             nextTurnImageName: String?,
+             speed: Int,
+             roundExitNumber: Int) {
+    self.timeToTarget = timeToTarget
+    self.targetDistance = targetDistance
+    self.targetUnits = RouteInfo.unitLength(for: targetUnits)
+    self.distanceToTurn = distanceToTurn
+    self.streetName = streetName;
+    self.turnUnits = RouteInfo.unitLength(for: turnUnits)
+    self.turnImageName = turnImageName
+    self.nextTurnImageName = nextTurnImageName
+    self.speed = speed
+    self.roundExitNumber = roundExitNumber
+  }
+  
+  class func unitLength(for targetUnits: String) -> UnitLength {
+    switch targetUnits {
+    case "mi":
+      return .miles
+    case "ft":
+      return .feet
+    case "km":
+      return .kilometers
+    case "m":
+      return .meters
+    default:
+      return .meters
+    }
+  }
+}
diff --git a/iphone/Maps/Classes/CarPlay/Templates Data/SearchResultInfo.swift b/iphone/Maps/Classes/CarPlay/Templates Data/SearchResultInfo.swift
new file mode 100644
index 0000000000..1b22ec10f9
--- /dev/null
+++ b/iphone/Maps/Classes/CarPlay/Templates Data/SearchResultInfo.swift	
@@ -0,0 +1,7 @@
+struct SearchResultInfo: InfoMetadata {
+  let originalRow: Int
+  
+  init(originalRow: Int) {
+    self.originalRow = originalRow
+  }
+}
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
index 47ade4c694..4c7346a91a 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -288,7 +288,7 @@ extern NSString * const kAlohalyticsTapEventKey;
 - (MWMSideButtons *)sideButtons
 {
   if (!_sideButtons)
-    _sideButtons = [[MWMSideButtons alloc] initWithParentView:self.ownerController.view];
+    _sideButtons = [[MWMSideButtons alloc] initWithParentView:self.ownerController.controlsView];
   return _sideButtons;
 }
 
@@ -319,7 +319,7 @@ extern NSString * const kAlohalyticsTapEventKey;
 {
   if (!_navigationManager)
     _navigationManager =
-        [[MWMNavigationDashboardManager alloc] initWithParentView:self.ownerController.view];
+        [[MWMNavigationDashboardManager alloc] initWithParentView:self.ownerController.controlsView];
   return _navigationManager;
 }
 
@@ -450,7 +450,7 @@ extern NSString * const kAlohalyticsTapEventKey;
   [ownerController addChildViewController:self.tutorialViewContoller];
   self.tutorialViewContoller.view.frame = ownerController.view.bounds;
   self.tutorialViewContoller.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-  [ownerController.view addSubview:self.tutorialViewContoller.view];
+  [ownerController.controlsView addSubview:self.tutorialViewContoller.view];
   [self.tutorialViewContoller didMoveToParentViewController:ownerController];
 }
 
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
index 88091b0926..eb35d6fcf1 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
@@ -54,7 +54,7 @@ NSArray<UIImage *> * imagesWithName(NSString * name)
   {
     MapViewController * ovc = [MapViewController sharedController];
     [ovc addChildViewController:self];
-    [ovc.view addSubview:self.view];
+    [ovc.controlsView addSubview:self.view];
     [self configLayout];
     [self refreshAppearance];
     [MWMTrafficManager addObserver:self];
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
index f47e9778a2..0cb51a0a82 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
@@ -49,7 +49,7 @@
 - (NSString *)speedUnits
 {
   auto const units = coreUnits([MWMSettings measurementUnits]);
-  return @(measurement_utils::FormatSpeedUnits(units).c_str());
+  return [self localizedUnitSpeed:@(measurement_utils::FormatSpeedUnits(units).c_str())];
 }
 
 - (NSString *)eta { return [NSDateComponentsFormatter etaStringFrom:self.timeToTarget]; }
@@ -70,4 +70,13 @@
   return [[NSAttributedString alloc] initWithString:@" • " attributes:attributes];
 }
 
+- (NSString *)localizedUnitSpeed:(NSString *)speedUnits {
+  if ([speedUnits isEqualToString:@"mph"]) {
+    return L(@"miles_per_hour");
+  } else if ([speedUnits isEqualToString:@"km/h"]) {
+    return L(@"kilometers_per_hour");
+  }
+  return speedUnits;
+}
+
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
index 357a75858e..67642846c7 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
@@ -135,10 +135,10 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
     entity.isValid = YES;
     entity.timeToTarget = info.m_time;
     entity.targetDistance = @(info.m_distToTarget.c_str());
-    entity.targetUnits = @(info.m_targetUnitsSuffix.c_str());
+    entity.targetUnits = [self localizedUnitLength:@(info.m_targetUnitsSuffix.c_str())];
     entity.progress = info.m_completionPercent;
     entity.distanceToTurn = @(info.m_distToTurn.c_str());
-    entity.turnUnits = @(info.m_turnUnitsSuffix.c_str());
+    entity.turnUnits = [self localizedUnitLength:@(info.m_turnUnitsSuffix.c_str())];
     entity.streetName = @(info.m_displayedStreetName.c_str());
     entity.nextTurnImage = image(info.m_nextTurn, true);
 
@@ -178,4 +178,17 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
   [self onNavigationInfoUpdated];
 }
 
+- (NSString *)localizedUnitLength:(NSString *)targetUnits {
+  if ([targetUnits isEqualToString:@"mi"]) {
+    return L(@"mile");
+  } else if ([targetUnits isEqualToString:@"km"]) {
+    return L(@"kilometer");
+  } else if ([targetUnits isEqualToString:@"ft"]) {
+    return L(@"foot");
+  } else if ([targetUnits isEqualToString:@"m"]) {
+    return L(@"meter");
+  }
+  return targetUnits;
+}
+
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm
index ab387acfa4..2e9e825697 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm
@@ -18,6 +18,7 @@ static CGFloat const kDrivingOptionsHeight = 48;
 @interface MWMRoutePreview ()<MWMCircularProgressProtocol>
 
 @property(nonatomic) BOOL isVisible;
+@property(nonatomic) BOOL actualVisibilityValue;
 @property(weak, nonatomic) IBOutlet UIButton * backButton;
 @property(weak, nonatomic) IBOutlet UIView * bicycle;
 @property(weak, nonatomic) IBOutlet UIView * contentView;
@@ -38,6 +39,7 @@ static CGFloat const kDrivingOptionsHeight = 48;
 - (void)awakeFromNib
 {
   [super awakeFromNib];
+  self.actualVisibilityValue = NO;
   self.translatesAutoresizingMaskIntoConstraints = NO;
   [self setupProgresses];
   [self.backButton matchInterfaceOrientation];
@@ -174,12 +176,16 @@ static CGFloat const kDrivingOptionsHeight = 48;
     return;
   [superview addSubview:self];
   [self setupConstraints];
+  self.actualVisibilityValue = YES;
   dispatch_async(dispatch_get_main_queue(), ^{
     self.isVisible = YES;
   });
 }
 
-- (void)remove { self.isVisible = NO; }
+- (void)remove {
+  self.actualVisibilityValue = NO;
+  self.isVisible = NO;
+}
 
 - (void)setupConstraints {}
 
@@ -209,6 +215,7 @@ static CGFloat const kDrivingOptionsHeight = 48;
 
 - (void)setIsVisible:(BOOL)isVisible
 {
+  if (isVisible != self.actualVisibilityValue) { return; }
   _isVisible = isVisible;
   auto sv = self.superview;
   [sv setNeedsLayout];
diff --git a/iphone/Maps/Classes/EAGLView.h b/iphone/Maps/Classes/EAGLView.h
index 72ab0df68d..c8c49cc757 100644
--- a/iphone/Maps/Classes/EAGLView.h
+++ b/iphone/Maps/Classes/EAGLView.h
@@ -1,34 +1,22 @@
-#include "drape/pointers.hpp"
-#include "drape/drape_global.hpp"
-
 @class MWMMapWidgets;
 
-namespace dp
-{
-  class GraphicsContextFactory;
-}
-
 // This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass.
 // The view content is basically an EAGL surface you render your OpenGL scene into.
 // Note that setting the view non-opaque will only work if the EAGL surface has an alpha channel.
 @interface EAGLView : UIView
-{
-  dp::ApiVersion m_apiVersion;
-  drape_ptr<dp::GraphicsContextFactory> m_factory;
-  // Do not call onSize from layoutSubViews when real size wasn't changed.
-  // It's possible when we add/remove subviews (bookmark balloons) and it hangs the map without this check
-  CGRect m_lastViewSize;
-  bool m_presentAvailable;
-}
+
 
 @property(nonatomic) MWMMapWidgets * widgetsManager;
 
 @property(nonatomic, readonly) BOOL drapeEngineCreated;
 @property(nonatomic, getter=isLaunchByDeepLink) BOOL launchByDeepLink;
-@property(nonatomic, readonly) m2::PointU pixelSize;
+@property(nonatomic, readonly) CGSize pixelSize;
+@property(nonatomic, readonly) BOOL graphicContextInitialized;
 
 - (void)createDrapeEngine;
 - (void)deallocateNative;
 - (void)setPresentAvailable:(BOOL)available;
+- (void)updateVisualScaleTo:(CGFloat)visualScale;
+- (void)updateVisualScaleToMain;
 
 @end
diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm
index b195d17007..72fbbbe8d0 100644
--- a/iphone/Maps/Classes/EAGLView.mm
+++ b/iphone/Maps/Classes/EAGLView.mm
@@ -5,19 +5,39 @@
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
-#include "Framework.h"
-
-#include "drape/drape_global.hpp"
-#include "drape/visual_scale.hpp"
-
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 
+#include "drape/drape_global.hpp"
+#include "drape/pointers.hpp"
+#include "drape/visual_scale.hpp"
+#include "drape_frontend/visual_params.hpp"
+
+#include "Framework.h"
+
 #ifdef OMIM_METAL_AVAILABLE
 #import "MetalContextFactory.h"
 #import <MetalKit/MetalKit.h>
 #endif
 
+namespace dp
+{
+  class GraphicsContextFactory;
+}
+
+@interface EAGLView()
+{
+  dp::ApiVersion m_apiVersion;
+  drape_ptr<dp::GraphicsContextFactory> m_factory;
+  // Do not call onSize from layoutSubViews when real size wasn't changed.
+  // It's possible when we add/remove subviews (bookmark balloons) and it hangs the map without this check
+  CGRect m_lastViewSize;
+  bool m_presentAvailable;
+  double main_visualScale;
+}
+@property(nonatomic, readwrite) BOOL graphicContextInitialized;
+@end
+
 @implementation EAGLView
 
 namespace
@@ -119,11 +139,16 @@ double getExactDPI(double contentScaleFactor)
     layer.drawableProperties = @{kEAGLDrawablePropertyRetainedBacking : @NO,
                                  kEAGLDrawablePropertyColorFormat : kEAGLColorFormatRGBA8};
   }
+  auto & f = GetFramework();
+  f.SetGraphicsContextInitializationHandler([self]() {
+    self.graphicContextInitialized = YES;
+  });
 }
 
 - (void)createDrapeEngine
 {
-  m2::PointU const s = [self pixelSize];
+  CGSize const objcSize = [self pixelSize];
+  m2::PointU const s = m2::PointU(static_cast<uint32_t>(objcSize.width), static_cast<uint32_t>(objcSize.height));
   
   if (m_apiVersion == dp::ApiVersion::Metal)
   {
@@ -172,12 +197,13 @@ double getExactDPI(double contentScaleFactor)
   }
 }
 
-- (m2::PointU)pixelSize
+- (CGSize)pixelSize
 {
   CGSize const s = self.bounds.size;
-  uint32_t const w = static_cast<uint32_t>(s.width * self.contentScaleFactor);
-  uint32_t const h = static_cast<uint32_t>(s.height * self.contentScaleFactor);
-  return m2::PointU(w, h);
+  
+  CGFloat const w = s.width * self.contentScaleFactor;
+  CGFloat const h = s.height * self.contentScaleFactor;
+  return CGSizeMake(w, h);
 }
 
 - (void)layoutSubviews
@@ -185,9 +211,10 @@ double getExactDPI(double contentScaleFactor)
   if (!CGRectEqualToRect(m_lastViewSize, self.frame))
   {
     m_lastViewSize = self.frame;
-    m2::PointU const s = [self pixelSize];
+    CGSize const objcSize = [self pixelSize];
+    m2::PointU const s = m2::PointU(static_cast<uint32_t>(objcSize.width), static_cast<uint32_t>(objcSize.height));
     GetFramework().OnSize(s.x, s.y);
-    [self.widgetsManager resize:CGSizeMake(s.x, s.y)];
+    [self.widgetsManager resize:objcSize];
   }
   [super layoutSubviews];
 }
@@ -212,4 +239,13 @@ double getExactDPI(double contentScaleFactor)
   return _widgetsManager;
 }
 
+- (void)updateVisualScaleTo:(CGFloat)visualScale {
+  main_visualScale = df::VisualParams::Instance().GetVisualScale();
+  GetFramework().UpdateVisualScale(visualScale);
+}
+
+- (void)updateVisualScaleToMain {
+  GetFramework().UpdateVisualScale(main_visualScale);
+}
+
 @end
diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h
index adeff36977..c9faab78d5 100644
--- a/iphone/Maps/Classes/MapViewController.h
+++ b/iphone/Maps/Classes/MapViewController.h
@@ -1,14 +1,19 @@
 #import "MWMMapDownloaderMode.h"
 #import "MWMViewController.h"
+#import "MWMMyPositionMode.h"
 
 @class MWMWelcomePageController;
 @class MWMMapViewControlsManager;
 @class MWMAPIBar;
 @class MWMPlacePageData;
+@class EAGLView;
+@protocol MWMLocationModeListener;
 
 @interface MapViewController : MWMViewController
 
 + (MapViewController *)sharedController;
+- (void)addListener:(id<MWMLocationModeListener>)listener;
+- (void)removeListener:(id<MWMLocationModeListener>)listener;
 
 // called when app is terminated by system
 - (void)onTerminate;
@@ -38,9 +43,16 @@
 + (void)setViewport:(double)lat lon:(double)lon zoomLevel:(int)zoomlevel;
 
 - (void)initialize;
+- (void)enableCarPlayRepresentation;
+- (void)disableCarPlayRepresentation;
 
 @property(nonatomic, readonly) MWMMapViewControlsManager * controlsManager;
 @property(nonatomic) MWMAPIBar * apiBar;
 @property(nonatomic) MWMWelcomePageController * welcomePageController;
 
+
+@property(nonatomic) MWMMyPositionMode currentPositionMode;
+@property(strong, nonatomic) IBOutlet EAGLView * _Nonnull mapView;
+@property(strong, nonatomic) IBOutlet UIView * _Nonnull controlsView;
+
 @end
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index cf9b85552c..9ed79f9e74 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -18,6 +18,7 @@
 #import "MWMPlacePageProtocol.h"
 #import "MapsAppDelegate.h"
 #import "SwiftBridge.h"
+#import "MWMLocationModeListener.h"
 
 #include "Framework.h"
 
@@ -93,15 +94,19 @@ BOOL gIsFirstMyPositionMode = YES;
 
 @property(nonatomic) BOOL skipForceTouch;
 
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint * visibleAreaBottom;
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint * visibleAreaKeyboard;
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint * placePageAreaKeyboard;
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint * sideButtonsAreaBottom;
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint * sideButtonsAreaKeyboard;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint * visibleAreaBottom;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint * visibleAreaKeyboard;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint * placePageAreaKeyboard;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint * sideButtonsAreaBottom;
+@property(strong, nonatomic) IBOutlet NSLayoutConstraint * sideButtonsAreaKeyboard;
+@property(strong, nonatomic) IBOutlet UILabel * carplayPlaceholderLabel;
+
+@property(strong, nonatomic) NSHashTable<id<MWMLocationModeListener>> *listeners;
 
 @end
 
 @implementation MapViewController
+@synthesize mapView, controlsView;
 
 + (MapViewController *)sharedController { return [MapsAppDelegate theApp].mapViewController; }
 
@@ -150,11 +155,14 @@ BOOL gIsFirstMyPositionMode = YES;
           withTouches:(NSSet *)touches
              andEvent:(UIEvent *)event
 {
+  if (@available(iOS 12.0, *)) {
+    if ([MWMCarPlayService shared].isCarplayActivated) { return; }
+  }
   NSArray * allTouches = [[event allTouches] allObjects];
   if ([allTouches count] < 1)
     return;
 
-  UIView * v = self.view;
+  UIView * v = self.mapView;
   CGFloat const scaleFactor = v.contentScaleFactor;
 
   df::TouchEvent e;
@@ -236,8 +244,8 @@ BOOL gIsFirstMyPositionMode = YES;
   [super didReceiveMemoryWarning];
 }
 
-- (void)onTerminate { [(EAGLView *)self.view deallocateNative]; }
-- (void)onGetFocus:(BOOL)isOnFocus { [(EAGLView *)self.view setPresentAvailable:isOnFocus]; }
+- (void)onTerminate { [self.mapView deallocateNative]; }
+- (void)onGetFocus:(BOOL)isOnFocus { [self.mapView setPresentAvailable:isOnFocus]; }
 - (void)viewWillAppear:(BOOL)animated
 {
   [super viewWillAppear:animated];
@@ -256,11 +264,12 @@ BOOL gIsFirstMyPositionMode = YES;
 {
   [super viewDidLoad];
 
-  [(EAGLView *)self.view setLaunchByDeepLink:DeepLinkHandler.shared.isLaunchedByDeeplink];
+  [self.mapView setLaunchByDeepLink:DeepLinkHandler.shared.isLaunchedByDeeplink];
   [MWMRouter restoreRouteIfNeeded];
 
   self.view.clipsToBounds = YES;
-  [self processMyPositionStateModeEvent:MWMMyPositionModePendingPosition];
+  self.currentPositionMode = MWMMyPositionModePendingPosition;
+  [self processMyPositionStateModeEvent:self.currentPositionMode];
   [MWMKeyboard addObserver:self];
   self.welcomePageController = [MWMWelcomePageController controllerWithParent:self];
   if ([MWMNavigationDashboardManager manager].state == MWMNavigationDashboardStateHidden)
@@ -285,9 +294,8 @@ BOOL gIsFirstMyPositionMode = YES;
 - (void)viewDidLayoutSubviews
 {
   [super viewDidLayoutSubviews];
-  EAGLView * renderingView = (EAGLView *)self.view;
-  if (!renderingView.drapeEngineCreated)
-    [renderingView createDrapeEngine];
+  if (!self.mapView.drapeEngineCreated)
+    [self.mapView createDrapeEngine];
 }
 
 - (void)mwm_refreshUI
@@ -368,6 +376,7 @@ BOOL gIsFirstMyPositionMode = YES;
 
 - (void)initialize
 {
+  self.listeners = [NSHashTable<id<MWMLocationModeListener>> weakObjectsHashTable];
   Framework & f = GetFramework();
   // TODO: Review and improve this code.
   f.SetMapSelectionListeners(
@@ -386,6 +395,14 @@ BOOL gIsFirstMyPositionMode = YES;
   [MWMFrameworkListener addObserver:self];
 }
 
+- (void)addListener:(id<MWMLocationModeListener>)listener {
+  [self.listeners addObject:listener];
+}
+
+- (void)removeListener:(id<MWMLocationModeListener>)listener {
+  [self.listeners removeObject:listener];
+}
+
 #pragma mark - Open controllers
 
 - (void)openMigration { [self performSegueWithIdentifier:kMigrationSegue sender:self]; }
@@ -529,12 +546,17 @@ BOOL gIsFirstMyPositionMode = YES;
 
 - (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode
 {
+  self.currentPositionMode = mode;
   [MWMLocationManager setMyPositionMode:mode];
   [[MWMSideButtons buttons] processMyPositionStateModeEvent:mode];
+  NSArray<id<MWMLocationModeListener>> * objects = self.listeners.allObjects;
+  for (id<MWMLocationModeListener> object in objects) {
+    [object processMyPositionStateModeEvent:mode];
+  }
   self.disableStandbyOnLocationStateMode = NO;
   switch (mode)
   {
-  case location::NotFollowNoPosition:
+  case MWMMyPositionModeNotFollowNoPosition:
   {
     BOOL const hasLocation = [MWMLocationManager lastLocation] != nil;
     if (hasLocation)
@@ -558,10 +580,10 @@ BOOL gIsFirstMyPositionMode = YES;
     }
     break;
   }
-  case location::PendingPosition:
-  case location::NotFollow: break;
-  case location::Follow:
-  case location::FollowAndRotate: self.disableStandbyOnLocationStateMode = YES; break;
+  case MWMMyPositionModePendingPosition:
+  case MWMMyPositionModeNotFollow: break;
+  case MWMMyPositionModeFollow:
+  case MWMMyPositionModeFollowAndRotate: self.disableStandbyOnLocationStateMode = YES; break;
   }
   gIsFirstMyPositionMode = NO;
 }
@@ -774,4 +796,33 @@ BOOL gIsFirstMyPositionMode = YES;
   f.SetViewportCenter(center, zoomLevel, false);
 }
 
+#pragma mark - CarPlay map append/remove
+
+- (void)disableCarPlayRepresentation
+{
+  self.carplayPlaceholderLabel.hidden = YES;
+  self.mapView.frame = self.view.bounds;
+  [self.view insertSubview:self.mapView atIndex:0];
+  [[self.mapView.topAnchor constraintEqualToAnchor:self.view.topAnchor] setActive:YES];
+  [[self.mapView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor] setActive:YES];
+  [[self.mapView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor] setActive:YES];
+  [[self.mapView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor] setActive:YES];
+  self.controlsView.hidden = NO;
+  [MWMFrameworkHelper setVisibleViewport:self.view.bounds];
+}
+
+- (void)enableCarPlayRepresentation
+{
+  UIViewController *presentedController = self.presentedViewController;
+  if (presentedController != nil) {
+    [presentedController dismissViewControllerAnimated:NO completion:nil];
+  }
+  [[MapsAppDelegate theApp] showMap];
+  [self.mapView removeFromSuperview];
+  if (!self.controlsView.isHidden) {
+    self.controlsView.hidden = YES;
+  }
+  self.carplayPlaceholderLabel.hidden = NO;
+}
+
 @end
diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h
index 8719f75f79..6cb81e674c 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.h
+++ b/iphone/Maps/Classes/MapsAppDelegate.h
@@ -3,6 +3,7 @@
 #import "MWMNavigationController.h"
 
 @class MapViewController;
+@class MWMCarPlayService;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -14,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property(nonatomic) UIWindow * window;
 
+@property(nonatomic, readonly) MWMCarPlayService *carplayService API_AVAILABLE(ios(12.0));
 @property(nonatomic, readonly) MapViewController * mapViewController;
 @property(nonatomic, readonly) BOOL isDrapeEngineCreated;
 
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 37abf9f03c..ee7b59b669 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -24,6 +24,7 @@
 #import <CoreSpotlight/CoreSpotlight.h>
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <UserNotifications/UserNotifications.h>
+#import <CarPlay/CarPlay.h>
 
 #import <AppsFlyerLib/AppsFlyerTracker.h>
 #import <Crashlytics/Crashlytics.h>
@@ -107,7 +108,10 @@ void OverrideUserAgent()
 
 using namespace osm_auth_ios;
 
-@interface MapsAppDelegate ()<MWMFrameworkStorageObserver, NotificationManagerDelegate, AppsFlyerTrackerDelegate>
+@interface MapsAppDelegate ()<MWMFrameworkStorageObserver,
+                              NotificationManagerDelegate,
+                              AppsFlyerTrackerDelegate,
+                              CPApplicationDelegate>
 
 @property(nonatomic) NSInteger standbyCounter;
 @property(nonatomic) MWMBackgroundFetchScheduler * backgroundFetchScheduler;
@@ -153,7 +157,12 @@ using namespace osm_auth_ios;
 
 - (BOOL)isDrapeEngineCreated
 {
-  return ((EAGLView *)self.mapViewController.view).drapeEngineCreated;
+  return self.mapViewController.mapView.drapeEngineCreated;
+}
+
+- (BOOL)isGraphicContextInitialized
+{
+  return self.mapViewController.mapView.graphicContextInitialized;
 }
 
 - (void)searchText:(NSString *)searchString
@@ -413,8 +422,8 @@ using namespace osm_auth_ios;
   // because of new OpenGL driver powered by Metal.
   if ([AppInfo sharedInfo].openGLDriver == MWMOpenGLDriverMetalPre103)
   {
-    m2::PointU const size = ((EAGLView *)self.mapViewController.view).pixelSize;
-    f.OnRecoverSurface(static_cast<int>(size.x), static_cast<int>(size.y), true /* recreateContextDependentResources */);
+    CGSize const objcSize = self.mapViewController.mapView.pixelSize;
+    f.OnRecoverSurface(static_cast<int>(objcSize.width), static_cast<int>(objcSize.height), true /* recreateContextDependentResources */);
   }
   [MWMLocationManager applicationDidBecomeActive];
   [MWMSearch addCategoriesToSpotlight];
@@ -643,6 +652,10 @@ continueUserActivity:(NSUserActivity *)userActivity
   return [(UINavigationController *)self.window.rootViewController viewControllers].firstObject;
 }
 
+- (MWMCarPlayService *)carplayService {
+  return [MWMCarPlayService shared];
+}
+
 #pragma mark - TTS
 
 - (void)enableTTSForTheFirstTime
@@ -815,4 +828,59 @@ continueUserActivity:(NSUserActivity *)userActivity
   });
 }
 
+#pragma mark - CPApplicationDelegate implementation
+
+- (void)application:(UIApplication *)application
+didConnectCarInterfaceController:(CPInterfaceController *)interfaceController
+           toWindow:(CPWindow *)window API_AVAILABLE(ios(12.0)) {
+  [self.carplayService setupWithWindow:window
+                   interfaceController:interfaceController];
+  [self updateVisualScaleFromWindow:self.window
+                           toWindow:window
+                 isCarplayActivated:YES];
+}
+
+- (void)application:(UIApplication *)application
+didDisconnectCarInterfaceController:(CPInterfaceController *)interfaceController
+         fromWindow:(CPWindow *)window API_AVAILABLE(ios(12.0)) {
+  [self.carplayService destroy];
+  [self updateVisualScaleFromWindow:window
+                           toWindow:self.window
+                 isCarplayActivated:NO];
+}
+
+- (void)updateVisualScaleFromWindow:(UIWindow *)sourceWindow
+                          toWindow:(UIWindow *)destinationWindow
+                isCarplayActivated:(BOOL)isCarplayActivated {
+  CGFloat sourceContentScale = sourceWindow.screen.nativeScale;
+  CGFloat destinationContentScale = destinationWindow.screen.nativeScale;
+  if (ABS(sourceContentScale - destinationContentScale) > 0.1) {
+    if (isCarplayActivated) {
+      [self updateVisualScale:destinationContentScale];
+    } else {
+      [self updateVisualScaleToMain];
+    }
+  }
+}
+
+- (void)updateVisualScale:(CGFloat)scale {
+  if ([self isGraphicContextInitialized]) {
+    [self.mapViewController.mapView updateVisualScaleTo:scale];
+  } else {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self updateVisualScale:scale];
+    });
+  }
+}
+
+- (void)updateVisualScaleToMain {
+  if ([self isGraphicContextInitialized]) {
+    [self.mapViewController.mapView updateVisualScaleToMain];
+  } else {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self updateVisualScaleToMain];
+    });
+  }
+}
+
 @end
diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
index 2c2020a44d..1769986866 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
@@ -3,6 +3,7 @@
 #import "CLLocation+Mercator.h"
 #import "MWMAlertViewController.h"
 #import "MWMBottomMenuViewController.h"
+#import "SwiftBridge.h"
 #import "MWMCircularProgress.h"
 #import "MWMCommon.h"
 #import "MWMFrameworkListener.h"
@@ -166,6 +167,9 @@ using namespace storage;
         m_autoDownloadCountryId = kInvalidCountryId;
         [self showDownloadRequest];
       }
+      if (@available(iOS 12.0, *)) {
+        [[MWMCarPlayService shared] showNoMapAlert];
+      }
       break;
       }
       case NodeStatus::Downloading:
@@ -209,6 +213,9 @@ using namespace storage;
 
 - (void)removeFromSuperview
 {
+  if (@available(iOS 12.0, *)) {
+    [[MWMCarPlayService shared] hideNoMapAlert];
+  }
   self.progress.state = MWMCircularProgressStateNormal;
   [MWMFrameworkListener removeObserver:self];
   [super removeFromSuperview];
diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgets.h b/iphone/Maps/Classes/Widgets/MWMMapWidgets.h
index c763c8539c..73ff218541 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapWidgets.h
+++ b/iphone/Maps/Classes/Widgets/MWMMapWidgets.h
@@ -8,5 +8,7 @@
 
 - (void)resize:(CGSize)size;
 - (void)updateAvailableArea:(CGRect)frame;
+- (void)updateLayout:(CGRect)frame;
+- (void)updateLayoutForAvailableArea;
 
 @end
diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm b/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm
index bed8d9950c..22a062961b 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm
@@ -1,6 +1,7 @@
 #import "MWMMapWidgets.h"
 #import "EAGLView.h"
 #import "MapViewController.h"
+#import "SwiftBridge.h"
 
 @interface MWMMapWidgets ()
 
@@ -16,7 +17,7 @@
 
 + (MWMMapWidgets *)widgetsManager
 {
-  return ((EAGLView *)[MapViewController sharedController].view).widgetsManager;
+  return [MapViewController sharedController].mapView.widgetsManager;
 }
 
 - (void)setupWidgets:(Framework::DrapeCreationParams &)p
@@ -34,7 +35,14 @@
   if (m_skin != nullptr)
     m_skin->Resize(size.width, size.height);
   dispatch_async(dispatch_get_main_queue(), ^{
-    [self updateAvailableArea:self.availableArea];
+    if (@available(iOS 12.0, *)) {
+      if ([MWMCarPlayService shared].isCarplayActivated) {
+        CGRect bounds = [MapViewController sharedController].mapView.bounds;
+        [self updateLayout: bounds];
+        return;
+      }
+    }
+    [self updateLayoutForAvailableArea];
   });
 }
 
@@ -43,26 +51,41 @@
   if (CGRectEqualToRect(self.availableArea, frame))
     return;
   self.availableArea = frame;
+  if (@available(iOS 12.0, *)) {
+    if ([MWMCarPlayService shared].isCarplayActivated) {
+      return;
+    }
+  }
+  [self updateLayout:frame];
+}
+
+- (void)updateLayoutForAvailableArea
+{
+  [self updateLayout:self.availableArea];
+}
+
+- (void)updateLayout:(CGRect)frame
+{
   if (m_skin == nullptr)
     return;
   gui::TWidgetsLayoutInfo layout;
   auto const vs = self.visualScale;
-  auto const viewHeight = [MapViewController sharedController].view.height;
-  auto const viewWidth = [MapViewController sharedController].view.width;
+  auto const viewHeight = [MapViewController sharedController].mapView.height;
+  auto const viewWidth = [MapViewController sharedController].mapView.width;
   auto const rulerOffset =
-      m2::PointF(frame.origin.x * vs, (frame.origin.y + frame.size.height - viewHeight) * vs);
+    m2::PointF(frame.origin.x * vs, (frame.origin.y + frame.size.height - viewHeight) * vs);
   auto const compassOffset =
-      m2::PointF((frame.origin.x + frame.size.width - viewWidth) * vs, frame.origin.y * vs);
+    m2::PointF((frame.origin.x + frame.size.width - viewWidth) * vs, frame.origin.y * vs);
   m_skin->ForEach([&](gui::EWidget w, gui::Position const & pos) {
     m2::PointF pivot = pos.m_pixelPivot;
     switch (w)
     {
-    case gui::WIDGET_RULER:
-    case gui::WIDGET_WATERMARK:
-    case gui::WIDGET_COPYRIGHT: pivot += rulerOffset; break;
-    case gui::WIDGET_COMPASS: pivot += compassOffset; break;
-    case gui::WIDGET_SCALE_FPS_LABEL:
-    case gui::WIDGET_CHOOSE_POSITION_MARK: break;
+      case gui::WIDGET_RULER:
+      case gui::WIDGET_WATERMARK:
+      case gui::WIDGET_COPYRIGHT: pivot += rulerOffset; break;
+      case gui::WIDGET_COMPASS: pivot += compassOffset; break;
+      case gui::WIDGET_SCALE_FPS_LABEL:
+      case gui::WIDGET_CHOOSE_POSITION_MARK: break;
     }
     layout[w] = pivot;
   });
diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.h b/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.h
index 9eaf865516..695bc2c5a7 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.h
+++ b/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.h
@@ -1,5 +1,7 @@
 @interface MWMMapWidgetsHelper : NSObject
 
 + (void)updateAvailableArea:(CGRect)frame;
++ (void)updateLayout:(CGRect)frame;
++ (void)updateLayoutForAvailableArea;
 
 @end
diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.mm b/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.mm
index 1038217b0c..488c7e5008 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapWidgetsHelper.mm
@@ -8,4 +8,14 @@
   [[MWMMapWidgets widgetsManager] updateAvailableArea:frame];
 }
 
++ (void)updateLayout:(CGRect)frame
+{
+  [[MWMMapWidgets widgetsManager] updateLayout:frame];
+}
+
++ (void)updateLayoutForAvailableArea
+{
+  [[MWMMapWidgets widgetsManager] updateLayoutForAvailableArea];
+}
+
 @end
diff --git a/iphone/Maps/Common/Keyboard/MWMKeyboard.h b/iphone/Maps/Common/Keyboard/MWMKeyboard.h
index f701f04a01..f0a371fc20 100644
--- a/iphone/Maps/Common/Keyboard/MWMKeyboard.h
+++ b/iphone/Maps/Common/Keyboard/MWMKeyboard.h
@@ -9,4 +9,11 @@
 
 + (CGFloat)keyboardHeight;
 
+- (instancetype)init __attribute__((unavailable("call +manager instead")));
+- (instancetype)copy __attribute__((unavailable("call +manager instead")));
+- (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +manager instead")));
++ (instancetype)allocWithZone:(struct _NSZone *)zone
+__attribute__((unavailable("call +manager instead")));
++ (instancetype) new __attribute__((unavailable("call +manager instead")));
+
 @end
diff --git a/iphone/Maps/Common/Keyboard/MWMKeyboard.mm b/iphone/Maps/Common/Keyboard/MWMKeyboard.mm
index 7f999d5e71..0ab86f6bca 100644
--- a/iphone/Maps/Common/Keyboard/MWMKeyboard.mm
+++ b/iphone/Maps/Common/Keyboard/MWMKeyboard.mm
@@ -21,7 +21,7 @@ using Observers = NSHashTable<Observer>;
   static MWMKeyboard * manager;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    manager = [[super alloc] initManager];
+    manager = [[self alloc] initManager];
   });
   return manager;
 }
diff --git a/iphone/Maps/Core/BackgroundFetchScheduler/BackgroundFetchTaskFrameworkType.swift b/iphone/Maps/Core/BackgroundFetchScheduler/BackgroundFetchTaskFrameworkType.swift
index 8bdaf036d5..89df4f558f 100644
--- a/iphone/Maps/Core/BackgroundFetchScheduler/BackgroundFetchTaskFrameworkType.swift
+++ b/iphone/Maps/Core/BackgroundFetchScheduler/BackgroundFetchTaskFrameworkType.swift
@@ -5,7 +5,7 @@
   func create() {
     switch self {
     case .none: return
-    case .full: MWMFrameworkHelper.createFramework()
+    case .full: FrameworkHelper.createFramework()
     }
   }
 }
diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
index cd156fd9a2..aaecdc8b77 100644
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
@@ -3,6 +3,7 @@
 #import "MWMCatalogCommon.h"
 
 @class MWMCategory;
+@class MWMCarPlayBookmarkObject;
 @class MWMTagGroup;
 @class MWMTag;
 
@@ -37,10 +38,11 @@ typedef void (^LoadTagsCompletionBlock)(NSArray<MWMTagGroup *> * _Nullable tags,
 - (void)setUserCategoriesVisible:(BOOL)isVisible;
 - (void)setCatalogCategoriesVisible:(BOOL)isVisible;
 - (void)deleteCategory:(MWMMarkGroupID)groupId;
-
-- (void)deleteBookmark:(MWMMarkID)bookmarkId;
 - (BOOL)checkCategoryName:(NSString *)name;
 
+- (NSArray<MWMCarPlayBookmarkObject *> *)bookmarksForCategory:(MWMMarkGroupID)categoryId;
+- (void)deleteBookmark:(MWMMarkID)bookmarkId;
+
 - (void)shareCategory:(MWMMarkGroupID)groupId;
 - (NSURL *)shareCategoryURL;
 - (void)finishShareCategory;
@@ -90,5 +92,12 @@ typedef void (^LoadTagsCompletionBlock)(NSArray<MWMTagGroup *> * _Nullable tags,
                     progress:(_Nullable ProgressBlock)progress
                   completion:(UploadCompletionBlock)completion;
 
+- (instancetype)init __attribute__((unavailable("call +manager instead")));
+- (instancetype)copy __attribute__((unavailable("call +manager instead")));
+- (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +manager instead")));
++ (instancetype)allocWithZone:(struct _NSZone *)zone
+__attribute__((unavailable("call +manager instead")));
++ (instancetype) new __attribute__((unavailable("call +manager instead")));
+
 @end
 NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
index 0ed75dffb3..d81a5bf302 100644
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
@@ -1,6 +1,7 @@
 #import "MWMBookmarksManager.h"
 #import "AppInfo.h"
 #import "MWMCategory.h"
+#import "MWMCarPlayBookmarkObject.h"
 #import "MWMTag+Convenience.h"
 #import "MWMTagGroup+Convenience.h"
 #import "MWMCatalogObserver.h"
@@ -47,7 +48,7 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
   static MWMBookmarksManager * manager;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    manager = [[super alloc] initManager];
+    manager = [[self alloc] initManager];
   });
   return manager;
 }
@@ -383,6 +384,25 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
   }];
 }
 
+- (BOOL)checkCategoryName:(NSString *)name
+{
+  return !self.bm.IsUsedCategoryName(name.UTF8String);
+}
+
+#pragma mark - Bookmarks
+
+- (NSArray<MWMCarPlayBookmarkObject *> *)bookmarksForCategory:(MWMMarkGroupID)categoryId
+{
+  NSMutableArray<MWMCarPlayBookmarkObject *> * result = [NSMutableArray array];
+  auto const & bookmarkIds = self.bm.GetUserMarkIds(categoryId);
+  for (auto bookmarkId : bookmarkIds)
+  {
+    MWMCarPlayBookmarkObject *bookmark = [[MWMCarPlayBookmarkObject alloc] initWithBookmarkId:bookmarkId];
+    [result addObject:bookmark];
+  }
+  return [result copy];
+}
+
 - (void)deleteBookmark:(MWMMarkID)bookmarkId
 {
   self.bm.GetEditSession().DeleteBookmark(bookmarkId);
@@ -392,11 +412,6 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
   }];
 }
 
-- (BOOL)checkCategoryName:(NSString *)name
-{
-  return !self.bm.IsUsedCategoryName(name.UTF8String);
-}
-
 #pragma mark - Category sharing
 
 - (void)shareCategory:(MWMMarkGroupID)groupId
diff --git a/iphone/Maps/Core/EventListening/ListenerContainer.swift b/iphone/Maps/Core/EventListening/ListenerContainer.swift
new file mode 100644
index 0000000000..0bb0a72a8a
--- /dev/null
+++ b/iphone/Maps/Core/EventListening/ListenerContainer.swift
@@ -0,0 +1,60 @@
+import Foundation
+
+// TODO: define directly T as AnyObject after Swift version update
+final class ListenerContainer<T> {
+  // MARK: - WeakWrapper for listeners
+  private class WeakWrapper<T> {
+    private weak var weakValue: AnyObject?
+    
+    init(value: T) {
+      self.weakValue = value as AnyObject?
+    }
+    
+    var value: T? {
+      return weakValue as? T
+    }
+  }
+  
+  // MARK: - Properties
+  private var listeners = [WeakWrapper<T>]()
+  
+  // MARK: - Public methods
+  func addListener(_ listener: T) {
+    guard isUnique(listener) else {
+      return
+    }
+    listeners.append(WeakWrapper(value: listener))
+  }
+  
+  func removeListener(_ listener: T) {
+    listeners = listeners.filter({ weakRef in
+      guard let object = weakRef.value else {
+        return false
+      }
+      return !identical(object, listener)
+    })
+  }
+  
+  func forEach(_ block: @escaping (T) -> Void) {
+    fetchListeners().forEach(block)
+  }
+  
+  // MARK: - Private methods
+  private func isUnique(_ listener: T) -> Bool {
+    return !fetchListeners().contains(where: { identical($0, listener) })
+  }
+  
+  private func fetchListeners() -> [T] {
+    removeNilReference()
+    return listeners.compactMap({ $0.value })
+  }
+  
+  private func removeNilReference() {
+    listeners = listeners.filter({ $0.value != nil })
+  }
+}
+
+private func identical(_ lhs: Any, _ rhs: Any) -> Bool {
+  return (lhs as AnyObject?) === (rhs as AnyObject?)
+}
+
diff --git a/iphone/Maps/Core/Framework/MWMFrameworkHelper.h b/iphone/Maps/Core/Framework/MWMFrameworkHelper.h
index 0ec4c7706f..bf0c74d1ef 100644
--- a/iphone/Maps/Core/Framework/MWMFrameworkHelper.h
+++ b/iphone/Maps/Core/Framework/MWMFrameworkHelper.h
@@ -1,3 +1,9 @@
+typedef NS_ENUM(NSUInteger, MWMZoomMode) {
+  MWMZoomModeIn = 0,
+  MWMZoomModeOut
+};
+
+NS_SWIFT_NAME(FrameworkHelper)
 @interface MWMFrameworkHelper : NSObject
 
 + (void)processFirstLaunch;
@@ -20,4 +26,12 @@
 
 + (MWMMarkGroupID)invalidCategoryId;
 
++ (void)zoomMap:(MWMZoomMode)mode;
++ (void)moveMap:(UIOffset)offset;
++ (void)deactivateMapSelection:(BOOL)notifyUI NS_SWIFT_NAME(deactivateMapSelection(notifyUI:));
++ (void)switchMyPositionMode;
++ (void)stopLocationFollow;
++ (NSArray<NSString *> *)obtainLastSearchQueries;
++ (BOOL)needUpdateMaps;
+
 @end
diff --git a/iphone/Maps/Core/Framework/MWMFrameworkHelper.mm b/iphone/Maps/Core/Framework/MWMFrameworkHelper.mm
index 6684786289..523d75b9a7 100644
--- a/iphone/Maps/Core/Framework/MWMFrameworkHelper.mm
+++ b/iphone/Maps/Core/Framework/MWMFrameworkHelper.mm
@@ -2,10 +2,17 @@
 #import "MWMLocationManager.h"
 #import "MapViewController.h"
 #import "MWMAlertViewController.h"
+#import "MWMCategory.h"
+#import "Statistics.h"
+#import "3party/Alohalytics/src/alohalytics_objc.h"
+#import "EAGLView.h"
 
 #include "Framework.h"
 
 #include "platform/network_policy_ios.h"
+#include "platform/local_country_file_utils.hpp"
+
+extern NSString * const kAlohalyticsTapEventKey;
 
 #include "base/sunrise_sunset.hpp"
 
@@ -23,7 +30,7 @@
 
 + (void)setVisibleViewport:(CGRect)rect
 {
-  CGFloat const scale = [MapViewController sharedController].view.contentScaleFactor;
+  CGFloat const scale = [MapViewController sharedController].mapView.contentScaleFactor;
   CGFloat const x0 = rect.origin.x * scale;
   CGFloat const y0 = rect.origin.y * scale;
   CGFloat const x1 = x0 + rect.size.width * scale;
@@ -117,4 +124,56 @@
 
 + (MWMMarkGroupID)invalidCategoryId { return kml::kInvalidMarkGroupId; }
 
++ (NSArray<NSString *> *)obtainLastSearchQueries
+{
+  NSMutableArray * result = [NSMutableArray array];
+  auto const & queries = GetFramework().GetLastSearchQueries();
+  for (auto const & item : queries)
+  {
+    [result addObject:@(item.second.c_str())];
+  }
+  return [result copy];
+}
+
+#pragma mark - Map Interaction
+
++ (void)zoomMap:(MWMZoomMode)mode
+{
+  [Statistics logEvent:kStatEventName(kStatZoom, kStatOut)];
+  [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"-"];
+  switch(mode) {
+    case MWMZoomModeIn:
+      GetFramework().Scale(Framework::SCALE_MAG, true);
+      break;
+    case MWMZoomModeOut:
+      GetFramework().Scale(Framework::SCALE_MIN, true);
+      break;
+  }
+}
+
++ (void)moveMap:(UIOffset)offset
+{
+  GetFramework().Move(offset.horizontal, offset.vertical, true);
+}
+
++ (void)deactivateMapSelection:(BOOL)notifyUI
+{
+  GetFramework().DeactivateMapSelection(notifyUI);
+}
+
++ (void)switchMyPositionMode
+{
+  GetFramework().SwitchMyPositionNextMode();
+}
+
++ (void)stopLocationFollow
+{
+  GetFramework().StopLocationFollow();
+}
+
++ (BOOL)needUpdateMaps
+{
+  return platform::migrate::NeedMigrate();
+}
+
 @end
diff --git a/iphone/Maps/Core/Framework/MWMFrameworkListener.h b/iphone/Maps/Core/Framework/MWMFrameworkListener.h
index 7ac163dbd0..55d814ee7e 100644
--- a/iphone/Maps/Core/Framework/MWMFrameworkListener.h
+++ b/iphone/Maps/Core/Framework/MWMFrameworkListener.h
@@ -9,7 +9,6 @@
 - (instancetype)init __attribute__((unavailable("call +listener instead")));
 - (instancetype)copy __attribute__((unavailable("call +listener instead")));
 - (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +listener instead")));
-+ (instancetype)alloc __attribute__((unavailable("call +listener instead")));
 + (instancetype)allocWithZone:(struct _NSZone *)zone
     __attribute__((unavailable("call +listener instead")));
 + (instancetype) new __attribute__((unavailable("call +listener instead")));
diff --git a/iphone/Maps/Core/Framework/MWMFrameworkListener.mm b/iphone/Maps/Core/Framework/MWMFrameworkListener.mm
index a6847b37bc..051327be16 100644
--- a/iphone/Maps/Core/Framework/MWMFrameworkListener.mm
+++ b/iphone/Maps/Core/Framework/MWMFrameworkListener.mm
@@ -124,6 +124,18 @@ void loopWrappers(Observers * observers, TLoopBlock block)
         [observer processRouteRecommendation:rec];
     });
   });
+  rm.SetRouteSpeedCamShowListener([observers](m2::PointD const & point, double cameraSpeedKmPH) {
+    loopWrappers(observers, [cameraSpeedKmPH](TRouteBuildingObserver observer) {
+      if ([observer respondsToSelector:@selector(speedCameraShowedUpOnRoute:)])
+          [observer speedCameraShowedUpOnRoute:cameraSpeedKmPH];
+    });
+  });
+  rm.SetRouteSpeedCamsClearListener([observers]() {
+    loopWrappers(observers, ^(TRouteBuildingObserver observer) {
+      if ([observer respondsToSelector:@selector(speedCameraLeftVisibleArea)])
+          [observer speedCameraLeftVisibleArea];
+    });
+  });
 }
 
 #pragma mark - MWMFrameworkStorageObserver
diff --git a/iphone/Maps/Core/Framework/MWMFrameworkObservers.h b/iphone/Maps/Core/Framework/MWMFrameworkObservers.h
index 87abf9d2a0..987b94c8d5 100644
--- a/iphone/Maps/Core/Framework/MWMFrameworkObservers.h
+++ b/iphone/Maps/Core/Framework/MWMFrameworkObservers.h
@@ -20,6 +20,8 @@ using namespace storage;
 
 - (void)processRouteBuilderProgress:(CGFloat)progress;
 - (void)processRouteRecommendation:(MWMRouterRecommendation)recommendation;
+- (void)speedCameraShowedUpOnRoute:(double)speedLimit;
+- (void)speedCameraLeftVisibleArea;
 
 @end
 
diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Location/MWMLocationModeListener.h b/iphone/Maps/Core/Framework/ProxyObjects/Location/MWMLocationModeListener.h
new file mode 100644
index 0000000000..744a423ac9
--- /dev/null
+++ b/iphone/Maps/Core/Framework/ProxyObjects/Location/MWMLocationModeListener.h
@@ -0,0 +1,10 @@
+#import "MWMMyPositionMode.h"
+NS_ASSUME_NONNULL_BEGIN
+
+NS_SWIFT_NAME(LocationModeListener)
+@protocol MWMLocationModeListener <NSObject>
+- (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode;
+@end
+
+NS_ASSUME_NONNULL_END
+
diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRouterResultCode.h b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRouterResultCode.h
new file mode 100644
index 0000000000..001022559b
--- /dev/null
+++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRouterResultCode.h
@@ -0,0 +1,19 @@
+typedef NS_ENUM(NSUInteger, MWMRouterResultCode) {
+  MWMRouterResultCodeNoError = 0,
+  MWMRouterResultCodeCancelled = 1,
+  MWMRouterResultCodeNoCurrentPosition = 2,
+  MWMRouterResultCodeInconsistentMWMandRoute = 3,
+  MWMRouterResultCodeRouteFileNotExist = 4,
+  MWMRouterResultCodeStartPointNotFound = 5,
+  MWMRouterResultCodeEndPointNotFound = 6,
+  MWMRouterResultCodePointsInDifferentMWM = 7,
+  MWMRouterResultCodeRouteNotFound = 8,
+  MWMRouterResultCodeNeedMoreMaps = 9,
+  MWMRouterResultCodeInternalError = 10,
+  MWMRouterResultCodeFileTooOld = 11,
+  MWMRouterResultCodeIntermediatePointNotFound = 12,
+  MWMRouterResultCodeTransitRouteNotFoundNoNetwork = 13,
+  MWMRouterResultCodeTransitRouteNotFoundTooLongPedestrian = 14,
+  MWMRouterResultCodeRouteNotFoundRedressRouteError = 15,
+  MWMRouterResultCodeHasWarnings = 16
+} NS_SWIFT_NAME(RouterResultCode);
diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.h b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.h
new file mode 100644
index 0000000000..1a41fe734c
--- /dev/null
+++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.h
@@ -0,0 +1,48 @@
+#import "MWMRouterType.h"
+#import "MWMRoutePoint.h"
+#import "MWMRouterResultCode.h"
+#import "MWMSpeedCameraManagerMode.h"
+@class RouteInfo;
+
+NS_ASSUME_NONNULL_BEGIN
+
+NS_SWIFT_NAME(RoutingManagerListener)
+@protocol MWMRoutingManagerListener <NSObject>
+- (void)processRouteBuilderEventWithCode:(MWMRouterResultCode)code
+                               countries:(NSArray<NSString *> *)absentCountries;
+- (void)didLocationUpdate:(NSArray<NSString *> *)notifications;
+- (void)updateCameraInfo:(BOOL)isCameraOnRoute speedLimit:(nullable NSString *)limit NS_SWIFT_NAME(updateCameraInfo(isCameraOnRoute:speedLimit:));
+@end
+
+NS_SWIFT_NAME(RoutingManager)
+@interface MWMRoutingManager : NSObject
+@property(class, nonatomic, readonly) MWMRoutingManager *routingManager;
+@property(nonatomic, readonly, nullable) MWMRoutePoint *startPoint;
+@property(nonatomic, readonly, nullable) MWMRoutePoint *endPoint;
+@property(nonatomic, readonly) BOOL isOnRoute;
+@property(nonatomic, readonly) BOOL isRoutingActive;
+@property(nonatomic, readonly) BOOL isRouteFinished;
+@property(nonatomic, readonly, nullable) RouteInfo *routeInfo;
+@property(nonatomic, readonly) MWMRouterType type;
+@property(nonatomic) MWMSpeedCameraManagerMode speedCameraMode;
+
+- (instancetype)init NS_UNAVAILABLE;
+- (void)addListener:(id<MWMRoutingManagerListener>)listener;
+- (void)removeListener:(id<MWMRoutingManagerListener>)listener;
+
+- (void)stopRoutingAndRemoveRoutePoints:(BOOL)flag;
+- (void)deleteSavedRoutePoints;
+- (void)applyRouterType:(MWMRouterType)type NS_SWIFT_NAME(apply(routeType:));
+- (void)addRoutePoint:(MWMRoutePoint *)point NS_SWIFT_NAME(add(routePoint:));
+- (void)buildRouteWithDidFailError:(NSError **)errorPtr __attribute__((swift_error(nonnull_error))) NS_SWIFT_NAME(buildRoute());
+- (void)startRoute;
+
+- (instancetype)init __attribute__((unavailable("call +routingManager instead")));
+- (instancetype)copy __attribute__((unavailable("call +routingManager instead")));
+- (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +routingManager instead")));
++ (instancetype)allocWithZone:(struct _NSZone *)zone
+__attribute__((unavailable("call +routingManager instead")));
++ (instancetype) new __attribute__((unavailable("call +routingManager instead")));
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm
new file mode 100644
index 0000000000..b7a074d11f
--- /dev/null
+++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm
@@ -0,0 +1,285 @@
+#import "MWMRoutingManager.h"
+#import "MWMLocationManager.h"
+#import "MWMLocationObserver.h"
+#import "MWMFrameworkListener.h"
+#import "MWMCoreRouterType.h"
+#import "MWMRouterResultCode.h"
+#import "MWMRoutePoint+CPP.h"
+#import "MWMCoreUnits.h"
+#import "SwiftBridge.h"
+
+#include "Framework.h"
+#include "routing/turns.hpp"
+#include "routing/routing_session.hpp"
+
+@interface MWMRoutingManager()<MWMFrameworkRouteBuilderObserver, MWMLocationObserver>
+@property(nonatomic, readonly) RoutingManager & rm;
+@property(strong, nonatomic) NSHashTable<id<MWMRoutingManagerListener>> *listeners;
+@end
+
+@implementation MWMRoutingManager
+
++ (MWMRoutingManager *)routingManager {
+  static MWMRoutingManager * routingManager;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    routingManager = [[self alloc] initManager];
+  });
+  return routingManager;
+}
+
+- (instancetype)initManager {
+  self = [super init];
+  if (self) {
+    self.listeners = [NSHashTable<id<MWMRoutingManagerListener>> weakObjectsHashTable];
+    [MWMFrameworkListener addObserver:self];
+    [MWMLocationManager addObserver:self];
+  }
+  return self;
+}
+
+- (RoutingManager &)rm {
+  return GetFramework().GetRoutingManager();
+}
+
+- (routing::SpeedCameraManager &)scm {
+  return self.rm.GetSpeedCamManager();
+}
+
+- (MWMRoutePoint *)startPoint {
+  auto const routePoints = self.rm.GetRoutePoints();
+  if (routePoints.empty())
+    return nil;
+  auto const & routePoint = routePoints.front();
+  if (routePoint.m_pointType == RouteMarkType::Start)
+    return [[MWMRoutePoint alloc] initWithRouteMarkData:routePoint];
+  return nil;
+}
+
+- (MWMRoutePoint *)endPoint {
+  auto const routePoints = self.rm.GetRoutePoints();
+  if (routePoints.empty())
+    return nil;
+  auto const & routePoint = routePoints.back();
+  if (routePoint.m_pointType == RouteMarkType::Finish)
+    return [[MWMRoutePoint alloc] initWithRouteMarkData:routePoint];
+  return nil;
+}
+
+- (BOOL)isOnRoute {
+  return self.rm.IsRoutingFollowing();
+}
+
+- (BOOL)isRoutingActive {
+  return self.rm.IsRoutingActive();
+}
+
+- (BOOL)isRouteFinished {
+  return self.rm.IsRouteFinished();
+}
+
+- (MWMRouteInfo *)routeInfo {
+  if (!self.isRoutingActive) { return  nil; }
+  location::FollowingInfo info;
+  self.rm.GetRouteFollowingInfo(info);
+  if (!info.IsValid()) { return nil; }
+  CLLocation * lastLocation = [MWMLocationManager lastLocation];
+  NSString *speed = @"0";
+  if (lastLocation && lastLocation.speed >= 0) {
+    auto const units = coreUnits([MWMSettings measurementUnits]);
+    speed = @(measurement_utils::FormatSpeed(lastLocation.speed, units).c_str());
+  }
+  NSInteger roundExitNumber = 0;
+  if (info.m_turn == routing::turns::CarDirection::EnterRoundAbout ||
+      info.m_turn == routing::turns::CarDirection::StayOnRoundAbout ||
+      info.m_turn == routing::turns::CarDirection::LeaveRoundAbout) {
+    roundExitNumber = info.m_exitNum;
+  }
+  
+  MWMRouteInfo *objCInfo = [[MWMRouteInfo alloc] initWithTimeToTarget:info.m_time
+                                                       targetDistance:@(info.m_distToTarget.c_str())
+                                                          targetUnits:@(info.m_targetUnitsSuffix.c_str())
+                                                       distanceToTurn:@(info.m_distToTurn.c_str())
+                                                           streetName:@(info.m_displayedStreetName.c_str())
+                                                            turnUnits:@(info.m_turnUnitsSuffix.c_str())
+                                                        turnImageName:[self turnImageName:info.m_turn isPrimary:YES]
+                                                    nextTurnImageName:[self turnImageName:info.m_nextTurn isPrimary:NO]
+                                                                speed:[speed integerValue]
+                                                      roundExitNumber: roundExitNumber];
+  return objCInfo;
+}
+
+- (MWMRouterType)type {
+  return routerType(self.rm.GetRouter());
+}
+
+- (void)addListener:(id<MWMRoutingManagerListener>)listener {
+  [self.listeners addObject:listener];
+}
+
+- (void)removeListener:(id<MWMRoutingManagerListener>)listener {
+  [self.listeners removeObject:listener];
+}
+
+- (void)stopRoutingAndRemoveRoutePoints:(BOOL)flag {
+  self.rm.CloseRouting(flag);
+}
+
+- (void)deleteSavedRoutePoints {
+  self.rm.DeleteSavedRoutePoints();
+}
+
+- (void)applyRouterType:(MWMRouterType)type {
+  self.rm.SetRouter(coreRouterType(type));
+}
+
+- (void)addRoutePoint:(MWMRoutePoint *)point {
+  RouteMarkData startPt = point.routeMarkData;
+  self.rm.AddRoutePoint(std::move(startPt));
+}
+
+- (void)saveRoute {
+  self.rm.SaveRoutePoints();
+}
+
+- (void)buildRouteWithDidFailError:(NSError * __autoreleasing  __nullable *)errorPtr {
+  auto const & points = self.rm.GetRoutePoints();
+  auto const pointsCount = points.size();
+  
+  if (pointsCount > 1) {
+    self.rm.BuildRoute(0 /* timeoutSec */);
+  } else {
+    if (errorPtr) {
+      if (pointsCount == 0) {
+        *errorPtr = [NSError errorWithDomain:@"maps.me.routing"
+                                        code:MWMRouterResultCodeStartPointNotFound
+                                    userInfo:nil];
+      } else {
+        auto const & routePoint = points.front();
+        MWMRouterResultCode code;
+        if (routePoint.m_pointType == RouteMarkType::Start) {
+          code = MWMRouterResultCodeEndPointNotFound;
+        } else {
+          code = MWMRouterResultCodeStartPointNotFound;
+        }
+        *errorPtr = [NSError errorWithDomain:@"maps.me.routing"
+                                        code:code
+                                    userInfo:nil];
+      }
+    }
+  }
+}
+
+- (void)startRoute {
+  [self saveRoute];
+  self.rm.FollowRoute();
+}
+
+- (MWMSpeedCameraManagerMode)speedCameraMode {
+  auto const mode = self.scm.GetMode();
+  switch (mode) {
+    case routing::SpeedCameraManagerMode::Auto:
+      return MWMSpeedCameraManagerModeAuto;
+    case routing::SpeedCameraManagerMode::Always:
+      return MWMSpeedCameraManagerModeAlways;
+    default:
+      return MWMSpeedCameraManagerModeNever;
+  }
+}
+
+- (void)setSpeedCameraMode:(MWMSpeedCameraManagerMode)mode {
+  switch (mode) {
+    case MWMSpeedCameraManagerModeAuto:
+      self.scm.SetMode(routing::SpeedCameraManagerMode::Auto);
+      break;
+    case MWMSpeedCameraManagerModeAlways:
+      self.scm.SetMode(routing::SpeedCameraManagerMode::Always);
+      break;
+    default:
+      self.scm.SetMode(routing::SpeedCameraManagerMode::Never);
+  }
+}
+
+#pragma mark - MWMFrameworkRouteBuilderObserver implementation
+
+- (void)processRouteBuilderEvent:(routing::RouterResultCode)code
+                       countries:(const storage::CountriesSet &)absentCountries {
+  NSArray<id<MWMRoutingManagerListener>> * objects = self.listeners.allObjects;
+  MWMRouterResultCode objCCode = MWMRouterResultCode(code);
+  NSMutableArray<NSString *> *objCAbsentCountries = [NSMutableArray new];
+  std::for_each(absentCountries.begin(), absentCountries.end(), ^(std::string const & str) {
+    id nsstr = [NSString stringWithUTF8String:str.c_str()];
+    [objCAbsentCountries addObject:nsstr];
+  });
+  for (id<MWMRoutingManagerListener> object in objects) {
+    [object processRouteBuilderEventWithCode:objCCode
+                                   countries:objCAbsentCountries];
+  }
+}
+
+- (void)speedCameraShowedUpOnRoute:(double)speedLimit {
+  NSArray<id<MWMRoutingManagerListener>> * objects = self.listeners.allObjects;
+  for (id<MWMRoutingManagerListener> object in objects) {
+    if (speedLimit == routing::SpeedCameraOnRoute::kNoSpeedInfo) {
+      [object updateCameraInfo:YES speedLimit:nil];
+    } else {
+      auto const units = coreUnits([MWMSettings measurementUnits]);
+      
+      NSString *limit = @(measurement_utils::FormatSpeedLimit(speedLimit, units).c_str());
+      [object updateCameraInfo:YES speedLimit:limit];
+    }
+  }
+}
+
+- (void)speedCameraLeftVisibleArea {
+  NSArray<id<MWMRoutingManagerListener>> * objects = self.listeners.allObjects;
+  for (id<MWMRoutingManagerListener> object in objects) {
+    [object updateCameraInfo:NO speedLimit:nil];
+  }
+}
+
+#pragma mark - MWMLocationObserver implementation
+
+- (void)onLocationUpdate:(location::GpsInfo const &)gpsInfo {
+  NSMutableArray<NSString *> * turnNotifications = [NSMutableArray array];
+  vector<string> notifications;
+  self.rm.GenerateNotifications(notifications);
+  for (auto const & text : notifications) {
+    [turnNotifications addObject:@(text.c_str())];
+  }
+  NSArray<id<MWMRoutingManagerListener>> * objects = self.listeners.allObjects;
+  for (id<MWMRoutingManagerListener> object in objects) {
+    [object didLocationUpdate:turnNotifications];
+  }
+}
+
+- (NSString *)turnImageName:(routing::turns::CarDirection)turn isPrimary:(BOOL)isPrimary {
+  using namespace routing::turns;
+  NSString *imageName = nil;
+  switch (turn) {
+    case CarDirection::ExitHighwayToRight: imageName = @"ic_cp_exit_highway_to_right"; break;
+    case CarDirection::TurnSlightRight: imageName = @"ic_cp_slight_right"; break;
+    case CarDirection::TurnRight: imageName = @"ic_cp_simple_right"; break;
+    case CarDirection::TurnSharpRight: imageName = @"ic_cp_sharp_right"; break;
+    case CarDirection::ExitHighwayToLeft: imageName = @"ic_cp_exit_highway_to_left"; break;
+    case CarDirection::TurnSlightLeft: imageName = @"ic_cp_slight_left"; break;
+    case CarDirection::TurnLeft: imageName = @"ic_cp_simple_left"; break;
+    case CarDirection::TurnSharpLeft: imageName = @"ic_cp_sharp_left"; break;
+    case CarDirection::UTurnLeft: imageName = @"ic_cp_uturn_left"; break;
+    case CarDirection::UTurnRight: imageName = @"ic_cp_uturn_right"; break;
+    case CarDirection::ReachedYourDestination: imageName = @"ic_cp_finish_point"; break;
+    case CarDirection::LeaveRoundAbout:
+    case CarDirection::EnterRoundAbout: imageName = @"ic_cp_round"; break;
+    case CarDirection::GoStraight: imageName = @"ic_cp_straight"; break;
+    case CarDirection::StartAtEndOfStreet:
+    case CarDirection::StayOnRoundAbout:
+    case CarDirection::Count:
+    case CarDirection::None: imageName = isPrimary ? @"ic_cp_straight" : nil; break;
+  }
+  if (!isPrimary && imageName != nil) {
+    imageName = [NSString stringWithFormat:@"%@_then", imageName];
+  }
+  return imageName;
+}
+
+@end
diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMSpeedCameraManagerMode.h b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMSpeedCameraManagerMode.h
new file mode 100644
index 0000000000..c52febd45f
--- /dev/null
+++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMSpeedCameraManagerMode.h
@@ -0,0 +1,5 @@
+typedef NS_ENUM(NSUInteger, MWMSpeedCameraManagerMode) {
+  MWMSpeedCameraManagerModeAuto,
+  MWMSpeedCameraManagerModeAlways,
+  MWMSpeedCameraManagerModeNever
+} NS_SWIFT_NAME(SpeedCameraManagerMode);
diff --git a/iphone/Maps/Core/Location/MWMLocationHelpers.h b/iphone/Maps/Core/Location/MWMLocationHelpers.h
index 0667197afb..6cb6986e0b 100644
--- a/iphone/Maps/Core/Location/MWMLocationHelpers.h
+++ b/iphone/Maps/Core/Location/MWMLocationHelpers.h
@@ -31,14 +31,28 @@ static inline NSString * formattedSpeedAndAltitude(CLLocation * location)
   return result;
 }
 
-static inline NSString * formattedDistance(double const & meters)
-{
+static inline NSString * formattedDistance(double const & meters) {
   if (meters < 0.)
     return nil;
-
-  string s;
-  measurement_utils::FormatDistance(meters, s);
-  return @(s.c_str());
+  
+  auto units = measurement_utils::Units::Metric;
+  settings::TryGet(settings::kMeasurementUnits, units);
+  
+  string distance;
+  switch (units)
+  {
+  case measurement_utils::Units::Imperial:
+    measurement_utils::FormatDistanceWithLocalization(meters,
+                                                      distance,
+                                                      [[@" " stringByAppendingString:L(@"mile")] UTF8String],
+                                                      [[@" " stringByAppendingString:L(@"foot")] UTF8String]);
+  case measurement_utils::Units::Metric:
+    measurement_utils::FormatDistanceWithLocalization(meters,
+                                                      distance,
+                                                      [[@" " stringByAppendingString:L(@"kilometer")] UTF8String],
+                                                      [[@" " stringByAppendingString:L(@"meter")] UTF8String]);
+  }
+  return @(distance.c_str());
 }
 
 static inline BOOL isMyPositionPendingOrNoPosition()
diff --git a/iphone/Maps/Core/Location/MWMLocationManager.h b/iphone/Maps/Core/Location/MWMLocationManager.h
index 05af150421..0503fd3cfc 100644
--- a/iphone/Maps/Core/Location/MWMLocationManager.h
+++ b/iphone/Maps/Core/Location/MWMLocationManager.h
@@ -21,7 +21,6 @@
 - (instancetype)init __attribute__((unavailable("call +manager instead")));
 - (instancetype)copy __attribute__((unavailable("call +manager instead")));
 - (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +manager instead")));
-+ (instancetype)alloc __attribute__((unavailable("call +manager instead")));
 + (instancetype)allocWithZone:(struct _NSZone *)zone
     __attribute__((unavailable("call +manager instead")));
 + (instancetype) new __attribute__((unavailable("call +manager instead")));
diff --git a/iphone/Maps/Core/Location/MWMLocationManager.mm b/iphone/Maps/Core/Location/MWMLocationManager.mm
index c538a0620d..33fc737e27 100644
--- a/iphone/Maps/Core/Location/MWMLocationManager.mm
+++ b/iphone/Maps/Core/Location/MWMLocationManager.mm
@@ -171,7 +171,7 @@ void setPermissionRequested()
   static MWMLocationManager * manager;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    manager = [[super alloc] initManager];
+    manager = [[self alloc] initManager];
   });
   return manager;
 }
diff --git a/iphone/Maps/Core/Routing/MWMRoutePoint.h b/iphone/Maps/Core/Routing/MWMRoutePoint.h
index 056754bdca..3a30d61163 100644
--- a/iphone/Maps/Core/Routing/MWMRoutePoint.h
+++ b/iphone/Maps/Core/Routing/MWMRoutePoint.h
@@ -9,6 +9,12 @@ typedef NS_ENUM(NSUInteger, MWMRoutePointType) {
 - (instancetype)initWithLastLocationAndType:(MWMRoutePointType)type
                           intermediateIndex:(size_t)intermediateIndex;
 
+- (instancetype)initWithCGPoint:(CGPoint)point
+                          title:(NSString *)title
+                       subtitle:(NSString *)subtitle
+                           type:(MWMRoutePointType)type
+              intermediateIndex:(size_t)intermediateIndex;
+
 @property(copy, nonatomic, readonly) NSString * title;
 @property(copy, nonatomic, readonly) NSString * subtitle;
 @property(copy, nonatomic, readonly) NSString * latLonString;
diff --git a/iphone/Maps/Core/Routing/MWMRoutePoint.mm b/iphone/Maps/Core/Routing/MWMRoutePoint.mm
index c3bb8c9b6c..45c0b8d0bc 100644
--- a/iphone/Maps/Core/Routing/MWMRoutePoint.mm
+++ b/iphone/Maps/Core/Routing/MWMRoutePoint.mm
@@ -79,6 +79,21 @@
   return self;
 }
 
+- (instancetype)initWithCGPoint:(CGPoint)point
+                          title:(NSString *)title
+                       subtitle:(NSString *)subtitle
+                           type:(MWMRoutePointType)type
+              intermediateIndex:(size_t)intermediateIndex
+{
+  auto const pointD = m2::PointD(point.x, point.y);
+  self = [self initWithPoint:pointD
+                       title:title
+                    subtitle:subtitle
+                        type:type intermediateIndex:intermediateIndex];
+  return self;
+}
+
+
 - (instancetype)initWithPoint:(m2::PointD const &)point
                         title:(NSString *)title
                      subtitle:(NSString *)subtitle
diff --git a/iphone/Maps/Core/Routing/MWMRouter.h b/iphone/Maps/Core/Routing/MWMRouter.h
index 4684f778b3..c184188888 100644
--- a/iphone/Maps/Core/Routing/MWMRouter.h
+++ b/iphone/Maps/Core/Routing/MWMRouter.h
@@ -12,6 +12,9 @@ typedef void (^MWMImageHeightBlock)(UIImage *, NSString *);
 
 @interface MWMRouter : NSObject
 
++ (void)subscribeToEvents;
++ (void)unsubscribeFromEvents;
+
 + (BOOL)isTaxi;
 + (BOOL)isRoutingActive;
 + (BOOL)isRouteBuilt;
@@ -60,10 +63,20 @@ typedef void (^MWMImageHeightBlock)(UIImage *, NSString *);
 + (void)saveRouteIfNeeded;
 + (void)restoreRouteIfNeeded;
 + (BOOL)hasSavedRoute;
++ (BOOL)isRestoreProcessCompleted;
 
 + (void)updateRoute;
 + (BOOL)hasActiveDrivingOptions;
 + (void)avoidRoadTypeAndRebuild:(MWMRoadType)type;
++ (void)showNavigationMapControls;
++ (void)hideNavigationMapControls;
+
+- (instancetype)init __attribute__((unavailable("call +router instead")));
+- (instancetype)copy __attribute__((unavailable("call +router instead")));
+- (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +router instead")));
++ (instancetype)allocWithZone:(struct _NSZone *)zone
+__attribute__((unavailable("call +router instead")));
++ (instancetype) new __attribute__((unavailable("call +router instead")));
 
 @end
 
diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm
index e817d2523e..e2247a051e 100644
--- a/iphone/Maps/Core/Routing/MWMRouter.mm
+++ b/iphone/Maps/Core/Routing/MWMRouter.mm
@@ -38,6 +38,7 @@ using namespace routing;
 @property(nonatomic) uint32_t routeManagerTransactionId;
 @property(nonatomic) BOOL canAutoAddLastLocation;
 @property(nonatomic) BOOL isAPICall;
+@property(nonatomic) BOOL isRestoreProcessCompleted;
 @property(strong, nonatomic) MWMRoutingOptions * routingOptions;
 
 + (MWMRouter *)router;
@@ -85,7 +86,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
   static MWMRouter * router;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    router = [[super alloc] initRouter];
+    router = [[self alloc] initRouter];
   });
   return router;
 }
@@ -230,10 +231,23 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
     [MWMFrameworkListener addObserver:self];
     _canAutoAddLastLocation = YES;
     _routingOptions = [MWMRoutingOptions new];
+    _isRestoreProcessCompleted = NO;
   }
   return self;
 }
 
++ (void)subscribeToEvents
+{
+  [MWMFrameworkListener addObserver:[MWMRouter router]];
+  [MWMLocationManager addObserver:[MWMRouter router]];
+}
+
++ (void)unsubscribeFromEvents
+{
+  [MWMFrameworkListener removeObserver:[MWMRouter router]];
+  [MWMLocationManager removeObserver:[MWMRouter router]];
+}
+
 + (void)setType:(MWMRouterType)type
 {
   if (type == self.type)
@@ -507,7 +521,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
   // Don't save taxi routing type as default.
   if ([MWMRouter isTaxi])
     GetFramework().GetRoutingManager().SetRouter(routing::RouterType::Vehicle);
-  [[MWMMapViewControlsManager manager] onRouteStop];
+  [self hideNavigationMapControls];
   [MWMRouter router].canAutoAddLastLocation = YES;
 }
 
@@ -612,9 +626,10 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
   if (![MWMRouter isRoutingActive])
     return;
   auto tts = [MWMTextToSpeech tts];
+  NSArray<NSString *> *turnNotifications = [MWMRouter turnNotifications];
   if ([MWMRouter isOnRoute] && tts.active)
   {
-    [tts playTurnNotifications];
+    [tts playTurnNotifications:turnNotifications];
     [tts playWarningSound];
   }
 
@@ -763,12 +778,15 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
   if ([MapsAppDelegate theApp].isDrapeEngineCreated)
   {
     auto & rm = GetFramework().GetRoutingManager();
-    if ([self isRoutingActive] || ![self hasSavedRoute])
+    if ([self isRoutingActive] || ![self hasSavedRoute]) {
+      self.router.isRestoreProcessCompleted = YES;
       return;
+    }
     rm.LoadRoutePoints([self](bool success)
     {
       if (success)
         [self rebuildWithBestRouter:YES];
+      self.router.isRestoreProcessCompleted = YES;
     });
   }
   else
@@ -779,6 +797,11 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
   }
 }
 
++ (BOOL)isRestoreProcessCompleted
+{
+  return self.router.isRestoreProcessCompleted;
+}
+
 + (BOOL)hasSavedRoute
 {
   return GetFramework().GetRoutingManager().HasSavedRoutePoints();
@@ -816,4 +839,12 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
   [self rebuildWithBestRouter:YES];
 }
 
++ (void)showNavigationMapControls {
+  [[MWMMapViewControlsManager manager] onRouteStart];
+}
+
++ (void)hideNavigationMapControls {
+  [[MWMMapViewControlsManager manager] onRouteStop];
+}
+
 @end
diff --git a/iphone/Maps/Core/Search/MWMSearch.h b/iphone/Maps/Core/Search/MWMSearch.h
index e28131ac96..0038de96c2 100644
--- a/iphone/Maps/Core/Search/MWMSearch.h
+++ b/iphone/Maps/Core/Search/MWMSearch.h
@@ -42,11 +42,11 @@ struct ProductInfo;
 + (MWMHotelParams *)getFilter;
 + (void)clearFilter;
 
-- (instancetype)init __attribute__((unavailable("unavailable")));
-- (instancetype)copy __attribute__((unavailable("unavailable")));
-- (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("unavailable")));
-+ (instancetype)alloc __attribute__((unavailable("unavailable")));
-+ (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable("unavailable")));
-+ (instancetype) new __attribute__((unavailable("unavailable")));
+- (instancetype)init __attribute__((unavailable("call +manager instead")));
+- (instancetype)copy __attribute__((unavailable("call +manager instead")));
+- (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +manager instead")));
++ (instancetype)allocWithZone:(struct _NSZone *)zone
+__attribute__((unavailable("call +manager instead")));
++ (instancetype) new __attribute__((unavailable("call +manager instead")));
 
 @end
diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm
index 261e5b8f8a..b69814bfa9 100644
--- a/iphone/Maps/Core/Search/MWMSearch.mm
+++ b/iphone/Maps/Core/Search/MWMSearch.mm
@@ -96,7 +96,7 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params && availab
   static MWMSearch * manager;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    manager = [[super alloc] initManager];
+    manager = [[self alloc] initManager];
   });
   return manager;
 }
diff --git a/iphone/Maps/Core/Settings/MWMRoutingOptions.h b/iphone/Maps/Core/Settings/MWMRoutingOptions.h
index 664ff976ef..d1251fa389 100644
--- a/iphone/Maps/Core/Settings/MWMRoutingOptions.h
+++ b/iphone/Maps/Core/Settings/MWMRoutingOptions.h
@@ -2,6 +2,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+NS_SWIFT_NAME(RoutingOptions)
 @interface MWMRoutingOptions : NSObject
 
 @property(nonatomic) BOOL avoidToll;
diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm
index 5d0aee7d41..a2f9a80cf9 100644
--- a/iphone/Maps/Core/Settings/MWMSettings.mm
+++ b/iphone/Maps/Core/Settings/MWMSettings.mm
@@ -115,6 +115,16 @@ NSString * const kCrashReportingDisabled = @"CrashReportingDisabled";
 
 + (MWMTheme)theme
 {
+  if (@available(iOS 12.0, *)) {
+    if ([MWMCarPlayService shared].isCarplayActivated) {
+      UIUserInterfaceStyle style = [[MWMCarPlayService shared] interfaceStyle];
+      switch (style) {
+      case UIUserInterfaceStyleLight: return MWMThemeDay;
+      case UIUserInterfaceStyleDark: return MWMThemeNight;
+      case UIUserInterfaceStyleUnspecified: break;
+      }
+    }
+  }
   auto ud = NSUserDefaults.standardUserDefaults;
   if (![ud boolForKey:kUDAutoNightModeOff])
     return MWMThemeAuto;
diff --git a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.h b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.h
index 38f9cb6cc6..ecd4a8299d 100644
--- a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.h
+++ b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.h
@@ -14,15 +14,14 @@
 
 @property(nonatomic) BOOL active;
 - (void)setNotificationsLocale:(NSString *)locale;
-- (void)playTurnNotifications;
+- (void)playTurnNotifications:(NSArray<NSString *> *)turnNotifications;
 - (void)playWarningSound;
 
-- (instancetype)init __attribute__((unavailable("call tts instead")));
-- (instancetype)copy __attribute__((unavailable("call tts instead")));
-- (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call tts instead")));
-+ (instancetype)alloc __attribute__((unavailable("call tts instead")));
+- (instancetype)init __attribute__((unavailable("call +tts instead")));
+- (instancetype)copy __attribute__((unavailable("call +tts instead")));
+- (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +tts instead")));
 + (instancetype)allocWithZone:(struct _NSZone *)zone
-    __attribute__((unavailable("call tts instead")));
-+ (instancetype) new __attribute__((unavailable("call tts instead")));
+__attribute__((unavailable("call +tts instead")));
++ (instancetype) new __attribute__((unavailable("call +tts instead")));
 
 @end
diff --git a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm
index aed0cc94cc..4cd9415862 100644
--- a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm
+++ b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm
@@ -4,6 +4,7 @@
 #import "MWMRouter.h"
 #import "MWMTextToSpeech+CPP.h"
 #import "Statistics.h"
+#import "SwiftBridge.h"
 
 #include "LocaleTranslator.h"
 
@@ -65,28 +66,24 @@ using Observers = NSHashTable<Observer>;
 
 @implementation MWMTextToSpeech
 
-+ (MWMTextToSpeech *)tts
-{
++ (MWMTextToSpeech *)tts {
   static dispatch_once_t onceToken;
   static MWMTextToSpeech * tts = nil;
   dispatch_once(&onceToken, ^{
-    tts = [[super alloc] initTTS];
+    tts = [[self alloc] initTTS];
   });
   return tts;
 }
 
-+ (void)applicationDidBecomeActive
-{
++ (void)applicationDidBecomeActive {
   auto tts = [self tts];
   tts.speechSynthesizer = nil;
   tts.speechVoice = nil;
 }
 
-- (instancetype)initTTS
-{
+- (instancetype)initTTS {
   self = [super init];
-  if (self)
-  {
+  if (self) {
     _availableLanguages = availableLanguages();
     _observers = [Observers weakObjectsHashTable];
 
@@ -111,8 +108,7 @@ using Observers = NSHashTable<Observer>;
     if (![[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback
                                           withOptions:AVAudioSessionCategoryOptionMixWithOthers |
                                                       AVAudioSessionCategoryOptionDuckOthers
-                                                error:&err])
-    {
+                                                error:&err]) {
       LOG(LWARNING, ("[ setCategory]] error.", [err localizedDescription]));
     }
 
@@ -121,16 +117,14 @@ using Observers = NSHashTable<Observer>;
   return self;
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
   [[AVAudioSession sharedInstance] setActive:NO
                                  withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation
                                        error:nil];
   self.speechSynthesizer.delegate = nil;
 }
 - (std::vector<std::pair<string, string>>)availableLanguages { return _availableLanguages; }
-- (void)setNotificationsLocale:(NSString *)locale
-{
+- (void)setNotificationsLocale:(NSString *)locale {
   [Statistics logEvent:kStatEventName(kStatTTSSettings, kStatChangeLanguage)
         withParameters:@{kStatValue : locale}];
   NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
@@ -141,8 +135,7 @@ using Observers = NSHashTable<Observer>;
 
 - (BOOL)isValid { return _speechSynthesizer != nil && _speechVoice != nil; }
 + (BOOL)isTTSEnabled { return [NSUserDefaults.standardUserDefaults boolForKey:kIsTTSEnabled]; }
-+ (void)setTTSEnabled:(BOOL)enabled
-{
++ (void)setTTSEnabled:(BOOL)enabled {
   if ([self isTTSEnabled] == enabled)
     return;
   auto tts = [self tts];
@@ -157,8 +150,7 @@ using Observers = NSHashTable<Observer>;
     [tts setActive:YES];
 }
 
-- (void)setActive:(BOOL)active
-{
+- (void)setActive:(BOOL)active {
   if (![[self class] isTTSEnabled] || self.active == active)
     return;
   if (active && ![self isValid])
@@ -170,15 +162,12 @@ using Observers = NSHashTable<Observer>;
 }
 
 - (BOOL)active { return [[self class] isTTSEnabled] && [MWMRouter areTurnNotificationsEnabled]; }
-+ (NSString *)savedLanguage
-{
++ (NSString *)savedLanguage {
   return [NSUserDefaults.standardUserDefaults stringForKey:kUserDefaultsTTSLanguageBcp47];
 }
 
-- (void)createVoice:(NSString *)locale
-{
-  if (!self.speechSynthesizer)
-  {
+- (void)createVoice:(NSString *)locale {
+  if (!self.speechSynthesizer) {
     self.speechSynthesizer = [[AVSpeechSynthesizer alloc] init];
     self.speechSynthesizer.delegate = self;
   }
@@ -190,53 +179,39 @@ using Observers = NSHashTable<Observer>;
   else
     LOG(LWARNING, ("locale is nil. Trying default locale."));
 
-  NSArray<AVSpeechSynthesisVoice *> * availTTSVoices = [AVSpeechSynthesisVoice speechVoices];
   AVSpeechSynthesisVoice * voice = nil;
-  for (NSString * loc in candidateLocales)
-  {
+  for (NSString * loc in candidateLocales) {
     if ([loc isEqualToString:@"en-US"])
       voice = [AVSpeechSynthesisVoice voiceWithIdentifier:AVSpeechSynthesisVoiceIdentifierAlex];
     if (voice)
       break;
-    for (AVSpeechSynthesisVoice * ttsVoice in availTTSVoices)
-    {
-      if ([ttsVoice.language isEqualToString:loc])
-      {
-        voice = [AVSpeechSynthesisVoice voiceWithLanguage:loc];
-        break;
-      }
-    }
+    voice = [AVSpeechSynthesisVoice voiceWithLanguage:loc];
     if (voice)
       break;
   }
 
   self.speechVoice = voice;
-  if (voice)
-  {
+  if (voice) {
     string const twineLang = bcp47ToTwineLanguage(voice.language);
     if (twineLang.empty())
       LOG(LERROR, ("Cannot convert UI locale or default locale to twine language. MWMTextToSpeech "
                    "is invalid."));
     else
       [MWMRouter setTurnNotificationsLocale:@(twineLang.c_str())];
-  }
-  else
-  {
+  } else {
     LOG(LERROR,
         ("The UI language and English are not available for TTS. MWMTextToSpeech is invalid."));
   }
 }
 
-- (void)speakOneString:(NSString *)textToSpeak
-{
+- (void)speakOneString:(NSString *)textToSpeak {
   AVSpeechUtterance * utterance = [AVSpeechUtterance speechUtteranceWithString:textToSpeak];
   utterance.voice = self.speechVoice;
   utterance.rate = AVSpeechUtteranceDefaultSpeechRate;
   [self.speechSynthesizer speakUtterance:utterance];
 }
 
-- (void)playTurnNotifications
-{
+- (void)playTurnNotifications:(NSArray<NSString *> *)turnNotifications {
   auto stopSession = ^{
     if (self.speechSynthesizer.isSpeaking)
       return;
@@ -246,8 +221,7 @@ using Observers = NSHashTable<Observer>;
               error:nil];
   };
 
-  if (![MWMRouter isOnRoute] || !self.active)
-  {
+  if (![MWMRouter isOnRoute] || !self.active) {
     stopSession();
     return;
   }
@@ -255,21 +229,26 @@ using Observers = NSHashTable<Observer>;
   if (![self isValid])
     [self createVoice:[[self class] savedLanguage]];
 
-  if (![self isValid])
-  {
+  if (![self isValid]) {
     stopSession();
     return;
   }
 
-  NSArray<NSString *> * turnNotifications = [MWMRouter turnNotifications];
-  if (turnNotifications.count == 0)
-  {
+  if (turnNotifications.count == 0) {
     stopSession();
     return;
-  }
-  else
-  {
-    if (![[AVAudioSession sharedInstance] setActive:YES error:nil])
+  } else {
+    AVAudioSessionMode mode = AVAudioSessionModeDefault;
+    if (@available(iOS 12.0, *)) {
+      if ([MWMCarPlayService shared].isCarplayActivated) {
+        mode = AVAudioSessionModeVoicePrompt;
+      }
+    }
+    if (![[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback
+                                                 mode:mode
+                                              options:AVAudioSessionCategoryOptionMixWithOthers | AVAudioSessionCategoryOptionDuckOthers
+                                                error:nil] ||
+        ![[AVAudioSession sharedInstance] setActive:YES error:nil])
       return;
 
     for (NSString * notification in turnNotifications)
@@ -277,26 +256,20 @@ using Observers = NSHashTable<Observer>;
   }
 }
 
-- (void)playWarningSound
-{
+- (void)playWarningSound {
   if (!GetFramework().GetRoutingManager().GetSpeedCamManager().ShouldPlayBeepSignal())
     return;
 
   [self.audioPlayer play];
 }
 
-- (AVAudioPlayer *)audioPlayer
-{
-  if (!_audioPlayer)
-  {
-    if (auto url = [[NSBundle mainBundle] URLForResource:@"Alert 5" withExtension:@"m4a"])
-    {
+- (AVAudioPlayer *)audioPlayer {
+  if (!_audioPlayer) {
+    if (auto url = [[NSBundle mainBundle] URLForResource:@"Alert 5" withExtension:@"m4a"]) {
       NSError * error = nil;
       _audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:url error:&error];
       CHECK(!error, (error.localizedDescription.UTF8String));
-    }
-    else
-    {
+    } else {
       CHECK(false, ("Speed warning file not found"));
     }
   }
@@ -306,21 +279,18 @@ using Observers = NSHashTable<Observer>;
 
 #pragma mark - MWMNavigationDashboardObserver
 
-- (void)onTTSStatusUpdated
-{
+- (void)onTTSStatusUpdated {
   for (Observer observer in self.observers)
     [observer onTTSStatusUpdated];
 }
 
 #pragma mark - Add/Remove Observers
 
-+ (void)addObserver:(id<MWMTextToSpeechObserver>)observer
-{
++ (void)addObserver:(id<MWMTextToSpeechObserver>)observer {
   [[self tts].observers addObject:observer];
 }
 
-+ (void)removeObserver:(id<MWMTextToSpeechObserver>)observer
-{
++ (void)removeObserver:(id<MWMTextToSpeechObserver>)observer {
   [[self tts].observers removeObject:observer];
 }
 
diff --git a/iphone/Maps/Core/Traffic/MWMTrafficManager.h b/iphone/Maps/Core/Traffic/MWMTrafficManager.h
index 5e5653df07..0588507c95 100644
--- a/iphone/Maps/Core/Traffic/MWMTrafficManager.h
+++ b/iphone/Maps/Core/Traffic/MWMTrafficManager.h
@@ -38,4 +38,11 @@ typedef NS_ENUM(NSUInteger, MWMTransitManagerState) {
 + (void)setTrafficEnabled:(BOOL)enable;
 + (void)setTransitEnabled:(BOOL)enable;
 
+- (instancetype)init __attribute__((unavailable("call +manager instead")));
+- (instancetype)copy __attribute__((unavailable("call +manager instead")));
+- (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +manager instead")));
++ (instancetype)allocWithZone:(struct _NSZone *)zone
+__attribute__((unavailable("call +manager instead")));
++ (instancetype) new __attribute__((unavailable("call +manager instead")));
+
 @end
diff --git a/iphone/Maps/Core/Traffic/MWMTrafficManager.mm b/iphone/Maps/Core/Traffic/MWMTrafficManager.mm
index dc38e19507..c52b809ad6 100644
--- a/iphone/Maps/Core/Traffic/MWMTrafficManager.mm
+++ b/iphone/Maps/Core/Traffic/MWMTrafficManager.mm
@@ -26,7 +26,7 @@ using Observers = NSHashTable<Observer>;
   static MWMTrafficManager * manager;
   static dispatch_once_t onceToken = 0;
   dispatch_once(&onceToken, ^{
-    manager = [[super alloc] initManager];
+    manager = [[self alloc] initManager];
   });
   return manager;
 }
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Contents.json
new file mode 100644
index 0000000000..da4a164c91
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Contents.json
new file mode 100644
index 0000000000..da4a164c91
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/Contents.json
new file mode 100644
index 0000000000..da4a164c91
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_left_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_left_then.imageset/Contents.json
new file mode 100644
index 0000000000..bfe15cd61d
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_left_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_exit_highway_to_left_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_left_then.imageset/ic_cp_exit_highway_to_left_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_left_then.imageset/ic_cp_exit_highway_to_left_then.pdf
new file mode 100644
index 0000000000..4287523a54
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_left_then.imageset/ic_cp_exit_highway_to_left_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_right_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_right_then.imageset/Contents.json
new file mode 100644
index 0000000000..de7ca65795
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_right_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_exit_highway_to_right_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_right_then.imageset/ic_cp_exit_highway_to_right_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_right_then.imageset/ic_cp_exit_highway_to_right_then.pdf
new file mode 100644
index 0000000000..6ab58e2554
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_right_then.imageset/ic_cp_exit_highway_to_right_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_round_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_round_then.imageset/Contents.json
new file mode 100644
index 0000000000..22494cbeec
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_round_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_round_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_round_then.imageset/ic_cp_round_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_round_then.imageset/ic_cp_round_then.pdf
new file mode 100644
index 0000000000..2a472b9a1b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_round_then.imageset/ic_cp_round_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_left_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_left_then.imageset/Contents.json
new file mode 100644
index 0000000000..dd2f15cbeb
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_left_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_sharp_left_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_left_then.imageset/ic_cp_sharp_left_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_left_then.imageset/ic_cp_sharp_left_then.pdf
new file mode 100644
index 0000000000..e6c182d7ac
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_left_then.imageset/ic_cp_sharp_left_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_right_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_right_then.imageset/Contents.json
new file mode 100644
index 0000000000..dbe7800800
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_right_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_sharp_right_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_right_then.imageset/ic_cp_sharp_right_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_right_then.imageset/ic_cp_sharp_right_then.pdf
new file mode 100644
index 0000000000..c2f2def932
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_right_then.imageset/ic_cp_sharp_right_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_left_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_left_then.imageset/Contents.json
new file mode 100644
index 0000000000..6c2bcc63a6
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_left_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_simple_left_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_left_then.imageset/ic_cp_simple_left_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_left_then.imageset/ic_cp_simple_left_then.pdf
new file mode 100644
index 0000000000..401e00937d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_left_then.imageset/ic_cp_simple_left_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_right_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_right_then.imageset/Contents.json
new file mode 100644
index 0000000000..7c25ae90a0
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_right_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_simple_right_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_right_then.imageset/ic_cp_simple_right_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_right_then.imageset/ic_cp_simple_right_then.pdf
new file mode 100644
index 0000000000..ec0d666610
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_right_then.imageset/ic_cp_simple_right_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_left_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_left_then.imageset/Contents.json
new file mode 100644
index 0000000000..95298854a9
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_left_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_slight_left_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_left_then.imageset/ic_cp_slight_left_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_left_then.imageset/ic_cp_slight_left_then.pdf
new file mode 100644
index 0000000000..f892e3c090
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_left_then.imageset/ic_cp_slight_left_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_right_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_right_then.imageset/Contents.json
new file mode 100644
index 0000000000..a2e2458b40
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_right_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_slight_right_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_right_then.imageset/ic_cp_slight_right_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_right_then.imageset/ic_cp_slight_right_then.pdf
new file mode 100644
index 0000000000..dcf5a9cd41
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_right_then.imageset/ic_cp_slight_right_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_straight_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_straight_then.imageset/Contents.json
new file mode 100644
index 0000000000..6e2859ec48
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_straight_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_straight_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_straight_then.imageset/ic_cp_straight_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_straight_then.imageset/ic_cp_straight_then.pdf
new file mode 100644
index 0000000000..c67eca603d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_straight_then.imageset/ic_cp_straight_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_left_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_left_then.imageset/Contents.json
new file mode 100644
index 0000000000..43fe06b955
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_left_then.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_uturn_left_then.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_left_then.imageset/ic_cp_uturn_left_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_left_then.imageset/ic_cp_uturn_left_then.pdf
new file mode 100644
index 0000000000..a111989af2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_left_then.imageset/ic_cp_uturn_left_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_right_then.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_right_then.imageset/Contents.json
new file mode 100644
index 0000000000..26a4e02e66
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_right_then.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_uturn_right_then.pdf",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_right_then.imageset/ic_cp_uturn_right_then.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_right_then.imageset/ic_cp_uturn_right_then.pdf
new file mode 100644
index 0000000000..4ce39b06b3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_right_then.imageset/ic_cp_uturn_right_then.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_left.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_left.imageset/Contents.json
new file mode 100644
index 0000000000..848e4bfee5
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_left.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_exit_highway_to_left.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_left.imageset/ic_cp_exit_highway_to_left.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_left.imageset/ic_cp_exit_highway_to_left.pdf
new file mode 100644
index 0000000000..941eca62a4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_left.imageset/ic_cp_exit_highway_to_left.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_right.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_right.imageset/Contents.json
new file mode 100644
index 0000000000..4a365925ce
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_right.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_exit_highway_to_right.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_right.imageset/ic_cp_exit_highway_to_right.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_right.imageset/ic_cp_exit_highway_to_right.pdf
new file mode 100644
index 0000000000..d10f8d2f99
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_right.imageset/ic_cp_exit_highway_to_right.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_finish_point.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_finish_point.imageset/Contents.json
new file mode 100644
index 0000000000..57f6c720f4
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_finish_point.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_finish_point.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_finish_point.imageset/ic_cp_finish_point.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_finish_point.imageset/ic_cp_finish_point.pdf
new file mode 100644
index 0000000000..03d8bd629b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_finish_point.imageset/ic_cp_finish_point.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_round.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_round.imageset/Contents.json
new file mode 100644
index 0000000000..c8f5d98783
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_round.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_round.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_round.imageset/ic_cp_round.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_round.imageset/ic_cp_round.pdf
new file mode 100644
index 0000000000..7842b1e739
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_round.imageset/ic_cp_round.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_left.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_left.imageset/Contents.json
new file mode 100644
index 0000000000..7ede7b28c2
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_left.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_sharp_left.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_left.imageset/ic_cp_sharp_left.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_left.imageset/ic_cp_sharp_left.pdf
new file mode 100644
index 0000000000..6ee42f08b2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_left.imageset/ic_cp_sharp_left.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_right.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_right.imageset/Contents.json
new file mode 100644
index 0000000000..dc2d93e7ab
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_right.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_sharp_right.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_right.imageset/ic_cp_sharp_right.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_right.imageset/ic_cp_sharp_right.pdf
new file mode 100644
index 0000000000..1dc08aa9f6
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_right.imageset/ic_cp_sharp_right.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_left.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_left.imageset/Contents.json
new file mode 100644
index 0000000000..2a19d0c3b1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_left.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_simple_left.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_left.imageset/ic_cp_simple_left.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_left.imageset/ic_cp_simple_left.pdf
new file mode 100644
index 0000000000..9e56420820
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_left.imageset/ic_cp_simple_left.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_right.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_right.imageset/Contents.json
new file mode 100644
index 0000000000..4bc8d21f45
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_right.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_simple_right.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_right.imageset/ic_cp_simple_right.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_right.imageset/ic_cp_simple_right.pdf
new file mode 100644
index 0000000000..f9d1eb3caa
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_right.imageset/ic_cp_simple_right.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_left.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_left.imageset/Contents.json
new file mode 100644
index 0000000000..740ddf7e37
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_left.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_slight_left.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_left.imageset/ic_cp_slight_left.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_left.imageset/ic_cp_slight_left.pdf
new file mode 100644
index 0000000000..2117adb929
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_left.imageset/ic_cp_slight_left.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_right.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_right.imageset/Contents.json
new file mode 100644
index 0000000000..9b63d8cf65
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_right.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_slight_right.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_right.imageset/ic_cp_slight_right.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_right.imageset/ic_cp_slight_right.pdf
new file mode 100644
index 0000000000..aa269dd624
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_right.imageset/ic_cp_slight_right.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_straight.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_straight.imageset/Contents.json
new file mode 100644
index 0000000000..a223018e21
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_straight.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_straight.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_straight.imageset/ic_cp_straight.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_straight.imageset/ic_cp_straight.pdf
new file mode 100644
index 0000000000..b55f368242
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_straight.imageset/ic_cp_straight.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_left.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_left.imageset/Contents.json
new file mode 100644
index 0000000000..d6d6800b12
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_left.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_uturn_left.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_left.imageset/ic_cp_uturn_left.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_left.imageset/ic_cp_uturn_left.pdf
new file mode 100644
index 0000000000..e6727fb1bb
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_left.imageset/ic_cp_uturn_left.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_right.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_right.imageset/Contents.json
new file mode 100644
index 0000000000..e02b1dac45
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_right.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_cp_uturn_right.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_right.imageset/ic_cp_uturn_right.pdf b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_right.imageset/ic_cp_uturn_right.pdf
new file mode 100644
index 0000000000..7931cccffe
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_right.imageset/ic_cp_uturn_right.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/Contents.json
new file mode 100644
index 0000000000..ca8632cb7e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "btn_carplay_pan.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/btn_carplay_pan.pdf b/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/btn_carplay_pan.pdf
new file mode 100644
index 0000000000..9cddacad53
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/btn_carplay_pan.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json
new file mode 100644
index 0000000000..9f6082e3a1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_bookmark.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/ic_carplay_bookmark.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/ic_carplay_bookmark.pdf
new file mode 100644
index 0000000000..668b1bacbc
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/ic_carplay_bookmark.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_camera.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_camera.imageset/Contents.json
new file mode 100644
index 0000000000..7463348c73
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_camera.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_camera.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_camera.imageset/ic_carplay_camera.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_camera.imageset/ic_carplay_camera.pdf
new file mode 100644
index 0000000000..c03357adae
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_camera.imageset/ic_carplay_camera.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/Contents.json
new file mode 100644
index 0000000000..b5b6157625
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_ferry.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/ic_carplay_ferry.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/ic_carplay_ferry.pdf
new file mode 100644
index 0000000000..d0acc41a99
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/ic_carplay_ferry.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/Contents.json
new file mode 100644
index 0000000000..f33805a8de
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_ferry_active.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/ic_carplay_ferry_active.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/ic_carplay_ferry_active.pdf
new file mode 100644
index 0000000000..8ae3f37b41
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/ic_carplay_ferry_active.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json
new file mode 100644
index 0000000000..857b5622e7
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_keyboard.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/ic_carplay_keyboard.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/ic_carplay_keyboard.pdf
new file mode 100644
index 0000000000..cb32fd4f9f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/ic_carplay_keyboard.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/Contents.json
new file mode 100644
index 0000000000..2a69e6a79b
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_muted.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/ic_carplay_muted.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/ic_carplay_muted.pdf
new file mode 100644
index 0000000000..a4edec519b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/ic_carplay_muted.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/Contents.json
new file mode 100644
index 0000000000..d892fb8f1a
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_recent.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/ic_carplay_recent.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/ic_carplay_recent.pdf
new file mode 100644
index 0000000000..3ca236a4fc
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/ic_carplay_recent.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_redirect_route.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_redirect_route.imageset/Contents.json
new file mode 100644
index 0000000000..e9a76349b2
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_redirect_route.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_redirect_route.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_redirect_route.imageset/ic_carplay_redirect_route.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_redirect_route.imageset/ic_carplay_redirect_route.pdf
new file mode 100644
index 0000000000..10afbe537d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_redirect_route.imageset/ic_carplay_redirect_route.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json
new file mode 100644
index 0000000000..779364e352
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_settings.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/ic_carplay_settings.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/ic_carplay_settings.pdf
new file mode 100644
index 0000000000..476ea9b0e8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/ic_carplay_settings.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/Contents.json
new file mode 100644
index 0000000000..ae4cf79999
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_speedcam.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/ic_carplay_speedcam.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/ic_carplay_speedcam.pdf
new file mode 100644
index 0000000000..6a657b470f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/ic_carplay_speedcam.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/Contents.json
new file mode 100644
index 0000000000..bf070f02de
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_speedcam_active.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/ic_carplay_speedcam_active.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/ic_carplay_speedcam_active.pdf
new file mode 100644
index 0000000000..de37485a87
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/ic_carplay_speedcam_active.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/Contents.json
new file mode 100644
index 0000000000..f453309665
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_toll.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/ic_carplay_toll.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/ic_carplay_toll.pdf
new file mode 100644
index 0000000000..c4f60747f2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/ic_carplay_toll.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/Contents.json
new file mode 100644
index 0000000000..3c9228214f
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_toll_active.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/ic_carplay_toll_active.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/ic_carplay_toll_active.pdf
new file mode 100644
index 0000000000..2fba6cbb56
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/ic_carplay_toll_active.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight.imageset/Contents.json
new file mode 100644
index 0000000000..6f0dd140e5
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_trafficlight.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight.imageset/ic_carplay_trafficlight.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight.imageset/ic_carplay_trafficlight.pdf
new file mode 100644
index 0000000000..3ed2e850db
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight.imageset/ic_carplay_trafficlight.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight_active.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight_active.imageset/Contents.json
new file mode 100644
index 0000000000..efcda0d148
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight_active.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_trafficlight_active.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight_active.imageset/ic_carplay_trafficlight_active.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight_active.imageset/ic_carplay_trafficlight_active.pdf
new file mode 100644
index 0000000000..925e7976d8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight_active.imageset/ic_carplay_trafficlight_active.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/Contents.json
new file mode 100644
index 0000000000..8cd99816d4
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_volumn.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/ic_carplay_volumn.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/ic_carplay_volumn.pdf
new file mode 100644
index 0000000000..7b36f9af23
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/ic_carplay_volumn.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/Contents.json
new file mode 100644
index 0000000000..8e5994cd5d
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_unpaved.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/ic_carplay_unpaved.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/ic_carplay_unpaved.pdf
new file mode 100644
index 0000000000..73c19108f5
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/ic_carplay_unpaved.pdf differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/Contents.json
new file mode 100644
index 0000000000..1af51b2e48
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_carplay_unpaved_active.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/ic_carplay_unpaved_active.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/ic_carplay_unpaved_active.pdf
new file mode 100644
index 0000000000..bf47569362
Binary files /dev/null and b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/ic_carplay_unpaved_active.pdf differ
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 3b6b88d387..ce7731fcfa 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -569,15 +569,37 @@
 		BB8123D0212C264700ADE512 /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB8123CE212C264700ADE512 /* MetalKit.framework */; };
 		BB8123D62130427E00ADE512 /* MetalContextFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB8123D52130427E00ADE512 /* MetalContextFactory.mm */; };
 		CD08887422B7ABB400C1368D /* MWMDiscoveryCollectionView.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD08887322B7ABB400C1368D /* MWMDiscoveryCollectionView.mm */; };
+		CD6E8677226774C700D1EDF7 /* CPConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6E8676226774C700D1EDF7 /* CPConstants.swift */; };
 		CD96C70C22A681C400DB7CFE /* DiscoveryGuideCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD96C70A22A681C400DB7CFE /* DiscoveryGuideCell.swift */; };
 		CD96C70D22A681C400DB7CFE /* DiscoveryGuideCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD96C70B22A681C400DB7CFE /* DiscoveryGuideCell.xib */; };
 		CD96C71122A6820800DB7CFE /* DiscoveryGuideCollectionHolderCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD96C70F22A6820800DB7CFE /* DiscoveryGuideCollectionHolderCell.xib */; };
 		CD96C71422A6CBFD00DB7CFE /* MWMDiscoveryGuideViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CD96C71322A6CBFD00DB7CFE /* MWMDiscoveryGuideViewModel.m */; };
 		CD96C71722A7B5DE00DB7CFE /* MWMDiscoveryCityGalleryObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD96C71622A7B5DE00DB7CFE /* MWMDiscoveryCityGalleryObjects.mm */; };
 		CD96C71C22A8113100DB7CFE /* MWMDiscoveryControllerViewModel.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDB92CEA229E9ADF00EC757C /* MWMDiscoveryControllerViewModel.mm */; };
+		CD9AD967228067F500EC174A /* MapInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD9AD966228067F500EC174A /* MapInfo.swift */; };
+		CD9AD96C2281B56900EC174A /* CPViewPortState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD9AD96B2281B56900EC174A /* CPViewPortState.swift */; };
+		CD9AD96F2281DF3600EC174A /* CategoryInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD9AD96E2281DF3500EC174A /* CategoryInfo.swift */; };
+		CDB4D4D5222D118E00104869 /* CarPlay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDB4D4D4222D118E00104869 /* CarPlay.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		CDB4D4D7222D248900104869 /* CarPlayStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CDB4D4D6222D248900104869 /* CarPlayStoryboard.storyboard */; };
+		CDB4D4E1222D70DF00104869 /* CarPlayMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB4D4E0222D70DF00104869 /* CarPlayMapViewController.swift */; };
+		CDB4D4E4222E8FF600104869 /* CarPlayService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB4D4E3222E8FF600104869 /* CarPlayService.swift */; };
+		CDB4D5002231412900104869 /* MapTemplateBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB4D4FB2231412900104869 /* MapTemplateBuilder.swift */; };
+		CDB4D5012231412900104869 /* ListTemplateBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB4D4FC2231412900104869 /* ListTemplateBuilder.swift */; };
+		CDB4D5022231412900104869 /* SettingsTemplateBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB4D4FD2231412900104869 /* SettingsTemplateBuilder.swift */; };
 		CDB92CEE229E9CF900EC757C /* MWMDiscoveryMapObjects.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDB92CED229E9CF900EC757C /* MWMDiscoveryMapObjects.mm */; };
 		CDB92CF1229EB8A800EC757C /* MWMDiscoverySearchViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CDB92CF0229EB8A800EC757C /* MWMDiscoverySearchViewModel.m */; };
 		CDB92CF822A5350500EC757C /* MWMDiscoveryHotelViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CDB92CF722A5350500EC757C /* MWMDiscoveryHotelViewModel.m */; };
+		CDCA27382237F1BD00167D87 /* BookmarkInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA27372237F1BD00167D87 /* BookmarkInfo.swift */; };
+		CDCA273A2237FCFE00167D87 /* SearchTemplateBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA27392237FCFE00167D87 /* SearchTemplateBuilder.swift */; };
+		CDCA273F2238087700167D87 /* MWMCarPlaySearchService.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA273E2238087700167D87 /* MWMCarPlaySearchService.mm */; };
+		CDCA2743223F8D1E00167D87 /* ListItemInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA2742223F8D1E00167D87 /* ListItemInfo.swift */; };
+		CDCA2745223FCFD200167D87 /* SearchResultInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA2744223FCFD200167D87 /* SearchResultInfo.swift */; };
+		CDCA2748223FD24600167D87 /* MWMCarPlaySearchResultObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA2747223FD24600167D87 /* MWMCarPlaySearchResultObject.mm */; };
+		CDCA277222426A2400167D87 /* MWMCarPlayBookmarkObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA277122426A2400167D87 /* MWMCarPlayBookmarkObject.mm */; };
+		CDCA27812243F59800167D87 /* CarPlayRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA27802243F59800167D87 /* CarPlayRouter.swift */; };
+		CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA27832245090900167D87 /* ListenerContainer.swift */; };
+		CDCA278622451F5000167D87 /* RouteInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA278522451F5000167D87 /* RouteInfo.swift */; };
+		CDCA278E2248F34C00167D87 /* MWMRoutingManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA278B2248F34C00167D87 /* MWMRoutingManager.mm */; };
 		F5BD255A0838E70EC012748E /* DiscoverySearchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD2ED6E94925472A9901B4 /* DiscoverySearchCell.swift */; };
 		F5BD29FF26AD58255766C51A /* DiscoverySpinnerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD246A7E6BE8CD8600EDD9 /* DiscoverySpinnerCell.swift */; };
 		F5BD2CA4DBEFACBC48195F39 /* DiscoveryCollectionHolderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BD2A86D9DA2F9769D30B54 /* DiscoveryCollectionHolderCell.swift */; };
@@ -1607,6 +1629,9 @@
 		BB8123D52130427E00ADE512 /* MetalContextFactory.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MetalContextFactory.mm; sourceTree = "<group>"; };
 		CD08887222B7ABB400C1368D /* MWMDiscoveryCollectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryCollectionView.h; sourceTree = "<group>"; };
 		CD08887322B7ABB400C1368D /* MWMDiscoveryCollectionView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDiscoveryCollectionView.mm; sourceTree = "<group>"; };
+		CD08888322BCF1C800C1368D /* maps.me rel.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "maps.me rel.entitlements"; sourceTree = "<group>"; };
+		CD08888422BCF1C900C1368D /* maps.me full.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "maps.me full.entitlements"; sourceTree = "<group>"; };
+		CD6E8676226774C700D1EDF7 /* CPConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPConstants.swift; sourceTree = "<group>"; };
 		CD96C70A22A681C400DB7CFE /* DiscoveryGuideCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscoveryGuideCell.swift; sourceTree = "<group>"; };
 		CD96C70B22A681C400DB7CFE /* DiscoveryGuideCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoveryGuideCell.xib; sourceTree = "<group>"; };
 		CD96C70F22A6820800DB7CFE /* DiscoveryGuideCollectionHolderCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoveryGuideCollectionHolderCell.xib; sourceTree = "<group>"; };
@@ -1614,6 +1639,16 @@
 		CD96C71322A6CBFD00DB7CFE /* MWMDiscoveryGuideViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMDiscoveryGuideViewModel.m; sourceTree = "<group>"; };
 		CD96C71522A7B5DE00DB7CFE /* MWMDiscoveryCityGalleryObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryCityGalleryObjects.h; sourceTree = "<group>"; };
 		CD96C71622A7B5DE00DB7CFE /* MWMDiscoveryCityGalleryObjects.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDiscoveryCityGalleryObjects.mm; sourceTree = "<group>"; };
+		CD9AD966228067F500EC174A /* MapInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapInfo.swift; sourceTree = "<group>"; };
+		CD9AD96B2281B56900EC174A /* CPViewPortState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPViewPortState.swift; sourceTree = "<group>"; };
+		CD9AD96E2281DF3500EC174A /* CategoryInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryInfo.swift; sourceTree = "<group>"; };
+		CDB4D4D4222D118E00104869 /* CarPlay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CarPlay.framework; path = System/Library/Frameworks/CarPlay.framework; sourceTree = SDKROOT; };
+		CDB4D4D6222D248900104869 /* CarPlayStoryboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CarPlayStoryboard.storyboard; sourceTree = "<group>"; };
+		CDB4D4E0222D70DF00104869 /* CarPlayMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayMapViewController.swift; sourceTree = "<group>"; };
+		CDB4D4E3222E8FF600104869 /* CarPlayService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayService.swift; sourceTree = "<group>"; };
+		CDB4D4FB2231412900104869 /* MapTemplateBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapTemplateBuilder.swift; sourceTree = "<group>"; };
+		CDB4D4FC2231412900104869 /* ListTemplateBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListTemplateBuilder.swift; sourceTree = "<group>"; };
+		CDB4D4FD2231412900104869 /* SettingsTemplateBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTemplateBuilder.swift; sourceTree = "<group>"; };
 		CDB92CE9229E9ADF00EC757C /* MWMDiscoveryControllerViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryControllerViewModel.h; sourceTree = "<group>"; };
 		CDB92CEA229E9ADF00EC757C /* MWMDiscoveryControllerViewModel.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDiscoveryControllerViewModel.mm; sourceTree = "<group>"; };
 		CDB92CEC229E9CF900EC757C /* MWMDiscoveryMapObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryMapObjects.h; sourceTree = "<group>"; };
@@ -1622,6 +1657,24 @@
 		CDB92CF0229EB8A800EC757C /* MWMDiscoverySearchViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMDiscoverySearchViewModel.m; sourceTree = "<group>"; };
 		CDB92CF622A5350500EC757C /* MWMDiscoveryHotelViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryHotelViewModel.h; sourceTree = "<group>"; };
 		CDB92CF722A5350500EC757C /* MWMDiscoveryHotelViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMDiscoveryHotelViewModel.m; sourceTree = "<group>"; };
+		CDCA27372237F1BD00167D87 /* BookmarkInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkInfo.swift; sourceTree = "<group>"; };
+		CDCA27392237FCFE00167D87 /* SearchTemplateBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTemplateBuilder.swift; sourceTree = "<group>"; };
+		CDCA273D2238087700167D87 /* MWMCarPlaySearchService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCarPlaySearchService.h; sourceTree = "<group>"; };
+		CDCA273E2238087700167D87 /* MWMCarPlaySearchService.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCarPlaySearchService.mm; sourceTree = "<group>"; };
+		CDCA2742223F8D1E00167D87 /* ListItemInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListItemInfo.swift; sourceTree = "<group>"; };
+		CDCA2744223FCFD200167D87 /* SearchResultInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultInfo.swift; sourceTree = "<group>"; };
+		CDCA2746223FD24600167D87 /* MWMCarPlaySearchResultObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCarPlaySearchResultObject.h; sourceTree = "<group>"; };
+		CDCA2747223FD24600167D87 /* MWMCarPlaySearchResultObject.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCarPlaySearchResultObject.mm; sourceTree = "<group>"; };
+		CDCA277022426A2400167D87 /* MWMCarPlayBookmarkObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCarPlayBookmarkObject.h; sourceTree = "<group>"; };
+		CDCA277122426A2400167D87 /* MWMCarPlayBookmarkObject.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCarPlayBookmarkObject.mm; sourceTree = "<group>"; };
+		CDCA27802243F59800167D87 /* CarPlayRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayRouter.swift; sourceTree = "<group>"; };
+		CDCA27832245090900167D87 /* ListenerContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListenerContainer.swift; sourceTree = "<group>"; };
+		CDCA278522451F5000167D87 /* RouteInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouteInfo.swift; sourceTree = "<group>"; };
+		CDCA278A2248F34C00167D87 /* MWMRoutingManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutingManager.h; sourceTree = "<group>"; };
+		CDCA278B2248F34C00167D87 /* MWMRoutingManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutingManager.mm; sourceTree = "<group>"; };
+		CDCA278C2248F34C00167D87 /* MWMRouterResultCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterResultCode.h; sourceTree = "<group>"; };
+		CDCA278F2248F3B800167D87 /* MWMLocationModeListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMLocationModeListener.h; sourceTree = "<group>"; };
+		CDE0F3AD225B8D45008BA5C3 /* MWMSpeedCameraManagerMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSpeedCameraManagerMode.h; sourceTree = "<group>"; };
 		ED48BBB317C267F5003E7E92 /* ColorPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorPickerView.h; sourceTree = "<group>"; };
 		ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ColorPickerView.mm; sourceTree = "<group>"; };
 		ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = "<group>"; };
@@ -1996,6 +2049,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4577B28121F2066A00864FAC /* libvulkan_wrapper.a in Frameworks */,
+				CDB4D4D5222D118E00104869 /* CarPlay.framework in Frameworks */,
 				BB2C99B021B6AB4500F7371C /* libdescriptions.a in Frameworks */,
 				3D1958EB213804B6009A83EC /* libmetrics.a in Frameworks */,
 				4598438621394CFD00F8CAB2 /* MetalPerformanceShaders.framework in Frameworks */,
@@ -2081,6 +2135,7 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				CDB4D4E2222E8F8200104869 /* CarPlay */,
 				346EDAD81B9F0E15004F8DB5 /* Components */,
 				97B4E9271851DAB300BEC5D7 /* Custom Views */,
 				F64F195F1AB8125C006EAF7E /* CustomAlert */,
@@ -2163,6 +2218,8 @@
 			children = (
 				F6C3A1B121AC22810060EEC8 /* Alert 5.m4a */,
 				34D7DB77204ED3DD0041D015 /* maps.me dbg.entitlements */,
+				CD08888422BCF1C900C1368D /* maps.me full.entitlements */,
+				CD08888322BCF1C800C1368D /* maps.me rel.entitlements */,
 				345E8F4D1F83976800A826CC /* GoogleService-Info.plist */,
 				34BBD6451F8264980070CA50 /* GoogleSignIn.bundle */,
 				6B653B931C7F2DE4007BEFC5 /* cuisine-strings */,
@@ -2176,6 +2233,7 @@
 			isa = PBXGroup;
 			children = (
 				4577B28021F2066A00864FAC /* libvulkan_wrapper.a */,
+				CDB4D4D4222D118E00104869 /* CarPlay.framework */,
 				BB2C99AF21B6AB4500F7371C /* libdescriptions.a */,
 				474C9F59213FF75800369009 /* StoreKit.framework */,
 				3D1958EA213804B6009A83EC /* libmetrics.a */,
@@ -2383,8 +2441,8 @@
 		340475281E081A4600C92850 /* Core */ = {
 			isa = PBXGroup;
 			children = (
+				CDCA27822245090900167D87 /* EventListening */,
 				47B9064821C7FA100079C85E /* WebImage */,
-				473464A8218C688400D6AF5B /* Util */,
 				470F5A7B2189BA7200754295 /* InappPurchase */,
 				474C9F602141894300369009 /* Metrics */,
 				472E3F4221468AF40020E412 /* Subscriptions */,
@@ -2536,6 +2594,7 @@
 				340E1EE81E2F614400CE49BF /* Settings.storyboard */,
 				340E1EE91E2F614400CE49BF /* Storyboard.swift */,
 				340E1EEA1E2F614400CE49BF /* Welcome.storyboard */,
+				CDB4D4D6222D248900104869 /* CarPlayStoryboard.storyboard */,
 			);
 			path = Storyboard;
 			sourceTree = "<group>";
@@ -2946,6 +3005,7 @@
 		3486B50F1E27AD3B0069C126 /* Framework */ = {
 			isa = PBXGroup;
 			children = (
+				CDCA27762243CCFF00167D87 /* ProxyObjects */,
 				3486B5101E27AD3B0069C126 /* Framework.cpp */,
 				3486B5111E27AD3B0069C126 /* Framework.h */,
 				3486B5121E27AD3B0069C126 /* MWMFrameworkListener.h */,
@@ -3396,13 +3456,6 @@
 			path = Subscriptions;
 			sourceTree = "<group>";
 		};
-		473464A8218C688400D6AF5B /* Util */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Util;
-			sourceTree = "<group>";
-		};
 		474A450520EBA03900C10B4E /* Layers */ = {
 			isa = PBXGroup;
 			children = (
@@ -3587,6 +3640,93 @@
 			path = "View Models";
 			sourceTree = "<group>";
 		};
+		CDB4D4DA222D24EE00104869 /* CarPlay */ = {
+			isa = PBXGroup;
+			children = (
+				CDB4D4E0222D70DF00104869 /* CarPlayMapViewController.swift */,
+			);
+			path = CarPlay;
+			sourceTree = "<group>";
+		};
+		CDB4D4E2222E8F8200104869 /* CarPlay */ = {
+			isa = PBXGroup;
+			children = (
+				CD9AD96B2281B56900EC174A /* CPViewPortState.swift */,
+				CD6E8676226774C700D1EDF7 /* CPConstants.swift */,
+				CDB4D4FA2231412900104869 /* Template Builders */,
+				CDB4D4F72231412900104869 /* Templates Data */,
+				CDB4D4E3222E8FF600104869 /* CarPlayService.swift */,
+				CDCA27802243F59800167D87 /* CarPlayRouter.swift */,
+				CDCA273D2238087700167D87 /* MWMCarPlaySearchService.h */,
+				CDCA273E2238087700167D87 /* MWMCarPlaySearchService.mm */,
+				CDCA2746223FD24600167D87 /* MWMCarPlaySearchResultObject.h */,
+				CDCA2747223FD24600167D87 /* MWMCarPlaySearchResultObject.mm */,
+				CDCA277022426A2400167D87 /* MWMCarPlayBookmarkObject.h */,
+				CDCA277122426A2400167D87 /* MWMCarPlayBookmarkObject.mm */,
+			);
+			path = CarPlay;
+			sourceTree = "<group>";
+		};
+		CDB4D4F72231412900104869 /* Templates Data */ = {
+			isa = PBXGroup;
+			children = (
+				CDCA27372237F1BD00167D87 /* BookmarkInfo.swift */,
+				CDCA2742223F8D1E00167D87 /* ListItemInfo.swift */,
+				CDCA2744223FCFD200167D87 /* SearchResultInfo.swift */,
+				CDCA278522451F5000167D87 /* RouteInfo.swift */,
+				CD9AD966228067F500EC174A /* MapInfo.swift */,
+				CD9AD96E2281DF3500EC174A /* CategoryInfo.swift */,
+			);
+			path = "Templates Data";
+			sourceTree = "<group>";
+		};
+		CDB4D4FA2231412900104869 /* Template Builders */ = {
+			isa = PBXGroup;
+			children = (
+				CDB4D4FB2231412900104869 /* MapTemplateBuilder.swift */,
+				CDB4D4FC2231412900104869 /* ListTemplateBuilder.swift */,
+				CDB4D4FD2231412900104869 /* SettingsTemplateBuilder.swift */,
+				CDCA27392237FCFE00167D87 /* SearchTemplateBuilder.swift */,
+			);
+			path = "Template Builders";
+			sourceTree = "<group>";
+		};
+		CDCA27762243CCFF00167D87 /* ProxyObjects */ = {
+			isa = PBXGroup;
+			children = (
+				CDCA278D2248F34C00167D87 /* Location */,
+				CDCA27892248F34C00167D87 /* Routing */,
+			);
+			path = ProxyObjects;
+			sourceTree = "<group>";
+		};
+		CDCA27822245090900167D87 /* EventListening */ = {
+			isa = PBXGroup;
+			children = (
+				CDCA27832245090900167D87 /* ListenerContainer.swift */,
+			);
+			path = EventListening;
+			sourceTree = "<group>";
+		};
+		CDCA27892248F34C00167D87 /* Routing */ = {
+			isa = PBXGroup;
+			children = (
+				CDCA278A2248F34C00167D87 /* MWMRoutingManager.h */,
+				CDCA278B2248F34C00167D87 /* MWMRoutingManager.mm */,
+				CDCA278C2248F34C00167D87 /* MWMRouterResultCode.h */,
+				CDE0F3AD225B8D45008BA5C3 /* MWMSpeedCameraManagerMode.h */,
+			);
+			path = Routing;
+			sourceTree = "<group>";
+		};
+		CDCA278D2248F34C00167D87 /* Location */ = {
+			isa = PBXGroup;
+			children = (
+				CDCA278F2248F3B800167D87 /* MWMLocationModeListener.h */,
+			);
+			path = Location;
+			sourceTree = "<group>";
+		};
 		F607C18B1C047FCA00B53A87 /* Segue */ = {
 			isa = PBXGroup;
 			children = (
@@ -3837,6 +3977,7 @@
 		F6E2FBFB1E097B9F0083EBEC /* UI */ = {
 			isa = PBXGroup;
 			children = (
+				CDB4D4DA222D24EE00104869 /* CarPlay */,
 				F6E407CC1FC45ED4001F7821 /* Discovery */,
 				3432E17F1E49BEFA008477E9 /* Ads */,
 				34574A601E3B5B2A0061E839 /* Appearance */,
@@ -4528,9 +4669,9 @@
 				ORGANIZATIONNAME = MapsWithMe;
 				TargetAttributes = {
 					6741A93D1BF340DE002C974C = {
-						DevelopmentTeam = 3T6FSDE8C7;
+						DevelopmentTeam = N9X2A789QT;
 						LastSwiftMigration = 0900;
-						ProvisioningStyle = Automatic;
+						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.InAppPurchase = {
 								enabled = 1;
@@ -4831,6 +4972,7 @@
 				47B505552136B0CF009CBB55 /* SearchTutorialBlur.xib in Resources */,
 				6741A97D1BF340DE002C974C /* synonyms.txt in Resources */,
 				34E50DF31F6FCC41008EED49 /* UGCYourReviewCell.xib in Resources */,
+				CDB4D4D7222D248900104869 /* CarPlayStoryboard.storyboard in Resources */,
 				3476B8E11BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */,
 				3476B8DD1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */,
 				6741A95D1BF340DE002C974C /* types.txt in Resources */,
@@ -4954,6 +5096,7 @@
 				34AB66651FC5AA330078E451 /* TransportTransitTrain.swift in Sources */,
 				343064411E9FDC7300DC7665 /* SearchIndex.swift in Sources */,
 				F6664BFA1E6459CB00E703C2 /* PPFacilityCell.swift in Sources */,
+				CDCA273F2238087700167D87 /* MWMCarPlaySearchService.mm in Sources */,
 				348B926D1FF3B5E100379009 /* UIView+Animation.swift in Sources */,
 				F6E2FDE91E097BA00083EBEC /* MWMObjectsCategorySelectorController.mm in Sources */,
 				34AB665F1FC5AA330078E451 /* TransportTransitIntermediatePoint.swift in Sources */,
@@ -4993,6 +5136,7 @@
 				F6E2FE491E097BA00083EBEC /* MWMPlacePageData.mm in Sources */,
 				348F8A531F863B6100060C2A /* UGCReview.swift in Sources */,
 				340475501E081A4600C92850 /* fabric_logging_ios.mm in Sources */,
+				CDCA273A2237FCFE00167D87 /* SearchTemplateBuilder.swift in Sources */,
 				34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm in Sources */,
 				F6E2FED01E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */,
 				34D4FA671E265749003F53EF /* WhatsNewController.swift in Sources */,
@@ -5041,6 +5185,7 @@
 				34763F071F3092E700F4D2D3 /* String+Format.swift in Sources */,
 				346DB83A1E5C4F6700E3123E /* GalleryItemModel.swift in Sources */,
 				F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.mm in Sources */,
+				CDCA278E2248F34C00167D87 /* MWMRoutingManager.mm in Sources */,
 				34D3AFF21E37945B004100F9 /* UITableView+Cells.swift in Sources */,
 				34D3B0301E389D05004100F9 /* MWMEditorCategoryCell.mm in Sources */,
 				F653CE191C71F62700A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */,
@@ -5054,12 +5199,14 @@
 				473CBF9B2164DD470059BD54 /* SettingsTableViewSelectableProgressCell.swift in Sources */,
 				47E3C72D2111E6A2008B3B27 /* FadeTransitioning.swift in Sources */,
 				34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */,
+				CD6E8677226774C700D1EDF7 /* CPConstants.swift in Sources */,
 				474C9F632141896800369009 /* MWMEye.mm in Sources */,
 				F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */,
 				33F8BA4421998BFA00ECA8EE /* MWMTagGroup.m in Sources */,
 				F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */,
 				F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */,
 				34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */,
+				CDB4D5012231412900104869 /* ListTemplateBuilder.swift in Sources */,
 				6741A9CF1BF340DE002C974C /* MWMLocationAlert.mm in Sources */,
 				474AC76C2139E4F2002F9BF9 /* RemoveAdsViewController.swift in Sources */,
 				34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.mm in Sources */,
@@ -5077,6 +5224,7 @@
 				346DB8281E5C4F6700E3123E /* GalleryCell.swift in Sources */,
 				47B9065521C7FA400079C85E /* NSString+MD5.m in Sources */,
 				33F8BA4121998BEB00ECA8EE /* MWMTag.m in Sources */,
+				CDB4D5022231412900104869 /* SettingsTemplateBuilder.swift in Sources */,
 				F6EBB26F1FD7E33300B69B6A /* DiscoveryNoResultsCell.swift in Sources */,
 				47D0026721999DA900F651A2 /* PendingTransactionsHandler.swift in Sources */,
 				F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */,
@@ -5116,6 +5264,7 @@
 				34AB66741FC5AA330078E451 /* BaseRoutePreviewStatus.swift in Sources */,
 				340475531E081A4600C92850 /* MWMCustomFacebookEvents.mm in Sources */,
 				349D1CE41E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */,
+				CDB4D4E1222D70DF00104869 /* CarPlayMapViewController.swift in Sources */,
 				347039A91FB9A5CF00E47496 /* MWMBookmarksManager.mm in Sources */,
 				F692F3831EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */,
 				34574A671E3B85F80061E839 /* ThemeManager.swift in Sources */,
@@ -5123,6 +5272,7 @@
 				34AB664D1FC5AA330078E451 /* RouteManagerFooterView.swift in Sources */,
 				F6E2FD771E097BA00083EBEC /* MWMMapDownloaderDataSource.mm in Sources */,
 				6741A9E01BF340DE002C974C /* MWMDownloaderDialogHeader.mm in Sources */,
+				CDCA2748223FD24600167D87 /* MWMCarPlaySearchResultObject.mm in Sources */,
 				349D1AD81E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */,
 				F6E2FEBE1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */,
 				3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.mm in Sources */,
@@ -5140,6 +5290,7 @@
 				47C3DB582268CDDB00DF6F91 /* DeeplinkInfoViewController.swift in Sources */,
 				3404F490202898CC0090E401 /* BMCModels.swift in Sources */,
 				F6E2FD561E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.mm in Sources */,
+				CDB4D5002231412900104869 /* MapTemplateBuilder.swift in Sources */,
 				3462258F1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm in Sources */,
 				470F5A7D2189BB2F00754295 /* PaidRoutePurchase.swift in Sources */,
 				34AB66171FC5AA320078E451 /* MWMiPhoneRoutePreview.m in Sources */,
@@ -5149,6 +5300,7 @@
 				F6E2FD981E097BA00083EBEC /* MWMBookmarkTitleCell.m in Sources */,
 				33E905462180C40900868CAC /* UIViewController+Authorization.swift in Sources */,
 				6741A9E81BF340DE002C974C /* MWMAPIBar.mm in Sources */,
+				CDCA2745223FCFD200167D87 /* SearchResultInfo.swift in Sources */,
 				349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.mm in Sources */,
 				349D1ADE1E2E325C004A2006 /* MWMBottomMenuViewController.mm in Sources */,
 				6741A9EC1BF340DE002C974C /* MWMCircularProgress.mm in Sources */,
@@ -5167,6 +5319,7 @@
 				F6E2FE3D1E097BA00083EBEC /* MWMMigrationViewController.mm in Sources */,
 				F6E2FD501E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.mm in Sources */,
 				4719A643219CB61D009F9AA7 /* BillingPendingTransaction.swift in Sources */,
+				CD9AD96F2281DF3600EC174A /* CategoryInfo.swift in Sources */,
 				F6E2FE881E097BA00083EBEC /* MWMPlacePageRegularCell.mm in Sources */,
 				3DEE1AEB21F72CD300054A91 /* MWMPowerManagmentViewController.mm in Sources */,
 				34AB66771FC5AA330078E451 /* TransportRoutePreviewStatus.swift in Sources */,
@@ -5205,6 +5358,7 @@
 				F6E2FE3A1E097BA00083EBEC /* MWMMigrationView.mm in Sources */,
 				3472B5CF200F4A2B00DC6CD5 /* BackgroundFetchTask.swift in Sources */,
 				477219052243E79500E5B227 /* DrivingOptionsViewController.swift in Sources */,
+				CDB4D4E4222E8FF600104869 /* CarPlayService.swift in Sources */,
 				F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.mm in Sources */,
 				F6E2FF661E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */,
 				3472B5EB200F8CFF00DC6CD5 /* MWMUGCHelper.mm in Sources */,
@@ -5229,6 +5383,7 @@
 				F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.mm in Sources */,
 				340FDC092031C39E00F140AD /* BMCPermissionsPendingCell.swift in Sources */,
 				F6E2FD6B1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.mm in Sources */,
+				CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */,
 				47E3C7252111E41B008B3B27 /* DimmedModalPresentationController.swift in Sources */,
 				3409D50B1FC6D8D2000F9B3E /* FilterCheckCell.swift in Sources */,
 				47E3C72121108E9F008B3B27 /* BookmarksLoadedViewController.swift in Sources */,
@@ -5239,6 +5394,7 @@
 				6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */,
 				33F8BA472199A91900ECA8EE /* MWMTag+Convenience.mm in Sources */,
 				F6E2FE9D1E097BA00083EBEC /* MWMiPhonePlacePageLayoutImpl.mm in Sources */,
+				CDCA27382237F1BD00167D87 /* BookmarkInfo.swift in Sources */,
 				34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */,
 				3454D7C81E07F045004AF2AD /* UIButton+RuntimeAttributes.mm in Sources */,
 				337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */,
@@ -5254,12 +5410,14 @@
 				34AB66591FC5AA330078E451 /* TransportTransitFlowLayout.swift in Sources */,
 				3486B5191E27AD3B0069C126 /* MWMFrameworkListener.mm in Sources */,
 				3404756B1E081A4600C92850 /* MWMSearch+CoreSpotlight.mm in Sources */,
+				CD9AD96C2281B56900EC174A /* CPViewPortState.swift in Sources */,
 				F653CE121C6DEC8E00A453F1 /* MWMDropDown.mm in Sources */,
 				3404755C1E081A4600C92850 /* MWMLocationManager.mm in Sources */,
 				3454D7BC1E07F045004AF2AD /* CLLocation+Mercator.mm in Sources */,
 				47E3C7272111E5A8008B3B27 /* AlertPresentationController.swift in Sources */,
 				F6E2FF4E1E097BA00083EBEC /* MWMAboutController.mm in Sources */,
 				47B06DF921B95F5E0094CCAD /* IGeoTracker.swift in Sources */,
+				CDCA27812243F59800167D87 /* CarPlayRouter.swift in Sources */,
 				34F407381E9E1AFF00E57AC0 /* FacebookBanner.swift in Sources */,
 				34F5E0D41E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */,
 				33BCDF8B218C976D00EF5B74 /* TagsCollectionViewLayout.swift in Sources */,
@@ -5277,6 +5435,7 @@
 				47C7F97521930F5300C2760C /* IInAppBilling.swift in Sources */,
 				4719A64E21A30C3B009F9AA7 /* PaidRouteStatistics.swift in Sources */,
 				34BBD6601F8270360070CA50 /* AuthorizationiPadPresentationController.swift in Sources */,
+				CDCA277222426A2400167D87 /* MWMCarPlayBookmarkObject.mm in Sources */,
 				F6E2FD7D1E097BA00083EBEC /* MWMMapDownloaderExtendedDataSource.mm in Sources */,
 				F6E2FED31E097BA00083EBEC /* MWMSearchHotelsFilterViewController.mm in Sources */,
 				340475741E081A4600C92850 /* MWMStorage.mm in Sources */,
@@ -5289,6 +5448,7 @@
 				F655C027207278300048A241 /* DiscoveryMoreCell.swift in Sources */,
 				337F98B821D3D67E00C8AC27 /* SearchHistoryQueryCell.swift in Sources */,
 				34AB66621FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */,
+				CDCA2743223F8D1E00167D87 /* ListItemInfo.swift in Sources */,
 				B32FE74020D2844600EF7446 /* DownloadedBookmarksViewController.swift in Sources */,
 				340416541E7C09C200E2B6D6 /* PhotoScalingView.swift in Sources */,
 				4767CDA820AB401000BD8166 /* LinkTextView.swift in Sources */,
@@ -5339,6 +5499,7 @@
 				3454D7BF1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */,
 				6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.mm in Sources */,
 				34D3B0481E389D05004100F9 /* MWMNoteCell.mm in Sources */,
+				CD9AD967228067F500EC174A /* MapInfo.swift in Sources */,
 				47F6E51221F61908004580CA /* CoreNotificationWrapper.mm in Sources */,
 				F6E2FE971E097BA00083EBEC /* ContextViews.mm in Sources */,
 				344532561F7155540059FBCC /* UGCReviewModel.swift in Sources */,
@@ -5393,6 +5554,7 @@
 				CD08887422B7ABB400C1368D /* MWMDiscoveryCollectionView.mm in Sources */,
 				4788739220EE326500F6826B /* VerticallyAlignedButton.swift in Sources */,
 				3444DFDE1F18A5AF00E73099 /* SideButtonsArea.swift in Sources */,
+				CDCA278622451F5000167D87 /* RouteInfo.swift in Sources */,
 				3451F4EE1F026DAF00A981F2 /* PlacePageTaxiCell.swift in Sources */,
 				3467CEB6202C6FA900D3C670 /* BMCNotificationsCell.swift in Sources */,
 				34B846A32029DFEB0081ECCD /* BMCPermissionsHeader.swift in Sources */,
@@ -5545,8 +5707,10 @@
 			baseConfigurationReference = 0B07BBB5C2EFC6F60EF51BC8 /* Pods-MAPS.ME.debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "maps.me dbg.entitlements";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Aleksey Belousov (927TL2MZMM)";
+				CODE_SIGN_STYLE = Manual;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = 3T6FSDE8C7;
+				DEVELOPMENT_TEAM = N9X2A789QT;
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = MetalContextFactory.mm;
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = MetalContextFactory.mm;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5556,6 +5720,8 @@
 					"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/FacebookAudienceNetwork/SDK",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.full;
+				PROVISIONING_PROFILE_SPECIFIER = "Maps.me Carplay";
 			};
 			name = Debug;
 		};
@@ -5563,9 +5729,11 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 8022FD18AD3EEA9E8C75A7A7 /* Pods-MAPS.ME.release.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_ENTITLEMENTS = "maps.me dbg.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "maps.me rel.entitlements";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Aleksey Belousov (927TL2MZMM)";
+				CODE_SIGN_STYLE = Manual;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = 3T6FSDE8C7;
+				DEVELOPMENT_TEAM = N9X2A789QT;
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = MetalContextFactory.mm;
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = MetalContextFactory.mm;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5575,6 +5743,8 @@
 					"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/FacebookAudienceNetwork/SDK",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.full;
+				PROVISIONING_PROFILE_SPECIFIER = "Maps.me Carplay";
 			};
 			name = Release;
 		};
@@ -5582,9 +5752,11 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 166595280BE641CF8ADE2209 /* Pods-MAPS.ME.production full.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_ENTITLEMENTS = "maps.me dbg.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "maps.me full.entitlements";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Aleksey Belousov (927TL2MZMM)";
+				CODE_SIGN_STYLE = Manual;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = 3T6FSDE8C7;
+				DEVELOPMENT_TEAM = N9X2A789QT;
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = MetalContextFactory.mm;
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = MetalContextFactory.mm;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5594,6 +5766,8 @@
 					"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/FacebookAudienceNetwork/SDK",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.full;
+				PROVISIONING_PROFILE_SPECIFIER = "Maps.me Carplay";
 			};
 			name = "Production Full";
 		};
diff --git a/iphone/Maps/UI/Appearance/ThemeManager.swift b/iphone/Maps/UI/Appearance/ThemeManager.swift
index 9b5350249a..eac42222d2 100644
--- a/iphone/Maps/UI/Appearance/ThemeManager.swift
+++ b/iphone/Maps/UI/Appearance/ThemeManager.swift
@@ -18,7 +18,7 @@ final class ThemeManager: NSObject {
       case .vehicleNight: return isVehicleRouting ? .vehicleNight : .night
       case .auto:
         guard isVehicleRouting else { return .day }
-        switch MWMFrameworkHelper.daytime() {
+        switch FrameworkHelper.daytime() {
         case .day: return .vehicleDay
         case .night: return .vehicleNight
         }
@@ -36,7 +36,7 @@ final class ThemeManager: NSObject {
       }
     }(actualTheme)
 
-    MWMFrameworkHelper.setTheme(actualTheme)
+    FrameworkHelper.setTheme(actualTheme)
     if nightMode != newNightMode {
       UIColor.setNightMode(newNightMode)
       (UIViewController.topViewController() as! MWMController).mwm_refreshUI()
diff --git a/iphone/Maps/UI/AvailableArea/VisibleArea.swift b/iphone/Maps/UI/AvailableArea/VisibleArea.swift
index ce38f76470..6060a34b6b 100644
--- a/iphone/Maps/UI/AvailableArea/VisibleArea.swift
+++ b/iphone/Maps/UI/AvailableArea/VisibleArea.swift
@@ -10,7 +10,12 @@ final class VisibleArea: AvailableArea {
   }
 
   override func notifyObserver() {
-    MWMFrameworkHelper.setVisibleViewport(areaFrame)
+    if #available(iOS 12.0, *) {
+      if CarPlayService.shared.isCarplayActivated {
+        return
+      }
+    }
+    FrameworkHelper.setVisibleViewport(areaFrame)
   }
 }
 
diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.mm
index 8a15b90495..8e108bb3d8 100644
--- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.mm
+++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.mm
@@ -28,8 +28,9 @@ CGFloat constexpr kDefaultMainButtonsHeight = 48;
 - (void)didMoveToSuperview
 {
   [super didMoveToSuperview];
-  self.minY = self.superview.height;
-  self.width = self.superview.width;
+  CGSize screenSize = [[UIScreen mainScreen] bounds].size;
+  self.minY = screenSize.height;
+  self.width = screenSize.width;
 }
 
 - (void)layoutSubviews
diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
index 2b716b1f0b..7cedb95df0 100644
--- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
+++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
@@ -81,7 +81,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
     _mapViewController = controller;
     _delegate = delegate;
     [controller addChildViewController:self];
-    [controller.view addSubview:self.view];
+    [controller.controlsView addSubview:self.view];
     [controller.view layoutIfNeeded];
   }
   return self;
@@ -393,7 +393,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
   });
   BOOL const menuActive = (state == MWMBottomMenuStateActive);
   if (menuActive)
-    [self.mapViewController.view bringSubviewToFront:self.menuView];
+    [self.mapViewController.controlsView bringSubviewToFront:self.menuView];
 
   [self.dimBackground setVisible:menuActive completion:nil];
   self.menuView.state = state;
diff --git a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift
new file mode 100644
index 0000000000..2c1f8ec426
--- /dev/null
+++ b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift
@@ -0,0 +1,150 @@
+final class CarPlayMapViewController: MWMViewController {
+  private(set) var mapView: EAGLView?
+  @IBOutlet var speedInfoView: UIView!
+  @IBOutlet var speedLimitContainer: UIView!
+  @IBOutlet var speedCamImageView: UIImageView!
+  @IBOutlet var speedLimitLabel: UILabel!
+  @IBOutlet var currentSpeedView: UIView!
+  @IBOutlet var currentSpeedLabel: UILabel!
+  private var currentSpeed: Int = 0
+  private var speedLimit: Int?
+  private var isCameraOnRoute: Bool = false
+  private var viewPortState: CPViewPortState = .default
+  private var isLeftWheelCar: Bool {
+    return self.speedInfoView.frame.origin.x > self.view.frame.midX
+  }
+  
+  override func viewDidLoad() {
+    super.viewDidLoad()
+  }
+  
+  override func viewDidLayoutSubviews() {
+    super.viewDidLayoutSubviews()
+    updateVisibleViewPortState(viewPortState)
+  }
+  
+  func addMapView(_ mapView: EAGLView, mapButtonSafeAreaLayoutGuide: UILayoutGuide) {
+    mapView.translatesAutoresizingMaskIntoConstraints = false
+    removeMapView()
+    
+    self.mapView = mapView
+    mapView.frame = view.bounds
+    view.insertSubview(mapView, at: 0)
+    mapView.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
+    mapView.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
+    mapView.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
+    mapView.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
+    speedInfoView.trailingAnchor.constraint(equalTo: mapButtonSafeAreaLayoutGuide.trailingAnchor).isActive = true
+  }
+  
+  func removeMapView() {
+    if let mapView = mapView {
+      mapView.removeFromSuperview()
+      self.mapView = nil
+    }
+  }
+  
+  
+  func hideSpeedControl() {
+    if !speedInfoView.isHidden {
+      speedInfoView.isHidden = true
+    }
+  }
+  
+  func showSpeedControl() {
+    if speedInfoView.isHidden {
+      speedInfoView.isHidden = false
+    }
+  }
+  
+  func updateCurrentSpeed(_ speed: Int) {
+    self.currentSpeed = speed
+    updateSpeedControl()
+  }
+  
+  func updateCameraInfo(isCameraOnRoute: Bool, speedLimit: Int?) {
+    self.isCameraOnRoute = isCameraOnRoute
+    self.speedLimit = speedLimit
+    updateSpeedControl()
+  }
+  
+  private func updateSpeedControl() {
+    currentSpeedLabel.text = "\(currentSpeed)"
+    if isCameraOnRoute {
+      speedLimitContainer.layer.borderColor = UIColor.speedLimitRed()?.cgColor
+      speedLimitContainer.layer.borderWidth = 2.0
+      if let speedLimit = speedLimit {
+        speedCamImageView.alpha = 0.0
+        speedLimitLabel.textColor = UIColor.speedLimitDarkGray()
+        speedLimitLabel.text = "\(speedLimit)"
+        speedLimitLabel.alpha = 1.0
+        currentSpeedLabel.textColor = UIColor.white
+        if speedLimit >= currentSpeed {
+          currentSpeedView.backgroundColor = UIColor.speedLimitGeen()
+        } else {
+          currentSpeedView.backgroundColor = UIColor.speedLimitRed()
+        }
+      } else {
+        speedLimitLabel.alpha = 0.0
+        speedCamImageView.tintColor = UIColor.speedLimitRed()
+        speedCamImageView.alpha = 1.0
+        currentSpeedLabel.textColor = UIColor.speedLimitDarkGray()
+        currentSpeedView.backgroundColor = UIColor.speedLimitWhite()
+      }
+    } else {
+      speedLimitContainer.layer.borderColor = UIColor.speedLimitLightGray()?.cgColor
+      speedLimitContainer.layer.borderWidth = 2.0
+      speedLimitLabel.alpha = 0.0
+      speedCamImageView.tintColor = UIColor.speedLimitLightGray()
+      speedCamImageView.alpha = 1.0
+      currentSpeedLabel.textColor = UIColor.speedLimitDarkGray()
+      currentSpeedView.backgroundColor = UIColor.speedLimitWhite()
+    }
+  }
+  
+  func updateVisibleViewPortState(_ state: CPViewPortState) {
+    viewPortState = state
+    switch viewPortState {
+    case .default:
+      updateVisibleViewPortToDefaultState()
+    case .preview:
+      updateVisibleViewPortToPreviewState()
+    case .navigation:
+      updateVisibleViewPortToNavigationState()
+    }
+  }
+  
+  private func updateVisibleViewPortToPreviewState() {
+    let viewBounds = view.bounds
+    let previewWidth = self.view.frame.width * 0.45
+    let navigationHeight: CGFloat = 45.0
+    var frame = CGRect.zero
+    let origin = isLeftWheelCar ? CGPoint(x: previewWidth, y: navigationHeight) : CGPoint(x: 0, y: navigationHeight)
+    frame.origin = origin
+    frame.size = CGSize(width: viewBounds.width - origin.x,
+                        height: viewBounds.height - origin.y)
+    FrameworkHelper.setVisibleViewport(frame)
+  }
+  
+  private func updateVisibleViewPortToNavigationState() {
+    let viewBounds = view.bounds
+    let previewWidth = viewBounds.width * 0.45
+    let mapControlsWidth = viewBounds.width * 0.15
+    let navigationHeight: CGFloat = 45.0
+    var frame = CGRect.zero
+    let origin = isLeftWheelCar ? CGPoint(x: previewWidth, y: navigationHeight) : CGPoint(x: 0, y: navigationHeight)
+    frame.origin = origin
+    frame.size = CGSize(width: viewBounds.width - (origin.x + mapControlsWidth),
+                        height: viewBounds.height - origin.y)
+    FrameworkHelper.setVisibleViewport(frame)
+  }
+  
+  private func updateVisibleViewPortToDefaultState() {
+    FrameworkHelper.setVisibleViewport(view.bounds)
+  }
+  
+  override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+    super.traitCollectionDidChange(previousTraitCollection)
+    ThemeManager.invalidate()
+  }
+}
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index 34d71c8685..ada76e6eb1 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -308,7 +308,7 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
 
 - (void)showDropDown
 {
-  MWMDropDown * dd = [[MWMDropDown alloc] initWithSuperview:[MapViewController sharedController].view];
+  MWMDropDown * dd = [[MWMDropDown alloc] initWithSuperview:[MapViewController sharedController].controlsView];
   [dd showWithMessage:L(@"editor_edits_sent_message")];
 }
 
diff --git a/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm b/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm
index e1727828cc..f01c9588b9 100644
--- a/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm
+++ b/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm
@@ -35,7 +35,7 @@ static CGFloat const kDirectionArrowSide = IPAD ? 260. : 160.;
 
 - (void)show
 {
-  UIView * superview = [MapsAppDelegate theApp].mapViewController.view;
+  UIView * superview = [MapsAppDelegate theApp].mapViewController.controlsView;
   [superview addSubview:self];
   [superview endEditing:YES];
   [self setNeedsLayout];
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
index 92733a1043..35d2b03fbf 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@@ -187,8 +187,26 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
   string distance;
   CLLocationCoordinate2D const & coord = lastLocation.coordinate;
   ms::LatLon const & target = data.latLon;
-  measurement_utils::FormatDistance(
-      ms::DistanceOnEarth(coord.latitude, coord.longitude, target.m_lat, target.m_lon), distance);
+  double meters = ms::DistanceOnEarth(coord.latitude, coord.longitude, target.m_lat, target.m_lon);
+  if (meters < 0.)
+    return nil;
+  
+  auto units = measurement_utils::Units::Metric;
+  settings::TryGet(settings::kMeasurementUnits, units);
+  
+  string s;
+  switch (units) {
+    case measurement_utils::Units::Imperial:
+      measurement_utils::FormatDistanceWithLocalization(meters,
+                                                        distance,
+                                                        [[@" " stringByAppendingString:L(@"mile")] UTF8String],
+                                                        [[@" " stringByAppendingString:L(@"foot")] UTF8String]);
+    case measurement_utils::Units::Metric:
+      measurement_utils::FormatDistanceWithLocalization(meters,
+                                                        distance,
+                                                        [[@" " stringByAppendingString:L(@"kilometer")] UTF8String],
+                                                        [[@" " stringByAppendingString:L(@"meter")] UTF8String]);
+  }
   return @(distance.c_str());
 }
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
index 54db2670ec..0c0a7ef4a5 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
@@ -644,7 +644,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
     if (!cell)
       return;
     auto taxiBottom = CGPointMake(cell.width / 2, cell.height);
-    auto mainView = [MapViewController sharedController].view;
+    auto mainView = [MapViewController sharedController].controlsView;
     auto actionBar = self.actionBar;
     BOOL const isInMainView =
         [mainView pointInside:[cell convertPoint:taxiBottom toView:mainView] withEvent:nil];
diff --git a/iphone/Maps/UI/Settings/DrivingOptionsViewController.swift b/iphone/Maps/UI/Settings/DrivingOptionsViewController.swift
index 10a32d8531..35312db284 100644
--- a/iphone/Maps/UI/Settings/DrivingOptionsViewController.swift
+++ b/iphone/Maps/UI/Settings/DrivingOptionsViewController.swift
@@ -1,7 +1,7 @@
 import UIKit
 
 class DrivingOptionsViewController: MWMTableViewController {
-  let options = MWMRoutingOptions()
+  let options = RoutingOptions()
   @IBOutlet var tollRoadsCell: SettingsTableViewSwitchCell!
   @IBOutlet var unpavedRoadsCell: SettingsTableViewSwitchCell!
   @IBOutlet var ferryCrossingsCell: SettingsTableViewSwitchCell!
diff --git a/iphone/Maps/UI/Storyboard/CarPlayStoryboard.storyboard b/iphone/Maps/UI/Storyboard/CarPlayStoryboard.storyboard
new file mode 100644
index 0000000000..32bf764f6c
--- /dev/null
+++ b/iphone/Maps/UI/Storyboard/CarPlayStoryboard.storyboard
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="Wnk-yS-70Z">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <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>
+    <scenes>
+        <!--Car Play Map View Controller-->
+        <scene sceneID="5vb-C1-ak4">
+            <objects>
+                <viewController id="Wnk-yS-70Z" customClass="CarPlayMapViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="o9I-Sz-toK">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dAY-9Y-UMN">
+                                <rect key="frame" x="331" y="34" width="30" height="60"/>
+                                <subviews>
+                                    <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1hD-QK-pwq">
+                                        <rect key="frame" x="0.0" y="5" width="30" height="55"/>
+                                        <subviews>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="45" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3af-sk-wxY">
+                                                <rect key="frame" x="0.0" y="21" width="30" height="30"/>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="30" id="dub-Q6-uQK"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
+                                                <nil key="textColor"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" white="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstItem="3af-sk-wxY" firstAttribute="leading" secondItem="1hD-QK-pwq" secondAttribute="leading" id="FeL-XM-PB3"/>
+                                            <constraint firstAttribute="bottom" secondItem="3af-sk-wxY" secondAttribute="bottom" constant="4" id="Lre-a2-mgf"/>
+                                            <constraint firstAttribute="height" constant="55" id="eLm-Q1-gmp"/>
+                                            <constraint firstAttribute="trailing" secondItem="3af-sk-wxY" secondAttribute="trailing" id="vA1-1o-R2h"/>
+                                        </constraints>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                <integer key="value" value="15"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
+                                    </view>
+                                    <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uhn-dc-aMW">
+                                        <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
+                                        <subviews>
+                                            <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_carplay_camera" translatesAutoresizingMaskIntoConstraints="NO" id="Vip-QN-Smh">
+                                                <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            </imageView>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="60" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ifo-0s-Ynd">
+                                                <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
+                                                <nil key="textColor"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="bottom" secondItem="ifo-0s-Ynd" secondAttribute="bottom" id="3Xs-qB-du5"/>
+                                            <constraint firstAttribute="height" constant="30" id="3kW-0W-yq6"/>
+                                            <constraint firstItem="ifo-0s-Ynd" firstAttribute="leading" secondItem="uhn-dc-aMW" secondAttribute="leading" id="E66-Vw-hnJ"/>
+                                            <constraint firstAttribute="bottom" secondItem="Vip-QN-Smh" secondAttribute="bottom" id="Fyn-Kb-u3B"/>
+                                            <constraint firstAttribute="trailing" secondItem="Vip-QN-Smh" secondAttribute="trailing" id="Ko3-FW-nRj"/>
+                                            <constraint firstAttribute="trailing" secondItem="ifo-0s-Ynd" secondAttribute="trailing" id="O1W-WY-amn"/>
+                                            <constraint firstItem="Vip-QN-Smh" firstAttribute="top" secondItem="uhn-dc-aMW" secondAttribute="top" id="UwD-bP-0ze"/>
+                                            <constraint firstItem="ifo-0s-Ynd" firstAttribute="top" secondItem="uhn-dc-aMW" secondAttribute="top" id="d6z-uY-hED"/>
+                                            <constraint firstItem="Vip-QN-Smh" firstAttribute="leading" secondItem="uhn-dc-aMW" secondAttribute="leading" id="oJg-ld-yAS"/>
+                                        </constraints>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                <integer key="value" value="15"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstItem="1hD-QK-pwq" firstAttribute="leading" secondItem="dAY-9Y-UMN" secondAttribute="leading" id="6LO-Gn-TAQ"/>
+                                    <constraint firstAttribute="trailing" secondItem="uhn-dc-aMW" secondAttribute="trailing" id="7Xw-O9-Q18"/>
+                                    <constraint firstAttribute="trailing" secondItem="1hD-QK-pwq" secondAttribute="trailing" id="DwE-PO-Png"/>
+                                    <constraint firstItem="uhn-dc-aMW" firstAttribute="top" secondItem="dAY-9Y-UMN" secondAttribute="top" id="YQG-Dw-ZrP"/>
+                                    <constraint firstAttribute="height" constant="60" id="lWz-ou-THE"/>
+                                    <constraint firstAttribute="width" constant="30" id="pLu-F8-bWR"/>
+                                    <constraint firstItem="uhn-dc-aMW" firstAttribute="leading" secondItem="dAY-9Y-UMN" secondAttribute="leading" id="u2b-Zv-qig"/>
+                                    <constraint firstAttribute="bottom" secondItem="1hD-QK-pwq" secondAttribute="bottom" id="uZc-jn-PWc"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="dAY-9Y-UMN" secondAttribute="trailing" constant="14" placeholder="YES" id="Qzf-ri-mLE"/>
+                            <constraint firstItem="dAY-9Y-UMN" firstAttribute="top" secondItem="HDO-Ge-bK0" secondAttribute="top" constant="14" id="VaC-AO-1lC"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="HDO-Ge-bK0"/>
+                    </view>
+                    <connections>
+                        <outlet property="currentSpeedLabel" destination="3af-sk-wxY" id="WgR-NP-nvm"/>
+                        <outlet property="currentSpeedView" destination="1hD-QK-pwq" id="Mbg-8c-EWp"/>
+                        <outlet property="speedCamImageView" destination="Vip-QN-Smh" id="ASc-eP-fXa"/>
+                        <outlet property="speedInfoView" destination="dAY-9Y-UMN" id="k1g-9g-oKS"/>
+                        <outlet property="speedLimitContainer" destination="uhn-dc-aMW" id="AQt-AB-ZyL"/>
+                        <outlet property="speedLimitLabel" destination="ifo-0s-Ynd" id="zgD-Di-6YZ"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="6hr-Cq-l0z" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="31" y="227"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="ic_carplay_camera" width="15" height="15"/>
+    </resources>
+</document>
diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard
index a57ac0f1a3..ef55a678fe 100644
--- a/iphone/Maps/UI/Storyboard/Main.storyboard
+++ b/iphone/Maps/UI/Storyboard/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
+<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="Wns-nH-AQU">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -14,82 +14,114 @@
         <scene sceneID="Wq1-a3-f7n">
             <objects>
                 <viewController id="xTf-lf-yxN" customClass="MapViewController" sceneMemberID="viewController">
-                    <view key="view" clearsContextBeforeDrawing="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" id="USG-6L-Uhw" customClass="EAGLView">
+                    <view key="view" clearsContextBeforeDrawing="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" id="USG-6L-Uhw">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="65S-M4-TnM" customClass="NavigationInfoArea" customModule="maps_me" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="20" width="320" height="548"/>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
-                            </view>
-                            <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TdT-ia-GP9" customClass="MenuArea" customModule="maps_me" customModuleProvider="target">
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CarPlay Activated" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kUL-gQ-qaf">
+                                <rect key="frame" x="20" y="281" width="280" height="26.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aPn-pa-nCx" customClass="EAGLView">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
-                            <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="awj-9E-eBS" customClass="PlacePageArea" customModule="maps_me" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rL1-9E-4b7">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
-                            </view>
-                            <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FFY-Dy-Wou" customClass="VisibleArea" customModule="maps_me" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
-                            </view>
-                            <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NI8-tV-i2B" customClass="WidgetsArea" customModule="maps_me" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="20" width="320" height="548"/>
-                                <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
-                            </view>
-                            <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xJx-UU-IdV" customClass="SideButtonsArea" customModule="maps_me" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="20" width="320" height="548"/>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
-                            </view>
-                            <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QKu-4A-UgP" customClass="TrafficButtonArea" customModule="maps_me" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="20" width="320" height="548"/>
-                                <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+                                <subviews>
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="65S-M4-TnM" customClass="NavigationInfoArea" customModule="maps_me" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+                                        <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+                                    </view>
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TdT-ia-GP9" customClass="MenuArea" customModule="maps_me" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                        <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+                                    </view>
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="awj-9E-eBS" customClass="PlacePageArea" customModule="maps_me" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                        <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+                                    </view>
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FFY-Dy-Wou" customClass="VisibleArea" customModule="maps_me" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                        <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+                                    </view>
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NI8-tV-i2B" customClass="WidgetsArea" customModule="maps_me" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+                                        <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+                                    </view>
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xJx-UU-IdV" customClass="SideButtonsArea" customModule="maps_me" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+                                        <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+                                    </view>
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QKu-4A-UgP" customClass="TrafficButtonArea" customModule="maps_me" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+                                        <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="NI8-tV-i2B" secondAttribute="trailing" priority="100" id="14U-q4-H7N"/>
+                                    <constraint firstItem="NI8-tV-i2B" firstAttribute="leading" secondItem="rL1-9E-4b7" secondAttribute="leading" priority="100" id="50S-ed-wwj"/>
+                                    <constraint firstAttribute="trailing" secondItem="xJx-UU-IdV" secondAttribute="trailing" priority="100" id="6fL-hy-Ucd"/>
+                                    <constraint firstItem="xJx-UU-IdV" firstAttribute="leading" secondItem="rL1-9E-4b7" secondAttribute="leading" priority="100" id="6gZ-6J-Y0a"/>
+                                    <constraint firstItem="QKu-4A-UgP" firstAttribute="leading" secondItem="rL1-9E-4b7" secondAttribute="leading" priority="100" id="Axx-wL-eMP"/>
+                                    <constraint firstItem="FFY-Dy-Wou" firstAttribute="leading" secondItem="rL1-9E-4b7" secondAttribute="leading" priority="100" id="FXz-Nr-x4G"/>
+                                    <constraint firstAttribute="trailing" secondItem="FFY-Dy-Wou" secondAttribute="trailing" priority="100" id="FZq-fS-oYa"/>
+                                    <constraint firstItem="TdT-ia-GP9" firstAttribute="top" secondItem="rL1-9E-4b7" secondAttribute="top" priority="100" id="RAX-O7-Lnd"/>
+                                    <constraint firstAttribute="trailing" secondItem="awj-9E-eBS" secondAttribute="trailing" priority="100" id="TEL-dH-TJ7"/>
+                                    <constraint firstAttribute="trailing" secondItem="TdT-ia-GP9" secondAttribute="trailing" priority="100" id="aeq-NS-iqz"/>
+                                    <constraint firstItem="awj-9E-eBS" firstAttribute="leading" secondItem="rL1-9E-4b7" secondAttribute="leading" priority="100" id="m7e-b7-NS9"/>
+                                    <constraint firstAttribute="trailing" secondItem="QKu-4A-UgP" secondAttribute="trailing" priority="100" id="p0L-Ic-nWq"/>
+                                    <constraint firstAttribute="trailing" secondItem="65S-M4-TnM" secondAttribute="trailing" priority="100" id="pyg-ph-5Qe"/>
+                                    <constraint firstItem="awj-9E-eBS" firstAttribute="top" secondItem="rL1-9E-4b7" secondAttribute="top" priority="100" id="sdc-wL-91M"/>
+                                    <constraint firstItem="FFY-Dy-Wou" firstAttribute="top" secondItem="rL1-9E-4b7" secondAttribute="top" priority="100" id="svT-Vi-vvC"/>
+                                    <constraint firstItem="TdT-ia-GP9" firstAttribute="leading" secondItem="rL1-9E-4b7" secondAttribute="leading" priority="100" id="x0e-zZ-mxb"/>
+                                    <constraint firstItem="65S-M4-TnM" firstAttribute="leading" secondItem="rL1-9E-4b7" secondAttribute="leading" priority="100" id="zBX-w3-K7G"/>
+                                </constraints>
                             </view>
                         </subviews>
                         <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="QKu-4A-UgP" secondAttribute="bottom" priority="100" id="488-ng-pRw"/>
-                            <constraint firstItem="QKu-4A-UgP" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="top" priority="100" id="60l-kI-cp7"/>
-                            <constraint firstAttribute="trailing" secondItem="awj-9E-eBS" secondAttribute="trailing" priority="100" id="6cS-mj-HcX"/>
-                            <constraint firstItem="TdT-ia-GP9" firstAttribute="leading" secondItem="USG-6L-Uhw" secondAttribute="leading" priority="100" id="819-qB-GBD"/>
-                            <constraint firstItem="FFY-Dy-Wou" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" priority="100" id="AW8-cN-xzE"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="65S-M4-TnM" secondAttribute="trailing" priority="100" id="Bjn-UL-ALa"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="xJx-UU-IdV" secondAttribute="bottom" id="BqM-vp-EnJ"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="65S-M4-TnM" secondAttribute="bottom" priority="100" id="FU7-Pa-O3P"/>
-                            <constraint firstItem="QKu-4A-UgP" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" priority="100" id="Gw4-fq-sLY"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="NI8-tV-i2B" secondAttribute="bottom" priority="100" id="HW4-dR-LNu"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="awj-9E-eBS" secondAttribute="bottom" priority="100" id="Kf4-GM-1aY"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="xJx-UU-IdV" secondAttribute="trailing" priority="100" id="KfO-hH-S7R"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="FFY-Dy-Wou" secondAttribute="bottom" id="QQc-TF-hhE"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="QKu-4A-UgP" secondAttribute="trailing" priority="100" id="SNy-Ck-trF"/>
-                            <constraint firstItem="NI8-tV-i2B" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" priority="100" id="Uf3-sL-39L"/>
-                            <constraint firstAttribute="trailing" secondItem="TdT-ia-GP9" secondAttribute="trailing" priority="100" id="UvG-fn-nF1"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="TdT-ia-GP9" secondAttribute="bottom" priority="100" id="Wmw-ON-0aO"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="65S-M4-TnM" secondAttribute="top" priority="100" id="XrN-7f-l3w"/>
-                            <constraint firstItem="awj-9E-eBS" firstAttribute="leading" secondItem="USG-6L-Uhw" secondAttribute="leading" priority="100" id="YBB-Wd-lq6"/>
-                            <constraint firstItem="65S-M4-TnM" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" priority="100" id="YiU-Dr-KCp"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="FFY-Dy-Wou" secondAttribute="bottom" priority="100" id="ZFU-IG-uZh"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="FFY-Dy-Wou" secondAttribute="top" priority="100" constant="20" id="aOI-yX-CJY"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="NI8-tV-i2B" secondAttribute="trailing" priority="100" id="bPj-dO-SIK"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="awj-9E-eBS" secondAttribute="bottom" id="dNo-wc-hvO"/>
-                            <constraint firstItem="xJx-UU-IdV" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" priority="100" id="fUZ-NK-6GU"/>
-                            <constraint firstAttribute="top" secondItem="TdT-ia-GP9" secondAttribute="top" priority="100" id="ihO-7V-XPf"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="NI8-tV-i2B" secondAttribute="top" priority="100" id="kvw-Gs-ady"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="xJx-UU-IdV" secondAttribute="bottom" priority="100" id="pur-5a-SQA"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="FFY-Dy-Wou" secondAttribute="trailing" priority="100" id="qdF-Ru-TYd"/>
-                            <constraint firstItem="xJx-UU-IdV" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="top" priority="100" id="w8f-5v-bHr"/>
-                            <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="awj-9E-eBS" secondAttribute="top" priority="100" constant="20" id="xFF-Ic-RDu"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="65S-M4-TnM" secondAttribute="bottom" priority="100" id="2E3-5i-6An"/>
+                            <constraint firstItem="kUL-gQ-qaf" firstAttribute="centerY" secondItem="utd-Jy-pE5" secondAttribute="centerY" id="2d6-IK-Qp8"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="kUL-gQ-qaf" secondAttribute="trailing" constant="20" id="3mb-qK-t4t"/>
+                            <constraint firstAttribute="bottom" secondItem="rL1-9E-4b7" secondAttribute="bottom" id="4fw-Xu-gAG"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="QKu-4A-UgP" secondAttribute="bottom" priority="100" id="6ko-rI-S5u"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="xJx-UU-IdV" secondAttribute="top" priority="100" id="BMq-jc-qfO"/>
+                            <constraint firstItem="rL1-9E-4b7" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="E89-WV-ZTh"/>
+                            <constraint firstAttribute="trailing" secondItem="aPn-pa-nCx" secondAttribute="trailing" id="GKJ-zm-8xb"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="FFY-Dy-Wou" secondAttribute="bottom" priority="100" id="OE7-Qb-J0v"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="awj-9E-eBS" secondAttribute="bottom" id="PFs-sL-oVA"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="rL1-9E-4b7" secondAttribute="trailing" id="QdS-Yx-ADV"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="xJx-UU-IdV" secondAttribute="bottom" id="SDX-4J-Jz5"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="xJx-UU-IdV" secondAttribute="bottom" priority="100" id="VfU-Zk-8IU"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="QKu-4A-UgP" secondAttribute="top" priority="100" id="X96-y7-5oI"/>
+                            <constraint firstItem="aPn-pa-nCx" firstAttribute="leading" secondItem="USG-6L-Uhw" secondAttribute="leading" id="YFX-ma-vAf"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="FFY-Dy-Wou" secondAttribute="bottom" id="YUs-MJ-9w8"/>
+                            <constraint firstItem="rL1-9E-4b7" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="Z1s-Q9-zX6"/>
+                            <constraint firstItem="awj-9E-eBS" firstAttribute="bottom" secondItem="utd-Jy-pE5" secondAttribute="bottom" priority="100" id="aqR-pe-LgT"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="NI8-tV-i2B" secondAttribute="bottom" priority="100" id="fgM-Gj-Vd4"/>
+                            <constraint firstItem="aPn-pa-nCx" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="pwE-hX-IML"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="TdT-ia-GP9" secondAttribute="bottom" priority="100" id="pwZ-Fm-mHR"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="NI8-tV-i2B" secondAttribute="top" priority="100" id="sSU-QE-9zI"/>
+                            <constraint firstAttribute="bottom" secondItem="aPn-pa-nCx" secondAttribute="bottom" id="tB3-eX-gUV"/>
+                            <constraint firstItem="kUL-gQ-qaf" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" constant="20" id="vUG-uh-lFN"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="65S-M4-TnM" secondAttribute="top" priority="100" id="vfQ-ZT-Dlc"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="utd-Jy-pE5"/>
                     </view>
                     <navigationItem key="navigationItem" id="8E8-0f-UV9"/>
                     <connections>
-                        <outlet property="placePageAreaKeyboard" destination="dNo-wc-hvO" id="WPJ-RF-gzS"/>
-                        <outlet property="sideButtonsAreaBottom" destination="pur-5a-SQA" id="a6A-LK-YRV"/>
-                        <outlet property="sideButtonsAreaKeyboard" destination="BqM-vp-EnJ" id="fVm-sC-LXU"/>
-                        <outlet property="visibleAreaBottom" destination="ZFU-IG-uZh" id="Zmh-A4-yUm"/>
-                        <outlet property="visibleAreaKeyboard" destination="QQc-TF-hhE" id="rzk-WW-ab6"/>
+                        <outlet property="carplayPlaceholderLabel" destination="kUL-gQ-qaf" id="yqd-YG-wb6"/>
+                        <outlet property="controlsView" destination="rL1-9E-4b7" id="sfV-7X-WlR"/>
+                        <outlet property="mapView" destination="aPn-pa-nCx" id="tCi-LW-1ll"/>
+                        <outlet property="placePageAreaKeyboard" destination="PFs-sL-oVA" id="O3P-ia-ZlX"/>
+                        <outlet property="sideButtonsAreaBottom" destination="VfU-Zk-8IU" id="MvP-Ki-4wP"/>
+                        <outlet property="sideButtonsAreaKeyboard" destination="SDX-4J-Jz5" id="kv9-zX-hbD"/>
+                        <outlet property="visibleAreaBottom" destination="OE7-Qb-J0v" id="isp-aT-LtA"/>
+                        <outlet property="visibleAreaKeyboard" destination="YUs-MJ-9w8" id="UJP-KT-2uK"/>
                         <segue destination="Lfa-Zp-orR" kind="custom" identifier="Map2EditorSegue" customClass="MWMSegue" id="OEF-kR-jKi"/>
                         <segue destination="QlF-CJ-cEG" kind="custom" identifier="MapToCategorySelectorSegue" customClass="MWMSegue" id="4Cc-99-mlN"/>
                         <segue destination="5Wc-fy-NOW" kind="custom" identifier="Map2OsmLogin" customClass="MWMSegue" id="7YC-t5-0WN"/>
diff --git a/iphone/Maps/UI/Storyboard/Storyboard.swift b/iphone/Maps/UI/Storyboard/Storyboard.swift
index 07ca84ea15..f2225a6df0 100644
--- a/iphone/Maps/UI/Storyboard/Storyboard.swift
+++ b/iphone/Maps/UI/Storyboard/Storyboard.swift
@@ -11,6 +11,7 @@ enum Storyboard: Int {
   case sharing
   case categorySettings
   case drivingOptions
+  case carPlay
 }
 
 extension UIStoryboard {
@@ -26,6 +27,7 @@ extension UIStoryboard {
     case .sharing: name = "BookmarksSharingFlow"
     case .categorySettings: name = "CategorySettings"
     case .drivingOptions: name = "DrivingOptions"
+    case .carPlay: name = "CarPlayStoryboard"
     }
     return UIStoryboard(name: name, bundle: nil)
   }
diff --git a/iphone/Maps/UI/Welcome/WelcomePageController.swift b/iphone/Maps/UI/Welcome/WelcomePageController.swift
index 6db2e14103..d1c2103d1d 100644
--- a/iphone/Maps/UI/Welcome/WelcomePageController.swift
+++ b/iphone/Maps/UI/Welcome/WelcomePageController.swift
@@ -98,7 +98,7 @@ final class WelcomePageController: UIPageViewController {
     view.removeFromSuperview()
     removeFromParentViewController()
     parentController.closePageController(self)
-    MWMFrameworkHelper.processFirstLaunch()
+    FrameworkHelper.processFirstLaunch()
   }
 
   @objc func show() {
diff --git a/iphone/Maps/maps.me dbg.entitlements b/iphone/Maps/maps.me dbg.entitlements
index a9cda6ed70..15d293d3a0 100644
--- a/iphone/Maps/maps.me dbg.entitlements	
+++ b/iphone/Maps/maps.me dbg.entitlements	
@@ -10,5 +10,7 @@
 		<string>applinks:dlink.mapsme.devmail.ru</string>
 		<string>applinks:mapsme.onelink.me</string>
 	</array>
+	<key>com.apple.developer.carplay-maps</key>
+	<true/>
 </dict>
 </plist>
diff --git a/iphone/Maps/maps.me full.entitlements b/iphone/Maps/maps.me full.entitlements
new file mode 100644
index 0000000000..15d293d3a0
--- /dev/null
+++ b/iphone/Maps/maps.me full.entitlements	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:dlink.maps.me</string>
+		<string>applinks:dlink.mapsme.devmail.ru</string>
+		<string>applinks:mapsme.onelink.me</string>
+	</array>
+	<key>com.apple.developer.carplay-maps</key>
+	<true/>
+</dict>
+</plist>
diff --git a/iphone/Maps/maps.me rel.entitlements b/iphone/Maps/maps.me rel.entitlements
new file mode 100644
index 0000000000..a9cda6ed70
--- /dev/null
+++ b/iphone/Maps/maps.me rel.entitlements	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:dlink.maps.me</string>
+		<string>applinks:dlink.mapsme.devmail.ru</string>
+		<string>applinks:mapsme.onelink.me</string>
+	</array>
+</dict>
+</plist>
diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 6c83818ad0..3c3a4dc226 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -321,6 +321,9 @@ RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate)
   {
     GetPlatform().RunTask(Platform::Thread::Gui, [this, point, cameraSpeedKmPH]()
     {
+      if (m_routeSpeedCamShowCallback)
+        m_routeSpeedCamShowCallback(point, cameraSpeedKmPH);
+      
       auto editSession = m_bmManager->GetEditSession();
       auto mark = editSession.CreateUserMark<SpeedCameraMark>(point);
 
@@ -345,6 +348,8 @@ RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate)
     GetPlatform().RunTask(Platform::Thread::Gui, [this]()
     {
       m_bmManager->GetEditSession().ClearGroup(UserMark::Type::SPEED_CAM);
+      if (m_routeSpeedCamsClearCallback)
+        m_routeSpeedCamsClearCallback();
     });
   });
 }
diff --git a/map/routing_manager.hpp b/map/routing_manager.hpp
index 8182d98022..32dd99934d 100644
--- a/map/routing_manager.hpp
+++ b/map/routing_manager.hpp
@@ -102,6 +102,10 @@ public:
 
   using RouteBuildingCallback =
       std::function<void(routing::RouterResultCode, storage::CountriesSet const &)>;
+  using RouteSpeedCamShowCallback =
+      std::function<void(m2::PointD const &, double)>;
+  using RouteSpeedCamsClearCallback =
+      std::function<void()>;
 
   using RouteStartBuildCallback = std::function<void(std::vector<RouteMarkData> const & points)>;
 
@@ -144,6 +148,17 @@ public:
   {
     m_routingBuildingCallback = buildingCallback;
   }
+
+  void SetRouteSpeedCamShowListener(RouteSpeedCamShowCallback const & speedCamShowCallback)
+  {
+    m_routeSpeedCamShowCallback = speedCamShowCallback;
+  }
+    
+  void SetRouteSpeedCamsClearListener(RouteSpeedCamsClearCallback const & speedCamsClearCallback)
+  {
+    m_routeSpeedCamsClearCallback = speedCamsClearCallback;
+  }
+  
   void SetRouteStartBuildListener(RouteStartBuildCallback const & startBuildCallback)
   {
     m_routingStartBuildCallback = startBuildCallback;
@@ -337,6 +352,8 @@ private:
   void OnExtrapolatedLocationUpdate(location::GpsInfo const & info);
 
   RouteBuildingCallback m_routingBuildingCallback;
+  RouteSpeedCamShowCallback m_routeSpeedCamShowCallback;
+  RouteSpeedCamsClearCallback m_routeSpeedCamsClearCallback;
   RouteRecommendCallback m_routeRecommendCallback;
   RouteStartBuildCallback m_routingStartBuildCallback;
   Callbacks m_callbacks;
diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp
index 04357c6731..af3f697da0 100644
--- a/platform/measurement_utils.cpp
+++ b/platform/measurement_utils.cpp
@@ -62,6 +62,20 @@ double ToSpeedKmPH(double speed, measurement_utils::Units units)
   UNREACHABLE();
 }
 
+bool FormatDistanceWithLocalization(double m, string & res, char const * high, char const * low)
+{
+  auto units = Units::Metric;
+  TryGet(settings::kMeasurementUnits, units);
+
+  /// @todo Put string units resources.
+  switch (units)
+  {
+  case Units::Imperial: return FormatDistanceImpl(m, res, high, low, 1609.344, 0.3048);
+  case Units::Metric: return FormatDistanceImpl(m, res, high, low, 1000.0, 1.0);
+  }
+  UNREACHABLE();
+}
+  
 bool FormatDistance(double m, string & res)
 {
   auto units = Units::Metric;
@@ -212,6 +226,17 @@ string FormatSpeed(double metersPerSecond, Units units)
   }
   return ToStringPrecision(unitsPerHour, unitsPerHour >= 10.0 ? 0 : 1);
 }
+  
+string FormatSpeedLimit(double kilometersPerHour, Units units)
+{
+  double unitsPerHour;
+  switch (units)
+  {
+      case Units::Imperial: unitsPerHour = 0.621371192 * kilometersPerHour; break;
+      case Units::Metric: unitsPerHour = kilometersPerHour; break;
+  }
+  return ToStringPrecision(unitsPerHour, unitsPerHour >= 10.0 ? 0 : 1);
+}
 
 string FormatSpeedUnits(Units units)
 {
diff --git a/platform/measurement_utils.hpp b/platform/measurement_utils.hpp
index 620f41d607..4b07ab68b4 100644
--- a/platform/measurement_utils.hpp
+++ b/platform/measurement_utils.hpp
@@ -42,6 +42,7 @@ double ToSpeedKmPH(double speed, measurement_utils::Units units);
 /// @param[out] res formatted std::string for search
 /// @return should be direction arrow drawed? false if distance is to small (< 1.0)
 bool FormatDistance(double m, std::string & res);
+bool FormatDistanceWithLocalization(double m, std::string & res, char const * high, char const * low);
 
 /// We always use meters and feet/yards for altitude
 std::string FormatAltitude(double altitudeInMeters);
@@ -50,6 +51,7 @@ std::string FormatSpeedWithDeviceUnits(double metersPerSecond);
 std::string FormatSpeedWithUnits(double metersPerSecond, Units units);
 std::string FormatSpeed(double metersPerSecond, Units units);
 std::string FormatSpeedUnits(Units units);
+std::string FormatSpeedLimit(double kilometersPerHour, Units units);
 
 /// @param[in] dac  Digits after comma in seconds.
 /// Use dac == 3 for our common conversions to DMS.
diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata
index eb176f781b..98573b3c90 100644
--- a/xcode/omim.xcworkspace/contents.xcworkspacedata
+++ b/xcode/omim.xcworkspace/contents.xcworkspacedata
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
-   <FileRef
-      location = "group:../../Amsterdam.gpx">
-   </FileRef>
    <FileRef
       location = "container:common-debug.xcconfig">
    </FileRef>