[ios] Added notes display in place page.

13 files changed, 429 insertions, 195 deletions

diff --git a/iphone/Maps/Classes/MWMBasePlacePageView.mm b/iphone/Maps/Classes/MWMBasePlacePageView.mm
index 1f020349a7..52a9c99eb6 100644
--- a/iphone/Maps/Classes/MWMBasePlacePageView.mm
+++ b/iphone/Maps/Classes/MWMBasePlacePageView.mm
@@ -1,23 +1,23 @@
 #import "MWMBasePlacePageView.h"
-#import "MWMPlacePageInfoCell.h"
-#import "MWMPlacePageBookmarkCell.h"
-#import "MWMPlacePageEntity.h"
 #import "MWMPlacePage.h"
 #import "MWMPlacePageActionBar.h"
-#import "MWMPlacePageViewManager.h"
+#import "MWMPlacePageBookmarkCell.h"
+#import "MWMPlacePageEntity.h"
+#import "MWMPlacePageInfoCell.h"
 #import "MWMPlacePageTypeDescription.h"
-#import <CoreLocation/CoreLocation.h>
+#import "MWMPlacePageViewManager.h"
 
 static NSString * const kPlacePageLinkCellIdentifier = @"PlacePageLinkCell";
 static NSString * const kPlacePageInfoCellIdentifier = @"PlacePageInfoCell";
 static NSString * const kPlacePageBookmarkCellIdentifier = @"PlacePageBookmarkCell";
-extern CGFloat const kBookmarkCellHeight = 135.;
 
 @interface MWMBasePlacePageView ()
 
 @property (weak, nonatomic) MWMPlacePageEntity * entity;
 @property (weak, nonatomic) IBOutlet MWMPlacePage * ownerPlacePage;
 
+@property (nonatomic) MWMPlacePageBookmarkCell * bookmarkSizingCell;
+
 @end
 
 @interface MWMBasePlacePageView (UITableView) <UITableViewDelegate, UITableViewDataSource>
@@ -28,9 +28,16 @@ extern CGFloat const kBookmarkCellHeight = 135.;
 - (void)awakeFromNib
 {
   [super awakeFromNib];
-  [self.featureTable registerNib:[UINib nibWithNibName:kPlacePageInfoCellIdentifier bundle:nil] forCellReuseIdentifier:kPlacePageInfoCellIdentifier];
-  [self.featureTable registerNib:[UINib nibWithNibName:kPlacePageLinkCellIdentifier bundle:nil] forCellReuseIdentifier:kPlacePageLinkCellIdentifier];
-  [self.featureTable registerNib:[UINib nibWithNibName:kPlacePageBookmarkCellIdentifier bundle:nil] forCellReuseIdentifier:kPlacePageBookmarkCellIdentifier];
+
+  self.featureTable.delegate = self;
+  self.featureTable.dataSource = self;
+
+  [self.featureTable registerNib:[UINib nibWithNibName:kPlacePageInfoCellIdentifier bundle:nil]
+          forCellReuseIdentifier:kPlacePageInfoCellIdentifier];
+  [self.featureTable registerNib:[UINib nibWithNibName:kPlacePageLinkCellIdentifier bundle:nil]
+          forCellReuseIdentifier:kPlacePageLinkCellIdentifier];
+  [self.featureTable registerNib:[UINib nibWithNibName:kPlacePageBookmarkCellIdentifier bundle:nil]
+          forCellReuseIdentifier:kPlacePageBookmarkCellIdentifier];
 }
 
 - (void)configureWithEntity:(MWMPlacePageEntity *)entity
@@ -64,8 +71,6 @@ extern CGFloat const kBookmarkCellHeight = 135.;
 
   self.distanceLabel.text = @"";
 
-  self.featureTable.delegate = self;
-  self.featureTable.dataSource = self;
   [self.featureTable reloadData];
   [self layoutSubviews];
 }
@@ -166,9 +171,9 @@ static CGFloat const kTitleBottomOffset = 2.;
 
 - (void)reloadBookmarkCell
 {
-  NSUInteger const count = self.entity.metadataTypes.count;
-  NSIndexPath * index = [NSIndexPath indexPathForRow:count - 1 inSection:0];
-  [self.featureTable reloadRowsAtIndexPaths:@[index] withRowAnimation:UITableViewRowAnimationAutomatic];
+  [self.featureTable reloadData];
+  [self setNeedsLayout];
+  [self layoutIfNeeded];
 }
 
 - (IBAction)directionButtonTap
