diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
index 28e967bcac..dd574203f6 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -62,6 +62,7 @@
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation
 {
   [self.placePageManager willRotateToInterfaceOrientation:orientation];
+  [self.navigationManager willRotateToInterfaceOrientation:orientation];
 }
 
 #pragma mark - MWMPlacePageViewManager
@@ -110,7 +111,8 @@
 
 - (void)buildRouteWithType:(enum MWMNavigationRouteType)type
 {
-  GetFramework().BuildRoute(self.routeDestination, 0 /* timeoutSec */);
+  self.navigationManager.state = MWMNavigationDashboardStatePlanning;
+//  GetFramework().BuildRoute(self.routeDestination, 0 /* timeoutSec */);
 }
 
 #pragma mark - Properties
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Dashboard/MWMNavigationDashboard.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Dashboard/MWMNavigationDashboard.mm
deleted file mode 100644
index 261a1e83a6..0000000000
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Dashboard/MWMNavigationDashboard.mm
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//  MWMNavigationDashboard.m
-//  Maps
-//
-//  Created by v.mikhaylenko on 20.07.15.
-//  Copyright (c) 2015 MapsWithMe. All rights reserved.
-//
-
-#import "MWMNavigationDashboard.h"
-
-@interface MWMNavigationDashboard ()
-
-@end
-
-@implementation MWMNavigationDashboard
-
-- (void)addToView:(UIView *)superview
-{
-  [superview addSubview:self];
-  self.frame = self.defaultFrame;
-  [self setInitialPosition];
-  [self moveIn];
-}
-
-- (void)remove
-{
-  [UIView animateWithDuration:0.2 animations:^
-  {
-    [self setInitialPosition];
-  }
-  completion:^(BOOL finished)
-  {
-    [self removeFromSuperview];
-  }];
-}
-
-- (void)setInitialPosition
-{
-  self.maxY = 0.0;
-}
-
-- (void)moveIn
-{
-  [UIView animateWithDuration:0.2 animations:^{ self.origin = CGPointZero; }];
-}
-
-- (void)layoutSubviews
-{
-  self.frame = self.defaultFrame;
-  [super layoutSubviews];
-}
-
-#pragma mark - Properties
-
-- (CGRect)defaultFrame
-{
-  return CGRectMake(0.0, self.topOffset, self.superview.width, 92.0);
-}
-
-@end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
index 6682735e83..2fb013f46f 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
@@ -32,4 +32,6 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState)
 - (instancetype)init __attribute__((unavailable("init is not available")));
 - (instancetype)initWithParentView:(UIView *)view delegate:(id<MWMNavigationDashboardManagerDelegate>)delegate;
 
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation;
+
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index 4bba4c411e..1397d2c3dd 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -13,8 +13,14 @@
 
 @interface MWMNavigationDashboardManager ()
 
-@property (nonatomic) IBOutlet MWMRoutePreview * routePreview;
-@property (nonatomic) IBOutlet MWMNavigationDashboard * navigationDashboard;
+@property (nonatomic) IBOutlet MWMRoutePreview * routePreviewLandscape;
+@property (nonatomic) IBOutlet MWMRoutePreview * routePreviewPortrait;
+@property (weak, nonatomic) MWMRoutePreview * routePreview;
+
+
+@property (nonatomic) IBOutlet MWMNavigationDashboard * navigationDashboardLandscape;
+@property (nonatomic) IBOutlet MWMNavigationDashboard * navigationDashboardPortrait;
+@property (weak, nonatomic) MWMNavigationDashboard * navigationDashboard;
 
 @property (weak, nonatomic) UIView * ownerView;
 @property (weak, nonatomic) id<MWMNavigationDashboardManagerDelegate> delegate;
@@ -30,22 +36,55 @@
   {
     self.ownerView = view;
     self.delegate = delegate;
+    BOOL const isPortrait = self.ownerView.width < self.ownerView.height;
+
+    [NSBundle.mainBundle loadNibNamed:@"MWMPortraitRoutePreview" owner:self options:nil];
+    [NSBundle.mainBundle loadNibNamed:@"MWMLandscapeRoutePreview" owner:self options:nil];
+    self.routePreview = isPortrait ? self.routePreviewPortrait : self.routePreviewLandscape;
+
+    [NSBundle.mainBundle loadNibNamed:@"MWMPortraitNavigationDashboard" owner:self options:nil];
+    [NSBundle.mainBundle loadNibNamed:@"MWMLandscapeNavigationDashboard" owner:self options:nil];
+    self.navigationDashboard = isPortrait ? self.navigationDashboardPortrait : self.navigationDashboardLandscape;
   }
   return self;
 }
 
+#pragma mark - Layout
+
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)orientation
+{
+  BOOL const isPortrait = orientation == UIInterfaceOrientationPortrait || orientation == UIInterfaceOrientationPortraitUpsideDown;
+  MWMRoutePreview * routePreview = isPortrait ? self.routePreviewPortrait : self.routePreviewLandscape;
+  if (self.routePreview.isVisible && ![routePreview isEqual:self.routePreview])
+  {
+    [self.routePreview remove];
+    [routePreview addToView:self.ownerView];
+  }
+  self.routePreview = routePreview;
+
+  MWMNavigationDashboard * navigationDashboard = isPortrait ? self.navigationDashboardPortrait : self.navigationDashboardLandscape;
+  if (self.navigationDashboard.isVisible && ![navigationDashboard isEqual:self.navigationDashboard])
+  {
+    [self.navigationDashboard remove];
+    [navigationDashboard addToView:self.ownerView];
+  }
+  self.navigationDashboard = navigationDashboard;
+}
+
 #pragma mark - MWMRoutePreview
 
 - (IBAction)routePreviewChange:(UIButton *)sender
 {
-  enum MWMNavigationRouteType const type = [sender isEqual:self.routePreview.pedestrian] ? MWMNavigationRouteTypePedestrian : MWMNavigationRouteTypeVehicle;
-  [self.delegate buildRouteWithType:type];
+  self.routePreview.showGoButton = [sender isEqual:self.routePreview.pedestrian];
+//  enum MWMNavigationRouteType const type = [sender isEqual:self.routePreview.pedestrian] ? MWMNavigationRouteTypePedestrian : MWMNavigationRouteTypeVehicle;
+//  [self.delegate buildRouteWithType:type];
 }
 
 #pragma mark - MWMNavigationDashboard
 
 - (IBAction)navigationCancelPressed:(UIButton *)sender
 {
+  self.state = MWMNavigationDashboardStateHidden;
 }
 
 #pragma mark - MWMNavigationGo
