diff --git a/iphone/Maps/Bookmarks/AddSetVC.mm b/iphone/Maps/Bookmarks/AddSetVC.mm
index 4ebbc2728b..922a19ca37 100644
--- a/iphone/Maps/Bookmarks/AddSetVC.mm
+++ b/iphone/Maps/Bookmarks/AddSetVC.mm
@@ -2,6 +2,7 @@
 #import "AddSetVC.h"
 #import "Framework.h"
 #import "UIKitCategories.h"
+#import "UIViewController+Navigation.h"
 
 #define TEXT_FIELD_TAG 666
 
@@ -17,11 +18,7 @@
 {
   [super viewDidLoad];
   self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(onSaveClicked)];
-  UIImage * backImage = [UIImage imageNamed:@"NavigationBarBackButton"];
-  UIButton * backButton = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., backImage.size.width, backImage.size.height)];
-  [backButton addTarget:self action:@selector(onCancelClicked) forControlEvents:UIControlEventTouchUpInside];
-  [backButton setImage:backImage forState:UIControlStateNormal];
-  self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton];
+  [(UIViewController *)self showBackButton];
   self.title = L(@"add_new_set");
 }
 
diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm
index cc44298132..301b2cf6e2 100644
--- a/iphone/Maps/Bookmarks/SelectSetVC.mm
+++ b/iphone/Maps/Bookmarks/SelectSetVC.mm
@@ -5,6 +5,7 @@
 #import "UIKitCategories.h"
 #import "MWMPlacePageViewManager.h"
 #import "MWMPlacePageEntity.h"
+#import "UIViewController+Navigation.h"
 
 @interface SelectSetVC () <AddSetVCDelegate>
 
@@ -25,31 +26,23 @@
   return self;
 }
 
-- (void)viewDidLoad
-{
-  [super viewDidLoad];
-  if (!self.iPadOwnerNavigationController)
-    return;
-  [self.iPadOwnerNavigationController setNavigationBarHidden:NO];
-  UIImage * backImage = [UIImage imageNamed:@"NavigationBarBackButton"];
-  UIButton * backButton = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., backImage.size.width, backImage.size.height)];
-  [backButton addTarget:self action:@selector(backTap) forControlEvents:UIControlEventTouchUpInside];
-  [backButton setImage:backImage forState:UIControlStateNormal];
-  [self.navigationItem setLeftBarButtonItem:[[UIBarButtonItem alloc] initWithCustomView:backButton]];
-}
-
 - (void)viewWillAppear:(BOOL)animated
 {
   [super viewWillAppear:animated];
   if (!self.iPadOwnerNavigationController)
     return;
 
+  [self.iPadOwnerNavigationController setNavigationBarHidden:NO];
+  [(UIViewController *)self showBackButton];
   CGFloat const bottomOffset = 88.;
   self.iPadOwnerNavigationController.view.height = self.tableView.height + bottomOffset;
 }
 
 - (void)backTap
 {
+  if (self.iPadOwnerNavigationController)
+    [self.iPadOwnerNavigationController setNavigationBarHidden:YES];
+
   [self.navigationController popViewControllerAnimated:YES];
 }
 
@@ -139,13 +132,4 @@
   }
 }
 
-- (void)viewWillDisappear:(BOOL)animated
-{
-  [super viewWillDisappear:animated];
-  if (!self.iPadOwnerNavigationController)
-    return;
-
-  self.iPadOwnerNavigationController.navigationBar.hidden = YES;
-}
-
 @end
diff --git a/iphone/Maps/Classes/MWMBasePlacePageView.mm b/iphone/Maps/Classes/MWMBasePlacePageView.mm
index 0ebe134b7d..4639079f5c 100644
--- a/iphone/Maps/Classes/MWMBasePlacePageView.mm
+++ b/iphone/Maps/Classes/MWMBasePlacePageView.mm
@@ -79,7 +79,7 @@ extern CGFloat const kBookmarkCellHeight = 135.;
   [self layoutSubviews];
 }
 
