diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
index 58346a4147..04288c13f6 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
@@ -42,6 +42,7 @@ bool GLGizmoFdmSupports::on_init()
     m_desc["clipping_of_view"] = _L("Clipping of view") + ": ";
     m_desc["reset_direction"]  = _L("Reset direction");
     m_desc["cursor_size"]      = _L("Cursor size") + ": ";
+    m_desc["cursor_type"]      = _L("Cursor type") + ": ";
     m_desc["enforce_caption"]  = _L("Left mouse button") + ": ";
     m_desc["enforce"]          = _L("Enforce supports");
     m_desc["block_caption"]    = _L("Right mouse button") + " ";
@@ -78,16 +79,26 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l
     if (! m_c->selection_info()->model_object())
         return;
 
-    const float approx_height = m_imgui->scaled(18.0f);
+    const float approx_height = m_imgui->scaled(14.0f);
     y = std::min(y, bottom_limit - approx_height);
     m_imgui->set_next_window_pos(x, y, ImGuiCond_Always);
 
     if (! m_setting_angle) {
         m_imgui->begin(on_get_name(), ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse);
 
+        std::vector<std::string> cursor_types;
+        cursor_types.push_back(_L("Circle").ToUTF8().data());
+        cursor_types.push_back(_L("Sphere").ToUTF8().data());
+
         // First calculate width of all the texts that are could possibly be shown. We will decide set the dialog width based on that:
-        const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x, m_imgui->calc_text_size(m_desc.at("reset_direction")).x) + m_imgui->scaled(1.5f);
+        const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x,
+                                                    m_imgui->calc_text_size(m_desc.at("reset_direction")).x)
+                                              + m_imgui->scaled(1.5f);
         const float cursor_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.f);
+        const float cursor_type_combo_left  = m_imgui->calc_text_size(m_desc.at("cursor_type")).x + m_imgui->scaled(1.f);
+        const float cursor_type_combo_width = std::max(m_imgui->calc_text_size(wxString::FromUTF8(cursor_types[0])).x,
+                                                       m_imgui->calc_text_size(wxString::FromUTF8(cursor_types[1])).x)
+                                                 + m_imgui->scaled(2.5f);
         const float button_width = m_imgui->calc_text_size(m_desc.at("remove_all")).x + m_imgui->scaled(1.f);
         const float minimal_slider_width = m_imgui->scaled(4.f);
 
@@ -103,6 +114,7 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l
         float window_width = minimal_slider_width + std::max(cursor_slider_left, clipping_slider_left);
         window_width = std::max(window_width, total_text_max);
         window_width = std::max(window_width, button_width);
+        window_width = std::max(window_width, cursor_type_combo_left + cursor_type_combo_width);
 
         auto draw_text_with_caption = [this, &caption_max](const wxString& caption, const wxString& text) {
             m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, caption);
@@ -139,8 +151,8 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l
         const float max_tooltip_width = ImGui::GetFontSize() * 20.0f;
 
         m_imgui->text(m_desc.at("cursor_size"));
-        ImGui::SameLine(clipping_slider_left);
-        ImGui::PushItemWidth(window_width - clipping_slider_left);
+        ImGui::SameLine(cursor_slider_left);
+        ImGui::PushItemWidth(window_width - cursor_slider_left);
         ImGui::SliderFloat(" ", &m_cursor_radius, CursorRadiusMin, CursorRadiusMax, "%.2f");
         if (ImGui::IsItemHovered()) {
             ImGui::BeginTooltip();
@@ -150,6 +162,23 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l
             ImGui::EndTooltip();
         }
 
+
+        m_imgui->text(m_desc.at("cursor_type"));
+        ImGui::SameLine(window_width - cursor_type_combo_width - m_imgui->scaled(0.5f));
+        ImGui::PushItemWidth(cursor_type_combo_width);
+        int selection = int(m_cursor_type);
+        m_imgui->combo("", cursor_types, selection);
+        m_cursor_type = TriangleSelector::CursorType(selection);
+        if (ImGui::IsItemHovered()) {
+            ImGui::BeginTooltip();
+            ImGui::PushTextWrapPos(max_tooltip_width);
+            ImGui::TextUnformatted(_L("Sphere paints all facets inside, regardless of their orientation.\n\n"
+                                      "Circle ignores facets facing away from the camera.").ToUTF8().data());
+            ImGui::PopTextWrapPos();
+            ImGui::EndTooltip();
+        }
+
+
         ImGui::Separator();
         if (m_c->object_clipper()->get_position() == 0.f)
             m_imgui->text(m_desc.at("clipping_of_view"));
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
index 1b1b1f10f5..0cbfaeedcf 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
@@ -25,7 +25,7 @@ bool GLGizmoSeam::on_init()
     m_desc["clipping_of_view"] = _L("Clipping of view") + ": ";
     m_desc["reset_direction"]  = _L("Reset direction");
     m_desc["cursor_size"]      = _L("Cursor size") + ": ";