@@ -57,6 +96,12 @@
 
 #pragma mark - State changes
 
+- (void)hideState
+{
+  [self.routePreview remove];
+  [self.navigationDashboard remove];
+}
+
 - (void)showStatePlanning
 {
   [self.routePreview addToView:self.ownerView];
@@ -70,20 +115,6 @@
 
 #pragma mark - Properties
 
-- (MWMRoutePreview *)routePreview
-{
-  if (!_routePreview)
-    [NSBundle.mainBundle loadNibNamed:MWMRoutePreview.className owner:self options:nil];
-  return _routePreview;
-}
-
-- (MWMNavigationDashboard *)navigationDashboard
-{
-  if (!_navigationDashboard)
-    [NSBundle.mainBundle loadNibNamed:MWMNavigationDashboard.className owner:self options:nil];
-  return _navigationDashboard;
-}
-
 - (void)setState:(MWMNavigationDashboardState)state
 {
   if (_state == state)
@@ -91,6 +122,7 @@
   switch (state)
   {
     case MWMNavigationDashboardStateHidden:
+      [self hideState];
       break;
     case MWMNavigationDashboardStatePlanning:
       NSAssert(_state == MWMNavigationDashboardStateHidden, @"Invalid state change");
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMLandscapeNavigationDashboard.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMLandscapeNavigationDashboard.xib
new file mode 100644
index 0000000000..86a23cba5f
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMLandscapeNavigationDashboard.xib
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
+            <connections>
+                <outlet property="navigationDashboardLandscape" destination="Oeo-6A-mHo" id="IAU-RJ-VYg"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="Oeo-6A-mHo" customClass="MWMNavigationDashboard">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="92"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jQ3-Hp-ClD" userLabel="Cancel">
+                    <rect key="frame" x="0.0" y="32" width="40" height="40"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="40" id="Bpd-ps-0hN"/>
+                        <constraint firstAttribute="height" constant="40" id="TZ8-Bz-6NM"/>
+                    </constraints>
+                    <state key="normal" image="ic_cancel">
+                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5N1-pV-7uW" userLabel="Azimut Box">
+                    <rect key="frame" x="56" y="29" width="190" height="52"/>
+                    <subviews>
+                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_direction" translatesAutoresizingMaskIntoConstraints="NO" id="wn3-TT-TQ9">
+                            <rect key="frame" x="0.0" y="0.0" width="52" height="52"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="52" id="JKH-zH-4E3"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TrJ-7a-QPc">
+                            <rect key="frame" x="60" y="5" width="21" height="42"/>
+                            <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="36"/>
+                            <color key="textColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="km" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xYv-zR-wkx">
+                            <rect key="frame" x="82" y="21" width="26" height="22"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="26" id="6TZ-Rx-Yen"/>
+                                <constraint firstAttribute="height" constant="21.5" id="LJI-b9-3D4"/>
+                                <constraint firstAttribute="height" constant="21.5" id="Wmm-iR-zeA"/>
+                                <constraint firstAttribute="width" constant="25.5" id="lks-aY-5bf"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
+                            <color key="textColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                            <variation key="default">
+                                <mask key="constraints">
+                                    <exclude reference="6TZ-Rx-Yen"/>
+                                    <exclude reference="Wmm-iR-zeA"/>
+                                </mask>
+                            </variation>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="TrJ-7a-QPc" secondAttribute="bottom" constant="5" id="0VR-3j-tvk"/>
+                        <constraint firstItem="TrJ-7a-QPc" firstAttribute="baseline" secondItem="xYv-zR-wkx" secondAttribute="baseline" id="1c6-vV-o9Z"/>
+                        <constraint firstItem="wn3-TT-TQ9" firstAttribute="leading" secondItem="5N1-pV-7uW" secondAttribute="leading" id="2Jn-9t-ISi"/>
+                        <constraint firstAttribute="width" constant="190" id="2We-Mg-bL7"/>
+                        <constraint firstItem="xYv-zR-wkx" firstAttribute="leading" secondItem="TrJ-7a-QPc" secondAttribute="trailing" constant="3.5" id="4aM-XV-mEd"/>
+                        <constraint firstItem="wn3-TT-TQ9" firstAttribute="top" secondItem="5N1-pV-7uW" secondAttribute="top" id="IVh-x5-T8F"/>
+                        <constraint firstAttribute="trailing" secondItem="xYv-zR-wkx" secondAttribute="trailing" id="ItV-X2-0pS"/>
+                        <constraint firstItem="TrJ-7a-QPc" firstAttribute="baseline" secondItem="xYv-zR-wkx" secondAttribute="baseline" id="W1L-Y4-bPS"/>
+                        <constraint firstItem="xYv-zR-wkx" firstAttribute="leading" secondItem="TrJ-7a-QPc" secondAttribute="trailing" constant="1" id="fDw-Rm-nO6"/>
+                        <constraint firstAttribute="bottom" secondItem="wn3-TT-TQ9" secondAttribute="bottom" id="fYR-ML-ZFU"/>
+                        <constraint firstItem="xYv-zR-wkx" firstAttribute="leading" secondItem="TrJ-7a-QPc" secondAttribute="trailing" constant="4" id="hm1-wr-aJv"/>
+                        <constraint firstItem="xYv-zR-wkx" firstAttribute="leading" secondItem="TrJ-7a-QPc" secondAttribute="trailing" constant="4" id="qUO-VD-GIs"/>
+                        <constraint firstAttribute="height" constant="52" id="r9w-fj-fuv"/>
+                        <constraint firstItem="TrJ-7a-QPc" firstAttribute="top" secondItem="5N1-pV-7uW" secondAttribute="top" constant="5" id="tBm-Wm-SDr"/>
+                        <constraint firstItem="TrJ-7a-QPc" firstAttribute="leading" secondItem="wn3-TT-TQ9" secondAttribute="trailing" constant="8" id="uiI-JA-XCl"/>
+                    </constraints>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="1c6-vV-o9Z"/>
+                            <exclude reference="4aM-XV-mEd"/>
+                            <exclude reference="ItV-X2-0pS"/>
+                            <exclude reference="hm1-wr-aJv"/>
+                            <exclude reference="qUO-VD-GIs"/>
+                        </mask>
+                    </variation>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ern-y6-muT" userLabel="Distance Box">
+                    <rect key="frame" x="216" y="35" width="96" height="43"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100000 km" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mi4-cd-rXM">
+                            <rect key="frame" x="0.0" y="0.0" width="96" height="23"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="23" id="ZOk-he-haN"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="18"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10000 h" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wpm-lp-HRo">
+                            <rect key="frame" x="0.0" y="26" width="96" height="17"/>
+                            <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="Wpm-lp-HRo" secondAttribute="bottom" id="3ez-2Y-B7e"/>
+                        <constraint firstItem="Wpm-lp-HRo" firstAttribute="leading" secondItem="ern-y6-muT" secondAttribute="leading" id="Bx8-Xf-Swo"/>
+                        <constraint firstAttribute="width" constant="96" id="FVS-4O-Wlt"/>
+                        <constraint firstItem="mi4-cd-rXM" firstAttribute="leading" secondItem="ern-y6-muT" secondAttribute="leading" id="NZn-px-bwb"/>
+                        <constraint firstAttribute="trailing" secondItem="Wpm-lp-HRo" secondAttribute="trailing" id="PYy-Kc-0qF"/>
+                        <constraint firstItem="Wpm-lp-HRo" firstAttribute="top" secondItem="mi4-cd-rXM" secondAttribute="bottom" constant="3" id="SNa-ww-TL8"/>
+                        <constraint firstItem="mi4-cd-rXM" firstAttribute="top" secondItem="ern-y6-muT" secondAttribute="top" id="b3c-mw-4ze"/>
+                        <constraint firstAttribute="trailing" secondItem="mi4-cd-rXM" secondAttribute="trailing" id="gZ9-Qc-ayG"/>
+                        <constraint firstAttribute="height" constant="43" id="tRm-S2-Vph"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="jQ3-Hp-ClD" firstAttribute="leading" secondItem="Oeo-6A-mHo" secondAttribute="leading" id="7Vk-WT-CKU"/>
+                <constraint firstAttribute="bottom" secondItem="5N1-pV-7uW" secondAttribute="bottom" constant="11" id="Hgg-G6-nob"/>
+                <constraint firstAttribute="bottom" secondItem="jQ3-Hp-ClD" secondAttribute="bottom" constant="20" id="LgD-CF-cA5"/>
+                <constraint firstItem="5N1-pV-7uW" firstAttribute="leading" secondItem="jQ3-Hp-ClD" secondAttribute="trailing" constant="16" id="T2H-LK-kGY"/>
+                <constraint firstAttribute="bottom" secondItem="ern-y6-muT" secondAttribute="bottom" constant="14" id="cl8-AF-vx8"/>
+                <constraint firstAttribute="trailing" secondItem="ern-y6-muT" secondAttribute="trailing" constant="8" id="tL0-LY-fbN"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="direction" destination="wn3-TT-TQ9" id="rIY-wm-gMd"/>
+                <outlet property="distanceLeft" destination="mi4-cd-rXM" id="odK-YR-gVQ"/>
+                <outlet property="distanceToNextAction" destination="TrJ-7a-QPc" id="cSr-TJ-LCS"/>
+                <outlet property="distanceToNextActionUnits" destination="xYv-zR-wkx" id="Aj1-l2-je6"/>
+                <outlet property="eta" destination="Wpm-lp-HRo" id="1XZ-Wa-nf4"/>
+            </connections>
+            <point key="canvasLocation" x="369" y="261"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="ic_cancel" width="40" height="40"/>
+        <image name="ic_direction" width="52" height="52"/>
+    </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+</document>
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Dashboard/MWMNavigationDashboard.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.h
similarity index 72%
rename from iphone/Maps/Classes/CustomViews/NavigationDashboard/Dashboard/MWMNavigationDashboard.h
rename to iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.h
index f56c2f35b7..8c38199be8 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Dashboard/MWMNavigationDashboard.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.h
@@ -6,11 +6,9 @@
 //  Copyright (c) 2015 MapsWithMe. All rights reserved.
 //
 
-#import "UIKitCategories.h"
+#import "MWMNavigationView.h"
 
-@interface MWMNavigationDashboard : SolidTouchView
-
-@property (nonatomic) CGFloat topOffset;
+@interface MWMNavigationDashboard : MWMNavigationView
 
 @property (weak, nonatomic) IBOutlet UIImageView * direction;
 @property (weak, nonatomic) IBOutlet UILabel * distanceToNextAction;
@@ -18,7 +16,4 @@
 @property (weak, nonatomic) IBOutlet UILabel * distanceLeft;
 @property (weak, nonatomic) IBOutlet UILabel * eta;
 
-- (void)addToView:(UIView *)superview;
-- (void)remove;
-
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm
new file mode 100644
index 0000000000..6aa201ef49
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm
@@ -0,0 +1,13 @@
+//
+//  MWMNavigationDashboard.m
+//  Maps
+//
+//  Created by v.mikhaylenko on 20.07.15.
+//  Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMNavigationDashboard.h"
+
+@implementation MWMNavigationDashboard
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Dashboard/MWMNavigationDashboard.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMPortraitNavigationDashboard.xib
similarity index 99%
rename from iphone/Maps/Classes/CustomViews/NavigationDashboard/Dashboard/MWMNavigationDashboard.xib
rename to iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMPortraitNavigationDashboard.xib
index 92fd8f19f6..6ebf8d19b5 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Dashboard/MWMNavigationDashboard.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMPortraitNavigationDashboard.xib
@@ -7,7 +7,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
             <connections>
-                <outlet property="navigationDashboard" destination="kJl-MF-nLa" id="zpZ-nD-4eH"/>
+                <outlet property="navigationDashboardPortrait" destination="kJl-MF-nLa" id="3Sz-qR-jPV"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h
new file mode 100644
index 0000000000..c14009d42b
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h
@@ -0,0 +1,19 @@
+//
+//  MWMNavigationView.h
+//  Maps
+//
+//  Created by Ilya Grechuhin on 22.07.15.
+//  Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "UIKitCategories.h"
+
+@interface MWMNavigationView : SolidTouchView
+
+@property (nonatomic) CGFloat topOffset;
+@property (nonatomic, readonly) BOOL isVisible;
+
+- (void)addToView:(UIView *)superview;
+- (void)remove;
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.m b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.m
new file mode 100644
index 0000000000..641f954b28
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.m
@@ -0,0 +1,71 @@
+//
+//  MWMNavigationView.m
+//  Maps
+//
+//  Created by Ilya Grechuhin on 22.07.15.
+//  Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMNavigationView.h"
+
+@interface MWMNavigationView ()
+
+@property (nonatomic) BOOL isVisible;
+@property (nonatomic) CGFloat defaultHeight;
+
+@end
+
+@implementation MWMNavigationView
+
+- (void)awakeFromNib
+{
+  [super awakeFromNib];
+  self.defaultHeight = self.height;
+}
+
+- (void)addToView:(UIView *)superview
+{
+  [superview addSubview:self];
+  self.frame = self.defaultFrame;
+  self.isVisible = YES;
+}
+
+- (void)remove
+{
+  self.isVisible = NO;
+}
+
+- (void)layoutSubviews
+{
+  [UIView animateWithDuration:0.2 animations:^
+   {
+     self.frame = self.defaultFrame;
+   }
+                   completion:^(BOOL finished)
+   {
+     if (!self.isVisible)
+       [self removeFromSuperview];
+   }];
+  [super layoutSubviews];
+}
+
+#pragma mark - Properties
+
+- (CGRect)defaultFrame
+{
+  return CGRectMake(0.0, self.topOffset - (self.isVisible ? 0.0 : self.defaultHeight), self.superview.width, self.defaultHeight);
+}
+
+- (void)setTopOffset:(CGFloat)topOffset
+{
+  _topOffset = topOffset;
+  [self layoutSubviews];
+}
+
+- (void)setIsVisible:(BOOL)isVisible
+{
+  _isVisible = isVisible;
+  [self layoutSubviews];
+}
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMLandscapeRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMLandscapeRoutePreview.xib
new file mode 100644
index 0000000000..667eec8f80
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMLandscapeRoutePreview.xib
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
+            <connections>
+                <outlet property="routePreviewLandscape" destination="EvQ-CH-5qC" id="s8e-5T-iGB"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="EvQ-CH-5qC" customClass="MWMRoutePreview">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="120"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0m5-cD-yfC">
+                    <rect key="frame" x="0.0" y="32" width="320" height="44"/>
+                    <color key="backgroundColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="O48-rs-xGy"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="14"/>
+                    <state key="normal" title="Start">
+                        <color key="titleColor" red="1" green="1" blue="1" alpha="0.87" colorSpace="custom" customColorSpace="sRGB"/>
+                    </state>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius">
+                            <integer key="value" value="2"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor">
+                            <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="calibratedRGB"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bfG-c5-fMl">
+                    <rect key="frame" x="0.0" y="0.0" width="320" height="76"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xcU-SM-tN8" userLabel="Spiner Button">
+                            <rect key="frame" x="0.0" y="28" width="40" height="40"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="40" id="X0o-SP-FVU"/>
+                                <constraint firstAttribute="width" constant="40" id="e71-1l-O5m"/>
+                            </constraints>
+                            <state key="normal" image="ic_spinner_close_1">
+                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                            </state>
+                        </button>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Landscape" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wzR-lf-hDI">
+                            <rect key="frame" x="56" y="37" width="172" height="21"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="21" id="a91-oh-DfU"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oe3-Op-uEp" userLabel="Buttons Box">
+                            <rect key="frame" x="232" y="28" width="80" height="40"/>
+                            <subviews>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0dd-I8-xaK" userLabel="Walk Button">
+                                    <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                                    <state key="normal" image="ic_walk_on">
+                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="routeTypePressed:" destination="EvQ-CH-5qC" eventType="touchUpInside" id="qWU-C0-8CT"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yNr-DG-8Hu" userLabel="Drive Button">
+                                    <rect key="frame" x="40" y="0.0" width="40" height="40"/>
+                                    <state key="normal" image="ic_drive_on">
+                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="routeTypePressed:" destination="EvQ-CH-5qC" eventType="touchUpInside" id="pI7-Yh-QDE"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="yNr-DG-8Hu" firstAttribute="leading" secondItem="0dd-I8-xaK" secondAttribute="trailing" id="A2v-Wd-ekq"/>
+                                <constraint firstAttribute="width" constant="80" id="CWs-S1-Q3d"/>
+                                <constraint firstItem="yNr-DG-8Hu" firstAttribute="leading" secondItem="0dd-I8-xaK" secondAttribute="trailing" id="HgM-AD-lb8"/>
+                                <constraint firstItem="0dd-I8-xaK" firstAttribute="leading" secondItem="Oe3-Op-uEp" secondAttribute="leading" id="T9Y-hU-9Do"/>
+                                <constraint firstAttribute="bottom" secondItem="0dd-I8-xaK" secondAttribute="bottom" id="Yp7-rD-6h3"/>
+                                <constraint firstItem="yNr-DG-8Hu" firstAttribute="top" secondItem="Oe3-Op-uEp" secondAttribute="top" id="cIV-hA-FGQ"/>
+                                <constraint firstAttribute="height" constant="40" id="hGs-kN-l8Z"/>
+                                <constraint firstAttribute="bottom" secondItem="yNr-DG-8Hu" secondAttribute="bottom" id="rUs-Fr-0Nh"/>
+                                <constraint firstItem="0dd-I8-xaK" firstAttribute="top" secondItem="Oe3-Op-uEp" secondAttribute="top" id="uOg-Rd-X6M"/>
+                                <constraint firstAttribute="trailing" secondItem="yNr-DG-8Hu" secondAttribute="trailing" id="yZ5-4G-SLq"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="Oe3-Op-uEp" firstAttribute="leading" secondItem="wzR-lf-hDI" secondAttribute="trailing" constant="4" id="1E7-wu-yXe"/>
+                        <constraint firstItem="xcU-SM-tN8" firstAttribute="leading" secondItem="bfG-c5-fMl" secondAttribute="leading" id="Jpl-JM-x5O"/>
+                        <constraint firstAttribute="bottom" secondItem="Oe3-Op-uEp" secondAttribute="bottom" constant="8" id="Res-ht-qAb"/>
+                        <constraint firstItem="wzR-lf-hDI" firstAttribute="leading" secondItem="xcU-SM-tN8" secondAttribute="trailing" constant="16" id="gCW-J7-UDl"/>
+                        <constraint firstAttribute="bottom" secondItem="wzR-lf-hDI" secondAttribute="bottom" constant="18" id="psh-bv-p2o"/>
+                        <constraint firstAttribute="height" constant="76" id="qFf-mT-U9d"/>
+                        <constraint firstAttribute="trailing" secondItem="Oe3-Op-uEp" secondAttribute="trailing" constant="8" id="rTj-VC-TKj"/>
+                        <constraint firstAttribute="bottom" secondItem="xcU-SM-tN8" secondAttribute="bottom" constant="8" id="rZp-0H-JZc"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="bfG-c5-fMl" secondAttribute="trailing" id="BtB-CZ-LoT"/>
+                <constraint firstAttribute="bottom" secondItem="0m5-cD-yfC" secondAttribute="bottom" constant="44" id="C4v-nE-10G"/>
+                <constraint firstItem="0m5-cD-yfC" firstAttribute="leading" secondItem="EvQ-CH-5qC" secondAttribute="leading" id="Czx-5O-b1N"/>
+                <constraint firstItem="bfG-c5-fMl" firstAttribute="top" secondItem="EvQ-CH-5qC" secondAttribute="top" id="Zkj-D8-VKg"/>
+                <constraint firstItem="bfG-c5-fMl" firstAttribute="leading" secondItem="EvQ-CH-5qC" secondAttribute="leading" id="hrq-5X-Lkg"/>
+                <constraint firstAttribute="trailing" secondItem="0m5-cD-yfC" secondAttribute="trailing" id="x24-aP-iq2"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="goButtonVerticalOffset" destination="C4v-nE-10G" id="YCG-GD-szj"/>
+                <outlet property="pedestrian" destination="0dd-I8-xaK" id="0p2-T2-1MD"/>
+                <outlet property="status" destination="wzR-lf-hDI" id="FXn-1Y-15m"/>
+                <outlet property="vehicle" destination="yNr-DG-8Hu" id="nVZ-KV-Icf"/>
+            </connections>
+            <point key="canvasLocation" x="369" y="452"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="ic_drive_on" width="40" height="40"/>
+        <image name="ic_spinner_close_1" width="40" height="40"/>
+        <image name="ic_walk_on" width="40" height="40"/>
+    </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+</document>
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/RoutePreview/MWMRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMPortraitRoutePreview.xib
similarity index 96%
rename from iphone/Maps/Classes/CustomViews/NavigationDashboard/RoutePreview/MWMRoutePreview.xib
rename to iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMPortraitRoutePreview.xib
index ddef74763d..827165f343 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/RoutePreview/MWMRoutePreview.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMPortraitRoutePreview.xib
@@ -7,7 +7,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
             <connections>
-                <outlet property="routePreview" destination="7PP-4j-9rc" id="WJG-eH-84f"/>
+                <outlet property="routePreviewPortrait" destination="7PP-4j-9rc" id="R6c-Vi-IQ0"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -50,7 +50,7 @@
                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                             </state>
                         </button>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Creating Route..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Thj-oD-UU9">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Portrait" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Thj-oD-UU9">
                             <rect key="frame" x="56" y="37" width="172" height="21"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="21" id="mTp-qM-1co"/>
@@ -121,6 +121,7 @@
                 <constraint firstAttribute="bottom" secondItem="xXd-rh-qax" secondAttribute="bottom" constant="44" id="oL8-Fe-U5W"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
+            <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="goButtonVerticalOffset" destination="oL8-Fe-U5W" id="aPg-oO-QqN"/>
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/RoutePreview/MWMRoutePreview.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h
similarity index 68%
rename from iphone/Maps/Classes/CustomViews/NavigationDashboard/RoutePreview/MWMRoutePreview.h
rename to iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h
index e992d9c3bf..06c1c80cf9 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/RoutePreview/MWMRoutePreview.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h
@@ -6,11 +6,9 @@
 //  Copyright (c) 2015 MapsWithMe. All rights reserved.
 //
 
-#import "UIKitCategories.h"
+#import "MWMNavigationView.h"
 
-@interface MWMRoutePreview : SolidTouchView
-
-@property (nonatomic) CGFloat topOffset;
+@interface MWMRoutePreview : MWMNavigationView
 
 @property (nonatomic) BOOL showGoButton;
 
@@ -18,7 +16,4 @@
 @property (weak, nonatomic) IBOutlet UIButton * pedestrian;
 @property (weak, nonatomic) IBOutlet UIButton * vehicle;
 
-- (void)addToView:(UIView *)superview;
-- (void)remove;
-
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/RoutePreview/MWMRoutePreview.m b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.m
similarity index 55%
rename from iphone/Maps/Classes/CustomViews/NavigationDashboard/RoutePreview/MWMRoutePreview.m
rename to iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.m
index a0237058ea..d6e98a9f6d 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/RoutePreview/MWMRoutePreview.m
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.m
@@ -14,43 +14,16 @@
 @property (nonatomic) CGFloat goButtonHiddenOffset;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint * goButtonVerticalOffset;
 
-@property (nonatomic) BOOL shown;
-
 @end
 
 @implementation MWMRoutePreview
 
 - (void)awakeFromNib
 {
+  [super awakeFromNib];
   self.goButtonHiddenOffset = self.goButtonVerticalOffset.constant;
 }
 
-- (void)addToView:(UIView *)superview
-{
-  self.frame = self.defaultFrame;
-  [superview addSubview:self];
-  self.shown = YES;
-}
-
-- (void)remove
-{
-  self.shown = NO;
-}
-
-- (void)layoutSubviews
-{
-  [UIView animateWithDuration:0.2 animations:^
-  {
-    self.frame = self.defaultFrame;
-  }
-  completion:^(BOOL finished)
-  {
-    if (!self.shown)
-      [self removeFromSuperview];
-  }];
-  [super layoutSubviews];
-}
-
 - (IBAction)routeTypePressed:(UIButton *)sender
 {
   self.pedestrian.selected = self.vehicle.selected = NO;
@@ -59,17 +32,6 @@
 
 #pragma mark - Properties
 
-- (CGRect)defaultFrame
-{
-  return CGRectMake(0.0, self.topOffset - (self.shown ? 0.0 : self.height), self.superview.width, self.height);
-}
-
-- (void)setTopOffset:(CGFloat)topOffset
-{
-  _topOffset = topOffset;
-  [self layoutSubviews];
-}
-
 - (void)setShowGoButton:(BOOL)showGoButton
 {
   _showGoButton = showGoButton;
@@ -78,10 +40,4 @@
   [UIView animateWithDuration:0.2 animations:^{ [self layoutIfNeeded]; }];
 }
 
-- (void)setShown:(BOOL)shown
-{
-  _shown = shown;
-  [self layoutSubviews];
-}
-
 @end
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index a9ad3bf2c4..d727a1dc19 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -29,14 +29,10 @@
 		34570A3D1B13223000E6D4FD /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3C1B13223000E6D4FD /* libsqlite3.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
 		34570A3F1B13225500E6D4FD /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3E1B13225500E6D4FD /* Accounts.framework */; settings = {ATTRIBUTES = (Required, ); }; };
 		34570A411B13229300E6D4FD /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A401B13229300E6D4FD /* FBSDKLoginKit.framework */; settings = {ATTRIBUTES = (Required, ); }; };
-		3457D2101B5E2DD000428798 /* MWMRoutePreview.m in Sources */ = {isa = PBXBuildFile; fileRef = 3457D20D1B5E2DD000428798 /* MWMRoutePreview.m */; };
-		3457D2151B5E2DF600428798 /* MWMNavigationDashboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3457D2131B5E2DF600428798 /* MWMNavigationDashboard.mm */; };
-		3457D2161B5E2DF600428798 /* MWMNavigationDashboard.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3457D2141B5E2DF600428798 /* MWMNavigationDashboard.xib */; };
 		345C31711AE798DD00EA0CC2 /* MWMCategoriesInterfaceCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 345C316E1AE798DD00EA0CC2 /* MWMCategoriesInterfaceCell.m */; };
 		345C31721AE798DD00EA0CC2 /* MWMCategoriesInterfaceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345C31701AE798DD00EA0CC2 /* MWMCategoriesInterfaceController.mm */; };
 		345C31781AE799B600EA0CC2 /* MWMSearchResultCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 345C31751AE799B600EA0CC2 /* MWMSearchResultCell.m */; };
 		345C31791AE799B600EA0CC2 /* MWMSearchResultController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345C31771AE799B600EA0CC2 /* MWMSearchResultController.mm */; };
