diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h
index 154a1c98c3..acabbc7173 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.h
@@ -1,4 +1,5 @@
 #import "MWMNavigationDashboardManager.h"
+#import "MWMRouterType.h"
 
 namespace routing
 {
@@ -9,7 +10,7 @@ struct TransitRouteInfo;
 
 @interface MWMNavigationDashboardManager (Entity)
 
-- (void)updateFollowingInfo:(routing::FollowingInfo const &)info;
+- (void)updateFollowingInfo:(routing::FollowingInfo const &)info type:(MWMRouterType)type;
 - (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 b1f633b001..b7e4deec7d 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm
@@ -20,9 +20,7 @@ UIImage * image(routing::turns::CarDirection t, bool isNextTurn)
 {
   if (![MWMLocationManager lastLocation])
     return nil;
-  if ([MWMRouter type] == MWMRouterTypePedestrian)
-    return [UIImage imageNamed:@"ic_direction"];
-
+  
   using namespace routing::turns;
   NSString * imageName;
   switch (t)
@@ -51,6 +49,27 @@ UIImage * image(routing::turns::CarDirection t, bool isNextTurn)
   return [UIImage imageNamed:isNextTurn ? [imageName stringByAppendingString:@"_then"] : imageName];
 }
 
+UIImage * image(routing::turns::PedestrianDirection t)
+{
+  if (![MWMLocationManager lastLocation])
+    return nil;
+  
+  using namespace routing::turns;
+  NSString * imageName;
+  switch (t)
+   {
+     case PedestrianDirection::TurnRight: imageName = @"simple_right"; break;
+     case PedestrianDirection::TurnLeft: imageName = @"simple_left"; break;
+     case PedestrianDirection::ReachedYourDestination: imageName = @"finish_point"; break;
+     case PedestrianDirection::GoStraight:
+     case PedestrianDirection::Count:
+     case PedestrianDirection::None: imageName = @"straight"; break;
+   }
+  if (!imageName)
+    return nil;
+  return [UIImage imageNamed:imageName];
+}
+
 NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSString * distance,
                               NSString * distanceUnits, NSDictionary * primaryAttributes,
                               NSDictionary * secondaryAttributes, BOOL isWalk)
@@ -122,8 +141,7 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
 
 @implementation MWMNavigationDashboardManager (Entity)
 
-- (void)updateFollowingInfo:(routing::FollowingInfo const &)info
-{
+- (void)updateFollowingInfo:(routing::FollowingInfo const &)info type:(MWMRouterType)type {
   if ([MWMRouter isRouteFinished])
   {
     [MWMRouter stopRouting];
@@ -141,22 +159,26 @@ NSAttributedString * estimate(NSTimeInterval time, NSAttributedString * dot, NSS
     entity.distanceToTurn = @(info.m_distToTurn.c_str());
     entity.turnUnits = [self localizedUnitLength:@(info.m_turnUnitsSuffix.c_str())];
     entity.streetName = @(info.m_displayedStreetName.c_str());
-    entity.nextTurnImage = image(info.m_nextTurn, true);
 
     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;
-    entity.turnImage = image(turn, false);
-    BOOL const isRound = turn == CarDirection::EnterRoundAbout ||
-                         turn == CarDirection::StayOnRoundAbout ||
-                         turn == CarDirection::LeaveRoundAbout;
-    if (isRound)
-      entity.roundExitNumber = info.m_exitNum;
-    else
-      entity.roundExitNumber = 0;
+   if (type == MWMRouterTypePedestrian) {
+     entity.turnImage = image(info.m_pedestrianTurn);
+   } else {
+      using namespace routing::turns;
+      CarDirection const turn = info.m_turn;
+      entity.turnImage = image(turn, false);
+      entity.nextTurnImage = image(info.m_nextTurn, true);
+      BOOL const isRound = turn == CarDirection::EnterRoundAbout ||
+      turn == CarDirection::StayOnRoundAbout ||
+      turn == CarDirection::LeaveRoundAbout;
+      if (isRound)
+        entity.roundExitNumber = info.m_exitNum;
+      else
+        entity.roundExitNumber = 0;
+    }
   }
 
   [self onNavigationInfoUpdated];
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
index 5cf310bc1b..5feebdc22f 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
@@ -274,10 +274,9 @@ BOOL defaultOrientation(CGSize const & size)
 - (void)onNavigationInfoUpdated:(MWMNavigationDashboardEntity *)info
 {
   self.navigationInfo = info;
-  BOOL const isPedestrianRouting = [MWMRouter type] == MWMRouterTypePedestrian;
   if (self.state != MWMNavigationInfoViewStateNavigation)
     return;
-  if (!isPedestrianRouting && info.streetName.length != 0)
+  if (info.streetName.length != 0)
   {
     [self setStreetNameVisible:YES];
     self.streetNameLabel.text = info.streetName;
@@ -319,7 +318,7 @@ BOOL defaultOrientation(CGSize const & size)
                                        attributes:turnLegendAttributes]];
 
     self.distanceToNextTurnLabel.attributedText = distance;
-    if (!isPedestrianRouting && info.nextTurnImage)
+    if (info.nextTurnImage)
     {
       self.secondTurnView.hidden = NO;
       self.secondTurnImageView.image = info.nextTurnImage;
@@ -345,21 +344,6 @@ BOOL defaultOrientation(CGSize const & size)
     [self updateToastView];
 }
 
-- (void)onHeadingUpdate:(CLHeading *)heading
-{
-  auto transform = CATransform3DIdentity;
-  auto lastLocation = [MWMLocationManager lastLocation];
-  if (lastLocation && self.state == MWMNavigationInfoViewStateNavigation &&
-      [MWMRouter type] == MWMRouterTypePedestrian)
-  {
-    auto const info = location_util::compassInfoFromHeading(heading);
-    auto const angle = ang::AngleTo(lastLocation.mercator,
-                                    self.navigationInfo.pedestrianDirectionPosition.mercator);
-    transform = CATransform3DMakeRotation(M_PI_2 - angle - info.m_bearing, 0, 0, 1);
-  }
-  self.nextTurnImageView.layer.transform = transform;
-}
-
 #pragma mark - SolidTouchView
 
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift
index cce0faa647..51ef544d8d 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift
@@ -258,8 +258,7 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO
 
   func onTTSStatusUpdated() {
     guard MWMRouter.isRoutingActive() else { return }
-    let isPedestrianRouting = MWMRouter.type() == .pedestrian
-    ttsButton.isHidden = isPedestrianRouting || !MWMTextToSpeech.isTTSEnabled()
+    ttsButton.isHidden = !MWMTextToSpeech.isTTSEnabled()
     if !ttsButton.isHidden {
       ttsButton.isSelected = MWMTextToSpeech.tts().active
     }
@@ -274,6 +273,12 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO
     refreshDiminishTimer()
   }
 
+  override func applyTheme() {
+    super.applyTheme()
+    onTrafficStateUpdated()
+    onTTSStatusUpdated()
+  }
+
   override var sideButtonsAreaAffectDirections: MWMAvailableAreaAffectDirections {
     return .bottom
   }
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib
index 273a0bbffc..e5541a9f33 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina3_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -85,7 +85,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </label>
                                 <pageControl opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="100" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="2" translatesAutoresizingMaskIntoConstraints="NO" id="ppd-rW-dYo">
-                                    <rect key="frame" x="52.5" y="4" width="23" height="13"/>
+                                    <rect key="frame" x="12.5" y="4" width="103.5" height="13"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="13" id="BmO-Rd-DKp"/>
@@ -166,7 +166,7 @@
                                 <constraint firstItem="JiD-R1-DnS" firstAttribute="leading" secondItem="Q0w-Me-x4p" secondAttribute="leading" id="eon-hA-hQn"/>
                             </constraints>
                         </view>
-                        <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UPO-sh-VhS" userLabel="ToggleInfo">
+                        <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UPO-sh-VhS" userLabel="ToggleInfo">
                             <rect key="frame" x="0.0" y="0.0" width="260" height="48"/>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             <connections>
@@ -230,42 +230,53 @@
                 <view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CMT-MI-d8X">
                     <rect key="frame" x="0.0" y="52" width="320" height="64"/>
                     <subviews>
-                        <button opaque="NO" contentMode="center" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bfb-5v-iWA" customClass="MWMButton">
-                            <rect key="frame" x="8" y="0.0" width="57.5" height="64"/>
-                            <state key="normal" image="ic_voice_on"/>
-                            <state key="selected" image="ic_voice_off"/>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
-                            </userDefinedRuntimeAttributes>
-                            <connections>
-                                <action selector="ttsButtonAction" destination="-1" eventType="touchUpInside" id="2U8-vo-LOQ"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eaa-f0-INU" userLabel="Traffic" customClass="MWMButton">
-                            <rect key="frame" x="73.5" y="0.0" width="57" height="64"/>
-                            <state key="normal" image="ic_setting_traffic_on"/>
-                            <state key="selected" image="ic_setting_traffic_off"/>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
-                            </userDefinedRuntimeAttributes>
-                            <connections>
-                                <action selector="trafficButtonAction" destination="-1" eventType="touchUpInside" id="ZI3-1D-OeH"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" contentMode="center" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="skM-Xx-3En" userLabel="Settings" customClass="MWMButton">
-                            <rect key="frame" x="138.5" y="0.0" width="57.5" height="64"/>
-                            <state key="normal" image="ic_menu_settings"/>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
-                            </userDefinedRuntimeAttributes>
-                            <connections>
-                                <action selector="settingsButtonAction" destination="-1" eventType="touchUpInside" id="m7v-S7-aqm"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mtt-q0-SUx" customClass="MWMStopButton">
+                        <stackView opaque="NO" contentMode="right" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="udk-ZC-Gz0">
+                            <rect key="frame" x="9" y="0.0" width="187" height="64"/>
+                            <subviews>
+                                <button opaque="NO" contentMode="center" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bfb-5v-iWA" customClass="MWMButton">
+                                    <rect key="frame" x="0.0" y="0.0" width="57" height="64"/>
+                                    <state key="normal" image="ic_voice_on"/>
+                                    <state key="selected" image="ic_voice_off"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="ttsButtonAction" destination="-1" eventType="touchUpInside" id="2U8-vo-LOQ"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eaa-f0-INU" userLabel="Traffic" customClass="MWMButton">
+                                    <rect key="frame" x="65" y="0.0" width="57" height="64"/>
+                                    <state key="normal" image="ic_setting_traffic_on"/>
+                                    <state key="selected" image="ic_setting_traffic_off"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="trafficButtonAction" destination="-1" eventType="touchUpInside" id="ZI3-1D-OeH"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="center" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="skM-Xx-3En" userLabel="Settings" customClass="MWMButton">
+                                    <rect key="frame" x="130" y="0.0" width="57" height="64"/>
+                                    <state key="normal" image="ic_menu_settings"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="MWMBlack"/>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="settingsButtonAction" destination="-1" eventType="touchUpInside" id="m7v-S7-aqm"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <constraints>
+                                <constraint firstItem="eaa-f0-INU" firstAttribute="width" secondItem="Bfb-5v-iWA" secondAttribute="width" id="LRL-2t-ise"/>
+                                <constraint firstItem="Bfb-5v-iWA" firstAttribute="width" secondItem="udk-ZC-Gz0" secondAttribute="height" multiplier="57:64" id="Pvi-bX-9ME"/>
+                                <constraint firstItem="eaa-f0-INU" firstAttribute="width" secondItem="skM-Xx-3En" secondAttribute="width" id="wSy-Ay-Dg5"/>
+                            </constraints>
+                        </stackView>
+                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mtt-q0-SUx" customClass="MWMStopButton">
                             <rect key="frame" x="204" y="14" width="96" height="36"/>
                             <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
+                                <constraint firstAttribute="width" relation="lessThanOrEqual" constant="140" id="4E4-UU-lhc"/>
                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="96" id="N0o-f3-nuw"/>
                                 <constraint firstAttribute="height" priority="750" constant="36" id="Pfs-0w-XX9"/>
                             </constraints>
@@ -283,24 +294,17 @@
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="eaa-f0-INU" firstAttribute="top" secondItem="CMT-MI-d8X" secondAttribute="top" id="2ZI-jO-Rzb"/>
-                        <constraint firstAttribute="bottom" secondItem="skM-Xx-3En" secondAttribute="bottom" id="3mJ-M7-QYs"/>
-                        <constraint firstItem="eaa-f0-INU" firstAttribute="leading" secondItem="Bfb-5v-iWA" secondAttribute="trailing" constant="8" id="5ar-52-BSS"/>
-                        <constraint firstItem="skM-Xx-3En" firstAttribute="top" secondItem="CMT-MI-d8X" secondAttribute="top" id="I7f-Pc-SUr"/>
                         <constraint firstItem="mtt-q0-SUx" firstAttribute="top" secondItem="CMT-MI-d8X" secondAttribute="top" priority="750" constant="14" id="L5z-8y-Duk"/>
                         <constraint firstAttribute="height" constant="64" id="LaX-SD-Kzr"/>
-                        <constraint firstItem="Bfb-5v-iWA" firstAttribute="leading" secondItem="CMT-MI-d8X" secondAttribute="leading" constant="8" id="V74-6u-Ohx"/>
-                        <constraint firstItem="eaa-f0-INU" firstAttribute="width" secondItem="Bfb-5v-iWA" secondAttribute="width" id="Wit-m1-Qhu"/>
-                        <constraint firstItem="Bfb-5v-iWA" firstAttribute="top" secondItem="CMT-MI-d8X" secondAttribute="top" id="hZJ-Ek-eep"/>
+                        <constraint firstItem="mtt-q0-SUx" firstAttribute="leading" secondItem="udk-ZC-Gz0" secondAttribute="trailing" constant="8" id="QSr-OG-Imw"/>
+                        <constraint firstItem="udk-ZC-Gz0" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="CMT-MI-d8X" secondAttribute="leading" priority="250" constant="8" id="V36-Jb-U8R"/>
+                        <constraint firstItem="udk-ZC-Gz0" firstAttribute="top" secondItem="CMT-MI-d8X" secondAttribute="top" id="W8O-lT-eqz"/>
+                        <constraint firstAttribute="bottom" secondItem="udk-ZC-Gz0" secondAttribute="bottom" id="bMN-ct-cOQ"/>
                         <constraint firstAttribute="trailing" secondItem="mtt-q0-SUx" secondAttribute="trailing" constant="20" id="huM-XX-MM9"/>
-                        <constraint firstAttribute="bottom" secondItem="Bfb-5v-iWA" secondAttribute="bottom" id="jWC-0W-pIV"/>
-                        <constraint firstItem="eaa-f0-INU" firstAttribute="width" secondItem="skM-Xx-3En" secondAttribute="width" id="jg9-YP-GwC"/>
-                        <constraint firstAttribute="bottom" secondItem="eaa-f0-INU" secondAttribute="bottom" id="mO5-Wj-UYu"/>
-                        <constraint firstItem="skM-Xx-3En" firstAttribute="leading" secondItem="eaa-f0-INU" secondAttribute="trailing" constant="8" id="nCN-ow-4GR"/>
-                        <constraint firstItem="mtt-q0-SUx" firstAttribute="leading" secondItem="skM-Xx-3En" secondAttribute="trailing" constant="8" id="rTu-89-tgS"/>
                     </constraints>
                 </view>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="ghU-PK-XSf"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="u7O-n6-ZXy" secondAttribute="trailing" id="2zR-Xc-sbx"/>
@@ -319,7 +323,6 @@
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="ghU-PK-XSf"/>
             <connections>
                 <outlet property="distanceLabel" destination="vbY-p5-3bX" id="uxW-PA-dra"/>
                 <outlet property="distanceLegendLabel" destination="7dx-1W-LWs" id="Kmh-8u-jgj"/>
@@ -337,7 +340,7 @@
                 <outlet property="trafficButton" destination="eaa-f0-INU" id="nyl-Nf-A4Z"/>
                 <outlet property="ttsButton" destination="Bfb-5v-iWA" id="GMb-ft-G6X"/>
             </connections>
-            <point key="canvasLocation" x="34" y="53.5"/>
+            <point key="canvasLocation" x="33.600000000000001" y="53.073463268365821"/>
         </view>
     </objects>
     <resources>
diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm
index 59fd71161e..59750e57f6 100644
--- a/iphone/Maps/Core/Routing/MWMRouter.mm
+++ b/iphone/Maps/Core/Routing/MWMRouter.mm
@@ -543,7 +543,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
   if ([MWMRouter type] == MWMRouterTypePublicTransport)
     [navManager updateTransitInfo:rm.GetTransitRouteInfo()];
   else
-    [navManager updateFollowingInfo:info];
+    [navManager updateFollowingInfo:info type:[MWMRouter type]];
 }
 
 + (void)routeAltitudeImageForSize:(CGSize)size completion:(MWMImageHeightBlock)block