-static CGFloat const kPlacePageTitleKoefficient = 0.6375;
+static CGFloat const kPlacePageTitleKoefficient = 0.63;
 static CGFloat const kLeftOffset = 16.;
 static CGFloat const kDirectionArrowSide = 32.;
 static CGFloat const kOffsetFromTitleToDistance = 12.;
@@ -108,7 +108,6 @@ static CGFloat const kTitleBottomOffset = 2.;
   self.titleLabel.origin = CGPointMake(kLeftOffset, topOffset);
   self.typeLabel.origin = CGPointMake(kLeftOffset, typeMinY);
 
-  [self layoutDistanceLabelWithPlacePageWidth:placePageWidth];
   [self.typeDescriptionView removeFromSuperview];
   if (isExtendedType)
     [self layoutTypeDescription];
@@ -116,6 +115,7 @@ static CGFloat const kTitleBottomOffset = 2.;
   CGFloat const typeHeight = self.typeLabel.text.length > 0 ? self.typeLabel.height : self.typeDescriptionView.height;
   self.featureTable.minY = typeMinY + typeHeight + typeBottomOffset;
   self.separatorView.minY = self.featureTable.minY - 1;
+  [self layoutDistanceLabelWithPlacePageWidth:placePageWidth];
   self.featureTable.height = self.featureTable.contentSize.height;
   self.height = typeBottomOffset + kTitleBottomOffset + self.titleLabel.height + self.typeLabel.height + self.featureTable.height;
 }
@@ -142,13 +142,11 @@ static CGFloat const kTitleBottomOffset = 2.;
   CGFloat const distanceLabelWidthPositionLeft = placePageWidth - maximumTitleWidth - kDirectionArrowSide - 2 * kLeftOffset - kOffsetFromDistanceToArrow - kOffsetFromTitleToDistance;
   self.distanceLabel.width = distanceLabelWidthPositionLeft;
   [self.distanceLabel sizeToFit];
-  CGFloat const titleCenterY = self.titleLabel.center.y;
   CGFloat const directionArrowMinX = placePageWidth - kLeftOffset - kDirectionArrowSide;
   CGFloat const distanceLabelMinX = directionArrowMinX - self.distanceLabel.width - kOffsetFromDistanceToArrow;
-  CGFloat const distanceLabelMinY = titleCenterY - self.distanceLabel.height / 2.;
-  CGFloat const directionArrowMinY = titleCenterY - kDirectionArrowSide / 2.;
-  self.distanceLabel.origin = CGPointMake(distanceLabelMinX, distanceLabelMinY);
-  self.directionArrow.center = CGPointMake(directionArrowMinX + kDirectionArrowSide / 2., directionArrowMinY + kDirectionArrowSide / 2.);
+  CGFloat const directionArrowCenterY = self.separatorView.maxY / 2.;
+  self.directionArrow.center = CGPointMake(directionArrowMinX + kDirectionArrowSide / 2., directionArrowCenterY);
+  self.distanceLabel.origin = CGPointMake(distanceLabelMinX, directionArrowCenterY - self.distanceLabel.height / 2.);
   self.directionButton.origin = self.directionArrow.origin;
 }
 
diff --git a/iphone/Maps/Classes/MWMBookmarkColorCell.xib b/iphone/Maps/Classes/MWMBookmarkColorCell.xib
index 25e935444f..516007831b 100644
--- a/iphone/Maps/Classes/MWMBookmarkColorCell.xib
+++ b/iphone/Maps/Classes/MWMBookmarkColorCell.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="7702" systemVersion="14D131" 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="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMBookmarkColorViewController"/>
@@ -11,16 +11,9 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="3MP-b3-Pk5">
-                        <rect key="frame" x="8" y="0.0" width="36" height="43"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
-                        <state key="normal">
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
-                    </button>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Красный" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="15v-Tv-AWS">
                         <rect key="frame" x="60" y="11" width="216" height="21"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
@@ -32,6 +25,13 @@
                         <rect key="frame" x="290" y="15" width="14" height="14"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
                     </imageView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="3MP-b3-Pk5">
+                        <rect key="frame" x="16" y="8" width="28" height="28"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
+                        <state key="normal">
+                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                        </state>
+                    </button>
                 </subviews>
             </tableViewCellContentView>
             <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
