diff --git a/resources/shaders/options_120.fs b/resources/shaders/options_120.fs
index 5f699f9204..236174f3a3 100644
--- a/resources/shaders/options_120.fs
+++ b/resources/shaders/options_120.fs
@@ -5,10 +5,11 @@ uniform vec3 uniform_color;
 void main()
 {
     vec2 pos = gl_PointCoord - vec2(0.5, 0.5);
-    float sq_radius = pos.x * pos.x + pos.y * pos.y;
+    float sq_radius = dot(pos, pos);
     if (sq_radius > 0.25)
         discard;
-    else if ((sq_radius < 0.005625) || (sq_radius > 0.180625))
+        
+    if ((sq_radius < 0.005625) || (sq_radius > 0.180625))
         gl_FragColor = vec4(0.5 * uniform_color, 1.0);
     else
         gl_FragColor = vec4(uniform_color, 1.0);
diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index fb7d4c24cf..49b1c255b7 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -672,7 +672,7 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, bool disab
         shader->set_uniform("print_box.actived", volume.first->shader_outside_printer_detection_enabled);
         shader->set_uniform("print_box.volume_world_matrix", volume.first->world_matrix());
         shader->set_uniform("slope.actived", m_slope.active && !volume.first->is_modifier && !volume.first->is_wipe_tower);
-        shader->set_uniform("slope.volume_world_normal_matrix", volume.first->world_matrix().matrix().block(0, 0, 3, 3).inverse().transpose().cast<float>());
+        shader->set_uniform("slope.volume_world_normal_matrix", static_cast<Matrix3f>(volume.first->world_matrix().matrix().block(0, 0, 3, 3).inverse().transpose().cast<float>()));
 
         volume.first->render();
 #else
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 330a5a261b..54c7d3bb5a 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -740,9 +740,29 @@ void GCodeViewer::render_toolpaths() const
     bool is_glsl_120 = wxGetApp().is_glsl_version_greater_or_equal_to(1, 20);
     int detected_point_sizes[2];
     ::glGetIntegerv(GL_ALIASED_POINT_SIZE_RANGE, detected_point_sizes);
-    std::array<float, 2> point_sizes = { 2.0f, std::min(64.0f, static_cast<float>(detected_point_sizes[1])) };
+    std::array<float, 2> point_sizes = { std::min(8.0f, static_cast<float>(detected_point_sizes[1])), std::min(48.0f, static_cast<float>(detected_point_sizes[1])) };
     double zoom = wxGetApp().plater()->get_camera().get_zoom();
 
+    auto render_options = [this, is_glsl_120, zoom, point_sizes](const IBuffer& buffer, EOptionsColors colors_id, GLShaderProgram& shader) {
+        shader.set_uniform("uniform_color", Options_Colors[static_cast<unsigned int>(colors_id)]);
+        shader.set_uniform("zoom", zoom);
+        shader.set_uniform("point_sizes", point_sizes);
+        if (is_glsl_120) {
+            glsafe(::glEnable(GL_POINT_SPRITE));
+            glsafe(::glEnable(GL_VERTEX_PROGRAM_POINT_SIZE));
+        }
+        for (const RenderPath& path : buffer.render_paths) {
+            glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size()));
+#if ENABLE_GCODE_VIEWER_STATISTICS
+            ++m_statistics.gl_multi_points_calls_count;
+#endif // ENABLE_GCODE_VIEWER_STATISTICS
+        }
+        if (is_glsl_120) {
+            glsafe(::glDisable(GL_VERTEX_PROGRAM_POINT_SIZE));
+            glsafe(::glDisable(GL_POINT_SPRITE));
+        }
+    };
+
     glsafe(::glCullFace(GL_BACK));
     glsafe(::glLineWidth(3.0f));
 
