diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp
index 4c70c1f9b0..78ffb8f391 100644
--- a/drape/overlay_handle.cpp
+++ b/drape/overlay_handle.cpp
@@ -283,6 +283,16 @@ uint64_t CalculateOverlayPriority(int minZoomLevel, uint8_t rank, float depth)
 }
 
 uint64_t CalculateSpecialModePriority(uint16_t specialPriority)
+{
+  // [5 bytes - 0xFFFFFFFFFF][1 byte - 0x00][2 bytes - special priority]
+  static uint64_t constexpr kMask = ~static_cast<uint64_t>(0xFFFFFF);
+  uint64_t priority = dp::kPriorityMaskAll;
+  priority &= kMask;
+  priority |= specialPriority;
+  return priority;
+}
+
+uint64_t CalculateSpecialModeUserMarkPriority(uint16_t specialPriority)
 {
   // [6 bytes - 0xFFFFFFFFFFFF][2 bytes - special priority]
   static uint64_t constexpr kMask = ~static_cast<uint64_t>(0xFFFF);
diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp
index 66462f2724..c050988eb1 100644
--- a/drape/overlay_handle.hpp
+++ b/drape/overlay_handle.hpp
@@ -233,5 +233,6 @@ private:
 
 uint64_t CalculateOverlayPriority(int minZoomLevel, uint8_t rank, float depth);
 uint64_t CalculateSpecialModePriority(uint16_t specialPriority);
+uint64_t CalculateSpecialModeUserMarkPriority(uint16_t specialPriority);
 uint64_t CalculateUserMarkPriority(int minZoomLevel, uint16_t specialPriority);
 }  // namespace dp
diff --git a/drape_frontend/colored_symbol_shape.cpp b/drape_frontend/colored_symbol_shape.cpp
index d45913bc6b..e612482dc3 100644
--- a/drape_frontend/colored_symbol_shape.cpp
+++ b/drape_frontend/colored_symbol_shape.cpp
@@ -313,11 +313,11 @@ void ColoredSymbolShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::
 uint64_t ColoredSymbolShape::GetOverlayPriority() const
 {
   // Special displacement mode.
-  if (m_params.m_specialDisplacement == SpecialDisplacement::SpecialMode ||
-      m_params.m_specialDisplacement == SpecialDisplacement::SpecialModeUserMark)
-  {
+  if (m_params.m_specialDisplacement == SpecialDisplacement::SpecialMode)
     return dp::CalculateSpecialModePriority(m_params.m_specialPriority);
-  }
+
+  if (m_params.m_specialDisplacement == SpecialDisplacement::SpecialModeUserMark)
+    return dp::CalculateSpecialModeUserMarkPriority(m_params.m_specialPriority);
 
   if (m_params.m_specialDisplacement == SpecialDisplacement::UserMark)
     return dp::CalculateUserMarkPriority(m_params.m_minVisibleScale, m_params.m_specialPriority);
diff --git a/drape_frontend/poi_symbol_shape.cpp b/drape_frontend/poi_symbol_shape.cpp
index cc117549f9..abab394374 100644
--- a/drape_frontend/poi_symbol_shape.cpp
+++ b/drape_frontend/poi_symbol_shape.cpp
@@ -180,11 +180,11 @@ uint64_t PoiSymbolShape::GetOverlayPriority() const
     return dp::kPriorityMaskAll;
 
   // Special displacement mode.
-  if (m_params.m_specialDisplacement == SpecialDisplacement::SpecialMode ||
-      m_params.m_specialDisplacement == SpecialDisplacement::SpecialModeUserMark)
-  {
+  if (m_params.m_specialDisplacement == SpecialDisplacement::SpecialMode)
     return dp::CalculateSpecialModePriority(m_params.m_specialPriority);
-  }
+
+  if (m_params.m_specialDisplacement == SpecialDisplacement::SpecialModeUserMark)
+    return dp::CalculateSpecialModeUserMarkPriority(m_params.m_specialPriority);
 
   if (m_params.m_specialDisplacement == SpecialDisplacement::UserMark)
     return dp::CalculateUserMarkPriority(m_params.m_minVisibleScale, m_params.m_specialPriority);
diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp
index 3f78b6acc4..bda90d397b 100644
--- a/drape_frontend/text_shape.cpp
+++ b/drape_frontend/text_shape.cpp
@@ -436,11 +436,11 @@ uint64_t TextShape::GetOverlayPriority() const
     return dp::kPriorityMaskAll;
 
   // Special displacement mode.
-  if (m_params.m_specialDisplacement == SpecialDisplacement::SpecialMode ||
-      m_params.m_specialDisplacement == SpecialDisplacement::SpecialModeUserMark)
-  {
+  if (m_params.m_specialDisplacement == SpecialDisplacement::SpecialMode)
     return dp::CalculateSpecialModePriority(m_params.m_specialPriority);
-  }
+
+  if (m_params.m_specialDisplacement == SpecialDisplacement::SpecialModeUserMark)
+    return dp::CalculateSpecialModeUserMarkPriority(m_params.m_specialPriority);
 
   if (m_params.m_specialDisplacement == SpecialDisplacement::UserMark)
     return dp::CalculateUserMarkPriority(m_params.m_minVisibleScale, m_params.m_specialPriority);