diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h
index e4869fd60d..df86fd1514 100644
--- a/iphone/Maps/Bridging-Header.h
+++ b/iphone/Maps/Bridging-Header.h
@@ -45,6 +45,7 @@
 #import "MWMRouteManagerPointType.h"
 #import "MWMRoutePreviewTaxiCellType.h"
 #import "MWMRouter.h"
+#import "MWMRouterTransitStepInfo.h"
 #import "MWMSearchItemType.h"
 #import "MWMSearchNoResults.h"
 #import "MWMSettings.h"
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.h
index ec91b505f0..c24404aa81 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.h
@@ -1,5 +1,8 @@
+@class MWMRouterTransitStepInfo;
+
 @interface MWMNavigationDashboardEntity : NSObject
 
+@property(copy, nonatomic, readonly) NSArray<MWMRouterTransitStepInfo *> * transitSteps;
 @property(copy, nonatomic, readonly) NSAttributedString * estimate;
 @property(copy, nonatomic, readonly) NSAttributedString * estimateDot;
 @property(copy, nonatomic, readonly) NSString * distanceToTurn;
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
index 48886cf449..3546b631e9 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
@@ -1,6 +1,7 @@
 #import "MWMNavigationDashboardEntity.h"
 #import "MWMCoreUnits.h"
 #import "MWMLocationManager.h"
+#import "MWMRouterTransitStepInfo.h"
 #import "MWMSettings.h"
 #import "SwiftBridge.h"
 
@@ -8,6 +9,7 @@
 
 @interface MWMNavigationDashboardEntity ()
 
+@property(copy, nonatomic, readwrite) NSArray<MWMRouterTransitStepInfo *> * transitSteps;
 @property(copy, nonatomic, readwrite) NSAttributedString * estimate;
 @property(copy, nonatomic, readwrite) NSAttributedString * estimateDot;
 @property(copy, nonatomic, readwrite) NSString * distanceToTurn;
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h
index 452a1531ff..96aafc0a1e 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h
@@ -5,8 +5,11 @@ namespace location
 class FollowingInfo;
 }
 
+struct TransitRouteInfo;
+
 @interface MWMNavigationDashboardManager (Entity)
 
 - (void)updateFollowingInfo:(location::FollowingInfo const &)info;
+- (void)updateTransitInfo:(TransitRouteInfo const &)info;
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
index c754ce784a..c353ed2e2a 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
@@ -2,10 +2,13 @@
 #import "MWMNavigationDashboardEntity.h"
 #import "MWMNavigationDashboardManager+Entity.h"
 #import "MWMRouter.h"
+#import "MWMRouterTransitStepInfo.h"
 #import "SwiftBridge.h"
 
 #include "routing/turns.hpp"
 
+#include "map/routing_manager.hpp"
+
 #include "platform/location.hpp"
 
 #include "geometry/distance_on_sphere.hpp"
@@ -45,10 +48,44 @@ UIImage * image(routing::turns::CarDirection t, bool isNextTurn)
     return nil;
   return [UIImage imageNamed:isNextTurn ? [imageName stringByAppendingString:@"_then"] : imageName];
 }
+
+NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSString * distance,
+                              NSString * distanceUnits, NSDictionary * primaryAttributes,
+                              NSDictionary * secondaryAttributes, BOOL isWalk)
+{
+  NSString * eta = [NSDateComponentsFormatter etaStringFrom:time];
+  auto result = [[NSMutableAttributedString alloc] initWithString:eta attributes:primaryAttributes];
+  [result appendAttributedString:dot];
+
+  if (isWalk)
+  {
+    UIFont * font = primaryAttributes[NSFontAttributeName];
+    auto textAttachment = [[NSTextAttachment alloc] init];
+    auto image = [UIImage imageNamed:@"ic_walk"];
+    textAttachment.image = image;
+    auto const height = font.lineHeight;
+    auto const y = height - image.size.height;
+    auto const width = image.size.width * height / image.size.height;
+    textAttachment.bounds = CGRectIntegral({{0, y}, {width, height}});
+
+    NSMutableAttributedString * attrStringWithImage =
+        [NSAttributedString attributedStringWithAttachment:textAttachment].mutableCopy;
+    [attrStringWithImage addAttributes:secondaryAttributes
+                                 range:NSMakeRange(0, attrStringWithImage.length)];
+    [result appendAttributedString:attrStringWithImage];
+  }
+
+  auto target = [NSString stringWithFormat:@"%@ %@", distance, distanceUnits];
+  [result appendAttributedString:[[NSAttributedString alloc] initWithString:target
+                                                                 attributes:secondaryAttributes]];
+
+  return result;
+}
 }  // namespace
 
 @interface MWMNavigationDashboardEntity ()
 
+@property(copy, nonatomic, readwrite) NSArray<MWMRouterTransitStepInfo *> * transitSteps;
 @property(copy, nonatomic, readwrite) NSAttributedString * estimate;
 @property(copy, nonatomic, readwrite) NSString * distanceToTurn;
 @property(copy, nonatomic, readwrite) NSString * streetName;
@@ -65,9 +102,16 @@ UIImage * image(routing::turns::CarDirection t, bool isNextTurn)
 
 @end
 
+@interface MWMRouterTransitStepInfo ()
+
+- (instancetype)initWithStepInfo:(TransitStepInfo const &)info;
+
+@end
+
 @interface MWMNavigationDashboardManager ()
 
 @property(copy, nonatomic) NSDictionary * etaAttributes;
+@property(copy, nonatomic) NSDictionary * etaSecondaryAttributes;
 @property(nonatomic) MWMNavigationDashboardEntity * entity;
 
 - (void)onNavigationInfoUpdated;
@@ -87,7 +131,7 @@ UIImage * image(routing::turns::CarDirection t, bool isNextTurn)
 
   if (auto entity = self.entity)
   {
-    entity.isValid = info.IsValid();
+    entity.isValid = YES;
     entity.timeToTarget = info.m_time;
     entity.targetDistance = @(info.m_distToTarget.c_str());
     entity.targetUnits = @(info.m_targetUnitsSuffix.c_str());
@@ -97,12 +141,9 @@ UIImage * image(routing::turns::CarDirection t, bool isNextTurn)
     entity.streetName = @(info.m_displayedStreetName.c_str());
     entity.nextTurnImage = image(info.m_nextTurn, true);
 
-    NSString * eta = [NSDateComponentsFormatter etaStringFrom:entity.timeToTarget];
-    auto result = [[NSMutableAttributedString alloc] initWithString:eta attributes:self.etaAttributes];
-    [result appendAttributedString:entity.estimateDot];
-    auto target = [NSString stringWithFormat:@"%@ %@", entity.targetDistance, entity.targetUnits];
-    [result appendAttributedString:[[NSAttributedString alloc] initWithString:target attributes:self.etaAttributes]];
-    entity.estimate = result;
+    entity.estimate =
+        estimate(entity.timeToTarget, entity.estimateDot, entity.targetDistance, entity.targetUnits,
+                 self.etaAttributes, self.etaSecondaryAttributes, NO);
 
     using namespace routing::turns;
     CarDirection const turn = info.m_turn;
@@ -119,4 +160,21 @@ UIImage * image(routing::turns::CarDirection t, bool isNextTurn)
   [self onNavigationInfoUpdated];
 }
 
+- (void)updateTransitInfo:(TransitRouteInfo const &)info
+{
+  if (auto entity = self.entity)
+  {
+    entity.isValid = YES;
+    entity.estimate = estimate(info.m_totalTimeInSec, entity.estimateDot,
+                               @(info.m_totalPedestrianDistanceStr.c_str()),
+                               @(info.m_totalPedestrianUnitsSuffix.c_str()), self.etaAttributes,
+                               self.etaSecondaryAttributes, YES);
+    NSMutableArray<MWMRouterTransitStepInfo *> * transitSteps = [@[] mutableCopy];
+    for (auto const & stepInfo : info.m_steps)
+      [transitSteps addObject:[[MWMRouterTransitStepInfo alloc] initWithStepInfo:stepInfo]];
+    entity.transitSteps = transitSteps;
+  }
+  [self onNavigationInfoUpdated];
+}
+
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index 66d3548ebf..c5911fb648 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -31,11 +31,13 @@ using Observers = NSHashTable<Observer>;
 @interface MWMNavigationDashboardManager ()<MWMSearchManagerObserver>
 
 @property(copy, nonatomic) NSDictionary * etaAttributes;
+@property(copy, nonatomic) NSDictionary * etaSecondaryAttributes;
 @property(copy, nonatomic) NSString * errorMessage;
+@property(nonatomic) IBOutlet MWMBaseRoutePreviewStatus * baseRoutePreviewStatus;
 @property(nonatomic) IBOutlet MWMNavigationControlView * navigationControlView;
 @property(nonatomic) IBOutlet MWMNavigationInfoView * navigationInfoView;
 @property(nonatomic) IBOutlet MWMRoutePreview * routePreview;
-@property(nonatomic) IBOutlet MWMRoutePreviewStatus * statusBox;
+@property(nonatomic) IBOutlet MWMTransportRoutePreviewStatus * transportRoutePreviewStatus;
 @property(nonatomic) IBOutletCollection(MWMRouteStartButton) NSArray * goButtons;
 @property(nonatomic) MWMNavigationDashboardEntity * entity;
 @property(nonatomic) MWMRouteManagerTransitioningManager * routeManagerTransitioningManager;
@@ -43,6 +45,7 @@ using Observers = NSHashTable<Observer>;
 @property(nonatomic, readwrite) MWMTaxiPreviewDataSource * taxiDataSource;
 @property(weak, nonatomic) IBOutlet MWMTaxiCollectionView * taxiCollectionView;
 @property(weak, nonatomic) IBOutlet UIButton * showRouteManagerButton;
+@property(weak, nonatomic) IBOutlet UIView * goButtonsContainer;
 @property(weak, nonatomic) UIView * ownerView;
 
 @end
@@ -65,12 +68,14 @@ using Observers = NSHashTable<Observer>;
   return self;
 }
 
-- (void)loadPreviewWithStatusBox
+- (void)loadPreviewWithStatusBoxes
 {
   [NSBundle.mainBundle loadNibNamed:IPAD ? kRoutePreviewIPADXibName : kRoutePreviewIPhoneXibName
                               owner:self
                             options:nil];
-  _statusBox.ownerView = self.ownerView;
+  auto ownerView = self.ownerView;
+  _baseRoutePreviewStatus.ownerView = ownerView;
+  _transportRoutePreviewStatus.ownerView = ownerView;
 }
 
 #pragma mark - MWMRoutePreview
@@ -100,7 +105,8 @@ using Observers = NSHashTable<Observer>;
   [_routePreview mwm_refreshUI];
   [_navigationInfoView mwm_refreshUI];
   [_navigationControlView mwm_refreshUI];
-  [_statusBox mwm_refreshUI];
+  [_baseRoutePreviewStatus mwm_refreshUI];
+  [_transportRoutePreviewStatus mwm_refreshUI];
 }
 
 - (void)onNavigationInfoUpdated
@@ -109,7 +115,10 @@ using Observers = NSHashTable<Observer>;
   if (!entity.isValid)
     return;
   [_navigationInfoView onNavigationInfoUpdated:entity];
-  [_statusBox onNavigationInfoUpdated:entity];
+  if ([MWMRouter type] == MWMRouterTypePublicTransport)
+    [_transportRoutePreviewStatus onNavigationInfoUpdated:entity];
+  else
+    [_baseRoutePreviewStatus onNavigationInfoUpdated:entity];
   [_navigationControlView onNavigationInfoUpdated:entity];
 }
 
@@ -141,8 +150,10 @@ using Observers = NSHashTable<Observer>;
   self.navigationInfoView = nil;
   _navigationControlView.isVisible = NO;
   _navigationControlView = nil;
-  [self.statusBox stateHidden];
-  self.statusBox = nil;
+  [_baseRoutePreviewStatus hide];
+  _baseRoutePreviewStatus = nil;
+  [_transportRoutePreviewStatus hide];
+  _transportRoutePreviewStatus = nil;
 }
 
 - (void)statePrepare
@@ -153,7 +164,8 @@ using Observers = NSHashTable<Observer>;
   [routePreview statePrepare];
   [routePreview selectRouter:[MWMRouter type]];
   [self updateGoButtonTitle];
-  [self.statusBox statePrepare];
+  [_baseRoutePreviewStatus hide];
+  [_transportRoutePreviewStatus hide];
   for (MWMRouteStartButton * button in self.goButtons)
     [button statePrepare];
 }
@@ -193,7 +205,7 @@ using Observers = NSHashTable<Observer>;
   auto routePreview = self.routePreview;
   [routePreview router:[MWMRouter type] setState:MWMCircularProgressStateFailed];
   [self updateGoButtonTitle];
-  [self.statusBox stateErrorWithMessage:self.errorMessage];
+  [self.baseRoutePreviewStatus showErrorWithMessage:self.errorMessage];
   for (MWMRouteStartButton * button in self.goButtons)
     [button stateError];
 }
@@ -203,7 +215,12 @@ using Observers = NSHashTable<Observer>;
   NSAssert(_state == MWMNavigationDashboardStatePlanning, @"Invalid state change (ready)");
   [self setRouteBuilderProgress:100.];
   [self updateGoButtonTitle];
-  [self.statusBox stateReady];
+  auto const isTransport = ([MWMRouter type] == MWMRouterTypePublicTransport);
+  if (isTransport)
+    [self.transportRoutePreviewStatus showReady];
+  else
+    [self.baseRoutePreviewStatus showReady];
+  self.goButtonsContainer.hidden = isTransport;
   for (MWMRouteStartButton * button in self.goButtons)
     [button stateReady];
 }
@@ -216,8 +233,10 @@ using Observers = NSHashTable<Observer>;
   self.routePreview = nil;
   self.navigationInfoView.state = MWMNavigationInfoViewStateNavigation;
   self.navigationControlView.isVisible = YES;
-  [self.statusBox stateNavigation];
-  self.statusBox = nil;
+  [_baseRoutePreviewStatus hide];
+  _baseRoutePreviewStatus = nil;
+  [_transportRoutePreviewStatus hide];
+  _transportRoutePreviewStatus = nil;
   [self onNavigationInfoUpdated];
 }
 
@@ -318,6 +337,18 @@ using Observers = NSHashTable<Observer>;
   return _etaAttributes;
 }
 
