diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
index b018c0829f..8e7c4398e3 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
@@ -13,10 +13,6 @@ namespace GUI {
 const float GLGizmoBase::Grabber::SizeFactor = 0.05f;
 const float GLGizmoBase::Grabber::MinHalfSize = 1.5f;
 const float GLGizmoBase::Grabber::DraggingScaleFactor = 1.25f;
-GLModel     GLGizmoBase::Grabber::VBOCube;
-GLModel     GLGizmoBase::VBOCone;
-GLModel     GLGizmoBase::VBOCylinder;
-GLModel     GLGizmoBase::VBOSphere;
 
 GLGizmoBase::Grabber::Grabber()
     : center(Vec3d::Zero())
@@ -25,9 +21,9 @@ GLGizmoBase::Grabber::Grabber()
     , enabled(true)
 {
     color = { 1.0f, 1.0f, 1.0f, 1.0f };
-    TriangleMesh cube = make_cube(1., 1., 1.);
-    cube.translate(Vec3f(-0.5, -0.5, -0.5));
-    VBOCube.init_from(cube);
+    TriangleMesh mesh = make_cube(1., 1., 1.);
+    mesh.translate(Vec3f(-0.5, -0.5, -0.5));
+    cube.init_from(mesh);
 }
 
 void GLGizmoBase::Grabber::render(bool hover, float size) const
@@ -75,7 +71,7 @@ void GLGizmoBase::Grabber::render(float size, const std::array<float, 4>& render
     glsafe(::glRotated(Geometry::rad2deg(angles(1)), 0.0, 1.0, 0.0));
     glsafe(::glRotated(Geometry::rad2deg(angles(0)), 1.0, 0.0, 0.0));
     glsafe(::glScaled(fullsize, fullsize, fullsize));
-    VBOCube.render();
+    cube.render();
     glsafe(::glPopMatrix());
 
     if (! picking)
@@ -98,9 +94,9 @@ GLGizmoBase::GLGizmoBase(GLCanvas3D& parent, const std::string& icon_filename, u
     ::memcpy((void*)m_base_color, (const void*)DEFAULT_BASE_COLOR, 4 * sizeof(float));
     ::memcpy((void*)m_drag_color, (const void*)DEFAULT_DRAG_COLOR, 4 * sizeof(float));
     ::memcpy((void*)m_highlight_color, (const void*)DEFAULT_HIGHLIGHT_COLOR, 4 * sizeof(float));
-    VBOCone.init_from(make_cone(1., 1., 2*PI/24));
-    VBOSphere.init_from(make_sphere(1., (2*M_PI)/24.));
-    VBOCylinder.init_from(make_cylinder(1., 1., 2*PI/24.));
+    m_cone.init_from(make_cone(1., 1., 2 * PI / 24));
+    m_sphere.init_from(make_sphere(1., (2 * M_PI) / 24.));
+    m_cylinder.init_from(make_cylinder(1., 1., 2 * PI / 24.));
 }
 
 void GLGizmoBase::set_hover_id(int id)
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
index 7fdae15985..eed3938819 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
@@ -45,9 +45,8 @@ protected:
         static const float SizeFactor;
         static const float MinHalfSize;
         static const float DraggingScaleFactor;
-        static GLModel     VBOCube;
-        static GLModel     VBOCone;
 
+        GLModel cube;
         Vec3d center;
         Vec3d angles;
         std::array<float, 4> color;
@@ -102,9 +101,9 @@ protected:
     bool m_first_input_window_render;
     mutable std::string m_tooltip;
     CommonGizmosDataPool* m_c;
-    static GLModel VBOCone;
-    static GLModel VBOCylinder;
-    static GLModel VBOSphere;
+    GLModel m_cone;
+    GLModel m_cylinder;
+    GLModel m_sphere;
 
 public:
     GLGizmoBase(GLCanvas3D& parent,
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
index 758ab75295..624cf2b2f2 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
@@ -345,7 +345,7 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
     glsafe(::glRotated(90.0, 1.0, 0.0, 0.0));
     glsafe(::glTranslated(0.0, 0.0, 2.0 * size));
     glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size));
-    VBOCone.render();
+    m_cone.render();
     glsafe(::glPopMatrix());
     glsafe(::glPushMatrix());
     glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2)));
@@ -353,7 +353,7 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
     glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0));
     glsafe(::glTranslated(0.0, 0.0, 2.0 * size));
     glsafe(::glScaled(0.75 * size, 0.75 * size, 3.0 * size));
-    VBOCone.render();
+    m_cone.render();
     glsafe(::glPopMatrix());
 
     if (!picking)
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
index 68fd3a6c01..faeee499d7 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
@@ -202,7 +202,7 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking)
             glsafe(::glPushMatrix());
             glsafe(::glRotated(180., 1., 0., 0.));
             glsafe(::glScaled(cone_radius, cone_radius, cone_height));
-            VBOCone.render();
+            m_cone.render();
             glsafe(::glPopMatrix());
             glsafe(::glTranslatef(0.f, 0.f, cone_height));
             glsafe(::glPopMatrix());
@@ -211,7 +211,7 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking)
         glsafe(::glPushMatrix());
         double radius = (double)support_point.head_front_radius * RenderPointScale;
         glsafe(::glScaled(radius, radius, radius));
-        VBOSphere.render();
+        m_sphere.render();
         glsafe(::glPopMatrix());
 
         if (vol->is_left_handed())
@@ -251,7 +251,7 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking)
             glsafe(::glPushMatrix());
             glsafe(::glTranslated(0., 0., -drain_hole.height));
             glsafe(::glScaled(drain_hole.radius, drain_hole.radius, drain_hole.height + sla::HoleStickOutLength));
-            VBOCylinder.render();
+            m_cylinder.render();
             glsafe(::glPopMatrix());
 
             if (vol->is_left_handed())