diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib
index 358870b9ee..e7430e7fe0 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib
@@ -376,7 +376,7 @@
                                 <action selector="soundTouchUpInside:" destination="-1" eventType="touchUpInside" id="CEW-OG-NlS"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kyc-p0-3HI" customClass="MWMStopButton">
+                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kyc-p0-3HI" customClass="MWMStopButton">
                             <rect key="frame" x="112" y="14" width="96" height="36"/>
                             <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
index 6b5cff6913..85a79f9204 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -311,12 +311,18 @@ extern NSString * const kAlohalyticsTapEventKey;
 
 - (void)navigationDashBoardDidUpdate
 {
-  CGFloat const topBound = self.topBound + self.navigationManager.height;
-  if (!IPAD)
+  if (IPAD)
+  {
+    [self.placePageManager setTopBound:self.topBound + self.navigationManager.leftHeight];
+  }
+  else
+  {
+    CGFloat const topBound = self.topBound + self.navigationManager.rightHeight;
     [self.sideButtons setTopBound:topBound];
-  BOOL const skipNavDashboardHeight =
-      self.navigationManager.state == MWMNavigationDashboardStateNavigation;
-  [self.placePageManager setTopBound:skipNavDashboardHeight ? self.topBound : topBound];
+    BOOL const skipNavDashboardHeight =
+        self.navigationManager.state == MWMNavigationDashboardStateNavigation;
+    [self.placePageManager setTopBound:skipNavDashboardHeight ? self.topBound : topBound];
+  }
 }
 
 - (void)didStartEditingRoutePoint:(BOOL)isSource
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
index ca4bc37f42..0e707c1e34 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
@@ -36,7 +36,8 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState) {
 @property(nonatomic) CGFloat topBound;
 @property(nonatomic) CGFloat leftBound;
 @property(nonatomic, readonly) CGFloat extraCompassBottomOffset;
-@property(nonatomic, readonly) CGFloat height;
+@property(nonatomic, readonly) CGFloat leftHeight;
+@property(nonatomic, readonly) CGFloat rightHeight;
 
 - (instancetype)init __attribute__((unavailable("init is not available")));
 - (instancetype)initWithParentView:(UIView *)view
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index 75db4dcd88..b1aa5c79b3 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -190,7 +190,7 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>;
     self.navigationInfoView.leftBound = leftBound;
 }
 
-- (CGFloat)height
+- (CGFloat)leftHeight
 {
   switch (self.state)
   {
@@ -199,10 +199,22 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>;
   case MWMNavigationDashboardStateReady:
   case MWMNavigationDashboardStateError:
   case MWMNavigationDashboardStatePrepare:
-    if (IPAD)
-      return self.topBound;
-    return self.routePreview.visibleHeight;
-  case MWMNavigationDashboardStateNavigation: return self.navigationInfoView.visibleHeight;
+    return IPAD ? self.topBound : self.routePreview.visibleHeight;
+  case MWMNavigationDashboardStateNavigation: return self.navigationInfoView.leftHeight;
+  }
+}
+
+- (CGFloat)rightHeight
+{
+  switch (self.state)
+  {
+  case MWMNavigationDashboardStateHidden: return 0.0;
+  case MWMNavigationDashboardStatePlanning:
+  case MWMNavigationDashboardStateReady:
+  case MWMNavigationDashboardStateError:
+  case MWMNavigationDashboardStatePrepare:
+    return IPAD ? self.topBound : self.routePreview.visibleHeight;
+  case MWMNavigationDashboardStateNavigation: return self.navigationInfoView.rightHeight;
   }
 }
 
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.h
index 032c48ec55..9a797b0469 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.h
@@ -16,7 +16,8 @@ enum class NavigationSearchState
 
 @property(nonatomic) CGFloat leftBound;
 @property(nonatomic, readonly) CGFloat extraCompassBottomOffset;
-@property(nonatomic, readonly) CGFloat visibleHeight;
+@property(nonatomic, readonly) CGFloat leftHeight;
+@property(nonatomic, readonly) CGFloat rightHeight;
 @property(nonatomic, readonly) NavigationSearchState searchState;
 
 - (void)addToView:(UIView *)superview;
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
index 1d5adc9966..ebbacbd4f1 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
@@ -111,7 +111,8 @@ BOOL defaultOrientation()
   [super layoutSubviews];
 }
 
-- (CGFloat)visibleHeight { return self.streetNameView.maxY; }
+- (CGFloat)leftHeight { return self.turnsView.maxY; }
+- (CGFloat)rightHeight { return self.streetNameView.maxY; }
 - (void)setMapSearch { [self setSearchState:NavigationSearchState::MinimizedSearch animated:YES]; }
 #pragma mark - Search