diff --git a/iphone/Chart/Chart/Views/ChartInfo/ChartInfoView.swift b/iphone/Chart/Chart/Views/ChartInfo/ChartInfoView.swift
index a18123e49b..896c24795f 100644
--- a/iphone/Chart/Chart/Views/ChartInfo/ChartInfoView.swift
+++ b/iphone/Chart/Chart/Views/ChartInfo/ChartInfoView.swift
@@ -10,6 +10,7 @@ struct ChartLineInfo {
 protocol ChartInfoViewDelegate: AnyObject {
   func chartInfoView(_ view: ChartInfoView, infoAtPointX pointX: CGFloat) -> (String, [ChartLineInfo])?
   func chartInfoView(_ view: ChartInfoView, didCaptureInfoView captured: Bool)
+  func chartInfoView(_ view: ChartInfoView, didMoveToPoint pointX: CGFloat)
 }
 
 class ChartInfoView: UIView {
@@ -35,6 +36,18 @@ class ChartInfoView: UIView {
     }
   }
 
+  var myPositionX: CGFloat = -1 {
+    didSet {
+      if myPositionX < 0 || myPositionX > 1 {
+        myPositionView.isHidden = true
+        return
+      }
+      myPositionView.isHidden = false
+      myPositionView.center = CGPoint(x: bounds.width * myPositionX, y: myPositionView.center.y)
+      updateMyPosition()
+    }
+  }
+
   var bgColor: UIColor = UIColor.white
 
   var textColor: UIColor = UIColor.black {
@@ -78,6 +91,11 @@ class ChartInfoView: UIView {
     updateViews(point: lineInfo!.point)
   }
 
+  private func updateMyPosition() {
+    guard let (_, myPositionPoints) = delegate?.chartInfoView(self, infoAtPointX: myPositionView.center.x) else { return }
+    myPositionView.updatePoint(myPositionPoints[0].point.y)
+  }
+
   @objc func onPan(_ sender: UIPanGestureRecognizer) {
     let x = sender.location(in: self).x
     switch sender.state {
@@ -85,13 +103,14 @@ class ChartInfoView: UIView {
       break
     case .began:
       guard let lineInfo = lineInfo else { return }
-      captured = abs(x - lineInfo.point.x) < 22
+      captured = abs(x - lineInfo.point.x) <= 22
     case .changed:
       if captured {
         if x < bounds.minX || x > bounds.maxX {
           return
         }
         update(x)
+        delegate?.chartInfoView(self, didMoveToPoint: x)
       }
     case .ended, .cancelled, .failed:
       captured = false
@@ -141,6 +160,7 @@ class ChartInfoView: UIView {
     myPositionView.frame = mf
 
     update(bounds.width * infoX)
+    updateMyPosition()
   }
 }
 
diff --git a/iphone/Chart/Chart/Views/ChartInfo/ChartMyPositionView.swift b/iphone/Chart/Chart/Views/ChartInfo/ChartMyPositionView.swift
index c1b944e6c7..94e60fc403 100644
--- a/iphone/Chart/Chart/Views/ChartInfo/ChartMyPositionView.swift
+++ b/iphone/Chart/Chart/Views/ChartInfo/ChartMyPositionView.swift
@@ -13,6 +13,8 @@ class ChartMyPositionView: UIView {
     shapeLayer.lineWidth = 2
     shapeLayer.strokeColor = UIColor(red: 0.142, green: 0.614, blue: 0.95, alpha: 0.3).cgColor
     addSubview(pinView)
+    transform = CGAffineTransform.identity.scaledBy(x: 1, y: -1)
+    pinView.transform = CGAffineTransform.identity.scaledBy(x: 1, y: -1)
   }
   
   required init?(coder: NSCoder) {
@@ -28,6 +30,10 @@ class ChartMyPositionView: UIView {
 
     pinView.center = CGPoint(x: bounds.midX, y: bounds.midY)
   }
+
+  func updatePoint(_ y: CGFloat) {
+    pinView.center = CGPoint(x: bounds.midX, y: y + pinView.bounds.height / 2)
+  }
 }
 
 fileprivate class MyPositionPinView: UIView {
diff --git a/iphone/Chart/Chart/Views/ChartView.swift b/iphone/Chart/Chart/Views/ChartView.swift
index 2e67b24dce..78ea10cd33 100644
--- a/iphone/Chart/Chart/Views/ChartView.swift
+++ b/iphone/Chart/Chart/Views/ChartView.swift
@@ -20,6 +20,12 @@ public class ChartView: UIView {
   private var pinchStartUpper = 0
   private var pinchGR: UIPinchGestureRecognizer!
 
+  public var myPosition: Double = -1 {
+    didSet {
+      setMyPosition(myPosition)
+    }
+  }
+
   public var previewSelectorColor: UIColor = UIColor.lightGray.withAlphaComponent(0.9) {
     didSet {
       chartPreviewView.selectorColor = previewSelectorColor
@@ -156,7 +162,13 @@ public class ChartView: UIView {
       lower = chartData.xAxisValueAt(CGFloat(chartPreviewView.minX))
     }
     chartInfoView.infoX = CGFloat((x - lower) / rangeLength)
+  }
 
+  fileprivate func setMyPosition(_ x: Double) {
+    let upper = chartData.xAxisValueAt(CGFloat(chartPreviewView.maxX))
+    let lower = chartData.xAxisValueAt(CGFloat(chartPreviewView.minX))
+    let rangeLength = upper - lower
+    chartInfoView.myPositionX = CGFloat((x - lower) / rangeLength)
   }
 
   override public func layoutSubviews() {
@@ -274,10 +286,19 @@ extension ChartView: ChartPreviewViewDelegate {
     xAxisView.setBounds(lower: minX, upper: maxX)
     updateCharts(animationStyle: .none)
     chartInfoView.update()
+    setMyPosition(myPosition)
+    let x = chartInfoView.infoX * CGFloat(xAxisView.upperBound - xAxisView.lowerBound) + CGFloat(xAxisView.lowerBound)
+    onSelectedPointChanged?(x)
   }
 }
 
 extension ChartView: ChartInfoViewDelegate {
+  func chartInfoView(_ view: ChartInfoView, didMoveToPoint pointX: CGFloat) {
+    let p = convert(CGPoint(x: pointX, y: 0), from: view)
+    let x = (p.x / bounds.width) * CGFloat(xAxisView.upperBound - xAxisView.lowerBound) + CGFloat(xAxisView.lowerBound)
+    onSelectedPointChanged?(x)
+  }
+
   func chartInfoView(_ view: ChartInfoView, didCaptureInfoView captured: Bool) {
     panGR.isEnabled = !captured
   }
@@ -305,7 +326,6 @@ extension ChartView: ChartInfoViewDelegate {
       let v1 = line.originalValues[x1]
       let v2 = line.originalValues[x2]
       let v = round(dx * CGFloat(v2 - v1)) + CGFloat(v1)
-      onSelectedPointChanged?(x)
       result.append(ChartLineInfo(name: line.name,
                                   color: line.color,
                                   point: chartsContainerView.convert(CGPoint(x: p.x, y: py), to: view),
diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
index 66c13f5260..f407ef2457 100644
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
@@ -122,6 +122,9 @@ typedef void (^ElevationPointChangedBlock)(double distance);
 
 - (void)setElevationActivePoint:(double)distance trackId:(uint64_t)trackId;
 - (void)setElevationActivePointChanged:(uint64_t)trackId callback:(ElevationPointChangedBlock)callback;
+- (void)resetElevationActivePointChanged;
+- (void)setElevationMyPositionChanged:(uint64_t)trackId callback:(ElevationPointChangedBlock)callback;
+- (void)resetElevationMyPositionChanged;
 
 @end
 NS_ASSUME_NONNULL_END
diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
index aefc12703e..cd48478c5b 100644
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
@@ -783,4 +783,16 @@
   self.bm.SetElevationActivePointChangedCallback(nullptr);
 }
 
+- (void)setElevationMyPositionChanged:(uint64_t)trackId callback:(ElevationPointChangedBlock)callback {
+  __weak __typeof(self) ws = self;
+  self.bm.SetElevationMyPositionChangedCallback([callback, trackId, ws] () {
+    callback(ws.bm.GetElevationMyPosition(trackId));
+  });
+}
+
+- (void)resetElevationMyPositionChanged {
+  self.bm.SetElevationMyPositionChangedCallback(nullptr);
+}
+
+
 @end
diff --git a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData+Core.h b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData+Core.h
index b69dbdd798..c94b5000da 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData+Core.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData+Core.h
@@ -6,7 +6,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ElevationProfileData (Core)
 
-- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo activePoint:(double)activePoint;
+- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo
+                          activePoint:(double)activePoint
+                           myPosition:(double)myPosition;
 
 @end
 
diff --git a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.h b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.h
index fbfcbf89f7..971995c64a 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.h
@@ -22,6 +22,7 @@ typedef NS_ENUM(NSInteger, ElevationDifficulty) {
 //@property(nonatomic, readonly, nullable) NSString *extendedDifficultyDescription;
 @property(nonatomic, readonly) NSArray<ElevationHeightPoint *> *points;
 @property(nonatomic, readonly) double activePoint;
+@property(nonatomic, readonly) double myPosition;
 
 @end
 
diff --git a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.mm b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.mm
index 7bcc5958e2..78e83acd7e 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.mm
@@ -6,7 +6,9 @@
 
 @implementation ElevationProfileData (Core)
 
-- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo activePoint:(double)activePoint {
+- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo
+                          activePoint:(double)activePoint
+                           myPosition:(double)myPosition {
   self = [super init];
   if (self) {
     _trackId = elevationInfo.GetId();
@@ -24,6 +26,7 @@
     }
     _points = [pointsArray copy];
     _activePoint = activePoint;
+    _myPosition = myPosition;
   }
   return self;
 }
diff --git a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
index 4b3d5cacf8..949ea92fe0 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
@@ -136,7 +136,8 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
       auto const &bm = GetFramework().GetBookmarkManager();
       auto const &trackId = rawData().GetTrackId();
       _elevationProfileData = [[ElevationProfileData alloc] initWithElevationInfo:bm.MakeElevationInfo(trackId)
-                                                                      activePoint:bm.GetElevationActivePoint(trackId)];
+                                                                      activePoint:bm.GetElevationActivePoint(trackId)
+                                                                       myPosition:bm.GetElevationMyPosition(trackId)];
     }
 
     auto const &countryId = rawData().GetCountryId();
diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
index 46b156a67d..0f06a26786 100644
--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
@@ -50,6 +50,11 @@ class ElevationProfilePresenter: NSObject {
       DescriptionsViewModel(title: L("elevation_profile_minaltitude"), value: data.minAttitude, imageName: "ic_em_min_attitude_24")
     ]
   }
+
+  deinit {
+    MWMBookmarksManager.shared().resetElevationActivePointChanged()
+    MWMBookmarksManager.shared().resetElevationMyPositionChanged()
+  }
 }
 
 extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
@@ -61,6 +66,7 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
                                                  useFilter: true)
     view?.setChartData(presentationData)
     view?.setActivePoint(data.activePoint)
+    view?.setMyPosition(data.myPosition)
 //    if let extendedDifficultyGrade = data.extendedDifficultyGrade {
 //      view?.isExtendedDifficultyLabelHidden = false
 //      view?.setExtendedDifficultyGrade(extendedDifficultyGrade)
@@ -71,6 +77,9 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
     MWMBookmarksManager.shared().setElevationActivePointChanged(data.trackId) { [weak self] distance in
       self?.view?.setActivePoint(distance)
     }
+    MWMBookmarksManager.shared().setElevationMyPositionChanged(data.trackId) { [weak self] distance in
+      self?.view?.setMyPosition(distance)
+    }
   }
 
   func onAppear() {
diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
index cbae7355dc..7f530f433e 100644
--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
@@ -9,6 +9,7 @@ protocol ElevationProfileViewProtocol: class {
   func setDifficulty(_ value: ElevationDifficulty)
   func setChartData(_ data: ChartPresentationData)
   func setActivePoint(_ distance: Double)
+  func setMyPosition(_ distance: Double)
 }
 
 class ElevationProfileViewController: UIViewController {
@@ -79,4 +80,8 @@ extension ElevationProfileViewController: ElevationProfileViewProtocol {
   func setActivePoint(_ distance: Double) {
     chartView.setSelectedPoint(distance)
   }
+
+  func setMyPosition(_ distance: Double) {
+    chartView.myPosition = distance
+  }
 }