-    m_desc["cursor_type"]      = _L("Cursor size") + ": ";
+    m_desc["cursor_type"]      = _L("Cursor type") + ": ";
     m_desc["enforce_caption"]  = _L("Left mouse button") + ": ";
     m_desc["enforce"]          = _L("Enforce seam");
     m_desc["block_caption"]    = _L("Right mouse button") + " ";
@@ -68,16 +68,26 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit)
     if (! m_c->selection_info()->model_object())
         return;
 
-    const float approx_height = m_imgui->scaled(18.0f);
+    const float approx_height = m_imgui->scaled(14.0f);
     y = std::min(y, bottom_limit - approx_height);
     m_imgui->set_next_window_pos(x, y, ImGuiCond_Always);
 
+    std::vector<std::string> cursor_types;
+    cursor_types.push_back(_L("Circle").ToUTF8().data());
+    cursor_types.push_back(_L("Sphere").ToUTF8().data());
+
 
     m_imgui->begin(on_get_name(), ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse);
 
     // First calculate width of all the texts that are could possibly be shown. We will decide set the dialog width based on that:
-    const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x, m_imgui->calc_text_size(m_desc.at("reset_direction")).x) + m_imgui->scaled(1.5f);
-    const float cursor_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.f);
+    const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x,
+                                                m_imgui->calc_text_size(m_desc.at("reset_direction")).x)
+                                           + m_imgui->scaled(1.5f);
+    const float cursor_size_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.f);
+    const float cursor_type_combo_left  = m_imgui->calc_text_size(m_desc.at("cursor_type")).x + m_imgui->scaled(1.f);
+    const float cursor_type_combo_width = std::max(m_imgui->calc_text_size(wxString::FromUTF8(cursor_types[0])).x,
+                                                   m_imgui->calc_text_size(wxString::FromUTF8(cursor_types[1])).x)
+                                             + m_imgui->scaled(2.5f);
     const float button_width = m_imgui->calc_text_size(m_desc.at("remove_all")).x + m_imgui->scaled(1.f);
     const float minimal_slider_width = m_imgui->scaled(4.f);
 
@@ -90,9 +100,10 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit)
     caption_max += m_imgui->scaled(1.f);
     total_text_max += m_imgui->scaled(1.f);
 
-    float window_width = minimal_slider_width + std::max(cursor_slider_left, clipping_slider_left);
+    float window_width = minimal_slider_width + std::max(cursor_size_slider_left, clipping_slider_left);
     window_width = std::max(window_width, total_text_max);
     window_width = std::max(window_width, button_width);
+    window_width = std::max(window_width, cursor_type_combo_left + cursor_type_combo_width);
 
     auto draw_text_with_caption = [this, &caption_max](const wxString& caption, const wxString& text) {
         static const ImVec4 ORANGE(1.0f, 0.49f, 0.22f, 1.0f);
@@ -124,8 +135,8 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit)
     const float max_tooltip_width = ImGui::GetFontSize() * 20.0f;
 
     m_imgui->text(m_desc.at("cursor_size"));
-    ImGui::SameLine(clipping_slider_left);
-    ImGui::PushItemWidth(window_width - clipping_slider_left);
+    ImGui::SameLine(cursor_size_slider_left);
+    ImGui::PushItemWidth(window_width - cursor_size_slider_left);
     ImGui::SliderFloat(" ", &m_cursor_radius, CursorRadiusMin, CursorRadiusMax, "%.2f");
     if (ImGui::IsItemHovered()) {
         ImGui::BeginTooltip();
@@ -137,18 +148,19 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit)
 
 
     m_imgui->text(m_desc.at("cursor_type"));
-    ImGui::SameLine(/*clipping_slider_left*/);
-    //ImGui::PushItemWidth(window_width - clipping_slider_left);
+    ImGui::SameLine(window_width - cursor_type_combo_width - m_imgui->scaled(0.5f));
+    ImGui::PushItemWidth(cursor_type_combo_width);
     int selection = int(m_cursor_type);
-    m_imgui->combo("   ", {"Circle", "Sphere"}, selection);
+    m_imgui->combo("", cursor_types, selection);
     m_cursor_type = TriangleSelector::CursorType(selection);
-    /*if (ImGui::IsItemHovered()) {
+    if (ImGui::IsItemHovered()) {
         ImGui::BeginTooltip();
         ImGui::PushTextWrapPos(max_tooltip_width);
-        ImGui::TextUnformatted(_L("Alt + Mouse wheel").ToUTF8().data());
+        ImGui::TextUnformatted(_L("Sphere paints all facets inside, regardless of their orientation.\n\n"
+                                  "Circle ignores facets facing away from the camera.").ToUTF8().data());
         ImGui::PopTextWrapPos();
         ImGui::EndTooltip();
-    }*/
+    }