diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index e083236614..1548433e21 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -112,7 +112,7 @@
   Framework & f = GetFramework();
   shared_ptr<location::State> ls = f.GetLocationState();
   
-  if (newStatus == 1)
+  if (newStatus == location::ECompassFollow)
     [m_myPositionButton setImage:[UIImage imageNamed:@"location-follow.png"] forState:UIControlStateSelected];
   else
   {
@@ -174,7 +174,7 @@
   [[MapsAppDelegate theApp] enableStandby];
   [[MapsAppDelegate theApp].m_locationManager stop:self];
 
-  m_myPositionButton.selected = YES;
+  m_myPositionButton.selected = NO;
   [m_myPositionButton setImage:[UIImage imageNamed:@"location.png"] forState:UIControlStateSelected];
 }
 
diff --git a/map/basic_tiling_render_policy.cpp b/map/basic_tiling_render_policy.cpp
index e4cbe75616..31298d6db7 100644
--- a/map/basic_tiling_render_policy.cpp
+++ b/map/basic_tiling_render_policy.cpp
@@ -36,7 +36,7 @@ size_t BasicTilingRenderPolicy::CalculateTileSize(size_t screenWidth, size_t scr
 
 BasicTilingRenderPolicy::BasicTilingRenderPolicy(Params const & p,
                                                  bool doUseQueuedRenderer)
-  : RenderPolicy(p, GetPlatform().DoSupportRotation(), GetPlatform().CpuCores()),
+  : RenderPolicy(p, GetPlatform().IsPro(), GetPlatform().CpuCores()),
     m_DrawScale(0),
     m_IsEmptyModel(false),
     m_DoRecreateCoverage(false),
diff --git a/platform/platform.hpp b/platform/platform.hpp
index 4d38693290..0f2a056535 100644
--- a/platform/platform.hpp
+++ b/platform/platform.hpp
@@ -128,8 +128,6 @@ public:
 
   inline bool IsPro() const { return m_isPro; }
 
-  bool DoSupportRotation() const;
-
   /// @return url for clients to download maps
   //@{
   string MetaServerUrl() const;
diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp
index 0bc21d7021..9ff174079b 100644
--- a/platform/platform_android.cpp
+++ b/platform/platform_android.cpp
@@ -129,11 +129,6 @@ namespace
   };
 }
 
-bool Platform::DoSupportRotation() const
-{
-  return IsPro();
-}
-
 void Platform::RunAsync(TFunctor const & fn, Priority p)
 {
   UNUSED_VALUE(p);
diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm
index c859726d7e..5b99e1e161 100644
--- a/platform/platform_ios.mm
+++ b/platform/platform_ios.mm
@@ -172,11 +172,6 @@ string Platform::UniqueClientId() const
   return HashUniqueID(GetMacAddress() + GetDeviceUid());
 }
 
-bool Platform::DoSupportRotation() const
-{
-  return true;
-}
-
 static void PerformImpl(void * obj)
 {
   Platform::TFunctor * f = reinterpret_cast<Platform::TFunctor *>(obj);
diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp
index ec9c67577d..e5bf38d9b7 100644
--- a/platform/platform_qt.cpp
+++ b/platform/platform_qt.cpp
@@ -67,11 +67,6 @@ int Platform::VideoMemoryLimit() const
   return 20 * 1024 * 1024;
 }
 
-bool Platform::DoSupportRotation() const
-{
-  return IsPro();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 extern Platform & GetPlatform()
 {