@@ -190,7 +195,11 @@ static CGFloat const kTitleBottomOffset = 2.;
 {
   NSNumber * const currentType = self.entity.metadataTypes[indexPath.row];
   if (currentType.integerValue == MWMPlacePageMetadataTypeBookmark)
-    return kBookmarkCellHeight;
+  {
+    [self.bookmarkSizingCell config:self.ownerPlacePage forHeight:YES];
+    CGFloat height = self.bookmarkSizingCell.cellHeight;
+    return height;
+  }
 
   CGFloat const defaultCellHeight = 44.;
   CGFloat const defaultWidth = tableView.width;
@@ -217,12 +226,7 @@ static CGFloat const kTitleBottomOffset = 2.;
   {
     MWMPlacePageBookmarkCell * cell = (MWMPlacePageBookmarkCell *)[tableView dequeueReusableCellWithIdentifier:kPlacePageBookmarkCellIdentifier];
 
-    if (!cell)
-      cell = [[MWMPlacePageBookmarkCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kPlacePageBookmarkCellIdentifier];
-
-    cell.ownerTableView = tableView;
-    cell.placePage = self.ownerPlacePage;
-    [cell configure];
+    [cell config:self.ownerPlacePage forHeight:NO];
     return cell;
   }
 
@@ -231,12 +235,16 @@ static CGFloat const kTitleBottomOffset = 2.;
 
   MWMPlacePageInfoCell * cell = (MWMPlacePageInfoCell *)[tableView dequeueReusableCellWithIdentifier:cellIdentifier];
 
-  if (!cell)
-    cell = [[MWMPlacePageInfoCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifier];
-
   cell.currentEntity = self.entity;
   [cell configureWithType:currentType info:self.entity.metadataValues[indexPath.row]];
   return cell;
 }
 
+- (MWMPlacePageBookmarkCell *)bookmarkSizingCell
+{
+  if (!_bookmarkSizingCell)
+    _bookmarkSizingCell = [self.featureTable dequeueReusableCellWithIdentifier:kPlacePageBookmarkCellIdentifier];
+  return _bookmarkSizingCell;
+}
+
 @end
diff --git a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
index c6eee185e5..51ebdb3cdb 100644
--- a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
+++ b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
@@ -76,6 +76,12 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
   [self.iPadOwnerNavigationController setNavigationBarHidden:NO];
 }
 
+- (void)viewWillDisappear:(BOOL)animated
+{
+  [super viewWillDisappear:animated];
+  [self.manager reloadBookmark];
+}
+
 - (void)setState:(BookmarkDescriptionState)state
 {
   MWMPlacePageEntity * entity = self.manager.entity;
diff --git a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.xib b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.xib
index ba0887790a..cd015b5612 100644
--- a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.xib
+++ b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.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="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMBookmarkDescriptionViewController">
@@ -14,11 +14,12 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="SolidTouchView">
-            <rect key="frame" x="0.0" y="64" width="320" height="568"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" alpha="0.0" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="24o-IB-Pbl" customClass="MWMTextView">
                     <rect key="frame" x="20" y="5" width="280" height="543"/>
+                    <animations/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <color key="textColor" red="0.12941176470588237" green="0.12941176470588237" blue="0.12941176470588237" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
@@ -29,6 +30,7 @@
                 </textView>
                 <webView alpha="0.0" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lov-Ku-GJM">
                     <rect key="frame" x="20" y="5" width="280" height="543"/>
+                    <animations/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES"/>
                     <connections>
@@ -36,6 +38,7 @@
                     </connections>
                 </webView>
             </subviews>
+            <animations/>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="24o-IB-Pbl" secondAttribute="trailing" constant="20" symbolic="YES" id="0yD-gW-2U7"/>
@@ -51,9 +54,4 @@
             <point key="canvasLocation" x="303" y="292"/>
         </view>
     </objects>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.h b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.h
index 9c71f85235..9a6b156b3f 100644
--- a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.h
+++ b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.h
@@ -1,16 +1,10 @@
-#import <UIKit/UIKit.h>
 
-@class MWMPlacePageEntity, MWMPlacePage, MWMTextView;
+@class MWMPlacePage;
 
 @interface MWMPlacePageBookmarkCell : UITableViewCell
 
-@property (weak, nonatomic, readonly) IBOutlet UITextField * title;
-@property (weak, nonatomic, readonly) IBOutlet UIButton * categoryButton;
-@property (weak, nonatomic, readonly) IBOutlet UIButton * markButton;
-@property (weak, nonatomic, readonly) IBOutlet UILabel * descriptionLabel;
-@property (weak, nonatomic) UITableView * ownerTableView;
-@property (weak, nonatomic) MWMPlacePage * placePage;
+- (void)config:(MWMPlacePage *)placePage forHeight:(BOOL)forHeight;
 
-- (void)configure;
+- (CGFloat)cellHeight;
 
 @end
diff --git a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
index bfce691780..6e7024c82f 100644
--- a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
+++ b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
@@ -1,40 +1,95 @@
+#import "MWMBasePlacePageView.h"
+#import "MWMPlacePage.h"
 #import "MWMPlacePageBookmarkCell.h"
 #import "MWMPlacePageEntity.h"
-#import "MWMPlacePage.h"
 #import "MWMPlacePageViewManager.h"
-#import "MWMBasePlacePageView.h"
 #import "MWMTextView.h"
 
-extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @"WebViewDidFifishLoadContent";
+extern CGFloat const kBookmarkCellHeight = 136.0;
+
+static CGFloat const kSeparatorAndTitleHeight = 52.0;
+
+static NSUInteger sWebViewHeight = 0;
 
 @interface MWMPlacePageBookmarkCell () <UITextFieldDelegate, UIWebViewDelegate>
 
-@property (weak, nonatomic, readwrite) IBOutlet UITextField * title;
-@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 UITextField * title;
+@property (weak, nonatomic) IBOutlet UIButton * categoryButton;
+@property (weak, nonatomic) IBOutlet UIButton * markButton;
+
+@property (weak, nonatomic) IBOutlet UIView * note;
+@property (weak, nonatomic) IBOutlet UILabel * noteLabel;
+@property (weak, nonatomic) IBOutlet UIWebView * noteWebView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint * noteViewHeight;
+
+@property (weak, nonatomic) MWMPlacePage * placePage;
 
-@property (weak, nonatomic) IBOutlet UIView * firstSeparatorView;
-@property (weak, nonatomic) IBOutlet UIView * secondSeparatorView;
+@property (nonatomic) BOOL forHeight;
+
+@property (nonatomic) NSString * webViewContent;
 
 @end
 
 @implementation MWMPlacePageBookmarkCell
 
-- (void)configure
+- (void)config:(MWMPlacePage *)placePage forHeight:(BOOL)forHeight
 {
-  MWMPlacePageEntity const * entity = self.placePage.manager.entity;
-  self.title.text = entity.bookmarkTitle;
-  [self.categoryButton setTitle:[NSString stringWithFormat:@"%@ >", entity.bookmarkCategory] forState:UIControlStateNormal];
-  [self.markButton setImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@-on", entity.bookmarkColor]] forState:UIControlStateNormal];
+  self.placePage = placePage;
+  self.forHeight = forHeight;
+
+  [self configNote];
+
+  if (forHeight && self.entity.isHTMLDescription)
+    return;
+
+  self.title.text = self.entity.bookmarkTitle;
+  [self.categoryButton setTitle:[NSString stringWithFormat:@"%@ >", self.entity.bookmarkCategory]
+                       forState:UIControlStateNormal];
+  [self.markButton
+   setImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@-on", self.entity.bookmarkColor]]
+   forState:UIControlStateNormal];
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(keyboardWillShown:)
-                                               name:UIKeyboardWillShowNotification object:nil];
+                                               name:UIKeyboardWillShowNotification
+                                             object:nil];
 
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(keyboardWillBeHidden)
-                                               name:UIKeyboardWillHideNotification object:nil];
+                                               name:UIKeyboardWillHideNotification
+                                             object:nil];
+}
+
+- (void)configNote
+{
+  if (self.entity.bookmarkDescription.length == 0)
+  {
+    self.note.hidden = YES;
+    self.noteViewHeight.constant = 0.0;
+  }
+  else
+  {
+    self.note.hidden = NO;
+    if (self.entity.isHTMLDescription)
+    {
+      self.noteWebView.hidden = NO;
+      self.noteLabel.hidden = YES;
+      if (!self.forHeight && ![self.webViewContent isEqualToString:self.entity.bookmarkDescription])
+      {
+        sWebViewHeight = 0.0;
+        self.webViewContent = self.entity.bookmarkDescription;
+        [self.noteWebView loadHTMLString:self.entity.bookmarkDescription baseURL:nil];
+        self.noteWebView.scrollView.scrollEnabled = NO;
+      }
+    }
+    else
+    {
+      self.noteWebView.hidden = YES;
+      self.noteLabel.hidden = NO;
+      self.noteLabel.text = self.entity.bookmarkDescription;
+      [self.noteLabel sizeToFit];
+      self.noteViewHeight.constant = kSeparatorAndTitleHeight + self.noteLabel.height;
+    }
+  }
 }
 
 - (void)keyboardWillShown:(NSNotification *)aNotification
