diff --git a/geometry/any_rect2d.hpp b/geometry/any_rect2d.hpp
index 61e073445b..dcf1f2ecdf 100644
--- a/geometry/any_rect2d.hpp
+++ b/geometry/any_rect2d.hpp
@@ -66,8 +66,8 @@ namespace m2
 
     Point<T> const GlobalZero() const
     {
-      m2::PointD i(1, 0);
-      m2::PointD j(0, 1);
+      m2::Point<T> i(1, 0);
+      m2::Point<T> j(0, 1);
       return Convert(m_zero, m_i, m_j, i, j);
     }
 
@@ -81,7 +81,18 @@ namespace m2
       return m_j;
     }
 
-    ang::Angle<T> const & angle() const
+    void SetAngle(ang::Angle<T> const & a)
+    {
+      m2::Point<T> glbZero = GlobalZero();
+
+      m_angle = a;
+      m_i = m2::Point<T>(m_angle.cos(), m_angle.sin());
+      m_j = m2::Point<T>(-m_angle.sin(), m_angle.cos());
+
+      m_zero = Convert(glbZero, Point<T>(1, 0), Point<T>(0, 1), m_i, m_j);
+    }
+
+    ang::Angle<T> const & Angle() const
     {
       return m_angle;
     }
@@ -157,8 +168,8 @@ namespace m2
     /// Convert into global coordinates from the local coordinates of this AnyRect
     Point<T> const ConvertFrom(Point<T> const & p) const
     {
-      m2::PointD i(1, 0);
-      m2::PointD j(0, 1);
+      m2::Point<T> i(1, 0);
+      m2::Point<T> j(0, 1);
       return Convert(p + m_zero, m_i, m_j, i, j);
     }
 
diff --git a/geometry/screenbase.cpp b/geometry/screenbase.cpp
index 0753090f0c..1c7772025c 100644
--- a/geometry/screenbase.cpp
+++ b/geometry/screenbase.cpp
@@ -62,7 +62,7 @@ void ScreenBase::SetFromRects(m2::AnyRectD const & glbRect, m2::RectD const & px
   double vScale = glbRect.GetLocalRect().SizeY() / pxRect.SizeY();
 
   m_Scale = max(hScale, vScale);
-  m_Angle = glbRect.angle();
+  m_Angle = glbRect.Angle();
   m_Org = glbRect.GlobalCenter();
 
   UpdateDependentParameters();
@@ -74,7 +74,7 @@ void ScreenBase::SetFromRect(m2::AnyRectD const & GlobalRect)
   double vScale = GlobalRect.GetLocalRect().SizeY() / m_PixelRect.SizeY();
 
   m_Scale = max(hScale, vScale);
-  m_Angle = GlobalRect.angle();
+  m_Angle = GlobalRect.Angle();
   m_Org = GlobalRect.GlobalCenter();
 
   UpdateDependentParameters();
diff --git a/map/navigator.cpp b/map/navigator.cpp
index a64e004b69..0a11f55b48 100644
--- a/map/navigator.cpp
+++ b/map/navigator.cpp
@@ -89,7 +89,10 @@ void Navigator::CenterViewport(m2::PointD const & p)
 
 void Navigator::SaveState()
 {
-  Settings::Set("ScreenClipRect", m_Screen.GlobalRect());
+  m2::AnyRectD r = m_Screen.GlobalRect();
+  r.SetAngle(0);
+
+  Settings::Set("ScreenClipRect", r);
 }
 
 bool Navigator::LoadState()
diff --git a/platform/settings.cpp b/platform/settings.cpp
index c416555322..d9baa3d88d 100644
--- a/platform/settings.cpp
+++ b/platform/settings.cpp
@@ -127,7 +127,7 @@ namespace Settings
     out.precision(12);
     m2::PointD glbZero(rect.GlobalZero());
     out << glbZero.x << " " << glbZero.y << " ";
-    out << rect.angle().val() << " ";
+    out << rect.Angle().val() << " ";
     m2::RectD r = rect.GetLocalRect();
     out << r.minX() << " " << r.minY() << " " << r.maxX() << " " << r.maxY();
     return out.str();