+- (NSDictionary *)etaSecondaryAttributes
+{
+  if (!_etaSecondaryAttributes)
+  {
+    _etaSecondaryAttributes = @{
+      NSForegroundColorAttributeName: [UIColor blackSecondaryText],
+      NSFontAttributeName: [UIFont medium17]
+    };
+  }
+  return _etaSecondaryAttributes;
+}
+
 - (void)setState:(MWMNavigationDashboardState)state
 {
   if (_state == state)
@@ -351,15 +382,22 @@ using Observers = NSHashTable<Observer>;
 - (MWMRoutePreview *)routePreview
 {
   if (!_routePreview)
-    [self loadPreviewWithStatusBox];
+    [self loadPreviewWithStatusBoxes];
   return _routePreview;
 }
 
-- (MWMRoutePreviewStatus *)statusBox
+- (MWMBaseRoutePreviewStatus *)baseRoutePreviewStatus
 {
-  if (!_statusBox)
-    [self loadPreviewWithStatusBox];
-  return _statusBox;
+  if (!_baseRoutePreviewStatus)
+    [self loadPreviewWithStatusBoxes];
+  return _baseRoutePreviewStatus;
+}
+
+- (MWMTransportRoutePreviewStatus *)transportRoutePreviewStatus
+{
+  if (!_transportRoutePreviewStatus)
+    [self loadPreviewWithStatusBoxes];
+  return _transportRoutePreviewStatus;
 }
 
 - (MWMNavigationInfoView *)navigationInfoView
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib
index 4ac2a09bb8..4482bc77a7 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib
@@ -17,10 +17,12 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
             <connections>
+                <outlet property="baseRoutePreviewStatus" destination="87p-Qg-8f3" id="ddh-nm-Ux9"/>
+                <outlet property="goButtonsContainer" destination="gcR-zj-b7P" id="RuF-Qu-ahX"/>
                 <outlet property="routePreview" destination="u2u-Vb-2eH" id="VZw-5q-2P6"/>
                 <outlet property="showRouteManagerButton" destination="NAs-km-8uw" id="pJx-0l-Skz"/>
-                <outlet property="statusBox" destination="87p-Qg-8f3" id="dze-gL-fnK"/>
                 <outlet property="taxiCollectionView" destination="t6d-gI-JcN" id="b5y-vn-rwV"/>
+                <outlet property="transportRoutePreviewStatus" destination="FXb-tH-ZTF" id="P0g-ys-6wW"/>
                 <outletCollection property="goButtons" destination="4IJ-pR-Ztp" id="ePc-jh-SfE"/>
             </connections>
         </placeholder>
@@ -127,7 +129,7 @@
                         <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87p-Qg-8f3" userLabel="Status Box" customClass="MWMRoutePreviewStatus">
+                <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87p-Qg-8f3" customClass="MWMBaseRoutePreviewStatus">
                     <rect key="frame" x="0.0" y="100" width="375" height="180"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QEP-6s-YTM" userLabel="Error Box">
@@ -354,6 +356,49 @@
                         <outlet property="taxiBoxBottom" destination="CCT-23-3wk" id="e2w-eO-HqA"/>
                     </connections>
                 </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FXb-tH-ZTF" customClass="MWMTransportRoutePreviewStatus">
+                    <rect key="frame" x="0.0" y="100" width="375" height="80"/>
+                    <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="tuZ-25-ltG">
+                            <rect key="frame" x="16" y="12" width="42" height="20"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <nil key="textColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <collectionView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" alwaysBounceHorizontal="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" delaysContentTouches="NO" canCancelContentTouches="NO" bouncesZoom="NO" dataMode="none" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ey-lL-uzF" customClass="TransportTransitStepsCollectionView" customModule="cm_dbg" customModuleProvider="target">
+                            <rect key="frame" x="16" y="44" width="343" height="20"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="4NI-xp-o3L"/>
+                            </constraints>
+                            <collectionViewLayout key="collectionViewLayout" id="PJv-Hi-Xu3" customClass="TransportTransitFlowLayout" customModule="cm_dbg" customModuleProvider="target"/>
+                        </collectionView>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="tuZ-25-ltG" firstAttribute="top" secondItem="FXb-tH-ZTF" secondAttribute="top" constant="12" id="1Aj-rm-MMr"/>
+                        <constraint firstItem="8Ey-lL-uzF" firstAttribute="top" secondItem="tuZ-25-ltG" secondAttribute="bottom" constant="12" id="CKR-P5-B2a"/>
+                        <constraint firstItem="tuZ-25-ltG" firstAttribute="leading" secondItem="FXb-tH-ZTF" secondAttribute="leading" constant="16" id="GJC-Gt-255"/>
+                        <constraint firstAttribute="bottom" secondItem="8Ey-lL-uzF" secondAttribute="bottom" constant="16" id="KxL-xf-eVL"/>
+                        <constraint firstAttribute="trailing" secondItem="8Ey-lL-uzF" secondAttribute="trailing" constant="16" id="ejR-Po-Dxm"/>
+                        <constraint firstItem="8Ey-lL-uzF" firstAttribute="leading" secondItem="tuZ-25-ltG" secondAttribute="leading" id="gkU-xQ-hb2"/>
+                        <constraint firstAttribute="height" priority="100" constant="80" id="lLi-5o-PDI"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
+                            <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
+                            <integer key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <outlet property="etaLabel" destination="tuZ-25-ltG" id="Rwo-UC-mvq"/>
+                        <outlet property="stepsCollectionView" destination="8Ey-lL-uzF" id="qrI-Cw-rAJ"/>
+                        <outlet property="stepsCollectionViewHeight" destination="4NI-xp-o3L" id="Z11-UU-Mca"/>
+                    </connections>
+                </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gcR-zj-b7P">
                     <rect key="frame" x="0.0" y="619" width="375" height="48"/>
                     <subviews>
@@ -402,13 +447,16 @@
                 <constraint firstAttribute="trailing" secondItem="87p-Qg-8f3" secondAttribute="trailing" id="5wh-lx-rUz"/>
                 <constraint firstItem="3s2-BV-X5i" firstAttribute="top" secondItem="3zr-me-gbI" secondAttribute="bottom" id="6c0-tH-qlJ"/>
                 <constraint firstItem="87p-Qg-8f3" firstAttribute="top" secondItem="3s2-BV-X5i" secondAttribute="bottom" constant="36" id="8nt-tf-wyq"/>
+                <constraint firstItem="FXb-tH-ZTF" firstAttribute="top" secondItem="3s2-BV-X5i" secondAttribute="bottom" constant="36" id="9Bz-NL-px6"/>
                 <constraint firstItem="87p-Qg-8f3" firstAttribute="leading" secondItem="u2u-Vb-2eH" secondAttribute="leading" id="9bA-9R-pwq"/>
+                <constraint firstItem="FXb-tH-ZTF" firstAttribute="leading" secondItem="u2u-Vb-2eH" secondAttribute="leading" id="Mmr-RH-iDm"/>
                 <constraint firstAttribute="trailing" secondItem="3zr-me-gbI" secondAttribute="trailing" id="OZ2-dP-mna"/>
                 <constraint firstAttribute="bottom" secondItem="gcR-zj-b7P" secondAttribute="bottom" id="QYs-r4-Jyl"/>
                 <constraint firstItem="3s2-BV-X5i" firstAttribute="leading" secondItem="u2u-Vb-2eH" secondAttribute="leading" id="e90-R4-YQR"/>
                 <constraint firstItem="3zr-me-gbI" firstAttribute="top" secondItem="u2u-Vb-2eH" secondAttribute="top" id="hE5-50-mMA"/>
                 <constraint firstAttribute="trailing" secondItem="3s2-BV-X5i" secondAttribute="trailing" id="lnu-7l-aPG"/>
                 <constraint firstAttribute="trailing" secondItem="gcR-zj-b7P" secondAttribute="trailing" id="n9j-dG-kOB"/>
+                <constraint firstAttribute="trailing" secondItem="FXb-tH-ZTF" secondAttribute="trailing" id="sFK-Dz-Ta2"/>
                 <constraint firstItem="3zr-me-gbI" firstAttribute="leading" secondItem="u2u-Vb-2eH" secondAttribute="leading" id="xgY-7G-jgv"/>
             </constraints>
             <userDefinedRuntimeAttributes>
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
index 54ec6e0803..93e51d289c 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
@@ -16,9 +16,10 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
             <connections>
+                <outlet property="baseRoutePreviewStatus" destination="hIE-BJ-nFm" id="Kwy-sL-krz"/>
                 <outlet property="routePreview" destination="aNH-vh-DPz" id="ORz-pz-7sV"/>
-                <outlet property="statusBox" destination="hIE-BJ-nFm" id="j6g-xk-RgK"/>
                 <outlet property="taxiCollectionView" destination="Dm8-yS-U68" id="crw-jv-vGq"/>
+                <outlet property="transportRoutePreviewStatus" destination="iWi-pM-AJF" id="ah9-rm-QeN"/>
                 <outletCollection property="goButtons" destination="ZXz-KM-xQz" id="14O-qB-UJl"/>
                 <outletCollection property="goButtons" destination="CQB-xn-DSM" id="FPU-6h-5CN"/>
             </connections>
@@ -157,7 +158,7 @@
             </connections>
             <point key="canvasLocation" x="448" y="341"/>
         </view>
-        <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hIE-BJ-nFm" userLabel="Status Box" customClass="MWMRoutePreviewStatus">
+        <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hIE-BJ-nFm" customClass="MWMBaseRoutePreviewStatus">
             <rect key="frame" x="0.0" y="0.0" width="320" height="152"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fD2-1N-x27" userLabel="Error Box">
@@ -396,7 +397,7 @@
                 <outlet property="manageRouteBoxBottom" destination="kPq-9v-D4c" id="FPP-Hc-DGv"/>
                 <outlet property="manageRouteButtonCompact" destination="Zzm-Yo-BvL" id="MAs-VL-pR0"/>
                 <outlet property="manageRouteButtonRegular" destination="K37-2W-GE8" id="I40-pl-MM4"/>
-                <outlet property="resultLabel" destination="sjQ-Sc-mtN" id="XIY-sS-M2V"/>
+                <outlet property="resultLabel" destination="sjQ-Sc-mtN" id="GLa-P4-7XO"/>
                 <outlet property="resultsBox" destination="Tai-sE-6DC" id="l4p-m2-z4z"/>
                 <outlet property="resultsBoxBottom" destination="trf-mi-xeb" id="tdb-sa-2ak"/>
                 <outlet property="taxiBox" destination="5a5-vb-p6T" id="MLv-mh-dK2"/>
@@ -404,6 +405,51 @@
             </connections>
             <point key="canvasLocation" x="448" y="521"/>
         </view>
+        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iWi-pM-AJF" customClass="MWMTransportRoutePreviewStatus">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
+            <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="Iu4-M8-t6g">
+                    <rect key="frame" x="16" y="12" width="42" height="20"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <collectionView userInteractionEnabled="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" alwaysBounceHorizontal="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" delaysContentTouches="NO" canCancelContentTouches="NO" bouncesZoom="NO" dataMode="none" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RVh-LF-kSn" customClass="TransportTransitStepsCollectionView" customModule="cm_dbg" customModuleProvider="target">
+                    <rect key="frame" x="16" y="44" width="288" height="20"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="eGu-Mr-auv"/>
+                    </constraints>
+                    <collectionViewLayout key="collectionViewLayout" id="d3P-nT-IFD" customClass="TransportTransitFlowLayout" customModule="cm_dbg" customModuleProvider="target"/>
+                </collectionView>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="Iu4-M8-t6g" firstAttribute="leading" secondItem="iWi-pM-AJF" secondAttribute="leading" constant="16" id="5Ge-fx-3pw"/>
+                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="80" id="CQk-tf-wu9"/>
+                <constraint firstItem="RVh-LF-kSn" firstAttribute="top" secondItem="Iu4-M8-t6g" secondAttribute="bottom" constant="12" id="DOH-Jl-zYW"/>
+                <constraint firstItem="RVh-LF-kSn" firstAttribute="leading" secondItem="Iu4-M8-t6g" secondAttribute="leading" id="Jo0-dN-03y"/>
+                <constraint firstItem="Iu4-M8-t6g" firstAttribute="top" secondItem="iWi-pM-AJF" secondAttribute="top" constant="12" id="Zyw-PT-55a"/>
+                <constraint firstAttribute="bottom" secondItem="RVh-LF-kSn" secondAttribute="bottom" constant="16" id="b0R-Xj-EVN"/>
+                <constraint firstAttribute="trailing" secondItem="RVh-LF-kSn" secondAttribute="trailing" constant="16" id="nhh-en-tgm"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <userDefinedRuntimeAttributes>
+                <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
+                    <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
+                </userDefinedRuntimeAttribute>
+                <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
+                    <integer key="value" value="1"/>
+                </userDefinedRuntimeAttribute>
+                <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
+            </userDefinedRuntimeAttributes>
+            <connections>
+                <outlet property="etaLabel" destination="Iu4-M8-t6g" id="hJe-KS-ctT"/>
+                <outlet property="stepsCollectionView" destination="RVh-LF-kSn" id="3uG-nE-mt3"/>
+                <outlet property="stepsCollectionViewHeight" destination="eGu-Mr-auv" id="K2J-yO-yQ5"/>
+            </connections>
+            <point key="canvasLocation" x="449" y="737"/>
+        </view>
     </objects>
     <resources>
         <image name="ic_24px_manager" width="24" height="24"/>
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift
similarity index 95%
rename from iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus.swift
rename to iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift
index 2382c942bf..0366fe7276 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus.swift
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift
@@ -1,5 +1,5 @@
-@objc(MWMRoutePreviewStatus)
-final class RoutePreviewStatus: SolidTouchView {
+@objc(MWMBaseRoutePreviewStatus)
+final class BaseRoutePreviewStatus: SolidTouchView {
   @IBOutlet private weak var errorBox: UIView!
   @IBOutlet private weak var resultsBox: UIView!
   @IBOutlet private weak var heightBox: UIView!
@@ -49,7 +49,7 @@ final class RoutePreviewStatus: SolidTouchView {
     }
   }
 
-  var isVisible = false {
+  private var isVisible = false {
     didSet {
       alternative(iPhone: {
         guard self.isVisible != oldValue else { return }
@@ -120,15 +120,11 @@ final class RoutePreviewStatus: SolidTouchView {
     manageRouteButtonCompact?.isHidden = !isCompact
   }
 
-  @objc func stateHidden() {
+  @objc func hide() {
     isVisible = false
   }
 
-  @objc func statePrepare() {
-    isVisible = false
-  }
-
-  @objc func stateError(message: String) {
+  @objc func showError(message: String) {
     isVisible = true
     errorBox.isHidden = false
     resultsBox.isHidden = true
@@ -141,7 +137,7 @@ final class RoutePreviewStatus: SolidTouchView {
     updateHeight()
   }
 
-  @objc func stateReady() {
+  @objc func showReady() {
     isVisible = true
     errorBox.isHidden = true
 
@@ -175,10 +171,6 @@ final class RoutePreviewStatus: SolidTouchView {
     updateHeight()
   }
 
-  @objc func stateNavigation() {
-    isVisible = false
-  }
-
   private func updateResultsLabel() {
     guard let info = navigationInfo else { return }
 
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift
new file mode 100644
index 0000000000..99e6b14dd5
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift
@@ -0,0 +1,97 @@
+@objc(MWMTransportRoutePreviewStatus)
+final class TransportRoutePreviewStatus: SolidTouchView {
+  @IBOutlet private weak var etaLabel: UILabel!
+  @IBOutlet private weak var stepsCollectionView: TransportTransitStepsCollectionView!
+  @IBOutlet private weak var stepsCollectionViewHeight: NSLayoutConstraint!
+
+  private var hiddenConstraint: NSLayoutConstraint!
+  @objc weak var ownerView: UIView!
+
+  weak var navigationInfo: MWMNavigationDashboardEntity?
+
+  private var isVisible = false {
+    didSet {
+      alternative(iPhone: {
+        guard self.isVisible != oldValue else { return }
+        if self.isVisible {
+          self.addView()
+        }
+        DispatchQueue.main.async {
+          guard let sv = self.superview else { return }
+          sv.setNeedsLayout()
+          self.hiddenConstraint.isActive = !self.isVisible
+          UIView.animate(withDuration: kDefaultAnimationDuration,
+                         animations: { sv.layoutIfNeeded() },
+                         completion: { _ in
+                           if !self.isVisible {
+                             self.removeFromSuperview()
+                           }
+          })
+        }
+      },
+      iPad: { self.isHidden = !self.isVisible })()
+    }
+  }
+
+  private func addView() {
+    guard superview != ownerView else { return }
+    ownerView.addSubview(self)
+
+    NSLayoutConstraint(item: self, attribute: .left, relatedBy: .equal, toItem: ownerView, attribute: .left, multiplier: 1, constant: 0).isActive = true
+    NSLayoutConstraint(item: self, attribute: .right, relatedBy: .equal, toItem: ownerView, attribute: .right, multiplier: 1, constant: 0).isActive = true
+
+    hiddenConstraint = NSLayoutConstraint(item: self, attribute: .top, relatedBy: .equal, toItem: ownerView, attribute: .bottom, multiplier: 1, constant: 0)
+    hiddenConstraint.priority = UILayoutPriority.defaultHigh
+    hiddenConstraint.isActive = true
+
+    let visibleConstraint = NSLayoutConstraint(item: self, attribute: .bottom, relatedBy: .equal, toItem: ownerView, attribute: .bottom, multiplier: 1, constant: 0)
+    visibleConstraint.priority = UILayoutPriority.defaultLow
+    visibleConstraint.isActive = true
+  }
+
+  @objc func hide() {
+    isVisible = false
+  }
+
+  @objc func showReady() {
+    isVisible = true
+    updateHeight()
+  }
+
+  @objc func onNavigationInfoUpdated(_ info: MWMNavigationDashboardEntity) {
+    navigationInfo = info
+    etaLabel.attributedText = info.estimate
+    stepsCollectionView.steps = info.transitSteps
+  }
+
+  private func updateHeight() {
+    guard stepsCollectionViewHeight.constant != stepsCollectionView.contentSize.height else { return }
+    DispatchQueue.main.async {
+      self.setNeedsLayout()
+      self.stepsCollectionViewHeight.constant = self.stepsCollectionView.contentSize.height
+      UIView.animate(withDuration: kDefaultAnimationDuration) { self.layoutIfNeeded() }
+    }
+  }
+
+  override func layoutSubviews() {
+    super.layoutSubviews()
+    updateHeight()
+  }
+
+  override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+    super.traitCollectionDidChange(previousTraitCollection)
+    updateHeight()
+  }
+
+  override var sideButtonsAreaAffectDirections: MWMAvailableAreaAffectDirections {
+    return alternative(iPhone: .bottom, iPad: [])
+  }
+
+  override var visibleAreaAffectDirections: MWMAvailableAreaAffectDirections {
+    return alternative(iPhone: .bottom, iPad: [])
+  }
+
+  override var widgetsAreaAffectDirections: MWMAvailableAreaAffectDirections {
+    return alternative(iPhone: .bottom, iPad: [])
+  }
+}
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitCell.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitCell.swift
new file mode 100644
index 0000000000..5835709f49
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitCell.swift
@@ -0,0 +1,11 @@
+class TransportTransitCell: UICollectionViewCell {
+  enum Config {
+    static let cellSize = CGSize(width: 20, height: 20)
+  }
+
+  class func estimatedCellSize(step _: MWMRouterTransitStepInfo) -> CGSize {
+    return Config.cellSize
+  }
+
+  func config(step _: MWMRouterTransitStepInfo) {}
+}
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitFlowLayout.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitFlowLayout.swift
new file mode 100644
index 0000000000..6cc1b62d55
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitFlowLayout.swift
@@ -0,0 +1,77 @@
+final class TransportTransitFlowLayout: UICollectionViewLayout {
+  enum Config {
+    static let lineSpacing = CGFloat(8)
+    static let separator = TransportTransitSeparator.self
+    static let separatorKind = toString(separator)
+    static let separatorSize = CGSize(width: 16, height: 20)
+    static let minimumCellWidthAfterShrink = CGFloat(56)
+  }
+
+  private var cellsLayoutAttrs = [UICollectionViewLayoutAttributes]()
+  private var decoratorsLayoutAttrs = [UICollectionViewLayoutAttributes]()
+
+  required init?(coder aDecoder: NSCoder) {
+    super.init(coder: aDecoder)
+    register(Config.separator, forDecorationViewOfKind: Config.separatorKind)
+  }
+
+  override var collectionViewContentSize: CGSize {
+    let width = collectionView?.frame.width ?? 0
+    let height = cellsLayoutAttrs.reduce(0) { return max($0, $1.frame.maxY) }
+    return CGSize(width: width, height: height)
+  }
+
+  override func prepare() {
+    super.prepare()
+    let cv = collectionView as! TransportTransitStepsCollectionView
+
+    let section = 0
+    let width = cv.width
+    var x = CGFloat(0)
+    var y = CGFloat(0)
+
+    cellsLayoutAttrs = []
+    decoratorsLayoutAttrs = []
+    for item in 0 ..< cv.numberOfItems(inSection: section) {
+      let ip = IndexPath(item: item, section: section)
+
+      if item != 0 {
+        let sepAttr = UICollectionViewLayoutAttributes(forDecorationViewOfKind: Config.separatorKind, with: ip)
+        sepAttr.frame = CGRect(origin: CGPoint(x: x, y: y), size: Config.separatorSize)
+        decoratorsLayoutAttrs.append(sepAttr)
+
+        x += Config.separatorSize.width
+      }
+
+      var cellSize = cv.estimatedCellSize(item: item)
+      let spaceLeft = width - x - Config.separatorSize.width
+      let minimumSpaceRequired = min(cellSize.width, Config.minimumCellWidthAfterShrink)
+      if spaceLeft < minimumSpaceRequired {
+        x = 0
+        y += Config.separatorSize.height + Config.lineSpacing
+      } else {
+        cellSize.width = min(cellSize.width, spaceLeft)
+      }
+
+      let cellAttr = UICollectionViewLayoutAttributes(forCellWith: ip)
+      cellAttr.frame = CGRect(origin: CGPoint(x: x, y: y), size: cellSize)
+      cellsLayoutAttrs.append(cellAttr)
+
+      x += cellSize.width
+    }
+  }
+
+  override func layoutAttributesForItem(at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? {
+    return cellsLayoutAttrs.first(where: { $0.indexPath == indexPath })
+  }
+
+  override func layoutAttributesForDecorationView(ofKind _: String, at indexPath: IndexPath) -> UICollectionViewLayoutAttributes? {
+    return decoratorsLayoutAttrs.first(where: { $0.indexPath == indexPath })
+  }
+
+  override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
+    var layoutAttrs = cellsLayoutAttrs.filter { $0.frame.intersects(rect) }
+    layoutAttrs.append(contentsOf: decoratorsLayoutAttrs.filter { $0.frame.intersects(rect) })
+    return layoutAttrs
+  }
+}
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitIntermediatePoint.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitIntermediatePoint.swift
new file mode 100644
index 0000000000..1fd63fb645
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitIntermediatePoint.swift
@@ -0,0 +1,17 @@
+final class TransportTransitIntermediatePoint: TransportTransitCell {
+  enum Config {
+    static let imageColor = UIColor.primary()!
+  }
+
+  @IBOutlet private weak var image: UIImageView!
+  override func config(step: MWMRouterTransitStepInfo) {
+    super.config(step: step)
+    switch step.intermediateIndex {
+    case 0: image.image = #imageLiteral(resourceName: "ic_route_manager_stop_a")
+    case 1: image.image = #imageLiteral(resourceName: "ic_route_manager_stop_b")
+    case 2: image.image = #imageLiteral(resourceName: "ic_route_manager_stop_c")
+    default: fatalError("Unsupported route point intermediateIndex.")
+    }
+    image.tintColor = Config.imageColor
+  }
+}
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitIntermediatePoint.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitIntermediatePoint.xib
new file mode 100644
index 0000000000..830c1ecc8f
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitIntermediatePoint.xib
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportTransitIntermediatePoint" customModule="cm_dbg" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_route_manager_stop_a" translatesAutoresizingMaskIntoConstraints="NO" id="kZf-7J-OZ5">
+                        <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+                        <color key="tintColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="20" id="OkK-UD-TWr"/>
+                            <constraint firstAttribute="height" constant="20" id="n8x-xG-gUb"/>
+                        </constraints>
+                    </imageView>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstItem="kZf-7J-OZ5" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="5rb-Q4-qua"/>
+                <constraint firstAttribute="bottom" secondItem="kZf-7J-OZ5" secondAttribute="bottom" id="5uG-SP-l0m"/>
+                <constraint firstItem="kZf-7J-OZ5" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="KiE-6N-4Jp"/>
+                <constraint firstAttribute="trailing" secondItem="kZf-7J-OZ5" secondAttribute="trailing" id="mJI-lD-bsw"/>
+            </constraints>
+            <size key="customSize" width="490" height="20"/>
+            <connections>
+                <outlet property="image" destination="kZf-7J-OZ5" id="b9M-uB-XoA"/>
+            </connections>
+            <point key="canvasLocation" x="270" y="54"/>
+        </collectionViewCell>
+    </objects>
+    <resources>
+        <image name="ic_route_manager_stop_a" width="24" height="24"/>
+    </resources>
+</document>
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitPedestrian.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitPedestrian.swift
new file mode 100644
index 0000000000..ebb634a7d9
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitPedestrian.swift
@@ -0,0 +1,22 @@
+final class TransportTransitPedestrian: TransportTransitCell {
+  enum Config {
+    static let backgroundCornerRadius = CGFloat(4)
+    static let backgroundColor = UIColor.blackOpaque()!
+    static let imageColor = UIColor.blackSecondaryText()!
+  }
+
+  @IBOutlet private weak var background: UIView! {
+    didSet {
+      background.layer.cornerRadius = Config.backgroundCornerRadius
+      background.backgroundColor = Config.backgroundColor
+    }
+  }
+
+  @IBOutlet private weak var image: UIImageView! {
+    didSet {
+      image.image = #imageLiteral(resourceName: "ic_walk")
+      image.tintColor = Config.imageColor
+      image.contentMode = .scaleAspectFit
+    }
+  }
+}
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitPedestrian.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitPedestrian.xib
new file mode 100644
index 0000000000..263720bcf9
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitPedestrian.xib
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="gTV-IL-0wX" customClass="TransportTransitPedestrian" customModule="cm_dbg" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Shb-td-cXL">
+                        <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="ic_walk" translatesAutoresizingMaskIntoConstraints="NO" id="9hI-Y9-uRa">
+                                <rect key="frame" x="3" y="3" width="14" height="14"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="14" id="EeL-qS-rKg"/>
+                                    <constraint firstAttribute="height" constant="14" id="WCk-l4-hQF"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="9hI-Y9-uRa" firstAttribute="centerY" secondItem="Shb-td-cXL" secondAttribute="centerY" id="IkJ-Yh-48o"/>
+                            <constraint firstAttribute="height" constant="20" id="hEu-YE-u8j"/>
+                            <constraint firstAttribute="width" constant="20" id="pxM-8S-VsE"/>
+                            <constraint firstItem="9hI-Y9-uRa" firstAttribute="centerX" secondItem="Shb-td-cXL" secondAttribute="centerX" id="vZX-k3-HmM"/>
+                        </constraints>
+                    </view>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="Shb-td-cXL" secondAttribute="trailing" id="JRQ-z7-d3U"/>
+                <constraint firstAttribute="bottom" secondItem="Shb-td-cXL" secondAttribute="bottom" id="nDY-rn-9J0"/>
+                <constraint firstItem="Shb-td-cXL" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="pu1-LW-wkd"/>
+                <constraint firstItem="Shb-td-cXL" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="ymH-iI-Ify"/>
+            </constraints>
+            <size key="customSize" width="227" height="20"/>
+            <connections>
+                <outlet property="background" destination="Shb-td-cXL" id="YAM-iA-NYW"/>
+                <outlet property="image" destination="9hI-Y9-uRa" id="9i8-eW-XWO"/>
+            </connections>
+            <point key="canvasLocation" x="137.5" y="54"/>
+        </collectionViewCell>
+    </objects>
+    <resources>
+        <image name="ic_walk" width="24" height="24"/>
+    </resources>
+</document>
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitSeparator.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitSeparator.swift
new file mode 100644
index 0000000000..37708711fe
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitSeparator.swift
@@ -0,0 +1,27 @@
+final class TransportTransitSeparator: UICollectionReusableView {
+  enum Config {
+    static let imageColor = UIColor.blackSecondaryText()!
+  }
+
+  override init(frame: CGRect) {
+    super.init(frame: frame)
+    setup()
+  }
+
+  required init?(coder aDecoder: NSCoder) {
+    super.init(coder: aDecoder)
+    setup()
+  }
+
+  private func setup() {
+    let image = UIImageView(image: #imageLiteral(resourceName: "ic_arrow"))
+    image.tintColor = Config.imageColor
+    image.contentMode = .scaleAspectFit
+    addSubview(image)
+  }
+
+  override func layoutSubviews() {
+    super.layoutSubviews()
+    subviews.first!.frame = bounds
+  }
+}
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitStepsCollectionView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitStepsCollectionView.swift
new file mode 100644
index 0000000000..587e1e55c4
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitStepsCollectionView.swift
@@ -0,0 +1,57 @@
+final class TransportTransitStepsCollectionView: UICollectionView {
+  var steps: [MWMRouterTransitStepInfo] = [] {
+    didSet {
+      reloadData()
+    }
+  }
+
+  override var frame: CGRect {
+    didSet {
+      collectionViewLayout.invalidateLayout()
+    }
+  }
+
+  override var bounds: CGRect {
+    didSet {
+      collectionViewLayout.invalidateLayout()
+    }
+  }
+
+  override func awakeFromNib() {
+    super.awakeFromNib()
+    dataSource = self
+    [TransportTransitIntermediatePoint.self, TransportTransitPedestrian.self, TransportTransitTrain.self].forEach {
+      register(cellClass: $0)
+    }
+  }
+
+  private func cellClass(item: Int) -> TransportTransitCell.Type {
+    let step = steps[item]
+    switch step.type {
+    case .intermediatePoint: return TransportTransitIntermediatePoint.self
+    case .pedestrian: return TransportTransitPedestrian.self
+    case .train: fallthrough
+    case .subway: fallthrough
+    case .lightRail: fallthrough
+    case .monorail: return TransportTransitTrain.self
+    }
+  }
+
+  func estimatedCellSize(item: Int) -> CGSize {
+    return cellClass(item: item).estimatedCellSize(step: steps[item])
+  }
+}
+
+extension TransportTransitStepsCollectionView: UICollectionViewDataSource {
+  func collectionView(_: UICollectionView, numberOfItemsInSection _: Int) -> Int {
+    return steps.count
+  }
+
+  func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+    let item = indexPath.item
+    let cellClass = self.cellClass(item: item)
+    let cell = collectionView.dequeueReusableCell(withCellClass: cellClass, indexPath: indexPath) as! TransportTransitCell
+    cell.config(step: steps[item])
+    return cell
+  }
+}
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.swift
new file mode 100644
index 0000000000..ac29fe5d8c
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.swift
@@ -0,0 +1,52 @@
+final class TransportTransitTrain: TransportTransitCell {
+  enum Config {
+    static let backgroundCornerRadius = CGFloat(4)
+    static let labelTextColor = UIColor.white
+    static let labelTextFont = UIFont.bold12()!
+    static let labelTrailing = CGFloat(4)
+  }
+
+  @IBOutlet private weak var background: UIView! {
+    didSet {
+      background.layer.cornerRadius = Config.backgroundCornerRadius
+    }
+  }
+
+  @IBOutlet private weak var image: UIImageView!
+  @IBOutlet private weak var label: UILabel! {
+    didSet {
+      label.textColor = Config.labelTextColor
+      label.font = Config.labelTextFont
+    }
+  }
+
+  @IBOutlet private weak var labelTrailing: NSLayoutConstraint! {
+    didSet {
+      labelTrailing.constant = Config.labelTrailing
+    }
+  }
+
+  @IBOutlet private var emptyNumberTrailingOffset: NSLayoutConstraint!
+
+  override class func estimatedCellSize(step: MWMRouterTransitStepInfo) -> CGSize {
+    let defaultSize = super.estimatedCellSize(step: step)
+    let labelSize = step.number.size(width: CGFloat.greatestFiniteMagnitude, font: Config.labelTextFont, maxNumberOfLines: 1)
+    return CGSize(width: defaultSize.width + labelSize.width + Config.labelTrailing, height: defaultSize.height)
+  }
+
+  override func config(step: MWMRouterTransitStepInfo) {
+    switch step.type {
+    case .intermediatePoint: fallthrough
+    case .pedestrian: fatalError()
+    case .train: image.image = #imageLiteral(resourceName: "ic_20px_route_planning_train")
+    case .subway: fallthrough
+    case .lightRail: fallthrough
+    case .monorail: image.image = #imageLiteral(resourceName: "ic_20px_route_planning_metro")
+    }
+    background.backgroundColor = step.color
+
+    emptyNumberTrailingOffset.isActive = step.number.isEmpty
+    label.isHidden = step.number.isEmpty
+    label.text = step.number
+  }
+}
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.xib
new file mode 100644
index 0000000000..6aa954abdc
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.xib
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportTransitTrain" customModule="cm_dbg" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kDc-o2-JUp">
+                        <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="9d1-PP-h28">
+                                <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="9d1-PP-h28" secondAttribute="height" multiplier="1:1" id="g45-u1-mQs"/>
+                                </constraints>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="450" verticalCompressionResistancePriority="450" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Eo-0D-mup">
+                                <rect key="frame" x="20" y="0.0" width="0.0" height="20"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="9d1-PP-h28" firstAttribute="top" secondItem="kDc-o2-JUp" secondAttribute="top" id="3Nm-tA-OCb"/>
+                            <constraint firstItem="0Eo-0D-mup" firstAttribute="leading" secondItem="9d1-PP-h28" secondAttribute="trailing" id="3sb-9G-W6c"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="0Eo-0D-mup" secondAttribute="trailing" priority="750" id="5NZ-eM-6di"/>
+                            <constraint firstAttribute="bottom" secondItem="0Eo-0D-mup" secondAttribute="bottom" id="Gu9-KZ-D9R"/>
+                            <constraint firstAttribute="trailing" secondItem="0Eo-0D-mup" secondAttribute="trailing" priority="250" constant="4" id="YNn-8w-SmG"/>
+                            <constraint firstItem="0Eo-0D-mup" firstAttribute="top" secondItem="kDc-o2-JUp" secondAttribute="top" id="ZPx-f9-8LV"/>
+                            <constraint firstItem="9d1-PP-h28" firstAttribute="leading" secondItem="kDc-o2-JUp" secondAttribute="leading" id="cQu-Lg-9xy"/>
+                            <constraint firstAttribute="bottom" secondItem="9d1-PP-h28" secondAttribute="bottom" id="m4N-mH-YaE"/>
+                            <constraint firstAttribute="trailing" secondItem="9d1-PP-h28" secondAttribute="trailing" id="mCa-Ah-9Xz"/>
+                            <constraint firstAttribute="height" constant="20" id="nQ0-T1-CvV"/>
+                        </constraints>
+                    </view>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="kDc-o2-JUp" secondAttribute="bottom" id="3wL-hq-d5s"/>
+                <constraint firstItem="kDc-o2-JUp" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="JMg-4a-h4Z"/>
+                <constraint firstItem="kDc-o2-JUp" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="MOo-JD-4vU"/>
+                <constraint firstAttribute="trailing" secondItem="kDc-o2-JUp" secondAttribute="trailing" id="gmg-yt-uVD"/>
+            </constraints>
+            <size key="customSize" width="744" height="20"/>
+            <connections>
+                <outlet property="background" destination="kDc-o2-JUp" id="fh8-Ss-FeL"/>
+                <outlet property="emptyNumberTrailingOffset" destination="mCa-Ah-9Xz" id="k8k-Ca-u6s"/>
+                <outlet property="image" destination="9d1-PP-h28" id="Kpo-zR-osU"/>
+                <outlet property="label" destination="0Eo-0D-mup" id="Z15-fa-Wkx"/>
+                <outlet property="labelTrailing" destination="YNn-8w-SmG" id="lL1-5q-mjx"/>
+            </connections>
+            <point key="canvasLocation" x="383" y="54"/>
+        </collectionViewCell>
+    </objects>
+</document>
diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm
index 34e10c5761..b006b9006e 100644
--- a/iphone/Maps/Core/Routing/MWMRouter.mm
+++ b/iphone/Maps/Core/Routing/MWMRouter.mm
@@ -503,10 +503,16 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
 {
   if (![MWMRouter isRoutingActive])
     return;
+  auto const & rm = GetFramework().GetRoutingManager();
   location::FollowingInfo info;
-  GetFramework().GetRoutingManager().GetRouteFollowingInfo(info);
-  if (info.IsValid())
-    [[MWMNavigationDashboardManager manager] updateFollowingInfo:info];
+  rm.GetRouteFollowingInfo(info);
+  auto navManager = [MWMNavigationDashboardManager manager];
+  if (!info.IsValid())
+    return;
+  if ([MWMRouter type] == MWMRouterTypePublicTransport)
+    [navManager updateTransitInfo:rm.GetTransitRouteInfo()];
+  else
+    [navManager updateFollowingInfo:info];
 }
 
 + (void)routeAltitudeImageForSize:(CGSize)size completion:(MWMImageHeightBlock)block
diff --git a/iphone/Maps/Core/Routing/MWMRouterTransitStepInfo.h b/iphone/Maps/Core/Routing/MWMRouterTransitStepInfo.h
new file mode 100644
index 0000000000..80ae7f5d43
--- /dev/null
+++ b/iphone/Maps/Core/Routing/MWMRouterTransitStepInfo.h
@@ -0,0 +1,12 @@
+#import "MWMRouterTransitType.h"
+
+@interface MWMRouterTransitStepInfo : NSObject
+
+@property(nonatomic, readonly) MWMRouterTransitType type;
+@property(copy, nonatomic, readonly) NSString * distance;
+@property(copy, nonatomic, readonly) NSString * distanceUnits;
+@property(copy, nonatomic, readonly) NSString * number;
+@property(nonatomic, readonly) UIColor * color;
+@property(nonatomic, readonly) NSInteger intermediateIndex;
+
+@end
diff --git a/iphone/Maps/Core/Routing/MWMRouterTransitStepInfo.mm b/iphone/Maps/Core/Routing/MWMRouterTransitStepInfo.mm
new file mode 100644
index 0000000000..2a5380c9e5
--- /dev/null
+++ b/iphone/Maps/Core/Routing/MWMRouterTransitStepInfo.mm
@@ -0,0 +1,58 @@
+#import "MWMRouterTransitStepInfo.h"
+
+#include "map/routing_manager.hpp"
+
+namespace
+{
+MWMRouterTransitType convertType(TransitType type)
+{
+  switch (type)
+  {
+  case TransitType::IntermediatePoint: return MWMRouterTransitTypeIntermediatePoint;
+  case TransitType::Pedestrian: return MWMRouterTransitTypePedestrian;
+  case TransitType::Subway: return MWMRouterTransitTypeSubway;
+  case TransitType::Train: return MWMRouterTransitTypeTrain;
+  case TransitType::LightRail: return MWMRouterTransitTypeLightRail;
+  case TransitType::Monorail: return MWMRouterTransitTypeMonorail;
+  }
+}
+
+UIColor * convertColor(uint32_t colorARGB)
+{
+  CGFloat const alpha = CGFloat((colorARGB >> 24) & 0xFF) / 255;
+  CGFloat const red = CGFloat((colorARGB >> 16) & 0xFF) / 255;
+  CGFloat const green = CGFloat((colorARGB >> 8) & 0xFF) / 255;
+  CGFloat const blue = CGFloat(colorARGB & 0xFF) / 255;
+  return [UIColor colorWithRed:red green:green blue:blue alpha:alpha];
+}
+}  // namespace
+
+@interface MWMRouterTransitStepInfo ()
+
+@property(nonatomic, readwrite) MWMRouterTransitType type;
+@property(copy, nonatomic, readwrite) NSString * distance;
+@property(copy, nonatomic, readwrite) NSString * distanceUnits;
+@property(copy, nonatomic, readwrite) NSString * number;
+@property(nonatomic, readwrite) UIColor * color;
+@property(nonatomic, readwrite) NSInteger intermediateIndex;
+
+@end
+
+@implementation MWMRouterTransitStepInfo
+
+- (instancetype)initWithStepInfo:(TransitStepInfo const &)info
+{
+  self = [super init];
+  if (self)
+  {
+    _type = convertType(info.m_type);
+    _distance = @(info.m_distanceStr.c_str());
+    _distanceUnits = @(info.m_distanceUnitsSuffix.c_str());
+    _number = @(info.m_number.c_str());
+    _color = convertColor(info.m_colorARGB);
+    _intermediateIndex = info.m_intermediateIndex;
+  }
+  return self;
+}
+
+@end
diff --git a/iphone/Maps/Core/Routing/MWMRouterTransitType.h b/iphone/Maps/Core/Routing/MWMRouterTransitType.h
new file mode 100644
index 0000000000..7eeca993fd
--- /dev/null
+++ b/iphone/Maps/Core/Routing/MWMRouterTransitType.h
@@ -0,0 +1,8 @@
+typedef NS_ENUM(NSUInteger, MWMRouterTransitType) {
+  MWMRouterTransitTypeIntermediatePoint,
+  MWMRouterTransitTypePedestrian,
+  MWMRouterTransitTypeSubway,
+  MWMRouterTransitTypeTrain,
+  MWMRouterTransitTypeLightRail,
+  MWMRouterTransitTypeMonorail
+};
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 48ce87f474..b09ca8ef59 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -106,42 +106,12 @@
 		3406FA161C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3406FA141C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm */; };
 		3406FA181C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3406FA171C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib */; };
 		3406FA191C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3406FA171C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib */; };
-		340708431F28ED2D00029ECC /* MWMRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340708421F28ED2D00029ECC /* MWMRoutePreview.mm */; };
-		3407084C1F28EDD100029ECC /* MWMiPadRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 340708441F28EDD100029ECC /* MWMiPadRoutePreview.xib */; };
-		3407084E1F28EDD100029ECC /* MWMTaxiPreviewDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340708481F28EDD100029ECC /* MWMTaxiPreviewDataSource.mm */; };
-		3407084F1F28EDD100029ECC /* RoutePreviewTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708491F28EDD100029ECC /* RoutePreviewTaxiCell.swift */; };
-		340708501F28EDD100029ECC /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3407084B1F28EDD100029ECC /* MWMTaxiCollectionLayout.mm */; };
-		340708521F28F1DD00029ECC /* MWMiPadRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 340708441F28EDD100029ECC /* MWMiPadRoutePreview.xib */; };
-		340708531F28F1DE00029ECC /* MWMiPadRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 340708441F28EDD100029ECC /* MWMiPadRoutePreview.xib */; };
-		340708561F28F1E900029ECC /* MWMRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340708421F28ED2D00029ECC /* MWMRoutePreview.mm */; };
-		340708571F28F1EA00029ECC /* MWMRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340708421F28ED2D00029ECC /* MWMRoutePreview.mm */; };
-		340708581F28F1F000029ECC /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3407084B1F28EDD100029ECC /* MWMTaxiCollectionLayout.mm */; };
-		340708591F28F1F000029ECC /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3407084B1F28EDD100029ECC /* MWMTaxiCollectionLayout.mm */; };
-		3407085A1F28F1F400029ECC /* MWMTaxiPreviewDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340708481F28EDD100029ECC /* MWMTaxiPreviewDataSource.mm */; };
-		3407085B1F28F1F400029ECC /* MWMTaxiPreviewDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340708481F28EDD100029ECC /* MWMTaxiPreviewDataSource.mm */; };
-		3407085C1F28F27100029ECC /* RoutePreviewTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708491F28EDD100029ECC /* RoutePreviewTaxiCell.swift */; };
-		3407085D1F28F27200029ECC /* RoutePreviewTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708491F28EDD100029ECC /* RoutePreviewTaxiCell.swift */; };
-		340708601F28FE2800029ECC /* MWMiPadRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3407085F1F28FE2800029ECC /* MWMiPadRoutePreview.mm */; };
-		340708611F28FE2800029ECC /* MWMiPadRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3407085F1F28FE2800029ECC /* MWMiPadRoutePreview.mm */; };
-		340708621F28FE2800029ECC /* MWMiPadRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3407085F1F28FE2800029ECC /* MWMiPadRoutePreview.mm */; };
 		340708641F2905A500029ECC /* NavigationInfoArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708631F2905A500029ECC /* NavigationInfoArea.swift */; };
 		340708651F2905A500029ECC /* NavigationInfoArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708631F2905A500029ECC /* NavigationInfoArea.swift */; };
 		340708661F2905A500029ECC /* NavigationInfoArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708631F2905A500029ECC /* NavigationInfoArea.swift */; };
-		3407086D1F2B427400029ECC /* RoutePreviewTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3407086C1F2B427400029ECC /* RoutePreviewTaxiCell.xib */; };
-		3407086E1F2B427400029ECC /* RoutePreviewTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3407086C1F2B427400029ECC /* RoutePreviewTaxiCell.xib */; };
-		3407086F1F2B427400029ECC /* RoutePreviewTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3407086C1F2B427400029ECC /* RoutePreviewTaxiCell.xib */; };
 		340708771F2B5D6C00029ECC /* DimBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708761F2B5D6C00029ECC /* DimBackground.swift */; };
 		340708781F2B5D6C00029ECC /* DimBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708761F2B5D6C00029ECC /* DimBackground.swift */; };
 		340708791F2B5D6C00029ECC /* DimBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708761F2B5D6C00029ECC /* DimBackground.swift */; };
-		3407087B1F2B6F5200029ECC /* NavigationControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3407087A1F2B6F5200029ECC /* NavigationControlView.swift */; };
-		3407087C1F2B6F5200029ECC /* NavigationControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3407087A1F2B6F5200029ECC /* NavigationControlView.swift */; };
-		3407087D1F2B6F5200029ECC /* NavigationControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3407087A1F2B6F5200029ECC /* NavigationControlView.swift */; };
-		3407087F1F2B6F7000029ECC /* NavigationControlView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3407087E1F2B6F7000029ECC /* NavigationControlView.xib */; };
-		340708801F2B6F7000029ECC /* NavigationControlView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3407087E1F2B6F7000029ECC /* NavigationControlView.xib */; };
-		340708811F2B6F7000029ECC /* NavigationControlView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3407087E1F2B6F7000029ECC /* NavigationControlView.xib */; };
-		340708841F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340708831F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm */; };
-		340708851F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340708831F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm */; };
-		340708861F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340708831F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm */; };
 		340837131B7243CE00B5C185 /* MWMActivityViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837121B7243CE00B5C185 /* MWMActivityViewController.mm */; };
 		340837161B72451A00B5C185 /* MWMShareActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */; };
 		3408963E1F83CEDE00BC7117 /* MWMAuthorizationViewModel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3408963D1F83CEDE00BC7117 /* MWMAuthorizationViewModel.mm */; };
