" + catalog.i18nc("@label:textbox", "Search settings")
style: TextFieldStyle
{
@@ -133,7 +133,7 @@ Item
UM.SimpleButton
{
id: clearFilterButton
- iconSource: UM.Theme.getIcon("cross1")
+ iconSource: UM.Theme.getIcon("Cancel")
visible: findingSettings
height: Math.round(parent.height * 0.4)
@@ -193,7 +193,7 @@ Item
sourceSize.width: width
sourceSize.height: height
color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")
- source: UM.Theme.getIcon("menu")
+ source: UM.Theme.getIcon("Hamburger")
}
}
label: Label {}
diff --git a/resources/qml/ToolTip.qml b/resources/qml/ToolTip.qml
index b8873439f1..3157f81d89 100644
--- a/resources/qml/ToolTip.qml
+++ b/resources/qml/ToolTip.qml
@@ -59,6 +59,7 @@ ToolTip
color: UM.Theme.getColor("tooltip")
target: Qt.point(targetPoint.x - tooltip.x, targetPoint.y - tooltip.y)
arrowSize: UM.Theme.getSize("default_arrow").width
+ visible: tooltip.height != 0
}
contentItem: Label
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 89d64b06ad..ec4d29420b 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -44,7 +44,6 @@ Item
anchors.top: parent.top
anchors.right: parent.right
- spacing: UM.Theme.getSize("default_lining").height
Repeater
{
@@ -69,7 +68,7 @@ Item
source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon
color: UM.Theme.getColor("icon")
- sourceSize: UM.Theme.getSize("button_icon")
+ sourceSize: Math.round(UM.Theme.getSize("button") / 2)
}
onCheckedChanged:
@@ -131,7 +130,6 @@ Item
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.top: toolButtons.bottom
anchors.right: parent.right
- spacing: UM.Theme.getSize("default_lining").height
Repeater
{
diff --git a/resources/qml/ToolbarButton.qml b/resources/qml/ToolbarButton.qml
index b3f84bba1d..206ab23dc4 100644
--- a/resources/qml/ToolbarButton.qml
+++ b/resources/qml/ToolbarButton.qml
@@ -25,22 +25,7 @@ Button
{
implicitWidth: UM.Theme.getSize("button").width
implicitHeight: UM.Theme.getSize("button").height
- color:
- {
- if (base.checked && base.hovered)
- {
- return UM.Theme.getColor("toolbar_button_active_hover")
- }
- else if (base.checked)
- {
- return UM.Theme.getColor("toolbar_button_active")
- }
- else if(base.hovered)
- {
- return UM.Theme.getColor("toolbar_button_hover")
- }
- return UM.Theme.getColor("toolbar_background")
- }
+ color: UM.Theme.getColor("toolbar_background")
radius: UM.Theme.getSize("default_radius").width
Rectangle
@@ -84,16 +69,35 @@ Button
color: parent.color
}
}
-
- contentItem: Item
+ contentItem: Rectangle
{
opacity: parent.enabled ? 1.0 : 0.2
+ implicitWidth: Math.round(UM.Theme.getSize("button").width * 0.75)
+ implicitHeight: Math.round(UM.Theme.getSize("button").height * 0.75)
+ radius: Math.round(width * 0.5)
+
+ color:
+ {
+ if (base.checked && base.hovered)
+ {
+ return UM.Theme.getColor("toolbar_button_active_hover")
+ }
+ else if (base.checked)
+ {
+ return UM.Theme.getColor("toolbar_button_active")
+ }
+ else if(base.hovered)
+ {
+ return UM.Theme.getColor("toolbar_button_hover")
+ }
+ return UM.Theme.getColor("toolbar_background")
+ }
Loader
{
id: contentItemLoader
anchors.centerIn: parent
- width: UM.Theme.getSize("button_icon").width
- height: UM.Theme.getSize("button_icon").height
+ width: Math.round(UM.Theme.getSize("button").width / 2)
+ height: Math.round(UM.Theme.getSize("button").height / 2)
}
}
diff --git a/resources/qml/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml
index 97f2bb9400..fc0f20fa77 100644
--- a/resources/qml/ViewOrientationControls.qml
+++ b/resources/qml/ViewOrientationControls.qml
@@ -18,7 +18,7 @@ Row
ViewOrientationButton
{
- iconSource: UM.Theme.getIcon("view_3d")
+ iconSource: UM.Theme.getIcon("View3D")
onClicked: Cura.Actions.view3DCamera.trigger()
UM.TooltipArea
@@ -31,7 +31,7 @@ Row
ViewOrientationButton
{
- iconSource: UM.Theme.getIcon("view_front")
+ iconSource: UM.Theme.getIcon("ViewFront")
onClicked: Cura.Actions.viewFrontCamera.trigger()
UM.TooltipArea
@@ -44,7 +44,7 @@ Row
ViewOrientationButton
{
- iconSource: UM.Theme.getIcon("view_top")
+ iconSource: UM.Theme.getIcon("ViewTop")
onClicked: Cura.Actions.viewTopCamera.trigger()
UM.TooltipArea
@@ -57,7 +57,7 @@ Row
ViewOrientationButton
{
- iconSource: UM.Theme.getIcon("view_left")
+ iconSource: UM.Theme.getIcon("ViewLeft")
onClicked: Cura.Actions.viewLeftSideCamera.trigger()
UM.TooltipArea
@@ -70,7 +70,7 @@ Row
ViewOrientationButton
{
- iconSource: UM.Theme.getIcon("view_right")
+ iconSource: UM.Theme.getIcon("ViewRight")
onClicked: Cura.Actions.viewRightSideCamera.trigger()
UM.TooltipArea
diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
index 68ee482b5c..fb809426f4 100644
--- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
@@ -143,7 +143,7 @@ Item
sourceSize.width: width
sourceSize.height: height
color: UM.Theme.getColor("text")
- source: base.currentSection == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right")
+ source: base.currentSection == section ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight")
}
Label
diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
index 9d79c421bd..5334a15974 100644
--- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
@@ -229,7 +229,7 @@ Item
width: height
sourceSize.height: width
color: UM.Theme.getColor("text_link")
- source: UM.Theme.getIcon("external_link")
+ source: UM.Theme.getIcon("LinkExternal")
}
Label
diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml
index 692ad12a29..26e3a2f87c 100644
--- a/resources/qml/WelcomePages/CloudContent.qml
+++ b/resources/qml/WelcomePages/CloudContent.qml
@@ -112,7 +112,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter
fillMode: Image.PreserveAspectFit
width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
- source: UM.Theme.getIcon("package")
+ source: UM.Theme.getIcon("Plugin")
sourceSize.width: width
sourceSize.height: height
}
@@ -142,7 +142,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter
fillMode: Image.PreserveAspectFit
width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
- source: UM.Theme.getIcon("material_spool")
+ source: UM.Theme.getIcon("Spool")
sourceSize.width: width
sourceSize.height: height
}
@@ -172,7 +172,7 @@ Item
anchors.horizontalCenter: communityColumn.horizontalCenter
fillMode: Image.PreserveAspectFit
width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
- source: UM.Theme.getIcon("group")
+ source: UM.Theme.getIcon("PrinterTriple", "medium")
sourceSize.width: width
sourceSize.height: height
}
diff --git a/resources/qml/WelcomePages/DropDownHeader.qml b/resources/qml/WelcomePages/DropDownHeader.qml
index 88da32c879..cb41ca808b 100644
--- a/resources/qml/WelcomePages/DropDownHeader.qml
+++ b/resources/qml/WelcomePages/DropDownHeader.qml
@@ -27,7 +27,7 @@ Cura.RoundedRectangle
cornerSide: contentShown ? Cura.RoundedRectangle.Direction.Up : Cura.RoundedRectangle.Direction.All
property string title: ""
- property url rightIconSource: UM.Theme.getIcon("arrow_bottom")
+ property url rightIconSource: UM.Theme.getIcon("ChevronSingleDown")
// If the tab is under hovering state
property bool hovered: false
diff --git a/resources/qml/WelcomePages/DropDownWidget.qml b/resources/qml/WelcomePages/DropDownWidget.qml
index 7ec6860c89..b129673905 100644
--- a/resources/qml/WelcomePages/DropDownWidget.qml
+++ b/resources/qml/WelcomePages/DropDownWidget.qml
@@ -49,7 +49,7 @@ Item
anchors.left: parent.left
anchors.right: parent.right
height: UM.Theme.getSize("expandable_component_content_header").height
- rightIconSource: contentShown ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
+ rightIconSource: contentShown ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
contentShown: base.contentShown
}
diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml
index 9e03e59ecf..65989ee536 100644
--- a/resources/qml/WelcomePages/WhatsNewContent.qml
+++ b/resources/qml/WelcomePages/WhatsNewContent.qml
@@ -135,7 +135,7 @@ Item
anchors
{
bottom: whatsNewNextButton.top
- bottomMargin: UM.Theme.getSize("narrow_margin").height
+ bottomMargin: UM.Theme.getSize("wide_margin").height
horizontalCenter: parent.horizontalCenter
}
diff --git a/resources/qml/Widgets/CheckBox.qml b/resources/qml/Widgets/CheckBox.qml
index f79dc1620e..295283d76e 100644
--- a/resources/qml/Widgets/CheckBox.qml
+++ b/resources/qml/Widgets/CheckBox.qml
@@ -58,7 +58,7 @@ CheckBox
height: Math.round(parent.height / 2.5)
sourceSize.height: width
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
- source: UM.Theme.getIcon("check")
+ source: UM.Theme.getIcon("Check")
opacity: control.checked ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100; } }
}
diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml
index 7eb366f0a3..f0ee3bdc00 100644
--- a/resources/qml/Widgets/ComboBox.qml
+++ b/resources/qml/Widgets/ComboBox.qml
@@ -62,7 +62,7 @@ ComboBox
x: control.width - width - control.rightPadding
y: control.topPadding + Math.round((control.availableHeight - height) / 2)
- source: UM.Theme.getIcon("arrow_bottom")
+ source: UM.Theme.getIcon("ChevronSingleDown")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5 * screenScaleFactor
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg
index e6f552abf0..f119e0d90b 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg
@@ -21,4 +21,4 @@ speed_layer_0 = 30
speed_print = 30
top_bottom_thickness = 0.72
wall_thickness = 0.88
-retraction_combing_max_distance = 50
\ No newline at end of file
+retraction_combing_max_distance = 8
\ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg
index d2f70e7731..65329daedd 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg
@@ -27,4 +27,4 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45)
-retraction_combing_max_distance = 50
\ No newline at end of file
+retraction_combing_max_distance = 8
\ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg
index 908d668459..9b098bd25f 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg
@@ -27,4 +27,4 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45)
-retraction_combing_max_distance = 50
\ No newline at end of file
+retraction_combing_max_distance = 8
\ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg
index 1231f7d5a5..a060c5d080 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg
@@ -22,4 +22,4 @@ speed_print = 45
speed_wall = =math.ceil(speed_print * 30 / 45)
top_bottom_thickness = 0.8
wall_thickness = 1.05
-retraction_combing_max_distance = 50
\ No newline at end of file
+retraction_combing_max_distance = 8
\ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg
index 0fb1d4a224..99157dacdc 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg
@@ -21,4 +21,4 @@ speed_layer_0 = 30
speed_print = 40
top_bottom_thickness = 1.2
wall_thickness = 1.59
-retraction_combing_max_distance = 50
\ No newline at end of file
+retraction_combing_max_distance = 8
\ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg
index 023f2f602d..d801c71a61 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg
@@ -21,4 +21,4 @@ speed_layer_0 = 30
speed_print = 40
top_bottom_thickness = 1.2
wall_thickness = 2.1
-retraction_combing_max_distance = 50
\ No newline at end of file
+retraction_combing_max_distance = 8
\ No newline at end of file
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
index 0c23b841ef..8d69db3b45 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -18,5 +18,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
wall_thickness = 0.92
material_print_temperature = =default_material_print_temperature - 5
-retraction_combing_max_distance = 40
+retraction_combing_max_distance = 8
retraction_combing = all
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg
index a62655f77e..fbe586589e 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg
@@ -23,5 +23,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
wall_thickness = 1
-retraction_combing_max_distance = 40
+retraction_combing_max_distance = 8
retraction_combing = all
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg
index e9a3def2f1..31a29963e7 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg
@@ -23,5 +23,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
speed_infill = =math.ceil(speed_print * 50 / 60)
-retraction_combing_max_distance = 40
+retraction_combing_max_distance = 8
retraction_combing = all
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg
index a30ec9d878..9588e6c5d5 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg
@@ -23,5 +23,5 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)
speed_infill = =math.ceil(speed_print * 45 / 55)
-retraction_combing_max_distance = 40
+retraction_combing_max_distance = 8
retraction_combing = all
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg
index cc4f6adc43..2757964881 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg
@@ -20,5 +20,5 @@ prime_tower_enable = True
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
-retraction_combing_max_distance = 40
+retraction_combing_max_distance = 8
retraction_combing = all
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg
index 9b7bf4c107..2ee0af5a1b 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg
@@ -22,5 +22,5 @@ speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-retraction_combing_max_distance = 40
+retraction_combing_max_distance = 8
retraction_combing = all
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg
index 238d3c2295..363038fe13 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg
@@ -21,5 +21,5 @@ prime_tower_enable = True
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
-retraction_combing_max_distance = 40
+retraction_combing_max_distance = 8
retraction_combing = all
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
index b60bc7b4bf..ef2cce367c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -12,7 +12,7 @@ material = generic_petg
variant = AA 0.25
[values]
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg
index ad0b66c730..b40410ce2c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg
@@ -15,7 +15,7 @@ variant = AA 0.4
material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature
material_final_print_temperature = =material_print_temperature - 5
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
skin_overlap = 20
speed_print = 60
speed_layer_0 = =math.ceil(speed_print * 20 / 60)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg
index ea31e718e9..72806c0c70 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg
@@ -16,7 +16,7 @@ cool_min_speed = 7
material_print_temperature = =default_material_print_temperature
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 60
speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg
index 7ac93b8176..0d759cd75c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg
@@ -18,7 +18,7 @@ machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 10
material_final_print_temperature = =material_print_temperature - 15
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 50
speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_topbottom = =math.ceil(speed_print * 30 / 50)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg
index 6a16910130..c06d19927e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg
@@ -17,7 +17,7 @@ machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =material_print_temperature - 10
material_final_print_temperature = =material_print_temperature - 15
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 55
speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
index 66053bbf47..2683dafad5 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
@@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100
prime_tower_enable = True
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
index d5fec5627a..ef23481606 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
@@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100
prime_tower_enable = True
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
index 0725baf5ac..e29efed202 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
@@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100
prime_tower_enable = True
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
index ff5ec96a33..c4d7fb98b9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -12,7 +12,7 @@ material = generic_petg
variant = AA 0.25
[values]
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
index b5c71c4aaf..0623118a07 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
@@ -15,7 +15,7 @@ variant = AA 0.4
material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature
material_final_print_temperature = =material_print_temperature - 5
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0
skin_overlap = 20
speed_print = 60
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg
index 9c73d97f54..bb667d7f4f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg
@@ -16,7 +16,7 @@ cool_min_speed = 7
material_print_temperature = =default_material_print_temperature
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 60
speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg
index ef33acba54..d43e8c813a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg
@@ -18,7 +18,7 @@ machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 10
material_final_print_temperature = =material_print_temperature - 15
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 50
speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_topbottom = =math.ceil(speed_print * 30 / 50)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg
index 74adcf30f8..7f718a80c2 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg
@@ -17,7 +17,7 @@ machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =material_print_temperature - 10
material_final_print_temperature = =material_print_temperature - 15
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 55
speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg
index fcbed34316..138cb73cae 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg
@@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100
prime_tower_enable = True
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
index d9aa06475c..7635f1f64f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
@@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100
prime_tower_enable = True
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg
index cd1a24f00c..4aa2619fec 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg
@@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100
prime_tower_enable = True
-retraction_combing_max_distance = 50
+retraction_combing_max_distance = 8
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt
index 80f5abb41a..f1cfb8b14d 100644
--- a/resources/texts/change_log.txt
+++ b/resources/texts/change_log.txt
@@ -151,6 +151,63 @@ Overlapping skin and alternating wall. The extra wall at each alternating step w
Assertion failure in SkeletalTrapezoidation. Can cause the engine to crash on certain models.
+[4.10.0]
+For an overview of the new features in Cura 4.10, please watch our video.
+
+*Native CAD import plugin
+Ultimaker Professional and Excellence subscribers can now directly import native CAD files into Ultimaker Cura.
+Enable this feature by downloading the Native CAD import plugin from the Ultimaker marketplace.
+
+*Flow visualization
+In preview mode you can now visualize the flow. Contributed by khani3s.
+
+*Show loading plugins on startup
+When starting Cura you will now see which plugins Cura is loading.
+
+*Add Z position parameter to FilamentChange
+With the FilamentChange script you can now control all 3 coordinates.
+
+*Allow FilamentChange script to use Marlin M600 configuration
+Contributed by Sekisback.
+
+*Double click on file in Digital Factory
+When double clicking on a file in the open project dialog in Digital Factory it will now open in Cura.
+
+* Bug Fixes
+- Fixed temperature exceptions for UM2+C material profiles.
+- Fixed a bug where pause at height stops all extrusion if relative extrusion is used.
+- Fixed authentication issues when logging into UM account. Contributed by fieldOfView.
+- Fixed the pause-at-height retract with Repetier-flavour.
+- Fixed erasing z-coordinate in the move tool to the value of 0.
+- Fixed the limit range of layer view to only visible structures.
+- Fixed a bug where Cura crashes when scaling a model on Linux.
+- Fixed path minimum limit.
+- Fixed a bug when using right to left language numbers were overlaying on text in the print settings.
+- Fixed edge case with disabling bridging.
+- Fixed a bug where some names with Unicode characters crashes Cura when trying to authorize.
+- Fixed renaming groups. Contributed by fieldOfView.
+- Fixed a bug when the seam was not placed in sharpest corner.
+- Fixed the gantry height for S-line printers.
+- Fixed a bug where a model is partially below build plate if center selected model is used.
+- Fixed a bug where a tootip arrow appeared when the "Manage printers" button is hovered.
+- Fixed a bug where assemblies were not arranged in the center of the build plate.
+
+* Printer definitions, profiles and materials.
+- Add CC0.4 core and materials for S3 and S5.
+- Updated Axi machine start gcodes, contributed by Synsuiter.
+- Volumic 3D printer definitions, contributed by VOLUMIC.
+- Anycubic Mega X and Anycubic Mega S, contributed by NilsRo.
+- Updated Deltacomb printer profiles, contributed by kaleidoscopeit.
+- eMotionTech Strateo3D materials and profiles, contributed by ChronosTech.
+- Sovol SV03, contributed by balacij.
+- Two Trees Bluer, Bluer Plus, Sapphire Pro and Sapphire Plus, contributed by Lester3DGadgets.
+- Update Skriware 2, contributed by Lukkoz.
+- Longer LK1, LK1 Pro, LK1 Plus, LK4, LK4 Pro, LK5, LK5 Plus and Cube 2, contributed by lowkeyjoe.
+- Mingda D3, D4 and Rock3, contributed by cataclism.
+- JGAurora A6, contributed by CrissR.
+
+Please, be aware that after version 4.10 Ultimaker Cura will only be supported on operating systems actively maintained by their software manufacturer or community. This means Windows 7 and MacOS 10.13 will no longer be supported. Technically this means Ultimaker will stop testing and developing for such operating systems. However, even though it is no longer supported, there is still a high likelihood the application keeps functioning.
+
[4.9.1]
* PETG Profile update.
Ultimaker PETG profiles have been added. The Generic PETG profile for 2.85mm filaments has been updated as well.
diff --git a/resources/texts/whats_new/0.html b/resources/texts/whats_new/0.html
index 8332dbf1ba..d0a7459099 100644
--- a/resources/texts/whats_new/0.html
+++ b/resources/texts/whats_new/0.html
@@ -1,2 +1,3 @@
-
Ultimaker PETG Profiles
-
Profiles for Ultimaker PETG are now included. Ultimaker PETG sets the standard for industrial applications and is suitable for a wide range of use cases thanks to its ease of use and versatility. Find out more
\ No newline at end of file
+
Open native CAD files for Ultimaker Professional and Excellence
+
Ultimaker Professional and Excellence subscribers can now directly import native CAD files into Ultimaker Cura. This provides users with an even more effective workflow by boosting productivity and increasing first-time right results.
+Learn more about our enterprise plans to access this feature.
\ No newline at end of file
diff --git a/resources/texts/whats_new/1.html b/resources/texts/whats_new/1.html
index 8b56f46928..2537344454 100644
--- a/resources/texts/whats_new/1.html
+++ b/resources/texts/whats_new/1.html
@@ -1,3 +1,2 @@
-
Better visual representation
-
The Z-seam is now clearly indicated in Preview mode. This ensures that you will know whether the seam will be sufficiently hidden in the end product.
-Thanks to BasF0 for contributing to this feature.
+
Try Ultimaker 3D Printing Academy and level up your slicing skills
+
Follow the Expert Tips for Ultimaker Cura course in the Ultimaker 3D Printing Academy and expand your knowledge. Get the most out of your slicing software by learning how to optimize prints and receive plugin recommendations from our team of 3D printing experts.
The Z-seam is now clearly indicated in Preview mode. This ensures that you will know whether the seam will be sufficiently hidden in the end product.
-Thanks to BasF0 for contributing to this feature.
+
Ultimaker PETG print profiles are now available for the Ultimaker 3
+
Ultimaker PETG sets the standard for industrial applications and is suitable for a wide range of use cases thanks to its ease of use and versatility. Ultimaker PETG is now fully supported on the Ultimaker 3. Find out more.
\ No newline at end of file
diff --git a/resources/texts/whats_new/3.html b/resources/texts/whats_new/3.html
index ae9560362e..a433453bde 100644
--- a/resources/texts/whats_new/3.html
+++ b/resources/texts/whats_new/3.html
@@ -1,4 +1,2 @@
-
“Line type” is now the default color scheme.
-
- This improves your user experience – as you will no longer have to manually switch to “line type” each time you enter Preview mode.
-
+
Flow rate
+
Thanks to Khani3s, we have now added the volumetric flow rate (in mm³/s) to the preview mode color schemes. In addition, we tweaked the minimum/maximum color values, making it easier to optimize your print strategy displayed as the flow, layer thickness, line width and speed.
\ No newline at end of file
diff --git a/resources/texts/whats_new/4.html b/resources/texts/whats_new/4.html
index 85d772904d..5997ce2408 100644
--- a/resources/texts/whats_new/4.html
+++ b/resources/texts/whats_new/4.html
@@ -1,3 +1,2 @@
-
Learn more
-
Want more information for Ultimaker Cura 4.9.1?
-Read the blog post or watch the video. And don't forget to give us your feedback!
+
Learn more!
+
Want more information for Ultimaker Cura 4.10? Read the blog post or watch the video, and don't forget to give us your feedback!
\ No newline at end of file
diff --git a/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg
deleted file mode 100644
index 09ba300b6a..0000000000
--- a/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
\ No newline at end of file
diff --git a/resources/themes/cura-dark/icons/sign_in_to_cloud.svg b/resources/themes/cura-dark/icons/sign_in_to_cloud.svg
deleted file mode 100644
index 09ba300b6a..0000000000
--- a/resources/themes/cura-dark/icons/sign_in_to_cloud.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
\ No newline at end of file
diff --git a/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg
deleted file mode 100644
index 09ba300b6a..0000000000
--- a/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/application.svg b/resources/themes/cura-light/icons/application.svg
deleted file mode 100644
index a76323a7d4..0000000000
--- a/resources/themes/cura-light/icons/application.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/arrow_bottom.svg b/resources/themes/cura-light/icons/arrow_bottom.svg
deleted file mode 100644
index 102f7b54a2..0000000000
--- a/resources/themes/cura-light/icons/arrow_bottom.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/arrow_left.svg b/resources/themes/cura-light/icons/arrow_left.svg
deleted file mode 100644
index e48cece556..0000000000
--- a/resources/themes/cura-light/icons/arrow_left.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/arrow_right.svg b/resources/themes/cura-light/icons/arrow_right.svg
deleted file mode 100644
index 6562a3e80b..0000000000
--- a/resources/themes/cura-light/icons/arrow_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/arrow_top.svg b/resources/themes/cura-light/icons/arrow_top.svg
deleted file mode 100644
index 7af5913a32..0000000000
--- a/resources/themes/cura-light/icons/arrow_top.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/basic.svg b/resources/themes/cura-light/icons/basic.svg
deleted file mode 100644
index b30d0669b3..0000000000
--- a/resources/themes/cura-light/icons/basic.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/buildplate.svg b/resources/themes/cura-light/icons/buildplate.svg
deleted file mode 100644
index 7505c8204e..0000000000
--- a/resources/themes/cura-light/icons/buildplate.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/category_adhesion.svg b/resources/themes/cura-light/icons/category_adhesion.svg
deleted file mode 100644
index dc119d889a..0000000000
--- a/resources/themes/cura-light/icons/category_adhesion.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_blackmagic.svg b/resources/themes/cura-light/icons/category_blackmagic.svg
deleted file mode 100644
index d4e2b89ba4..0000000000
--- a/resources/themes/cura-light/icons/category_blackmagic.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_cool.svg b/resources/themes/cura-light/icons/category_cool.svg
deleted file mode 100644
index db74322a2c..0000000000
--- a/resources/themes/cura-light/icons/category_cool.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_dual.svg b/resources/themes/cura-light/icons/category_dual.svg
deleted file mode 100644
index 2a53292379..0000000000
--- a/resources/themes/cura-light/icons/category_dual.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_experimental.svg b/resources/themes/cura-light/icons/category_experimental.svg
deleted file mode 100644
index 9fc7d74880..0000000000
--- a/resources/themes/cura-light/icons/category_experimental.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_fixes.svg b/resources/themes/cura-light/icons/category_fixes.svg
deleted file mode 100644
index 963338088a..0000000000
--- a/resources/themes/cura-light/icons/category_fixes.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_infill.svg b/resources/themes/cura-light/icons/category_infill.svg
deleted file mode 100644
index e1660ca8e2..0000000000
--- a/resources/themes/cura-light/icons/category_infill.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_layer_height.svg b/resources/themes/cura-light/icons/category_layer_height.svg
deleted file mode 100644
index 474e81f14e..0000000000
--- a/resources/themes/cura-light/icons/category_layer_height.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_machine.svg b/resources/themes/cura-light/icons/category_machine.svg
deleted file mode 100644
index 25c84aa4f2..0000000000
--- a/resources/themes/cura-light/icons/category_machine.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_material.svg b/resources/themes/cura-light/icons/category_material.svg
deleted file mode 100644
index 0d8ae42d9d..0000000000
--- a/resources/themes/cura-light/icons/category_material.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_shell.svg b/resources/themes/cura-light/icons/category_shell.svg
deleted file mode 100644
index 61e112d88c..0000000000
--- a/resources/themes/cura-light/icons/category_shell.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_shield.svg b/resources/themes/cura-light/icons/category_shield.svg
deleted file mode 100644
index 99a245936d..0000000000
--- a/resources/themes/cura-light/icons/category_shield.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_speed.svg b/resources/themes/cura-light/icons/category_speed.svg
deleted file mode 100644
index 36d1b3f2e1..0000000000
--- a/resources/themes/cura-light/icons/category_speed.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_support.svg b/resources/themes/cura-light/icons/category_support.svg
deleted file mode 100644
index 693e1f5f37..0000000000
--- a/resources/themes/cura-light/icons/category_support.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_topbottom.svg b/resources/themes/cura-light/icons/category_topbottom.svg
deleted file mode 100644
index 7efefbd4bb..0000000000
--- a/resources/themes/cura-light/icons/category_topbottom.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/category_travel.svg b/resources/themes/cura-light/icons/category_travel.svg
deleted file mode 100644
index 67f5713671..0000000000
--- a/resources/themes/cura-light/icons/category_travel.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/category_unknown.svg b/resources/themes/cura-light/icons/category_unknown.svg
deleted file mode 100644
index 67f5713671..0000000000
--- a/resources/themes/cura-light/icons/category_unknown.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/check.svg b/resources/themes/cura-light/icons/check.svg
deleted file mode 100644
index 62b6993763..0000000000
--- a/resources/themes/cura-light/icons/check.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/checked.svg b/resources/themes/cura-light/icons/checked.svg
deleted file mode 100644
index 22d1278667..0000000000
--- a/resources/themes/cura-light/icons/checked.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/clock.svg b/resources/themes/cura-light/icons/clock.svg
deleted file mode 100644
index 0b6cb78881..0000000000
--- a/resources/themes/cura-light/icons/clock.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
diff --git a/resources/themes/cura-light/icons/cross1.svg b/resources/themes/cura-light/icons/cross1.svg
deleted file mode 100644
index 63b7a6951c..0000000000
--- a/resources/themes/cura-light/icons/cross1.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/cross2.svg b/resources/themes/cura-light/icons/cross2.svg
deleted file mode 100644
index 7d4a3a878d..0000000000
--- a/resources/themes/cura-light/icons/cross2.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/resources/themes/cura-light/icons/default/Adhesion.svg b/resources/themes/cura-light/icons/default/Adhesion.svg
new file mode 100755
index 0000000000..9848ccca95
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/Adhesion.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg
new file mode 100755
index 0000000000..8c23b85331
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/ArrowFourWay.svg b/resources/themes/cura-light/icons/default/ArrowFourWay.svg
new file mode 100755
index 0000000000..885db61589
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/ArrowFourWay.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/ArrowReset.svg b/resources/themes/cura-light/icons/default/ArrowReset.svg
new file mode 100755
index 0000000000..6e54ece698
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/ArrowReset.svg
@@ -0,0 +1,5 @@
+
+
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/default/Bandage.svg b/resources/themes/cura-light/icons/default/Bandage.svg
new file mode 100755
index 0000000000..74e45f009e
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/Bandage.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/BlackMagic.svg b/resources/themes/cura-light/icons/default/BlackMagic.svg
new file mode 100755
index 0000000000..539b341950
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/BlackMagic.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg
new file mode 100644
index 0000000000..21d48f8e9e
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/default/Cancel.svg b/resources/themes/cura-light/icons/default/Cancel.svg
new file mode 100755
index 0000000000..82992683d8
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/Cancel.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/CancelBlock.svg b/resources/themes/cura-light/icons/default/CancelBlock.svg
new file mode 100755
index 0000000000..10b7917247
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/CancelBlock.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/CancelCircle.svg b/resources/themes/cura-light/icons/default/CancelCircle.svg
new file mode 100755
index 0000000000..40423ffd8d
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/CancelCircle.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/Check.svg b/resources/themes/cura-light/icons/default/Check.svg
new file mode 100755
index 0000000000..c64667efd8
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/Check.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/CheckCircle.svg b/resources/themes/cura-light/icons/default/CheckCircle.svg
new file mode 100755
index 0000000000..c364a1ecb9
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/CheckCircle.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/ChevronSingleDown.svg b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg
new file mode 100755
index 0000000000..f39c7de600
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg
new file mode 100755
index 0000000000..ad59cf483b
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/ChevronSingleRight.svg b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg
new file mode 100755
index 0000000000..5ee4ce7e82
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/resources/themes/cura-light/icons/default/ChevronSingleUp.svg b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg
new file mode 100755
index 0000000000..80d2e44ac9
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/resources/themes/cura-light/icons/circle_outline.svg b/resources/themes/cura-light/icons/default/CircleOutline.svg
similarity index 81%
rename from resources/themes/cura-light/icons/circle_outline.svg
rename to resources/themes/cura-light/icons/default/CircleOutline.svg
index 3a8fb197f3..6f7cd6aca0 100644
--- a/resources/themes/cura-light/icons/circle_outline.svg
+++ b/resources/themes/cura-light/icons/default/CircleOutline.svg
@@ -1,4 +1,4 @@
-