@@ -48,24 +103,16 @@ extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @
 - (void)keyboardWillBeHidden
 {
   if ([self.title isEditing])
-    [self.placePage willFinishEditingBookmarkTitle:self.title.text.length > 0 ? self.title.text : self.placePage.manager.entity.title];
+    [self.placePage willFinishEditingBookmarkTitle:self.title.text.length > 0 ? self.title.text : self.entity.title];
 }
 
 - (void)textFieldDidEndEditing:(UITextField *)textField
 {
-  MWMPlacePageEntity * entity = self.placePage.manager.entity;
-  entity.bookmarkTitle = textField.text.length > 0 ? textField.text : self.placePage.manager.entity.title;
-  [entity synchronize];
+  self.entity.bookmarkTitle = textField.text.length > 0 ? textField.text : self.entity.title;
+  [self.entity synchronize];
   [textField resignFirstResponder];
 }
 
-- (void)layoutSubviews
-{
-  CGFloat const leftOffset = 16.;
-  CGFloat const topOffset = 15.;
-  self.icon.origin = CGPointMake(leftOffset, topOffset);
-}
-
 - (BOOL)textFieldShouldClear:(UITextField *)textField
 {
   return YES;
@@ -79,7 +126,8 @@ extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @
 
 - (void)dealloc
 {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  if (!self.forHeight)
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 - (IBAction)colorPickerButtonTap
@@ -100,4 +148,41 @@ extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @
   [self.title resignFirstResponder];
 }
 
+- (MWMPlacePageEntity *)entity
+{
+  return self.placePage.manager.entity;
+}
+
+- (CGFloat)cellHeight
+{
+  CGFloat const noteViewHeight = self.entity.isHTMLDescription ? sWebViewHeight : self.noteViewHeight.constant;
+  return kBookmarkCellHeight + ceil(self.note.hidden ? 0.0 : noteViewHeight);
+}
+
+#pragma mark - UIWebViewDelegate
+
+- (void)webViewDidFinishLoad:(UIWebView * _Nonnull)webView
+{
+  webView.height = webView.scrollView.contentSize.height;
+  NSUInteger webViewHeight = ceil(kSeparatorAndTitleHeight + webView.height);
+  self.noteViewHeight.constant = webViewHeight;
+  if (sWebViewHeight != webViewHeight)
+  {
+    sWebViewHeight = webViewHeight;
+    [self.placePage reloadBookmark];
+  }
+}
+
+- (BOOL)webView:(UIWebView *)inWeb
+    shouldStartLoadWithRequest:(NSURLRequest *)inRequest
+                navigationType:(UIWebViewNavigationType)inType
+{
+  if (inType == UIWebViewNavigationTypeLinkClicked)
+  {
+    [[UIApplication sharedApplication] openURL:[inRequest URL]];
+    return NO;
+  }
+  return YES;
+}
+
 @end
diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.mm b/iphone/Maps/Classes/MWMPlacePageViewManager.mm
index dcb56764fe..5003528def 100644
--- a/iphone/Maps/Classes/MWMPlacePageViewManager.mm
+++ b/iphone/Maps/Classes/MWMPlacePageViewManager.mm
@@ -107,7 +107,7 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageManagerState)
   if (IPAD)
   {
     self.placePage.parentViewHeight = self.ownerViewController.view.width;
-    [(MWMiPadPlacePage *)self.placePage updatePlacePageLayout];
+    [(MWMiPadPlacePage *)self.placePage updatePlacePageLayoutAnimated:NO];
   }
   else
   {
diff --git a/iphone/Maps/Classes/MWMiPadPlacePage.h b/iphone/Maps/Classes/MWMiPadPlacePage.h
index 267fb1bba8..10d76bc683 100644
--- a/iphone/Maps/Classes/MWMiPadPlacePage.h
+++ b/iphone/Maps/Classes/MWMiPadPlacePage.h
@@ -2,6 +2,6 @@
 
 @interface MWMiPadPlacePage : MWMPlacePage
 
-- (void)updatePlacePageLayout;
+- (void)updatePlacePageLayoutAnimated:(BOOL)animated;
 
 @end
diff --git a/iphone/Maps/Classes/MWMiPadPlacePage.mm b/iphone/Maps/Classes/MWMiPadPlacePage.mm
index db8d148c0a..76d57f2db3 100644
--- a/iphone/Maps/Classes/MWMiPadPlacePage.mm
+++ b/iphone/Maps/Classes/MWMiPadPlacePage.mm
@@ -1,15 +1,14 @@
 #import "Common.h"
-#import "MWMiPadPlacePage.h"
-#import "MWMPlacePageViewManager.h"
-#import "MWMPlacePageActionBar.h"
 #import "MWMBasePlacePageView.h"
 #import "MWMBookmarkColorViewController.h"
+#import "MWMBookmarkDescriptionViewController.h"
+#import "MWMiPadPlacePage.h"
+#import "MWMPlacePageActionBar.h"
+#import "MWMPlacePageViewManager.h"
 #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.;
@@ -96,7 +95,7 @@ static CGFloat const kBottomOffset = 12.;
   [super configure];
 
   CGFloat const defaultWidth = 360.;
-  [self updatePlacePageLayout];
+  [self updatePlacePageLayoutAnimated:NO];
   [self addPlacePageShadowToView:self.navigationController.view offset:CGSizeMake(0.0, -2.0)];
 
   [self.manager addSubviews:@[self.navigationController.view] withNavigationController:self.navigationController];
@@ -150,25 +149,25 @@ static CGFloat const kBottomOffset = 12.;
 - (void)willFinishEditingBookmarkTitle:(NSString *)title
 {
   [super willFinishEditingBookmarkTitle:title];
-  [self updatePlacePageLayout];
+  [self updatePlacePageLayoutAnimated:NO];
 }
 
 - (void)addBookmark
 {
   [super addBookmark];
-  [UIView animateWithDuration:kDefaultAnimationDuration animations:^
-  {
-    [self updatePlacePageLayout];
-  }];
+  [self updatePlacePageLayoutAnimated:YES];
 }
 
 - (void)removeBookmark
 {
   [super removeBookmark];
-  [UIView animateWithDuration:kDefaultAnimationDuration animations:^
-  {
-    [self updatePlacePageLayout];
-  }];
+  [self updatePlacePageLayoutAnimated:YES];
+}
+
+- (void)reloadBookmark
+{
+  [super reloadBookmark];
+  [self updatePlacePageLayoutAnimated:YES];
 }
 
 - (void)changeBookmarkColor
@@ -215,12 +214,15 @@ static CGFloat const kBottomOffset = 12.;
   }
 }
 