@@ -184,27 +154,6 @@
 		341F09841C20138100F18AC5 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 341F09831C20138100F18AC5 /* libpugixml.a */; };
 		34201E091DC0DC7300D24118 /* libpartners_api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DDB4BC31DAB98F000F4D021 /* libpartners_api.a */; };
 		34201E0C1DC0E33100D24118 /* libtracking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34201E0B1DC0E33100D24118 /* libtracking.a */; };
-		342360931F3456E200AFE44D /* RouteManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360911F3456E200AFE44D /* RouteManagerViewController.swift */; };
-		342360941F3456E200AFE44D /* RouteManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360911F3456E200AFE44D /* RouteManagerViewController.swift */; };
-		342360951F3456E200AFE44D /* RouteManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360911F3456E200AFE44D /* RouteManagerViewController.swift */; };
-		342360961F3456E200AFE44D /* RouteManagerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342360921F3456E200AFE44D /* RouteManagerViewController.xib */; };
-		342360971F3456E200AFE44D /* RouteManagerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342360921F3456E200AFE44D /* RouteManagerViewController.xib */; };
-		342360981F3456E200AFE44D /* RouteManagerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342360921F3456E200AFE44D /* RouteManagerViewController.xib */; };
-		3423609A1F34585A00AFE44D /* RouteManagerFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360991F34585A00AFE44D /* RouteManagerFooterView.swift */; };
-		3423609B1F34585A00AFE44D /* RouteManagerFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360991F34585A00AFE44D /* RouteManagerFooterView.swift */; };
-		3423609C1F34585A00AFE44D /* RouteManagerFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360991F34585A00AFE44D /* RouteManagerFooterView.swift */; };
-		3423609E1F34787F00AFE44D /* RouteManagerTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3423609D1F34787F00AFE44D /* RouteManagerTableView.swift */; };
-		3423609F1F34787F00AFE44D /* RouteManagerTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3423609D1F34787F00AFE44D /* RouteManagerTableView.swift */; };
-		342360A01F34787F00AFE44D /* RouteManagerTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3423609D1F34787F00AFE44D /* RouteManagerTableView.swift */; };
-		342360A21F34840500AFE44D /* RouteManagerDimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360A11F34840500AFE44D /* RouteManagerDimView.swift */; };
-		342360A31F34840500AFE44D /* RouteManagerDimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360A11F34840500AFE44D /* RouteManagerDimView.swift */; };
-		342360A41F34840500AFE44D /* RouteManagerDimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360A11F34840500AFE44D /* RouteManagerDimView.swift */; };
-		342360A71F34906700AFE44D /* RouteManagerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360A51F34906700AFE44D /* RouteManagerCell.swift */; };
-		342360A81F34906700AFE44D /* RouteManagerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360A51F34906700AFE44D /* RouteManagerCell.swift */; };
-		342360A91F34906700AFE44D /* RouteManagerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 342360A51F34906700AFE44D /* RouteManagerCell.swift */; };
-		342360AA1F34906700AFE44D /* RouteManagerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342360A61F34906700AFE44D /* RouteManagerCell.xib */; };
-		342360AB1F34906700AFE44D /* RouteManagerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342360A61F34906700AFE44D /* RouteManagerCell.xib */; };
-		342360AC1F34906700AFE44D /* RouteManagerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342360A61F34906700AFE44D /* RouteManagerCell.xib */; };
 		342639361EA0E60A0025EB89 /* local_ads_symbols.txt in Resources */ = {isa = PBXBuildFile; fileRef = 450703081E9E6CF000E8C029 /* local_ads_symbols.txt */; };
 		342639381EA0E60B0025EB89 /* local_ads_symbols.txt in Resources */ = {isa = PBXBuildFile; fileRef = 450703081E9E6CF000E8C029 /* local_ads_symbols.txt */; };
 		342CC5F11C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */; };
@@ -399,18 +348,6 @@
 		34763EE61F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34763EE51F2F392300F4D2D3 /* MWMTextToSpeech.mm */; };
 		34763EE71F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34763EE51F2F392300F4D2D3 /* MWMTextToSpeech.mm */; };
 		34763EE81F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34763EE51F2F392300F4D2D3 /* MWMTextToSpeech.mm */; };
-		34763EED1F2F5F2E00F4D2D3 /* MWMiPhoneRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34763EEC1F2F5F2E00F4D2D3 /* MWMiPhoneRoutePreview.xib */; };
-		34763EEE1F2F5F2F00F4D2D3 /* MWMiPhoneRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34763EEC1F2F5F2E00F4D2D3 /* MWMiPhoneRoutePreview.xib */; };
-		34763EEF1F2F5F2F00F4D2D3 /* MWMiPhoneRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34763EEC1F2F5F2E00F4D2D3 /* MWMiPhoneRoutePreview.xib */; };
-		34763EF21F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34763EF11F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm */; };
-		34763EF31F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34763EF11F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm */; };
-		34763EF41F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34763EF11F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm */; };
-		34763EFE1F3069BB00F4D2D3 /* RouteStartButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763EFD1F3069BB00F4D2D3 /* RouteStartButton.swift */; };
-		34763EFF1F3069BB00F4D2D3 /* RouteStartButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763EFD1F3069BB00F4D2D3 /* RouteStartButton.swift */; };
-		34763F001F3069BB00F4D2D3 /* RouteStartButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763EFD1F3069BB00F4D2D3 /* RouteStartButton.swift */; };
-		34763F021F30749000F4D2D3 /* RoutePreviewStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763F011F30749000F4D2D3 /* RoutePreviewStatus.swift */; };
-		34763F031F30749000F4D2D3 /* RoutePreviewStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763F011F30749000F4D2D3 /* RoutePreviewStatus.swift */; };
-		34763F041F30749000F4D2D3 /* RoutePreviewStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763F011F30749000F4D2D3 /* RoutePreviewStatus.swift */; };
 		34763F061F3092E700F4D2D3 /* String+Format.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763F051F3092E700F4D2D3 /* String+Format.swift */; };
 		34763F071F3092E700F4D2D3 /* String+Format.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763F051F3092E700F4D2D3 /* String+Format.swift */; };
 		34763F081F3092E700F4D2D3 /* String+Format.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763F051F3092E700F4D2D3 /* String+Format.swift */; };
@@ -521,13 +458,6 @@
 		3495433D1EB22D9600F08F73 /* MPAdBrowserController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */; };
 		3495433E1EB22DAC00F08F73 /* MPAdBrowserController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */; };
 		3495433F1EB22DAD00F08F73 /* MPAdBrowserController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */; };
-		3497A93A1B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */; };
-		349993FA1F388F970064CFBE /* RouteManageriPadPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349993F81F388F970064CFBE /* RouteManageriPadPresentationController.swift */; };
-		349993FB1F388F970064CFBE /* RouteManageriPadPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349993F81F388F970064CFBE /* RouteManageriPadPresentationController.swift */; };
-		349993FC1F388F970064CFBE /* RouteManageriPadPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349993F81F388F970064CFBE /* RouteManageriPadPresentationController.swift */; };
-		349993FD1F388F970064CFBE /* RouteManageriPhonePresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349993F91F388F970064CFBE /* RouteManageriPhonePresentationController.swift */; };
-		349993FE1F388F970064CFBE /* RouteManageriPhonePresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349993F91F388F970064CFBE /* RouteManageriPhonePresentationController.swift */; };
-		349993FF1F388F970064CFBE /* RouteManageriPhonePresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349993F91F388F970064CFBE /* RouteManageriPhonePresentationController.swift */; };
 		349A13821DEC138C00C7DB60 /* MWMMobileInternetAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.mm */; };
 		349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.mm */; };
 		349A13841DEC138C00C7DB60 /* MWMMobileInternetAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A13811DEC138C00C7DB60 /* MWMMobileInternetAlert.xib */; };
@@ -576,6 +506,144 @@
 		349FC54C1F680DAE00968C9F /* ExpandableTextViewSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349FC5461F680DAE00968C9F /* ExpandableTextViewSettings.swift */; };
 		34AB39C11D2BD8310021857D /* MWMStopButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB39C01D2BD8310021857D /* MWMStopButton.mm */; };
 		34AB39C21D2BD8310021857D /* MWMStopButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB39C01D2BD8310021857D /* MWMStopButton.mm */; };
+		34AB66041FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65C51FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm */; };
+		34AB66051FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65C51FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm */; };
+		34AB66061FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65C51FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm */; };
+		34AB66071FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65C61FC5AA320078E451 /* MWMNavigationDashboardManager.mm */; };
+		34AB66081FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65C61FC5AA320078E451 /* MWMNavigationDashboardManager.mm */; };
+		34AB66091FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65C61FC5AA320078E451 /* MWMNavigationDashboardManager.mm */; };
+		34AB660A1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65CB1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm */; };
+		34AB660B1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65CB1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm */; };
+		34AB660C1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65CB1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm */; };
+		34AB660D1FC5AA320078E451 /* NavigationControlView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65CD1FC5AA320078E451 /* NavigationControlView.xib */; };
+		34AB660E1FC5AA320078E451 /* NavigationControlView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65CD1FC5AA320078E451 /* NavigationControlView.xib */; };
+		34AB660F1FC5AA320078E451 /* NavigationControlView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65CD1FC5AA320078E451 /* NavigationControlView.xib */; };
+		34AB66101FC5AA320078E451 /* NavigationTurnsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65CE1FC5AA320078E451 /* NavigationTurnsView.swift */; };
+		34AB66111FC5AA320078E451 /* NavigationTurnsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65CE1FC5AA320078E451 /* NavigationTurnsView.swift */; };
+		34AB66121FC5AA320078E451 /* NavigationTurnsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65CE1FC5AA320078E451 /* NavigationTurnsView.swift */; };
+		34AB66131FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65D01FC5AA320078E451 /* MWMNavigationInfoView.xib */; };
+		34AB66141FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65D01FC5AA320078E451 /* MWMNavigationInfoView.xib */; };
+		34AB66151FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65D01FC5AA320078E451 /* MWMNavigationInfoView.xib */; };
+		34AB66161FC5AA320078E451 /* MWMiPhoneRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D21FC5AA320078E451 /* MWMiPhoneRoutePreview.mm */; };
+		34AB66171FC5AA320078E451 /* MWMiPhoneRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D21FC5AA320078E451 /* MWMiPhoneRoutePreview.mm */; };
+		34AB66181FC5AA330078E451 /* MWMiPhoneRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D21FC5AA320078E451 /* MWMiPhoneRoutePreview.mm */; };
+		34AB66191FC5AA330078E451 /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D31FC5AA320078E451 /* MWMTaxiCollectionLayout.mm */; };
+		34AB661A1FC5AA330078E451 /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D31FC5AA320078E451 /* MWMTaxiCollectionLayout.mm */; };
+		34AB661B1FC5AA330078E451 /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D31FC5AA320078E451 /* MWMTaxiCollectionLayout.mm */; };
+		34AB661C1FC5AA330078E451 /* MWMTaxiPreviewDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D41FC5AA320078E451 /* MWMTaxiPreviewDataSource.mm */; };
+		34AB661D1FC5AA330078E451 /* MWMTaxiPreviewDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D41FC5AA320078E451 /* MWMTaxiPreviewDataSource.mm */; };
+		34AB661E1FC5AA330078E451 /* MWMTaxiPreviewDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D41FC5AA320078E451 /* MWMTaxiPreviewDataSource.mm */; };
+		34AB661F1FC5AA330078E451 /* RouteStartButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D51FC5AA320078E451 /* RouteStartButton.swift */; };
+		34AB66201FC5AA330078E451 /* RouteStartButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D51FC5AA320078E451 /* RouteStartButton.swift */; };
+		34AB66211FC5AA330078E451 /* RouteStartButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D51FC5AA320078E451 /* RouteStartButton.swift */; };
+		34AB66221FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65D61FC5AA320078E451 /* MWMiPadRoutePreview.xib */; };
+		34AB66231FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65D61FC5AA320078E451 /* MWMiPadRoutePreview.xib */; };
+		34AB66241FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65D61FC5AA320078E451 /* MWMiPadRoutePreview.xib */; };
+		34AB66251FC5AA330078E451 /* RouteManagerDimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D81FC5AA320078E451 /* RouteManagerDimView.swift */; };
+		34AB66261FC5AA330078E451 /* RouteManagerDimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D81FC5AA320078E451 /* RouteManagerDimView.swift */; };
+		34AB66271FC5AA330078E451 /* RouteManagerDimView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D81FC5AA320078E451 /* RouteManagerDimView.swift */; };
+		34AB66281FC5AA330078E451 /* RouteManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D91FC5AA320078E451 /* RouteManagerViewController.swift */; };
+		34AB66291FC5AA330078E451 /* RouteManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D91FC5AA320078E451 /* RouteManagerViewController.swift */; };
+		34AB662A1FC5AA330078E451 /* RouteManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65D91FC5AA320078E451 /* RouteManagerViewController.swift */; };
+		34AB662B1FC5AA330078E451 /* RouteManagerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DA1FC5AA320078E451 /* RouteManagerViewModel.swift */; };
+		34AB662C1FC5AA330078E451 /* RouteManagerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DA1FC5AA320078E451 /* RouteManagerViewModel.swift */; };
+		34AB662D1FC5AA330078E451 /* RouteManagerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DA1FC5AA320078E451 /* RouteManagerViewModel.swift */; };
+		34AB662E1FC5AA330078E451 /* RouteManageriPhonePresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DB1FC5AA320078E451 /* RouteManageriPhonePresentationController.swift */; };
+		34AB662F1FC5AA330078E451 /* RouteManageriPhonePresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DB1FC5AA320078E451 /* RouteManageriPhonePresentationController.swift */; };
+		34AB66301FC5AA330078E451 /* RouteManageriPhonePresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DB1FC5AA320078E451 /* RouteManageriPhonePresentationController.swift */; };
+		34AB66311FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DC1FC5AA320078E451 /* RouteManagerHeaderView.swift */; };
+		34AB66321FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DC1FC5AA320078E451 /* RouteManagerHeaderView.swift */; };
+		34AB66331FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DC1FC5AA320078E451 /* RouteManagerHeaderView.swift */; };
+		34AB66341FC5AA330078E451 /* RouteManagerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65DD1FC5AA320078E451 /* RouteManagerCell.xib */; };
+		34AB66351FC5AA330078E451 /* RouteManagerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65DD1FC5AA320078E451 /* RouteManagerCell.xib */; };
+		34AB66361FC5AA330078E451 /* RouteManagerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65DD1FC5AA320078E451 /* RouteManagerCell.xib */; };
+		34AB66371FC5AA330078E451 /* RouteManagerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DE1FC5AA320078E451 /* RouteManagerCell.swift */; };
+		34AB66381FC5AA330078E451 /* RouteManagerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DE1FC5AA320078E451 /* RouteManagerCell.swift */; };
+		34AB66391FC5AA330078E451 /* RouteManagerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65DE1FC5AA320078E451 /* RouteManagerCell.swift */; };
+		34AB663A1FC5AA330078E451 /* RouteManagerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65DF1FC5AA320078E451 /* RouteManagerViewController.xib */; };
+		34AB663B1FC5AA330078E451 /* RouteManagerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65DF1FC5AA320078E451 /* RouteManagerViewController.xib */; };
+		34AB663C1FC5AA330078E451 /* RouteManagerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65DF1FC5AA320078E451 /* RouteManagerViewController.xib */; };
+		34AB663D1FC5AA330078E451 /* RouteManagerTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E01FC5AA320078E451 /* RouteManagerTransitioning.swift */; };
+		34AB663E1FC5AA330078E451 /* RouteManagerTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E01FC5AA320078E451 /* RouteManagerTransitioning.swift */; };
+		34AB663F1FC5AA330078E451 /* RouteManagerTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E01FC5AA320078E451 /* RouteManagerTransitioning.swift */; };
+		34AB66401FC5AA330078E451 /* RouteManagerTransitioningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E11FC5AA320078E451 /* RouteManagerTransitioningManager.swift */; };
+		34AB66411FC5AA330078E451 /* RouteManagerTransitioningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E11FC5AA320078E451 /* RouteManagerTransitioningManager.swift */; };
+		34AB66421FC5AA330078E451 /* RouteManagerTransitioningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E11FC5AA320078E451 /* RouteManagerTransitioningManager.swift */; };
+		34AB66431FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E21FC5AA320078E451 /* RouteManagerViewModelProtocol.swift */; };
+		34AB66441FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E21FC5AA320078E451 /* RouteManagerViewModelProtocol.swift */; };
+		34AB66451FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E21FC5AA320078E451 /* RouteManagerViewModelProtocol.swift */; };
+		34AB66461FC5AA330078E451 /* RouteManagerTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E41FC5AA320078E451 /* RouteManagerTableView.swift */; };
+		34AB66471FC5AA330078E451 /* RouteManagerTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E41FC5AA320078E451 /* RouteManagerTableView.swift */; };
+		34AB66481FC5AA330078E451 /* RouteManagerTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E41FC5AA320078E451 /* RouteManagerTableView.swift */; };
+		34AB66491FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E51FC5AA320078E451 /* RouteManageriPadPresentationController.swift */; };
+		34AB664A1FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E51FC5AA320078E451 /* RouteManageriPadPresentationController.swift */; };
+		34AB664B1FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E51FC5AA320078E451 /* RouteManageriPadPresentationController.swift */; };
+		34AB664C1FC5AA330078E451 /* RouteManagerFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E61FC5AA320078E451 /* RouteManagerFooterView.swift */; };
+		34AB664D1FC5AA330078E451 /* RouteManagerFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E61FC5AA320078E451 /* RouteManagerFooterView.swift */; };
+		34AB664E1FC5AA330078E451 /* RouteManagerFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E61FC5AA320078E451 /* RouteManagerFooterView.swift */; };
+		34AB664F1FC5AA330078E451 /* RoutePreviewTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E81FC5AA320078E451 /* RoutePreviewTaxiCell.swift */; };
+		34AB66501FC5AA330078E451 /* RoutePreviewTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E81FC5AA320078E451 /* RoutePreviewTaxiCell.swift */; };
+		34AB66511FC5AA330078E451 /* RoutePreviewTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E81FC5AA320078E451 /* RoutePreviewTaxiCell.swift */; };
+		34AB66521FC5AA330078E451 /* MWMiPadRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E91FC5AA320078E451 /* MWMiPadRoutePreview.mm */; };
+		34AB66531FC5AA330078E451 /* MWMiPadRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E91FC5AA320078E451 /* MWMiPadRoutePreview.mm */; };
+		34AB66541FC5AA330078E451 /* MWMiPadRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65E91FC5AA320078E451 /* MWMiPadRoutePreview.mm */; };
+		34AB66551FC5AA330078E451 /* TransportTransitPedestrian.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65EE1FC5AA320078E451 /* TransportTransitPedestrian.swift */; };
+		34AB66561FC5AA330078E451 /* TransportTransitPedestrian.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65EE1FC5AA320078E451 /* TransportTransitPedestrian.swift */; };
+		34AB66571FC5AA330078E451 /* TransportTransitPedestrian.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65EE1FC5AA320078E451 /* TransportTransitPedestrian.swift */; };
+		34AB66581FC5AA330078E451 /* TransportTransitFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65EF1FC5AA320078E451 /* TransportTransitFlowLayout.swift */; };
+		34AB66591FC5AA330078E451 /* TransportTransitFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65EF1FC5AA320078E451 /* TransportTransitFlowLayout.swift */; };
+		34AB665A1FC5AA330078E451 /* TransportTransitFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65EF1FC5AA320078E451 /* TransportTransitFlowLayout.swift */; };
+		34AB665B1FC5AA330078E451 /* TransportTransitIntermediatePoint.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65F01FC5AA320078E451 /* TransportTransitIntermediatePoint.xib */; };
+		34AB665C1FC5AA330078E451 /* TransportTransitIntermediatePoint.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65F01FC5AA320078E451 /* TransportTransitIntermediatePoint.xib */; };
+		34AB665D1FC5AA330078E451 /* TransportTransitIntermediatePoint.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65F01FC5AA320078E451 /* TransportTransitIntermediatePoint.xib */; };
+		34AB665E1FC5AA330078E451 /* TransportTransitIntermediatePoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F11FC5AA320078E451 /* TransportTransitIntermediatePoint.swift */; };
+		34AB665F1FC5AA330078E451 /* TransportTransitIntermediatePoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F11FC5AA320078E451 /* TransportTransitIntermediatePoint.swift */; };
+		34AB66601FC5AA330078E451 /* TransportTransitIntermediatePoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F11FC5AA320078E451 /* TransportTransitIntermediatePoint.swift */; };
+		34AB66611FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F21FC5AA320078E451 /* TransportTransitSeparator.swift */; };
+		34AB66621FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F21FC5AA320078E451 /* TransportTransitSeparator.swift */; };
+		34AB66631FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F21FC5AA320078E451 /* TransportTransitSeparator.swift */; };
+		34AB66641FC5AA330078E451 /* TransportTransitTrain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F31FC5AA320078E451 /* TransportTransitTrain.swift */; };
+		34AB66651FC5AA330078E451 /* TransportTransitTrain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F31FC5AA320078E451 /* TransportTransitTrain.swift */; };
+		34AB66661FC5AA330078E451 /* TransportTransitTrain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F31FC5AA320078E451 /* TransportTransitTrain.swift */; };
+		34AB66671FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65F41FC5AA320078E451 /* TransportTransitPedestrian.xib */; };
+		34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65F41FC5AA320078E451 /* TransportTransitPedestrian.xib */; };
+		34AB66691FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65F41FC5AA320078E451 /* TransportTransitPedestrian.xib */; };
+		34AB666A1FC5AA330078E451 /* TransportTransitCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F51FC5AA320078E451 /* TransportTransitCell.swift */; };
+		34AB666B1FC5AA330078E451 /* TransportTransitCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F51FC5AA320078E451 /* TransportTransitCell.swift */; };
+		34AB666C1FC5AA330078E451 /* TransportTransitCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F51FC5AA320078E451 /* TransportTransitCell.swift */; };
+		34AB666D1FC5AA330078E451 /* TransportTransitStepsCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F61FC5AA320078E451 /* TransportTransitStepsCollectionView.swift */; };
+		34AB666E1FC5AA330078E451 /* TransportTransitStepsCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F61FC5AA320078E451 /* TransportTransitStepsCollectionView.swift */; };
+		34AB666F1FC5AA330078E451 /* TransportTransitStepsCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F61FC5AA320078E451 /* TransportTransitStepsCollectionView.swift */; };
+		34AB66701FC5AA330078E451 /* TransportTransitTrain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65F71FC5AA320078E451 /* TransportTransitTrain.xib */; };
+		34AB66711FC5AA330078E451 /* TransportTransitTrain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65F71FC5AA320078E451 /* TransportTransitTrain.xib */; };
+		34AB66721FC5AA330078E451 /* TransportTransitTrain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65F71FC5AA320078E451 /* TransportTransitTrain.xib */; };
+		34AB66731FC5AA330078E451 /* BaseRoutePreviewStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F81FC5AA320078E451 /* BaseRoutePreviewStatus.swift */; };
+		34AB66741FC5AA330078E451 /* BaseRoutePreviewStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F81FC5AA320078E451 /* BaseRoutePreviewStatus.swift */; };
+		34AB66751FC5AA330078E451 /* BaseRoutePreviewStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F81FC5AA320078E451 /* BaseRoutePreviewStatus.swift */; };
+		34AB66761FC5AA330078E451 /* TransportRoutePreviewStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F91FC5AA320078E451 /* TransportRoutePreviewStatus.swift */; };
+		34AB66771FC5AA330078E451 /* TransportRoutePreviewStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F91FC5AA320078E451 /* TransportRoutePreviewStatus.swift */; };
+		34AB66781FC5AA330078E451 /* TransportRoutePreviewStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65F91FC5AA320078E451 /* TransportRoutePreviewStatus.swift */; };
+		34AB66791FC5AA330078E451 /* RoutePreviewTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65FA1FC5AA320078E451 /* RoutePreviewTaxiCell.xib */; };
+		34AB667A1FC5AA330078E451 /* RoutePreviewTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65FA1FC5AA320078E451 /* RoutePreviewTaxiCell.xib */; };
+		34AB667B1FC5AA330078E451 /* RoutePreviewTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65FA1FC5AA320078E451 /* RoutePreviewTaxiCell.xib */; };
+		34AB667C1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65FD1FC5AA320078E451 /* MWMRoutePreview.mm */; };
+		34AB667D1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65FD1FC5AA320078E451 /* MWMRoutePreview.mm */; };
+		34AB667E1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB65FD1FC5AA320078E451 /* MWMRoutePreview.mm */; };
+		34AB667F1FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65FE1FC5AA320078E451 /* MWMiPhoneRoutePreview.xib */; };
+		34AB66801FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65FE1FC5AA320078E451 /* MWMiPhoneRoutePreview.xib */; };
+		34AB66811FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AB65FE1FC5AA320078E451 /* MWMiPhoneRoutePreview.xib */; };
+		34AB66821FC5AA330078E451 /* NavigationAddPointToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66001FC5AA320078E451 /* NavigationAddPointToastView.swift */; };
+		34AB66831FC5AA330078E451 /* NavigationAddPointToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66001FC5AA320078E451 /* NavigationAddPointToastView.swift */; };
+		34AB66841FC5AA330078E451 /* NavigationAddPointToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66001FC5AA320078E451 /* NavigationAddPointToastView.swift */; };
+		34AB66851FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66011FC5AA320078E451 /* MWMNavigationInfoView.mm */; };
+		34AB66861FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66011FC5AA320078E451 /* MWMNavigationInfoView.mm */; };
+		34AB66871FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66011FC5AA320078E451 /* MWMNavigationInfoView.mm */; };
+		34AB66881FC5AA330078E451 /* NavigationControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66021FC5AA320078E451 /* NavigationControlView.swift */; };
+		34AB66891FC5AA330078E451 /* NavigationControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66021FC5AA320078E451 /* NavigationControlView.swift */; };
+		34AB668A1FC5AA330078E451 /* NavigationControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66021FC5AA320078E451 /* NavigationControlView.swift */; };
+		34AB668B1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66031FC5AA320078E451 /* NavigationStreetNameView.swift */; };
+		34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66031FC5AA320078E451 /* NavigationStreetNameView.swift */; };
+		34AB668D1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66031FC5AA320078E451 /* NavigationStreetNameView.swift */; };
 		34ABA6161C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */; };
 		34ABA6171C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */; };
 		34ABA6201C2D517500FE1BEC /* MWMInputValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA61F1C2D517500FE1BEC /* MWMInputValidator.mm */; };
@@ -591,20 +659,14 @@
 		34AC8FBB1EFBAD1900E7F910 /* ViatorElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FB91EFBAD1900E7F910 /* ViatorElement.swift */; };
 		34AC8FBC1EFBAD1900E7F910 /* ViatorElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FB91EFBAD1900E7F910 /* ViatorElement.swift */; };
 		34AC8FC91EFC01F500E7F910 /* MWMRoutePoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */; };
-		34AC8FCE1EFC028600E7F910 /* MWMNavigationInfoView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FCB1EFC028600E7F910 /* MWMNavigationInfoView.mm */; };
-		34AC8FCF1EFC028600E7F910 /* MWMNavigationInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AC8FCC1EFC028600E7F910 /* MWMNavigationInfoView.xib */; };
-		34AC8FD01EFC028600E7F910 /* NavigationAddPointToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FCD1EFC028600E7F910 /* NavigationAddPointToastView.swift */; };
 		34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */; };
 		34AC8FD21EFC02C100E7F910 /* MWMRoutePoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */; };
-		34AC8FD31EFC02CC00E7F910 /* MWMNavigationInfoView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FCB1EFC028600E7F910 /* MWMNavigationInfoView.mm */; };
-		34AC8FD41EFC02CC00E7F910 /* MWMNavigationInfoView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FCB1EFC028600E7F910 /* MWMNavigationInfoView.mm */; };
-		34AC8FD51EFC02D100E7F910 /* MWMNavigationInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AC8FCC1EFC028600E7F910 /* MWMNavigationInfoView.xib */; };
-		34AC8FD61EFC02D100E7F910 /* MWMNavigationInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AC8FCC1EFC028600E7F910 /* MWMNavigationInfoView.xib */; };
-		34AC8FD71EFC02D400E7F910 /* NavigationAddPointToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FCD1EFC028600E7F910 /* NavigationAddPointToastView.swift */; };
-		34AC8FD81EFC02D500E7F910 /* NavigationAddPointToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FCD1EFC028600E7F910 /* NavigationAddPointToastView.swift */; };
 		34AC8FDA1EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FD91EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift */; };
 		34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FD91EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift */; };
 		34AC8FDC1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FD91EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift */; };
+		34B127E91FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */; };
+		34B127EA1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */; };
+		34B127EB1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */; };
 		34B924421DC8A29C0008D971 /* MWMMailViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B924411DC8A29C0008D971 /* MWMMailViewController.mm */; };
 		34B924431DC8A29C0008D971 /* MWMMailViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B924411DC8A29C0008D971 /* MWMMailViewController.mm */; };
 		34BBD6461F8264980070CA50 /* GoogleSignIn.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 34BBD6451F8264980070CA50 /* GoogleSignIn.bundle */; };
@@ -633,18 +695,6 @@
 		34C0A69C1F4C1B380007CE5B /* GoogleNativeBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C0A69B1F4C1B380007CE5B /* GoogleNativeBanner.swift */; };
 		34C0A69D1F4C1B380007CE5B /* GoogleNativeBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C0A69B1F4C1B380007CE5B /* GoogleNativeBanner.swift */; };
 		34C0A69E1F4C1B380007CE5B /* GoogleNativeBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C0A69B1F4C1B380007CE5B /* GoogleNativeBanner.swift */; };
-		34C5B80F1F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B80E1F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift */; };
-		34C5B8101F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B80E1F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift */; };
-		34C5B8111F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B80E1F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift */; };
-		34C5B8131F335BCA005E50B6 /* RouteManagerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B8121F335BCA005E50B6 /* RouteManagerViewModel.swift */; };
-		34C5B8141F335BCA005E50B6 /* RouteManagerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B8121F335BCA005E50B6 /* RouteManagerViewModel.swift */; };
-		34C5B8151F335BCA005E50B6 /* RouteManagerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B8121F335BCA005E50B6 /* RouteManagerViewModel.swift */; };
-		34C5B81B1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B81A1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift */; };
-		34C5B81C1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B81A1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift */; };
-		34C5B81D1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B81A1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift */; };
-		34C5B8231F336DF5005E50B6 /* RouteManagerTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B8221F336DF5005E50B6 /* RouteManagerTransitioning.swift */; };
-		34C5B8241F336DF5005E50B6 /* RouteManagerTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B8221F336DF5005E50B6 /* RouteManagerTransitioning.swift */; };
-		34C5B8251F336DF5005E50B6 /* RouteManagerTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5B8221F336DF5005E50B6 /* RouteManagerTransitioning.swift */; };
 		34C9BD021C6DB693000DC38D /* MWMTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */; };
 		34C9BD031C6DB693000DC38D /* MWMTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */; };
 		34C9BD041C6DB693000DC38D /* MWMViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD011C6DB693000DC38D /* MWMViewController.mm */; };
