diff --git a/3party/glm b/3party/glm
index 6347f62261..c834d06c27 160000
--- a/3party/glm
+++ b/3party/glm
@@ -1 +1 @@
-Subproject commit 6347f62261da5be4e27a256e28aef6abc0ba884d
+Subproject commit c834d06c2739f63e28e5665d4569dca9415e3891
diff --git a/drape/CMakeLists.txt b/drape/CMakeLists.txt
index 0a100d49ab..252614503f 100644
--- a/drape/CMakeLists.txt
+++ b/drape/CMakeLists.txt
@@ -54,7 +54,6 @@ set(
   ${DRAPE_ROOT}/gl_extensions_list.hpp
   ${DRAPE_ROOT}/gl_functions.hpp
   ${DRAPE_ROOT}/gl_includes.hpp
-  ${DRAPE_ROOT}/glm_config.hpp
   ${DRAPE_ROOT}/glsl_func.hpp
   ${DRAPE_ROOT}/glsl_types.hpp
   ${DRAPE_ROOT}/glyph_generator.cpp
diff --git a/drape/glm_config.hpp b/drape/glm_config.hpp
deleted file mode 100644
index a1a9b19b58..0000000000
--- a/drape/glm_config.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// These defines should be included/defined before including any glm header.
-#pragma once
-
-#ifndef GLM_FORCE_CXX17
-#define GLM_FORCE_CXX17
-#endif
-
-#ifndef GLM_FORCE_SWIZZLE
-#define GLM_FORCE_SWIZZLE
-#endif
diff --git a/drape/glsl_func.hpp b/drape/glsl_func.hpp
index f753bb7992..2e4d74aead 100644
--- a/drape/glsl_func.hpp
+++ b/drape/glsl_func.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "drape/glm_config.hpp"  // Required for <glm> includes below.
 #include <glm/geometric.hpp>
 #include <glm/gtc/matrix_transform.hpp>
+#define GLM_ENABLE_EXPERIMENTAL  // TODO: Remove this line after upgrading glm to the latest version.
 #include <glm/gtx/rotate_vector.hpp>
 
 namespace glsl
diff --git a/drape/glsl_types.hpp b/drape/glsl_types.hpp
index 27c08c5a6f..3394632fa2 100644
--- a/drape/glsl_types.hpp
+++ b/drape/glsl_types.hpp
@@ -4,7 +4,6 @@
 
 #include "drape/color.hpp"
 
-#include "drape/glm_config.hpp"  // Required for <glm> includes below.
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/mat3x3.hpp>
 #include <glm/mat4x2.hpp>
diff --git a/drape/static_texture.cpp b/drape/static_texture.cpp
index 8f2f4db6a4..407cf55282 100644
--- a/drape/static_texture.cpp
+++ b/drape/static_texture.cpp
@@ -11,10 +11,8 @@
 
 #include "3party/stb_image/stb_image.h"
 
-#include "drape/glm_config.hpp"  // Required for <glm> includes below.
-#include <glm/ext/scalar_integer.hpp>  // glm::isPowerOfTwo
 #ifdef DEBUG
-#include <glm/gtx/bit.hpp>
+#include <glm/gtc/round.hpp>  // glm::isPowerOfTwo
 #endif
 
 #include <functional>
diff --git a/drape/symbols_texture.cpp b/drape/symbols_texture.cpp
index bf75be28f9..d25343187d 100644
--- a/drape/symbols_texture.cpp
+++ b/drape/symbols_texture.cpp
@@ -11,10 +11,8 @@
 
 #include "3party/stb_image/stb_image.h"
 
-#include "drape/glm_config.hpp"  // Required for <glm> includes below.
-#include <glm/ext/scalar_integer.hpp>  // glm::isPowerOfTwo
 #ifdef DEBUG
-#include <glm/gtx/bit.hpp>
+#include <glm/gtc/round.hpp>  // glm::isPowerOfTwo
 #endif
 
 #include <functional>
diff --git a/drape/texture.cpp b/drape/texture.cpp
index e88e2805ea..b0dc7ac00b 100644
--- a/drape/texture.cpp
+++ b/drape/texture.cpp
@@ -6,9 +6,7 @@
 
 #include "base/math.hpp"
 
-#include "drape/glm_config.hpp"  // Required for <glm> includes below.
-#include <glm/ext/scalar_integer.hpp>  // glm::isPowerOfTwo
-#include <glm/gtx/bit.hpp>
+#include <glm/gtc/round.hpp>  // glm::isPowerOfTwo
 
 namespace dp
 {
diff --git a/drape_frontend/traffic_generator.cpp b/drape_frontend/traffic_generator.cpp
index c878fc60e6..a36d1e9c39 100644
--- a/drape_frontend/traffic_generator.cpp
+++ b/drape_frontend/traffic_generator.cpp
@@ -361,7 +361,7 @@ void TrafficGenerator::GenerateSegment(RoadClass roadClass,
     if (generateCircles && !firstFilled)
     {
       SubmitCircleStaticVertices(roadClass, glsl::vec3(p1, circleDepth), rightNormal,
-                                 uvStart.xy(), circlesGeometry);
+                                 glsl::vec2(uvStart), circlesGeometry);
     }
 
     firstFilled = true;
@@ -372,7 +372,7 @@ void TrafficGenerator::GenerateSegment(RoadClass roadClass,
   if (generateCircles && firstFilled)
   {
     SubmitCircleStaticVertices(roadClass, glsl::vec3(lastPoint, circleDepth), lastRightNormal,
-                               uvStart.xy(), circlesGeometry);
+                               glsl::vec2(uvStart), circlesGeometry);
   }
 }
 
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index ffe787a802..a4740b1996 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -514,7 +514,7 @@ void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe
 
         m2::RectD rect;
         for (auto const & vertex : buffer)
-          rect.Add(glsl::FromVec2(vertex.m_normalAndAnimateOrZ.xy()));
+          rect.Add(glsl::FromVec2(glsl::vec2(vertex.m_normalAndAnimateOrZ)));
 
         drape_ptr<dp::OverlayHandle> overlayHandle =
             CreateSymbolOverlayHandle(renderInfo, tileKey, symbolOffset, rect);