-- (void)updatePlacePageLayout
+- (void)updatePlacePageLayoutAnimated:(BOOL)animated
 {
-  CGFloat const actionBarHeight = self.actionBar.height;
-  self.height = self.basePlacePageView.height + self.anchorImageView.height + actionBarHeight - 1;
-  self.actionBar.origin = CGPointMake(0., self.height - actionBarHeight);
-  [self updatePlacePagePosition];
+  [UIView animateWithDuration:animated ? kDefaultAnimationDuration : 0.0 animations:^
+  {
+    CGFloat const actionBarHeight = self.actionBar.height;
+    self.height = self.basePlacePageView.height + self.anchorImageView.height + actionBarHeight - 1;
+    self.actionBar.origin = CGPointMake(0., self.height - actionBarHeight);
+    [self updatePlacePagePosition];
+  }];
 }
 
 - (void)updatePlacePagePosition
diff --git a/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm b/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm
index 343530fe04..d3628d6b0a 100644
--- a/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm
+++ b/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm
@@ -1,10 +1,10 @@
 #import "Common.h"
-#import "MWMiPhoneLandscapePlacePage.h"
 #import "MWMBasePlacePageView.h"
+#import "MWMiPhoneLandscapePlacePage.h"
+#import "MWMPlacePage+Animation.h"
 #import "MWMPlacePageActionBar.h"
 #import "MWMPlacePageViewManager.h"
 #import "MWMSpringAnimation.h"
-#import "MWMPlacePage+Animation.h"
 
 #include "Framework.h"
 
@@ -91,6 +91,12 @@ typedef NS_ENUM(NSUInteger, MWMiPhoneLandscapePlacePageState)
   [self configureContentInset];
 }
 
+- (void)reloadBookmark
+{
+  [super reloadBookmark];
+  [self configureContentInset];
+}
+
 - (void)updateTargetPoint
 {
   CGSize const size = UIScreen.mainScreen.bounds.size;
diff --git a/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm b/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm
index c5de9a8ac8..dd60bed250 100644
--- a/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm
+++ b/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm
@@ -1,14 +1,14 @@
 #import "Common.h"
+#import "MapViewController.h"
+#import "MWMBasePlacePageView.h"
 #import "MWMiPhonePortraitPlacePage.h"
-#import "MWMSpringAnimation.h"
+#import "MWMMapViewControlsManager.h"
+#import "MWMPlacePage+Animation.h"
 #import "MWMPlacePageActionBar.h"
+#import "MWMPlacePageEntity.h"
 #import "MWMPlacePageNavigationBar.h"
 #import "MWMPlacePageViewManager.h"
-#import "MWMBasePlacePageView.h"
-#import "MWMPlacePage+Animation.h"
-#import "MWMPlacePageEntity.h"
-#import "MWMMapViewControlsManager.h"
-#import "MapViewController.h"
+#import "MWMSpringAnimation.h"
 
 #include "Framework.h"
 
@@ -80,6 +80,12 @@ typedef NS_ENUM(NSUInteger, MWMiPhonePortraitPlacePageState)
   self.state = MWMiPhonePortraitPlacePageStatePreview;
 }
 