@@ -729,9 +779,6 @@
 		34D4FA661E265749003F53EF /* WhatsNewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA651E265749003F53EF /* WhatsNewController.swift */; };
 		34D4FA671E265749003F53EF /* WhatsNewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA651E265749003F53EF /* WhatsNewController.swift */; };
 		34D4FA681E265749003F53EF /* WhatsNewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D4FA651E265749003F53EF /* WhatsNewController.swift */; };
-		34D7F3411F33903F001D5ED5 /* RouteManagerHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D7F3401F33903F001D5ED5 /* RouteManagerHeaderView.swift */; };
-		34D7F3421F33903F001D5ED5 /* RouteManagerHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D7F3401F33903F001D5ED5 /* RouteManagerHeaderView.swift */; };
-		34D7F3431F33903F001D5ED5 /* RouteManagerHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D7F3401F33903F001D5ED5 /* RouteManagerHeaderView.swift */; };
 		34D8087B1E793606002F0584 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D8087A1E793606002F0584 /* Alamofire.framework */; };
 		34D8087D1E79360D002F0584 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D8087C1E79360D002F0584 /* AlamofireImage.framework */; };
 		34D8087E1E79361A002F0584 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D8087C1E79360D002F0584 /* AlamofireImage.framework */; };
@@ -777,12 +824,6 @@
 		34E7761E1F14DB48003040B3 /* PlacePageArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E7761D1F14DB48003040B3 /* PlacePageArea.swift */; };
 		34E7761F1F14DB48003040B3 /* PlacePageArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E7761D1F14DB48003040B3 /* PlacePageArea.swift */; };
 		34E776201F14DB48003040B3 /* PlacePageArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E7761D1F14DB48003040B3 /* PlacePageArea.swift */; };
-		34E776261F14FE77003040B3 /* NavigationStreetNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E776251F14FE77003040B3 /* NavigationStreetNameView.swift */; };
-		34E776271F14FE77003040B3 /* NavigationStreetNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E776251F14FE77003040B3 /* NavigationStreetNameView.swift */; };
-		34E776281F14FE77003040B3 /* NavigationStreetNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E776251F14FE77003040B3 /* NavigationStreetNameView.swift */; };
-		34E7762A1F150AFD003040B3 /* NavigationTurnsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E776291F150AFD003040B3 /* NavigationTurnsView.swift */; };
-		34E7762B1F150AFD003040B3 /* NavigationTurnsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E776291F150AFD003040B3 /* NavigationTurnsView.swift */; };
-		34E7762C1F150AFD003040B3 /* NavigationTurnsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E776291F150AFD003040B3 /* NavigationTurnsView.swift */; };
 		34E776321F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34E776311F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm */; };
 		34E776331F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34E776311F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm */; };
 		34E776341F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34E776311F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm */; };
@@ -942,13 +983,11 @@
 		6741A9E71BF340DE002C974C /* MWMCircularProgressView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35791B53D4C9009677EE /* MWMCircularProgressView.mm */; };
 		6741A9E81BF340DE002C974C /* MWMAPIBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3465E7D71B6658C000854C4D /* MWMAPIBar.mm */; };
 		6741A9EC1BF340DE002C974C /* MWMCircularProgress.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35761B53D4C9009677EE /* MWMCircularProgress.mm */; };
-		6741A9F11BF340DE002C974C /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */; };
 		6741A9F51BF340DE002C974C /* BookmarksVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA36B80615403A4F004560CC /* BookmarksVC.mm */; };
 		6741A9FE1BF340DE002C974C /* SelectSetVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA054611155C465E001F4E37 /* SelectSetVC.mm */; };
 		6741A9FF1BF340DE002C974C /* AddSetVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAA614B7155F16950031C345 /* AddSetVC.mm */; };
 		6741AA021BF340DE002C974C /* BookmarksRootVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAAEA7D3161D8D3100CCD661 /* BookmarksRootVC.mm */; };
 		6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837121B7243CE00B5C185 /* MWMActivityViewController.mm */; };
-		6741AA041BF340DE002C974C /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */; };
 		6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */; };
 		6741AA141BF340DE002C974C /* MWMMultilineLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */; };
 		6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.mm */; };
@@ -1114,7 +1153,6 @@
 		849CF6ED1DE842290024A8A5 /* MWMAuthorizationLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */; };
 		849CF6F11DE842290024A8A5 /* MWMCircularProgress.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A35761B53D4C9009677EE /* MWMCircularProgress.mm */; };
 		849CF6F31DE842290024A8A5 /* MWMButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA82C1C58E89B007223CC /* MWMButton.mm */; };
-		849CF6F61DE842290024A8A5 /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */; };
 		849CF6FB1DE842290024A8A5 /* BookmarksVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA36B80615403A4F004560CC /* BookmarksVC.mm */; };
 		849CF6FC1DE842290024A8A5 /* MWMSideButtonsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */; };
 		849CF7071DE842290024A8A5 /* LocaleTranslator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6381BF41CD12045004CA943 /* LocaleTranslator.mm */; };
@@ -1125,7 +1163,6 @@
 		849CF7171DE842290024A8A5 /* BookmarksRootVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAAEA7D3161D8D3100CCD661 /* BookmarksRootVC.mm */; };
 		849CF7191DE842290024A8A5 /* MWMActivityViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837121B7243CE00B5C185 /* MWMActivityViewController.mm */; };
 		849CF71A1DE842290024A8A5 /* MWMDropDown.mm in Sources */ = {isa = PBXBuildFile; fileRef = F653CE101C6DEB5A00A453F1 /* MWMDropDown.mm */; };
-		849CF71D1DE842290024A8A5 /* MWMNavigationDashboardManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */; };
 		849CF7251DE842290024A8A5 /* MWMMapViewControlsManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */; };
 		849CF7281DE842290024A8A5 /* MWMOsmAuthAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD1D1F1CA412920047B8E8 /* MWMOsmAuthAlert.mm */; };
 		849CF72B1DE842290024A8A5 /* MWMBookmarkNameCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6B97B251CD0CA990009B612 /* MWMBookmarkNameCell.mm */; };
@@ -1283,7 +1320,6 @@
 		F6BD1D211CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD1D1F1CA412920047B8E8 /* MWMOsmAuthAlert.mm */; };
 		F6BD1D231CA412E30047B8E8 /* MWMOsmAuthAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BD1D221CA412E30047B8E8 /* MWMOsmAuthAlert.xib */; };
 		F6BD1D241CA412E40047B8E8 /* MWMOsmAuthAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BD1D221CA412E30047B8E8 /* MWMOsmAuthAlert.xib */; };
-		F6BD33871B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */; };
 		F6C16A651F9626B1000FE296 /* ReviewsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3430291B1F87BC3000D0A07C /* ReviewsViewController.xib */; };
 		F6C16A661F9626B2000FE296 /* ReviewsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3430291B1F87BC3000D0A07C /* ReviewsViewController.xib */; };
 		F6C16A671F9626B2000FE296 /* ReviewsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3430291B1F87BC3000D0A07C /* ReviewsViewController.xib */; };
@@ -1924,24 +1960,8 @@
 		3406FA131C6E0C3300E9FAD2 /* MWMMapDownloadDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloadDialog.h; sourceTree = "<group>"; };
 		3406FA141C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloadDialog.mm; sourceTree = "<group>"; };
 		3406FA171C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMMapDownloadDialog.xib; sourceTree = "<group>"; };
-		340708411F28ED2D00029ECC /* MWMRoutePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutePreview.h; sourceTree = "<group>"; };
-		340708421F28ED2D00029ECC /* MWMRoutePreview.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutePreview.mm; sourceTree = "<group>"; };
-		340708441F28EDD100029ECC /* MWMiPadRoutePreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMiPadRoutePreview.xib; sourceTree = "<group>"; };
-		340708471F28EDD100029ECC /* MWMTaxiPreviewDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTaxiPreviewDataSource.h; sourceTree = "<group>"; };
-		340708481F28EDD100029ECC /* MWMTaxiPreviewDataSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTaxiPreviewDataSource.mm; sourceTree = "<group>"; };
-		340708491F28EDD100029ECC /* RoutePreviewTaxiCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoutePreviewTaxiCell.swift; sourceTree = "<group>"; };
-		3407084A1F28EDD100029ECC /* MWMTaxiCollectionLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTaxiCollectionLayout.h; sourceTree = "<group>"; };
-		3407084B1F28EDD100029ECC /* MWMTaxiCollectionLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTaxiCollectionLayout.mm; sourceTree = "<group>"; };
-		3407085E1F28FE2800029ECC /* MWMiPadRoutePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMiPadRoutePreview.h; sourceTree = "<group>"; };
-		3407085F1F28FE2800029ECC /* MWMiPadRoutePreview.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMiPadRoutePreview.mm; sourceTree = "<group>"; };
 		340708631F2905A500029ECC /* NavigationInfoArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationInfoArea.swift; sourceTree = "<group>"; };
-		3407086C1F2B427400029ECC /* RoutePreviewTaxiCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RoutePreviewTaxiCell.xib; sourceTree = "<group>"; };
 		340708761F2B5D6C00029ECC /* DimBackground.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DimBackground.swift; sourceTree = "<group>"; };
-		3407087A1F2B6F5200029ECC /* NavigationControlView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationControlView.swift; sourceTree = "<group>"; };
-		3407087E1F2B6F7000029ECC /* NavigationControlView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NavigationControlView.xib; sourceTree = "<group>"; };
-		340708831F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMNavigationDashboardManager+Entity.mm"; sourceTree = "<group>"; };
-		340708871F2B889400029ECC /* MWMNavigationDashboardManager+Entity.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMNavigationDashboardManager+Entity.h"; sourceTree = "<group>"; };
-		340708881F2B8B7900029ECC /* MWMRoutePreviewTaxiCellType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRoutePreviewTaxiCellType.h; sourceTree = "<group>"; };
 		340708891F2B8CBF00029ECC /* MWMCircularProgressState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCircularProgressState.h; sourceTree = "<group>"; };
 		340837111B7243CE00B5C185 /* MWMActivityViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMActivityViewController.h; sourceTree = "<group>"; };
 		340837121B7243CE00B5C185 /* MWMActivityViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMActivityViewController.mm; sourceTree = "<group>"; };
@@ -1965,14 +1985,6 @@
 		341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAPIBarView.xib; sourceTree = "<group>"; };
 		341F09831C20138100F18AC5 /* libpugixml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml.a; path = "../../../omim-xcode-build/Debug/libpugixml.a"; sourceTree = "<group>"; };
 		34201E0B1DC0E33100D24118 /* libtracking.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtracking.a; path = "../../../omim-xcode-build/Debug/libtracking.a"; sourceTree = "<group>"; };
-		342360911F3456E200AFE44D /* RouteManagerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerViewController.swift; sourceTree = "<group>"; };
-		342360921F3456E200AFE44D /* RouteManagerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RouteManagerViewController.xib; sourceTree = "<group>"; };
-		342360991F34585A00AFE44D /* RouteManagerFooterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerFooterView.swift; sourceTree = "<group>"; };
-		3423609D1F34787F00AFE44D /* RouteManagerTableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerTableView.swift; sourceTree = "<group>"; };
-		342360A11F34840500AFE44D /* RouteManagerDimView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerDimView.swift; sourceTree = "<group>"; };
-		342360A51F34906700AFE44D /* RouteManagerCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerCell.swift; sourceTree = "<group>"; };
-		342360A61F34906700AFE44D /* RouteManagerCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RouteManagerCell.xib; sourceTree = "<group>"; };
-		342360B11F349F9800AFE44D /* MWMRouteManagerPointType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouteManagerPointType.h; sourceTree = "<group>"; };
 		342639461EA0FDB30025EB89 /* MWMSearchItemType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchItemType.h; sourceTree = "<group>"; };
 		3426DEB11F45AE2800D1C43C /* MWMRouterType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterType.h; sourceTree = "<group>"; };
 		3426DEB21F45AE5100D1C43C /* MWMRouterRecommendation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterRecommendation.h; sourceTree = "<group>"; };
@@ -2081,11 +2093,6 @@
 		34763EE91F2F394D00F4D2D3 /* MWMTextToSpeech+CPP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMTextToSpeech+CPP.h"; sourceTree = "<group>"; };
 		34763EEA1F2F3AD700F4D2D3 /* MWMTextToSpeechObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTextToSpeechObserver.h; sourceTree = "<group>"; };
 		34763EEB1F2F420B00F4D2D3 /* MWMTrafficManagerState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTrafficManagerState.h; sourceTree = "<group>"; };
-		34763EEC1F2F5F2E00F4D2D3 /* MWMiPhoneRoutePreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMiPhoneRoutePreview.xib; sourceTree = "<group>"; };
-		34763EF01F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMiPhoneRoutePreview.h; sourceTree = "<group>"; };
-		34763EF11F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMiPhoneRoutePreview.mm; sourceTree = "<group>"; };
-		34763EFD1F3069BB00F4D2D3 /* RouteStartButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteStartButton.swift; sourceTree = "<group>"; };
-		34763F011F30749000F4D2D3 /* RoutePreviewStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoutePreviewStatus.swift; sourceTree = "<group>"; };
 		34763F051F3092E700F4D2D3 /* String+Format.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Format.swift"; sourceTree = "<group>"; };
 		34763F0B1F30CCAC00F4D2D3 /* MWMEditorCellType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMEditorCellType.h; sourceTree = "<group>"; };
 		3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "tts-how-to-set-up-voice.html"; path = "../../data/tts-how-to-set-up-voice.html"; sourceTree = "<group>"; };
@@ -2097,7 +2104,6 @@
 		347AD8081F28B4E6007ACB68 /* MWMSearchManagerObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerObserver.h; sourceTree = "<group>"; };
 		347BFA8E1F27909200E5531F /* MenuArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuArea.swift; sourceTree = "<group>"; };
 		347BFA921F27923200E5531F /* MWMBottomMenuControllerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuControllerProtocol.h; sourceTree = "<group>"; };
-		347BFA931F28842300E5531F /* MWMNavigationDashboardObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardObserver.h; sourceTree = "<group>"; };
 		347D15C71F82362900E86251 /* GoogleSignIn.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleSignIn.framework; path = GoogleSignIn/GoogleSignIn.framework; sourceTree = "<group>"; };
 		347D15C81F82362900E86251 /* GoogleSignInDependencies.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleSignInDependencies.framework; path = GoogleSignIn/GoogleSignInDependencies.framework; sourceTree = "<group>"; };
 		347E03981FAC5F1D00426032 /* UIWindow+InputLanguage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIWindow+InputLanguage.swift"; sourceTree = "<group>"; };
@@ -2141,10 +2147,6 @@
 		34943BB51E26222300B14F84 /* WelcomeProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomeProtocol.swift; sourceTree = "<group>"; };
 		34943BB91E2626B200B14F84 /* WelcomePageController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomePageController.swift; sourceTree = "<group>"; };
 		3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MPAdBrowserController.xib; path = 3party/MoPubSDK/Internal/Common/MPAdBrowserController.xib; sourceTree = "<group>"; };
-		3497A9361B5CF8A900F51E55 /* MWMNavigationDashboardManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardManager.h; sourceTree = "<group>"; };
-		3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMNavigationDashboardManager.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		349993F81F388F970064CFBE /* RouteManageriPadPresentationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManageriPadPresentationController.swift; sourceTree = "<group>"; };
-		349993F91F388F970064CFBE /* RouteManageriPhonePresentationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManageriPhonePresentationController.swift; sourceTree = "<group>"; };
 		349A137F1DEC138C00C7DB60 /* MWMMobileInternetAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMobileInternetAlert.h; sourceTree = "<group>"; };
 		349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMMobileInternetAlert.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		349A13811DEC138C00C7DB60 /* MWMMobileInternetAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMMobileInternetAlert.xib; sourceTree = "<group>"; };
@@ -2173,6 +2175,64 @@
 		349FC5461F680DAE00968C9F /* ExpandableTextViewSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExpandableTextViewSettings.swift; sourceTree = "<group>"; };
 		34AB39BF1D2BD8310021857D /* MWMStopButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStopButton.h; sourceTree = "<group>"; };
 		34AB39C01D2BD8310021857D /* MWMStopButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStopButton.mm; sourceTree = "<group>"; };
+		34AB65C51FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMNavigationDashboardManager+Entity.mm"; sourceTree = "<group>"; };
+		34AB65C61FC5AA320078E451 /* MWMNavigationDashboardManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboardManager.mm; sourceTree = "<group>"; };
+		34AB65C71FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMNavigationDashboardManager+Entity.h"; sourceTree = "<group>"; };
+		34AB65C81FC5AA320078E451 /* MWMNavigationDashboardObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardObserver.h; sourceTree = "<group>"; };
+		34AB65C91FC5AA320078E451 /* MWMNavigationDashboardEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardEntity.h; sourceTree = "<group>"; };
+		34AB65CA1FC5AA320078E451 /* MWMNavigationDashboardManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardManager.h; sourceTree = "<group>"; };
+		34AB65CB1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboardEntity.mm; sourceTree = "<group>"; };
+		34AB65CD1FC5AA320078E451 /* NavigationControlView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NavigationControlView.xib; sourceTree = "<group>"; };
+		34AB65CE1FC5AA320078E451 /* NavigationTurnsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationTurnsView.swift; sourceTree = "<group>"; };
+		34AB65CF1FC5AA320078E451 /* MWMNavigationInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationInfoView.h; sourceTree = "<group>"; };
+		34AB65D01FC5AA320078E451 /* MWMNavigationInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNavigationInfoView.xib; sourceTree = "<group>"; };
+		34AB65D21FC5AA320078E451 /* MWMiPhoneRoutePreview.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMiPhoneRoutePreview.mm; sourceTree = "<group>"; };
+		34AB65D31FC5AA320078E451 /* MWMTaxiCollectionLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTaxiCollectionLayout.mm; sourceTree = "<group>"; };
+		34AB65D41FC5AA320078E451 /* MWMTaxiPreviewDataSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTaxiPreviewDataSource.mm; sourceTree = "<group>"; };
+		34AB65D51FC5AA320078E451 /* RouteStartButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteStartButton.swift; sourceTree = "<group>"; };
+		34AB65D61FC5AA320078E451 /* MWMiPadRoutePreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMiPadRoutePreview.xib; sourceTree = "<group>"; };
+		34AB65D81FC5AA320078E451 /* RouteManagerDimView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerDimView.swift; sourceTree = "<group>"; };
+		34AB65D91FC5AA320078E451 /* RouteManagerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerViewController.swift; sourceTree = "<group>"; };
+		34AB65DA1FC5AA320078E451 /* RouteManagerViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerViewModel.swift; sourceTree = "<group>"; };
+		34AB65DB1FC5AA320078E451 /* RouteManageriPhonePresentationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManageriPhonePresentationController.swift; sourceTree = "<group>"; };
+		34AB65DC1FC5AA320078E451 /* RouteManagerHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerHeaderView.swift; sourceTree = "<group>"; };
+		34AB65DD1FC5AA320078E451 /* RouteManagerCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RouteManagerCell.xib; sourceTree = "<group>"; };
+		34AB65DE1FC5AA320078E451 /* RouteManagerCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerCell.swift; sourceTree = "<group>"; };
+		34AB65DF1FC5AA320078E451 /* RouteManagerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RouteManagerViewController.xib; sourceTree = "<group>"; };
+		34AB65E01FC5AA320078E451 /* RouteManagerTransitioning.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerTransitioning.swift; sourceTree = "<group>"; };
+		34AB65E11FC5AA320078E451 /* RouteManagerTransitioningManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerTransitioningManager.swift; sourceTree = "<group>"; };
+		34AB65E21FC5AA320078E451 /* RouteManagerViewModelProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerViewModelProtocol.swift; sourceTree = "<group>"; };
+		34AB65E31FC5AA320078E451 /* MWMRouteManagerPointType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouteManagerPointType.h; sourceTree = "<group>"; };
+		34AB65E41FC5AA320078E451 /* RouteManagerTableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerTableView.swift; sourceTree = "<group>"; };
+		34AB65E51FC5AA320078E451 /* RouteManageriPadPresentationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManageriPadPresentationController.swift; sourceTree = "<group>"; };
+		34AB65E61FC5AA320078E451 /* RouteManagerFooterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerFooterView.swift; sourceTree = "<group>"; };
+		34AB65E71FC5AA320078E451 /* MWMRoutePreviewTaxiCellType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutePreviewTaxiCellType.h; sourceTree = "<group>"; };
+		34AB65E81FC5AA320078E451 /* RoutePreviewTaxiCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoutePreviewTaxiCell.swift; sourceTree = "<group>"; };
+		34AB65E91FC5AA320078E451 /* MWMiPadRoutePreview.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMiPadRoutePreview.mm; sourceTree = "<group>"; };
+		34AB65EA1FC5AA320078E451 /* MWMiPadRoutePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMiPadRoutePreview.h; sourceTree = "<group>"; };
+		34AB65EB1FC5AA320078E451 /* MWMTaxiPreviewDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTaxiPreviewDataSource.h; sourceTree = "<group>"; };
+		34AB65EE1FC5AA320078E451 /* TransportTransitPedestrian.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransportTransitPedestrian.swift; sourceTree = "<group>"; };
+		34AB65EF1FC5AA320078E451 /* TransportTransitFlowLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransportTransitFlowLayout.swift; sourceTree = "<group>"; };
+		34AB65F01FC5AA320078E451 /* TransportTransitIntermediatePoint.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TransportTransitIntermediatePoint.xib; sourceTree = "<group>"; };
+		34AB65F11FC5AA320078E451 /* TransportTransitIntermediatePoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransportTransitIntermediatePoint.swift; sourceTree = "<group>"; };
+		34AB65F21FC5AA320078E451 /* TransportTransitSeparator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransportTransitSeparator.swift; sourceTree = "<group>"; };
+		34AB65F31FC5AA320078E451 /* TransportTransitTrain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransportTransitTrain.swift; sourceTree = "<group>"; };
+		34AB65F41FC5AA320078E451 /* TransportTransitPedestrian.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TransportTransitPedestrian.xib; sourceTree = "<group>"; };
+		34AB65F51FC5AA320078E451 /* TransportTransitCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransportTransitCell.swift; sourceTree = "<group>"; };
+		34AB65F61FC5AA320078E451 /* TransportTransitStepsCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransportTransitStepsCollectionView.swift; sourceTree = "<group>"; };
+		34AB65F71FC5AA320078E451 /* TransportTransitTrain.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TransportTransitTrain.xib; sourceTree = "<group>"; };
+		34AB65F81FC5AA320078E451 /* BaseRoutePreviewStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseRoutePreviewStatus.swift; sourceTree = "<group>"; };
+		34AB65F91FC5AA320078E451 /* TransportRoutePreviewStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransportRoutePreviewStatus.swift; sourceTree = "<group>"; };
+		34AB65FA1FC5AA320078E451 /* RoutePreviewTaxiCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RoutePreviewTaxiCell.xib; sourceTree = "<group>"; };
+		34AB65FB1FC5AA320078E451 /* MWMTaxiCollectionLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTaxiCollectionLayout.h; sourceTree = "<group>"; };
+		34AB65FC1FC5AA320078E451 /* MWMiPhoneRoutePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMiPhoneRoutePreview.h; sourceTree = "<group>"; };
+		34AB65FD1FC5AA320078E451 /* MWMRoutePreview.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutePreview.mm; sourceTree = "<group>"; };
+		34AB65FE1FC5AA320078E451 /* MWMiPhoneRoutePreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMiPhoneRoutePreview.xib; sourceTree = "<group>"; };
+		34AB65FF1FC5AA320078E451 /* MWMRoutePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutePreview.h; sourceTree = "<group>"; };
+		34AB66001FC5AA320078E451 /* NavigationAddPointToastView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationAddPointToastView.swift; sourceTree = "<group>"; };
+		34AB66011FC5AA320078E451 /* MWMNavigationInfoView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationInfoView.mm; sourceTree = "<group>"; };
+		34AB66021FC5AA320078E451 /* NavigationControlView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationControlView.swift; sourceTree = "<group>"; };
+		34AB66031FC5AA320078E451 /* NavigationStreetNameView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationStreetNameView.swift; sourceTree = "<group>"; };
 		34ABA6141C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationOSMLoginViewController.h; sourceTree = "<group>"; };
 		34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationOSMLoginViewController.mm; sourceTree = "<group>"; };
 		34ABA61E1C2D517500FE1BEC /* MWMInputValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMInputValidator.h; sourceTree = "<group>"; };
@@ -2189,11 +2249,10 @@
 		34AC8FB91EFBAD1900E7F910 /* ViatorElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViatorElement.swift; sourceTree = "<group>"; };
 		34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutePoint.mm; sourceTree = "<group>"; };
 		34AC8FC81EFC01F500E7F910 /* MWMRoutePoint+CPP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMRoutePoint+CPP.h"; sourceTree = "<group>"; };
-		34AC8FCA1EFC028600E7F910 /* MWMNavigationInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationInfoView.h; sourceTree = "<group>"; };
-		34AC8FCB1EFC028600E7F910 /* MWMNavigationInfoView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationInfoView.mm; sourceTree = "<group>"; };
-		34AC8FCC1EFC028600E7F910 /* MWMNavigationInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNavigationInfoView.xib; sourceTree = "<group>"; };
-		34AC8FCD1EFC028600E7F910 /* NavigationAddPointToastView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationAddPointToastView.swift; sourceTree = "<group>"; };
 		34AC8FD91EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UILabel+NumberOfVisibleLines.swift"; sourceTree = "<group>"; };
+		34B127E61FBDD358008713D9 /* MWMRouterTransitType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterTransitType.h; sourceTree = "<group>"; };
+		34B127E71FBDD410008713D9 /* MWMRouterTransitStepInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterTransitStepInfo.h; sourceTree = "<group>"; };
+		34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRouterTransitStepInfo.mm; sourceTree = "<group>"; };
 		34B3806B1F1E46E20087D65B /* MWMSearchManagerState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerState.h; sourceTree = "<group>"; };
 		34B924401DC8A29C0008D971 /* MWMMailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMailViewController.h; sourceTree = "<group>"; };
 		34B924411DC8A29C0008D971 /* MWMMailViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMailViewController.mm; sourceTree = "<group>"; };
@@ -2209,10 +2268,6 @@
 		34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationCommon.mm; sourceTree = "<group>"; };
 		34BF0CC81C31306300D097EB /* MWMAuthorizationCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationCommon.h; sourceTree = "<group>"; };
 		34C0A69B1F4C1B380007CE5B /* GoogleNativeBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GoogleNativeBanner.swift; sourceTree = "<group>"; };
-		34C5B80E1F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerViewModelProtocol.swift; sourceTree = "<group>"; };
-		34C5B8121F335BCA005E50B6 /* RouteManagerViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerViewModel.swift; sourceTree = "<group>"; };
-		34C5B81A1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerTransitioningManager.swift; sourceTree = "<group>"; };
-		34C5B8221F336DF5005E50B6 /* RouteManagerTransitioning.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerTransitioning.swift; sourceTree = "<group>"; };
 		34C9BCFE1C6DB693000DC38D /* MWMTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTableViewController.h; sourceTree = "<group>"; };
 		34C9BCFF1C6DB693000DC38D /* MWMTableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMTableViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		34C9BD001C6DB693000DC38D /* MWMViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMViewController.h; sourceTree = "<group>"; };
@@ -2257,7 +2312,6 @@
 		34D3B04D1E38A20C004100F9 /* Bundle+Init.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bundle+Init.swift"; sourceTree = "<group>"; };
 		34D4FA611E26572D003F53EF /* FirstLaunchController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirstLaunchController.swift; sourceTree = "<group>"; };
 		34D4FA651E265749003F53EF /* WhatsNewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WhatsNewController.swift; sourceTree = "<group>"; };
-		34D7F3401F33903F001D5ED5 /* RouteManagerHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteManagerHeaderView.swift; sourceTree = "<group>"; };
 		34D8087A1E793606002F0584 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
 		34D8087C1E79360D002F0584 /* AlamofireImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AlamofireImage.framework; path = Carthage/Build/iOS/AlamofireImage.framework; sourceTree = "<group>"; };
 		34D808851E793F91002F0584 /* Pushwoosh.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Pushwoosh.framework; path = Carthage/Build/iOS/Pushwoosh.framework; sourceTree = "<group>"; };
@@ -2276,8 +2330,6 @@
 		34E776121F14B17F003040B3 /* AvailableArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvailableArea.swift; sourceTree = "<group>"; };
 		34E776161F14B6E2003040B3 /* MWMAvailableAreaAffectDirection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMAvailableAreaAffectDirection.h; sourceTree = "<group>"; };
 		34E7761D1F14DB48003040B3 /* PlacePageArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlacePageArea.swift; sourceTree = "<group>"; };
-		34E776251F14FE77003040B3 /* NavigationStreetNameView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationStreetNameView.swift; sourceTree = "<group>"; };
-		34E776291F150AFD003040B3 /* NavigationTurnsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationTurnsView.swift; sourceTree = "<group>"; };
 		34E776301F15FAC2003040B3 /* MWMPlacePageManagerHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageManagerHelper.h; sourceTree = "<group>"; };
 		34E776311F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageManagerHelper.mm; sourceTree = "<group>"; };
 		34EE259C1EFA682D00F870AB /* PPViatorCarouselCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PPViatorCarouselCell.swift; sourceTree = "<group>"; };
@@ -2534,8 +2586,6 @@
 		F6BD1D1E1CA412920047B8E8 /* MWMOsmAuthAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMOsmAuthAlert.h; sourceTree = "<group>"; };
 		F6BD1D1F1CA412920047B8E8 /* MWMOsmAuthAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMOsmAuthAlert.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		F6BD1D221CA412E30047B8E8 /* MWMOsmAuthAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMOsmAuthAlert.xib; sourceTree = "<group>"; };
-		F6BD33851B62412E00F2CE18 /* MWMNavigationDashboardEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardEntity.h; sourceTree = "<group>"; };
-		F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboardEntity.mm; sourceTree = "<group>"; };
 		F6DF5F321CD1136800A87154 /* LocaleTranslator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocaleTranslator.h; sourceTree = "<group>"; };
 		F6E2FBFE1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloaderAdsTableViewCell.h; sourceTree = "<group>"; };
 		F6E2FBFF1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloaderAdsTableViewCell.mm; sourceTree = "<group>"; };
@@ -3256,15 +3306,18 @@
 		340475331E081A4600C92850 /* Routing */ = {
 			isa = PBXGroup;
 			children = (
-				34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */,
-				34AC8FC81EFC01F500E7F910 /* MWMRoutePoint+CPP.h */,
 				34F5E0DC1E3F51AF00B1C415 /* MWMCoreRouterType.h */,
 				34F5E0DA1E3F3ED300B1C415 /* MWMRoutePoint.h */,
+				34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */,
+				34AC8FC81EFC01F500E7F910 /* MWMRoutePoint+CPP.h */,
 				340475351E081A4600C92850 /* MWMRouter.h */,
 				340475361E081A4600C92850 /* MWMRouter.mm */,
 				340B33C41F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm */,
-				3426DEB11F45AE2800D1C43C /* MWMRouterType.h */,
 				3426DEB21F45AE5100D1C43C /* MWMRouterRecommendation.h */,
+				34B127E71FBDD410008713D9 /* MWMRouterTransitStepInfo.h */,
+				34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */,
+				34B127E61FBDD358008713D9 /* MWMRouterTransitType.h */,
+				3426DEB11F45AE2800D1C43C /* MWMRouterType.h */,
 			);
 			path = Routing;
 			sourceTree = "<group>";
@@ -3336,31 +3389,6 @@
 			path = Share;
 			sourceTree = "<group>";
 		};