-		346564D11B5E8468001C7C42 /* MWMRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346564D01B5E8468001C7C42 /* MWMRoutePreview.xib */; };
 		347274731B0F4EE000756B37 /* me.maps.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 347274721B0F4EE000756B37 /* me.maps.entitlements */; };
 		347274771B0F4F3900756B37 /* me.maps.watchkitextension.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 347274761B0F4F3900756B37 /* me.maps.watchkitextension.entitlements */; };
 		347274791B0F4FD900756B37 /* me.maps.watchkitextension.production.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 347274781B0F4FD900756B37 /* me.maps.watchkitextension.production.entitlements */; };
@@ -66,6 +62,13 @@
 		34BC72291B0DECAE0012A34B /* MWMZoomButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC721D1B0DECAE0012A34B /* MWMZoomButtons.mm */; };
 		34BC722A1B0DECAE0012A34B /* MWMZoomButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BC721F1B0DECAE0012A34B /* MWMZoomButtonsView.m */; };
 		34BC722B1B0DECAE0012A34B /* MWMZoomButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BC72201B0DECAE0012A34B /* MWMZoomButtonsView.xib */; };
+		34D783D21B5F9D7800E0C0EE /* MWMLandscapeNavigationDashboard.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D783C91B5F9D7800E0C0EE /* MWMLandscapeNavigationDashboard.xib */; };
+		34D783D31B5F9D7800E0C0EE /* MWMNavigationDashboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D783CB1B5F9D7800E0C0EE /* MWMNavigationDashboard.mm */; };
+		34D783D41B5F9D7800E0C0EE /* MWMPortraitNavigationDashboard.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D783CC1B5F9D7800E0C0EE /* MWMPortraitNavigationDashboard.xib */; };
+		34D783D51B5F9D7800E0C0EE /* MWMLandscapeRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D783CE1B5F9D7800E0C0EE /* MWMLandscapeRoutePreview.xib */; };
+		34D783D61B5F9D7800E0C0EE /* MWMPortraitRoutePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D783CF1B5F9D7800E0C0EE /* MWMPortraitRoutePreview.xib */; };
+		34D783D71B5F9D7800E0C0EE /* MWMRoutePreview.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D783D11B5F9D7800E0C0EE /* MWMRoutePreview.m */; };
+		34D783DA1B5F9DB100E0C0EE /* MWMNavigationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D783D91B5F9DB100E0C0EE /* MWMNavigationView.m */; };
 		34DF4D111AE77B9F0012702D /* MWMWKInterfaceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34DF4D101AE77B9F0012702D /* MWMWKInterfaceController.mm */; };
 		45159BF91B0CA2D5009BFA85 /* resources-6plus in Resources */ = {isa = PBXBuildFile; fileRef = 45159BF81B0CA2D5009BFA85 /* resources-6plus */; };
 		454040621AD2D75E007A9B12 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46F26C7210F61FD600ECCA39 /* OpenGLES.framework */; };