+- (void)reloadBookmark
+{
+  [super reloadBookmark];
+  [self updateTargetPoint];
+}
+
 - (void)updateMyPositionStatus:(NSString *)status
 {
   [super updateMyPositionStatus:status];
diff --git a/iphone/Maps/Classes/PlacePageBookmarkCell.xib b/iphone/Maps/Classes/PlacePageBookmarkCell.xib
index 0474fe5a59..588a58e882 100644
--- a/iphone/Maps/Classes/PlacePageBookmarkCell.xib
+++ b/iphone/Maps/Classes/PlacePageBookmarkCell.xib
@@ -1,124 +1,247 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="PlacePageBookmarkCell" rowHeight="123" id="riP-j7-sc5" customClass="MWMPlacePageBookmarkCell">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="135"/>
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="223" id="jfp-wb-Z7G" customClass="MWMPlacePageBookmarkCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="223"/>
             <autoresizingMask key="autoresizingMask"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="riP-j7-sc5" id="tHy-p3-ggw">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="134.5"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jfp-wb-Z7G" id="kUu-ao-FYN">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="222.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <view hidden="YES" contentMode="scaleToFill" id="Ke2-cO-m9r">
-                        <rect key="frame" x="0.0" y="0.0" width="40" height="1"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                        <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="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="48" y="44" width="212" height="1"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_bookmark" translatesAutoresizingMaskIntoConstraints="NO" id="NJ3-lK-ziZ" userLabel="Bookmark icon">
+                        <rect key="frame" x="16" y="14" width="16" height="16"/>
+                        <animations/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="16" id="puH-vO-c70"/>
+                            <constraint firstAttribute="height" constant="16" id="wNH-iS-hGK"/>
+                        </constraints>
+                    </imageView>
+                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="VLh-WI-T7X" userLabel="Title">
+                        <rect key="frame" x="48" y="0.0" width="220" height="44"/>
+                        <animations/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="44" id="ycn-hE-8e1"/>
+                        </constraints>
+                        <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="16"/>
+                        <textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="no" returnKeyType="done"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="name"/>
+                        </userDefinedRuntimeAttributes>
+                        <connections>
+                            <outlet property="delegate" destination="jfp-wb-Z7G" id="00o-sa-QS2"/>
+                        </connections>
+                    </textField>
+                    <button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wax-9r-T5y" userLabel="Mark Button">
+                        <rect key="frame" x="280" y="8" width="28" height="28"/>
+                        <animations/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="28" id="37w-94-KUu"/>
+                            <constraint firstAttribute="width" constant="28" id="Ty5-dA-bOy"/>
+                        </constraints>
+                        <state key="normal" image="placemark-red-on">
+                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                        </state>
+                        <connections>
+                            <action selector="colorPickerButtonTap" destination="jfp-wb-Z7G" eventType="touchUpInside" id="2LS-Ru-Bhb"/>
+                        </connections>
+                    </button>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6e1-wr-Alw" userLabel="Separator #1">
+                        <rect key="frame" x="48" y="44" width="220" height="1"/>
+                        <animations/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="wKq-as-hJq"/>
+                        </constraints>
                     </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="IZm-JR-i7Q">
-                        <rect key="frame" x="48" y="45" width="216" height="36"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jxG-Qv-eKF" userLabel="Category Button">
+                        <rect key="frame" x="48" y="45" width="220" height="44"/>
+                        <animations/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="44" id="8lM-kf-teP"/>
+                        </constraints>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
                         <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"/>
                         </state>
                         <connections>
-                            <action selector="categoryButtonTap" destination="riP-j7-sc5" eventType="touchUpInside" id="MSi-Yf-pko"/>
+                            <action selector="categoryButtonTap" destination="jfp-wb-Z7G" eventType="touchUpInside" id="e4D-w3-PQb"/>
                         </connections>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="07N-gj-Msx">
-                        <rect key="frame" x="272" y="14" width="28" height="28"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                        <state key="normal">
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f8i-PA-TJb" userLabel="Note">
+                        <rect key="frame" x="0.0" y="89" width="320" height="88"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rwd-Um-zNb" userLabel="Separator #2">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="1"/>
+                                <animations/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="1" id="0g9-86-Unw"/>
+                                </constraints>
+                            </view>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XF8-Ny-HSu" userLabel="Title">
+                                <rect key="frame" x="16" y="21" width="31" height="17"/>
+                                <animations/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="note"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
+                                </userDefinedRuntimeAttributes>
+                            </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ao2-ZN-0ct" userLabel="White Background">
+                                <rect key="frame" x="0.0" y="45" width="320" height="43"/>
+                                <animations/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            </view>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="288" translatesAutoresizingMaskIntoConstraints="NO" id="fVU-OV-gcK">
+                                <rect key="frame" x="16" y="50" width="288" height="20"/>
+                                <animations/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
+                                </userDefinedRuntimeAttributes>
+                            </label>
+                            <webView contentMode="scaleToFill" scalesPageToFit="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1yW-c7-l8L">
+                                <rect key="frame" x="16" y="45" width="288" height="43"/>
+                                <animations/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES"/>
+                                <connections>
+                                    <outlet property="delegate" destination="jfp-wb-Z7G" id="5hv-8L-gOi"/>
+                                </connections>
+                            </webView>
+                        </subviews>
+                        <animations/>
+                        <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstItem="1yW-c7-l8L" firstAttribute="top" secondItem="XF8-Ny-HSu" secondAttribute="bottom" constant="7" id="1Dv-8c-J8F"/>
+                            <constraint firstItem="fVU-OV-gcK" firstAttribute="top" secondItem="XF8-Ny-HSu" secondAttribute="bottom" constant="12" id="32Q-yX-6EP"/>
+                            <constraint firstItem="1yW-c7-l8L" firstAttribute="leading" secondItem="f8i-PA-TJb" secondAttribute="leading" constant="16" id="6vP-Tg-Q2p"/>
+                            <constraint firstAttribute="bottom" secondItem="Ao2-ZN-0ct" secondAttribute="bottom" id="8gM-ju-Pai"/>
+                            <constraint firstItem="Ao2-ZN-0ct" firstAttribute="leading" secondItem="f8i-PA-TJb" secondAttribute="leading" id="DgQ-h6-MKp"/>
+                            <constraint firstAttribute="bottom" secondItem="1yW-c7-l8L" secondAttribute="bottom" id="EEq-tP-Q3r"/>
+                            <constraint firstAttribute="trailing" secondItem="fVU-OV-gcK" secondAttribute="trailing" constant="16" id="FOU-f4-TaK"/>
+                            <constraint firstAttribute="trailing" secondItem="1yW-c7-l8L" secondAttribute="trailing" constant="16" id="HCK-RR-QTa"/>
+                            <constraint firstItem="rwd-Um-zNb" firstAttribute="leading" secondItem="f8i-PA-TJb" secondAttribute="leading" id="JAS-Lf-TnG"/>
+                            <constraint firstItem="fVU-OV-gcK" firstAttribute="leading" secondItem="f8i-PA-TJb" secondAttribute="leading" constant="16" id="OH6-73-FCW"/>
+                            <constraint firstAttribute="height" constant="88" id="P0o-9l-5ht"/>
+                            <constraint firstAttribute="trailing" secondItem="rwd-Um-zNb" secondAttribute="trailing" id="eRh-OF-HHJ"/>
+                            <constraint firstItem="XF8-Ny-HSu" firstAttribute="top" secondItem="rwd-Um-zNb" secondAttribute="bottom" constant="20" id="jOZ-xI-bCL"/>
+                            <constraint firstItem="Ao2-ZN-0ct" firstAttribute="top" secondItem="XF8-Ny-HSu" secondAttribute="bottom" constant="7" id="q2x-6b-LrZ"/>
+                            <constraint firstItem="XF8-Ny-HSu" firstAttribute="leading" secondItem="f8i-PA-TJb" secondAttribute="leading" constant="16" id="t8B-yg-VDs"/>
+                            <constraint firstAttribute="trailing" secondItem="Ao2-ZN-0ct" secondAttribute="trailing" id="tjB-T9-wJt"/>
+                            <constraint firstItem="rwd-Um-zNb" firstAttribute="top" secondItem="f8i-PA-TJb" secondAttribute="top" id="u3c-ZQ-FDu"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4nO-GH-Nv6" userLabel="Separator #3">
+                        <rect key="frame" x="0.0" y="177" width="320" height="1"/>
+                        <animations/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="oyp-iV-mpJ"/>
+                        </constraints>
+                    </view>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8KR-m1-j51">
+                        <rect key="frame" x="0.0" y="178" width="320" height="44"/>
+                        <animations/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="44" id="5rE-hZ-GLl"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
+                        <inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="9" maxY="0.0"/>
+                        <state key="normal" title="Edit Bookmark">
+                            <color key="titleColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         </state>
-                        <connections>
-                            <action selector="colorPickerButtonTap" destination="riP-j7-sc5" eventType="touchUpInside" id="DlV-JE-4MA"/>
-                        </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="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"/>
-                        <nil key="highlightedColor"/>
                         <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="description"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="edit_bookmark"/>
                         </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" flexibleMaxY="YES"/>
-                    </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray" id="7ox-1S-vLm">
-                        <rect key="frame" x="296" y="95" 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"/>
+                            <action selector="editTap" destination="jfp-wb-Z7G" eventType="touchUpInside" id="IKA-2o-75q"/>
                         </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="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"/>
-                        <textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="no" returnKeyType="done"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="name"/>
-                        </userDefinedRuntimeAttributes>
-                        <connections>
-                            <outlet property="delegate" destination="riP-j7-sc5" id="V5L-on-8bx"/>
-                        </connections>
-                    </textField>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray" translatesAutoresizingMaskIntoConstraints="NO" id="meU-rN-T7y" userLabel="Gray Arrow">
+                        <rect key="frame" x="284" y="186" width="28" height="28"/>
+                        <animations/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="28" id="XOd-bb-dsE"/>
+                            <constraint firstAttribute="width" constant="28" id="xnu-q1-DCI"/>
+                        </constraints>
+                    </imageView>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sx9-cz-Scg" userLabel="Separator #4">
+                        <rect key="frame" x="0.0" y="222" width="320" height="1"/>
+                        <animations/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="PcL-HG-sPH"/>
+                        </constraints>
+                    </view>
                 </subviews>
+                <animations/>
                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                <constraints>
+                    <constraint firstItem="VLh-WI-T7X" firstAttribute="leading" secondItem="NJ3-lK-ziZ" secondAttribute="trailing" constant="16" id="6qf-Bl-HGm"/>
+                    <constraint firstItem="8KR-m1-j51" firstAttribute="width" secondItem="f8i-PA-TJb" secondAttribute="width" id="7FM-xU-xDL"/>
+                    <constraint firstItem="Wax-9r-T5y" firstAttribute="leading" secondItem="VLh-WI-T7X" secondAttribute="trailing" constant="12" id="7mj-gk-N51"/>
+                    <constraint firstItem="Sx9-cz-Scg" firstAttribute="top" secondItem="8KR-m1-j51" secondAttribute="bottom" id="9Kr-d5-TnV"/>
+                    <constraint firstItem="4nO-GH-Nv6" firstAttribute="width" secondItem="f8i-PA-TJb" secondAttribute="width" id="CXv-x7-ogU"/>
+                    <constraint firstItem="8KR-m1-j51" firstAttribute="top" secondItem="4nO-GH-Nv6" secondAttribute="bottom" id="Czz-pd-70n"/>
+                    <constraint firstItem="6e1-wr-Alw" firstAttribute="width" secondItem="VLh-WI-T7X" secondAttribute="width" id="EvW-dl-wiL"/>
+                    <constraint firstItem="8KR-m1-j51" firstAttribute="centerX" secondItem="f8i-PA-TJb" secondAttribute="centerX" id="Fho-1G-DMQ"/>
+                    <constraint firstItem="jxG-Qv-eKF" firstAttribute="width" secondItem="6e1-wr-Alw" secondAttribute="width" id="HOz-WX-WLt"/>
+                    <constraint firstItem="4nO-GH-Nv6" firstAttribute="centerX" secondItem="f8i-PA-TJb" secondAttribute="centerX" id="JD8-H3-f4j"/>
+                    <constraint firstItem="jxG-Qv-eKF" firstAttribute="top" secondItem="6e1-wr-Alw" secondAttribute="bottom" id="Mmh-Od-405"/>
+                    <constraint firstItem="Sx9-cz-Scg" firstAttribute="centerX" secondItem="8KR-m1-j51" secondAttribute="centerX" id="R2v-D5-fHw"/>
+                    <constraint firstItem="6e1-wr-Alw" firstAttribute="centerX" secondItem="VLh-WI-T7X" secondAttribute="centerX" id="UjZ-c7-pSl"/>
+                    <constraint firstItem="NJ3-lK-ziZ" firstAttribute="leading" secondItem="kUu-ao-FYN" secondAttribute="leading" constant="16" id="Z9y-hZ-0pk"/>
+                    <constraint firstItem="meU-rN-T7y" firstAttribute="trailing" secondItem="8KR-m1-j51" secondAttribute="trailing" constant="-8" id="f7Q-08-8Ix"/>
+                    <constraint firstItem="f8i-PA-TJb" firstAttribute="top" secondItem="jxG-Qv-eKF" secondAttribute="bottom" id="jP6-dp-yga"/>
+                    <constraint firstItem="VLh-WI-T7X" firstAttribute="top" secondItem="kUu-ao-FYN" secondAttribute="top" id="juQ-wl-6VY"/>
+                    <constraint firstItem="Sx9-cz-Scg" firstAttribute="width" secondItem="8KR-m1-j51" secondAttribute="width" id="mFP-u1-HIX"/>
+                    <constraint firstItem="f8i-PA-TJb" firstAttribute="leading" secondItem="kUu-ao-FYN" secondAttribute="leading" id="oCY-wT-Wsp"/>
+                    <constraint firstItem="jxG-Qv-eKF" firstAttribute="centerX" secondItem="6e1-wr-Alw" secondAttribute="centerX" id="pJb-3Q-i3P"/>
+                    <constraint firstItem="Wax-9r-T5y" firstAttribute="centerY" secondItem="VLh-WI-T7X" secondAttribute="centerY" id="pb4-Hs-7GJ"/>
+                    <constraint firstItem="4nO-GH-Nv6" firstAttribute="top" secondItem="f8i-PA-TJb" secondAttribute="bottom" id="pkH-dr-L2H"/>
+                    <constraint firstItem="NJ3-lK-ziZ" firstAttribute="centerY" secondItem="VLh-WI-T7X" secondAttribute="centerY" id="qxx-I2-YpL"/>
+                    <constraint firstAttribute="trailing" secondItem="f8i-PA-TJb" secondAttribute="trailing" id="ua5-7p-icx"/>
+                    <constraint firstItem="meU-rN-T7y" firstAttribute="centerY" secondItem="8KR-m1-j51" secondAttribute="centerY" id="x5H-j5-32G"/>
+                    <constraint firstItem="6e1-wr-Alw" firstAttribute="top" secondItem="VLh-WI-T7X" secondAttribute="bottom" id="yeD-nY-idE"/>
+                    <constraint firstAttribute="trailing" secondItem="Wax-9r-T5y" secondAttribute="trailing" constant="12" id="zy0-un-D4A"/>
+                </constraints>
             </tableViewCellContentView>
+            <animations/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <connections>
-                <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"/>
+                <outlet property="categoryButton" destination="jxG-Qv-eKF" id="pom-En-q4u"/>
+                <outlet property="markButton" destination="Wax-9r-T5y" id="PlC-Ww-Hpr"/>
+                <outlet property="note" destination="f8i-PA-TJb" id="kAv-qp-HXO"/>
+                <outlet property="noteLabel" destination="fVU-OV-gcK" id="Zes-4a-UyY"/>
+                <outlet property="noteViewHeight" destination="P0o-9l-5ht" id="Wvg-zj-plp"/>
+                <outlet property="noteWebView" destination="1yW-c7-l8L" id="BB2-eV-Y01"/>
+                <outlet property="title" destination="VLh-WI-T7X" id="hXl-Pk-c5Y"/>
             </connections>
-            <point key="canvasLocation" x="191" y="304.5"/>
+            <point key="canvasLocation" x="152" y="568"/>
         </tableViewCell>
     </objects>
     <resources>
         <image name="ic_arrow_gray" width="8" height="12"/>
         <image name="ic_bookmark" width="16" height="16"/>
+        <image name="placemark-red-on" width="28" height="28"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/iphone/Maps/Classes/PlacePageView.xib b/iphone/Maps/Classes/PlacePageView.xib
index ac09781739..201f7ecde6 100644
--- a/iphone/Maps/Classes/PlacePageView.xib
+++ b/iphone/Maps/Classes/PlacePageView.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="7706" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMPlacePage">
@@ -21,11 +21,13 @@
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="a4c-bA-qa5">
                     <rect key="frame" x="0.0" y="0.0" width="320" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                    <animations/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </imageView>
                 <view contentMode="scaleToFill" id="1m8-Jf-cgf">
                     <rect key="frame" x="0.0" y="22" width="320" height="477"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <animations/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </view>
                 <view contentMode="scaleToFill" id="8RI-YR-2UD" customClass="MWMBasePlacePageView">
@@ -35,6 +37,7 @@
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Starbucks" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="T1Y-Oq-6fg">
                             <rect key="frame" x="16" y="0.0" width="190" height="23"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                            <animations/>
                             <fontDescription key="fontDescription" type="system" pointSize="24"/>
                             <color key="textColor" red="0.12549019610000001" green="0.12549019610000001" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -42,13 +45,15 @@
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Кафэ" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TNu-JO-vJi">
                             <rect key="frame" x="16" y="27" width="204" height="17"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <animations/>
                             <fontDescription key="fontDescription" type="system" weight="light" pointSize="16"/>
                             <color key="textColor" red="0.60784313729999995" green="0.60784313729999995" blue="0.60784313729999995" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelection="NO" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="hZM-Gs-BbS">
+                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" allowsSelection="NO" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="hZM-Gs-BbS">
                             <rect key="frame" x="0.0" y="60" width="320" height="408"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                            <animations/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -61,11 +66,13 @@
                         <view contentMode="scaleToFill" id="Spo-tb-t0A">
                             <rect key="frame" x="0.0" y="52" width="320" height="1"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                            <animations/>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="500 mi" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="kGT-CI-UsC">
                             <rect key="frame" x="214" y="7" width="57" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                            <animations/>
                             <fontDescription key="fontDescription" type="system" weight="light" pointSize="16"/>
                             <color key="textColor" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -73,10 +80,12 @@
                         <imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_direction" id="ExH-ug-j1j">
                             <rect key="frame" x="279" y="5" width="25" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                            <animations/>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="X4O-iK-cA2">
                             <rect key="frame" x="260" y="0.0" width="60" height="43"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                            <animations/>
                             <state key="normal">
                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                             </state>
@@ -85,6 +94,7 @@
                             </connections>
                         </button>
                     </subviews>
+                    <animations/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <connections>
                         <outlet property="directionArrow" destination="ExH-ug-j1j" id="3iY-1E-PNI"/>
@@ -98,6 +108,7 @@
                     </connections>
                 </view>
             </subviews>
+            <animations/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <gestureRecognizers/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
@@ -121,9 +132,4 @@
     <resources>
         <image name="img_direction" width="32" height="32"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 2c9d03c847..62a36a0f4c 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -22,6 +22,7 @@
 		341C2A5B1B720B8A00AD41A1 /* MWMAPIBarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 341C2A5A1B720B8A00AD41A1 /* MWMAPIBarView.xib */; };
 		342AD76F1B53D30C00E0B997 /* UIButton+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 342AD76E1B53D30C00E0B997 /* UIButton+RuntimeAttributes.m */; };
 		342AD7721B53D32F00E0B997 /* UIView+RuntimeAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 342AD7711B53D32F00E0B997 /* UIView+RuntimeAttributes.m */; };
