diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib
index 17d409d9e0..0f615ffb83 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6751" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
diff --git a/iphone/Maps/Classes/MWMPlacePageActionBar.mm b/iphone/Maps/Classes/MWMPlacePageActionBar.mm
index ee6dfa6d02..61d7b67ce1 100644
--- a/iphone/Maps/Classes/MWMPlacePageActionBar.mm
+++ b/iphone/Maps/Classes/MWMPlacePageActionBar.mm
@@ -74,7 +74,7 @@ static NSString * const kPlacePageActionBarNibName = @"PlacePageActionBar";
 - (void)layoutSubviews
 {
   BOOL const isMyPosition = self.placePage.manager.entity.type == MWMPlacePageEntityTypeMyPosition;
-  if (GetFramework().IsRouteBuilding())
+  if (GetFramework().IsRouteBuilding() && !isMyPosition)
     [self startActivityIndicator];
 
   CGPoint const center = self.center;
@@ -83,9 +83,10 @@ static NSString * const kPlacePageActionBarNibName = @"PlacePageActionBar";
   {
     CGSize const size = [[UIScreen mainScreen] bounds].size;
     CGFloat const maximumWidth = 360.;
-    CGFloat const screenWidth = MIN(size.height, maximumWidth);
-    self.bookmarkButton.center = CGPointMake(3. * screenWidth / 4., self.bookmarkButton.center.y);
-    self.shareButton.center = CGPointMake(screenWidth / 4., self.bookmarkButton.center.y);
+    CGFloat const actualWidth = MIN(MIN(size.height, size.width), maximumWidth);
+    self.bookmarkButton.center = CGPointMake(3. * actualWidth / 4., self.bookmarkButton.center.y);
+    self.shareButton.center = CGPointMake(actualWidth / 4., self.bookmarkButton.center.y);
+    [self.indicatior removeFromSuperview];
   }
   else
   {