@@ -383,11 +386,6 @@
 		34570A3C1B13223000E6D4FD /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
 		34570A3E1B13225500E6D4FD /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
 		34570A401B13229300E6D4FD /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKLoginKit.framework; path = Statistics/FBSDKLoginKit.framework; sourceTree = "<group>"; };
-		3457D20C1B5E2DD000428798 /* MWMRoutePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutePreview.h; sourceTree = "<group>"; };
-		3457D20D1B5E2DD000428798 /* MWMRoutePreview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMRoutePreview.m; sourceTree = "<group>"; };
-		3457D2121B5E2DF600428798 /* MWMNavigationDashboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboard.h; sourceTree = "<group>"; };
-		3457D2131B5E2DF600428798 /* MWMNavigationDashboard.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboard.mm; sourceTree = "<group>"; };
-		3457D2141B5E2DF600428798 /* MWMNavigationDashboard.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNavigationDashboard.xib; sourceTree = "<group>"; };
 		345C31681AE7860600EA0CC2 /* MWMWatchLocationTrackerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMWatchLocationTrackerDelegate.h; sourceTree = "<group>"; };
 		345C316D1AE798DD00EA0CC2 /* MWMCategoriesInterfaceCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCategoriesInterfaceCell.h; sourceTree = "<group>"; };
 		345C316E1AE798DD00EA0CC2 /* MWMCategoriesInterfaceCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMCategoriesInterfaceCell.m; sourceTree = "<group>"; };
@@ -397,7 +395,6 @@
 		345C31751AE799B600EA0CC2 /* MWMSearchResultCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSearchResultCell.m; sourceTree = "<group>"; };
 		345C31761AE799B600EA0CC2 /* MWMSearchResultController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchResultController.h; sourceTree = "<group>"; };
 		345C31771AE799B600EA0CC2 /* MWMSearchResultController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchResultController.mm; sourceTree = "<group>"; };
-		346564D01B5E8468001C7C42 /* MWMRoutePreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMRoutePreview.xib; sourceTree = "<group>"; };
 		347274721B0F4EE000756B37 /* me.maps.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = me.maps.entitlements; sourceTree = "<group>"; };
 		347274761B0F4F3900756B37 /* me.maps.watchkitextension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = me.maps.watchkitextension.entitlements; sourceTree = "<group>"; };
 		347274781B0F4FD900756B37 /* me.maps.watchkitextension.production.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = me.maps.watchkitextension.production.entitlements; sourceTree = "<group>"; };
@@ -447,6 +444,16 @@
 		34BC721F1B0DECAE0012A34B /* MWMZoomButtonsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMZoomButtonsView.m; sourceTree = "<group>"; };
 		34BC72201B0DECAE0012A34B /* MWMZoomButtonsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMZoomButtonsView.xib; sourceTree = "<group>"; };
 		34D56DDE1B3C310A00DFF4CC /* MWMSideMenuButtonDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuButtonDelegate.h; sourceTree = "<group>"; };
+		34D783C91B5F9D7800E0C0EE /* MWMLandscapeNavigationDashboard.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMLandscapeNavigationDashboard.xib; sourceTree = "<group>"; };
+		34D783CA1B5F9D7800E0C0EE /* MWMNavigationDashboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboard.h; sourceTree = "<group>"; };
+		34D783CB1B5F9D7800E0C0EE /* MWMNavigationDashboard.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationDashboard.mm; sourceTree = "<group>"; };
+		34D783CC1B5F9D7800E0C0EE /* MWMPortraitNavigationDashboard.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPortraitNavigationDashboard.xib; sourceTree = "<group>"; };
+		34D783CE1B5F9D7800E0C0EE /* MWMLandscapeRoutePreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMLandscapeRoutePreview.xib; sourceTree = "<group>"; };
+		34D783CF1B5F9D7800E0C0EE /* MWMPortraitRoutePreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPortraitRoutePreview.xib; sourceTree = "<group>"; };
+		34D783D01B5F9D7800E0C0EE /* MWMRoutePreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRoutePreview.h; sourceTree = "<group>"; };
+		34D783D11B5F9D7800E0C0EE /* MWMRoutePreview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMRoutePreview.m; sourceTree = "<group>"; };
+		34D783D81B5F9DB100E0C0EE /* MWMNavigationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNavigationView.h; sourceTree = "<group>"; };
+		34D783D91B5F9DB100E0C0EE /* MWMNavigationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMNavigationView.m; sourceTree = "<group>"; };
 		34DF4D0F1AE77B9F0012702D /* MWMWKInterfaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMWKInterfaceController.h; sourceTree = "<group>"; };
 		34DF4D101AE77B9F0012702D /* MWMWKInterfaceController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMWKInterfaceController.mm; sourceTree = "<group>"; };
 		3D443C9C19E421EE0025C2FC /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -1039,26 +1046,6 @@
 			path = FrameworkUtils;
 			sourceTree = "<group>";
 		};
-		3457D2081B5E2DD000428798 /* RoutePreview */ = {
-			isa = PBXGroup;
-			children = (
-				3457D20C1B5E2DD000428798 /* MWMRoutePreview.h */,
-				3457D20D1B5E2DD000428798 /* MWMRoutePreview.m */,
-				346564D01B5E8468001C7C42 /* MWMRoutePreview.xib */,
-			);
-			path = RoutePreview;
-			sourceTree = "<group>";
-		};
-		3457D2111B5E2DF600428798 /* Dashboard */ = {
-			isa = PBXGroup;
-			children = (
-				3457D2121B5E2DF600428798 /* MWMNavigationDashboard.h */,
-				3457D2131B5E2DF600428798 /* MWMNavigationDashboard.mm */,
-				3457D2141B5E2DF600428798 /* MWMNavigationDashboard.xib */,
-			);
-			path = Dashboard;
-			sourceTree = "<group>";
-		};
 		345C316A1AE7939B00EA0CC2 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -1137,8 +1124,7 @@
 			children = (
 				3497A9361B5CF8A900F51E55 /* MWMNavigationDashboardManager.h */,
 				3497A9371B5CF8A900F51E55 /* MWMNavigationDashboardManager.mm */,
-				3457D2081B5E2DD000428798 /* RoutePreview */,
-				3457D2111B5E2DF600428798 /* Dashboard */,
+				34D783C71B5F9D7800E0C0EE /* Views */,
 			);
 			name = NavigationDashboard;
 			path = ../NavigationDashboard;