diff --git a/iphone/Maps/Classes/MWMBookmarkColorViewController.mm b/iphone/Maps/Classes/MWMBookmarkColorViewController.mm
index fa54c23d10..1543b0d37e 100644
--- a/iphone/Maps/Classes/MWMBookmarkColorViewController.mm
+++ b/iphone/Maps/Classes/MWMBookmarkColorViewController.mm
@@ -11,6 +11,7 @@
 #import "MWMBookmarkColorCell.h"
 #import "MWMPlacePageEntity.h"
 #import "MWMPlacePageViewManager.h"
+#import "UIViewController+navigation.h"
 
 extern NSArray * const kBookmarkColorsVariant;
 
@@ -31,20 +32,9 @@ static NSString * const kBookmarkColorCellIdentifier = @"MWMBookmarkColorCell";
 - (void)viewDidLoad
 {
   [super viewDidLoad];
-  [self.iPadOwnerNavigationController setNavigationBarHidden:NO];
   self.title = L(@"bookmark_color");
   [self.tableView registerNib:[UINib nibWithNibName:kBookmarkColorCellIdentifier bundle:nil] forCellReuseIdentifier:kBookmarkColorCellIdentifier];
   self.colorWasChanged = NO;
-  if (!self.iPadOwnerNavigationController)
-    return;
-
-  CGFloat const bottomOffset = 88.;
-  self.iPadOwnerNavigationController.view.height = self.tableView.height + bottomOffset;
-  UIImage * backImage = [UIImage imageNamed:@"NavigationBarBackButton"];
-  UIButton * backButton = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., backImage.size.width, backImage.size.height)];
-  [backButton addTarget:self action:@selector(backTap) forControlEvents:UIControlEventTouchUpInside];
-  [backButton setImage:backImage forState:UIControlStateNormal];
-  [self.navigationItem setLeftBarButtonItem:[[UIBarButtonItem alloc] initWithCustomView:backButton]];
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -52,10 +42,20 @@ static NSString * const kBookmarkColorCellIdentifier = @"MWMBookmarkColorCell";
   [super viewWillAppear:animated];
   [self configureTableViewForOrientation:self.interfaceOrientation];
   [self.tableView reloadData];
+  if (!self.iPadOwnerNavigationController)
+    return;
+
+  [self.iPadOwnerNavigationController setNavigationBarHidden:NO];
+  CGFloat const bottomOffset = 88.;
+  self.iPadOwnerNavigationController.view.height = self.tableView.height + bottomOffset;
+  [self showBackButton];
 }
 
 - (void)backTap
 {
+  if (self.iPadOwnerNavigationController)
+   [self.iPadOwnerNavigationController setNavigationBarHidden:YES];
+
   [self.navigationController popViewControllerAnimated:YES];
 }
 
@@ -113,8 +113,6 @@ static NSString * const kBookmarkColorCellIdentifier = @"MWMBookmarkColorCell";
   [super viewWillDisappear:animated];
   if (self.colorWasChanged && !self.iPadOwnerNavigationController)
     [self.placePageManager reloadBookmark];
-  else
-    self.iPadOwnerNavigationController.navigationBar.hidden = YES;
 }
 
 @end
diff --git a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
index 0a83e931aa..4d6e2c5b81 100644
--- a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
+++ b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
@@ -11,6 +11,7 @@
 #import "MWMPlacePage.h"
 #import "MWMPlacePageEntity.h"
 #import "UIKitCategories.h"
+#import "UIViewController+Navigation.h"
 
 static NSString * const kBookmarkDescriptionViewControllerNibName = @"MWMBookmarkDescriptionViewController";
 static CGFloat const kIpadPlacePageDefaultHeight = 288.;
@@ -38,7 +39,6 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
 
 @implementation MWMBookmarkDescriptionViewController
 
