diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h
index 28668d98c4..cb92d474e8 100644
--- a/iphone/Maps/Classes/MapViewController.h
+++ b/iphone/Maps/Classes/MapViewController.h
@@ -56,5 +56,6 @@
 @property(nonatomic) MWMMyPositionMode currentPositionMode;
 @property(strong, nonatomic) IBOutlet EAGLView * _Nonnull mapView;
 @property(strong, nonatomic) IBOutlet UIView * _Nonnull controlsView;
+@property(strong, nonatomic) IBOutlet UIView * _Nonnull searchViewContainer;
 
 @end
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 92e1fc0ffb..9c9fc5b2a8 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -156,17 +156,22 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
 - (void)onMapObjectDeselected:(bool)switchFullScreenMode {
   [self hidePlacePage];
 
+  BOOL const isSearchResult = [MWMSearchManager manager].state == MWMSearchManagerStateResult;
+  if (isSearchResult) {
+    [MWMSearchManager manager].state = MWMSearchManagerStateMapSearch;
+  }
+
   if (!switchFullScreenMode)
     return;
 
   if (DeepLinkHandler.shared.isLaunchedByDeeplink)
     return;
 
-  BOOL const isSearchHidden = ([MWMSearchManager manager].state == MWMSearchManagerStateHidden);
-  BOOL const isNavigationDashboardHidden =
-    ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden);
-  if (isSearchHidden && isNavigationDashboardHidden)
+  BOOL const isSearchHidden = [MWMSearchManager manager].state == MWMSearchManagerStateHidden;
+  BOOL const isNavigationDashboardHidden = [MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden;
+  if (isSearchHidden && isNavigationDashboardHidden) {
     self.controlsManager.hidden = !self.controlsManager.hidden;
+  }
 }
 
 - (void)onMapObjectSelected {
diff --git a/iphone/Maps/Common/Statistics/StatisticsStrings.h b/iphone/Maps/Common/Statistics/StatisticsStrings.h
index c774e6837e..b951ab02df 100644
--- a/iphone/Maps/Common/Statistics/StatisticsStrings.h
+++ b/iphone/Maps/Common/Statistics/StatisticsStrings.h
@@ -48,6 +48,7 @@ static NSString * const kStatAuthorization = @"Authorization";
 static NSString * const kStatAutoDownload = @"Auto download";
 static NSString * const kStatAutoZoom = @"Autozoom";
 static NSString * const kStatBack = @"Back";
+static NSString * const kStatBackClick = @"Back_click";
 static NSString * const kStatBanner = @"banner";
 static NSString * const kStatBattery = @"battery";
 static NSString * const kStatBicycle = @"Bicycle";
@@ -397,6 +398,7 @@ static NSString * const kStatPointToPoint = @"point_to_point";
 static NSString * const kStatPoints = @"points";
 static NSString * const kStatPortrait = @"Portrait";
 static NSString * const kStatPosition = @"position";
+static NSString * const kStatPreview = @"preview";
 static NSString * const kStatPriceCategory = @"price_category";
 static NSString * const kStatPrivate = @"private";
 static NSString * const kStatProblem = @"Problem";
@@ -463,6 +465,9 @@ static NSString * const kStatSearchFilterCancel = @"Search_Filter_Cancel";
 static NSString * const kStatSearchFilterClick = @"Search_Filter_Click";
 static NSString * const kStatSearchFilterOpen = @"Search_Filter_Open";
 static NSString * const kStatSearchFilterReset = @"Search_Filter_Reset";
+static NSString * const kStatSearchMapOneResult = @"map_search_one_result";
+static NSString * const kStatSearchMapSearch = @"map_search";
+static NSString * const kStatSearchResults = @"search_results";
 static NSString * const kStatSearchRestaurants = @"Search.Restaurants";
 static NSString * const kStatSearchSponsoredSelect = @"Search_SponsoredCategory_selected";
 static NSString * const kStatSearchSponsoredShow = @"Search_SponsoredCategory_shown";
@@ -515,6 +520,7 @@ static NSString * const kStatThingsToDo = @"Things to do";
 static NSString * const kStatTipsTricksClick = @"TipsTricks_click";
 static NSString * const kStatTipsTricksClose = @"TipsTricks_close";
 static NSString * const kStatTipsTricksShow = @"TipsTricks_show";
+static NSString * const kStatTo = @"to";
 static NSString * const kStatToLocation = @"to_location";
 static NSString * const kStatToMyPosition = @"To my position";
 static NSString * const kStatToday = @"Today";
diff --git a/iphone/Maps/Core/Theme/SearchStyleSheet.swift b/iphone/Maps/Core/Theme/SearchStyleSheet.swift
index c4832be461..4830c6c637 100644
--- a/iphone/Maps/Core/Theme/SearchStyleSheet.swift
+++ b/iphone/Maps/Core/Theme/SearchStyleSheet.swift
@@ -78,6 +78,7 @@ class SearchStyleSheet: IStyleSheet {
 
     theme.add(styleName: "SearchSearchTextFieldIcon") { (s) -> (Void) in
       s.tintColor = colors.blackSecondaryText
+      s.coloring = MWMButtonColoring.black
       s.color = colors.blackSecondaryText
     }
 
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/ic_nav_bar_back.png b/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/ic_nav_bar_back.png
deleted file mode 100644
index 0042d4ddee..0000000000
Binary files a/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/ic_nav_bar_back.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/ic_nav_bar_back@2x.png b/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/ic_nav_bar_back@2x.png
deleted file mode 100644
index 0d77d0412c..0000000000
Binary files a/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/ic_nav_bar_back@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/ic_nav_bar_back@3x.png b/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/ic_nav_bar_back@3x.png
deleted file mode 100644
index ae77ae035e..0000000000
Binary files a/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/ic_nav_bar_back@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Back to search.png b/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Back to search.png
new file mode 100644
index 0000000000..e1d2026617
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Back to search.png differ
diff --git a/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Back to search@2x.png b/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Back to search@2x.png
new file mode 100644
index 0000000000..c2b34bb044
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Back to search@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Back to search@3x.png b/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Back to search@3x.png
new file mode 100644
index 0000000000..6952dcd0d1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Back to search@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/Contents.json b/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Contents.json
similarity index 57%
rename from iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Contents.json
index 14065c084f..a0e9110b21 100644
--- a/iphone/Maps/Images.xcassets/Navigation Bar/ic_nav_bar_back.imageset/Contents.json	
+++ b/iphone/Maps/Images.xcassets/Search/ic_search_back.imageset/Contents.json
@@ -2,22 +2,25 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_nav_bar_back.png",
+      "filename" : "Back to search.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_nav_bar_back@2x.png",
+      "filename" : "Back to search@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ic_nav_bar_back@3x.png",
+      "filename" : "Back to search@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 543a295f84..6170e8de75 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -628,6 +628,7 @@
 		995F1613244F0AA50060631D /* BottomMenuLayersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */; };
 		995F1614244F0AA50060631D /* BottomMenuLayersCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */; };
 		9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */; };
+		9977E69C247BFB510073780C /* MWMSearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E69B247BFB510073780C /* MWMSearchTextField.swift */; };
 		9977E6A32480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */; };
 		998927302449DE1500260CE2 /* TabBarArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9989272F2449DE1500260CE2 /* TabBarArea.swift */; };
 		998927382449E60200260CE2 /* BottomMenuPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998927322449E60200260CE2 /* BottomMenuPresenter.swift */; };
@@ -867,7 +868,6 @@
 		F6E2FEE21E097BA00083EBEC /* MWMSearchManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCFB1E097B9F0083EBEC /* MWMSearchManager.mm */; };
 		F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */; };
 		F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */; };
-		F6E2FEEB1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD001E097B9F0083EBEC /* MWMSearchTextField.mm */; };
 		F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */; };
 		F6E2FF001E097BA00083EBEC /* SearchCategoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD0E1E097B9F0083EBEC /* SearchCategoryCell.xib */; };
 		F6E2FF061E097BA00083EBEC /* SearchHistoryClearCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD121E097B9F0083EBEC /* SearchHistoryClearCell.xib */; };
@@ -1718,6 +1718,7 @@
 		995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayersCell.swift; sourceTree = "<group>"; };
 		995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BottomMenuLayersCell.xib; sourceTree = "<group>"; };
 		9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButton.swift; sourceTree = "<group>"; };
+		9977E69B247BFB510073780C /* MWMSearchTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MWMSearchTextField.swift; sourceTree = "<group>"; };
 		9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButtonRenderer.swift; sourceTree = "<group>"; };
 		9989272F2449DE1500260CE2 /* TabBarArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarArea.swift; sourceTree = "<group>"; };
 		998927322449E60200260CE2 /* BottomMenuPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuPresenter.swift; sourceTree = "<group>"; };
@@ -2110,8 +2111,6 @@
 		F6E2FCFC1E097B9F0083EBEC /* MWMSearchNoResults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchNoResults.h; sourceTree = "<group>"; };
 		F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMSearchNoResults.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchNoResults.xib; sourceTree = "<group>"; };
-		F6E2FCFF1E097B9F0083EBEC /* MWMSearchTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTextField.h; sourceTree = "<group>"; };
-		F6E2FD001E097B9F0083EBEC /* MWMSearchTextField.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchTextField.mm; sourceTree = "<group>"; };
 		F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchView.xib; sourceTree = "<group>"; };
 		F6E2FD0E1E097B9F0083EBEC /* SearchCategoryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchCategoryCell.xib; sourceTree = "<group>"; };
 		F6E2FD121E097B9F0083EBEC /* SearchHistoryClearCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchHistoryClearCell.xib; sourceTree = "<group>"; };
@@ -4698,8 +4697,7 @@
 				F6E2FCFC1E097B9F0083EBEC /* MWMSearchNoResults.h */,
 				F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */,
 				F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */,