@@ -1241,6 +1227,39 @@
 			path = ZoomButtons;
 			sourceTree = "<group>";
 		};
+		34D783C71B5F9D7800E0C0EE /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				34D783D81B5F9DB100E0C0EE /* MWMNavigationView.h */,
+				34D783D91B5F9DB100E0C0EE /* MWMNavigationView.m */,
+				34D783C81B5F9D7800E0C0EE /* Dashboard */,
+				34D783CD1B5F9D7800E0C0EE /* RoutePreview */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		34D783C81B5F9D7800E0C0EE /* Dashboard */ = {
+			isa = PBXGroup;
+			children = (
+				34D783CA1B5F9D7800E0C0EE /* MWMNavigationDashboard.h */,
+				34D783CB1B5F9D7800E0C0EE /* MWMNavigationDashboard.mm */,
+				34D783C91B5F9D7800E0C0EE /* MWMLandscapeNavigationDashboard.xib */,
+				34D783CC1B5F9D7800E0C0EE /* MWMPortraitNavigationDashboard.xib */,
+			);
+			path = Dashboard;
+			sourceTree = "<group>";
+		};
+		34D783CD1B5F9D7800E0C0EE /* RoutePreview */ = {
+			isa = PBXGroup;
+			children = (
+				34D783D01B5F9D7800E0C0EE /* MWMRoutePreview.h */,
+				34D783D11B5F9D7800E0C0EE /* MWMRoutePreview.m */,
+				34D783CE1B5F9D7800E0C0EE /* MWMLandscapeRoutePreview.xib */,
+				34D783CF1B5F9D7800E0C0EE /* MWMPortraitRoutePreview.xib */,
+			);
+			path = RoutePreview;
+			sourceTree = "<group>";
+		};
 		6C47C8C21AD6C76A000C52C1 /* Location */ = {
 			isa = PBXGroup;
 			children = (
@@ -2091,10 +2110,10 @@
 				F67BC26F1B254B2000FE1D7B /* MWMPlacePageDescriptionView.xib in Resources */,
 				EE026F0611D6AC0D00645242 /* classificator.txt in Resources */,
 				FA065FED128614C400FEA989 /* MainWindow-iPad.xib in Resources */,
-				346564D11B5E8468001C7C42 /* MWMRoutePreview.xib in Resources */,
 				FA46DA2C12D4166E00968C36 /* countries.txt in Resources */,
 				EE583CBB12F773F00042CBE3 /* unicode_blocks.txt in Resources */,
 				EEFE7C1412F8C9E1006AF8C3 /* fonts_blacklist.txt in Resources */,
+				34D783D51B5F9D7800E0C0EE /* MWMLandscapeRoutePreview.xib in Resources */,
 				F64F199E1AB81A00006EAF7E /* MWMDefaultAlert.xib in Resources */,
 				EEFE7C1512F8C9E1006AF8C3 /* fonts_whitelist.txt in Resources */,
 				F64F4B711B4A41D40081A24A /* MWMDownloaderDialogHeader.xib in Resources */,
@@ -2123,6 +2142,7 @@
 				97FC99E019C1A2CD00C1CF98 /* resources-xxhdpi in Resources */,
 				97719D4B1843B86700BDD815 /* Main_iPad.storyboard in Resources */,
 				F64F19A41AB81A00006EAF7E /* MWMDownloadTransitMapAlert.xib in Resources */,
+				34D783D41B5F9D7800E0C0EE /* MWMPortraitNavigationDashboard.xib in Resources */,
 				F6BBF2C81B4FFB8C000CF8E2 /* MWMLocationAlert.xib in Resources */,
 				97A5967F19B9CD47007A963F /* copyright.html in Resources */,
 				978F9247183B6671000D6C7C /* Main_iPhone.storyboard in Resources */,
@@ -2141,8 +2161,10 @@
 				F67BBB581AC54A7800D162C7 /* MWMFeedbackAlert.xib in Resources */,
 				FA140653162A6288002BC1ED /* empty.png in Resources */,
 				FA140655162A6288002BC1ED /* eye.png in Resources */,
+				34D783D61B5F9D7800E0C0EE /* MWMPortraitRoutePreview.xib in Resources */,
 				FA140657162A6288002BC1ED /* eye@2x.png in Resources */,
 				F7E7BA221672328F00B4492E /* atm.png in Resources */,
+				34D783D21B5F9D7800E0C0EE /* MWMLandscapeNavigationDashboard.xib in Resources */,
 				F7E7BA231672328F00B4492E /* atm@2x.png in Resources */,
 				F7E7BA241672328F00B4492E /* bank.png in Resources */,
 				34BC72231B0DECAE0012A34B /* MWMLocationButton.xib in Resources */,
@@ -2163,7 +2185,6 @@
 				F6CB21641AEFC42800FB8963 /* PlacePageActionBar.xib in Resources */,
 				F6CB216A1AF1303900FB8963 /* PlacePageBookmarkCell.xib in Resources */,
 				F7E7BA2D1672328F00B4492E /* hospital@2x.png in Resources */,
-				3457D2161B5E2DF600428798 /* MWMNavigationDashboard.xib in Resources */,
 				F7E7BA2E1672328F00B4492E /* parking.png in Resources */,
 				F7E7BA2F1672328F00B4492E /* parking@2x.png in Resources */,
 				F64F4B6F1B46A5380081A24A /* MWMDownloaderDialogCell.xib in Resources */,
@@ -2280,11 +2301,11 @@
 				976D86F119C877E600C920EF /* MapCell.mm in Sources */,
 				F6C934401AE64E4200DDC624 /* MWMSpringAnimation.mm in Sources */,
 				977E26C219E31BCC00BA2219 /* ActiveMapsVC.mm in Sources */,
-				3457D2101B5E2DD000428798 /* MWMRoutePreview.m in Sources */,
 				B08AA8CE1A24C7BC00810B1C /* LocalNotificationInfoProvider.m in Sources */,
 				1D3623260D0F684500981E51 /* MapsAppDelegate.mm in Sources */,
 				F67BBB571AC54A7800D162C7 /* MWMFeedbackAlert.mm in Sources */,
-				349A35831B53E967009677EE /* MWMDownloadMapRequest.mm in Sources */,
+				34D783D71B5F9D7800E0C0EE /* MWMRoutePreview.m in Sources */,
+				349A35831B53E967009677EE /* MWMDownloadMapRequest.m in Sources */,
 				A32B6D4C1A14980500E54A65 /* iosOGLContext.mm in Sources */,
 				B0E1FCDF1A2343BC00A8E08B /* NextTurnPhoneView.m in Sources */,
 				46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */,
@@ -2324,6 +2345,7 @@
 				F67BC2751B254F5500FE1D7B /* MWMPlacePageTypeDescription.mm in Sources */,
 				B08AA8DA1A26299A00810B1C /* TimeUtils.m in Sources */,
 				F6CB216D1AF13EBD00FB8963 /* MWMPlacePageBookmarkCell.mm in Sources */,
+				34D783DA1B5F9DB100E0C0EE /* MWMNavigationView.m in Sources */,
 				F653D4231AE9398700282659 /* MWMPlacePageViewManager.mm in Sources */,
 				F65243351B0B634F00BFA9D4 /* MWMPlacePage+Animation.mm in Sources */,
 				976D86F519CB21BD00C920EF /* RouteView.mm in Sources */,
@@ -2348,7 +2370,6 @@
 				FAF457E715597D4600DCCC49 /* Framework.cpp in Sources */,
 				97CC93BB19599F4700369B42 /* SearchSuggestCell.m in Sources */,
 				FA054612155C465E001F4E37 /* SelectSetVC.mm in Sources */,
-				3457D2151B5E2DF600428798 /* MWMNavigationDashboard.mm in Sources */,
 				FAA614B8155F16950031C345 /* AddSetVC.mm in Sources */,
 				977E26C619E31BDF00BA2219 /* DownloaderParentVC.mm in Sources */,
 				FAAEA7D5161D8D3100CCD661 /* BookmarksRootVC.mm in Sources */,
@@ -2364,6 +2385,7 @@
 				CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */,
 				978F9244183B660F000D6C7C /* SwitchCell.m in Sources */,
 				342AD7721B53D32F00E0B997 /* UIView+RuntimeAttributes.m in Sources */,
+				34D783D31B5F9D7800E0C0EE /* MWMNavigationDashboard.mm in Sources */,
 				F64F4B6D1B46A51F0081A24A /* MWMDownloaderDialogCell.mm in Sources */,
 				97508423199522D300A7457D /* SettingsAndMoreVC.mm in Sources */,
 				F6ED13541B1643900095C6DE /* MWMDirectionView.mm in Sources */,