+		342BB7AB1BC7CC5C00DF6443 /* PlacePageBookmarkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342BB7AA1BC7CC5C00DF6443 /* PlacePageBookmarkCell.xib */; settings = {ASSET_TAGS = (); }; };
 		3438CDF41B85F1170051AA78 /* MWMConsole.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3438CDF31B85F1170051AA78 /* MWMConsole.mm */; };
 		3438CDF81B8616760051AA78 /* MWMSearchShowOnMapCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3438CDF61B8616760051AA78 /* MWMSearchShowOnMapCell.mm */; };
 		3438CDF91B8616760051AA78 /* MWMSearchShowOnMapCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3438CDF71B8616760051AA78 /* MWMSearchShowOnMapCell.xib */; };
@@ -293,7 +294,6 @@
 		F6CB21621AEE902B00FB8963 /* PlacePageLinkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6CB21611AEE902B00FB8963 /* PlacePageLinkCell.xib */; };
 		F6CB21641AEFC42800FB8963 /* PlacePageActionBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6CB21631AEFC42800FB8963 /* PlacePageActionBar.xib */; };
 		F6CB21681AEFC6AA00FB8963 /* MWMPlacePageActionBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6CB21671AEFC6AA00FB8963 /* MWMPlacePageActionBar.mm */; };