-				F6E2FCFF1E097B9F0083EBEC /* MWMSearchTextField.h */,
-				F6E2FD001E097B9F0083EBEC /* MWMSearchTextField.mm */,
+				9977E69B247BFB510073780C /* MWMSearchTextField.swift */,
 				F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */,
 				F6E2FD021E097B9F0083EBEC /* Tabs */,
 				F6E2FD281E097BA00083EBEC /* TableView */,
@@ -5851,6 +5849,7 @@
 				34D3B02A1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.m in Sources */,
 				33C558E3217F6CF100299E70 /* UploadActionCell.swift in Sources */,
 				993DF10523F6BDB100AC231A /* UINavigationItem+styleName.swift in Sources */,
+				9977E69C247BFB510073780C /* MWMSearchTextField.swift in Sources */,
 				4726254921C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift in Sources */,
 				99CB34CF236B054B001D28AD /* DeepLinkInfoBuilder.swift in Sources */,
 				347E039A1FAC5F1D00426032 /* UIWindow+InputLanguage.swift in Sources */,
@@ -5932,7 +5931,6 @@
 				34AB66261FC5AA330078E451 /* RouteManagerDimView.swift in Sources */,
 				993F5514237C622700545511 /* DeepLinkStrategyFactory.swift in Sources */,
 				6741AA2B1BF340DE002C974C /* CircleView.m in Sources */,
-				F6E2FEEB1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */,
 				99CB34982369C291001D28AD /* FirstLaunchPresenter.swift in Sources */,
 				CD08887422B7ABB400C1368D /* MWMDiscoveryCollectionView.mm in Sources */,
 				4788739220EE326500F6826B /* VerticallyAlignedButton.swift in Sources */,
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib
index 3cd2a5fee7..136569a773 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib
@@ -14,7 +14,7 @@
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R50-Tj-X0W">
-                    <rect key="frame" x="-100" y="0.0" width="180" height="48"/>
+                    <rect key="frame" x="0.0" y="0.0" width="80" height="48"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W07-Hz-J60" customClass="MWMButton">
@@ -49,7 +49,7 @@
                 <constraint firstItem="R50-Tj-X0W" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="ZHQ-XD-E90"/>
                 <constraint firstAttribute="bottom" secondItem="rrI-0A-w3s" secondAttribute="bottom" constant="2" id="Zsi-G2-yc8"/>
                 <constraint firstAttribute="bottom" secondItem="R50-Tj-X0W" secondAttribute="bottom" id="adE-76-Hab"/>
-                <constraint firstItem="R50-Tj-X0W" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="-100" id="qid-13-F5b"/>
+                <constraint firstItem="R50-Tj-X0W" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="qid-13-F5b"/>
                 <constraint firstItem="W07-Hz-J60" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="rBR-of-5Ha"/>
                 <constraint firstAttribute="trailing" secondItem="W07-Hz-J60" secondAttribute="trailing" id="teM-gm-CX7"/>
             </constraints>
diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Layout.m b/iphone/Maps/UI/Search/MWMSearchManager+Layout.m
index 868d69d096..ed6c0ef6ff 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager+Layout.m
+++ b/iphone/Maps/UI/Search/MWMSearchManager+Layout.m
@@ -1,5 +1,5 @@
 #import "MWMSearchManager+Layout.h"
-
+#import "MapViewController.h"
 #import <CoreApi/MWMCommon.h>
 
 static CGFloat const kWidthForiPad = 320.0;
@@ -12,7 +12,7 @@ static CGFloat const kWidthForiPad = 320.0;
 
 @property(nonatomic) NSLayoutConstraint * actionBarViewBottom;
 
-@property(weak, nonatomic, readonly) UIViewController * ownerController;
+@property(weak, nonatomic, readonly) UIView * searchViewContainer;
 
 @end
 
@@ -23,7 +23,7 @@ static CGFloat const kWidthForiPad = 320.0;
   UIView * searchBarView = self.searchBarView;
   UIView * actionBarView = self.actionBarView;
   UIView * contentView = self.contentView;
-  UIView * parentView = self.ownerController.view;
+  UIView * parentView = self.searchViewContainer;
 
   searchBarView.translatesAutoresizingMaskIntoConstraints = NO;
   actionBarView.translatesAutoresizingMaskIntoConstraints = NO;
@@ -31,23 +31,10 @@ static CGFloat const kWidthForiPad = 320.0;
 
   NSLayoutXAxisAnchor * leadingAnchor = parentView.leadingAnchor;
   NSLayoutXAxisAnchor * trailingAnchor = parentView.trailingAnchor;
-  NSLayoutYAxisAnchor * topAnchor = parentView.topAnchor;
-  NSLayoutYAxisAnchor * bottomAnchor = parentView.bottomAnchor;
-  CGFloat topOffset = 0;
-  if (@available(iOS 11.0, *))
-  {
-    UILayoutGuide * safeAreaLayoutGuide = parentView.safeAreaLayoutGuide;
-    leadingAnchor = safeAreaLayoutGuide.leadingAnchor;
-    trailingAnchor = safeAreaLayoutGuide.trailingAnchor;
-    topAnchor = safeAreaLayoutGuide.topAnchor;
-    bottomAnchor = safeAreaLayoutGuide.bottomAnchor;
-  }
-  else
-  {
-    topOffset = statusBarHeight();
-  }
+  NSLayoutYAxisAnchor * topAnchor = parentView.safeAreaLayoutGuide.topAnchor;
+  NSLayoutYAxisAnchor * bottomAnchor = parentView.safeAreaLayoutGuide.bottomAnchor;
 
-  [searchBarView.topAnchor constraintEqualToAnchor:topAnchor constant:topOffset].active = YES;
+  [searchBarView.topAnchor constraintEqualToAnchor:topAnchor].active = YES;
   [searchBarView.leadingAnchor constraintEqualToAnchor:leadingAnchor].active = YES;
   if (IPAD)
     [searchBarView.widthAnchor constraintEqualToConstant:kWidthForiPad].active = YES;
diff --git a/iphone/Maps/UI/Search/MWMSearchManager.h b/iphone/Maps/UI/Search/MWMSearchManager.h
index 7146f3038f..570753a6fd 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager.h
+++ b/iphone/Maps/UI/Search/MWMSearchManager.h
@@ -1,13 +1,13 @@
 #import "MWMAlertViewController.h"
 #import "MWMSearchManagerObserver.h"
 #import "MWMSearchManagerState.h"
-#import "MWMSearchTextField.h"
 
 typedef NS_ENUM(NSInteger, MWMSearchManagerRoutingTooltipSearch) {
   MWMSearchManagerRoutingTooltipSearchNone,
   MWMSearchManagerRoutingTooltipSearchStart,
   MWMSearchManagerRoutingTooltipSearchFinish
 };
+@class MWMSearchTextField;
 
 @interface MWMSearchManager : NSObject
 
diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm
index bbd63d49ed..3d361a5392 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager.mm
@@ -11,8 +11,7 @@
 #import "Statistics.h"
 #import "SwiftBridge.h"
 