-
 - (instancetype)initWithPlacePageManager:(MWMPlacePageViewManager *)manager
 {
   self = [super initWithNibName:kBookmarkDescriptionViewControllerNibName bundle:nil];
@@ -51,7 +51,6 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
 - (void)viewDidLoad
 {
   [super viewDidLoad];
-  [self.iPadOwnerNavigationController setNavigationBarHidden:NO];
   self.navigationItem.title = L(@"description");
   MWMPlacePageEntity const * entity = self.manager.entity;
 
@@ -63,11 +62,8 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
   if (self.iPadOwnerNavigationController)
   {
     self.realPlacePageHeight = self.iPadOwnerNavigationController.view.height;
-    UIImage * backImage = [UIImage imageNamed:@"NavigationBarBackButton"];
-    UIButton * backButton = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., backImage.size.width, backImage.size.height)];
-    [backButton addTarget:self action:@selector(backTap) forControlEvents:UIControlEventTouchUpInside];
-    [backButton setImage:backImage forState:UIControlStateNormal];
-    [self.navigationItem setLeftBarButtonItem:[[UIBarButtonItem alloc] initWithCustomView:backButton]];
+    UIBarButtonItem * leftButton = [[UIBarButtonItem alloc] initWithCustomView:self.backButton];
+    [self.navigationItem setLeftBarButtonItem:leftButton];
     return;
   }
 
@@ -85,21 +81,14 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
   [super viewWillAppear:animated];
   if (!self.iPadOwnerNavigationController)
     return;
+
+  [self.iPadOwnerNavigationController setNavigationBarHidden:NO];
   CGFloat const bottomOffset = 12.;
   self.iPadOwnerNavigationController.view.height = kIpadPlacePageDefaultHeight;
   self.textView.height = kIpadPlacePageDefaultHeight - bottomOffset;
   self.webView.height = kIpadPlacePageDefaultHeight - bottomOffset;
 }
 
-- (void)viewWillDisappear:(BOOL)animated
-{
-  [super viewWillDisappear:animated];
-  if (!self.iPadOwnerNavigationController)
-    return;
-
-  self.iPadOwnerNavigationController.navigationBar.hidden = YES;
-}
-
 - (void)setState:(BookmarkDescriptionState)state
 {
   MWMPlacePageEntity * entity = self.manager.entity;
@@ -155,7 +144,7 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
 
 - (void)configureNavigationBarForView
 {
-  self.leftButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"NavigationBarBackButton"] style:UIBarButtonItemStylePlain target:self action:@selector(backTap)];
+  self.leftButton = [[UIBarButtonItem alloc] initWithCustomView:self.backButton];
   self.rightButton = [[UIBarButtonItem alloc] initWithTitle:L(@"edit") style:UIBarButtonItemStylePlain target:self action:@selector(editTap)];
   [self setupButtons];
 }
@@ -204,7 +193,7 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
     [self.navigationController popViewControllerAnimated:YES];
     return;
   }
-
+  [self.iPadOwnerNavigationController setNavigationBarHidden:YES];
   [UIView animateWithDuration:0.1 animations:^
   {
     self.iPadOwnerNavigationController.view.height = self.realPlacePageHeight;
@@ -250,4 +239,17 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
   return YES;
 }
 
+#pragma mark - Buttons
+
+- (UIButton *)backButton
+{
+  UIImage * backImage = [UIImage imageNamed:@"NavigationBarBackButton"];
+  CGFloat const imageSide = backImage.size.width;
+  UIButton * button = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., imageSide, imageSide)];
+  [button setImage:backImage forState:UIControlStateNormal];
+  [button addTarget:self action:@selector(backTap) forControlEvents:UIControlEventTouchUpInside];
+  button.imageEdgeInsets = UIEdgeInsetsMake(0., -imageSide, 0., 0.);
+  return button;
+}
+
 @end
diff --git a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
index 520488b4e9..f83db6a089 100644
--- a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
+++ b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
@@ -22,6 +22,7 @@ extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @
 @property (weak, nonatomic, readwrite) IBOutlet UIButton * categoryButton;
 @property (weak, nonatomic, readwrite) IBOutlet UIButton * markButton;
 @property (weak, nonatomic, readwrite) IBOutlet UILabel * descriptionLabel;
+@property (weak, nonatomic) IBOutlet UIImageView * icon;
 
 @property (weak, nonatomic) IBOutlet UIView * firstSeparatorView;
 @property (weak, nonatomic) IBOutlet UIView * secondSeparatorView;