@@ -773,146 +793,32 @@ void GCodeViewer::render_toolpaths() const
             {
             case GCodeProcessor::EMoveType::Tool_change:
             {
-                shader->set_uniform("uniform_color", Options_Colors[static_cast<unsigned int>(EOptionsColors::ToolChanges)]);
-                shader->set_uniform("zoom", zoom);
-                shader->set_uniform("point_sizes", point_sizes);
-                if (is_glsl_120)
-                {
-                    glsafe(::glEnable(GL_POINT_SPRITE));
-                    glsafe(::glEnable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                }
-                for (const RenderPath& path : buffer.render_paths)
-                {
-                    glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size()));
-#if ENABLE_GCODE_VIEWER_STATISTICS
-                    ++m_statistics.gl_multi_points_calls_count;
-#endif // ENABLE_GCODE_VIEWER_STATISTICS
-                }
-                if (is_glsl_120)
-                {
-                    glsafe(::glDisable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                    glsafe(::glDisable(GL_POINT_SPRITE));
-                }
+                render_options(buffer, EOptionsColors::ToolChanges, *shader);
                 break;
             }
             case GCodeProcessor::EMoveType::Color_change:
             {
-                shader->set_uniform("uniform_color", Options_Colors[static_cast<unsigned int>(EOptionsColors::ColorChanges)]);
-                shader->set_uniform("zoom", zoom);
-                shader->set_uniform("point_sizes", point_sizes);
-                if (is_glsl_120)
-                {
-                    glsafe(::glEnable(GL_POINT_SPRITE));
-                    glsafe(::glEnable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                }
-                for (const RenderPath& path : buffer.render_paths)
-                {
-                    glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size()));
-#if ENABLE_GCODE_VIEWER_STATISTICS
-                    ++m_statistics.gl_multi_points_calls_count;
-#endif // ENABLE_GCODE_VIEWER_STATISTICS
-                }
-                if (is_glsl_120)
-                {
-                    glsafe(::glDisable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                    glsafe(::glDisable(GL_POINT_SPRITE));
-                }
+                render_options(buffer, EOptionsColors::ColorChanges, *shader);
                 break;
             }
             case GCodeProcessor::EMoveType::Pause_Print:
             {
-                shader->set_uniform("uniform_color", Options_Colors[static_cast<unsigned int>(EOptionsColors::PausePrints)]);
-                shader->set_uniform("zoom", zoom);
-                shader->set_uniform("point_sizes", point_sizes);
-                if (is_glsl_120)
-                {
-                    glsafe(::glEnable(GL_POINT_SPRITE));
-                    glsafe(::glEnable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                }
-                for (const RenderPath& path : buffer.render_paths)
-                {
-                    glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size()));
-#if ENABLE_GCODE_VIEWER_STATISTICS
-                    ++m_statistics.gl_multi_points_calls_count;
-#endif // ENABLE_GCODE_VIEWER_STATISTICS
-                }
-                if (is_glsl_120)
-                {
-                    glsafe(::glDisable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                    glsafe(::glDisable(GL_POINT_SPRITE));
-                }
+                render_options(buffer, EOptionsColors::PausePrints, *shader);
                 break;
             }
             case GCodeProcessor::EMoveType::Custom_GCode:
             {
-                shader->set_uniform("uniform_color", Options_Colors[static_cast<unsigned int>(EOptionsColors::CustomGCodes)]);
-                shader->set_uniform("zoom", zoom);
-                shader->set_uniform("point_sizes", point_sizes);
-                if (is_glsl_120)
-                {
-                    glsafe(::glEnable(GL_POINT_SPRITE));
-                    glsafe(::glEnable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                }
-                for (const RenderPath& path : buffer.render_paths)
-                {
-                    glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size()));
-#if ENABLE_GCODE_VIEWER_STATISTICS
-                    ++m_statistics.gl_multi_points_calls_count;
-#endif // ENABLE_GCODE_VIEWER_STATISTICS
-                }
-                if (is_glsl_120)
-                {
-                    glsafe(::glDisable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                    glsafe(::glDisable(GL_POINT_SPRITE));
-                }
+                render_options(buffer, EOptionsColors::CustomGCodes, *shader);
                 break;
             }
             case GCodeProcessor::EMoveType::Retract:
             {
-                shader->set_uniform("uniform_color", Options_Colors[static_cast<unsigned int>(EOptionsColors::Retractions)]);
-                shader->set_uniform("zoom", zoom);
-                shader->set_uniform("point_sizes", point_sizes);
-                if (is_glsl_120)
-                {
-                    glsafe(::glEnable(GL_POINT_SPRITE));
-                    glsafe(::glEnable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                }
-                for (const RenderPath& path : buffer.render_paths)
-                {
-                    glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size()));
-#if ENABLE_GCODE_VIEWER_STATISTICS
-                    ++m_statistics.gl_multi_points_calls_count;
-#endif // ENABLE_GCODE_VIEWER_STATISTICS
-                    if (is_glsl_120)
-                    {
-                        glsafe(::glDisable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                        glsafe(::glDisable(GL_POINT_SPRITE));
-                    }
-                }
+                render_options(buffer, EOptionsColors::Retractions, *shader);
                 break;
             }
             case GCodeProcessor::EMoveType::Unretract:
             {
-                shader->set_uniform("uniform_color", Options_Colors[static_cast<unsigned int>(EOptionsColors::Unretractions)]);
-                shader->set_uniform("zoom", zoom);
-                shader->set_uniform("point_sizes", point_sizes);
-                if (is_glsl_120)
-                {
-                    glsafe(::glEnable(GL_POINT_SPRITE));
-                    glsafe(::glEnable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                }
-                for (const RenderPath& path : buffer.render_paths)
-                {
-                    glsafe(::glMultiDrawElements(GL_POINTS, (const GLsizei*)path.sizes.data(), GL_UNSIGNED_INT, (const void* const*)path.offsets.data(), (GLsizei)path.sizes.size()));
-#if ENABLE_GCODE_VIEWER_STATISTICS
-                    ++m_statistics.gl_multi_points_calls_count;
-#endif // ENABLE_GCODE_VIEWER_STATISTICS
-                }
-                if (is_glsl_120)
-                {
-                    glsafe(::glDisable(GL_VERTEX_PROGRAM_POINT_SIZE));
-                    glsafe(::glDisable(GL_POINT_SPRITE));
-                }
+                render_options(buffer, EOptionsColors::Unretractions, *shader);
                 break;
             }
             case GCodeProcessor::EMoveType::Extrude:
diff --git a/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp
index 42e5b0a9f5..a6d641f89f 100644
--- a/src/slic3r/GUI/GLShader.cpp
+++ b/src/slic3r/GUI/GLShader.cpp
@@ -215,6 +215,16 @@ bool GLShaderProgram::set_uniform(const char* name, double value) const
     return set_uniform(name, static_cast<float>(value));
 }
 
+bool GLShaderProgram::set_uniform(const char* name, const std::array<int, 4>& value) const
+{
+    int id = get_uniform_location(name);
+    if (id >= 0) {
+        glsafe(::glUniform4iv(id, 1, static_cast<const GLint*>(value.data())));
+        return true;
+    }
+    return false;
+}
+
 bool GLShaderProgram::set_uniform(const char* name, const std::array<float, 2>& value) const
 {
     int id = get_uniform_location(name);
@@ -290,6 +300,21 @@ bool GLShaderProgram::set_uniform(const char* name, const Matrix3f& value) const
     return false;
 }
 
+bool GLShaderProgram::set_uniform(const char* name, const Vec3f& value) const
+{
+    int id = get_uniform_location(name);
+    if (id >= 0) {
+        glsafe(::glUniform3fv(id, 1, static_cast<const GLfloat*>(value.data())));
+        return true;
+    }
+    return false;
+}
+
+bool GLShaderProgram::set_uniform(const char* name, const Vec3d& value) const
+{
+    return set_uniform(name, static_cast<Vec3f>(value.cast<float>()));
+}
+
 int GLShaderProgram::get_attrib_location(const char* name) const
 {
     return (m_id > 0) ? ::glGetAttribLocation(m_id, name) : -1;
diff --git a/src/slic3r/GUI/GLShader.hpp b/src/slic3r/GUI/GLShader.hpp
index e58437fbd1..521f6796f1 100644
--- a/src/slic3r/GUI/GLShader.hpp
+++ b/src/slic3r/GUI/GLShader.hpp
@@ -43,6 +43,7 @@ public:
     bool set_uniform(const char* name, bool value) const;
     bool set_uniform(const char* name, float value) const;
     bool set_uniform(const char* name, double value) const;
+    bool set_uniform(const char* name, const std::array<int, 4>& value) const;
     bool set_uniform(const char* name, const std::array<float, 2>& value) const;
     bool set_uniform(const char* name, const std::array<float, 3>& value) const;
     bool set_uniform(const char* name, const std::array<float, 4>& value) const;
@@ -50,6 +51,8 @@ public:
     bool set_uniform(const char* name, const Transform3f& value) const;
     bool set_uniform(const char* name, const Transform3d& value) const;
     bool set_uniform(const char* name, const Matrix3f& value) const;
+    bool set_uniform(const char* name, const Vec3f& value) const;
+    bool set_uniform(const char* name, const Vec3d& value) const;
 
     // returns -1 if not found
     int get_attrib_location(const char* name) const;