-namespace
-{
+namespace {
 typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) {
   MWMSearchManagerActionBarStateHidden,
   MWMSearchManagerActionBarStateTabBar,
@@ -25,49 +24,53 @@ using Observers = NSHashTable<Observer>;
 
 @interface MWMMapViewControlsManager ()
 
-@property(nonatomic) MWMSearchManager * searchManager;
+@property(nonatomic) MWMSearchManager *searchManager;
 
 @end
 
-@interface MWMSearchManager ()<MWMSearchTableViewProtocol, MWMSearchTabViewControllerDelegate,
-                               UITextFieldDelegate, MWMStorageObserver, MWMSearchObserver>
+@interface MWMSearchManager () <MWMSearchTableViewProtocol,
+                                MWMSearchTabViewControllerDelegate,
+                                UITextFieldDelegate,
+                                MWMStorageObserver,
+                                MWMSearchObserver>
 
-@property(weak, nonatomic, readonly) UIViewController * ownerController;
-@property(weak, nonatomic, readonly) UIView * actionBarContainer;
+@property(weak, nonatomic, readonly) UIViewController *ownerController;
+@property(weak, nonatomic, readonly) UIView *searchViewContainer;
+@property(weak, nonatomic, readonly) UIView *actionBarContainer;
 
-@property(nonatomic) IBOutlet UIView * searchBarView;
+@property(nonatomic) IBOutlet SearchBar *searchBarView;
 
-@property(nonatomic) IBOutlet UIView * actionBarView;
+@property(nonatomic) IBOutlet UIView *actionBarView;
 
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint * actionBarViewHeight;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint *actionBarViewHeight;
 @property(nonatomic) MWMSearchManagerActionBarState actionBarState;
-@property(weak, nonatomic) IBOutlet UIButton * actionBarViewFilterButton;
-@property(nonatomic) IBOutlet UIView * tabBarView;
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint * tabBarViewHeight;
-@property(nonatomic) IBOutlet MWMSearchChangeModeView * changeModeView;
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint * changeModeViewHeight;
-@property(weak, nonatomic) IBOutlet UIButton * filterButton;
+@property(weak, nonatomic) IBOutlet UIButton *actionBarViewFilterButton;
+@property(nonatomic) IBOutlet UIView *tabBarView;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint *tabBarViewHeight;
+@property(nonatomic) IBOutlet MWMSearchChangeModeView *changeModeView;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint *changeModeViewHeight;
+@property(weak, nonatomic) IBOutlet UIButton *filterButton;
 
-@property(nonatomic) IBOutlet UIView * contentView;
+@property(nonatomic) IBOutlet UIView *contentView;
 
-@property(nonatomic) NSLayoutConstraint * actionBarViewBottom;
+@property(nonatomic) NSLayoutConstraint *actionBarViewBottom;
 
-@property(nonatomic) UINavigationController * navigationController;
-@property(nonatomic) MWMSearchTableViewController * tableViewController;
-@property(nonatomic) MWMNoMapsViewController * noMapsController;
+@property(nonatomic) UINavigationController *navigationController;
+@property(nonatomic) MWMSearchTableViewController *tableViewController;
+@property(nonatomic) MWMNoMapsViewController *noMapsController;
 
-@property(nonatomic) Observers * observers;
+@property(nonatomic) Observers *observers;
 
 @end
 
 @implementation MWMSearchManager
 
-+ (MWMSearchManager *)manager { return [MWMMapViewControlsManager manager].searchManager; }
-- (nullable instancetype)init
-{
++ (MWMSearchManager *)manager {
+  return [MWMMapViewControlsManager manager].searchManager;
+}
+- (nullable instancetype)init {
   self = [super init];
-  if (self)
-  {
+  if (self) {
     [NSBundle.mainBundle loadNibNamed:@"MWMSearchView" owner:self options:nil];
     self.state = MWMSearchManagerStateHidden;
     [MWMSearch addObserver:self];
@@ -76,14 +79,12 @@ using Observers = NSHashTable<Observer>;
   return self;
 }
 
-- (void)beginSearch
-{
+- (void)beginSearch {
   if (self.state != MWMSearchManagerStateHidden)
     self.state = MWMSearchManagerStateTableSearch;
 }
 
-- (void)endSearch
-{
+- (void)endSearch {
   if (self.state != MWMSearchManagerStateHidden)
     self.state = MWMSearchManagerStateDefault;
   self.searchTextField.text = @"";
@@ -92,53 +93,60 @@ using Observers = NSHashTable<Observer>;
 
 #pragma mark - Actions
 
-- (IBAction)textFieldDidEndEditing:(UITextField *)textField
-{
+- (IBAction)textFieldDidEndEditing:(UITextField *)textField {
   if (textField.text.length == 0)
     [self endSearch];
 }
 
-- (IBAction)textFieldTextDidChange:(UITextField *)textField
-{
-  NSString * text = textField.text;
-  if (text.length > 0)
-  {
+- (IBAction)textFieldTextDidChange:(UITextField *)textField {
+  NSString *text = textField.text;
+  if (text.length > 0) {
     [self clearFilter];
     [self beginSearch];
     [MWMSearch searchQuery:text forInputLocale:textField.textInputMode.primaryLanguage];
-  }
-  else
-  {
+  } else {
     [self endSearch];
   }
 }
 
-- (IBAction)cancelButtonPressed
-{
+- (IBAction)cancelButtonPressed {
   [Statistics logEvent:kStatEventName(kStatSearch, kStatCancel)];
   [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"searchCancel"];
   self.state = MWMSearchManagerStateHidden;
 }
 
+- (IBAction)backButtonPressed {
+  NSString *statFrom = kStatUnknown;
+  if (self.state == MWMSearchManagerStateResult) {
+    statFrom = kStatSearchMapOneResult;
+  } else if (self.state == MWMSearchManagerStateResult) {
+    statFrom = kStatSearchMapSearch;
+  }
+  if (GetFramework().HasPlacePageInfo()) {
+    [Statistics logEvent:kStatBackClick withParameters:@{kStatFrom: statFrom, kStatTo: kStatSearchResults, kStatPlacePage: kStatPreview}];
+  } else {
+    [Statistics logEvent:kStatBackClick withParameters:@{kStatFrom: statFrom, kStatTo: kStatSearchResults}];
+  }
+  self.state = MWMSearchManagerStateTableSearch;
+}
+
 #pragma mark - Layout
 
 - (void)viewWillTransitionToSize:(CGSize)size
-       withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
-{
+       withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
   [self.navigationController viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
 }
 
 #pragma mark - UITextFieldDelegate
 
-- (void)textFieldDidBeginEditing:(UITextField *)textField
-{
+- (void)textFieldDidBeginEditing:(UITextField *)textField {
   BOOL const isEmpty = (textField.text.length == 0);
   self.state = isEmpty ? MWMSearchManagerStateDefault : MWMSearchManagerStateTableSearch;
 }
 
-- (BOOL)textFieldShouldReturn:(UITextField *)textField
-{
-  textField.text = [[textField.text stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet] stringByAppendingString:@" "];
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+  textField.text = [[textField.text stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet]
+    stringByAppendingString:@" "];
   [self textFieldTextDidChange:textField];
   [textField resignFirstResponder];
   return YES;
@@ -146,83 +154,74 @@ using Observers = NSHashTable<Observer>;
 
 #pragma mark - MWMSearchTabbedViewProtocol
 
-- (void)searchText:(NSString *)text forInputLocale:(NSString *)locale
-{
+- (void)searchText:(NSString *)text forInputLocale:(NSString *)locale {
   [self beginSearch];
   self.searchTextField.text = text;
-  NSString * inputLocale = locale ?: self.searchTextField.textInputMode.primaryLanguage;
+  NSString *inputLocale = locale ?: self.searchTextField.textInputMode.primaryLanguage;
   [MWMSearch searchQuery:text forInputLocale:inputLocale];
 }
 
-- (void)dismissKeyboard { [self.searchTextField resignFirstResponder]; }
-- (void)processSearchWithResult:(search::Result const &)result
-{
-  if (self.routingTooltipSearch == MWMSearchManagerRoutingTooltipSearchNone)
-  {
+- (void)dismissKeyboard {
+  [self.searchTextField resignFirstResponder];
+}
+- (void)processSearchWithResult:(search::Result const &)result {
+  if (self.routingTooltipSearch == MWMSearchManagerRoutingTooltipSearchNone) {
     [MWMSearch showResult:result];
-  }
-  else
-  {
+  } else {
     BOOL const isStart = self.routingTooltipSearch == MWMSearchManagerRoutingTooltipSearchStart;
-    auto point = [[MWMRoutePoint alloc]
-            initWithPoint:result.GetFeatureCenter()
-                    title:@(result.GetString().c_str())
-                 subtitle:@(result.GetAddress().c_str())
-                     type:isStart ? MWMRoutePointTypeStart : MWMRoutePointTypeFinish
-        intermediateIndex:0];
+    auto point = [[MWMRoutePoint alloc] initWithPoint:result.GetFeatureCenter()
+                                                title:@(result.GetString().c_str())
+                                             subtitle:@(result.GetAddress().c_str())
+                                                 type:isStart ? MWMRoutePointTypeStart : MWMRoutePointTypeFinish
+                                    intermediateIndex:0];
     if (isStart)
       [MWMRouter buildFromPoint:point bestRouter:NO];
     else
       [MWMRouter buildToPoint:point bestRouter:NO];
   }
   if (!IPAD || [MWMNavigationDashboardManager sharedManager].state != MWMNavigationDashboardStateHidden)
-    self.state = MWMSearchManagerStateHidden;
+    self.state = MWMSearchManagerStateResult;
 }
 
 #pragma mark - MWMStorageObserver
 
-- (void)processCountryEvent:(NSString *)countryId
-{
+- (void)processCountryEvent:(NSString *)countryId {
   using namespace storage;
   NodeStatuses nodeStatuses{};
   GetFramework().GetStorage().GetNodeStatuses(countryId.UTF8String, nodeStatuses);
   if (nodeStatuses.m_status != NodeStatus::OnDisk)
     return;
   [self updateTopController];
-  if (self.state == MWMSearchManagerStateTableSearch ||
-      self.state == MWMSearchManagerStateMapSearch)
-  {
-    NSString * text = self.searchTextField.text;
+  if (self.state == MWMSearchManagerStateTableSearch || self.state == MWMSearchManagerStateMapSearch) {
+    NSString *text = self.searchTextField.text;
     if (text.length != 0)
-      [MWMSearch searchQuery:text
-              forInputLocale:self.searchTextField.textInputMode.primaryLanguage];
+      [MWMSearch searchQuery:text forInputLocale:self.searchTextField.textInputMode.primaryLanguage];
   }
 }
 
 #pragma mark - State changes
 
-- (void)updateTopController
-{
-  UIViewController * selfTopVC = self.topController;
+- (void)updateTopController {
+  UIViewController *selfTopVC = self.topController;
   if (!selfTopVC || [selfTopVC isEqual:self.navigationController.topViewController])
     return;
-  NSMutableArray * viewControllers = [self.navigationController.viewControllers mutableCopy];
+  NSMutableArray *viewControllers = [self.navigationController.viewControllers mutableCopy];
   viewControllers[0] = selfTopVC;
   [self.navigationController setViewControllers:viewControllers animated:NO];
 }
 
-- (void)changeToHiddenState
-{
+- (void)changeToHiddenState {
   self.routingTooltipSearch = MWMSearchManagerRoutingTooltipSearchNone;
   [self endSearch];
 
   [self viewHidden:YES];
 }
 
-- (void)changeToDefaultState
-{
+- (void)changeToDefaultState {
   [self.navigationController popToRootViewControllerAnimated:NO];
 
+  self.searchBarView.state = SearchBarStateReady;
+  GetFramework().DeactivateMapSelection(true);
   [self animateConstraints:^{
     self.actionBarViewBottom.priority = UILayoutPriorityDefaultLow;
   }];
@@ -232,10 +231,11 @@ using Observers = NSHashTable<Observer>;
   [self.searchBarView applyTheme];
 }
 
-- (void)changeToTableSearchState
-{
+- (void)changeToTableSearchState {
   [self.navigationController popToRootViewControllerAnimated:NO];
 
+  self.searchBarView.state = SearchBarStateReady;
+  GetFramework().DeactivateMapSelection(true);
   [self updateTableSearchActionBar];
   [self viewHidden:NO];
   [MWMSearch setSearchOnMap:NO];
@@ -245,13 +245,12 @@ using Observers = NSHashTable<Observer>;
     [self.navigationController pushViewController:self.tableViewController animated:NO];
 }
 
-- (void)changeToMapSearchState
-{
+- (void)changeToMapSearchState {
   [self.navigationController popToRootViewControllerAnimated:NO];
 
+  self.searchBarView.state = SearchBarStateBack;
   self.actionBarState = MWMSearchManagerActionBarStateModeFilter;
-  if (!IPAD)
-  {
+  if (!IPAD) {
     [self animateConstraints:^{
       self.actionBarViewBottom.priority = UILayoutPriorityDefaultHigh;
     }];
@@ -264,15 +263,34 @@ using Observers = NSHashTable<Observer>;
   GetFramework().DeactivateMapSelection(true);
   [self.searchTextField resignFirstResponder];
 
-  if (navigationManagerState == MWMNavigationDashboardStateNavigation)
-  {
+  if (navigationManagerState == MWMNavigationDashboardStateNavigation) {
     self.searchTextField.text = @"";
   }
 }
 
-- (void)animateConstraints:(MWMVoidBlock)block
-{
-  UIView * parentView = self.ownerController.view;
+- (void)changeToResultSearchState {
+  [self.navigationController popToRootViewControllerAnimated:NO];
+
+  self.searchBarView.state = SearchBarStateBack;
+  self.actionBarState = MWMSearchManagerActionBarStateModeFilter;
+  if (!IPAD) {
+    [self animateConstraints:^{
+      self.actionBarViewBottom.priority = UILayoutPriorityDefaultHigh;
+    }];
+  }
+  auto const navigationManagerState = [MWMNavigationDashboardManager sharedManager].state;
+  [self viewHidden:navigationManagerState != MWMNavigationDashboardStateHidden];
+  [self.tableViewController reloadData];
+
+  [self.searchTextField resignFirstResponder];
+
+  if (navigationManagerState == MWMNavigationDashboardStateNavigation) {
+    self.searchTextField.text = @"";
+  }
+}
+
+- (void)animateConstraints:(MWMVoidBlock)block {
+  UIView *parentView = self.searchViewContainer;
   [parentView layoutIfNeeded];
   block();
   [UIView animateWithDuration:kDefaultAnimationDuration
@@ -283,28 +301,30 @@ using Observers = NSHashTable<Observer>;
 
 #pragma mark - MWMSearchObserver
 
-- (void)onSearchCompleted
-{
+- (void)onSearchCompleted {
+  if (self.state == MWMSearchManagerStateMapSearch || self.state == MWMSearchManagerStateResult) {
+    self.searchBarView.state = SearchBarStateBack;
+  } else {
+    self.searchBarView.state = SearchBarStateReady;
+  }
   if (self.state != MWMSearchManagerStateTableSearch)
-     return;
+    return;
   [self.tableViewController onSearchCompleted];
   [self updateTableSearchActionBar];
 }
 
-- (void)onSearchStarted
-{
+- (void)onSearchStarted {
+  self.searchBarView.state = SearchBarStateSearching;
   if (self.state != MWMSearchManagerStateTableSearch)
     return;
   self.actionBarState = MWMSearchManagerActionBarStateModeFilter;
 }
 
-- (void)onSearchResultsUpdated
-{
+- (void)onSearchResultsUpdated {
   [self.tableViewController reloadData];
 }
 
-- (void)updateTableSearchActionBar
-{
+- (void)updateTableSearchActionBar {
   if (self.state != MWMSearchManagerStateTableSearch)
     return;
   [self animateConstraints:^{
@@ -315,8 +335,8 @@ using Observers = NSHashTable<Observer>;
       hideActionBar = !([MWMSearch isHotelResults] || [MWMSearch hasFilter]);
     else
       hideActionBar = ([MWMSearch suggestionsCount] != 0);
-    self.actionBarState = hideActionBar ? MWMSearchManagerActionBarStateHidden
-                                        : MWMSearchManagerActionBarStateModeFilter;
+    self.actionBarState =
+      hideActionBar ? MWMSearchManagerActionBarStateHidden : MWMSearchManagerActionBarStateModeFilter;
 
     self.actionBarViewBottom.priority = UILayoutPriorityDefaultLow;
   }];
@@ -324,42 +344,40 @@ using Observers = NSHashTable<Observer>;
 
 #pragma mark - Add/Remove Observers
 
-+ (void)addObserver:(id<MWMSearchManagerObserver>)observer
-{
++ (void)addObserver:(id<MWMSearchManagerObserver>)observer {
   [[MWMSearchManager manager].observers addObject:observer];
 }
 
-+ (void)removeObserver:(id<MWMSearchManagerObserver>)observer
-{
++ (void)removeObserver:(id<MWMSearchManagerObserver>)observer {
   [[MWMSearchManager manager].observers removeObject:observer];
 }
 
 #pragma mark - MWMSearchManagerObserver
 
-- (void)onSearchManagerStateChanged
-{
+- (void)onSearchManagerStateChanged {
   for (Observer observer in self.observers)
     [observer onSearchManagerStateChanged];
 }
 
 #pragma mark - Filters
 
-- (IBAction)changeMode
-{
-  switch (self.state)
-  {
-  case MWMSearchManagerStateTableSearch: self.state = MWMSearchManagerStateMapSearch; break;
-  case MWMSearchManagerStateMapSearch: self.state = MWMSearchManagerStateTableSearch; break;
-  default: break;
+- (IBAction)changeMode {
+  switch (self.state) {
+    case MWMSearchManagerStateTableSearch:
+      self.state = MWMSearchManagerStateMapSearch;
+      break;
+    case MWMSearchManagerStateMapSearch:
+      self.state = MWMSearchManagerStateTableSearch;
+      break;
+    default:
+      break;
   }
 }
 
 #pragma mark - Properties
 
-- (UINavigationController *)navigationController
-{
-  if (!_navigationController)
-  {
+- (UINavigationController *)navigationController {
+  if (!_navigationController) {
     _navigationController = [[UINavigationController alloc] init];
     [self.contentView addSubview:_navigationController.view];
     _navigationController.navigationBarHidden = YES;
@@ -367,17 +385,15 @@ using Observers = NSHashTable<Observer>;
   return _navigationController;
 }
 
-- (UIViewController *)topController
-{
+- (UIViewController *)topController {
   [[MWMStorage sharedStorage] removeObserver:self];
   self.noMapsController = nil;
-  switch (self.state)
-  {
-    case MWMSearchManagerStateHidden: return nil;
-    case MWMSearchManagerStateDefault:
-    {
+  switch (self.state) {
+    case MWMSearchManagerStateHidden:
+      return nil;
+    case MWMSearchManagerStateDefault: {
       if (GetFramework().GetStorage().HaveDownloadedCountries()) {
-        MWMSearchTabViewController * tabViewController = [MWMSearchTabViewController new];
+        MWMSearchTabViewController *tabViewController = [MWMSearchTabViewController new];
         tabViewController.delegate = self;
         return tabViewController;
       }
@@ -385,66 +401,67 @@ using Observers = NSHashTable<Observer>;
       [[MWMStorage sharedStorage] addObserver:self];
       return self.noMapsController;
     }
-    case MWMSearchManagerStateTableSearch: return self.tableViewController;
-    case MWMSearchManagerStateMapSearch: return self.tableViewController;
+    case MWMSearchManagerStateTableSearch:
+      return self.tableViewController;
+    case MWMSearchManagerStateMapSearch:
+      return self.tableViewController;
+    case MWMSearchManagerStateResult:
+      return self.tableViewController;
   }
 }
 
-- (void)searchTabController:(MWMSearchTabViewController *)viewController didSearch:(NSString *)didSearch
-{
+- (void)searchTabController:(MWMSearchTabViewController *)viewController didSearch:(NSString *)didSearch {
   [self searchText:didSearch forInputLocale:[[AppInfo sharedInfo] languageId]];
 }
 
-- (MWMSearchTableViewController *)tableViewController
-{
+- (MWMSearchTableViewController *)tableViewController {
   if (!_tableViewController)
     _tableViewController = [[MWMSearchTableViewController alloc] initWithDelegate:self];
   return _tableViewController;
 }
 
-- (void)setState:(MWMSearchManagerState)state
-{
+- (void)setState:(MWMSearchManagerState)state {
   if (_state == state)
     return;
 
   _state = state;
   [self updateTopController];
-  switch (state)
-  {
-  case MWMSearchManagerStateHidden:
-    [Statistics logEvent:kStatSearchEnteredState withParameters:@{kStatName : kStatClose}];
-    [self changeToHiddenState];
-    break;
-  case MWMSearchManagerStateDefault:
-    [Statistics logEvent:kStatSearchEnteredState withParameters:@{kStatName : kStatOpen}];
-    [self changeToDefaultState];
-    break;
-  case MWMSearchManagerStateTableSearch:
-    [Statistics logEvent:kStatSearchEnteredState withParameters:@{kStatName : kStatTable}];
-    [self changeToTableSearchState];
-    break;
-  case MWMSearchManagerStateMapSearch:
-    [Statistics logEvent:kStatSearchEnteredState withParameters:@{kStatName : kStatMapSearch}];
-    [self changeToMapSearchState];
-    break;
+  switch (state) {
+    case MWMSearchManagerStateHidden:
+      [Statistics logEvent:kStatSearchEnteredState withParameters:@{kStatName: kStatClose}];
+      [self changeToHiddenState];
+      break;
+    case MWMSearchManagerStateDefault:
+      [Statistics logEvent:kStatSearchEnteredState withParameters:@{kStatName: kStatOpen}];
+      [self changeToDefaultState];
+      break;
+    case MWMSearchManagerStateTableSearch:
+      [Statistics logEvent:kStatSearchEnteredState withParameters:@{kStatName: kStatTable}];
+      [self changeToTableSearchState];
+      break;
+    case MWMSearchManagerStateMapSearch:
+      [Statistics logEvent:kStatSearchEnteredState withParameters:@{kStatName: kStatMapSearch}];
+      [self changeToMapSearchState];
+      break;
+    case MWMSearchManagerStateResult:
+      [Statistics logEvent:kStatSearchEnteredState withParameters:@{kStatName: kStatSearchMapOneResult}];
+      [self changeToResultSearchState];
+      break;
   }
   [self onSearchManagerStateChanged];
   [self.changeModeView updateForState:state];
   [[MapViewController sharedController] updateStatusBarStyle];
 }
 
-- (void)viewHidden:(BOOL)hidden
-{
-  UIView * searchBarView = self.searchBarView;
-  UIView * actionBarView = self.actionBarView;
-  UIView * contentView = self.contentView;
-  UIView * parentView = self.ownerController.view;
-  UIView * actionBarContaner = self.actionBarContainer;
+- (void)viewHidden:(BOOL)hidden {
+  UIView *searchBarView = self.searchBarView;
+  UIView *actionBarView = self.actionBarView;
+  UIView *contentView = self.contentView;
+  UIView *parentView = self.searchViewContainer;
+  UIView *actionBarContaner = self.actionBarContainer;
 
-  if (!hidden)
-  {
-    if (searchBarView.superview)
-    {
+  if (!hidden) {
+    if (searchBarView.superview) {
       [parentView bringSubviewToFront:searchBarView];
       [actionBarContaner bringSubviewToFront:actionBarView];
       [parentView bringSubviewToFront:contentView];
@@ -456,56 +473,60 @@ using Observers = NSHashTable<Observer>;
     [self layoutTopViews];
   }
   [UIView animateWithDuration:kDefaultAnimationDuration
-      animations:^{
-        CGFloat const alpha = hidden ? 0 : 1;
-        contentView.alpha = alpha;
-        actionBarView.alpha = alpha;
-        searchBarView.alpha = alpha;
-      }
-      completion:^(BOOL finished) {
-        if (!hidden)
-          return;
-        [contentView removeFromSuperview];
-        [actionBarView removeFromSuperview];
-        [searchBarView removeFromSuperview];
-      }];
+    animations:^{
+      CGFloat const alpha = hidden ? 0 : 1;
+      contentView.alpha = alpha;
+      actionBarView.alpha = alpha;
+      searchBarView.alpha = alpha;
+    }
+    completion:^(BOOL finished) {
+      if (!hidden)
+        return;
+      [contentView removeFromSuperview];
+      [actionBarView removeFromSuperview];
+      [searchBarView removeFromSuperview];
+    }];
 }
 
-- (void)setChangeModeView:(MWMSearchChangeModeView *)changeModeView
-{
+- (void)setChangeModeView:(MWMSearchChangeModeView *)changeModeView {
   _changeModeView = changeModeView;
   [changeModeView updateForState:self.state];
 }
 
-- (void)setActionBarState:(MWMSearchManagerActionBarState)actionBarState
-{
+- (void)setActionBarState:(MWMSearchManagerActionBarState)actionBarState {
   _actionBarState = actionBarState;
-  switch (actionBarState)
-  {
-  case MWMSearchManagerActionBarStateHidden:
-    self.tabBarView.hidden = YES;
-    self.changeModeView.hidden = YES;
-    self.actionBarViewHeight.priority = UILayoutPriorityDefaultHigh;
-    self.tabBarViewHeight.priority = UILayoutPriorityDefaultLow;
-    self.changeModeViewHeight.priority = UILayoutPriorityDefaultLow;
-    break;
-  case MWMSearchManagerActionBarStateTabBar:
-    self.tabBarView.hidden = NO;
-    self.changeModeView.hidden = YES;
-    self.actionBarViewHeight.priority = UILayoutPriorityDefaultLow;
-    self.tabBarViewHeight.priority = UILayoutPriorityDefaultHigh;
-    self.changeModeViewHeight.priority = UILayoutPriorityDefaultLow;
-    break;
-  case MWMSearchManagerActionBarStateModeFilter:
-    self.tabBarView.hidden = YES;
-    self.changeModeView.hidden = NO;
-    self.actionBarViewHeight.priority = UILayoutPriorityDefaultLow;
-    self.tabBarViewHeight.priority = UILayoutPriorityDefaultLow;
-    self.changeModeViewHeight.priority = UILayoutPriorityDefaultHigh;
-    break;
+  switch (actionBarState) {
+    case MWMSearchManagerActionBarStateHidden:
+      self.tabBarView.hidden = YES;
+      self.changeModeView.hidden = YES;
+      self.actionBarViewHeight.priority = UILayoutPriorityDefaultHigh;
+      self.tabBarViewHeight.priority = UILayoutPriorityDefaultLow;
+      self.changeModeViewHeight.priority = UILayoutPriorityDefaultLow;
+      break;
+    case MWMSearchManagerActionBarStateTabBar:
+      self.tabBarView.hidden = NO;
+      self.changeModeView.hidden = YES;
+      self.actionBarViewHeight.priority = UILayoutPriorityDefaultLow;
+      self.tabBarViewHeight.priority = UILayoutPriorityDefaultHigh;
+      self.changeModeViewHeight.priority = UILayoutPriorityDefaultLow;
+      break;
+    case MWMSearchManagerActionBarStateModeFilter:
+      self.tabBarView.hidden = YES;
+      self.changeModeView.hidden = NO;
+      self.actionBarViewHeight.priority = UILayoutPriorityDefaultLow;
+      self.tabBarViewHeight.priority = UILayoutPriorityDefaultLow;
+      self.changeModeViewHeight.priority = UILayoutPriorityDefaultHigh;
+      break;
   }
 }
 
-- (UIViewController *)ownerController { return [MapViewController sharedController]; }
-- (UIView *)actionBarContainer { return [MapViewController sharedController].controlsView; }
+- (UIViewController *)ownerController {
+  return [MapViewController sharedController];
+}
+- (UIView *)searchViewContainer {
+  return [MapViewController sharedController].searchViewContainer;
+}
+- (UIView *)actionBarContainer {
+  return [MapViewController sharedController].controlsView;
+}
 @end
diff --git a/iphone/Maps/UI/Search/MWMSearchManagerState.h b/iphone/Maps/UI/Search/MWMSearchManagerState.h
index 36a55f9b8c..8ef6214263 100644
--- a/iphone/Maps/UI/Search/MWMSearchManagerState.h
+++ b/iphone/Maps/UI/Search/MWMSearchManagerState.h
@@ -3,5 +3,6 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerState)
   MWMSearchManagerStateHidden,
   MWMSearchManagerStateDefault,
   MWMSearchManagerStateTableSearch,
-  MWMSearchManagerStateMapSearch
+  MWMSearchManagerStateMapSearch,
+  MWMSearchManagerStateResult
 };
diff --git a/iphone/Maps/UI/Search/MWMSearchTextField.h b/iphone/Maps/UI/Search/MWMSearchTextField.h
deleted file mode 100644
index cdc4df1184..0000000000
--- a/iphone/Maps/UI/Search/MWMSearchTextField.h
+++ /dev/null
@@ -1,2 +0,0 @@
-@interface MWMSearchTextField : UITextField
-@end
diff --git a/iphone/Maps/UI/Search/MWMSearchTextField.mm b/iphone/Maps/UI/Search/MWMSearchTextField.mm
deleted file mode 100644
index 61a62cbc77..0000000000
--- a/iphone/Maps/UI/Search/MWMSearchTextField.mm
+++ /dev/null
@@ -1,106 +0,0 @@
-#import "MWMSearchTextField.h"
-#import "MWMSearch.h"
-#import "UIImageView+Coloring.h"
-#import "SwiftBridge.h"
-
-namespace
-{
-NSTimeInterval constexpr kOnSearchCompletedDelay = 0.2;
-}  // namespace
-
-@interface MWMSearchTextField ()<MWMSearchObserver>
-
-@property(nonatomic) BOOL isSearching;
-
-@end
-
-@implementation MWMSearchTextField
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-  self = [super initWithCoder:aDecoder];
-  if (self)
-  {
-    [self setStaticIcon];
-    self.leftViewMode = UITextFieldViewModeAlways;
-    [MWMSearch addObserver:self];
-  }
-  return self;
-}
-
-- (CGRect)leftViewRectForBounds:(CGRect)bounds
-{
-  CGRect rect = [super leftViewRectForBounds:bounds];
-  rect.origin.x += 8.0;
-  return rect;
-}
-
-#pragma mark - Draw
-
-- (void)drawPlaceholderInRect:(CGRect)rect
-{
-  [[self placeholder] drawInRect:rect withAttributes:@{NSFontAttributeName: self.font,
-                                                       NSForegroundColorAttributeName: self.tintColor}];
-}
-
--(void)layoutSubviews
-{
-  [super layoutSubviews];
-  for (UIView* view in self.subviews) {
-    if ([view isKindOfClass:[UIButton class]]) {
-      UIButton* button = (UIButton*) view;
-      [button setImage:[UIImage imageNamed:@"ic_search_clear_14"] forState:UIControlStateNormal];
-      button.tintColor = self.tintColor;
-    }
-  }
-}
-
-#pragma mark - Properties
-
-- (void)setIsSearching:(BOOL)isSearching
-{
-  if (_isSearching == isSearching)
-    return;
-  _isSearching = isSearching;
-  if (isSearching)
-  {
-    UIActivityIndicatorView * view = [[UIActivityIndicatorView alloc]
-        initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
-    view.autoresizingMask =
-        UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin;
-    [view startAnimating];
-    view.bounds = self.leftView.bounds;
-    view.styleName = @"SearchSearchTextFieldIcon";
-    self.leftView = view;
-  }
-  else
-  {
-    [self setStaticIcon];
-  }
-}
-
-- (void)setStaticIcon
-{
-  self.leftView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ic_search"]];
-  [self.leftView setStyleAndApply:@"SearchSearchTextFieldIcon"];
-}
-
-- (void)stopSpinner { self.isSearching = NO; }
-#pragma mark - MWMSearchObserver
-
-- (void)onSearchStarted
-{
-  [NSObject cancelPreviousPerformRequestsWithTarget:self
-                                           selector:@selector(stopSpinner)
-                                             object:nil];
-  self.isSearching = YES;
-}
-
-- (void)onSearchCompleted
-{
-  SEL const selector = @selector(stopSpinner);
-  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:selector object:nil];
-  [self performSelector:selector withObject:nil afterDelay:kOnSearchCompletedDelay];
-}
-
-@end
diff --git a/iphone/Maps/UI/Search/MWMSearchTextField.swift b/iphone/Maps/UI/Search/MWMSearchTextField.swift
new file mode 100644
index 0000000000..469c283bca
--- /dev/null
+++ b/iphone/Maps/UI/Search/MWMSearchTextField.swift
@@ -0,0 +1,32 @@
+@objc(MWMSearchTextField)
+class SearchTextField: UITextField {
+  required init?(coder aDecoder: NSCoder) {
+    super.init(coder: aDecoder)
+    leftViewMode = UITextField.ViewMode.always
+    leftView = UIView(frame: CGRect(x: 0, y: 0, width: 32, height: 32))
+  }
+
+  override func drawPlaceholder(in rect: CGRect) {
+    guard let font = font, let tint = tintColor else {
+      super.drawPlaceholder(in: rect);
+      return
+    }
+    placeholder?.draw(
+      in: rect,
+      withAttributes: [
+        NSAttributedString.Key.font: font,
+        NSAttributedString.Key.foregroundColor: tint
+    ])
+  }
+
+  override func layoutSubviews() {
+    super.layoutSubviews()
+    for view in subviews {
+      if (view is UIButton) {
+        let button = view as? UIButton
+        button?.setImage(UIImage(named: "ic_search_clear_14"), for: .normal)
+        button?.tintColor = tintColor
+      }
+    }
+  }
+}
diff --git a/iphone/Maps/UI/Search/MWMSearchView.xib b/iphone/Maps/UI/Search/MWMSearchView.xib
index 0016f4efd5..dd9e203586 100644
--- a/iphone/Maps/UI/Search/MWMSearchView.xib
+++ b/iphone/Maps/UI/Search/MWMSearchView.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -29,13 +29,13 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8lb-Vi-0oJ" userLabel="StatusBarBackground">
-                    <rect key="frame" x="-100" y="-100" width="520" height="144"/>
+                    <rect key="frame" x="0.0" y="-100" width="320" height="144"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchBarView"/>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="fill" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="hna-zw-Zor" userLabel="Search" customClass="MWMSearchTextField">
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="fill" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="hna-zw-Zor" userLabel="Search" customClass="SearchTextField" customModule="maps_me" customModuleProvider="target">
                     <rect key="frame" x="8" y="4" width="246" height="36"/>
                     <accessibility key="accessibilityConfiguration" identifier="queryField"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
@@ -69,22 +69,62 @@
                         <action selector="cancelButtonPressed" destination="-1" eventType="touchUpInside" id="8EF-82-bpl"/>
                     </connections>
                 </button>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_search" translatesAutoresizingMaskIntoConstraints="NO" id="3pk-lE-he1">
+                    <rect key="frame" x="8" y="4" width="36" height="36"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="36" id="uQu-zo-HSW"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchSearchTextFieldIcon"/>
+                    </userDefinedRuntimeAttributes>
+                </imageView>
+                <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="s62-Rm-IgM">
+                    <rect key="frame" x="8" y="4" width="36" height="36"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="36" id="RWD-6J-ieA"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchSearchTextFieldIcon"/>
+                    </userDefinedRuntimeAttributes>
+                </activityIndicatorView>
+                <button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1K1-2y-aoz">
+                    <rect key="frame" x="8" y="4" width="36" height="36"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="36" id="gYr-En-zli"/>
+                    </constraints>
+                    <state key="normal" image="ic_search_back"/>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchSearchTextFieldIcon"/>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <action selector="backButtonPressed" destination="-1" eventType="touchUpInside" id="Ez8-FA-m5B"/>
+                    </connections>
+                </button>
             </subviews>
             <color key="backgroundColor" red="0.12549019607843137" green="0.59607843137254901" blue="0.32156862745098036" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
+                <constraint firstItem="1K1-2y-aoz" firstAttribute="bottom" secondItem="hna-zw-Zor" secondAttribute="bottom" id="5Ov-CR-SHR"/>
+                <constraint firstItem="3pk-lE-he1" firstAttribute="leading" secondItem="hna-zw-Zor" secondAttribute="leading" id="5oe-E7-WjD"/>
+                <constraint firstItem="3pk-lE-he1" firstAttribute="bottom" secondItem="hna-zw-Zor" secondAttribute="bottom" id="6Lk-AC-rKq"/>
                 <constraint firstAttribute="height" constant="44" id="92s-Aa-9VQ"/>
+                <constraint firstItem="1K1-2y-aoz" firstAttribute="leading" secondItem="hna-zw-Zor" secondAttribute="leading" id="ENZ-Rl-5Ew"/>
                 <constraint firstAttribute="bottom" secondItem="hna-zw-Zor" secondAttribute="bottom" constant="4" id="JRS-Wn-APP"/>
                 <constraint firstItem="hna-zw-Zor" firstAttribute="top" secondItem="HcT-Cg-vp3" secondAttribute="top" constant="4" id="OpQ-jn-TbX"/>
                 <constraint firstItem="5Hu-71-uqb" firstAttribute="leading" secondItem="hna-zw-Zor" secondAttribute="trailing" id="UnO-5R-Vaq"/>
+                <constraint firstItem="s62-Rm-IgM" firstAttribute="bottom" secondItem="hna-zw-Zor" secondAttribute="bottom" id="WiD-jZ-hcW"/>
+                <constraint firstItem="1K1-2y-aoz" firstAttribute="top" secondItem="hna-zw-Zor" secondAttribute="top" id="XQs-CO-rFJ"/>
+                <constraint firstItem="3pk-lE-he1" firstAttribute="top" secondItem="hna-zw-Zor" secondAttribute="top" id="XuP-Ho-nzq"/>
                 <constraint firstItem="8lb-Vi-0oJ" firstAttribute="top" secondItem="HcT-Cg-vp3" secondAttribute="top" constant="-100" id="YyR-vY-KLM"/>
-                <constraint firstAttribute="trailing" secondItem="8lb-Vi-0oJ" secondAttribute="trailing" constant="-100" id="cOI-Bb-dVh">
+                <constraint firstAttribute="trailing" secondItem="8lb-Vi-0oJ" secondAttribute="trailing" id="cOI-Bb-dVh">
                     <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                 </constraint>
+                <constraint firstItem="s62-Rm-IgM" firstAttribute="leading" secondItem="hna-zw-Zor" secondAttribute="leading" id="h6n-7q-awP"/>
                 <constraint firstItem="5Hu-71-uqb" firstAttribute="top" secondItem="HcT-Cg-vp3" secondAttribute="top" id="jGx-GC-U0a"/>
                 <constraint firstAttribute="trailing" secondItem="5Hu-71-uqb" secondAttribute="trailing" id="lsP-Aa-SwK"/>
                 <constraint firstAttribute="bottom" secondItem="5Hu-71-uqb" secondAttribute="bottom" id="qqg-dK-O8g"/>
                 <constraint firstItem="hna-zw-Zor" firstAttribute="leading" secondItem="HcT-Cg-vp3" secondAttribute="leading" constant="8" id="tLC-W9-2XZ"/>
-                <constraint firstItem="8lb-Vi-0oJ" firstAttribute="leading" secondItem="HcT-Cg-vp3" secondAttribute="leading" constant="-100" id="wB0-LU-IyU">
+                <constraint firstItem="s62-Rm-IgM" firstAttribute="top" secondItem="hna-zw-Zor" secondAttribute="top" id="und-VX-fTX"/>
+                <constraint firstItem="8lb-Vi-0oJ" firstAttribute="leading" secondItem="HcT-Cg-vp3" secondAttribute="leading" id="wB0-LU-IyU">
                     <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                 </constraint>
                 <constraint firstAttribute="bottom" secondItem="8lb-Vi-0oJ" secondAttribute="bottom" id="wkh-Pc-qKF"/>
@@ -94,7 +134,12 @@
             <userDefinedRuntimeAttributes>
                 <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchBar"/>
             </userDefinedRuntimeAttributes>
-            <point key="canvasLocation" x="236" y="-242"/>
+            <connections>
+                <outlet property="activityIndicator" destination="s62-Rm-IgM" id="iMc-UV-Rzf"/>
+                <outlet property="backButton" destination="1K1-2y-aoz" id="f5t-dc-4Jg"/>
+                <outlet property="searchIcon" destination="3pk-lE-he1" id="edK-sI-ual"/>
+            </connections>
+            <point key="canvasLocation" x="235.19999999999999" y="-242.87856071964021"/>
         </view>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j3Y-13-kVB" userLabel="ActionBar" customClass="SolidTouchView" propertyAccessControl="none">
@@ -104,7 +149,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gPn-bf-cPr" customClass="SolidTouchView">
-                            <rect key="frame" x="-100" y="0.0" width="520" height="164"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="164"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
@@ -117,10 +162,10 @@
                             <variation key="heightClass=compact" constant="44"/>
                         </constraint>
                         <constraint firstItem="gPn-bf-cPr" firstAttribute="top" secondItem="Smx-UL-Mcd" secondAttribute="top" id="UER-Ty-xhx"/>
-                        <constraint firstItem="gPn-bf-cPr" firstAttribute="leading" secondItem="Smx-UL-Mcd" secondAttribute="leading" constant="-100" id="b86-tJ-SqB">
+                        <constraint firstItem="gPn-bf-cPr" firstAttribute="leading" secondItem="Smx-UL-Mcd" secondAttribute="leading" id="b86-tJ-SqB">
                             <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                         </constraint>
-                        <constraint firstAttribute="trailing" secondItem="gPn-bf-cPr" secondAttribute="trailing" constant="-100" id="pkz-a1-2QA">
+                        <constraint firstAttribute="trailing" secondItem="gPn-bf-cPr" secondAttribute="trailing" id="pkz-a1-2QA">
                             <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                         </constraint>
                         <constraint firstAttribute="bottom" secondItem="gPn-bf-cPr" secondAttribute="bottom" constant="-100" id="y3i-4D-GKo">
@@ -135,7 +180,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KRD-Q7-fQP" customClass="SolidTouchView">
-                            <rect key="frame" x="-100" y="0.0" width="520" height="148"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="148"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchChangeModeView"/>
@@ -195,13 +240,13 @@
                         <constraint firstItem="vUE-KN-mbf" firstAttribute="bottom" secondItem="hzG-6h-WLq" secondAttribute="bottom" id="hsI-F8-c35"/>
                         <constraint firstItem="hzG-6h-WLq" firstAttribute="leading" secondItem="JhV-gM-MgM" secondAttribute="trailing" priority="500" constant="8" id="iMA-u6-5S9"/>
                         <constraint firstItem="JhV-gM-MgM" firstAttribute="leading" secondItem="Ysx-Oh-UYF" secondAttribute="leading" id="iwa-86-Rhh"/>
-                        <constraint firstAttribute="trailing" secondItem="KRD-Q7-fQP" secondAttribute="trailing" constant="-100" id="oJj-4y-uvN">
+                        <constraint firstAttribute="trailing" secondItem="KRD-Q7-fQP" secondAttribute="trailing" id="oJj-4y-uvN">
                             <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                         </constraint>
                         <constraint firstAttribute="bottom" secondItem="KRD-Q7-fQP" secondAttribute="bottom" constant="-100" id="pJU-Qh-4tn">
                             <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                         </constraint>
-                        <constraint firstItem="KRD-Q7-fQP" firstAttribute="leading" secondItem="Ysx-Oh-UYF" secondAttribute="leading" constant="-100" id="sMT-St-iws">
+                        <constraint firstItem="KRD-Q7-fQP" firstAttribute="leading" secondItem="Ysx-Oh-UYF" secondAttribute="leading" id="sMT-St-iws">
                             <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                         </constraint>
                         <constraint firstItem="JhV-gM-MgM" firstAttribute="top" secondItem="Ysx-Oh-UYF" secondAttribute="top" id="y3t-5r-CMa"/>
@@ -239,7 +284,7 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jHn-5d-yXG" customClass="SolidTouchView">
-                    <rect key="frame" x="-100" y="0.0" width="520" height="502"/>
+                    <rect key="frame" x="0.0" y="0.0" width="320" height="402"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
@@ -248,14 +293,14 @@
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="jHn-5d-yXG" firstAttribute="leading" secondItem="u9y-bx-NGd" secondAttribute="leading" constant="-100" id="1Qk-kN-iT5">
+                <constraint firstItem="jHn-5d-yXG" firstAttribute="leading" secondItem="u9y-bx-NGd" secondAttribute="leading" id="1Qk-kN-iT5">
                     <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                 </constraint>
                 <constraint firstItem="jHn-5d-yXG" firstAttribute="top" secondItem="u9y-bx-NGd" secondAttribute="top" id="Bgm-2G-pSD"/>
-                <constraint firstAttribute="trailing" secondItem="jHn-5d-yXG" secondAttribute="trailing" constant="-100" id="aKt-MM-Csi">
+                <constraint firstAttribute="trailing" secondItem="jHn-5d-yXG" secondAttribute="trailing" id="aKt-MM-Csi">
                     <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                 </constraint>
-                <constraint firstAttribute="bottom" secondItem="jHn-5d-yXG" secondAttribute="bottom" constant="-100" id="hm3-xK-oys">
+                <constraint firstAttribute="bottom" secondItem="jHn-5d-yXG" secondAttribute="bottom" id="hm3-xK-oys">
                     <variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
                 </constraint>
             </constraints>
@@ -269,5 +314,7 @@
     </objects>
     <resources>
         <image name="ic_clear_filters" width="36" height="36"/>
+        <image name="ic_search" width="28" height="28"/>
+        <image name="ic_search_back" width="24" height="24"/>
     </resources>
 </document>
diff --git a/iphone/Maps/UI/Search/SearchBar.swift b/iphone/Maps/UI/Search/SearchBar.swift
index aba8445c08..6c37e0f5ce 100644
--- a/iphone/Maps/UI/Search/SearchBar.swift
+++ b/iphone/Maps/UI/Search/SearchBar.swift
@@ -1,4 +1,14 @@
+@objc enum SearchBarState: Int {
+  case ready
+  case searching
+  case back
+}
+
 final class SearchBar: SolidTouchView {
+  @IBOutlet var searchIcon: UIImageView!
+  @IBOutlet var activityIndicator: UIActivityIndicatorView!
+  @IBOutlet var backButton: UIButton!
+
   override var visibleAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: .top, iPad: .left) }
 
   override var placePageAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: [], iPad: .left) }
@@ -8,4 +18,33 @@ final class SearchBar: SolidTouchView {
   override var trafficButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: .top, iPad: .left) }
 
   override var tabBarAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: [], iPad: .left) }
+
+  @objc var state: SearchBarState = .ready {
+    didSet {
+      if state != oldValue {
+        updateLeftView()
+      }
+    }
+  }
+
+  override func awakeFromNib() {
+    super.awakeFromNib()
+    updateLeftView()
+  }
+
+  private func updateLeftView() {
+    searchIcon.isHidden = true
+    activityIndicator.isHidden = true
+    backButton.isHidden = true
+
+    switch state {
+    case .ready:
+      searchIcon.isHidden = false
+    case .searching:
+      activityIndicator.isHidden = false
+      activityIndicator.startAnimating()
+    case .back:
+      backButton.isHidden = false
+    }
+  }
 }
diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h
index d776e22b08..dd977ef2bd 100644
--- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h
@@ -1,11 +1,11 @@
 #import "MWMSearch.h"
 #import "MWMSearchManager.h"
 #import "MWMSearchTabbedViewProtocol.h"
-#import "MWMSearchTextField.h"
 #import "MWMViewController.h"
 
 #include <CoreApi/Framework.h>
 
+@class MWMSearchTextField;
 namespace search
 {
 class Result;
diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard
index 78110e9531..65bc095bf0 100644
--- a/iphone/Maps/UI/Storyboard/Main.storyboard
+++ b/iphone/Maps/UI/Storyboard/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -121,8 +121,35 @@
                                     </mask>
                                 </variation>
                             </view>
+                            <view contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="jio-3T-E6G" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="350" id="Dd0-x6-7gc"/>
+                                </constraints>
+                                <variation key="default">
+                                    <mask key="constraints">
+                                        <exclude reference="Dd0-x6-7gc"/>
+                                    </mask>
+                                </variation>
+                                <variation key="heightClass=compact-widthClass=compact">
+                                    <mask key="constraints">
+                                        <include reference="Dd0-x6-7gc"/>
+                                    </mask>
+                                </variation>
+                                <variation key="heightClass=compact-widthClass=regular">
+                                    <mask key="constraints">
+                                        <include reference="Dd0-x6-7gc"/>
+                                    </mask>
+                                </variation>
+                                <variation key="heightClass=regular-widthClass=regular">
+                                    <mask key="constraints">
+                                        <include reference="Dd0-x6-7gc"/>
+                                    </mask>
+                                </variation>
+                            </view>
                             <view hidden="YES" contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="rbx-Oj-jeo" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="64" width="414" height="832"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="852"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="350" id="6h8-a6-LWn"/>
@@ -170,13 +197,14 @@
                             <constraint firstItem="rL1-9E-4b7" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="E89-WV-ZTh"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="at1-V1-pzl" secondAttribute="trailing" id="GKG-4Y-2Pq"/>
                             <constraint firstAttribute="trailing" secondItem="aPn-pa-nCx" secondAttribute="trailing" id="GKJ-zm-8xb"/>
-                            <constraint firstItem="rbx-Oj-jeo" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="top" constant="20" id="J0B-xe-sNj"/>
+                            <constraint firstItem="rbx-Oj-jeo" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="top" id="J0B-xe-sNj"/>
                             <constraint firstItem="aVk-ab-LFJ" firstAttribute="leading" secondItem="rL1-9E-4b7" secondAttribute="leading" priority="100" id="JyB-TX-fUN"/>
                             <constraint firstItem="aVk-ab-LFJ" firstAttribute="bottom" secondItem="rL1-9E-4b7" secondAttribute="bottom" priority="100" id="LCC-5Q-3hb"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="at1-V1-pzl" secondAttribute="bottom" constant="48" id="O8L-nd-nOa"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="FFY-Dy-Wou" secondAttribute="bottom" priority="100" id="OE7-Qb-J0v"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="awj-9E-eBS" secondAttribute="bottom" id="PFs-sL-oVA"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="rL1-9E-4b7" secondAttribute="trailing" id="QdS-Yx-ADV"/>
+                            <constraint firstItem="jio-3T-E6G" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="SAj-bF-qrr"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="xJx-UU-IdV" secondAttribute="bottom" id="SDX-4J-Jz5"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="xJx-UU-IdV" secondAttribute="bottom" priority="100" id="VfU-Zk-8IU"/>
                             <constraint firstItem="rbx-Oj-jeo" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" constant="8" id="W0l-NG-7lt"/>
@@ -188,9 +216,12 @@
                             <constraint firstItem="at1-V1-pzl" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="dVq-df-YMe"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="NI8-tV-i2B" secondAttribute="bottom" priority="100" id="fgM-Gj-Vd4"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="aVk-ab-LFJ" secondAttribute="top" priority="100" constant="48" id="jQI-62-O5O"/>
+                            <constraint firstAttribute="bottom" secondItem="jio-3T-E6G" secondAttribute="bottom" id="l6r-eW-Dbi"/>
                             <constraint firstItem="aPn-pa-nCx" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="pwE-hX-IML"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="TdT-ia-GP9" secondAttribute="bottom" priority="100" id="pwZ-Fm-mHR"/>
+                            <constraint firstAttribute="top" secondItem="jio-3T-E6G" secondAttribute="top" id="rYG-px-wH5"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="NI8-tV-i2B" secondAttribute="top" priority="100" id="sSU-QE-9zI"/>
+                            <constraint firstAttribute="trailing" secondItem="jio-3T-E6G" secondAttribute="trailing" id="t9l-Ud-h6j"/>
                             <constraint firstAttribute="bottom" secondItem="aPn-pa-nCx" secondAttribute="bottom" id="tB3-eX-gUV"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="rbx-Oj-jeo" secondAttribute="bottom" constant="70" id="u9s-KY-yCt"/>
                             <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="65S-M4-TnM" secondAttribute="top" priority="100" id="vfQ-ZT-Dlc"/>
@@ -205,16 +236,19 @@
                         </variation>
                         <variation key="heightClass=compact-widthClass=compact">
                             <mask key="constraints">
+                                <exclude reference="t9l-Ud-h6j"/>
                                 <exclude reference="9M9-8P-Hzb"/>
                             </mask>
                         </variation>
                         <variation key="heightClass=compact-widthClass=regular">
                             <mask key="constraints">
+                                <exclude reference="t9l-Ud-h6j"/>
                                 <exclude reference="9M9-8P-Hzb"/>
                             </mask>
                         </variation>
                         <variation key="heightClass=regular-widthClass=regular">
                             <mask key="constraints">
+                                <exclude reference="t9l-Ud-h6j"/>
                                 <exclude reference="9M9-8P-Hzb"/>
                                 <include reference="u9s-KY-yCt"/>
                                 <exclude reference="5Sh-l6-Icd"/>
@@ -231,6 +265,7 @@
                         <outlet property="mapView" destination="aPn-pa-nCx" id="tCi-LW-1ll"/>
                         <outlet property="placePageAreaKeyboard" destination="PFs-sL-oVA" id="O3P-ia-ZlX"/>
                         <outlet property="placePageContainer" destination="rbx-Oj-jeo" id="aFM-qm-QHB"/>
+                        <outlet property="searchViewContainer" destination="jio-3T-E6G" id="Rjn-UE-zFx"/>
                         <outlet property="sideButtonsAreaBottom" destination="VfU-Zk-8IU" id="MvP-Ki-4wP"/>
                         <outlet property="sideButtonsAreaKeyboard" destination="SDX-4J-Jz5" id="kv9-zX-hbD"/>
                         <outlet property="visibleAreaBottom" destination="OE7-Qb-J0v" id="isp-aT-LtA"/>
@@ -906,20 +941,20 @@
             <objects>
                 <viewController storyboardIdentifier="MWMNoMapsViewController" id="3el-Zi-2E4" customClass="MWMNoMapsViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="4WP-vj-Alg">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="762"/>
+                        <rect key="frame" x="0.0" y="0.0" width="808" height="337"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gmw-e3-n53" userLabel="Container" customClass="MWMNoMapsView">
-                                <rect key="frame" x="3.5" y="44" width="407" height="674"/>
+                                <rect key="frame" x="200.5" y="44" width="407" height="259"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dCZ-PN-2Ob" userLabel="BoundsView">
-                                        <rect key="frame" x="16" y="0.0" width="375" height="570"/>
+                                        <rect key="frame" x="16" y="0.0" width="375" height="155"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87G-jh-N8H" userLabel="CenteredView">
-                                                <rect key="frame" x="0.0" y="160.5" width="375" height="249"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="375" height="155"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="img_no_maps" translatesAutoresizingMaskIntoConstraints="NO" id="vI9-fc-FO2">
-                                                        <rect key="frame" x="107.5" y="0.0" width="160" height="160"/>
+                                                        <rect key="frame" x="137.5" y="0.0" width="100" height="100"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" secondItem="vI9-fc-FO2" secondAttribute="height" multiplier="1:1" id="f4J-1R-ewM"/>
                                                             <constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="160" id="jwh-bM-u0p"/>
@@ -927,7 +962,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="У вас нет загруженных карт" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="abh-G0-Alr" userLabel="Title">
-                                                        <rect key="frame" x="0.0" y="180" width="375" height="24"/>
+                                                        <rect key="frame" x="0.0" y="86" width="375" height="24"/>
                                                         <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
                                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -937,7 +972,7 @@
                                                         </userDefinedRuntimeAttributes>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LaW-Ad-mYI" userLabel="Text">
-                                                        <rect key="frame" x="0.0" y="216" width="375" height="33"/>
+                                                        <rect key="frame" x="0.0" y="122" width="375" height="33"/>
                                                         <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
                                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -977,7 +1012,7 @@
                                         </constraints>
                                     </view>
                                     <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Moj-UK-oyl" userLabel="DownloadMaps" customClass="MWMButton">
-                                        <rect key="frame" x="83.5" y="590" width="240" height="44"/>
+                                        <rect key="frame" x="83.5" y="175" width="240" height="44"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="240" id="49x-bx-JJj"/>