-		F6CB216A1AF1303900FB8963 /* PlacePageBookmarkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6CB21691AF1303900FB8963 /* PlacePageBookmarkCell.xib */; };
 		F6CB216D1AF13EBD00FB8963 /* MWMPlacePageBookmarkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6CB216C1AF13EBD00FB8963 /* MWMPlacePageBookmarkCell.mm */; };
 		F6D409FA1B319BD70041730F /* ContextViews.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6D409F91B319BD70041730F /* ContextViews.mm */; };
 		F6D4344E1AD2AB96007C7728 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F6D4344D1AD2AB96007C7728 /* Images.xcassets */; };
@@ -397,6 +397,7 @@
 		342AD76E1B53D30C00E0B997 /* UIButton+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+RuntimeAttributes.m"; sourceTree = "<group>"; };
 		342AD7701B53D32F00E0B997 /* UIView+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+RuntimeAttributes.h"; sourceTree = "<group>"; };
 		342AD7711B53D32F00E0B997 /* UIView+RuntimeAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+RuntimeAttributes.m"; sourceTree = "<group>"; };
+		342BB7AA1BC7CC5C00DF6443 /* PlacePageBookmarkCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlacePageBookmarkCell.xib; sourceTree = "<group>"; };
 		342E75A11B302FCC00A8635F /* MWMPlacePageViewManagerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageViewManagerDelegate.h; sourceTree = "<group>"; };
 		3438CDF21B85F1170051AA78 /* MWMConsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMConsole.h; sourceTree = "<group>"; };
 		3438CDF31B85F1170051AA78 /* MWMConsole.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMConsole.mm; sourceTree = "<group>"; };
@@ -783,7 +784,6 @@
 		F6CB21631AEFC42800FB8963 /* PlacePageActionBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlacePageActionBar.xib; sourceTree = "<group>"; };
 		F6CB21661AEFC6AA00FB8963 /* MWMPlacePageActionBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageActionBar.h; sourceTree = "<group>"; };
 		F6CB21671AEFC6AA00FB8963 /* MWMPlacePageActionBar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageActionBar.mm; sourceTree = "<group>"; };
-		F6CB21691AF1303900FB8963 /* PlacePageBookmarkCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlacePageBookmarkCell.xib; sourceTree = "<group>"; };
 		F6CB216B1AF13EBD00FB8963 /* MWMPlacePageBookmarkCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageBookmarkCell.h; sourceTree = "<group>"; };
 		F6CB216C1AF13EBD00FB8963 /* MWMPlacePageBookmarkCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageBookmarkCell.mm; sourceTree = "<group>"; };
 		F6D409F81B319BD70041730F /* ContextViews.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextViews.h; sourceTree = "<group>"; };
@@ -1898,9 +1898,9 @@
 				F6CB215E1AEE7A5B00FB8963 /* MWMPlacePageInfoCell.h */,
 				F6CB215F1AEE7A5B00FB8963 /* MWMPlacePageInfoCell.mm */,
 				F6CB21611AEE902B00FB8963 /* PlacePageLinkCell.xib */,