@@ -67,6 +68,13 @@ extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @
   [textField resignFirstResponder];
 }
 
+- (void)layoutSubviews
+{
+  CGFloat const leftOffset = 16.;
+  CGFloat const topOffset = 14.;
+  self.icon.origin = CGPointMake(leftOffset, topOffset);
+}
+
 - (BOOL)textFieldShouldClear:(UITextField *)textField
 {
   return YES;
diff --git a/iphone/Maps/Classes/MWMPlacePageInfoCell.mm b/iphone/Maps/Classes/MWMPlacePageInfoCell.mm
index a986f77780..f2d5eef232 100644
--- a/iphone/Maps/Classes/MWMPlacePageInfoCell.mm
+++ b/iphone/Maps/Classes/MWMPlacePageInfoCell.mm
@@ -61,7 +61,7 @@ extern NSString * const kUserDefaultsLatLonAsDMSKey;
   
   UIImage * image = [UIImage imageNamed:imageName];
   self.type = type;
-  [self.imageView setImage:image];
+  self.icon.image = image;
 
   if ([self.textContainer isKindOfClass:[UITextView class]])
     [self.textContainer setAttributedText:[[NSAttributedString alloc] initWithString:info attributes:@{NSFontAttributeName : [UIFont fontWithName:@"HelveticaNeue-Light" size:16.]}]];
@@ -78,6 +78,14 @@ extern NSString * const kUserDefaultsLatLonAsDMSKey;
   return YES;
 }
 