-		3409C9B11F28D3870038F2A9 /* RoutePreview */ = {
-			isa = PBXGroup;
-			children = (
-				34C5B8051F335AC7005E50B6 /* RouteManager */,
-				3407085E1F28FE2800029ECC /* MWMiPadRoutePreview.h */,
-				3407085F1F28FE2800029ECC /* MWMiPadRoutePreview.mm */,
-				340708441F28EDD100029ECC /* MWMiPadRoutePreview.xib */,
-				34763EF01F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.h */,
-				34763EF11F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm */,
-				34763EEC1F2F5F2E00F4D2D3 /* MWMiPhoneRoutePreview.xib */,
-				340708411F28ED2D00029ECC /* MWMRoutePreview.h */,
-				340708421F28ED2D00029ECC /* MWMRoutePreview.mm */,
-				340708881F2B8B7900029ECC /* MWMRoutePreviewTaxiCellType.h */,
-				3407084A1F28EDD100029ECC /* MWMTaxiCollectionLayout.h */,
-				3407084B1F28EDD100029ECC /* MWMTaxiCollectionLayout.mm */,
-				340708471F28EDD100029ECC /* MWMTaxiPreviewDataSource.h */,
-				340708481F28EDD100029ECC /* MWMTaxiPreviewDataSource.mm */,
-				34763F011F30749000F4D2D3 /* RoutePreviewStatus.swift */,
-				340708491F28EDD100029ECC /* RoutePreviewTaxiCell.swift */,
-				3407086C1F2B427400029ECC /* RoutePreviewTaxiCell.xib */,
-				34763EFD1F3069BB00F4D2D3 /* RouteStartButton.swift */,
-			);
-			path = RoutePreview;
-			sourceTree = "<group>";
-		};
 		340E1EE31E2F614400CE49BF /* Storyboard */ = {
 			isa = PBXGroup;
 			children = (
@@ -3705,22 +3733,6 @@
 			path = Welcome;
 			sourceTree = "<group>";
 		};
-		3497A9321B5CF8A900F51E55 /* NavigationDashboard */ = {
-			isa = PBXGroup;
-			children = (
-				F6BD33851B62412E00F2CE18 /* MWMNavigationDashboardEntity.h */,
-				F6BD33861B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm */,
-				3497A9361B5CF8A900F51E55 /* MWMNavigationDashboardManager.h */,
-				3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */,
-				340708871F2B889400029ECC /* MWMNavigationDashboardManager+Entity.h */,
-				340708831F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm */,
-				347BFA931F28842300E5531F /* MWMNavigationDashboardObserver.h */,
-				34D783C71B5F9D7800E0C0EE /* Views */,
-			);
-			name = NavigationDashboard;
-			path = ../NavigationDashboard;
-			sourceTree = "<group>";
-		};
 		349A137E1DEC138C00C7DB60 /* MobileInternetAlert */ = {
 			isa = PBXGroup;
 			children = (
@@ -3783,6 +3795,112 @@
 			path = ExpandableTextView;
 			sourceTree = "<group>";
 		};
+		34AB65C41FC5AA320078E451 /* NavigationDashboard */ = {
+			isa = PBXGroup;
+			children = (
+				34AB65C91FC5AA320078E451 /* MWMNavigationDashboardEntity.h */,
+				34AB65CB1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm */,
+				34AB65CA1FC5AA320078E451 /* MWMNavigationDashboardManager.h */,
+				34AB65C61FC5AA320078E451 /* MWMNavigationDashboardManager.mm */,
+				34AB65C71FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.h */,
+				34AB65C51FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm */,
+				34AB65C81FC5AA320078E451 /* MWMNavigationDashboardObserver.h */,
+				34AB65CC1FC5AA320078E451 /* Views */,
+			);
+			name = NavigationDashboard;
+			path = CustomViews/NavigationDashboard;
+			sourceTree = "<group>";
+		};
+		34AB65CC1FC5AA320078E451 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				34AB65CF1FC5AA320078E451 /* MWMNavigationInfoView.h */,
+				34AB66011FC5AA320078E451 /* MWMNavigationInfoView.mm */,
+				34AB65D01FC5AA320078E451 /* MWMNavigationInfoView.xib */,
+				34AB66001FC5AA320078E451 /* NavigationAddPointToastView.swift */,
+				34AB66021FC5AA320078E451 /* NavigationControlView.swift */,
+				34AB65CD1FC5AA320078E451 /* NavigationControlView.xib */,
+				34AB66031FC5AA320078E451 /* NavigationStreetNameView.swift */,
+				34AB65CE1FC5AA320078E451 /* NavigationTurnsView.swift */,
+				34AB65D11FC5AA320078E451 /* RoutePreview */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		34AB65D11FC5AA320078E451 /* RoutePreview */ = {
+			isa = PBXGroup;
+			children = (
+				34AB65EA1FC5AA320078E451 /* MWMiPadRoutePreview.h */,
+				34AB65E91FC5AA320078E451 /* MWMiPadRoutePreview.mm */,
+				34AB65D61FC5AA320078E451 /* MWMiPadRoutePreview.xib */,
+				34AB65FC1FC5AA320078E451 /* MWMiPhoneRoutePreview.h */,
+				34AB65D21FC5AA320078E451 /* MWMiPhoneRoutePreview.mm */,
+				34AB65FE1FC5AA320078E451 /* MWMiPhoneRoutePreview.xib */,
+				34AB65FF1FC5AA320078E451 /* MWMRoutePreview.h */,
+				34AB65FD1FC5AA320078E451 /* MWMRoutePreview.mm */,
+				34AB65E71FC5AA320078E451 /* MWMRoutePreviewTaxiCellType.h */,
+				34AB65FB1FC5AA320078E451 /* MWMTaxiCollectionLayout.h */,
+				34AB65D31FC5AA320078E451 /* MWMTaxiCollectionLayout.mm */,
+				34AB65EB1FC5AA320078E451 /* MWMTaxiPreviewDataSource.h */,
+				34AB65D41FC5AA320078E451 /* MWMTaxiPreviewDataSource.mm */,
+				34AB65D71FC5AA320078E451 /* RouteManager */,
+				34AB65EC1FC5AA320078E451 /* RoutePreviewStatus */,
+				34AB65E81FC5AA320078E451 /* RoutePreviewTaxiCell.swift */,
+				34AB65FA1FC5AA320078E451 /* RoutePreviewTaxiCell.xib */,
+				34AB65D51FC5AA320078E451 /* RouteStartButton.swift */,
+			);
+			path = RoutePreview;
+			sourceTree = "<group>";
+		};
+		34AB65D71FC5AA320078E451 /* RouteManager */ = {
+			isa = PBXGroup;
+			children = (
+				34AB65D81FC5AA320078E451 /* RouteManagerDimView.swift */,
+				34AB65D91FC5AA320078E451 /* RouteManagerViewController.swift */,
+				34AB65DA1FC5AA320078E451 /* RouteManagerViewModel.swift */,
+				34AB65DB1FC5AA320078E451 /* RouteManageriPhonePresentationController.swift */,
+				34AB65DC1FC5AA320078E451 /* RouteManagerHeaderView.swift */,
+				34AB65DD1FC5AA320078E451 /* RouteManagerCell.xib */,
+				34AB65DE1FC5AA320078E451 /* RouteManagerCell.swift */,
+				34AB65DF1FC5AA320078E451 /* RouteManagerViewController.xib */,
+				34AB65E01FC5AA320078E451 /* RouteManagerTransitioning.swift */,
+				34AB65E11FC5AA320078E451 /* RouteManagerTransitioningManager.swift */,
+				34AB65E21FC5AA320078E451 /* RouteManagerViewModelProtocol.swift */,
+				34AB65E31FC5AA320078E451 /* MWMRouteManagerPointType.h */,
+				34AB65E41FC5AA320078E451 /* RouteManagerTableView.swift */,
+				34AB65E51FC5AA320078E451 /* RouteManageriPadPresentationController.swift */,
+				34AB65E61FC5AA320078E451 /* RouteManagerFooterView.swift */,
+			);
+			path = RouteManager;
+			sourceTree = "<group>";
+		};
+		34AB65EC1FC5AA320078E451 /* RoutePreviewStatus */ = {
+			isa = PBXGroup;
+			children = (
+				34AB65F81FC5AA320078E451 /* BaseRoutePreviewStatus.swift */,
+				34AB65F91FC5AA320078E451 /* TransportRoutePreviewStatus.swift */,
+				34AB65ED1FC5AA320078E451 /* TransportTransitSteps */,
+			);
+			path = RoutePreviewStatus;
+			sourceTree = "<group>";
+		};
+		34AB65ED1FC5AA320078E451 /* TransportTransitSteps */ = {
+			isa = PBXGroup;
+			children = (
+				34AB65F51FC5AA320078E451 /* TransportTransitCell.swift */,
+				34AB65EF1FC5AA320078E451 /* TransportTransitFlowLayout.swift */,
+				34AB65F11FC5AA320078E451 /* TransportTransitIntermediatePoint.swift */,
+				34AB65F01FC5AA320078E451 /* TransportTransitIntermediatePoint.xib */,
+				34AB65EE1FC5AA320078E451 /* TransportTransitPedestrian.swift */,
+				34AB65F41FC5AA320078E451 /* TransportTransitPedestrian.xib */,
+				34AB65F21FC5AA320078E451 /* TransportTransitSeparator.swift */,
+				34AB65F61FC5AA320078E451 /* TransportTransitStepsCollectionView.swift */,
+				34AB65F31FC5AA320078E451 /* TransportTransitTrain.swift */,
+				34AB65F71FC5AA320078E451 /* TransportTransitTrain.xib */,
+			);
+			path = TransportTransitSteps;
+			sourceTree = "<group>";
+		};
 		34ABA60F1C2D17C200FE1BEC /* Login */ = {
 			isa = PBXGroup;
 			children = (
@@ -3839,7 +3957,6 @@
 				340537621BBED98600D452C6 /* MWMMapViewControlsCommon.h */,
 				34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */,
 				34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */,
-				3497A9321B5CF8A900F51E55 /* NavigationDashboard */,
 				345C34661CE9D32500BB2224 /* SideButtons */,
 				3463BA621DE81D760082417F /* TrafficButton */,
 			);
@@ -3847,28 +3964,6 @@
 			path = CustomViews/MapViewControls;
 			sourceTree = "<group>";
 		};
-		34C5B8051F335AC7005E50B6 /* RouteManager */ = {
-			isa = PBXGroup;
-			children = (
-				342360B11F349F9800AFE44D /* MWMRouteManagerPointType.h */,
-				342360A51F34906700AFE44D /* RouteManagerCell.swift */,
-				342360A61F34906700AFE44D /* RouteManagerCell.xib */,
-				342360A11F34840500AFE44D /* RouteManagerDimView.swift */,
-				342360991F34585A00AFE44D /* RouteManagerFooterView.swift */,
-				34D7F3401F33903F001D5ED5 /* RouteManagerHeaderView.swift */,
-				349993F81F388F970064CFBE /* RouteManageriPadPresentationController.swift */,
-				349993F91F388F970064CFBE /* RouteManageriPhonePresentationController.swift */,
-				3423609D1F34787F00AFE44D /* RouteManagerTableView.swift */,
-				34C5B8221F336DF5005E50B6 /* RouteManagerTransitioning.swift */,
-				34C5B81A1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift */,
-				342360911F3456E200AFE44D /* RouteManagerViewController.swift */,
-				342360921F3456E200AFE44D /* RouteManagerViewController.xib */,
-				34C5B8121F335BCA005E50B6 /* RouteManagerViewModel.swift */,
-				34C5B80E1F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift */,
-			);
-			path = RouteManager;
-			sourceTree = "<group>";
-		};
 		34D3AFFC1E389D05004100F9 /* Cells */ = {
 			isa = PBXGroup;
 			children = (
@@ -3902,22 +3997,6 @@
 			path = Cells;
 			sourceTree = "<group>";
 		};
-		34D783C71B5F9D7800E0C0EE /* Views */ = {
-			isa = PBXGroup;
-			children = (
-				3409C9B11F28D3870038F2A9 /* RoutePreview */,
-				34AC8FCA1EFC028600E7F910 /* MWMNavigationInfoView.h */,
-				34AC8FCB1EFC028600E7F910 /* MWMNavigationInfoView.mm */,
-				34AC8FCC1EFC028600E7F910 /* MWMNavigationInfoView.xib */,
-				34AC8FCD1EFC028600E7F910 /* NavigationAddPointToastView.swift */,
-				34E776251F14FE77003040B3 /* NavigationStreetNameView.swift */,
-				34E776291F150AFD003040B3 /* NavigationTurnsView.swift */,
-				3407087A1F2B6F5200029ECC /* NavigationControlView.swift */,
-				3407087E1F2B6F7000029ECC /* NavigationControlView.xib */,
-			);
-			path = Views;
-			sourceTree = "<group>";
-		};
 		34E7760D1F14B165003040B3 /* AvailableArea */ = {
 			isa = PBXGroup;
 			children = (
@@ -4032,13 +4111,14 @@
 		97B4E9271851DAB300BEC5D7 /* Custom Views */ = {
 			isa = PBXGroup;
 			children = (
-				34ABA60F1C2D17C200FE1BEC /* Login */,
-				349A35741B53D4C9009677EE /* CircularProgress */,
-				34BC72091B0DECAE0012A34B /* MapViewControls */,
-				ED48BBB317C267F5003E7E92 /* ColorPickerView.h */,
-				ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */,
 				ED48BBB817C2B1E2003E7E92 /* CircleView.h */,
 				ED48BBB917C2B1E2003E7E92 /* CircleView.mm */,
+				349A35741B53D4C9009677EE /* CircularProgress */,
+				ED48BBB317C267F5003E7E92 /* ColorPickerView.h */,
+				ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */,
+				34ABA60F1C2D17C200FE1BEC /* Login */,
+				34BC72091B0DECAE0012A34B /* MapViewControls */,
+				34AB65C41FC5AA320078E451 /* NavigationDashboard */,
 			);
 			name = "Custom Views";
 			sourceTree = "<group>";
@@ -5127,6 +5207,7 @@
 				EEA61601134C496A003A9827 /* 01_dejavusans.ttf in Resources */,
 				341C2A571B72092A00AD41A1 /* 02_droidsans-fallback.ttf in Resources */,
 				EEA61603134C496A003A9827 /* 03_jomolhari-id-a3d.ttf in Resources */,
+				34AB667F1FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */,
 				EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */,
 				EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */,
 				EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */,
@@ -5138,6 +5219,7 @@
 				F6E2FEAE1E097BA00083EBEC /* _MWMPPPExternalTitle.xib in Resources */,
 				F6E2FEB11E097BA00083EBEC /* _MWMPPPSchedule.xib in Resources */,
 				3495433E1EB22DAC00F08F73 /* MPAdBrowserController.xib in Resources */,
+				34AB66131FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */,
 				F69080BE1F98DB2A0017C00C /* AuthorizationViewController.xib in Resources */,
 				F6E2FEB41E097BA00083EBEC /* _MWMPPPSpace.xib in Resources */,
 				F6E2FEB71E097BA00083EBEC /* _MWMPPPSubtitle.xib in Resources */,
@@ -5146,7 +5228,6 @@
 				340E1EEB1E2F614400CE49BF /* Authorization.storyboard in Resources */,
 				FAAFD697139D9BE2000AE70C /* categories.txt in Resources */,
 				EE026F0611D6AC0D00645242 /* classificator.txt in Resources */,
-				342360961F3456E200AFE44D /* RouteManagerViewController.xib in Resources */,
 				452FCA3B1B6A3DF7007019AB /* colors.txt in Resources */,
 				97A5967F19B9CD47007A963F /* copyright.html in Resources */,
 				4A300ED41C6DCFD400140018 /* countries-strings in Resources */,
@@ -5185,15 +5266,15 @@
 				F64F199E1AB81A00006EAF7E /* MWMDefaultAlert.xib in Resources */,
 				F6E2FE451E097BA00083EBEC /* MWMDirectionView.xib in Resources */,
 				F64F4B6F1B46A5380081A24A /* MWMDownloaderDialogCell.xib in Resources */,
+				34AB66791FC5AA330078E451 /* RoutePreviewTaxiCell.xib in Resources */,
 				F64F4B711B4A41D40081A24A /* MWMDownloaderDialogHeader.xib in Resources */,
 				F64F19A41AB81A00006EAF7E /* MWMDownloadTransitMapAlert.xib in Resources */,
-				34AC8FCF1EFC028600E7F910 /* MWMNavigationInfoView.xib in Resources */,
 				F652B2EA1C6DE8E500D20C8C /* MWMDropDown.xib in Resources */,
 				34D3B0231E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.xib in Resources */,
 				34E50DDA1F6FCAB1008EED49 /* UGCSummaryRatingCell.xib in Resources */,
-				34763EED1F2F5F2E00F4D2D3 /* MWMiPhoneRoutePreview.xib in Resources */,
 				34D3B0261E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.xib in Resources */,
 				F6E2FDB81E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.xib in Resources */,
+				34AB663A1FC5AA330078E451 /* RouteManagerViewController.xib in Resources */,
 				34D3B02C1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.xib in Resources */,
 				34D3B0321E389D05004100F9 /* MWMEditorCategoryCell.xib in Resources */,
 				F6E2FDCA1E097BA00083EBEC /* MWMEditorNotesFooter.xib in Resources */,
@@ -5216,11 +5297,10 @@
 				F6E2FD731E097BA00083EBEC /* MWMMapDownloaderTableViewCell.xib in Resources */,
 				349A13841DEC138C00C7DB60 /* MWMMobileInternetAlert.xib in Resources */,
 				34E50DE21F6FCBA1008EED49 /* UGCAddReviewCell.xib in Resources */,
-				342360AA1F34906700AFE44D /* RouteManagerCell.xib in Resources */,
 				34D3B04A1E389D05004100F9 /* MWMNoteCell.xib in Resources */,
 				F6E2FDEE1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */,
 				F6E2FDF41E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */,
-				3407084C1F28EDD100029ECC /* MWMiPadRoutePreview.xib in Resources */,
+				34AB66341FC5AA330078E451 /* RouteManagerCell.xib in Resources */,
 				F6E2FDFA1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
 				F6E2FE751E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */,
 				F6E2FE001E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.xib in Resources */,
@@ -5234,6 +5314,7 @@
 				F6E2FE691E097BA00083EBEC /* MWMPlacePageButtonCell.xib in Resources */,
 				F6E2FE8A1E097BA00083EBEC /* MWMPlacePageInfoCell.xib in Resources */,
 				F6E2FE8D1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */,
+				34AB66701FC5AA330078E451 /* TransportTransitTrain.xib in Resources */,
 				F6E2FE7E1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */,
 				34BBD6461F8264980070CA50 /* GoogleSignIn.bundle in Resources */,
 				F6E2FE841E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */,
@@ -5245,16 +5326,20 @@
 				F6E2FEFF1E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */,
 				F69CE8DD1E5C51AB002B5881 /* CarouselElement.xib in Resources */,
 				3488B0151E9D0AEC0068AFD8 /* AdBanner.xib in Resources */,
+				34AB665B1FC5AA330078E451 /* TransportTransitIntermediatePoint.xib in Resources */,
 				F6E2FF321E097BA00083EBEC /* MWMSearchCommonCell.xib in Resources */,
 				BB7626B51E8559980031D71C /* icudt57l.dat in Resources */,
 				F6E2FF051E097BA00083EBEC /* MWMSearchHistoryClearCell.xib in Resources */,
+				34AB660D1FC5AA320078E451 /* NavigationControlView.xib in Resources */,
 				F6E2FF141E097BA00083EBEC /* MWMSearchHistoryRequestCell.xib in Resources */,
 				F6E2FEE71E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */,
 				346225911DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib in Resources */,
+				34AB66221FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */,
 				F6E2FF381E097BA00083EBEC /* MWMSearchSuggestionCell.xib in Resources */,
 				F6664C041E6459DA00E703C2 /* PPReviewHeaderCell.xib in Resources */,
 				F6E2FF1A1E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.xib in Resources */,
 				BB25B1A61FB32767007276FA /* transit_colors.txt in Resources */,
+				34AB66671FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */,
 				F6E2FF201E097BA00083EBEC /* MWMSearchTabbedViewController.xib in Resources */,
 				F6E2FF291E097BA00083EBEC /* MWMSearchTabButtonsView.xib in Resources */,
 				344532501F714FD70059FBCC /* UGCAddReviewController.xib in Resources */,
@@ -5281,7 +5366,6 @@
 				4A23D15E1B8B4DD700D4EB6F /* resources-xhdpi_clear in Resources */,
 				4A7D89C71B2EBF3B00AC843E /* resources-xhdpi_dark in Resources */,
 				4A23D15F1B8B4DD700D4EB6F /* resources-xxhdpi_clear in Resources */,
-				3407086D1F2B427400029ECC /* RoutePreviewTaxiCell.xib in Resources */,
 				4A7D89C81B2EBF3B00AC843E /* resources-xxhdpi_dark in Resources */,
 				340E1EF41E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
 				347E1A991F1F7404002BF7A8 /* CianElement.xib in Resources */,
@@ -5297,7 +5381,6 @@
 				EE583CBB12F773F00042CBE3 /* unicode_blocks.txt in Resources */,
 				340E1EFD1E2F614400CE49BF /* Welcome.storyboard in Resources */,
 				FAFF422A1347F101009BBB14 /* World.mwm in Resources */,
-				3407087F1F2B6F7000029ECC /* NavigationControlView.xib in Resources */,
 				FA459EB414327AF700B5BB3C /* WorldCoasts.mwm in Resources */,
 				671182E31C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
 				346DB8361E5C4F6700E3123E /* GalleryViewController.xib in Resources */,
@@ -5317,6 +5400,7 @@
 				6741A9571BF340DE002C974C /* 03_jomolhari-id-a3d.ttf in Resources */,
 				6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */,
 				6741A9591BF340DE002C974C /* 05_khmeros.ttf in Resources */,
+				34AB66801FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */,
 				6741A95B1BF340DE002C974C /* 06_code2000.ttf in Resources */,
 				6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */,
 				F6E2FE6D1E097BA00083EBEC /* _MWMOHHeaderCell.xib in Resources */,
@@ -5328,13 +5412,13 @@
 				F6E2FEB51E097BA00083EBEC /* _MWMPPPSpace.xib in Resources */,
 				F6E2FEB81E097BA00083EBEC /* _MWMPPPSubtitle.xib in Resources */,
 				4554B6EE1E55F0F30084017F /* drules_proto_vehicle_dark.bin in Resources */,
+				34AB66141FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */,
 				F6E2FEBB1E097BA00083EBEC /* _MWMPPPTitle.xib in Resources */,
 				6741A9781BF340DE002C974C /* AddSetTableViewCell.xib in Resources */,
 				340E1EEC1E2F614400CE49BF /* Authorization.storyboard in Resources */,
 				6741A95C1BF340DE002C974C /* categories.txt in Resources */,
 				6741A9451BF340DE002C974C /* classificator.txt in Resources */,
 				676507611C10559B00830BB3 /* colors.txt in Resources */,
-				342360971F3456E200AFE44D /* RouteManagerViewController.xib in Resources */,
 				6741A9711BF340DE002C974C /* copyright.html in Resources */,
 				4A300ED51C6DCFD400140018 /* countries-strings in Resources */,
 				6741A9491BF340DE002C974C /* countries.txt in Resources */,
@@ -5374,16 +5458,16 @@
 				6741A9511BF340DE002C974C /* MWMDownloaderDialogHeader.xib in Resources */,
 				6741A96C1BF340DE002C974C /* MWMDownloadTransitMapAlert.xib in Resources */,
 				F653CE0E1C6DEB2E00A453F1 /* MWMDropDown.xib in Resources */,
-				34AC8FD51EFC02D100E7F910 /* MWMNavigationInfoView.xib in Resources */,
 				34D3B0241E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.xib in Resources */,
+				34AB667A1FC5AA330078E451 /* RoutePreviewTaxiCell.xib in Resources */,
 				34D3B0271E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.xib in Resources */,
 				34E50DDB1F6FCAB1008EED49 /* UGCSummaryRatingCell.xib in Resources */,
-				34763EEE1F2F5F2F00F4D2D3 /* MWMiPhoneRoutePreview.xib in Resources */,
 				F6E2FDB91E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.xib in Resources */,
 				34D3B02D1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.xib in Resources */,
 				34D3B0331E389D05004100F9 /* MWMEditorCategoryCell.xib in Resources */,
 				F6E2FDCB1E097BA00083EBEC /* MWMEditorNotesFooter.xib in Resources */,
 				34D3B0391E389D05004100F9 /* MWMEditorSelectTableViewCell.xib in Resources */,
+				34AB663B1FC5AA330078E451 /* RouteManagerViewController.xib in Resources */,
 				34D3B03F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.xib in Resources */,
 				34D3B0451E389D05004100F9 /* MWMEditorTextTableViewCell.xib in Resources */,
 				F64D9CA31C899C760063FA30 /* MWMEditorViralAlert.xib in Resources */,
@@ -5404,13 +5488,12 @@
 				34D3B04B1E389D05004100F9 /* MWMNoteCell.xib in Resources */,
 				F6E2FDEF1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */,
 				34E50DE31F6FCBA1008EED49 /* UGCAddReviewCell.xib in Resources */,
-				342360AB1F34906700AFE44D /* RouteManagerCell.xib in Resources */,
 				F6E2FDF51E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */,
 				F6E2FDFB1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
 				342639361EA0E60A0025EB89 /* local_ads_symbols.txt in Resources */,
-				340708521F28F1DD00029ECC /* MWMiPadRoutePreview.xib in Resources */,
 				4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_clear.bin in Resources */,
 				F6E2FE761E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */,
+				34AB66351FC5AA330078E451 /* RouteManagerCell.xib in Resources */,
 				F6E2FE011E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.xib in Resources */,
 				F6E2FE071E097BA00083EBEC /* MWMOpeningHoursDaysSelectorTableViewCell.xib in Resources */,
 				F6E2FE0D1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.xib in Resources */,
@@ -5424,6 +5507,7 @@
 				F6E2FE8B1E097BA00083EBEC /* MWMPlacePageInfoCell.xib in Resources */,
 				F6E2FE8E1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */,
 				F6E2FE7F1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */,
+				34AB66711FC5AA330078E451 /* TransportTransitTrain.xib in Resources */,
 				34BBD6471F82649D0070CA50 /* GoogleSignIn.bundle in Resources */,
 				F6E2FE851E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */,
 				F6E2FE941E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */,
@@ -5435,16 +5519,20 @@
 				F6E2FF061E097BA00083EBEC /* MWMSearchHistoryClearCell.xib in Resources */,
 				3488B0161E9D0AEC0068AFD8 /* AdBanner.xib in Resources */,
 				BB7626B61E85599C0031D71C /* icudt57l.dat in Resources */,
+				34AB665C1FC5AA330078E451 /* TransportTransitIntermediatePoint.xib in Resources */,
 				F6E2FF151E097BA00083EBEC /* MWMSearchHistoryRequestCell.xib in Resources */,
 				F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */,
 				346225921DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib in Resources */,
+				34AB660E1FC5AA320078E451 /* NavigationControlView.xib in Resources */,
 				F6E2FF391E097BA00083EBEC /* MWMSearchSuggestionCell.xib in Resources */,
 				F6E2FF1B1E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.xib in Resources */,
 				F6E2FF211E097BA00083EBEC /* MWMSearchTabbedViewController.xib in Resources */,
+				34AB66231FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */,
 				F6664C051E6459DA00E703C2 /* PPReviewHeaderCell.xib in Resources */,
 				F6E2FF2A1E097BA00083EBEC /* MWMSearchTabButtonsView.xib in Resources */,
 				BB25B1A71FB32767007276FA /* transit_colors.txt in Resources */,
 				F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */,
+				34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */,
 				F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
 				344532511F714FD70059FBCC /* UGCAddReviewController.xib in Resources */,
 				3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
@@ -5470,7 +5558,6 @@
 				6741A9981BF340DE002C974C /* resources-xhdpi_clear in Resources */,
 				6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */,
 				6741A94D1BF340DE002C974C /* resources-xxhdpi_clear in Resources */,
-				3407086E1F2B427400029ECC /* RoutePreviewTaxiCell.xib in Resources */,
 				6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */,
 				340E1EF51E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
 				347E1A9A1F1F7404002BF7A8 /* CianElement.xib in Resources */,
@@ -5487,7 +5574,6 @@
 				6741A94B1BF340DE002C974C /* unicode_blocks.txt in Resources */,
 				340E1EFE1E2F614400CE49BF /* Welcome.storyboard in Resources */,
 				6741A9521BF340DE002C974C /* World.mwm in Resources */,
-				340708801F2B6F7000029ECC /* NavigationControlView.xib in Resources */,
 				6741A9751BF340DE002C974C /* WorldCoasts.mwm in Resources */,
 				671182E41C7F0DD800CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
 				346DB8371E5C4F6700E3123E /* GalleryViewController.xib in Resources */,
@@ -5505,6 +5591,7 @@
 				849CF6091DE842290024A8A5 /* 03_jomolhari-id-a3d.ttf in Resources */,
 				849CF60B1DE842290024A8A5 /* 04_padauk.ttf in Resources */,
 				849CF6101DE842290024A8A5 /* 05_khmeros.ttf in Resources */,
+				34AB665D1FC5AA330078E451 /* TransportTransitIntermediatePoint.xib in Resources */,
 				849CF6151DE842290024A8A5 /* 06_code2000.ttf in Resources */,
 				849CF67E1DE842290024A8A5 /* 07_roboto_medium.ttf in Resources */,
 				F6E2FE6E1E097BA00083EBEC /* _MWMOHHeaderCell.xib in Resources */,
@@ -5521,14 +5608,15 @@
 				849CF6441DE842290024A8A5 /* AddSetTableViewCell.xib in Resources */,
 				340E1EED1E2F614400CE49BF /* Authorization.storyboard in Resources */,
 				849CF6161DE842290024A8A5 /* categories.txt in Resources */,
+				34AB667B1FC5AA330078E451 /* RoutePreviewTaxiCell.xib in Resources */,
 				849CF5ED1DE842290024A8A5 /* classificator.txt in Resources */,
 				849CF5EC1DE842290024A8A5 /* colors.txt in Resources */,
 				849CF6391DE842290024A8A5 /* copyright.html in Resources */,
-				342360981F3456E200AFE44D /* RouteManagerViewController.xib in Resources */,
 				849CF6581DE842290024A8A5 /* countries-strings in Resources */,
 				849CF5F41DE842290024A8A5 /* countries.txt in Resources */,
 				849CF6571DE842290024A8A5 /* countries_obsolete.txt in Resources */,
 				849CF6251DE842290024A8A5 /* cuisine-strings in Resources */,
+				34AB66241FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */,
 				849CF65F1DE842290024A8A5 /* drules_proto_clear.bin in Resources */,
 				347752941F7251C7000D46A3 /* UGCAddReviewTextCell.xib in Resources */,
 				849CF64E1DE842290024A8A5 /* drules_proto_dark.bin in Resources */,
@@ -5539,6 +5627,7 @@
 				34F73FA41E08300E00AC1FD6 /* Images.xcassets in Resources */,
 				34F73F9D1E082FF800AC1FD6 /* InfoPlist.strings in Resources */,
 				340E1EF01E2F614400CE49BF /* LaunchScreen.storyboard in Resources */,
+				34AB66691FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */,
 				34F73FA01E082FF800AC1FD6 /* Localizable.strings in Resources */,
 				340E1EF31E2F614400CE49BF /* Main.storyboard in Resources */,
 				F6E2FF521E097BA00083EBEC /* MWMAboutControllerHeader.xib in Resources */,
@@ -5548,6 +5637,7 @@
 				849CF6621DE842290024A8A5 /* MWMAPIBarView.xib in Resources */,
 				F6C269F71F14D76F00EB6519 /* ugc_types.csv in Resources */,
 				F6E2FE651E097BA00083EBEC /* MWMBookmarkCell.xib in Resources */,
+				34AB66811FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */,
 				F6E2FD961E097BA00083EBEC /* MWMBookmarkColorViewController.xib in Resources */,
 				34EE25A71EFA6AD400F870AB /* ViatorElement.xib in Resources */,
 				849CF6521DE842290024A8A5 /* MWMBookmarkNameCell.xib in Resources */,
@@ -5555,6 +5645,7 @@
 				349D1AD31E2E325B004A2006 /* MWMBottomMenuCollectionViewLandscapeCell.xib in Resources */,
 				349D1AD61E2E325C004A2006 /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */,
 				F69CE8DF1E5C51AB002B5881 /* CarouselElement.xib in Resources */,
+				34AB66361FC5AA330078E451 /* RouteManagerCell.xib in Resources */,
 				349D1AE21E2E325C004A2006 /* MWMBottomMenuViewController.xib in Resources */,
 				34D3B01F1E389D05004100F9 /* MWMButtonCell.xib in Resources */,
 				849CF6661DE842290024A8A5 /* MWMCircularProgress.xib in Resources */,
@@ -5564,11 +5655,9 @@
 				849CF6011DE842290024A8A5 /* MWMDownloaderDialogHeader.xib in Resources */,
 				849CF62F1DE842290024A8A5 /* MWMDownloadTransitMapAlert.xib in Resources */,
 				849CF61B1DE842290024A8A5 /* MWMDropDown.xib in Resources */,
-				34AC8FD61EFC02D100E7F910 /* MWMNavigationInfoView.xib in Resources */,
 				34D3B0251E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.xib in Resources */,
 				34D3B0281E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.xib in Resources */,
 				34E50DDC1F6FCAB1008EED49 /* UGCSummaryRatingCell.xib in Resources */,
-				34763EEF1F2F5F2F00F4D2D3 /* MWMiPhoneRoutePreview.xib in Resources */,
 				F6E2FDBA1E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.xib in Resources */,
 				34D3B02E1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.xib in Resources */,
 				34D3B0341E389D05004100F9 /* MWMEditorCategoryCell.xib in Resources */,
@@ -5594,16 +5683,15 @@
 				34D3B04C1E389D05004100F9 /* MWMNoteCell.xib in Resources */,
 				F6E2FDF01E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */,
 				34E50DE41F6FCBA1008EED49 /* UGCAddReviewCell.xib in Resources */,
-				342360AC1F34906700AFE44D /* RouteManagerCell.xib in Resources */,
 				F6E2FDF61E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */,
 				F6E2FDFC1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
 				342639381EA0E60B0025EB89 /* local_ads_symbols.txt in Resources */,
-				340708531F28F1DE00029ECC /* MWMiPadRoutePreview.xib in Resources */,
 				F6E2FE771E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */,
 				4554B6ED1E55F0F00084017F /* drules_proto_vehicle_clear.bin in Resources */,
 				F6E2FE021E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.xib in Resources */,
 				F6E2FE081E097BA00083EBEC /* MWMOpeningHoursDaysSelectorTableViewCell.xib in Resources */,
 				F6E2FE0E1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.xib in Resources */,
+				34AB66721FC5AA330078E451 /* TransportTransitTrain.xib in Resources */,
 				F6E2FE171E097BA00083EBEC /* MWMOpeningHoursTimeSelectorTableViewCell.xib in Resources */,
 				F6E2FE1D1E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.xib in Resources */,
 				F6C16A661F9626B2000FE296 /* ReviewsViewController.xib in Resources */,
@@ -5641,6 +5729,7 @@
 				F6E2FEEF1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
 				849CF6471DE842290024A8A5 /* MWMSideButtonsView.xib in Resources */,
 				346DB82C1E5C4F6700E3123E /* GalleryCell.xib in Resources */,
+				34AB663C1FC5AA330078E451 /* RouteManagerViewController.xib in Resources */,
 				F6E2FE2F1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
 				349B92721DF0526D007779DD /* MWMToast.xib in Resources */,
 				344532351F6FE5880059FBCC /* UGCSummaryRatingStarsCell.xib in Resources */,
@@ -5653,15 +5742,16 @@
 				849CF63F1DE842290024A8A5 /* resources-6plus_dark in Resources */,
 				849CF6141DE842290024A8A5 /* resources-default in Resources */,
 				849CF6731DE842290024A8A5 /* resources-hdpi_clear in Resources */,
+				34AB660F1FC5AA320078E451 /* NavigationControlView.xib in Resources */,
 				849CF6031DE842290024A8A5 /* resources-hdpi_dark in Resources */,
 				849CF64F1DE842290024A8A5 /* resources-mdpi_clear in Resources */,
 				849CF66E1DE842290024A8A5 /* resources-mdpi_dark in Resources */,
 				F69CE8DB1E5C5088002B5881 /* PPHotelCarouselCell.xib in Resources */,
 				849CF67A1DE842290024A8A5 /* resources-xhdpi_clear in Resources */,
 				849CF61A1DE842290024A8A5 /* resources-xhdpi_dark in Resources */,
-				3407086F1F2B427400029ECC /* RoutePreviewTaxiCell.xib in Resources */,
 				849CF5FC1DE842290024A8A5 /* resources-xxhdpi_clear in Resources */,
 				849CF6061DE842290024A8A5 /* resources-xxhdpi_dark in Resources */,
+				34AB66151FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */,
 				347E1A9B1F1F7404002BF7A8 /* CianElement.xib in Resources */,
 				340E1EF61E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
 				340E1EF91E2F614400CE49BF /* Settings.storyboard in Resources */,
@@ -5676,7 +5766,6 @@
 				849CF5F81DE842290024A8A5 /* unicode_blocks.txt in Resources */,
 				340E1EFF1E2F614400CE49BF /* Welcome.storyboard in Resources */,
 				849CF6021DE842290024A8A5 /* World.mwm in Resources */,
-				340708811F2B6F7000029ECC /* NavigationControlView.xib in Resources */,
 				849CF6401DE842290024A8A5 /* WorldCoasts.mwm in Resources */,
 				849CF63D1DE842290024A8A5 /* WorldCoasts_obsolete.mwm in Resources */,
 				346DB8381E5C4F6700E3123E /* GalleryViewController.xib in Resources */,
@@ -5833,12 +5922,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				34845DB61E166084003D55B9 /* Common.swift in Sources */,
-				349993FD1F388F970064CFBE /* RouteManageriPhonePresentationController.swift in Sources */,
 				344BEAF21F66BDC30045DC45 /* RatingSummaryView.swift in Sources */,
 				1D60589B0D05DD56006BFB54 /* main.mm in Sources */,
 				34D3B04E1E38A20C004100F9 /* Bundle+Init.swift in Sources */,
+				34AB666D1FC5AA330078E451 /* TransportTransitStepsCollectionView.swift in Sources */,
 				340837161B72451A00B5C185 /* MWMShareActivityItem.mm in Sources */,
-				342360931F3456E200AFE44D /* RouteManagerViewController.swift in Sources */,
 				349FC5471F680DAE00968C9F /* ExpandableTextView.swift in Sources */,
 				F6E2FF531E097BA00083EBEC /* MWMHelpController.mm in Sources */,
 				F6E2FF591E097BA00083EBEC /* MWMNightModeController.mm in Sources */,
@@ -5846,11 +5934,13 @@
 				3408963E1F83CEDE00BC7117 /* MWMAuthorizationViewModel.mm in Sources */,
 				F6E2FE1E1E097BA00083EBEC /* MWMOpeningHoursCommon.mm in Sources */,
 				F6BC1E521ACBF98600EF0360 /* MWMFacebookAlert.mm in Sources */,
+				34AB66641FC5AA330078E451 /* TransportTransitTrain.swift in Sources */,
 				F6E2FF5C1E097BA00083EBEC /* MWMRecentTrackSettingsController.mm in Sources */,
 				343064401E9FDC7300DC7665 /* SearchIndex.swift in Sources */,
 				F6664BF91E6459CB00E703C2 /* PPFacilityCell.swift in Sources */,
 				347E1A8D1F1F71F1002BF7A8 /* PPCianCarouselCell.swift in Sources */,
 				F6E2FDE81E097BA00083EBEC /* MWMObjectsCategorySelectorController.mm in Sources */,
+				34AB665E1FC5AA330078E451 /* TransportTransitIntermediatePoint.swift in Sources */,
 				F64F199D1AB81A00006EAF7E /* MWMDefaultAlert.mm in Sources */,
 				348A8DF41F66775A00D83026 /* RatingView.swift in Sources */,
 				F63AF50E1EA6215100A1DB98 /* FilterPriceCategoryCell.swift in Sources */,
@@ -5860,21 +5950,19 @@
 				F6E2FDF71E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */,
 				1D3623260D0F684500981E51 /* MapsAppDelegate.mm in Sources */,
 				340B33C51F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */,
-				34763EF21F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm in Sources */,
 				F6E2FE181E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */,
 				F6E2FDEB1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */,
 				34BBD64B1F826DB10070CA50 /* AuthorizationViewController.swift in Sources */,
 				F6E2FE0F1E097BA00083EBEC /* MWMOpeningHoursTableViewCell.mm in Sources */,
 				341522BF1B666A550077AA8F /* MWMAPIBarView.mm in Sources */,
-				3423609A1F34585A00AFE44D /* RouteManagerFooterView.swift in Sources */,
 				34F742311E0834F400AC1FD6 /* UIViewController+Navigation.mm in Sources */,
+				34AB66551FC5AA330078E451 /* TransportTransitPedestrian.swift in Sources */,
 				340475801E081B3300C92850 /* iosOGLContextFactory.mm in Sources */,
 				3486B51D1E27AD590069C126 /* MWMFrameworkHelper.mm in Sources */,
 				34F4072E1E9E1AFF00E57AC0 /* BannersCache.swift in Sources */,
 				34D3B0201E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.mm in Sources */,
 				F6E2FE481E097BA00083EBEC /* MWMPlacePageData.mm in Sources */,
 				3404754F1E081A4600C92850 /* fabric_logging_ios.mm in Sources */,
-				34C5B81B1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift in Sources */,
 				348F8A521F863B6100060C2A /* UGCReview.swift in Sources */,
 				34ABA6281C2D567B00FE1BEC /* MWMInputLoginValidator.mm in Sources */,
 				34F4073D1E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm in Sources */,
@@ -5888,13 +5976,16 @@
 				F6E2FF081E097BA00083EBEC /* MWMSearchHistoryManager.mm in Sources */,
 				F63AF50A1EA6213F00A1DB98 /* FilterRatingCell.swift in Sources */,
 				F6E2FD8E1E097BA00083EBEC /* MWMNoMapsViewController.mm in Sources */,
+				34AB666A1FC5AA330078E451 /* TransportTransitCell.swift in Sources */,
 				340708641F2905A500029ECC /* NavigationInfoArea.swift in Sources */,
+				34AB66461FC5AA330078E451 /* RouteManagerTableView.swift in Sources */,
 				34D3B0411E389D05004100F9 /* MWMEditorTextTableViewCell.mm in Sources */,
 				3404163B1E7BDFE000E2B6D6 /* PhotosViewController.swift in Sources */,
 				F6E2FE601E097BA00083EBEC /* MWMBookmarkCell.mm in Sources */,
 				F6E2FEA21E097BA00083EBEC /* MWMPPView.mm in Sources */,
 				F6791B131C43DEA7007A8A6E /* MWMStartButton.mm in Sources */,
 				343F5A821FB6102A007DF002 /* MWMPlatform.mm in Sources */,
+				34AB662B1FC5AA330078E451 /* RouteManagerViewModel.swift in Sources */,
 				46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */,
 				EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */,
 				F61579341AC2CE9A0032D8E9 /* MWMRateAlert.mm in Sources */,
@@ -5909,20 +6000,20 @@
 				F6E2FD641E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */,
 				3454D7C41E07F045004AF2AD /* UIButton+Orientation.mm in Sources */,
 				F6E2FF2C1E097BA00083EBEC /* MWMSearchCell.mm in Sources */,
+				34AB66821FC5AA330078E451 /* NavigationAddPointToastView.swift in Sources */,
 				F6588E2C1B15C26700EE1E58 /* MWMTextView.mm in Sources */,
 				3454D7E51E07F045004AF2AD /* UIView+RuntimeAttributes.mm in Sources */,
 				34FE4C451BCC013500066718 /* MWMMapWidgets.mm in Sources */,
 				34763F061F3092E700F4D2D3 /* String+Format.swift in Sources */,
 				F6E2FE4B1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */,
 				346DB8391E5C4F6700E3123E /* GalleryItemModel.swift in Sources */,
-				34D7F3411F33903F001D5ED5 /* RouteManagerHeaderView.swift in Sources */,
 				3404757D1E081B3300C92850 /* iosOGLContext.mm in Sources */,
 				34D3AFF11E37945B004100F9 /* UITableView+Cells.swift in Sources */,
 				34D3B02F1E389D05004100F9 /* MWMEditorCategoryCell.mm in Sources */,
 				F6E2FD5B1E097BA00083EBEC /* MWMMapDownloaderCellHeader.mm in Sources */,
 				340475611E081A4600C92850 /* MWMNetworkPolicy.mm in Sources */,
 				342EE4111C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */,
-				3407084F1F28EDD100029ECC /* RoutePreviewTaxiCell.swift in Sources */,
+				34AB667C1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */,
 				F6E2FEE41E097BA00083EBEC /* MWMSearchNoResults.mm in Sources */,
 				F6E2FF621E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */,
 				F64D9C9F1C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */,
@@ -5934,16 +6025,15 @@
 				3454D7D31E07F045004AF2AD /* UIImageView+Coloring.mm in Sources */,
 				3463BA661DE81DB90082417F /* MWMTrafficButtonViewController.mm in Sources */,
 				F6BBF2C61B4FFB72000CF8E2 /* MWMLocationAlert.mm in Sources */,
+				34AB66041FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */,
 				F6E2FDA01E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */,
 				F6FE3C381CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */,
 				F64F19991AB81A00006EAF7E /* MWMAlertViewController.mm in Sources */,
 				F6E2FE541E097BA00083EBEC /* MWMPlacePageActionBar.mm in Sources */,
 				34C9BD091C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */,
-				340708431F28ED2D00029ECC /* MWMRoutePreview.mm in Sources */,
 				34D3B0171E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.swift in Sources */,
 				346DB8271E5C4F6700E3123E /* GalleryCell.swift in Sources */,
 				3406FA151C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm in Sources */,
-				342360A21F34840500AFE44D /* RouteManagerDimView.swift in Sources */,
 				F6E2FECC1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */,
 				F6E2FF111E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */,
 				34C9BD021C6DB693000DC38D /* MWMTableViewController.mm in Sources */,
@@ -5953,6 +6043,7 @@
 				34BBD6571F826F810070CA50 /* AuthorizationTransitioningManager.swift in Sources */,
 				34F4073A1E9E1AFF00E57AC0 /* MopubBanner.swift in Sources */,
 				34943BB61E26222300B14F84 /* WelcomeProtocol.swift in Sources */,
+				34AB66491FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */,
 				F6E2FD5E1E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm in Sources */,
 				F6558DA11E642CC0002203AE /* MWMFacilitiesController.mm in Sources */,
 				347E1A881F1F5DD7002BF7A8 /* CianItemModel.swift in Sources */,
@@ -5961,35 +6052,38 @@
 				F6E2FF261E097BA00083EBEC /* MWMSearchTabButtonsView.mm in Sources */,
 				F6E2FF441E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */,
 				F607C18E1C047FDC00B53A87 /* MWMSegue.mm in Sources */,
+				34AB664F1FC5AA330078E451 /* RoutePreviewTaxiCell.swift in Sources */,
 				F6E2FE301E097BA00083EBEC /* MWMStreetEditorViewController.mm in Sources */,
 				340416471E7BF28E00E2B6D6 /* UIView+Snapshot.swift in Sources */,
 				F6E2FE271E097BA00083EBEC /* MWMOpeningHoursSection.mm in Sources */,
 				34F407341E9E1AFF00E57AC0 /* CoreBanner.swift in Sources */,
 				F6E2FE241E097BA00083EBEC /* MWMOpeningHoursModel.mm in Sources */,
-				342360A71F34906700AFE44D /* RouteManagerCell.swift in Sources */,
 				34D3B0351E389D05004100F9 /* MWMEditorSelectTableViewCell.mm in Sources */,
 				F6E2FD8B1E097BA00083EBEC /* MWMNoMapsView.mm in Sources */,
+				34AB66731FC5AA330078E451 /* BaseRoutePreviewStatus.swift in Sources */,
 				F6E2FD701E097BA00083EBEC /* MWMMapDownloaderTableViewCell.mm in Sources */,
 				347039A81FB9A5CF00E47496 /* MWMBookmarksManager.mm in Sources */,
 				F6E2FE4E1E097BA00083EBEC /* MWMActionBarButton.mm in Sources */,
 				34BF0CC61C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */,
 				349D1CE31E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */,
 				34574A661E3B85F80061E839 /* ThemeManager.swift in Sources */,
+				34AB664C1FC5AA330078E451 /* RouteManagerFooterView.swift in Sources */,
 				340475521E081A4600C92850 /* MWMCustomFacebookEvents.mm in Sources */,
 				F6E2FD761E097BA00083EBEC /* MWMMapDownloaderDataSource.mm in Sources */,
 				F64F4B741B4A45FD0081A24A /* MWMDownloaderDialogHeader.mm in Sources */,
-				34763F021F30749000F4D2D3 /* RoutePreviewStatus.swift in Sources */,
 				349D1AD71E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */,
 				3462258E1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm in Sources */,
 				347BFA8F1F27909200E5531F /* MenuArea.swift in Sources */,
 				F6E2FEBD1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */,
 				343E75971E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */,
 				3454D7DF1E07F045004AF2AD /* UITextField+RuntimeAttributes.mm in Sources */,
+				34AB66071FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */,
 				34E776131F14B17F003040B3 /* AvailableArea.swift in Sources */,
 				3486B50C1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */,
 				F6E2FEF91E097BA00083EBEC /* MWMSearchCategoriesManager.mm in Sources */,
 				F6E2FE421E097BA00083EBEC /* MWMDirectionView.mm in Sources */,
 				F6E2FD551E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.mm in Sources */,
+				34AB66161FC5AA320078E451 /* MWMiPhoneRoutePreview.mm in Sources */,
 				349A357C1B53D4C9009677EE /* MWMCircularProgressView.mm in Sources */,
 				3465E7D81B6658C000854C4D /* MWMAPIBar.mm in Sources */,
 				34AC8FDA1EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */,
@@ -6005,28 +6099,31 @@
 				3444DFD11F17620C00E73099 /* MWMMapWidgetsHelper.mm in Sources */,
 				F6E2FE3C1E097BA00083EBEC /* MWMMigrationViewController.mm in Sources */,
 				F6E2FD4F1E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.mm in Sources */,
+				34AB66761FC5AA330078E451 /* TransportRoutePreviewStatus.swift in Sources */,
 				F6E2FE871E097BA00083EBEC /* MWMPlacePageRegularCell.mm in Sources */,
 				34BBD6631F8270AC0070CA50 /* AuthorizationTransitioning.swift in Sources */,
 				34D3AFE91E378AF1004100F9 /* UINib+Init.swift in Sources */,
 				F6E2FD7F1E097BA00083EBEC /* MWMMapDownloaderExtendedDataSourceWithAds.mm in Sources */,
 				34F407311E9E1AFF00E57AC0 /* BannerType.swift in Sources */,
+				34AB663D1FC5AA330078E451 /* RouteManagerTransitioning.swift in Sources */,
 				34BBD65B1F826FD30070CA50 /* AuthorizationiPhonePresentationController.swift in Sources */,
 				F63AF5121EA6250F00A1DB98 /* FilterCollectionHolderCell.swift in Sources */,
-				F6BD33871B62412E00F2CE18 /* MWMNavigationDashboardEntity.mm in Sources */,
 				FA36B80D15403A4F004560CC /* BookmarksVC.mm in Sources */,
 				349B926C1DF0518E007779DD /* MWMToast.mm in Sources */,
 				3490D2E01CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */,
+				34AB662E1FC5AA330078E451 /* RouteManageriPhonePresentationController.swift in Sources */,
+				34AB661F1FC5AA330078E451 /* RouteStartButton.swift in Sources */,
 				340475491E081A4600C92850 /* AppInfo.mm in Sources */,
 				34F4072B1E9E1AFF00E57AC0 /* Banner.swift in Sources */,
 				F660DEE41EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */,
 				F6E2FDF11E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */,
+				34AB66101FC5AA320078E451 /* NavigationTurnsView.swift in Sources */,
 				F6E2FD821E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */,
 				348A8DF71F66775A00D83026 /* RatingViewDelegate.swift in Sources */,
 				F6664C011E6459DA00E703C2 /* PPReviewHeaderCell.swift in Sources */,
 				3454D7C11E07F045004AF2AD /* NSString+Categories.mm in Sources */,
 				340E1EFA1E2F614400CE49BF /* Storyboard.swift in Sources */,
 				F6E2FE7B1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */,
-				34C5B8131F335BCA005E50B6 /* RouteManagerViewModel.swift in Sources */,
 				34E776321F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */,
 				F6E2FF351E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */,
 				F6E2FE391E097BA00083EBEC /* MWMMigrationView.mm in Sources */,
@@ -6035,16 +6132,15 @@
 				F6381BF51CD12045004CA943 /* LocaleTranslator.mm in Sources */,
 				346DB82D1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */,
 				34E7761E1F14DB48003040B3 /* PlacePageArea.swift in Sources */,
-				34763EFE1F3069BB00F4D2D3 /* RouteStartButton.swift in Sources */,
 				340475551E081A4600C92850 /* Statistics.mm in Sources */,
 				F653CE161C71F60200A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */,
 				3444DFCC1F1760B900E73099 /* WidgetsArea.swift in Sources */,
 				F6E2FE991E097BA00083EBEC /* MWMiPadPlacePageLayoutImpl.mm in Sources */,
 				34D3B03B1E389D05004100F9 /* MWMEditorSwitchTableViewCell.mm in Sources */,
 				3454D7CD1E07F045004AF2AD /* UIFont+MapsMeFonts.mm in Sources */,
+				34AB66401FC5AA330078E451 /* RouteManagerTransitioningManager.swift in Sources */,
 				344532371F6FFE6A0059FBCC /* UGCRating.swift in Sources */,
 				3454D7DC1E07F045004AF2AD /* UISwitch+RuntimeAttributes.m in Sources */,
-				340708501F28EDD100029ECC /* MWMTaxiCollectionLayout.mm in Sources */,
 				F682249A1E5B104600BC1C18 /* PPHotelDescriptionCell.swift in Sources */,
 				F6E2FEC91E097BA00083EBEC /* MWMSearchFilterTransitioning.mm in Sources */,
 				FA054612155C465E001F4E37 /* SelectSetVC.mm in Sources */,
@@ -6053,10 +6149,10 @@
 				F6E2FD6A1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.mm in Sources */,
 				FAA614B8155F16950031C345 /* AddSetVC.mm in Sources */,
 				F6E2FF681E097BA00083EBEC /* MWMUnitsController.mm in Sources */,
-				34AC8FCE1EFC028600E7F910 /* MWMNavigationInfoView.mm in Sources */,
 				34FE5A6E1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */,
 				34ABA6301C2D58F300FE1BEC /* MWMInputEmailValidator.mm in Sources */,
 				F6E2FE9C1E097BA00083EBEC /* MWMiPhonePlacePageLayoutImpl.mm in Sources */,
+				34AB668B1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */,
 				3454D7C71E07F045004AF2AD /* UIButton+RuntimeAttributes.mm in Sources */,
 				FAAEA7D5161D8D3100CCD661 /* BookmarksRootVC.mm in Sources */,
 				3404755E1E081A4600C92850 /* MWMLocationPredictor.mm in Sources */,
@@ -6064,8 +6160,8 @@
 				F6E2FE031E097BA00083EBEC /* MWMOpeningHoursDaysSelectorTableViewCell.mm in Sources */,
 				F6E2FE661E097BA00083EBEC /* MWMPlacePageButtonCell.mm in Sources */,
 				F6E2FE121E097BA00083EBEC /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */,
-				34C5B80F1F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift in Sources */,
 				344532301F6FE5880059FBCC /* UGCSummaryRatingStarsCell.swift in Sources */,
+				34AB66581FC5AA330078E451 /* TransportTransitFlowLayout.swift in Sources */,
 				340837131B7243CE00B5C185 /* MWMActivityViewController.mm in Sources */,
 				3486B5181E27AD3B0069C126 /* MWMFrameworkListener.mm in Sources */,
 				3404756A1E081A4600C92850 /* MWMSearch+CoreSpotlight.mm in Sources */,
@@ -6076,31 +6172,29 @@
 				F6E2FF4D1E097BA00083EBEC /* MWMAboutController.mm in Sources */,
 				34F5E0D31E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */,
 				34F407371E9E1AFF00E57AC0 /* FacebookBanner.swift in Sources */,
-				340708601F28FE2800029ECC /* MWMiPadRoutePreview.mm in Sources */,
-				3497A93A1B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm in Sources */,
 				F6E2FED81E097BA00083EBEC /* MWMSearchContentView.mm in Sources */,
 				F6E2FD881E097BA00083EBEC /* MWMMapDownloaderViewController.mm in Sources */,
 				34BC72241B0DECAE0012A34B /* MWMMapViewControlsManager.mm in Sources */,
-				34C5B8231F336DF5005E50B6 /* RouteManagerTransitioning.swift in Sources */,
+				34AB66311FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */,
 				F6E2FF4A1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */,
-				3407087B1F2B6F5200029ECC /* NavigationControlView.swift in Sources */,
 				34F1ADD21F6BC09E001CE79D /* PPPReview.swift in Sources */,
 				3470402F1EA6470700038379 /* BorderedButton.swift in Sources */,
 				F6E2FE781E097BA00083EBEC /* MWMOpeningHoursLayoutHelper.mm in Sources */,
 				F6BD1D201CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */,
 				F6B97B261CD0CA990009B612 /* MWMBookmarkNameCell.mm in Sources */,
 				34BBD65F1F8270360070CA50 /* AuthorizationiPadPresentationController.swift in Sources */,
-				349993FA1F388F970064CFBE /* RouteManageriPadPresentationController.swift in Sources */,
 				F6E2FD7C1E097BA00083EBEC /* MWMMapDownloaderExtendedDataSource.mm in Sources */,
 				F6E2FED21E097BA00083EBEC /* MWMSearchHotelsFilterViewController.mm in Sources */,
 				34ABA6201C2D517500FE1BEC /* MWMInputValidator.mm in Sources */,
 				3477528F1F7251C7000D46A3 /* UGCAddReviewTextCell.swift in Sources */,
 				34E50DEF1F6FCC41008EED49 /* UGCYourReviewCell.swift in Sources */,
+				34AB66371FC5AA330078E451 /* RouteManagerCell.swift in Sources */,
 				F6E2FF231E097BA00083EBEC /* MWMSearchTabbedViewLayout.mm in Sources */,
 				F6E2FF1D1E097BA00083EBEC /* MWMSearchTabbedViewController.mm in Sources */,
 				F6E2FF2F1E097BA00083EBEC /* MWMSearchCommonCell.mm in Sources */,
 				F6E2FE9F1E097BA00083EBEC /* MWMPlacePageLayout.mm in Sources */,
 				F6E2FEC31E097BA00083EBEC /* MWMSearchFilterPresentationController.mm in Sources */,
+				34AB66611FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */,
 				340475731E081A4600C92850 /* MWMStorage.mm in Sources */,
 				34763EE61F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */,
 				340416531E7C09C200E2B6D6 /* PhotoScalingView.swift in Sources */,
@@ -6117,12 +6211,14 @@
 				344BEAF51F66BDC30045DC45 /* RatingSummaryViewSettings.swift in Sources */,
 				F63AF5051EA6162400A1DB98 /* FilterTypeCell.swift in Sources */,
 				F6E2FDA31E097BA00083EBEC /* MWMCuisineEditorViewController.mm in Sources */,
+				34AB66191FC5AA330078E451 /* MWMTaxiCollectionLayout.mm in Sources */,
 				347752871F725002000D46A3 /* UGCAddReviewRatingCell.swift in Sources */,
+				34AB66851FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */,
 				345C2F891F86361B009DB8B4 /* MWMUGCViewModel.mm in Sources */,
 				346EDADB1B9F0E35004F8DB5 /* MWMMultilineLabel.mm in Sources */,
 				34D3B0291E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.mm in Sources */,
-				34E776261F14FE77003040B3 /* NavigationStreetNameView.swift in Sources */,
 				34926BE61EA4C2A700DCF14C /* SearchBanners.swift in Sources */,
+				34B127E91FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */,
 				34D4FA621E26572D003F53EF /* FirstLaunchController.swift in Sources */,
 				34C9BD041C6DB693000DC38D /* MWMViewController.mm in Sources */,
 				347E03991FAC5F1D00426032 /* UIWindow+InputLanguage.swift in Sources */,
@@ -6131,11 +6227,10 @@
 				34E50DDF1F6FCBA1008EED49 /* UGCAddReviewCell.swift in Sources */,
 				3404756D1E081A4600C92850 /* MWMSearch.mm in Sources */,
 				3486B5071E27A4B50069C126 /* LocalNotificationManager.mm in Sources */,
-				3423609E1F34787F00AFE44D /* RouteManagerTableView.swift in Sources */,
 				F6E2FEFC1E097BA00083EBEC /* MWMSearchCategoryCell.mm in Sources */,
+				34AB66431FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */,
 				3454D7CA1E07F045004AF2AD /* UIColor+MapsMeColor.mm in Sources */,
 				3454D7BE1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */,
-				34E7762A1F150AFD003040B3 /* NavigationTurnsView.swift in Sources */,
 				34D3B0471E389D05004100F9 /* MWMNoteCell.mm in Sources */,
 				F626D52E1C3E6CAA00C17D15 /* MWMTableViewCell.mm in Sources */,
 				F6E2FE961E097BA00083EBEC /* ContextViews.mm in Sources */,
@@ -6147,6 +6242,7 @@
 				F63774EA1B59376F00BCF54D /* MWMRoutingDisclaimerAlert.mm in Sources */,
 				340475081E08199E00C92850 /* MWMMyTarget.mm in Sources */,
 				3404164F1E7C085F00E2B6D6 /* PhotoViewController.swift in Sources */,
+				34AB66281FC5AA330078E451 /* RouteManagerViewController.swift in Sources */,
 				F64F19A31AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm in Sources */,
 				3404754C1E081A4600C92850 /* MWMKeyboard.mm in Sources */,
 				3457C4251F680F1900028233 /* String+BoundingRect.swift in Sources */,
@@ -6154,6 +6250,8 @@
 				3430291C1F87BF4400D0A07C /* ReviewsViewController.swift in Sources */,
 				34AB39C11D2BD8310021857D /* MWMStopButton.mm in Sources */,
 				F69CE8D51E5C49B4002B5881 /* PPHotelCarouselCell.swift in Sources */,
+				34AB66881FC5AA330078E451 /* NavigationControlView.swift in Sources */,
+				34AB661C1FC5AA330078E451 /* MWMTaxiPreviewDataSource.mm in Sources */,
 				F6E2FF5F1E097BA00083EBEC /* MWMSettingsViewController.mm in Sources */,
 				F6E2FE2A1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.mm in Sources */,
 				34EE259D1EFA682D00F870AB /* PPViatorCarouselCell.swift in Sources */,
@@ -6167,12 +6265,11 @@
 				34C0A69C1F4C1B380007CE5B /* GoogleNativeBanner.swift in Sources */,
 				F64F199B1AB81A00006EAF7E /* MWMAlert.mm in Sources */,
 				3488B0191E9D0B230068AFD8 /* UIColor+Modifications.swift in Sources */,
-				34AC8FD01EFC028600E7F910 /* NavigationAddPointToastView.swift in Sources */,
 				ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */,
 				34E50DD71F6FCAB1008EED49 /* UGCSummaryRatingCell.swift in Sources */,
 				F6E2FF561E097BA00083EBEC /* MWMMobileInternetViewController.mm in Sources */,
 				340416431E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift in Sources */,
-				3407084E1F28EDD100029ECC /* MWMTaxiPreviewDataSource.mm in Sources */,
+				34AB66251FC5AA330078E451 /* RouteManagerDimView.swift in Sources */,
 				ED48BBBA17C2B1E2003E7E92 /* CircleView.mm in Sources */,
 				F6E2FEEA1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */,
 				F6664C121E645A4100E703C2 /* MWMPPReviewCell.mm in Sources */,
@@ -6183,12 +6280,13 @@
 				349FC54A1F680DAE00968C9F /* ExpandableTextViewSettings.swift in Sources */,
 				F6E2FD9D1E097BA00083EBEC /* MWMEditBookmarkController.mm in Sources */,
 				F6E2FE091E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */,
+				34AB66521FC5AA330078E451 /* MWMiPadRoutePreview.mm in Sources */,
 				3454D7E21E07F045004AF2AD /* UITextView+RuntimeAttributes.mm in Sources */,
-				340708841F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm in Sources */,
 				34D15BA81BD8F93C00C8BCBE /* AddSetTableViewCell.mm in Sources */,
 				F6E2FED51E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */,
 				F6A218491CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */,
 				34845DB21E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
+				34AB660A1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6197,25 +6295,25 @@
 			buildActionMask = 2147483647;
 			files = (
 				34845DB71E166084003D55B9 /* Common.swift in Sources */,
-				349993FE1F388F970064CFBE /* RouteManageriPhonePresentationController.swift in Sources */,
 				344BEAF31F66BDC30045DC45 /* RatingSummaryView.swift in Sources */,
 				6741A9A31BF340DE002C974C /* main.mm in Sources */,
 				34D3B04F1E38A20C004100F9 /* Bundle+Init.swift in Sources */,
+				34AB666E1FC5AA330078E451 /* TransportTransitStepsCollectionView.swift in Sources */,
 				F6E2FF541E097BA00083EBEC /* MWMHelpController.mm in Sources */,
-				342360941F3456E200AFE44D /* RouteManagerViewController.swift in Sources */,
 				349FC5481F680DAE00968C9F /* ExpandableTextView.swift in Sources */,
 				F6E2FF5A1E097BA00083EBEC /* MWMNightModeController.mm in Sources */,
-				340708581F28F1F000029ECC /* MWMTaxiCollectionLayout.mm in Sources */,
 				6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */,
 				3408963F1F83CEDE00BC7117 /* MWMAuthorizationViewModel.mm in Sources */,
 				F6E2FE1F1E097BA00083EBEC /* MWMOpeningHoursCommon.mm in Sources */,
 				3454D7B91E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */,
 				F6E2FF5D1E097BA00083EBEC /* MWMRecentTrackSettingsController.mm in Sources */,
+				34AB66651FC5AA330078E451 /* TransportTransitTrain.swift in Sources */,
 				343064411E9FDC7300DC7665 /* SearchIndex.swift in Sources */,
 				F6664BFA1E6459CB00E703C2 /* PPFacilityCell.swift in Sources */,
 				347E1A8E1F1F71F1002BF7A8 /* PPCianCarouselCell.swift in Sources */,
 				F6E2FDE91E097BA00083EBEC /* MWMObjectsCategorySelectorController.mm in Sources */,
 				6741A9A81BF340DE002C974C /* MWMFacebookAlert.mm in Sources */,
+				34AB665F1FC5AA330078E451 /* TransportTransitIntermediatePoint.swift in Sources */,
 				348A8DF51F66775A00D83026 /* RatingView.swift in Sources */,
 				F63AF50F1EA6215100A1DB98 /* FilterPriceCategoryCell.swift in Sources */,
 				34D3AFF61E37A36A004100F9 /* UICollectionView+Cells.swift in Sources */,
@@ -6224,21 +6322,19 @@
 				3490D2DF1CE9DD2500D0B838 /* MWMSideButtons.mm in Sources */,
 				F6E2FDF81E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */,
 				340B33C61F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */,
-				34763EF31F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm in Sources */,
 				F6E2FE191E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */,
 				F6E2FDEC1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */,
 				34BBD64C1F826DB10070CA50 /* AuthorizationViewController.swift in Sources */,
 				F6E2FE101E097BA00083EBEC /* MWMOpeningHoursTableViewCell.mm in Sources */,
 				6741A9B01BF340DE002C974C /* MapsAppDelegate.mm in Sources */,
-				3423609B1F34585A00AFE44D /* RouteManagerFooterView.swift in Sources */,
 				34F742321E0834F400AC1FD6 /* UIViewController+Navigation.mm in Sources */,
 				340475811E081B3300C92850 /* iosOGLContextFactory.mm in Sources */,
+				34AB66561FC5AA330078E451 /* TransportTransitPedestrian.swift in Sources */,
 				6741A9B11BF340DE002C974C /* MWMAPIBarView.mm in Sources */,
 				34F4072F1E9E1AFF00E57AC0 /* BannersCache.swift in Sources */,
 				34D3B0211E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.mm in Sources */,
 				3486B51E1E27AD590069C126 /* MWMFrameworkHelper.mm in Sources */,
 				F6E2FE491E097BA00083EBEC /* MWMPlacePageData.mm in Sources */,
-				34C5B81C1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift in Sources */,
 				348F8A531F863B6100060C2A /* UGCReview.swift in Sources */,
 				340475501E081A4600C92850 /* fabric_logging_ios.mm in Sources */,
 				34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm in Sources */,
@@ -6253,13 +6349,16 @@
 				F63AF50B1EA6213F00A1DB98 /* FilterRatingCell.swift in Sources */,
 				34D3B0421E389D05004100F9 /* MWMEditorTextTableViewCell.mm in Sources */,
 				340708651F2905A500029ECC /* NavigationInfoArea.swift in Sources */,
+				34AB666B1FC5AA330078E451 /* TransportTransitCell.swift in Sources */,
 				3404163C1E7BDFE000E2B6D6 /* PhotosViewController.swift in Sources */,
+				34AB66471FC5AA330078E451 /* RouteManagerTableView.swift in Sources */,
 				F6E2FE611E097BA00083EBEC /* MWMBookmarkCell.mm in Sources */,
 				F6E2FEA31E097BA00083EBEC /* MWMPPView.mm in Sources */,
 				3454D7D11E07F045004AF2AD /* UIImage+RGBAData.mm in Sources */,
 				6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */,
 				343F5A831FB6102A007DF002 /* MWMPlatform.mm in Sources */,
 				6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */,
+				34AB662C1FC5AA330078E451 /* RouteManagerViewModel.swift in Sources */,
 				6741A9B91BF340DE002C974C /* MWMRateAlert.mm in Sources */,
 				349D1ABC1E2D05EF004A2006 /* SearchBar.swift in Sources */,
 				F6E2FD7A1E097BA00083EBEC /* MWMMapDownloaderDefaultDataSource.mm in Sources */,
@@ -6274,12 +6373,12 @@
 				F6E2FF2D1E097BA00083EBEC /* MWMSearchCell.mm in Sources */,
 				3454D7C51E07F045004AF2AD /* UIButton+Orientation.mm in Sources */,
 				3454D7E61E07F045004AF2AD /* UIView+RuntimeAttributes.mm in Sources */,
+				34AB66831FC5AA330078E451 /* NavigationAddPointToastView.swift in Sources */,
 				F6E2FE4C1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */,
 				3404757E1E081B3300C92850 /* iosOGLContext.mm in Sources */,
 				34763F071F3092E700F4D2D3 /* String+Format.swift in Sources */,
 				346DB83A1E5C4F6700E3123E /* GalleryItemModel.swift in Sources */,
 				F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.mm in Sources */,
-				34D7F3421F33903F001D5ED5 /* RouteManagerHeaderView.swift in Sources */,
 				34D3AFF21E37945B004100F9 /* UITableView+Cells.swift in Sources */,
 				34D3B0301E389D05004100F9 /* MWMEditorCategoryCell.mm in Sources */,
 				F653CE191C71F62700A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */,
@@ -6287,6 +6386,7 @@
 				F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.mm in Sources */,
 				F6E2FF631E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */,
 				342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */,
+				34AB667D1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */,
 				34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */,
 				F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */,
 				F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */,
@@ -6298,6 +6398,7 @@
 				3454D7D41E07F045004AF2AD /* UIImageView+Coloring.mm in Sources */,
 				3463BA671DE81DB90082417F /* MWMTrafficButtonViewController.mm in Sources */,
 				F6E2FE551E097BA00083EBEC /* MWMPlacePageActionBar.mm in Sources */,
+				34AB66051FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */,
 				34ABA6171C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */,
 				6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */,
 				F6E2FECD1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */,
@@ -6307,7 +6408,6 @@
 				F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */,
 				F6E2FDFE1E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.mm in Sources */,
 				F6E2FEDC1E097BA00083EBEC /* MWMSearchManager+Filter.mm in Sources */,
-				342360A31F34840500AFE44D /* RouteManagerDimView.swift in Sources */,
 				346DB8341E5C4F6700E3123E /* GalleryViewController.swift in Sources */,
 				34943BB71E26222300B14F84 /* WelcomeProtocol.swift in Sources */,
 				F6E2FD5F1E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm in Sources */,
@@ -6316,6 +6416,7 @@
 				F6E2FF271E097BA00083EBEC /* MWMSearchTabButtonsView.mm in Sources */,
 				34BBD6581F826F810070CA50 /* AuthorizationTransitioningManager.swift in Sources */,
 				F6558DA21E642CC0002203AE /* MWMFacilitiesController.mm in Sources */,
+				34AB664A1FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */,
 				349D1ACF1E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm in Sources */,
 				347E1A891F1F5DD7002BF7A8 /* CianItemModel.swift in Sources */,
 				F6E2FF451E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */,
@@ -6324,35 +6425,38 @@
 				F6E2FE281E097BA00083EBEC /* MWMOpeningHoursSection.mm in Sources */,
 				3406FA161C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm in Sources */,
 				340416481E7BF28E00E2B6D6 /* UIView+Snapshot.swift in Sources */,
+				34AB66501FC5AA330078E451 /* RoutePreviewTaxiCell.swift in Sources */,
 				F6E2FE251E097BA00083EBEC /* MWMOpeningHoursModel.mm in Sources */,
 				34F407351E9E1AFF00E57AC0 /* CoreBanner.swift in Sources */,
 				34C9BD031C6DB693000DC38D /* MWMTableViewController.mm in Sources */,
 				F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.mm in Sources */,
 				34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.mm in Sources */,
 				F6E2FD711E097BA00083EBEC /* MWMMapDownloaderTableViewCell.mm in Sources */,
-				342360A81F34906700AFE44D /* RouteManagerCell.swift in Sources */,
 				F6E2FE4F1E097BA00083EBEC /* MWMActionBarButton.mm in Sources */,
+				34AB66741FC5AA330078E451 /* BaseRoutePreviewStatus.swift in Sources */,
 				340475531E081A4600C92850 /* MWMCustomFacebookEvents.mm in Sources */,
 				349D1CE41E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */,
 				347039A91FB9A5CF00E47496 /* MWMBookmarksManager.mm in Sources */,
 				F692F3831EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */,
 				34574A671E3B85F80061E839 /* ThemeManager.swift in Sources */,
 				34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */,
+				34AB664D1FC5AA330078E451 /* RouteManagerFooterView.swift in Sources */,
 				F6E2FD771E097BA00083EBEC /* MWMMapDownloaderDataSource.mm in Sources */,
 				6741A9E01BF340DE002C974C /* MWMDownloaderDialogHeader.mm in Sources */,
 				349D1AD81E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */,
 				F6E2FEBE1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */,
-				34763F031F30749000F4D2D3 /* RoutePreviewStatus.swift in Sources */,
 				3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.mm in Sources */,
 				347BFA901F27909200E5531F /* MenuArea.swift in Sources */,
 				343E75981E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */,
 				F6E2FEFA1E097BA00083EBEC /* MWMSearchCategoriesManager.mm in Sources */,
 				34E776141F14B17F003040B3 /* AvailableArea.swift in Sources */,
+				34AB66081FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */,
 				F6664C131E645A4100E703C2 /* MWMPPReviewCell.mm in Sources */,
 				F6E2FE431E097BA00083EBEC /* MWMDirectionView.mm in Sources */,
 				3486B50D1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */,
 				F6E2FD561E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.mm in Sources */,
 				3462258F1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm in Sources */,
+				34AB66171FC5AA320078E451 /* MWMiPhoneRoutePreview.mm in Sources */,
 				6741A9E71BF340DE002C974C /* MWMCircularProgressView.mm in Sources */,
 				34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */,
 				F6E2FD981E097BA00083EBEC /* MWMBookmarkTitleCell.m in Sources */,
@@ -6366,31 +6470,32 @@
 				3444DFD21F17620C00E73099 /* MWMMapWidgetsHelper.mm in Sources */,
 				348A8DFB1F66775A00D83026 /* RatingViewSettings.swift in Sources */,
 				F6E2FE3D1E097BA00083EBEC /* MWMMigrationViewController.mm in Sources */,
-				340708561F28F1E900029ECC /* MWMRoutePreview.mm in Sources */,
 				F6E2FD501E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.mm in Sources */,
 				F6E2FE881E097BA00083EBEC /* MWMPlacePageRegularCell.mm in Sources */,
+				34AB66771FC5AA330078E451 /* TransportRoutePreviewStatus.swift in Sources */,
 				F6E2FD801E097BA00083EBEC /* MWMMapDownloaderExtendedDataSourceWithAds.mm in Sources */,
 				34BBD6641F8270AC0070CA50 /* AuthorizationTransitioning.swift in Sources */,
 				34D3AFEA1E378AF1004100F9 /* UINib+Init.swift in Sources */,
 				34F407321E9E1AFF00E57AC0 /* BannerType.swift in Sources */,
 				F63AF5131EA6250F00A1DB98 /* FilterCollectionHolderCell.swift in Sources */,
+				34AB663E1FC5AA330078E451 /* RouteManagerTransitioning.swift in Sources */,
 				34BBD65C1F826FD30070CA50 /* AuthorizationiPhonePresentationController.swift in Sources */,
-				6741A9F11BF340DE002C974C /* MWMNavigationDashboardEntity.mm in Sources */,
 				56C74C391C74A3BC00B71B9F /* MWMInputEmailValidator.mm in Sources */,
 				6741A9F51BF340DE002C974C /* BookmarksVC.mm in Sources */,
 				349B926D1DF0518E007779DD /* MWMToast.mm in Sources */,
 				3404754A1E081A4600C92850 /* AppInfo.mm in Sources */,
+				34AB662F1FC5AA330078E451 /* RouteManageriPhonePresentationController.swift in Sources */,
+				34AB66201FC5AA330078E451 /* RouteStartButton.swift in Sources */,
 				34F4072C1E9E1AFF00E57AC0 /* Banner.swift in Sources */,
 				F660DEE51EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */,
 				F6E2FDF21E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */,
 				F6E2FD831E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */,
-				3407085C1F28F27100029ECC /* RoutePreviewTaxiCell.swift in Sources */,
+				34AB66111FC5AA320078E451 /* NavigationTurnsView.swift in Sources */,
 				348A8DF81F66775A00D83026 /* RatingViewDelegate.swift in Sources */,
 				3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */,
 				F6664C021E6459DA00E703C2 /* PPReviewHeaderCell.swift in Sources */,
 				F6E2FE7C1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */,
 				340E1EFB1E2F614400CE49BF /* Storyboard.swift in Sources */,
-				34C5B8141F335BCA005E50B6 /* RouteManagerViewModel.swift in Sources */,
 				34E776331F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */,
 				F6E2FF361E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */,
 				F6E2FE3A1E097BA00083EBEC /* MWMMigrationView.mm in Sources */,
@@ -6399,7 +6504,6 @@
 				3454D7C21E07F045004AF2AD /* NSString+Categories.mm in Sources */,
 				6741A9FE1BF340DE002C974C /* SelectSetVC.mm in Sources */,
 				34E7761F1F14DB48003040B3 /* PlacePageArea.swift in Sources */,
-				34763EFF1F3069BB00F4D2D3 /* RouteStartButton.swift in Sources */,
 				346DB82E1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */,
 				340475561E081A4600C92850 /* Statistics.mm in Sources */,
 				F6381BF61CD12045004CA943 /* LocaleTranslator.mm in Sources */,
@@ -6407,6 +6511,7 @@
 				F6E2FE9A1E097BA00083EBEC /* MWMiPadPlacePageLayoutImpl.mm in Sources */,
 				34D3B03C1E389D05004100F9 /* MWMEditorSwitchTableViewCell.mm in Sources */,
 				344532381F6FFE6A0059FBCC /* UGCRating.swift in Sources */,
+				34AB66411FC5AA330078E451 /* RouteManagerTransitioningManager.swift in Sources */,
 				6741A9FF1BF340DE002C974C /* AddSetVC.mm in Sources */,
 				3454D7CE1E07F045004AF2AD /* UIFont+MapsMeFonts.mm in Sources */,
 				F682249B1E5B104600BC1C18 /* PPHotelDescriptionCell.swift in Sources */,
@@ -6416,21 +6521,20 @@
 				F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.mm in Sources */,
 				F6E2FD6B1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.mm in Sources */,
 				6741AA021BF340DE002C974C /* BookmarksRootVC.mm in Sources */,
-				34AC8FD31EFC02CC00E7F910 /* MWMNavigationInfoView.mm in Sources */,
 				34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */,
 				F6E2FF691E097BA00083EBEC /* MWMUnitsController.mm in Sources */,
 				6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */,
 				F6E2FE9D1E097BA00083EBEC /* MWMiPhonePlacePageLayoutImpl.mm in Sources */,
+				34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */,
 				3454D7C81E07F045004AF2AD /* UIButton+RuntimeAttributes.mm in Sources */,
-				6741AA041BF340DE002C974C /* MWMNavigationDashboardManager.mm in Sources */,
 				3488B0131E9D0AEC0068AFD8 /* AdBanner.swift in Sources */,
 				3404755F1E081A4600C92850 /* MWMLocationPredictor.mm in Sources */,
 				F6E2FE041E097BA00083EBEC /* MWMOpeningHoursDaysSelectorTableViewCell.mm in Sources */,
 				F6E2FE671E097BA00083EBEC /* MWMPlacePageButtonCell.mm in Sources */,
 				F6E2FE131E097BA00083EBEC /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */,
-				34C5B8101F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift in Sources */,
 				344532311F6FE5880059FBCC /* UGCSummaryRatingStarsCell.swift in Sources */,
 				F626D52F1C3E83F800C17D15 /* MWMTableViewCell.mm in Sources */,
+				34AB66591FC5AA330078E451 /* TransportTransitFlowLayout.swift in Sources */,
 				3486B5191E27AD3B0069C126 /* MWMFrameworkListener.mm in Sources */,
 				3404756B1E081A4600C92850 /* MWMSearch+CoreSpotlight.mm in Sources */,
 				34065A111F45E7F8006684E5 /* GoogleFallbackBanner.swift in Sources */,
@@ -6439,32 +6543,31 @@
 				3454D7BC1E07F045004AF2AD /* CLLocation+Mercator.mm in Sources */,
 				F6E2FF4E1E097BA00083EBEC /* MWMAboutController.mm in Sources */,
 				34F407381E9E1AFF00E57AC0 /* FacebookBanner.swift in Sources */,
-				340708611F28FE2800029ECC /* MWMiPadRoutePreview.mm in Sources */,
 				34F5E0D41E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */,
 				6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */,
 				F6E2FED91E097BA00083EBEC /* MWMSearchContentView.mm in Sources */,
 				F6E2FD891E097BA00083EBEC /* MWMMapDownloaderViewController.mm in Sources */,
 				F6BD1D211CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */,
-				34C5B8241F336DF5005E50B6 /* RouteManagerTransitioning.swift in Sources */,
+				34AB66321FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */,
 				347040301EA6470700038379 /* BorderedButton.swift in Sources */,
-				3407087C1F2B6F5200029ECC /* NavigationControlView.swift in Sources */,
 				34F1ADD31F6BC09E001CE79D /* PPPReview.swift in Sources */,
 				F6E2FF4B1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */,
 				F6E2FE791E097BA00083EBEC /* MWMOpeningHoursLayoutHelper.mm in Sources */,
 				F6B97B271CD0CA990009B612 /* MWMBookmarkNameCell.mm in Sources */,
 				34ABA6211C2D517500FE1BEC /* MWMInputValidator.mm in Sources */,
 				34BBD6601F8270360070CA50 /* AuthorizationiPadPresentationController.swift in Sources */,
-				349993FB1F388F970064CFBE /* RouteManageriPadPresentationController.swift in Sources */,
 				F6E2FD7D1E097BA00083EBEC /* MWMMapDownloaderExtendedDataSource.mm in Sources */,
 				F6E2FED31E097BA00083EBEC /* MWMSearchHotelsFilterViewController.mm in Sources */,
 				340475741E081A4600C92850 /* MWMStorage.mm in Sources */,
 				347752901F7251C7000D46A3 /* UGCAddReviewTextCell.swift in Sources */,
 				34E50DF01F6FCC41008EED49 /* UGCYourReviewCell.swift in Sources */,
+				34AB66381FC5AA330078E451 /* RouteManagerCell.swift in Sources */,
 				F6E2FF241E097BA00083EBEC /* MWMSearchTabbedViewLayout.mm in Sources */,
 				F6E2FF1E1E097BA00083EBEC /* MWMSearchTabbedViewController.mm in Sources */,
 				F6E2FF301E097BA00083EBEC /* MWMSearchCommonCell.mm in Sources */,
 				F6E2FEA01E097BA00083EBEC /* MWMPlacePageLayout.mm in Sources */,
 				F6E2FEC41E097BA00083EBEC /* MWMSearchFilterPresentationController.mm in Sources */,
+				34AB66621FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */,
 				340416541E7C09C200E2B6D6 /* PhotoScalingView.swift in Sources */,
 				34763EE71F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */,
 				34ABA6251C2D551900FE1BEC /* MWMInputValidatorFactory.mm in Sources */,
@@ -6477,16 +6580,17 @@
 				3404164C1E7BF42E00E2B6D6 /* UIView+Coordinates.swift in Sources */,
 				6741AA141BF340DE002C974C /* MWMMultilineLabel.mm in Sources */,
 				349D1ADB1E2E325C004A2006 /* MWMBottomMenuView.mm in Sources */,
-				3407085A1F28F1F400029ECC /* MWMTaxiPreviewDataSource.mm in Sources */,
 				344BEAF61F66BDC30045DC45 /* RatingSummaryViewSettings.swift in Sources */,
 				F6E2FD921E097BA00083EBEC /* MWMBookmarkColorViewController.mm in Sources */,
 				F63AF5061EA6162400A1DB98 /* FilterTypeCell.swift in Sources */,
 				347752881F725002000D46A3 /* UGCAddReviewRatingCell.swift in Sources */,
+				34AB661A1FC5AA330078E451 /* MWMTaxiCollectionLayout.mm in Sources */,
 				345C2F8A1F86361B009DB8B4 /* MWMUGCViewModel.mm in Sources */,
+				34AB66861FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */,
 				34C9BD051C6DB693000DC38D /* MWMViewController.mm in Sources */,
 				F6E2FDA41E097BA00083EBEC /* MWMCuisineEditorViewController.mm in Sources */,
 				3454D7CB1E07F045004AF2AD /* UIColor+MapsMeColor.mm in Sources */,
-				34E776271F14FE77003040B3 /* NavigationStreetNameView.swift in Sources */,
+				34B127EA1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */,
 				34926BE71EA4C2A700DCF14C /* SearchBanners.swift in Sources */,
 				34D3B02A1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.mm in Sources */,
 				347E039A1FAC5F1D00426032 /* UIWindow+InputLanguage.swift in Sources */,
@@ -6495,12 +6599,11 @@
 				34E50DE01F6FCBA1008EED49 /* UGCAddReviewCell.swift in Sources */,
 				34D4FA631E26572D003F53EF /* FirstLaunchController.swift in Sources */,
 				3404756E1E081A4600C92850 /* MWMSearch.mm in Sources */,
-				3423609F1F34787F00AFE44D /* RouteManagerTableView.swift in Sources */,
 				6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.mm in Sources */,
 				F6E2FEFD1E097BA00083EBEC /* MWMSearchCategoryCell.mm in Sources */,
+				34AB66441FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */,
 				3486B5081E27A4B50069C126 /* LocalNotificationManager.mm in Sources */,
 				3454D7BF1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */,
-				34E7762B1F150AFD003040B3 /* NavigationTurnsView.swift in Sources */,
 				6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.mm in Sources */,
 				34D3B0481E389D05004100F9 /* MWMNoteCell.mm in Sources */,
 				F6E2FE971E097BA00083EBEC /* ContextViews.mm in Sources */,
@@ -6512,6 +6615,7 @@
 				340475091E08199E00C92850 /* MWMMyTarget.mm in Sources */,
 				340416501E7C086000E2B6D6 /* PhotoViewController.swift in Sources */,
 				674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */,
+				34AB66291FC5AA330078E451 /* RouteManagerViewController.swift in Sources */,
 				3404754D1E081A4600C92850 /* MWMKeyboard.mm in Sources */,
 				3457C4261F680F1900028233 /* String+BoundingRect.swift in Sources */,
 				34EF94291C05A6F30050B714 /* MWMSegue.mm in Sources */,
@@ -6519,6 +6623,8 @@
 				F6E2FE731E097BA00083EBEC /* MWMOpeningHours.mm in Sources */,
 				F6E2FF601E097BA00083EBEC /* MWMSettingsViewController.mm in Sources */,
 				F6E2FE2B1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.mm in Sources */,
+				34AB66891FC5AA330078E451 /* NavigationControlView.swift in Sources */,
+				34AB661D1FC5AA330078E451 /* MWMTaxiPreviewDataSource.mm in Sources */,
 				F69CE8D61E5C49B4002B5881 /* PPHotelCarouselCell.swift in Sources */,
 				F6FEA82E1C58F108007223CC /* MWMButton.mm in Sources */,
 				3445324E1F714FD70059FBCC /* UGCAddReviewController.swift in Sources */,
@@ -6532,11 +6638,11 @@
 				3454D7D71E07F045004AF2AD /* UIKitCategories.mm in Sources */,
 				34AB39C21D2BD8310021857D /* MWMStopButton.mm in Sources */,
 				3488B01A1E9D0B230068AFD8 /* UIColor+Modifications.swift in Sources */,
-				34AC8FD71EFC02D400E7F910 /* NavigationAddPointToastView.swift in Sources */,
 				34E50DD81F6FCAB1008EED49 /* UGCSummaryRatingCell.swift in Sources */,
 				6741AA281BF340DE002C974C /* MWMAlert.mm in Sources */,
 				F6E2FF571E097BA00083EBEC /* MWMMobileInternetViewController.mm in Sources */,
 				340416441E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift in Sources */,
+				34AB66261FC5AA330078E451 /* RouteManagerDimView.swift in Sources */,
 				6741AA291BF340DE002C974C /* ColorPickerView.mm in Sources */,
 				6741AA2B1BF340DE002C974C /* CircleView.mm in Sources */,
 				F6E2FEEB1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */,
@@ -6547,12 +6653,13 @@
 				349FC54B1F680DAE00968C9F /* ExpandableTextViewSettings.swift in Sources */,
 				F6E2FE0A1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */,
 				3454D7DA1E07F045004AF2AD /* UILabel+RuntimeAttributes.mm in Sources */,
+				34AB66531FC5AA330078E451 /* MWMiPadRoutePreview.mm in Sources */,
 				3454D7E31E07F045004AF2AD /* UITextView+RuntimeAttributes.mm in Sources */,
-				340708851F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm in Sources */,
 				F6A2184A1CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */,
 				F6E2FED61E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */,
 				6741AA2D1BF340DE002C974C /* AddSetTableViewCell.mm in Sources */,
 				34845DB31E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
+				34AB660B1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6561,25 +6668,25 @@
 			buildActionMask = 2147483647;
 			files = (
 				34845DB81E166084003D55B9 /* Common.swift in Sources */,
-				349993FF1F388F970064CFBE /* RouteManageriPhonePresentationController.swift in Sources */,
 				344BEAF41F66BDC30045DC45 /* RatingSummaryView.swift in Sources */,
 				849CF6821DE842290024A8A5 /* main.mm in Sources */,
 				34D3B0501E38A20C004100F9 /* Bundle+Init.swift in Sources */,
+				34AB666F1FC5AA330078E451 /* TransportTransitStepsCollectionView.swift in Sources */,
 				3454D7D51E07F045004AF2AD /* UIImageView+Coloring.mm in Sources */,
-				342360951F3456E200AFE44D /* RouteManagerViewController.swift in Sources */,
 				349FC5491F680DAE00968C9F /* ExpandableTextView.swift in Sources */,
 				F6E2FF551E097BA00083EBEC /* MWMHelpController.mm in Sources */,
-				340708591F28F1F000029ECC /* MWMTaxiCollectionLayout.mm in Sources */,
 				F6E2FF5B1E097BA00083EBEC /* MWMNightModeController.mm in Sources */,
 				340896401F83CEDE00BC7117 /* MWMAuthorizationViewModel.mm in Sources */,
 				849CF6841DE842290024A8A5 /* MWMShareActivityItem.mm in Sources */,
 				F6E2FE201E097BA00083EBEC /* MWMOpeningHoursCommon.mm in Sources */,
 				849CF6891DE842290024A8A5 /* MWMFacebookAlert.mm in Sources */,
+				34AB66661FC5AA330078E451 /* TransportTransitTrain.swift in Sources */,
 				F6E2FF5E1E097BA00083EBEC /* MWMRecentTrackSettingsController.mm in Sources */,
 				343064421E9FDC7300DC7665 /* SearchIndex.swift in Sources */,
 				F6664BFB1E6459CB00E703C2 /* PPFacilityCell.swift in Sources */,
 				347E1A8F1F1F71F1002BF7A8 /* PPCianCarouselCell.swift in Sources */,
 				F6E2FDEA1E097BA00083EBEC /* MWMObjectsCategorySelectorController.mm in Sources */,
+				34AB66601FC5AA330078E451 /* TransportTransitIntermediatePoint.swift in Sources */,
 				849CF68A1DE842290024A8A5 /* MWMDefaultAlert.mm in Sources */,
 				348A8DF61F66775A00D83026 /* RatingView.swift in Sources */,
 				F63AF5101EA6215100A1DB98 /* FilterPriceCategoryCell.swift in Sources */,
@@ -6588,21 +6695,19 @@
 				340708791F2B5D6C00029ECC /* DimBackground.swift in Sources */,
 				845E4B1C1DEC839800D6BED8 /* MWMTrafficButtonViewController.mm in Sources */,
 				340B33C71F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */,
-				34763EF41F2F5F6400F4D2D3 /* MWMiPhoneRoutePreview.mm in Sources */,
 				F6E2FDF91E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */,
 				F6E2FE1A1E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */,
 				F6E2FDED1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */,
 				34BBD64D1F826DB10070CA50 /* AuthorizationViewController.swift in Sources */,
 				F6E2FE111E097BA00083EBEC /* MWMOpeningHoursTableViewCell.mm in Sources */,
-				3423609C1F34585A00AFE44D /* RouteManagerFooterView.swift in Sources */,
 				3404755A1E081A4600C92850 /* WebViewController.mm in Sources */,
 				34F742331E0834F400AC1FD6 /* UIViewController+Navigation.mm in Sources */,
+				34AB66571FC5AA330078E451 /* TransportTransitPedestrian.swift in Sources */,
 				849CF6911DE842290024A8A5 /* MWMSideButtons.mm in Sources */,
 				849CF6971DE842290024A8A5 /* MapsAppDelegate.mm in Sources */,
 				34F407301E9E1AFF00E57AC0 /* BannersCache.swift in Sources */,
 				34D3B0221E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.mm in Sources */,
 				3486B51F1E27AD590069C126 /* MWMFrameworkHelper.mm in Sources */,
-				34C5B81D1F3367E1005E50B6 /* RouteManagerTransitioningManager.swift in Sources */,
 				348F8A541F863B6100060C2A /* UGCReview.swift in Sources */,
 				F6E2FE4A1E097BA00083EBEC /* MWMPlacePageData.mm in Sources */,
 				849CF6981DE842290024A8A5 /* MWMAPIBarView.mm in Sources */,
@@ -6617,13 +6722,16 @@
 				F6E2FD901E097BA00083EBEC /* MWMNoMapsViewController.mm in Sources */,
 				F63AF50C1EA6213F00A1DB98 /* FilterRatingCell.swift in Sources */,
 				340708661F2905A500029ECC /* NavigationInfoArea.swift in Sources */,
+				34AB666C1FC5AA330078E451 /* TransportTransitCell.swift in Sources */,
 				34D3B0431E389D05004100F9 /* MWMEditorTextTableViewCell.mm in Sources */,
+				34AB66481FC5AA330078E451 /* RouteManagerTableView.swift in Sources */,
 				3404163D1E7BDFE000E2B6D6 /* PhotosViewController.swift in Sources */,
 				F6E2FE621E097BA00083EBEC /* MWMBookmarkCell.mm in Sources */,
 				F6E2FEA41E097BA00083EBEC /* MWMPPView.mm in Sources */,
 				849CF69F1DE842290024A8A5 /* MWMStartButton.mm in Sources */,
 				343F5A841FB6102A007DF002 /* MWMPlatform.mm in Sources */,
 				849CF6A01DE842290024A8A5 /* EAGLView.mm in Sources */,
+				34AB662D1FC5AA330078E451 /* RouteManagerViewModel.swift in Sources */,
 				849CF6A21DE842290024A8A5 /* MapViewController.mm in Sources */,
 				3404757F1E081B3300C92850 /* iosOGLContext.mm in Sources */,
 				349D1ABD1E2D05EF004A2006 /* SearchBar.swift in Sources */,
@@ -6638,12 +6746,12 @@
 				F6E2FD661E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */,
 				3454D7D21E07F045004AF2AD /* UIImage+RGBAData.mm in Sources */,
 				F6E2FF2E1E097BA00083EBEC /* MWMSearchCell.mm in Sources */,
+				34AB66841FC5AA330078E451 /* NavigationAddPointToastView.swift in Sources */,
 				340475661E081A4600C92850 /* MWMRouter.mm in Sources */,
 				849CF6AF1DE842290024A8A5 /* MWMTextView.mm in Sources */,
 				34763F081F3092E700F4D2D3 /* String+Format.swift in Sources */,
 				849CF6B11DE842290024A8A5 /* MWMMapWidgets.mm in Sources */,
 				F6E2FE4D1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */,
-				34D7F3431F33903F001D5ED5 /* RouteManagerHeaderView.swift in Sources */,
 				346DB83B1E5C4F6700E3123E /* GalleryItemModel.swift in Sources */,
 				340475631E081A4600C92850 /* MWMNetworkPolicy.mm in Sources */,
 				34D3AFF31E37945B004100F9 /* UITableView+Cells.swift in Sources */,
@@ -6651,6 +6759,7 @@
 				F6E2FD5D1E097BA00083EBEC /* MWMMapDownloaderCellHeader.mm in Sources */,
 				3454D7DB1E07F045004AF2AD /* UILabel+RuntimeAttributes.mm in Sources */,
 				3454D7BD1E07F045004AF2AD /* CLLocation+Mercator.mm in Sources */,
+				34AB667E1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */,
 				F6E2FEE61E097BA00083EBEC /* MWMSearchNoResults.mm in Sources */,
 				849CF6BD1DE842290024A8A5 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */,
 				F6E2FF641E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */,
@@ -6662,6 +6771,7 @@
 				849CF6C61DE842290024A8A5 /* MWMInputPasswordValidator.mm in Sources */,
 				849CF6C71DE842290024A8A5 /* MWMAuthorizationOSMLoginViewController.mm in Sources */,
 				849CF6CC1DE842290024A8A5 /* MWMLocationAlert.mm in Sources */,
+				34AB66061FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */,
 				F6E2FDA21E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */,
 				849CF6CE1DE842290024A8A5 /* MWMPlaceDoesntExistAlert.mm in Sources */,
 				3454D7CC1E07F045004AF2AD /* UIColor+MapsMeColor.mm in Sources */,
@@ -6671,7 +6781,6 @@
 				346DB8291E5C4F6700E3123E /* GalleryCell.swift in Sources */,
 				340475781E081A4600C92850 /* MWMTrafficManager.mm in Sources */,
 				F6E2FECE1E097BA00083EBEC /* MWMSearchFilterTransitioningManager.mm in Sources */,
-				342360A41F34840500AFE44D /* RouteManagerDimView.swift in Sources */,
 				F6E2FF131E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */,
 				849CF6D21DE842290024A8A5 /* MWMNavigationController.mm in Sources */,
 				346DB8351E5C4F6700E3123E /* GalleryViewController.swift in Sources */,
@@ -6680,6 +6789,7 @@
 				34F4073C1E9E1AFF00E57AC0 /* MopubBanner.swift in Sources */,
 				34BBD6591F826F810070CA50 /* AuthorizationTransitioningManager.swift in Sources */,
 				34943BB81E26222300B14F84 /* WelcomeProtocol.swift in Sources */,
+				34AB664B1FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */,
 				F6E2FD601E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm in Sources */,
 				F6558DA31E642CC0002203AE /* MWMFacilitiesController.mm in Sources */,
 				347E1A8A1F1F5DD7002BF7A8 /* CianItemModel.swift in Sources */,
@@ -6688,35 +6798,38 @@
 				F6E2FF281E097BA00083EBEC /* MWMSearchTabButtonsView.mm in Sources */,
 				F6E2FF461E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */,
 				3404756C1E081A4600C92850 /* MWMSearch+CoreSpotlight.mm in Sources */,
+				34AB66511FC5AA330078E451 /* RoutePreviewTaxiCell.swift in Sources */,
 				F6E2FE321E097BA00083EBEC /* MWMStreetEditorViewController.mm in Sources */,
 				340416491E7BF28E00E2B6D6 /* UIView+Snapshot.swift in Sources */,
 				F6E2FE291E097BA00083EBEC /* MWMOpeningHoursSection.mm in Sources */,
 				34F407361E9E1AFF00E57AC0 /* CoreBanner.swift in Sources */,
 				849CF6D31DE842290024A8A5 /* MWMMapDownloadDialog.mm in Sources */,
 				F6E2FE261E097BA00083EBEC /* MWMOpeningHoursModel.mm in Sources */,
-				342360A91F34906700AFE44D /* RouteManagerCell.swift in Sources */,
 				34D3B0371E389D05004100F9 /* MWMEditorSelectTableViewCell.mm in Sources */,
+				34AB66751FC5AA330078E451 /* BaseRoutePreviewStatus.swift in Sources */,
 				849CF6D51DE842290024A8A5 /* MWMTableViewController.mm in Sources */,
 				F6E2FD8D1E097BA00083EBEC /* MWMNoMapsView.mm in Sources */,
 				347039AA1FB9A5CF00E47496 /* MWMBookmarksManager.mm in Sources */,
 				849CF6D81DE842290024A8A5 /* MWMSegue.mm in Sources */,
 				F6E2FD721E097BA00083EBEC /* MWMMapDownloaderTableViewCell.mm in Sources */,
 				F6E2FE501E097BA00083EBEC /* MWMActionBarButton.mm in Sources */,
+				34AB664E1FC5AA330078E451 /* RouteManagerFooterView.swift in Sources */,
 				349D1CE51E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */,
 				F692F3841EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */,
 				34574A681E3B85F80061E839 /* ThemeManager.swift in Sources */,
 				F6E2FD781E097BA00083EBEC /* MWMMapDownloaderDataSource.mm in Sources */,
-				34763F041F30749000F4D2D3 /* RoutePreviewStatus.swift in Sources */,
 				349D1AD91E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */,
 				347BFA911F27909200E5531F /* MenuArea.swift in Sources */,
 				849CF6DF1DE842290024A8A5 /* MWMAuthorizationCommon.mm in Sources */,
 				F6E2FEBF1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */,
 				343E75991E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */,
+				34AB66091FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */,
 				34E776151F14B17F003040B3 /* AvailableArea.swift in Sources */,
 				3454D7CF1E07F045004AF2AD /* UIFont+MapsMeFonts.mm in Sources */,
 				3486B50E1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */,
 				F6E2FEFB1E097BA00083EBEC /* MWMSearchCategoriesManager.mm in Sources */,
 				F6E2FE441E097BA00083EBEC /* MWMDirectionView.mm in Sources */,
+				34AB66181FC5AA330078E451 /* MWMiPhoneRoutePreview.mm in Sources */,
 				F6E2FD571E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.mm in Sources */,
 				340475751E081A4600C92850 /* MWMStorage.mm in Sources */,
 				849CF6E11DE842290024A8A5 /* MWMDownloaderDialogHeader.mm in Sources */,
@@ -6731,30 +6844,31 @@
 				348A8DFC1F66775A00D83026 /* RatingViewSettings.swift in Sources */,
 				3444DFD31F17620C00E73099 /* MWMMapWidgetsHelper.mm in Sources */,
 				F6E2FE3E1E097BA00083EBEC /* MWMMigrationViewController.mm in Sources */,
-				340708571F28F1EA00029ECC /* MWMRoutePreview.mm in Sources */,
 				F6E2FD511E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.mm in Sources */,
+				34AB66781FC5AA330078E451 /* TransportRoutePreviewStatus.swift in Sources */,
 				F6E2FE891E097BA00083EBEC /* MWMPlacePageRegularCell.mm in Sources */,
 				34BBD6651F8270AC0070CA50 /* AuthorizationTransitioning.swift in Sources */,
 				34D3AFEB1E378AF1004100F9 /* UINib+Init.swift in Sources */,
 				F6E2FD811E097BA00083EBEC /* MWMMapDownloaderExtendedDataSourceWithAds.mm in Sources */,
 				34F407331E9E1AFF00E57AC0 /* BannerType.swift in Sources */,
+				34AB663F1FC5AA330078E451 /* RouteManagerTransitioning.swift in Sources */,
 				34BBD65D1F826FD30070CA50 /* AuthorizationiPhonePresentationController.swift in Sources */,
 				F63AF5141EA6250F00A1DB98 /* FilterCollectionHolderCell.swift in Sources */,
 				849CF6EB1DE842290024A8A5 /* MWMAPIBar.mm in Sources */,
 				3404755D1E081A4600C92850 /* MWMLocationManager.mm in Sources */,
 				849CF6ED1DE842290024A8A5 /* MWMAuthorizationLoginViewController.mm in Sources */,
+				34AB66301FC5AA330078E451 /* RouteManageriPhonePresentationController.swift in Sources */,
+				34AB66211FC5AA330078E451 /* RouteStartButton.swift in Sources */,
 				849CF6F11DE842290024A8A5 /* MWMCircularProgress.mm in Sources */,
 				849CF6F31DE842290024A8A5 /* MWMButton.mm in Sources */,
 				34F4072D1E9E1AFF00E57AC0 /* Banner.swift in Sources */,
 				F660DEE61EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */,
+				34AB66121FC5AA320078E451 /* NavigationTurnsView.swift in Sources */,
 				F6E2FDF31E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */,
-				3407085D1F28F27200029ECC /* RoutePreviewTaxiCell.swift in Sources */,
 				348A8DF91F66775A00D83026 /* RatingViewDelegate.swift in Sources */,
 				F6E2FD841E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */,
 				F6664C031E6459DA00E703C2 /* PPReviewHeaderCell.swift in Sources */,
-				849CF6F61DE842290024A8A5 /* MWMNavigationDashboardEntity.mm in Sources */,
 				340E1EFC1E2F614400CE49BF /* Storyboard.swift in Sources */,
-				34C5B8151F335BCA005E50B6 /* RouteManagerViewModel.swift in Sources */,
 				F6E2FE7D1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */,
 				34E776341F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */,
 				F6E2FF371E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */,
@@ -6763,7 +6877,6 @@
 				F6E2FF671E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */,
 				3454D7D81E07F045004AF2AD /* UIKitCategories.mm in Sources */,
 				346DB82F1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */,
-				34763F001F3069BB00F4D2D3 /* RouteStartButton.swift in Sources */,
 				34E776201F14DB48003040B3 /* PlacePageArea.swift in Sources */,
 				849CF6FB1DE842290024A8A5 /* BookmarksVC.mm in Sources */,
 				849CF6FC1DE842290024A8A5 /* MWMSideButtonsView.mm in Sources */,
@@ -6771,6 +6884,7 @@
 				3444DFCE1F1760B900E73099 /* WidgetsArea.swift in Sources */,
 				F6E2FE9B1E097BA00083EBEC /* MWMiPadPlacePageLayoutImpl.mm in Sources */,
 				344532391F6FFE6A0059FBCC /* UGCRating.swift in Sources */,
+				34AB66421FC5AA330078E451 /* RouteManagerTransitioningManager.swift in Sources */,
 				34D3B03D1E389D05004100F9 /* MWMEditorSwitchTableViewCell.mm in Sources */,
 				849CF7071DE842290024A8A5 /* LocaleTranslator.mm in Sources */,
 				340475821E081B3300C92850 /* iosOGLContextFactory.mm in Sources */,
@@ -6781,10 +6895,10 @@
 				340416591E7C0D4100E2B6D6 /* PhotosOverlayView.swift in Sources */,
 				F6E2FD6C1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.mm in Sources */,
 				F6E2FF6A1E097BA00083EBEC /* MWMUnitsController.mm in Sources */,
-				34AC8FD41EFC02CC00E7F910 /* MWMNavigationInfoView.mm in Sources */,
 				34FE5A701F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */,
 				3454D7BA1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */,
 				F6E2FE9E1E097BA00083EBEC /* MWMiPhonePlacePageLayoutImpl.mm in Sources */,
+				34AB668D1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */,
 				340475721E081A4600C92850 /* MWMSettings.mm in Sources */,
 				849CF7121DE842290024A8A5 /* SelectSetVC.mm in Sources */,
 				849CF7141DE842290024A8A5 /* AddSetVC.mm in Sources */,
@@ -6792,8 +6906,8 @@
 				F6E2FE051E097BA00083EBEC /* MWMOpeningHoursDaysSelectorTableViewCell.mm in Sources */,
 				F6E2FE681E097BA00083EBEC /* MWMPlacePageButtonCell.mm in Sources */,
 				F6E2FE141E097BA00083EBEC /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */,
-				34C5B8111F335BA8005E50B6 /* RouteManagerViewModelProtocol.swift in Sources */,
 				344532321F6FE5880059FBCC /* UGCSummaryRatingStarsCell.swift in Sources */,
+				34AB665A1FC5AA330078E451 /* TransportTransitFlowLayout.swift in Sources */,
 				849CF7151DE842290024A8A5 /* MWMInputEmailValidator.mm in Sources */,
 				3486B51A1E27AD3B0069C126 /* MWMFrameworkListener.mm in Sources */,
 				845E4B1D1DEC83AE00D6BED8 /* MWMMobileInternetAlert.mm in Sources */,
@@ -6804,31 +6918,29 @@
 				F6E2FF4F1E097BA00083EBEC /* MWMAboutController.mm in Sources */,
 				34F5E0D51E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */,
 				34F407391E9E1AFF00E57AC0 /* FacebookBanner.swift in Sources */,
-				340708621F28FE2800029ECC /* MWMiPadRoutePreview.mm in Sources */,
-				849CF71D1DE842290024A8A5 /* MWMNavigationDashboardManager.mm in Sources */,
 				3454D7C91E07F045004AF2AD /* UIButton+RuntimeAttributes.mm in Sources */,
 				F6E2FEDA1E097BA00083EBEC /* MWMSearchContentView.mm in Sources */,
 				F6E2FD8A1E097BA00083EBEC /* MWMMapDownloaderViewController.mm in Sources */,
-				34C5B8251F336DF5005E50B6 /* RouteManagerTransitioning.swift in Sources */,
+				34AB66331FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */,
 				F6E2FF4C1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */,
-				3407087D1F2B6F5200029ECC /* NavigationControlView.swift in Sources */,
 				34F1ADD41F6BC09E001CE79D /* PPPReview.swift in Sources */,
 				347040311EA6470700038379 /* BorderedButton.swift in Sources */,
 				F6E2FE7A1E097BA00083EBEC /* MWMOpeningHoursLayoutHelper.mm in Sources */,
 				849CF7251DE842290024A8A5 /* MWMMapViewControlsManager.mm in Sources */,
 				849CF7281DE842290024A8A5 /* MWMOsmAuthAlert.mm in Sources */,
 				34BBD6611F8270360070CA50 /* AuthorizationiPadPresentationController.swift in Sources */,
-				349993FC1F388F970064CFBE /* RouteManageriPadPresentationController.swift in Sources */,
 				F6E2FD7E1E097BA00083EBEC /* MWMMapDownloaderExtendedDataSource.mm in Sources */,
 				F6E2FED41E097BA00083EBEC /* MWMSearchHotelsFilterViewController.mm in Sources */,
 				849CF72B1DE842290024A8A5 /* MWMBookmarkNameCell.mm in Sources */,
 				347752911F7251C7000D46A3 /* UGCAddReviewTextCell.swift in Sources */,
 				34E50DF11F6FCC41008EED49 /* UGCYourReviewCell.swift in Sources */,
+				34AB66391FC5AA330078E451 /* RouteManagerCell.swift in Sources */,
 				F6E2FF251E097BA00083EBEC /* MWMSearchTabbedViewLayout.mm in Sources */,
 				F6E2FF1F1E097BA00083EBEC /* MWMSearchTabbedViewController.mm in Sources */,
 				F6E2FF311E097BA00083EBEC /* MWMSearchCommonCell.mm in Sources */,
 				F6E2FEA11E097BA00083EBEC /* MWMPlacePageLayout.mm in Sources */,
 				F6E2FEC51E097BA00083EBEC /* MWMSearchFilterPresentationController.mm in Sources */,
+				34AB66631FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */,
 				F6E2FD871E097BA00083EBEC /* MWMBaseMapDownloaderViewController.mm in Sources */,
 				34763EE81F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */,
 				340416551E7C09C200E2B6D6 /* PhotoScalingView.swift in Sources */,
@@ -6841,17 +6953,18 @@
 				349D1ADC1E2E325C004A2006 /* MWMBottomMenuView.mm in Sources */,
 				3404164D1E7BF42E00E2B6D6 /* UIView+Coordinates.swift in Sources */,
 				F6E2FD931E097BA00083EBEC /* MWMBookmarkColorViewController.mm in Sources */,
-				3407085B1F28F1F400029ECC /* MWMTaxiPreviewDataSource.mm in Sources */,
 				344BEAF71F66BDC30045DC45 /* RatingSummaryViewSettings.swift in Sources */,
 				849CF7331DE842290024A8A5 /* MWMInputValidatorFactory.mm in Sources */,
 				F6E2FDA51E097BA00083EBEC /* MWMCuisineEditorViewController.mm in Sources */,
 				347752891F725002000D46A3 /* UGCAddReviewRatingCell.swift in Sources */,
+				34AB661B1FC5AA330078E451 /* MWMTaxiCollectionLayout.mm in Sources */,
 				345C2F8B1F86361B009DB8B4 /* MWMUGCViewModel.mm in Sources */,
+				34AB66871FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */,
 				F63AF5071EA6162400A1DB98 /* FilterTypeCell.swift in Sources */,
 				3454D7C31E07F045004AF2AD /* NSString+Categories.mm in Sources */,
 				34D4FA641E26572D003F53EF /* FirstLaunchController.swift in Sources */,
 				34D3B02B1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.mm in Sources */,
-				34E776281F14FE77003040B3 /* NavigationStreetNameView.swift in Sources */,
+				34B127EB1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */,
 				34926BE81EA4C2A700DCF14C /* SearchBanners.swift in Sources */,
 				347E039B1FAC5F1D00426032 /* UIWindow+InputLanguage.swift in Sources */,
 				3454D7C61E07F045004AF2AD /* UIButton+Orientation.mm in Sources */,
@@ -6859,12 +6972,11 @@
 				34E50DE11F6FCBA1008EED49 /* UGCAddReviewCell.swift in Sources */,
 				340475571E081A4600C92850 /* Statistics.mm in Sources */,
 				3486B5091E27A4B50069C126 /* LocalNotificationManager.mm in Sources */,
-				342360A01F34787F00AFE44D /* RouteManagerTableView.swift in Sources */,
 				F6E2FEFE1E097BA00083EBEC /* MWMSearchCategoryCell.mm in Sources */,
 				3404754B1E081A4600C92850 /* AppInfo.mm in Sources */,
+				34AB66451FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */,
 				849CF73C1DE842290024A8A5 /* MWMMultilineLabel.mm in Sources */,
 				849CF73D1DE842290024A8A5 /* MWMViewController.mm in Sources */,
-				34E7762C1F150AFD003040B3 /* NavigationTurnsView.swift in Sources */,
 				34D3B0491E389D05004100F9 /* MWMNoteCell.mm in Sources */,
 				F6E2FE981E097BA00083EBEC /* ContextViews.mm in Sources */,
 				349B926E1DF0518E007779DD /* MWMToast.mm in Sources */,
@@ -6876,6 +6988,7 @@
 				F6E2FF041E097BA00083EBEC /* MWMSearchHistoryClearCell.mm in Sources */,
 				340475541E081A4600C92850 /* MWMCustomFacebookEvents.mm in Sources */,
 				340416511E7C086000E2B6D6 /* PhotoViewController.swift in Sources */,
+				34AB662A1FC5AA330078E451 /* RouteManagerViewController.swift in Sources */,
 				3404750A1E08199E00C92850 /* MWMMyTarget.mm in Sources */,
 				3457C4271F680F1900028233 /* String+BoundingRect.swift in Sources */,
 				849CF7561DE842290024A8A5 /* MWMRoutingDisclaimerAlert.mm in Sources */,
@@ -6883,6 +6996,8 @@
 				849CF7581DE842290024A8A5 /* MWMDownloadTransitMapAlert.mm in Sources */,
 				F6E2FE741E097BA00083EBEC /* MWMOpeningHours.mm in Sources */,
 				3454D7E71E07F045004AF2AD /* UIView+RuntimeAttributes.mm in Sources */,
+				34AB668A1FC5AA330078E451 /* NavigationControlView.swift in Sources */,
+				34AB661E1FC5AA330078E451 /* MWMTaxiPreviewDataSource.mm in Sources */,
 				F69CE8D71E5C49B4002B5881 /* PPHotelCarouselCell.swift in Sources */,
 				F6E2FF611E097BA00083EBEC /* MWMSettingsViewController.mm in Sources */,
 				3445324F1F714FD70059FBCC /* UGCAddReviewController.swift in Sources */,
@@ -6896,11 +7011,11 @@
 				F6E2FF191E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.mm in Sources */,
 				3404754E1E081A4600C92850 /* MWMKeyboard.mm in Sources */,
 				3488B01B1E9D0B230068AFD8 /* UIColor+Modifications.swift in Sources */,
-				34AC8FD81EFC02D500E7F910 /* NavigationAddPointToastView.swift in Sources */,
 				34E50DD91F6FCAB1008EED49 /* UGCSummaryRatingCell.swift in Sources */,
 				849CF7631DE842290024A8A5 /* MWMAlert.mm in Sources */,
 				F6E2FF581E097BA00083EBEC /* MWMMobileInternetViewController.mm in Sources */,
 				340416451E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift in Sources */,
+				34AB66271FC5AA330078E451 /* RouteManagerDimView.swift in Sources */,
 				849CF7651DE842290024A8A5 /* ColorPickerView.mm in Sources */,
 				F6E2FEEC1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */,
 				F6664C141E645A4100E703C2 /* MWMPPReviewCell.mm in Sources */,
@@ -6911,12 +7026,13 @@
 				349FC54C1F680DAE00968C9F /* ExpandableTextViewSettings.swift in Sources */,
 				849CF7671DE842290024A8A5 /* CircleView.mm in Sources */,
 				F6E2FD9F1E097BA00083EBEC /* MWMEditBookmarkController.mm in Sources */,
+				34AB66541FC5AA330078E451 /* MWMiPadRoutePreview.mm in Sources */,
 				F6E2FE0B1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */,
-				340708861F2B863500029ECC /* MWMNavigationDashboardManager+Entity.mm in Sources */,
 				849CF76D1DE842290024A8A5 /* AddSetTableViewCell.mm in Sources */,
 				F6E2FED71E097BA00083EBEC /* MWMSearchChangeModeView.mm in Sources */,
 				849CF76E1DE842290024A8A5 /* MWMEditorViralActivityItem.mm in Sources */,
 				34845DB41E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */,
+				34AB660C1FC5AA320078E451 /* MWMNavigationDashboardEntity.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};