-				F6CB21691AF1303900FB8963 /* PlacePageBookmarkCell.xib */,
 				F6CB216B1AF13EBD00FB8963 /* MWMPlacePageBookmarkCell.h */,
 				F6CB216C1AF13EBD00FB8963 /* MWMPlacePageBookmarkCell.mm */,
+				342BB7AA1BC7CC5C00DF6443 /* PlacePageBookmarkCell.xib */,
 			);
 			name = Cells;
 			sourceTree = "<group>";
@@ -2262,6 +2262,7 @@
 			files = (
 				5605022F1B6211E100169CAD /* sound-strings in Resources */,
 				F67BC26F1B254B2000FE1D7B /* MWMPlacePageDescriptionView.xib in Resources */,
+				342BB7AB1BC7CC5C00DF6443 /* PlacePageBookmarkCell.xib in Resources */,
 				EE026F0611D6AC0D00645242 /* classificator.txt in Resources */,
 				34CC4C0A1B81F3B500E44C1F /* MWMSearchTabbedViewController.xib in Resources */,
 				34B82ACB1B8465C100180497 /* MWMSearchCategoryCell.xib in Resources */,
@@ -2341,7 +2342,6 @@
 				4A7D89C61B2EBF3B00AC843E /* resources-mdpi_dark in Resources */,
 				F6BC1E541ACBF9AB00EF0360 /* MWMFacebookAlert.xib in Resources */,
 				F6CB21641AEFC42800FB8963 /* PlacePageActionBar.xib in Resources */,
-				F6CB216A1AF1303900FB8963 /* PlacePageBookmarkCell.xib in Resources */,
 				34F45E901B96E8B100AC93F8 /* MWMSearchTabButtonsView.xib in Resources */,
 				F6BD337A1B62400E00F2CE18 /* MWMPortraitNavigationDashboard.xib in Resources */,
 				F64F4B6F1B46A5380081A24A /* MWMDownloaderDialogCell.xib in Resources */,