+- (void)layoutSubviews
+{
+  CGFloat const leftOffset = 16.;
+  CGFloat const topOffset = 14.;;
+  self.icon.origin = CGPointMake(leftOffset, topOffset);
+  [self.textContainer setMinX:3 * leftOffset];
+}
+
 - (IBAction)cellTap
 {
   if (self.type != MWMPlacePageMetadataTypeCoordinate)
diff --git a/iphone/Maps/Classes/MWMiPadPlacePage.mm b/iphone/Maps/Classes/MWMiPadPlacePage.mm
index 431f0f0ce5..80c9079e18 100644
--- a/iphone/Maps/Classes/MWMiPadPlacePage.mm
+++ b/iphone/Maps/Classes/MWMiPadPlacePage.mm
@@ -15,13 +15,14 @@
 #import "SelectSetVC.h"
 #import "UIViewController+Navigation.h"
 #import "MWMBookmarkDescriptionViewController.h"
+#import "ViewController.h"
 
 extern CGFloat kBookmarkCellHeight;
 static CGFloat const kLeftOffset = 12.;
 static CGFloat const kTopOffset = 36.;
 static CGFloat const kBottomOffset = 12.;
 
-@interface MWMiPadPlacePageViewController : UIViewController
+@interface MWMiPadPlacePageViewController : ViewController
 
 @end
 
@@ -74,7 +75,7 @@ static CGFloat const kBottomOffset = 12.;
 - (UIViewController *)popViewControllerAnimated:(BOOL)animated
 {
   NSUInteger const count = self.viewControllers.count;
-  CGFloat const height = count > 1 ? ((UIViewController *)self.viewControllers[count - 2]).view.height + self.navigationBar.height: 0.0;
+  CGFloat const height = count > 1 ? ((UIViewController *)self.viewControllers[count - 2]).view.height : 0.0;
 
   [UIView animateWithDuration:0.1 animations:^
   {
diff --git a/iphone/Maps/Classes/PlacePageBookmarkCell.xib b/iphone/Maps/Classes/PlacePageBookmarkCell.xib
index d50f8e90f1..343250755c 100644
--- a/iphone/Maps/Classes/PlacePageBookmarkCell.xib
+++ b/iphone/Maps/Classes/PlacePageBookmarkCell.xib
@@ -20,21 +20,20 @@
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
                     </view>
                     <view contentMode="scaleToFill" id="X0g-D4-i58">
-                        <rect key="frame" x="40" y="81" width="280" height="1"/>
+                        <rect key="frame" x="48" y="81" width="272" height="1"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
                     </view>
                     <view contentMode="scaleToFill" id="jSl-xq-N7n">
-                        <rect key="frame" x="40" y="44" width="220" height="1"/>
+                        <rect key="frame" x="48" y="44" width="212" height="1"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
                     </view>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="IZm-JR-i7Q">
-                        <rect key="frame" x="44" y="45" width="220" height="36"/>
+                        <rect key="frame" x="48" y="45" width="216" height="36"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
-                        <inset key="contentEdgeInsets" minX="-3" minY="0.0" maxX="0.0" maxY="0.0"/>
                         <state key="normal" title="My marks &gt;">
                             <color key="titleColor" red="0.094117647060000004" green="0.61960784310000006" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -43,19 +42,6 @@
                             <action selector="categoryButtonTap" destination="riP-j7-sc5" eventType="touchUpInside" id="MSi-Yf-pko"/>
                         </connections>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="rer-vk-fBj">
-                        <rect key="frame" x="40" y="82" width="280" height="32"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
-                        <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="9" maxY="0.0"/>
-                        <state key="normal" title="&gt;">
-                            <color key="titleColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
-                        <connections>
-                            <action selector="editTap" destination="riP-j7-sc5" eventType="touchUpInside" id="anV-lp-0Gq"/>
-                        </connections>
-                    </button>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="07N-gj-Msx">
                         <rect key="frame" x="278" y="14" width="28" height="28"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
@@ -67,7 +53,7 @@
                         </connections>
                     </button>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dpw-Z7-JkD">
-                        <rect key="frame" x="40" y="82" width="248" height="32"/>
+                        <rect key="frame" x="48" y="82" width="240" height="32"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
                         <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
@@ -77,11 +63,28 @@
                         </userDefinedRuntimeAttributes>
                     </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_bookmark" id="Sgy-EK-ZNd">
-                        <rect key="frame" x="16" y="15" width="16" height="16"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/>
+                        <rect key="frame" x="16" y="14" width="16" height="16"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
                     </imageView>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray" id="7ox-1S-vLm">
+                        <rect key="frame" x="298" y="92" width="8" height="12"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES"/>
+                    </imageView>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="rer-vk-fBj">
+                        <rect key="frame" x="48" y="82" width="272" height="32"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
+                        <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="9" maxY="0.0"/>
+                        <state key="normal">
+                            <color key="titleColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                        </state>
+                        <connections>
+                            <action selector="editTap" destination="riP-j7-sc5" eventType="touchUpInside" id="anV-lp-0Gq"/>
+                        </connections>
+                    </button>
                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" id="iH4-qA-j8k">
-                        <rect key="frame" x="42" y="0.0" width="228" height="44"/>
+                        <rect key="frame" x="48" y="0.0" width="220" height="44"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                         <color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="16"/>
@@ -101,6 +104,7 @@
                 <outlet property="categoryButton" destination="IZm-JR-i7Q" id="D5e-XT-WOB"/>
                 <outlet property="descriptionLabel" destination="dpw-Z7-JkD" id="UFN-79-sDe"/>
                 <outlet property="firstSeparatorView" destination="jSl-xq-N7n" id="MLa-z2-PIS"/>
+                <outlet property="icon" destination="Sgy-EK-ZNd" id="syG-fk-rua"/>
                 <outlet property="markButton" destination="07N-gj-Msx" id="fQD-22-0C8"/>
                 <outlet property="secondSeparatorView" destination="X0g-D4-i58" id="kN1-EX-J9i"/>
                 <outlet property="title" destination="iH4-qA-j8k" id="A6E-Ob-jsN"/>
@@ -109,6 +113,7 @@
         </tableViewCell>
     </objects>
     <resources>
+        <image name="ic_arrow_gray" width="8" height="12"/>
         <image name="ic_bookmark" width="16" height="16"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
diff --git a/iphone/Maps/Classes/PlacePageInfoCell.xib b/iphone/Maps/Classes/PlacePageInfoCell.xib
index f67d2d9d8b..7fe4ff4bf2 100644
--- a/iphone/Maps/Classes/PlacePageInfoCell.xib
+++ b/iphone/Maps/Classes/PlacePageInfoCell.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="7702" systemVersion="14D131" 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="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -11,15 +11,15 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VAd-kw-ZEC" id="KHz-zH-ymS">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="xwC-DR-6Il">
                         <rect key="frame" x="16" y="14" width="16" height="16"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="viE-zJ-wsl" customClass="CopyLabel">
-                        <rect key="frame" x="44" y="14" width="256" height="18"/>
+                        <rect key="frame" x="48" y="14" width="256" height="18"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <gestureRecognizers/>
@@ -28,7 +28,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" id="CNm-TR-GPW">
-                        <rect key="frame" x="40" y="43" width="280" height="1"/>
+                        <rect key="frame" x="48" y="43" width="272" height="1"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
                     </view>
diff --git a/iphone/Maps/Classes/PlacePageLinkCell.xib b/iphone/Maps/Classes/PlacePageLinkCell.xib
index eae94364b6..5b02a00ea7 100644
--- a/iphone/Maps/Classes/PlacePageLinkCell.xib
+++ b/iphone/Maps/Classes/PlacePageLinkCell.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="7702" systemVersion="14D131" 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="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -11,18 +11,18 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DKh-ne-anv" id="M4j-cz-kSo">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="DT5-2i-vCG">
                         <rect key="frame" x="16" y="14" width="16" height="16"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
                     </imageView>
                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" id="T5l-Sb-Hfo">
-                        <rect key="frame" x="40" y="4" width="256" height="35"/>
+                        <rect key="frame" x="48" y="4" width="256" height="35"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <inset key="contentInset" minX="0.0" minY="2" maxX="0.0" maxY="0.0"/>
+                        <inset key="contentInset" minX="-4" minY="2" maxX="0.0" maxY="0.0"/>
                         <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="16"/>
                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -32,7 +32,7 @@
                         </connections>
                     </textView>
                     <view contentMode="scaleToFill" id="ZSw-Rd-B64">
-                        <rect key="frame" x="40" y="43" width="280" height="1"/>
+                        <rect key="frame" x="48" y="43" width="272" height="1"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
                     </view>
@@ -40,7 +40,7 @@
                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             </tableViewCellContentView>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <inset key="separatorInset" minX="40" minY="0.0" maxX="0.0" maxY="0.0"/>
+            <inset key="separatorInset" minX="48" minY="0.0" maxX="0.0" maxY="0.0"/>
             <connections>
                 <outlet property="icon" destination="DT5-2i-vCG" id="Qu6-7I-lP5"/>
                 <outlet property="textContainer" destination="T5l-Sb-Hfo" id="K2l-dM-fky"/>
diff --git a/iphone/Maps/Classes/PlacePageNavigationBar.xib b/iphone/Maps/Classes/PlacePageNavigationBar.xib
index 1817ae2a94..09272916cf 100644
--- a/iphone/Maps/Classes/PlacePageNavigationBar.xib
+++ b/iphone/Maps/Classes/PlacePageNavigationBar.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="7702" systemVersion="14D131" 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="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -14,7 +14,7 @@
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="WrL-L0-rh7">
                     <rect key="frame" x="0.0" y="20" width="44" height="44"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <state key="normal" image="NavigationBarBackButton">
+                    <state key="normal" image="ic_down">
                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
                     <connections>
@@ -39,7 +39,7 @@
         </view>
     </objects>
     <resources>
-        <image name="NavigationBarBackButton" width="44" height="44"/>
+        <image name="ic_down" width="44" height="44"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/iphone/Maps/Classes/UIViewController+Navigation.mm b/iphone/Maps/Classes/UIViewController+Navigation.mm
index ff26e3026e..0945836629 100644
--- a/iphone/Maps/Classes/UIViewController+Navigation.mm
+++ b/iphone/Maps/Classes/UIViewController+Navigation.mm
@@ -6,18 +6,24 @@
 
 - (void)showBackButton
 {
-  UIBarButtonItem * leftItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"NavigationBarBackButton"] style:UIBarButtonItemStylePlain target:self action:@selector(backButtonPressed:)];
+  UIImage * backImage = [UIImage imageNamed:@"NavigationBarBackButton"];
+  CGFloat const imageSide = backImage.size.width;
+  UIButton * button = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., imageSide, imageSide)];
+  [button setImage:backImage forState:UIControlStateNormal];
+  [button addTarget:self action:@selector(backTap) forControlEvents:UIControlEventTouchUpInside];
+  button.imageEdgeInsets = UIEdgeInsetsMake(0., -imageSide, 0., 0.);
+  UIBarButtonItem * leftItem = [[UIBarButtonItem alloc] initWithCustomView:button];
   self.navigationItem.leftBarButtonItem = leftItem;
 }
 
