diff --git a/drape_frontend/selection_shape.cpp b/drape_frontend/selection_shape.cpp
index e8b8b2d266..9d02794bbd 100644
--- a/drape_frontend/selection_shape.cpp
+++ b/drape_frontend/selection_shape.cpp
@@ -55,7 +55,6 @@ dp::BindingInfo GetBindingInfo()
 SelectionShape::SelectionShape(ref_ptr<dp::TextureManager> mng)
   : m_position(m2::PointD::Zero())
   , m_animation(false, 0.25)
-  , m_selectionRadius(15.0f * VisualParams::Instance().GetVisualScale())
 {
   int const TriangleCount = 40;
   int const VertexCount = 3 * TriangleCount;
@@ -96,6 +95,11 @@ SelectionShape::SelectionShape(ref_ptr<dp::TextureManager> mng)
 
     batcher.InsertTriangleList(state, make_ref(&provider), nullptr);
   }
+
+  double r = 15.0f * VisualParams::Instance().GetVisualScale();
+  m_mapping.AddRangePoint(0.6, 1.3 * r);
+  m_mapping.AddRangePoint(0.85, 0.8 * r);
+  m_mapping.AddRangePoint(1.0, r);
 }
 
 void SelectionShape::SetPosition(m2::PointD const & position)
@@ -116,13 +120,15 @@ void SelectionShape::Hide()
 void SelectionShape::Render(ScreenBase const & screen, ref_ptr<dp::GpuProgramManager> mng,
                             dp::UniformValuesStorage const & commonUniforms)
 {
+  UNUSED_VALUE(screen);
   ShowHideAnimation::EState state = m_animation.GetState();
   if (state == ShowHideAnimation::STATE_VISIBLE ||
       state == ShowHideAnimation::STATE_SHOW_DIRECTION)
   {
     dp::UniformValuesStorage uniforms = commonUniforms;
     uniforms.SetFloatValue("u_position", m_position.x, m_position.y, 0.0);
-    uniforms.SetFloatValue("u_accuracy", GetCurrentRadius());
+    uniforms.SetFloatValue("u_accuracy", m_mapping.GetValue(m_animation.GetT()));
+    uniforms.SetFloatValue("u_opacity", 1.0f);
     m_renderNode->Render(mng, uniforms);
   }
 }
@@ -137,30 +143,4 @@ SelectionShape::ESelectedObject SelectionShape::GetSelectedObject() const
   return m_selectedObject;
 }
 
-double SelectionShape::GetCurrentRadius() const
-{
-  static double const firstT = 0.6;
-  static double const secondT = 0.85;
-  static double const thirdT = 1.0;
-  static double const dfsT = secondT - firstT;
-  static double const dstT = thirdT - secondT;
-
-  static double const firstRadius = 1.3 * m_selectionRadius;
-  static double const secondRadius = 0.8 * m_selectionRadius;
-  static double const dfsRadius = secondRadius - firstRadius;
-  static double const dstRadius = m_selectionRadius - secondRadius;
-
-  double t = m_animation.GetT();
-  if (m_animation.IsFinished())
-    return m_selectionRadius * t;
-
-  if (t < firstT)
-    return firstRadius * (t / firstT);
-
-  if (t < secondT)
-    return firstRadius + dfsRadius * (t - firstT) / dfsT;
-
-  return secondRadius + dstRadius * (t - secondT)/ dstT;
-}
-
 } // namespace df
diff --git a/drape_frontend/selection_shape.hpp b/drape_frontend/selection_shape.hpp
index c306b26122..5b8c16877d 100644
--- a/drape_frontend/selection_shape.hpp
+++ b/drape_frontend/selection_shape.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "animation/show_hide_animation.hpp"
+#include "animation/value_mapping.hpp"
 #include "render_node.hpp"
 
 #include "geometry/point2d.hpp"
@@ -49,7 +50,7 @@ private:
   ESelectedObject m_selectedObject;
 
   drape_ptr<RenderNode> m_renderNode;
-  double const m_selectionRadius;
+  ValueMapping<float> m_mapping;
 };
 
 } // namespace df