-- (void)backButtonPressed:(id)sender
+- (void)backTap
 {
   [self.navigationController popViewControllerAnimated:YES];
 }
 
 - (UIStoryboard *)mainStoryboard
 {
-  NSString * name = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? @"Main_iPad" : @"Main_iPhone";
+  NSString * name = IPAD ? @"Main_iPad" : @"Main_iPhone";
   return [UIStoryboard storyboardWithName:name bundle:nil];
 }
 
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/Contents.json b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/Contents.json
index 31f097ed1f..c55117d32e 100644
--- a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/Contents.json	
+++ b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/Contents.json	
@@ -3,17 +3,17 @@
     {
       "idiom" : "universal",
       "scale" : "1x",
-      "filename" : "nav-bar-button-back.png"
+      "filename" : "ic_back.png"
     },
     {
       "idiom" : "universal",
       "scale" : "2x",
-      "filename" : "nav-bar-button-back@2x.png"
+      "filename" : "ic_back@2x.png"
     },
     {
       "idiom" : "universal",
       "scale" : "3x",
-      "filename" : "nav-bar-button-back@3x.png"
+      "filename" : "ic_back@3x.png"
     }
   ],
   "info" : {
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back.png b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back.png
new file mode 100644
index 0000000000..ff6fa6dfda
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back.png differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@2x.png b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@2x.png
new file mode 100644
index 0000000000..89bed02e7f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@3x.png b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@3x.png
new file mode 100644
index 0000000000..134c80a3e4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/nav-bar-button-back.png b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/nav-bar-button-back.png
deleted file mode 100644
index 661ce6ae60..0000000000
Binary files a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/nav-bar-button-back.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/nav-bar-button-back@2x.png b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/nav-bar-button-back@2x.png
deleted file mode 100644
index e8075e9540..0000000000
Binary files a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/nav-bar-button-back@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/nav-bar-button-back@3x.png b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/nav-bar-button-back@3x.png
deleted file mode 100644
index ffd16b710f..0000000000
Binary files a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/nav-bar-button-back@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/Contents.json b/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/Contents.json
new file mode 100644
index 0000000000..4e8a5173d3
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/Contents.json	
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "ic_down.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "ic_down@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "ic_down@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/ic_down.png b/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/ic_down.png
new file mode 100644
index 0000000000..e03738c616
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/ic_down.png differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/ic_down@2x.png b/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/ic_down@2x.png
new file mode 100644
index 0000000000..0bd99585f9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/ic_down@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/ic_down@3x.png b/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/ic_down@3x.png
new file mode 100644
index 0000000000..a027806982
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Navigation Bar/ic_down.imageset/ic_down@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/Contents.json b/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/Contents.json
new file mode 100644
index 0000000000..7dfe458d08
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/Contents.json	
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "ic_arrow_gray.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "ic_arrow_gray@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "ic_arrow_gray@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/ic_arrow_gray.png b/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/ic_arrow_gray.png
new file mode 100644
index 0000000000..a20702a8cc
Binary files /dev/null and b/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/ic_arrow_gray.png differ
diff --git a/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/ic_arrow_gray@2x.png b/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/ic_arrow_gray@2x.png
new file mode 100644
index 0000000000..055c179bf8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/ic_arrow_gray@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/ic_arrow_gray@3x.png b/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/ic_arrow_gray@3x.png
new file mode 100644
index 0000000000..a20702a8cc
Binary files /dev/null and b/iphone/Maps/Images.xcassets/New Place Page/ic_arrow_gray.imageset/ic_arrow_gray@3x.png differ