From 1d0620908e68ff8469a23b9954c1d8c166a2b698 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 28 Jun 2021 18:22:52 +0200
Subject: [PATCH] Remove useless and unused SVG elements

- Remove unused imports of xlink.
- Remove comments about which application originally wrote the text file. It's untrue because PyCharm edited it, etc.
- Remove unused IDs.
- Remove unused colours for icons rendered with RecolorImage.
- Remove useless x and y positions on 0, which is the default.
- Remove useless style setting the background to transparent.
- Remove useless whitespace in the path d attribute, and remove the then-useless XML space preserving attribute.
- Remove unused groups.
- Remove unused CSS classes.

Contributes to issue CURA-8342.
---
 plugins/PostProcessingPlugin/Script.svg       | 12 +++-----
 plugins/SimulationView/resources/Pause.svg    |  5 ++--
 plugins/SimulationView/resources/Play.svg     |  5 ++--
 plugins/Toolbox/resources/images/Shop.svg     |  9 +++---
 .../resources/svg/Camera.svg                  |  7 ++---
 .../resources/svg/CancelCircle.svg            |  7 ++---
 .../resources/svg/Check.svg                   |  5 ++--
 .../resources/svg/CheckCircle.svg             | 11 +++----
 .../resources/svg/PauseCircle.svg             | 13 ++++-----
 .../resources/svg/Prohibition.svg             |  7 ++---
 .../resources/svg/Warning.svg                 |  7 ++---
 .../resources/svg/icons/Buildplate.svg        |  8 ++---
 .../resources/svg/icons/CameraPhoto.svg       |  8 ++---
 .../resources/svg/icons/Extruder.svg          | 16 ++--------
 .../cura-light/icons/default/Adhesion.svg     | 19 +++++-------
 .../icons/default/ArrowDoubleCircleRight.svg  |  7 ++---
 .../cura-light/icons/default/ArrowFourWay.svg |  7 ++---
 .../cura-light/icons/default/ArrowReset.svg   |  7 ++---
 .../cura-light/icons/default/Bandage.svg      |  5 ++--
 .../cura-light/icons/default/BlackMagic.svg   |  5 ++--
 .../icons/default/BlockSupportOverlaps.svg    | 10 ++++++-
 .../cura-light/icons/default/Cancel.svg       |  7 ++---
 .../cura-light/icons/default/CancelBlock.svg  |  9 ++----
 .../cura-light/icons/default/CancelCircle.svg |  7 ++---
 .../themes/cura-light/icons/default/Check.svg |  5 ++--
 .../cura-light/icons/default/CheckCircle.svg  | 11 +++----
 .../icons/default/ChevronSingleDown.svg       |  5 ++--
 .../icons/default/ChevronSingleLeft.svg       |  5 ++--
 .../icons/default/ChevronSingleRight.svg      |  5 ++--
 .../icons/default/ChevronSingleUp.svg         |  5 ++--
 .../icons/default/CircleOutline.svg           |  2 +-
 .../themes/cura-light/icons/default/Clock.svg |  7 ++---
 .../themes/cura-light/icons/default/Cloud.svg |  7 ++---
 .../icons/default/DualExtrusion.svg           | 13 ++++-----
 .../cura-light/icons/default/Experiment.svg   |  9 ++----
 .../themes/cura-light/icons/default/Eye.svg   |  7 ++---
 .../themes/cura-light/icons/default/Fan.svg   |  7 ++---
 .../cura-light/icons/default/Folder.svg       |  7 ++---
 .../cura-light/icons/default/Formula.svg      | 10 ++-----
 .../cura-light/icons/default/Function.svg     |  5 +++-
 .../themes/cura-light/icons/default/Guide.svg | 11 +++----
 .../cura-light/icons/default/Hamburger.svg    | 11 +++----
 .../themes/cura-light/icons/default/House.svg |  5 ++--
 .../cura-light/icons/default/Infill0.svg      |  5 ++--
 .../cura-light/icons/default/Infill1.svg      |  7 ++---
 .../cura-light/icons/default/Infill2.svg      |  7 ++---
 .../cura-light/icons/default/Infill3.svg      |  7 ++---
 .../icons/default/InfillGradual.svg           |  7 ++---
 .../cura-light/icons/default/Information.svg  |  7 ++---
 .../cura-light/icons/default/LayFlat.svg      | 11 +++----
 .../icons/default/LayFlatOnFace.svg           |  5 ++--
 .../cura-light/icons/default/Layers.svg       | 13 ++++-----
 .../cura-light/icons/default/Lightning.svg    | 11 ++-----
 .../themes/cura-light/icons/default/Link.svg  |  7 ++---
 .../cura-light/icons/default/LinkExternal.svg |  7 ++---
 .../cura-light/icons/default/Magnifier.svg    |  7 ++---
 .../cura-light/icons/default/MeshType.svg     | 17 +++++------
 .../icons/default/MeshTypeIntersect.svg       |  5 ++--
 .../icons/default/MeshTypeNormal.svg          |  5 ++--
 .../icons/default/MeshTypeSupport.svg         | 15 ++++------
 .../themes/cura-light/icons/default/Minus.svg |  5 ++--
 .../cura-light/icons/default/Mirror.svg       | 19 +++++-------
 .../themes/cura-light/icons/default/Pen.svg   |  5 ++--
 .../cura-light/icons/default/Plugin.svg       |  7 ++---
 .../themes/cura-light/icons/default/Plus.svg  |  5 ++--
 .../cura-light/icons/default/PrintQuality.svg | 11 +++----
 .../cura-light/icons/default/PrintShell.svg   | 24 +++++++--------
 .../icons/default/PrintTopBottom.svg          | 18 ++++++------
 .../cura-light/icons/default/PrintTravel.svg  | 11 +++----
 .../cura-light/icons/default/Printer.svg      |  5 ++--
 .../icons/default/PrinterTriple.svg           | 13 ++++-----
 .../themes/cura-light/icons/default/Quick.svg | 25 +++++++---------
 .../cura-light/icons/default/Rotate.svg       | 29 +++++++++----------
 .../themes/cura-light/icons/default/Scale.svg |  9 ++----
 .../cura-light/icons/default/ScaleMax.svg     |  9 ++----
 .../cura-light/icons/default/Shield.svg       |  7 ++---
 .../cura-light/icons/default/Sliders.svg      |  7 ++---
 .../themes/cura-light/icons/default/Solid.svg | 17 +++++------
 .../cura-light/icons/default/SpeedOMeter.svg  |  7 ++---
 .../themes/cura-light/icons/default/Spool.svg |  8 ++---
 .../cura-light/icons/default/Sputnik.svg      |  7 ++---
 .../themes/cura-light/icons/default/Star.svg  |  7 ++---
 .../cura-light/icons/default/StarFilled.svg   |  5 ++--
 .../cura-light/icons/default/Support.svg      | 19 +++++-------
 .../icons/default/SupportBlocker.svg          | 17 +++++------
 .../cura-light/icons/default/ThreeDots.svg    |  8 ++---
 .../icons/default/UltimakerCura.svg           |  9 ++----
 .../cura-light/icons/default/View3D.svg       |  5 ++--
 .../cura-light/icons/default/ViewFront.svg    |  5 ++--
 .../cura-light/icons/default/ViewLeft.svg     |  5 ++--
 .../cura-light/icons/default/ViewRight.svg    |  5 ++--
 .../cura-light/icons/default/ViewTop.svg      |  5 ++--
 .../cura-light/icons/default/Warning.svg      |  7 ++---
 .../cura-light/icons/low/CheckBlueBG.svg      |  8 ++---
 .../cura-light/icons/low/CloudBlueBG.svg      | 10 ++-----
 .../cura-light/icons/low/CloudGreyBG.svg      | 10 ++-----
 resources/themes/cura-light/icons/low/Dot.svg |  2 +-
 .../cura-light/icons/medium/Extruder.svg      | 15 ++--------
 .../cura-light/icons/medium/PrinterTriple.svg | 17 ++++-------
 99 files changed, 356 insertions(+), 534 deletions(-)

diff --git a/plugins/PostProcessingPlugin/Script.svg b/plugins/PostProcessingPlugin/Script.svg
index 6bf481deef..d85a85c0bd 100755
--- a/plugins/PostProcessingPlugin/Script.svg
+++ b/plugins/PostProcessingPlugin/Script.svg
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<polygon style="fill:#1D1C1A;" points="4.4,12 8.2,15.8 6.8,17.2 1.6,12 6.8,6.8 8.2,8.2 	"/>
-	<polygon style="fill:#1D1C1A;" points="22.4,12 17.2,17.2 15.8,15.8 19.6,12 15.8,8.2 17.2,6.8 	"/>
-	
-		<rect x="3.9" y="11" transform="matrix(0.1236 -0.9923 0.9923 0.1236 -1.429 22.4317)" style="fill:#1D1C1A;" width="16.1" height="2"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+	<polygon points="4.4,12 8.2,15.8 6.8,17.2 1.6,12 6.8,6.8 8.2,8.2" />
+	<polygon points="22.4,12 17.2,17.2 15.8,15.8 19.6,12 15.8,8.2 17.2,6.8" />
+	<rect x="3.9" y="11" transform="matrix(0.1236 -0.9923 0.9923 0.1236 -1.429 22.4317)" width="16.1" height="2" />
 </svg>
diff --git a/plugins/SimulationView/resources/Pause.svg b/plugins/SimulationView/resources/Pause.svg
index 1e155a783f..67f2b49303 100755
--- a/plugins/SimulationView/resources/Pause.svg
+++ b/plugins/SimulationView/resources/Pause.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M8,21H6V3h2V21z M18,3h-2v18h2V3z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M8,21H6V3h2V21z M18,3h-2v18h2V3z" />
 </svg>
diff --git a/plugins/SimulationView/resources/Play.svg b/plugins/SimulationView/resources/Play.svg
index 36bbe99c10..62c76767bd 100755
--- a/plugins/SimulationView/resources/Play.svg
+++ b/plugins/SimulationView/resources/Play.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#231F20;" d="M5,20V4c0-0.8,0.9-1.3,1.5-0.9l13,8c0.6,0.4,0.6,1.3,0,1.7l-13,8C5.9,21.3,5,20.8,5,20z M7,5.8v12.4
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M5,20V4c0-0.8,0.9-1.3,1.5-0.9l13,8c0.6,0.4,0.6,1.3,0,1.7l-13,8C5.9,21.3,5,20.8,5,20z M7,5.8v12.4
 	L17.1,12L7,5.8z"/>
 </svg>
diff --git a/plugins/Toolbox/resources/images/Shop.svg b/plugins/Toolbox/resources/images/Shop.svg
index a93d6d4cfb..a1bb1f1b8c 100755
--- a/plugins/Toolbox/resources/images/Shop.svg
+++ b/plugins/Toolbox/resources/images/Shop.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M19,3H5C3.3,3,2,4.3,2,6v3c0,1.5,0.8,2.7,2,3.4V22h16v-9.6c1.2-0.7,2-2,2-3.4V6C22,4.3,20.7,3,19,3z
-	 M10,5h4v4c0,1.1-0.9,2-2,2s-2-0.9-2-2V5z M4,9V5h4v4c0,1.1-0.9,2-2,2S4,10.1,4,9z M18,20h-4v-5h-4v5H6v-7c1.2,0,2.3-0.5,3-1.4
-	c0.7,0.8,1.8,1.4,3,1.4s2.3-0.5,3-1.4c0.7,0.8,1.8,1.4,3,1.4V20z M20,9c0,1.1-0.9,2-2,2s-2-0.9-2-2V5h4V9z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19,3H5C3.3,3,2,4.3,2,6v3c0,1.5,0.8,2.7,2,3.4V22h16v-9.6c1.2-0.7,2-2,2-3.4V6C22,4.3,20.7,3,19,3z
+	M10,5h4v4c0,1.1-0.9,2-2,2s-2-0.9-2-2V5z M4,9V5h4v4c0,1.1-0.9,2-2,2S4,10.1,4,9z M18,20h-4v-5h-4v5H6v-7c1.2,0,2.3-0.5,3-1.4
+	c0.7,0.8,1.8,1.4,3,1.4s2.3-0.5,3-1.4c0.7,0.8,1.8,1.4,3,1.4V20z M20,9c0,1.1-0.9,2-2,2s-2-0.9-2-2V5h4V9z" />
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/Camera.svg b/plugins/UM3NetworkPrinting/resources/svg/Camera.svg
index ae6a67fc0b..40852cc4a6 100755
--- a/plugins/UM3NetworkPrinting/resources/svg/Camera.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/Camera.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M22,6.4l-4,2V8c0-1.7-1.3-3-3-3H5C3.3,5,2,6.3,2,8v8c0,1.7,1.3,3,3,3h10c1.7,0,3-1.3,3-3v-0.4l4,2
-	V6.4z M16,17H4V7h12V17z M20,14.4l-2-1c0-0.9,0-1.8,0-2.8l2-1V14.4z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M22,6.4l-4,2V8c0-1.7-1.3-3-3-3H5C3.3,5,2,6.3,2,8v8c0,1.7,1.3,3,3,3h10c1.7,0,3-1.3,3-3v-0.4l4,2
+	V6.4z M16,17H4V7h12V17z M20,14.4l-2-1c0-0.9,0-1.8,0-2.8l2-1V14.4z" />
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg
index dc541f2d54..2b82cd6fab 100755
--- a/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,20c-4.4,0-8-3.6-8-8s3.6-8,8-8
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,20c-4.4,0-8-3.6-8-8s3.6-8,8-8
 	s8,3.6,8,8S16.4,20,12,20z M16.7,8.7L13.4,12l3.3,3.3l-1.4,1.4L12,13.4l-3.3,3.3l-1.4-1.4l3.3-3.3L7.3,8.7l1.4-1.4l3.3,3.3l3.3-3.3
-	L16.7,8.7z"/>
+	L16.7,8.7z" />
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/Check.svg b/plugins/UM3NetworkPrinting/resources/svg/Check.svg
index 17e290a38b..f061477019 100755
--- a/plugins/UM3NetworkPrinting/resources/svg/Check.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/Check.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon style="fill:#000E1A;" points="9.1,19.4 1.9,12.2 3.3,10.8 9.1,16.6 19.4,6.3 20.8,7.7 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="9.1,19.4 1.9,12.2 3.3,10.8 9.1,16.6 19.4,6.3 20.8,7.7" />
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg
index aac1a50b95..c76a3b1995 100755
--- a/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
-		c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z"/>
-	<polygon style="fill:#000E1A;" points="16.3,8.3 11,13.6 7.7,10.3 6.3,11.7 11,16.4 17.7,9.7 	"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
+	c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z" />
+<polygon points="16.3,8.3 11,13.6 7.7,10.3 6.3,11.7 11,16.4 17.7,9.7" />
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg
index b010624979..4a1d93fab4 100755
--- a/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
-		c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z"/>
-	<rect x="13" y="8" style="fill:#000E1A;" width="2" height="8"/>
-	<rect x="9" y="8" style="fill:#000E1A;" width="2" height="8"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
+	c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z" />
+<rect x="13" y="8" width="2" height="8"/>
+<rect x="9" y="8" width="2" height="8"/>
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg b/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg
index d4dc842551..278ef5ca76 100755
--- a/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M4,12c0-1.8,0.6-3.5,1.7-4.9
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M4,12c0-1.8,0.6-3.5,1.7-4.9
 	l11.2,11.2C15.5,19.4,13.8,20,12,20C7.6,20,4,16.4,4,12z M18.3,16.9L7.1,5.7C8.5,4.6,10.2,4,12,4c4.4,0,8,3.6,8,8
-	C20,13.8,19.4,15.5,18.3,16.9z"/>
+	C20,13.8,19.4,15.5,18.3,16.9z" />
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/Warning.svg b/plugins/UM3NetworkPrinting/resources/svg/Warning.svg
index 6105030fe6..256e8ede13 100755
--- a/plugins/UM3NetworkPrinting/resources/svg/Warning.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/Warning.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M22,18L13.7,3.1c-0.4-0.6-1-1-1.7-1s-1.4,0.4-1.7,1L2,18c-0.3,0.6-0.3,1.4,0,2c0.4,0.6,1,1,1.7,1
-	h16.6c0.7,0,1.4-0.4,1.7-1C22.4,19.4,22.4,18.7,22,18z M3.7,19L12,4.1L20.3,19H3.7z M11,8h2v6h-2V8z M13,18h-2v-2h2V18z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M22,18L13.7,3.1c-0.4-0.6-1-1-1.7-1s-1.4,0.4-1.7,1L2,18c-0.3,0.6-0.3,1.4,0,2c0.4,0.6,1,1,1.7,1
+	h16.6c0.7,0,1.4-0.4,1.7-1C22.4,19.4,22.4,18.7,22,18z M3.7,19L12,4.1L20.3,19H3.7z M11,8h2v6h-2V8z M13,18h-2v-2h2V18z" />
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg
index 79fdc06c07..40f26235a2 100755
--- a/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14
-	V5H5V19z M14.7,7.7l-1.4-1.4l-7,7l1.4,1.4L14.7,7.7z M9.7,7.7L8.3,6.3l-2,2l1.4,1.4L9.7,7.7z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14
+	V5H5V19z M14.7,7.7l-1.4-1.4l-7,7l1.4,1.4L14.7,7.7z M9.7,7.7L8.3,6.3l-2,2l1.4,1.4L9.7,7.7z" />
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg
index 01f9c67c4e..72b0591ea7 100755
--- a/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M19,6h-1.6l-2-2H8.6l-2,2H5C3.3,6,2,7.3,2,9v8c0,1.7,1.3,3,3,3h14c1.7,0,3-1.3,3-3V9
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19,6h-1.6l-2-2H8.6l-2,2H5C3.3,6,2,7.3,2,9v8c0,1.7,1.3,3,3,3h14c1.7,0,3-1.3,3-3V9
 	C22,7.3,20.7,6,19,6z M20,18H4V8h3.4l2-2h5.2l2,2H20V18z M12,8c-2.2,0-4,1.8-4,4s1.8,4,4,4s4-1.8,4-4S14.2,8,12,8z M12,14
-	c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2S13.1,14,12,14z"/>
+	c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2S13.1,14,12,14z" />
 </svg>
diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg
index 3a2cf1147b..753d370417 100644
--- a/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg
+++ b/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<g id="Layer_1">
-	<g>
-		<g>
-			<path d="M15,3C8.37,3,3,8.37,3,15v11h2v-4.36C7.15,24.87,10.83,27,15,27c6.63,0,12-5.37,12-12S21.63,3,15,3z M15,25
-				C9.49,25,5,20.51,5,15S9.49,5,15,5s10,4.49,10,10S20.51,25,15,25z"/>
-		</g>
-	</g>
-</g>
-<g id="Comments">
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+<path d="M15,3C8.37,3,3,8.37,3,15v11h2v-4.36C7.15,24.87,10.83,27,15,27c6.63,0,12-5.37,12-12S21.63,3,15,3z M15,25
+	C9.49,25,5,20.51,5,15S9.49,5,15,5s10,4.49,10,10S20.51,25,15,25z"/>
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Adhesion.svg b/resources/themes/cura-light/icons/default/Adhesion.svg
index f43ccdb030..81470f420e 100755
--- a/resources/themes/cura-light/icons/default/Adhesion.svg
+++ b/resources/themes/cura-light/icons/default/Adhesion.svg
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<polygon points="16.9,8.4 15.5,7 13,9.5 13,2 11,2 11,9.5 8.5,7 7.1,8.4 12,13.4 	"/>
-	<path d="M20,14v-4h-2v5H6v-5H4v4c0,1.7,1.3,3,3,3h10C18.7,17,20,15.7,20,14z"/>
-	<circle cx="4" cy="20" r="1"/>
-	<circle cx="8" cy="20" r="1"/>
-	<circle cx="12" cy="20" r="1"/>
-	<circle cx="16" cy="20" r="1"/>
-	<circle cx="20" cy="20" r="1"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="16.9,8.4 15.5,7 13,9.5 13,2 11,2 11,9.5 8.5,7 7.1,8.4 12,13.4" />
+<path d="M20,14v-4h-2v5H6v-5H4v4c0,1.7,1.3,3,3,3h10C18.7,17,20,15.7,20,14z" />
+<circle cx="4" cy="20" r="1" />
+<circle cx="8" cy="20" r="1" />
+<circle cx="12" cy="20" r="1" />
+<circle cx="16" cy="20" r="1" />
+<circle cx="20" cy="20" r="1" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg
index 9c3699e040..e32531eeac 100755
--- a/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg
+++ b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M21,12c0,5-4,9-9,9c-2.2,0-4.4-0.8-6-2.3V22H4v-7h7v2H7.1c1.3,1.3,3,2,4.9,2c3.9,0,7-3.1,7-7H21z
-	 M12,5c1.9,0,3.6,0.7,4.9,2H13v2h7V2h-2v3.3C16.4,3.8,14.2,3,12,3c-5,0-9,4-9,9h2C5,8.1,8.1,5,12,5z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M21,12c0,5-4,9-9,9c-2.2,0-4.4-0.8-6-2.3V22H4v-7h7v2H7.1c1.3,1.3,3,2,4.9,2c3.9,0,7-3.1,7-7H21z
+	 M12,5c1.9,0,3.6,0.7,4.9,2H13v2h7V2h-2v3.3C16.4,3.8,14.2,3,12,3c-5,0-9,4-9,9h2C5,8.1,8.1,5,12,5z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ArrowFourWay.svg b/resources/themes/cura-light/icons/default/ArrowFourWay.svg
index 5470443441..6b46c3ccb8 100755
--- a/resources/themes/cura-light/icons/default/ArrowFourWay.svg
+++ b/resources/themes/cura-light/icons/default/ArrowFourWay.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon style="fill:#000E1A;" points="17.7,8.3 16.3,9.7 17.6,11 13,11 13,6.4 14.3,7.7 15.7,6.3 12,2.6 8.3,6.3 9.7,7.7 11,6.4 
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="17.7,8.3 16.3,9.7 17.6,11 13,11 13,6.4 14.3,7.7 15.7,6.3 12,2.6 8.3,6.3 9.7,7.7 11,6.4
 	11,11 6.4,11 7.7,9.7 6.3,8.3 2.6,12 6.3,15.7 7.7,14.3 6.4,13 11,13 11,17.6 9.7,16.3 8.3,17.7 12,21.4 15.7,17.7 14.3,16.3 
-	13,17.6 13,13 17.6,13 16.3,14.3 17.7,15.7 21.4,12 "/>
+	13,17.6 13,13 17.6,13 16.3,14.3 17.7,15.7 21.4,12" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ArrowReset.svg b/resources/themes/cura-light/icons/default/ArrowReset.svg
index 0283cf67b6..4bf2f8d611 100755
--- a/resources/themes/cura-light/icons/default/ArrowReset.svg
+++ b/resources/themes/cura-light/icons/default/ArrowReset.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M6,14c0,3.3,2.7,6,6,6s6-2.7,6-6s-2.7-6-6-6H8.4l2.3,2.3l-1.4,1.4L4.6,7l4.7-4.7l1.4,1.4L8.4,6H12c4.4,0,8,3.6,8,8
-	s-3.6,8-8,8s-8-3.6-8-8H6z"/>
-</svg>
+	s-3.6,8-8,8s-8-3.6-8-8H6z" />
+</svg>
\ 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
index abb13320ca..d348a512c9 100755
--- a/resources/themes/cura-light/icons/default/Bandage.svg
+++ b/resources/themes/cura-light/icons/default/Bandage.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M20.5,3.5c-2.8-2.8-5.8-1.2-7.1,0l-9.9,9.9c-1.2,1.2-2.8,4.3,0,7.1c2.8,2.8,5.8,1.2,7.1,0l9.9-9.9
 	C21.7,9.4,23.3,6.3,20.5,3.5z M9.2,19.1c-0.4,0.3-2.3,2-4.2,0c-2-2-0.3-3.9,0-4.2l1.4-1.4l4.2,4.2L9.2,19.1z M12,16.2L7.8,12L12,7.8
-	l4.2,4.2L12,16.2z M19.1,9.2l-1.4,1.4l-4.2-4.2l1.4-1.4c0.4-0.4,2.3-2,4.2,0C21.1,6.9,19.4,8.8,19.1,9.2z"/>
+	l4.2,4.2L12,16.2z M19.1,9.2l-1.4,1.4l-4.2-4.2l1.4-1.4c0.4-0.4,2.3-2,4.2,0C21.1,6.9,19.4,8.8,19.1,9.2z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/BlackMagic.svg b/resources/themes/cura-light/icons/default/BlackMagic.svg
index f53f54f3dd..78f271a679 100755
--- a/resources/themes/cura-light/icons/default/BlackMagic.svg
+++ b/resources/themes/cura-light/icons/default/BlackMagic.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M17.4,20.8l-5.4-4l-5.4,4c-0.8,0.6-1.9-0.2-1.5-1.1l2.2-6.3L2.4,9.8C1.6,9.2,2,8,3,8h6.2l1.9-5.3c0.3-0.9,1.6-0.9,1.9,0
 	L14.8,8H21c1,0,1.4,1.2,0.6,1.8l-4.9,3.6l2.2,6.3C19.3,20.6,18.2,21.4,17.4,20.8z M13.7,15.6l2.3,1.7L15,14.6L13.7,15.6z M9,14.6
 	L8,17.3l2.3-1.7L9,14.6z M9.7,12.6l2.3,1.7l2.3-1.7L13.4,10h-2.8L9.7,12.6z M15.5,10l0.5,1.4l1.9-1.4H15.5z M6.1,10L8,11.4L8.5,10
-	H6.1z M11.3,8h1.4L12,6L11.3,8z"/>
+	H6.1z M11.3,8h1.4L12,6L11.3,8z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg
index a6d250c80a..21d48f8e9e 100644
--- a/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg
+++ b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg
@@ -1 +1,9 @@
-<svg id="Artwork" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#231f20;}</style></defs><path class="cls-1" d="M5.05,14.3v6.75h-2V12.27c.09.11.19.22.29.32Z"/><path class="cls-1" d="M9.05,17.8v3.25h-2V16.3l.46.46A4.82,4.82,0,0,0,9.05,17.8Z"/><path class="cls-1" d="M13.05,17.8v3.25h-2V18.22A4.85,4.85,0,0,0,13.05,17.8Z"/><path d="M21.47,7.64l-2-2a2,2,0,0,0-2.82,0l-2,2a2,2,0,0,0,0,2.82l2,2a2,2,0,0,0,2.82,0l2-2A2,2,0,0,0,21.47,7.64Zm-3.42,3.41-2-2,2-2,2,2Z"/><polygon points="21 16.42 19.58 15 18 16.58 16.42 15 15 16.42 16.58 18 15 19.58 16.42 21 18 19.42 19.58 21 21 19.58 19.42 18 21 16.42"/><path d="M13.47,12.13l1.41,1.41-1.76,1.75a3,3,0,0,1-4.24,0L4.71,11.12a3,3,0,0,1,0-4.24L8.88,2.71a3,3,0,0,1,4.24,0l1.81,1.81-.41.41-.59.59-.41.41L11,3.41,5.41,9,11,14.59Z"/><path d="M13.52,5.93l.41-.41"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+	<path d="M5.05,14.3v6.75h-2V12.27c.09.11.19.22.29.32Z" />
+	<path d="M9.05,17.8v3.25h-2V16.3l.46.46A4.82,4.82,0,0,0,9.05,17.8Z" />
+	<path d="M13.05,17.8v3.25h-2V18.22A4.85,4.85,0,0,0,13.05,17.8Z" />
+	<path d="M21.47,7.64l-2-2a2,2,0,0,0-2.82,0l-2,2a2,2,0,0,0,0,2.82l2,2a2,2,0,0,0,2.82,0l2-2A2,2,0,0,0,21.47,7.64Zm-3.42,3.41-2-2,2-2,2,2Z" />
+	<polygon points="21 16.42 19.58 15 18 16.58 16.42 15 15 16.42 16.58 18 15 19.58 16.42 21 18 19.42 19.58 21 21 19.58 19.42 18 21 16.42" />
+	<path d="M13.47,12.13l1.41,1.41-1.76,1.75a3,3,0,0,1-4.24,0L4.71,11.12a3,3,0,0,1,0-4.24L8.88,2.71a3,3,0,0,1,4.24,0l1.81,1.81-.41.41-.59.59-.41.41L11,3.41,5.41,9,11,14.59Z" />
+	<path d="M13.52,5.93l.41-.41" />
+</svg>
\ 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
index 2646952ce1..0b6d3e9a69 100755
--- a/resources/themes/cura-light/icons/default/Cancel.svg
+++ b/resources/themes/cura-light/icons/default/Cancel.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon style="fill:#000E1A;" points="19.7,5.7 18.3,4.3 12,10.6 5.7,4.3 4.3,5.7 10.6,12 4.3,18.3 5.7,19.7 12,13.4 18.3,19.7 
-	19.7,18.3 13.4,12 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="19.7,5.7 18.3,4.3 12,10.6 5.7,4.3 4.3,5.7 10.6,12 4.3,18.3 5.7,19.7 12,13.4 18.3,19.7
+	19.7,18.3 13.4,12 " />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/CancelBlock.svg b/resources/themes/cura-light/icons/default/CancelBlock.svg
index 605839e0bf..f2cda45fb5 100755
--- a/resources/themes/cura-light/icons/default/CancelBlock.svg
+++ b/resources/themes/cura-light/icons/default/CancelBlock.svg
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14V5H5V19z"/>
-	<polygon points="13.4,12 17.7,16.3 16.3,17.7 12,13.4 7.7,17.7 6.3,16.3 10.6,12 6.3,7.7 7.7,6.3 12,10.6 16.3,6.3 17.7,7.7 	"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14V5H5V19z" />
+<polygon points="13.4,12 17.7,16.3 16.3,17.7 12,13.4 7.7,17.7 6.3,16.3 10.6,12 6.3,7.7 7.7,6.3 12,10.6 16.3,6.3 17.7,7.7 	" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/CancelCircle.svg b/resources/themes/cura-light/icons/default/CancelCircle.svg
index dc541f2d54..2b82cd6fab 100755
--- a/resources/themes/cura-light/icons/default/CancelCircle.svg
+++ b/resources/themes/cura-light/icons/default/CancelCircle.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,20c-4.4,0-8-3.6-8-8s3.6-8,8-8
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,20c-4.4,0-8-3.6-8-8s3.6-8,8-8
 	s8,3.6,8,8S16.4,20,12,20z M16.7,8.7L13.4,12l3.3,3.3l-1.4,1.4L12,13.4l-3.3,3.3l-1.4-1.4l3.3-3.3L7.3,8.7l1.4-1.4l3.3,3.3l3.3-3.3
-	L16.7,8.7z"/>
+	L16.7,8.7z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Check.svg b/resources/themes/cura-light/icons/default/Check.svg
index 17e290a38b..f061477019 100755
--- a/resources/themes/cura-light/icons/default/Check.svg
+++ b/resources/themes/cura-light/icons/default/Check.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon style="fill:#000E1A;" points="9.1,19.4 1.9,12.2 3.3,10.8 9.1,16.6 19.4,6.3 20.8,7.7 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="9.1,19.4 1.9,12.2 3.3,10.8 9.1,16.6 19.4,6.3 20.8,7.7" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/CheckCircle.svg b/resources/themes/cura-light/icons/default/CheckCircle.svg
index aac1a50b95..c76a3b1995 100755
--- a/resources/themes/cura-light/icons/default/CheckCircle.svg
+++ b/resources/themes/cura-light/icons/default/CheckCircle.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
-		c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z"/>
-	<polygon style="fill:#000E1A;" points="16.3,8.3 11,13.6 7.7,10.3 6.3,11.7 11,16.4 17.7,9.7 	"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
+	c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z" />
+<polygon points="16.3,8.3 11,13.6 7.7,10.3 6.3,11.7 11,16.4 17.7,9.7" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ChevronSingleDown.svg b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg
index 3d6018ada0..406eed4829 100755
--- a/resources/themes/cura-light/icons/default/ChevronSingleDown.svg
+++ b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon style="fill:#000E1A;" points="3.3,8.3 4.7,6.9 12,14.2 19.3,6.9 20.7,8.3 12,17 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="3.3,8.3 4.7,6.9 12,14.2 19.3,6.9 20.7,8.3 12,17" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg
index 25d41e2ef5..035b0d7420 100755
--- a/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg
+++ b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon style="fill:#000E1A;" points="15.6,3.3 17,4.7 9.7,12 17,19.3 15.6,20.7 6.9,12 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="15.6,3.3 17,4.7 9.7,12 17,19.3 15.6,20.7 6.9,12" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ChevronSingleRight.svg b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg
index 099ca58e67..10eff2d2d0 100755
--- a/resources/themes/cura-light/icons/default/ChevronSingleRight.svg
+++ b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon style="fill:#000E1A;" points="8.3,20.7 6.9,19.3 14.2,12 6.9,4.7 8.3,3.3 17,12 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="8.3,20.7 6.9,19.3 14.2,12 6.9,4.7 8.3,3.3 17,12" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ChevronSingleUp.svg b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg
index 1575d25ed5..9fe1dadc36 100755
--- a/resources/themes/cura-light/icons/default/ChevronSingleUp.svg
+++ b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon style="fill:#000E1A;" points="20.7,15.7 19.3,17.1 12,9.8 4.7,17.1 3.3,15.7 12,7 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="20.7,15.7 19.3,17.1 12,9.8 4.7,17.1 3.3,15.7 12,7" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/CircleOutline.svg b/resources/themes/cura-light/icons/default/CircleOutline.svg
index 3a8fb197f3..6f7cd6aca0 100644
--- a/resources/themes/cura-light/icons/default/CircleOutline.svg
+++ b/resources/themes/cura-light/icons/default/CircleOutline.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<svg width="50" height="50" >
+<svg width="50" height="50">
     <circle cx="25" cy="25" r="23.74" fill="none" stroke="black" stroke-width="2.5" />
 </svg>
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/default/Clock.svg b/resources/themes/cura-light/icons/default/Clock.svg
index 9bdc8252aa..f558f0f987 100755
--- a/resources/themes/cura-light/icons/default/Clock.svg
+++ b/resources/themes/cura-light/icons/default/Clock.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
-	c-4.4,0-8-3.6-8-8s3.6-8,8-8s8,3.6,8,8S16.4,20,12,20z M17,13h-6V6h2v5h4V13z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
+	c-4.4,0-8-3.6-8-8s3.6-8,8-8s8,3.6,8,8S16.4,20,12,20z M17,13h-6V6h2v5h4V13z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Cloud.svg b/resources/themes/cura-light/icons/default/Cloud.svg
index df0a4560c8..f76e37dcab 100755
--- a/resources/themes/cura-light/icons/default/Cloud.svg
+++ b/resources/themes/cura-light/icons/default/Cloud.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M16,19H8c-2.8,0-5-2.2-5-5c0-2.4,1.8-4.5,4.1-4.9C7.5,6.8,9.6,5,12,5s4.5,1.8,4.9,4.1
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M16,19H8c-2.8,0-5-2.2-5-5c0-2.4,1.8-4.5,4.1-4.9C7.5,6.8,9.6,5,12,5s4.5,1.8,4.9,4.1
 	C19.2,9.5,21,11.6,21,14C21,16.8,18.8,19,16,19z M8,11c-1.7,0-3,1.3-3,3s1.3,3,3,3h8c1.7,0,3-1.3,3-3s-1.3-3-3-3h-1v-1
-	c0-1.7-1.3-3-3-3c-1.4,0-2.5,0.9-2.9,2.1C11.3,9.6,13,11.6,13,14h-2C11,12.3,9.7,11,8,11z"/>
+	c0-1.7-1.3-3-3-3c-1.4,0-2.5,0.9-2.9,2.1C11.3,9.6,13,11.6,13,14h-2C11,12.3,9.7,11,8,11z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/DualExtrusion.svg b/resources/themes/cura-light/icons/default/DualExtrusion.svg
index 18b991ad44..dc1c598fca 100755
--- a/resources/themes/cura-light/icons/default/DualExtrusion.svg
+++ b/resources/themes/cura-light/icons/default/DualExtrusion.svg
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M12,9.5V5H4v4.5l4,2.7L12,9.5z M6,7h4v1.5L8,9.8L6,8.5V7z"/>
-	<path d="M14,5v4.5l4,2.7l4-2.7V5H14z M20,8.5l-2,1.3l-2-1.3V7h4V8.5z"/>
-	<path d="M7,16c0,0.8-0.5,1-1,1H3v2h3c1.2,0,3-0.8,3-3v-2H7V16z"/>
-	<path d="M17,16c0,0.8-0.5,1-1,1h-5v2h5c1.2,0,3-0.8,3-3v-2h-2V16z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,9.5V5H4v4.5l4,2.7L12,9.5z M6,7h4v1.5L8,9.8L6,8.5V7z" />
+<path d="M14,5v4.5l4,2.7l4-2.7V5H14z M20,8.5l-2,1.3l-2-1.3V7h4V8.5z" />
+<path d="M7,16c0,0.8-0.5,1-1,1H3v2h3c1.2,0,3-0.8,3-3v-2H7V16z" />
+<path d="M17,16c0,0.8-0.5,1-1,1h-5v2h5c1.2,0,3-0.8,3-3v-2h-2V16z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Experiment.svg b/resources/themes/cura-light/icons/default/Experiment.svg
index 75201d92f7..adb729a8a2 100755
--- a/resources/themes/cura-light/icons/default/Experiment.svg
+++ b/resources/themes/cura-light/icons/default/Experiment.svg
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M10,3v1v6l-1.3,2.9l1.2-2.7L10,10V9.8V4V3 M14,10l0.1,0.2l1.2,2.7L14,10L14,10 M17.4,21H6.6H17.4 M16,2H8v2h1v5.8l-4.3,9.4
-		C4.1,20.5,5.1,22,6.6,22h10.9c1.5,0,2.4-1.5,1.8-2.8L15,9.8V4h1V2L16,2z M6.6,20l4.4-9.8V4h2v6.2l4.4,9.8H6.6L6.6,20z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M10,3v1v6l-1.3,2.9l1.2-2.7L10,10V9.8V4V3 M14,10l0.1,0.2l1.2,2.7L14,10L14,10 M17.4,21H6.6H17.4 M16,2H8v2h1v5.8l-4.3,9.4
+	C4.1,20.5,5.1,22,6.6,22h10.9c1.5,0,2.4-1.5,1.8-2.8L15,9.8V4h1V2L16,2z M6.6,20l4.4-9.8V4h2v6.2l4.4,9.8H6.6L6.6,20z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Eye.svg b/resources/themes/cura-light/icons/default/Eye.svg
index a45a0fed40..8b23619b5b 100755
--- a/resources/themes/cura-light/icons/default/Eye.svg
+++ b/resources/themes/cura-light/icons/default/Eye.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M21.9,11.5C21.7,11.3,18.5,6,12,6s-9.7,5.3-9.9,5.5L1.8,12l0.3,0.5C2.3,12.7,5.5,18,12,18
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M21.9,11.5C21.7,11.3,18.5,6,12,6s-9.7,5.3-9.9,5.5L1.8,12l0.3,0.5C2.3,12.7,5.5,18,12,18
 	s9.7-5.3,9.9-5.5l0.3-0.5L21.9,11.5z M12,16c-4.3,0-6.9-2.8-7.8-4c0.9-1.2,3.5-4,7.8-4c4.3,0,6.9,2.8,7.8,4C18.9,13.2,16.3,16,12,16
-	z M12,9c-1.7,0-3,1.3-3,3s1.3,3,3,3s3-1.3,3-3S13.7,9,12,9z M12,13c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S12.6,13,12,13z"/>
+	z M12,9c-1.7,0-3,1.3-3,3s1.3,3,3,3s3-1.3,3-3S13.7,9,12,9z M12,13c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S12.6,13,12,13z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Fan.svg b/resources/themes/cura-light/icons/default/Fan.svg
index 7e984250b9..6e7fc59939 100755
--- a/resources/themes/cura-light/icons/default/Fan.svg
+++ b/resources/themes/cura-light/icons/default/Fan.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M19.1,12c1.9-1.9,1.9-5.1,0-7.1l-0.7-0.7l-5,5c0.2-1.5-0.2-3.1-1.4-4.3C10.1,3,6.9,3,5,4.9L4.3,5.6
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19.1,12c1.9-1.9,1.9-5.1,0-7.1l-0.7-0.7l-5,5c0.2-1.5-0.2-3.1-1.4-4.3C10.1,3,6.9,3,5,4.9L4.3,5.6
 	l5,5C7.8,10.4,6.2,10.8,5,12c-1.9,1.9-1.9,5.1,0,7.1l0.7,0.7l5-5c-0.2,1.5,0.2,3.1,1.4,4.3c1.9,1.9,5.1,1.9,7.1,0l0.7-0.7l-5-5
 	C16.4,13.6,18,13.2,19.1,12z M18.3,7.2c0.5,1.1,0.3,2.5-0.6,3.4s-2.3,1.1-3.4,0.6L18.3,7.2z M10.7,6.3c0.9,0.9,1.1,2.3,0.6,3.4l-4-4
 	C8.4,5.2,9.7,5.4,10.7,6.3z M5.8,16.8c-0.5-1.1-0.3-2.5,0.6-3.4c0.9-0.9,2.3-1.1,3.4-0.6L5.8,16.8z M13.5,17.7
-	c-0.9-0.9-1.1-2.3-0.6-3.4l4,4C15.8,18.8,14.4,18.6,13.5,17.7z"/>
+	c-0.9-0.9-1.1-2.3-0.6-3.4l4,4C15.8,18.8,14.4,18.6,13.5,17.7z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Folder.svg b/resources/themes/cura-light/icons/default/Folder.svg
index 32ffd27cfe..a6232796c1 100755
--- a/resources/themes/cura-light/icons/default/Folder.svg
+++ b/resources/themes/cura-light/icons/default/Folder.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M19,8L19,8c0-1.7-1.3-3-3-3h-6L9,4H5C3.3,4,2,5.3,2,7v10c0,1.7,1.3,3,3,3h14c1.7,0,3-1.3,3-3v-6
-	C22,9.3,20.7,8,19,8L19,8z M20,18H4V6h4.2l3.4,3.4l0.6,0.6H13h7V18z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19,8L19,8c0-1.7-1.3-3-3-3h-6L9,4H5C3.3,4,2,5.3,2,7v10c0,1.7,1.3,3,3,3h14c1.7,0,3-1.3,3-3v-6
+	C22,9.3,20.7,8,19,8L19,8z M20,18H4V6h4.2l3.4,3.4l0.6,0.6H13h7V18z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Formula.svg b/resources/themes/cura-light/icons/default/Formula.svg
index 2d89dd7df0..c8838e559c 100755
--- a/resources/themes/cura-light/icons/default/Formula.svg
+++ b/resources/themes/cura-light/icons/default/Formula.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<polygon points="3,10 5,10 5,21 7,21 7,10 10,10 10,21 12,21 12,10 14,10 14,8 3,8 	"/>
-	<polygon points="20.9,4.5 19.5,3.1 18.1,4.5 16.7,3.1 15.3,4.5 16.7,5.9 15.3,7.3 16.7,8.7 18.1,7.3 19.5,8.7 20.9,7.3 19.5,5.9 	
-		"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="3,10 5,10 5,21 7,21 7,10 10,10 10,21 12,21 12,10 14,10 14,8 3,8" />
+<polygon points="20.9,4.5 19.5,3.1 18.1,4.5 16.7,3.1 15.3,4.5 16.7,5.9 15.3,7.3 16.7,8.7 18.1,7.3 19.5,8.7 20.9,7.3 19.5,5.9" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Function.svg b/resources/themes/cura-light/icons/default/Function.svg
index 8c3e9c883d..4947b6d248 100644
--- a/resources/themes/cura-light/icons/default/Function.svg
+++ b/resources/themes/cura-light/icons/default/Function.svg
@@ -1 +1,4 @@
-<svg id="Artwork" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><polygon points="19.71 15.71 18.29 14.29 16.5 16.09 14.71 14.29 13.29 15.71 15.09 17.5 13.29 19.29 14.71 20.71 16.5 18.91 18.29 20.71 19.71 19.29 17.91 17.5 19.71 15.71"/><path d="M15.26,2a4,4,0,0,0-3.84,2.9L10.24,9H8v2H9.67L7.55,18.43a2,2,0,0,1-2,1.57H4v2H5.59a4,4,0,0,0,3.89-3.07L11.75,11H14V9H12.32l1-3.55A2,2,0,0,1,15.26,4H17V2Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="19.71 15.71 18.29 14.29 16.5 16.09 14.71 14.29 13.29 15.71 15.09 17.5 13.29 19.29 14.71 20.71 16.5 18.91 18.29 20.71 19.71 19.29 17.91 17.5 19.71 15.71" />
+<path d="M15.26,2a4,4,0,0,0-3.84,2.9L10.24,9H8v2H9.67L7.55,18.43a2,2,0,0,1-2,1.57H4v2H5.59a4,4,0,0,0,3.89-3.07L11.75,11H14V9H12.32l1-3.55A2,2,0,0,1,15.26,4H17V2Z" />
+</svg>
\ No newline at end of file
diff --git a/resources/themes/cura-light/icons/default/Guide.svg b/resources/themes/cura-light/icons/default/Guide.svg
index 358a8864a4..89ae9a8e6f 100755
--- a/resources/themes/cura-light/icons/default/Guide.svg
+++ b/resources/themes/cura-light/icons/default/Guide.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M19,5v15H6c-0.5,0-1-0.4-1-1s0.5-1,1-1h12V2H6C4.3,2,3,3.3,3,5v14c0,1.7,1.3,3,3,3h15V5H19z M12,16h-2v-2h2V16z M12,4.1
-		c1.3,0.3,2.4,1.4,2.7,2.7c0.5,2.1-0.8,4-2.7,4.5V12h-2v-1.6c0-0.5,0.4-0.9,0.9-0.9c0.8,0,1.5-0.4,1.8-1.2C13,7.1,12.2,6,11,6
-		c-0.9,0-1.6,0.7-1.7,1.5h-2C7.4,5.2,9.6,3.5,12,4.1z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19,5v15H6c-0.5,0-1-0.4-1-1s0.5-1,1-1h12V2H6C4.3,2,3,3.3,3,5v14c0,1.7,1.3,3,3,3h15V5H19z M12,16h-2v-2h2V16z M12,4.1
+	c1.3,0.3,2.4,1.4,2.7,2.7c0.5,2.1-0.8,4-2.7,4.5V12h-2v-1.6c0-0.5,0.4-0.9,0.9-0.9c0.8,0,1.5-0.4,1.8-1.2C13,7.1,12.2,6,11,6
+	c-0.9,0-1.6,0.7-1.7,1.5h-2C7.4,5.2,9.6,3.5,12,4.1z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Hamburger.svg b/resources/themes/cura-light/icons/default/Hamburger.svg
index ed83977773..905d1afcac 100755
--- a/resources/themes/cura-light/icons/default/Hamburger.svg
+++ b/resources/themes/cura-light/icons/default/Hamburger.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<rect x="3" y="11" width="18" height="2"/>
-	<rect x="3" y="4" width="18" height="2"/>
-	<rect x="3" y="18" width="18" height="2"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<rect x="3" y="11" width="18" height="2" />
+<rect x="3" y="4" width="18" height="2" />
+<rect x="3" y="18" width="18" height="2" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/House.svg b/resources/themes/cura-light/icons/default/House.svg
index b44362a061..6f5d951b08 100755
--- a/resources/themes/cura-light/icons/default/House.svg
+++ b/resources/themes/cura-light/icons/default/House.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M21.7,13.3L12,3.6l-9.7,9.7l1.4,1.4L5,13.4V18c0,1.7,1.3,3,3,3h8c1.7,0,3-1.3,3-3v-4.6l1.3,1.3L21.7,13.3z M17,19h-3v-5h-4
-	v5H7v-7.6l5-5l5,5V19z"/>
+v5H7v-7.6l5-5l5,5V19z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Infill0.svg b/resources/themes/cura-light/icons/default/Infill0.svg
index d33ab09dda..d09c93fb48 100755
--- a/resources/themes/cura-light/icons/default/Infill0.svg
+++ b/resources/themes/cura-light/icons/default/Infill0.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14V5H5V19z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14V5H5V19z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Infill1.svg b/resources/themes/cura-light/icons/default/Infill1.svg
index 1d31070389..c5a07a2d5f 100755
--- a/resources/themes/cura-light/icons/default/Infill1.svg
+++ b/resources/themes/cura-light/icons/default/Infill1.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M15.1,7.5
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M15.1,7.5
 	L12,10.6L8.9,7.5L11.4,5h1.2L15.1,7.5z M15.4,5h2.2l-1.1,1.1L15.4,5z M16.5,8.9l2.5,2.5v1.2l-2.5,2.5L13.4,12L16.5,8.9z M10.6,12
 	l-3.1,3.1L5,12.6v-1.2l2.5-2.5L10.6,12z M7.5,6.1L6.4,5h2.2L7.5,6.1z M5,8.6V6.4l1.1,1.1L5,8.6z M6.1,16.5L5,17.6v-2.2L6.1,16.5z
 	 M8.9,16.5l3.1-3.1l3.1,3.1L12.6,19h-1.2L8.9,16.5z M8.6,19H6.4l1.1-1.1L8.6,19z M16.5,17.9l1.1,1.1h-2.2L16.5,17.9z M17.9,16.5
-	l1.1-1.1v2.2L17.9,16.5z M17.9,7.5L19,6.4v2.2L17.9,7.5z"/>
+	l1.1-1.1v2.2L17.9,16.5z M17.9,7.5L19,6.4v2.2L17.9,7.5z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Infill2.svg b/resources/themes/cura-light/icons/default/Infill2.svg
index 67de5e5eec..5bf473f58d 100755
--- a/resources/themes/cura-light/icons/default/Infill2.svg
+++ b/resources/themes/cura-light/icons/default/Infill2.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M12,13.4
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M12,13.4
 	l2.6,2.6L12,18.6L9.4,16L12,13.4z M8,14.6L5.4,12L8,9.4l2.6,2.6L8,14.6z M13.4,12L16,9.4l2.6,2.6L16,14.6L13.4,12z M12,10.6L9.4,8
 	L12,5.4L14.6,8L12,10.6z M14.4,5h3.2L16,6.6L14.4,5z M8,6.6L6.4,5h3.2L8,6.6z M5,9.6V6.4L6.6,8L5,9.6z M6.6,16L5,17.6v-3.2L6.6,16z
-	 M9.6,19H6.4L8,17.4L9.6,19z M16,17.4l1.6,1.6h-3.2L16,17.4z M17.4,16l1.6-1.6v3.2L17.4,16z M17.4,8L19,6.4v3.2L17.4,8z"/>
+	 M9.6,19H6.4L8,17.4L9.6,19z M16,17.4l1.6,1.6h-3.2L16,17.4z M17.4,16l1.6-1.6v3.2L17.4,16z M17.4,8L19,6.4v3.2L17.4,8z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Infill3.svg b/resources/themes/cura-light/icons/default/Infill3.svg
index 19292cd230..5046c0a372 100755
--- a/resources/themes/cura-light/icons/default/Infill3.svg
+++ b/resources/themes/cura-light/icons/default/Infill3.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M19,11.6
-	L11.6,19H6.4L19,6.4V11.6z M5,12.4L12.4,5h5.2L5,17.6V12.4z M9.6,5L5,9.6V5H9.6z M14.4,19l4.6-4.6V19H14.4z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M19,11.6
+	L11.6,19H6.4L19,6.4V11.6z M5,12.4L12.4,5h5.2L5,17.6V12.4z M9.6,5L5,9.6V5H9.6z M14.4,19l4.6-4.6V19H14.4z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/InfillGradual.svg b/resources/themes/cura-light/icons/default/InfillGradual.svg
index 28ad18fbf7..6aff475379 100755
--- a/resources/themes/cura-light/icons/default/InfillGradual.svg
+++ b/resources/themes/cura-light/icons/default/InfillGradual.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M16,6.6
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M16,6.6
 	L14.4,5h3.2L16,6.6z M14.6,8L12,10.6L9.4,8L12,5.4L14.6,8z M8,6.6L6.4,5h3.2L8,6.6z M10.6,12L5,17.6V6.4L10.6,12z M19,6.4v11.2
-	L13.4,12L19,6.4z M12,13.4l5.6,5.6H6.4L12,13.4z"/>
+	L13.4,12L19,6.4z M12,13.4l5.6,5.6H6.4L12,13.4z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Information.svg b/resources/themes/cura-light/icons/default/Information.svg
index 980167c73f..7cceb664e0 100755
--- a/resources/themes/cura-light/icons/default/Information.svg
+++ b/resources/themes/cura-light/icons/default/Information.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,20c-4.4,0-8-3.6-8-8s3.6-8,8-8
-	s8,3.6,8,8S16.4,20,12,20z M11,10h2v7h-2V10z M13,8h-2V6h2V8z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,20c-4.4,0-8-3.6-8-8s3.6-8,8-8
+	s8,3.6,8,8S16.4,20,12,20z M11,10h2v7h-2V10z M13,8h-2V6h2V8z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/LayFlat.svg b/resources/themes/cura-light/icons/default/LayFlat.svg
index d66062da43..6fceb000f1 100755
--- a/resources/themes/cura-light/icons/default/LayFlat.svg
+++ b/resources/themes/cura-light/icons/default/LayFlat.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<polygon points="16.7,6.7 15.3,5.3 13,7.6 13,3 11,3 11,7.6 8.7,5.3 7.3,6.7 12,11.4 	"/>
-	<path d="M21.8,19.3l-6-7C15.6,12.1,15.3,12,15,12H9c-0.3,0-0.6,0.1-0.8,0.3l-6,7c-0.3,0.3-0.3,0.7-0.1,1.1S2.6,21,3,21h18
-		c0.4,0,0.7-0.2,0.9-0.6S22,19.6,21.8,19.3z M5.2,19l4.3-5h5.1l4.3,5H5.2z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="16.7,6.7 15.3,5.3 13,7.6 13,3 11,3 11,7.6 8.7,5.3 7.3,6.7 12,11.4 	" />
+<path d="M21.8,19.3l-6-7C15.6,12.1,15.3,12,15,12H9c-0.3,0-0.6,0.1-0.8,0.3l-6,7c-0.3,0.3-0.3,0.7-0.1,1.1S2.6,21,3,21h18
+	c0.4,0,0.7-0.2,0.9-0.6S22,19.6,21.8,19.3z M5.2,19l4.3-5h5.1l4.3,5H5.2z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/LayFlatOnFace.svg b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg
index 1f2b42f6fe..1032567d83 100755
--- a/resources/themes/cura-light/icons/default/LayFlatOnFace.svg
+++ b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M5,5h6v6H5V5z M11,19H5v-6h6V19z
-	 M19,19h-6v-6h6V19z"/>
+	 M19,19h-6v-6h6V19z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Layers.svg b/resources/themes/cura-light/icons/default/Layers.svg
index b4f488f007..047c0f94e7 100755
--- a/resources/themes/cura-light/icons/default/Layers.svg
+++ b/resources/themes/cura-light/icons/default/Layers.svg
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M12,5l7,4l-7,4L5,9L12,5 M2.5,9.9l8.5,4.9c0.6,0.4,1.4,0.4,2,0l8.5-4.9c0.7-0.4,0.7-1.4,0-1.7L13,3.3c-0.6-0.4-1.4-0.4-2,0
-		L2.5,8.1C1.8,8.5,1.8,9.5,2.5,9.9z"/>
-	<path d="M21.5,14.1l-2.7-1.6l-2,1.2L19,15l-7,4l-7-4l2.2-1.3l-2-1.2l-2.7,1.6c-0.7,0.4-0.7,1.3,0,1.7l8.5,4.9c0.6,0.3,1.4,0.3,2,0
-		l8.5-4.9C22.2,15.5,22.2,14.5,21.5,14.1z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,5l7,4l-7,4L5,9L12,5 M2.5,9.9l8.5,4.9c0.6,0.4,1.4,0.4,2,0l8.5-4.9c0.7-0.4,0.7-1.4,0-1.7L13,3.3c-0.6-0.4-1.4-0.4-2,0
+	L2.5,8.1C1.8,8.5,1.8,9.5,2.5,9.9z" />
+<path d="M21.5,14.1l-2.7-1.6l-2,1.2L19,15l-7,4l-7-4l2.2-1.3l-2-1.2l-2.7,1.6c-0.7,0.4-0.7,1.3,0,1.7l8.5,4.9c0.6,0.3,1.4,0.3,2,0
+	l8.5-4.9C22.2,15.5,22.2,14.5,21.5,14.1z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Lightning.svg b/resources/themes/cura-light/icons/default/Lightning.svg
index 544fe86df1..6067de8d9a 100644
--- a/resources/themes/cura-light/icons/default/Lightning.svg
+++ b/resources/themes/cura-light/icons/default/Lightning.svg
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g id="Layer_1">
-	<path d="M8.012,20.879l0.86-6.876H4.923l9.3-11.625c0.63-0.788,1.898-0.252,1.773,0.749l-0.86,6.876h3.948l-9.3,11.625
-		C9.155,22.416,7.887,21.88,8.012,20.879z M9.085,12.003h2.052l-0.701,5.61l4.487-5.61h-2.052l0.701-5.61L9.085,12.003z"/>
-</g>
-<g id="Comments">
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M8.012,20.879l0.86-6.876H4.923l9.3-11.625c0.63-0.788,1.898-0.252,1.773,0.749l-0.86,6.876h3.948l-9.3,11.625
+	C9.155,22.416,7.887,21.88,8.012,20.879z M9.085,12.003h2.052l-0.701,5.61l4.487-5.61h-2.052l0.701-5.61L9.085,12.003z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Link.svg b/resources/themes/cura-light/icons/default/Link.svg
index 477d977f50..c6e37495aa 100755
--- a/resources/themes/cura-light/icons/default/Link.svg
+++ b/resources/themes/cura-light/icons/default/Link.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M19.8,11.3L17,14.1c-0.9,0.9-2.2,1.5-3.5,1.5c-1.3,0-2.6-0.5-3.5-1.5l1.4-1.4c1.1,1.1,3.1,1.1,4.2,0
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19.8,11.3L17,14.1c-0.9,0.9-2.2,1.5-3.5,1.5c-1.3,0-2.6-0.5-3.5-1.5l1.4-1.4c1.1,1.1,3.1,1.1,4.2,0
 	l2.8-2.8c1.2-1.2,1.2-3.1,0-4.2c-1.2-1.2-3.1-1.2-4.2,0L12.7,7l-1.4-1.4l1.4-1.4c1.9-1.9,5.1-1.9,7.1,0C21.7,6.2,21.7,9.3,19.8,11.3
 	z M9.9,18.4c-1.2,1.2-3.1,1.2-4.2,0c-1.2-1.2-1.2-3.1,0-4.2l2.8-2.8c1.1-1.1,3.1-1.1,4.2,0l1.4-1.4c-0.9-0.9-2.2-1.5-3.5-1.5
 	C9.3,8.4,8,8.9,7.1,9.9l-2.8,2.8c-0.9,0.9-1.5,2.2-1.5,3.5c0,1.3,0.5,2.6,1.5,3.5c1,1,2.3,1.5,3.5,1.5c1.3,0,2.6-0.5,3.5-1.5
-	l1.4-1.4L11.3,17L9.9,18.4z"/>
+	l1.4-1.4L11.3,17L9.9,18.4z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/LinkExternal.svg b/resources/themes/cura-light/icons/default/LinkExternal.svg
index 57e9079a30..59c4ddea10 100755
--- a/resources/themes/cura-light/icons/default/LinkExternal.svg
+++ b/resources/themes/cura-light/icons/default/LinkExternal.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M19.3,13h2v5c0,1.7-1.3,3-3,3h-12c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h5v2h-6v14h14V13z M14.3,3v2
-	h3.6l-8.3,8.3l1.4,1.4l8.3-8.3V10h2V3H14.3z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19.3,13h2v5c0,1.7-1.3,3-3,3h-12c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h5v2h-6v14h14V13z M14.3,3v2
+	h3.6l-8.3,8.3l1.4,1.4l8.3-8.3V10h2V3H14.3z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Magnifier.svg b/resources/themes/cura-light/icons/default/Magnifier.svg
index 5edba462f1..d3769a3801 100755
--- a/resources/themes/cura-light/icons/default/Magnifier.svg
+++ b/resources/themes/cura-light/icons/default/Magnifier.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M15,2c-3.9,0-7,3.1-7,7c0,1.6,0.5,3,1.4,4.2L2,20.6L3.4,22l7.4-7.4C12,15.5,13.4,16,15,16
-	c3.9,0,7-3.1,7-7S18.9,2,15,2z M15,14c-2.8,0-5-2.2-5-5s2.2-5,5-5s5,2.2,5,5S17.8,14,15,14z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M15,2c-3.9,0-7,3.1-7,7c0,1.6,0.5,3,1.4,4.2L2,20.6L3.4,22l7.4-7.4C12,15.5,13.4,16,15,16
+	c3.9,0,7-3.1,7-7S18.9,2,15,2z M15,14c-2.8,0-5-2.2-5-5s2.2-5,5-5s5,2.2,5,5S17.8,14,15,14z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/MeshType.svg b/resources/themes/cura-light/icons/default/MeshType.svg
index fa164ef885..062dd9c258 100755
--- a/resources/themes/cura-light/icons/default/MeshType.svg
+++ b/resources/themes/cura-light/icons/default/MeshType.svg
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M6,3C4.3,3,3,4.3,3,6v5h8V3H6z M9,5v4H5V5H9z"/>
-	<path d="M18,21c1.7,0,3-1.3,3-3v-5h-8v8H18z M15,19v-4h4v4H15z"/>
-	<path d="M3,13v5c0,1.7,1.3,3,3,3h5v-8H3z"/>
-	<polygon points="14.6,3 13,4.6 13,7.4 17.4,3 	"/>
-	<polygon points="19.4,11 21,9.4 21,6.6 16.6,11 	"/>
-	<path d="M20.7,4.7L14.4,11H13V9.6l6.3-6.3C19.9,3.6,20.4,4.1,20.7,4.7z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M6,3C4.3,3,3,4.3,3,6v5h8V3H6z M9,5v4H5V5H9z" />
+<path d="M18,21c1.7,0,3-1.3,3-3v-5h-8v8H18z M15,19v-4h4v4H15z" />
+<path d="M3,13v5c0,1.7,1.3,3,3,3h5v-8H3z" />
+<polygon points="14.6,3 13,4.6 13,7.4 17.4,3" />
+<polygon points="19.4,11 21,9.4 21,6.6 16.6,11" />
+<path d="M20.7,4.7L14.4,11H13V9.6l6.3-6.3C19.9,3.6,20.4,4.1,20.7,4.7z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg
index 0f98747442..3f1fb572c3 100755
--- a/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg
+++ b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path d="M17,7V3H6C4.3,3,3,4.3,3,6v11h4v4h11c1.7,0,3-1.3,3-3V7H17z M7,15H5V5h10v2H7V15z M15,9v6H9V9H15z M19,19H9v-2h8V9h2V19z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M17,7V3H6C4.3,3,3,4.3,3,6v11h4v4h11c1.7,0,3-1.3,3-3V7H17z M7,15H5V5h10v2H7V15z M15,9v6H9V9H15z M19,19H9v-2h8V9h2V19z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/MeshTypeNormal.svg b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg
index d33ab09dda..d09c93fb48 100755
--- a/resources/themes/cura-light/icons/default/MeshTypeNormal.svg
+++ b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14V5H5V19z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14V5H5V19z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/MeshTypeSupport.svg b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg
index e9a6d5b095..67035a7a16 100755
--- a/resources/themes/cura-light/icons/default/MeshTypeSupport.svg
+++ b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M3,6v12c0,1.3,0.8,2.4,2,2.8V19V5V3.2C3.8,3.6,3,4.7,3,6z"/>
-	<path d="M19,3.2L19,5v14v1.8c1.2-0.4,2-1.5,2-2.8V6C21,4.7,20.2,3.6,19,3.2z"/>
-	<rect x="7" y="3" width="2" height="18"/>
-	<rect x="11" y="3" width="2" height="18"/>
-	<rect x="15" y="3" width="2" height="18"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M3,6v12c0,1.3,0.8,2.4,2,2.8V19V5V3.2C3.8,3.6,3,4.7,3,6z" />
+<path d="M19,3.2L19,5v14v1.8c1.2-0.4,2-1.5,2-2.8V6C21,4.7,20.2,3.6,19,3.2z" />
+<rect x="7" y="3" width="2" height="18" />
+<rect x="11" y="3" width="2" height="18" />
+<rect x="15" y="3" width="2" height="18" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Minus.svg b/resources/themes/cura-light/icons/default/Minus.svg
index ebb380a3fa..86f48d6338 100755
--- a/resources/themes/cura-light/icons/default/Minus.svg
+++ b/resources/themes/cura-light/icons/default/Minus.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<rect x="4" y="11" width="16" height="2"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<rect x="4" y="11" width="16" height="2" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Mirror.svg b/resources/themes/cura-light/icons/default/Mirror.svg
index cec1fddc84..0381a6447e 100755
--- a/resources/themes/cura-light/icons/default/Mirror.svg
+++ b/resources/themes/cura-light/icons/default/Mirror.svg
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M3.7,6.3C3.1,5.7,2,6.1,2,7v10c0,0.9,1.1,1.3,1.7,0.7l5-5c0.4-0.4,0.4-1,0-1.4L3.7,6.3z M4,14.6V9.4L6.6,12L4,14.6z"/>
-	<path d="M20.3,6.3l-5,5c-0.4,0.4-0.4,1,0,1.4l5,5c0.6,0.6,1.7,0.2,1.7-0.7V7C22,6.1,20.9,5.7,20.3,6.3z"/>
-	<circle cx="12" cy="8" r="1"/>
-	<circle cx="12" cy="4" r="1"/>
-	<circle cx="12" cy="12" r="1"/>
-	<circle cx="12" cy="16" r="1"/>
-	<circle cx="12" cy="20" r="1"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M3.7,6.3C3.1,5.7,2,6.1,2,7v10c0,0.9,1.1,1.3,1.7,0.7l5-5c0.4-0.4,0.4-1,0-1.4L3.7,6.3z M4,14.6V9.4L6.6,12L4,14.6z" />
+<path d="M20.3,6.3l-5,5c-0.4,0.4-0.4,1,0,1.4l5,5c0.6,0.6,1.7,0.2,1.7-0.7V7C22,6.1,20.9,5.7,20.3,6.3z" />
+<circle cx="12" cy="8" r="1" />
+<circle cx="12" cy="4" r="1" />
+<circle cx="12" cy="12" r="1" />
+<circle cx="12" cy="16" r="1" />
+<circle cx="12" cy="20" r="1" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Pen.svg b/resources/themes/cura-light/icons/default/Pen.svg
index bf57f90e6f..14f6a4daf9 100755
--- a/resources/themes/cura-light/icons/default/Pen.svg
+++ b/resources/themes/cura-light/icons/default/Pen.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M3,19h18v2H3V19z M21,5.8L18.2,3L7,14.2V17h2.8L21,5.8z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M3,19h18v2H3V19z M21,5.8L18.2,3L7,14.2V17h2.8L21,5.8z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Plugin.svg b/resources/themes/cura-light/icons/default/Plugin.svg
index 95db5e876a..9f497f6d57 100755
--- a/resources/themes/cura-light/icons/default/Plugin.svg
+++ b/resources/themes/cura-light/icons/default/Plugin.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M19,8V4h-6v4h-2V4H5v4h0c-1.7,0-3,1.3-3,3v6c0,1.7,1.3,3,3,3h14c1.7,0,3-1.3,3-3v-6
-	C22,9.3,20.7,8,19,8L19,8z M15,6h2v2c-0.6,0-1.3,0-2,0V6z M7,6h2v2C8.3,8,7.6,8,7,8V6z M20,18H4v-8h16V18z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M19,8V4h-6v4h-2V4H5v4h0c-1.7,0-3,1.3-3,3v6c0,1.7,1.3,3,3,3h14c1.7,0,3-1.3,3-3v-6
+	C22,9.3,20.7,8,19,8L19,8z M15,6h2v2c-0.6,0-1.3,0-2,0V6z M7,6h2v2C8.3,8,7.6,8,7,8V6z M20,18H4v-8h16V18z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Plus.svg b/resources/themes/cura-light/icons/default/Plus.svg
index ec8319b336..9c6d4724c6 100755
--- a/resources/themes/cura-light/icons/default/Plus.svg
+++ b/resources/themes/cura-light/icons/default/Plus.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon style="fill:#000E1A;" points="21,11 13,11 13,3 11,3 11,11 3,11 3,13 11,13 11,21 13,21 13,13 21,13 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="21,11 13,11 13,3 11,3 11,11 3,11 3,13 11,13 11,21 13,21 13,13 21,13" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/PrintQuality.svg b/resources/themes/cura-light/icons/default/PrintQuality.svg
index 59eeb25c1e..96574bcfc7 100755
--- a/resources/themes/cura-light/icons/default/PrintQuality.svg
+++ b/resources/themes/cura-light/icons/default/PrintQuality.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<rect x="3" y="3" style="fill:#000E1A;" width="5" height="2"/>
-	<rect x="3" y="8" style="fill:#000E1A;" width="11" height="4"/>
-	<rect x="3" y="15" style="fill:#000E1A;" width="18" height="6"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<rect x="3" y="3" width="5" height="2" />
+<rect x="3" y="8" width="11" height="4" />
+<rect x="3" y="15" width="18" height="6" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/PrintShell.svg b/resources/themes/cura-light/icons/default/PrintShell.svg
index 66291153a2..0de1453978 100755
--- a/resources/themes/cura-light/icons/default/PrintShell.svg
+++ b/resources/themes/cura-light/icons/default/PrintShell.svg
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path style="fill:#000E1A;" d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M19,19H5V5
-		h14V19z"/>
-	<circle style="fill:#000E1A;" cx="8" cy="8" r="1"/>
-	<circle style="fill:#000E1A;" cx="12" cy="8" r="1"/>
-	<circle style="fill:#000E1A;" cx="16" cy="8" r="1"/>
-	<circle style="fill:#000E1A;" cx="16" cy="12" r="1"/>
-	<circle style="fill:#000E1A;" cx="16" cy="16" r="1"/>
-	<circle style="fill:#000E1A;" cx="12" cy="16" r="1"/>
-	<circle style="fill:#000E1A;" cx="8" cy="16" r="1"/>
-	<circle style="fill:#000E1A;" cx="8" cy="12" r="1"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,3H6C4.3,3,3,4.3,3,6v12c0,1.7,1.3,3,3,3h12c1.7,0,3-1.3,3-3V6C21,4.3,19.7,3,18,3z M19,19H5V5h14V19z" />
+<circle cx="8" cy="8" r="1" />
+<circle cx="12" cy="8" r="1" />
+<circle cx="16" cy="8" r="1" />
+<circle cx="16" cy="12" r="1" />
+<circle cx="16" cy="16" r="1" />
+<circle cx="12" cy="16" r="1" />
+<circle cx="8" cy="16" r="1" />
+<circle cx="8" cy="12" r="1" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/PrintTopBottom.svg b/resources/themes/cura-light/icons/default/PrintTopBottom.svg
index 2ac2e241e0..97d66fd19c 100644
--- a/resources/themes/cura-light/icons/default/PrintTopBottom.svg
+++ b/resources/themes/cura-light/icons/default/PrintTopBottom.svg
@@ -1,10 +1,10 @@
-<svg id="ICONS2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <circle cx="10" cy="8" r="1"/><circle cx="14" cy="8" r="1"/>
-    <circle cx="18" cy="8" r="1"/><circle cx="18" cy="16" r="1"/>
-    <circle cx="14" cy="16" r="1"/>
-    <circle cx="10" cy="16" r="1"/>
-    <circle cx="6" cy="16" r="1"/>
-    <circle cx="6" cy="8" r="1"/>
-    <path d="M6,5H20.82A3,3,0,0,0,18,3H6A3,3,0,0,0,3.18,5Z"/>
-    <path d="M19,19H3.18A3,3,0,0,0,6,21H18a3,3,0,0,0,2.82-2Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<circle cx="10" cy="8" r="1" /><circle cx="14" cy="8" r="1" />
+<circle cx="18" cy="8" r="1" /><circle cx="18" cy="16" r="1" />
+<circle cx="14" cy="16" r="1" />
+<circle cx="10" cy="16" r="1" />
+<circle cx="6" cy="16" r="1" />
+<circle cx="6" cy="8" r="1" />
+<path d="M6,5H20.82A3,3,0,0,0,18,3H6A3,3,0,0,0,3.18,5Z" />
+<path d="M19,19H3.18A3,3,0,0,0,6,21H18a3,3,0,0,0,2.82-2Z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/PrintTravel.svg b/resources/themes/cura-light/icons/default/PrintTravel.svg
index cd2f5a8602..9c0099b3bb 100755
--- a/resources/themes/cura-light/icons/default/PrintTravel.svg
+++ b/resources/themes/cura-light/icons/default/PrintTravel.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M13,3v4.5l4,2.7l4-2.7V3H13z M19,6.5l-2,1.3l-2-1.3V5h4V6.5z"/>
-	<path d="M22,18c0,1.7-1.3,3-3,3H2v-2h17c0.5,0,1-0.5,1-1s-0.5-1-1-1H5c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3h10v2H5c-0.5,0-1,0.5-1,1
-		s0.5,1,1,1h14C20.7,15,22,16.3,22,18z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M13,3v4.5l4,2.7l4-2.7V3H13z M19,6.5l-2,1.3l-2-1.3V5h4V6.5z" />
+<path d="M22,18c0,1.7-1.3,3-3,3H2v-2h17c0.5,0,1-0.5,1-1s-0.5-1-1-1H5c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3h10v2H5c-0.5,0-1,0.5-1,1
+	s0.5,1,1,1h14C20.7,15,22,16.3,22,18z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Printer.svg b/resources/themes/cura-light/icons/default/Printer.svg
index f5f1a50cce..1c2686d68c 100755
--- a/resources/themes/cura-light/icons/default/Printer.svg
+++ b/resources/themes/cura-light/icons/default/Printer.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M21,21h-4.4l-2-2H9.4l-2,2H3V3h18V21z M17.4,19H19V5H5v14h1.6l2-2h6.8L17.4,19z M16,13H8v2h8V13z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M21,21h-4.4l-2-2H9.4l-2,2H3V3h18V21z M17.4,19H19V5H5v14h1.6l2-2h6.8L17.4,19z M16,13H8v2h8V13z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/PrinterTriple.svg b/resources/themes/cura-light/icons/default/PrinterTriple.svg
index 4530fad98e..b3da9b3c2f 100755
--- a/resources/themes/cura-light/icons/default/PrinterTriple.svg
+++ b/resources/themes/cura-light/icons/default/PrinterTriple.svg
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path style="fill:#000E1A;" d="M5,20h3.8l2-2h2.3l2,2H19V4H5V20z M7,6h10v12h-1l-2-2h-4l-2,2H7V6z"/>
-	<rect x="9" y="12" style="fill:#000E1A;" width="6" height="2"/>
-	<rect x="20" y="6" style="fill:#000E1A;" width="2" height="12"/>
-	<rect x="2" y="6" style="fill:#000E1A;" width="2" height="12"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M5,20h3.8l2-2h2.3l2,2H19V4H5V20z M7,6h10v12h-1l-2-2h-4l-2,2H7V6z" />
+<rect x="9" y="12" width="6" height="2" />
+<rect x="20" y="6" width="2" height="12" />
+<rect x="2" y="6" width="2" height="12" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Quick.svg b/resources/themes/cura-light/icons/default/Quick.svg
index 25a5ee0af5..350f9d8a90 100755
--- a/resources/themes/cura-light/icons/default/Quick.svg
+++ b/resources/themes/cura-light/icons/default/Quick.svg
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M20.7,4.7l-16,16c-0.6-0.3-1.1-0.8-1.4-1.4l16-16C19.9,3.6,20.4,4.1,20.7,4.7z"/>
-	<polygon points="16.4,3 3,16.4 3,13.6 13.6,3 	"/>
-	<polygon points="10.4,3 3,10.4 3,7.6 7.6,3 	"/>
-	<polygon points="21,13.6 21,16.4 16.4,21 13.6,21 	"/>
-	<polygon points="21,7.6 21,10.4 10.4,21 7.6,21 	"/>
-	<polygon points="10.4,3 3,10.4 3,7.6 7.6,3 	"/>
-	<polygon points="16.4,3 3,16.4 3,13.6 13.6,3 	"/>
-	<path d="M20.7,4.7l-16,16c-0.6-0.3-1.1-0.8-1.4-1.4l16-16C19.9,3.6,20.4,4.1,20.7,4.7z"/>
-	<polygon points="21,7.6 21,10.4 10.4,21 7.6,21 	"/>
-	<polygon points="21,13.6 21,16.4 16.4,21 13.6,21 	"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M20.7,4.7l-16,16c-0.6-0.3-1.1-0.8-1.4-1.4l16-16C19.9,3.6,20.4,4.1,20.7,4.7z" />
+<polygon points="16.4,3 3,16.4 3,13.6 13.6,3" />
+<polygon points="10.4,3 3,10.4 3,7.6 7.6,3" />
+<polygon points="21,13.6 21,16.4 16.4,21 13.6,21" />
+<polygon points="21,7.6 21,10.4 10.4,21 7.6,21" />
+<polygon points="10.4,3 3,10.4 3,7.6 7.6,3" />
+<polygon points="16.4,3 3,16.4 3,13.6 13.6,3" />
+<path d="M20.7,4.7l-16,16c-0.6-0.3-1.1-0.8-1.4-1.4l16-16C19.9,3.6,20.4,4.1,20.7,4.7z" />
+<polygon points="21,7.6 21,10.4 10.4,21 7.6,21" />
+<polygon points="21,13.6 21,16.4 16.4,21 13.6,21" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Rotate.svg b/resources/themes/cura-light/icons/default/Rotate.svg
index 0b294e399b..b3b7f767f1 100755
--- a/resources/themes/cura-light/icons/default/Rotate.svg
+++ b/resources/themes/cura-light/icons/default/Rotate.svg
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M11.9,3c-2.2,0-4.4,0.8-6,2.3V2h-2v7h7V7H7c1.3-1.3,3-2,4.9-2c3.9,0,7,3.1,7,7c0,0.5,0.5,1,1,1s1-0.5,1-1
-		C20.9,7,16.9,3,11.9,3z"/>
-	<path d="M4.9,16c-0.5,0.3-0.5,1-0.2,1.4c0,0,0,0,0,0c0.2,0.3,0.5,0.4,0.8,0.4c0.2,0,0.4-0.1,0.6-0.2c0.5-0.3,0.5-1,0.2-1.4
-		C6,15.8,5.4,15.7,4.9,16z"/>
-	<path d="M5,13c-0.1-0.6-0.6-0.9-1.1-0.9c-0.5,0.1-0.9,0.6-0.8,1.1c0.1,0.5,0.5,0.9,1,0.9c0,0,0.1,0,0.1,0C4.7,14,5.1,13.5,5,13z"/>
-	<path d="M9,18.4c-0.5-0.2-1.1,0-1.3,0.5c-0.2,0.5,0,1.1,0.5,1.3c0.1,0.1,0.3,0.1,0.4,0.1c0.4,0,0.8-0.2,0.9-0.6
-		C9.7,19.2,9.5,18.6,9,18.4z"/>
-	<path d="M19.4,15c-0.5-0.3-1.1-0.1-1.4,0.4c-0.3,0.5-0.1,1.1,0.4,1.4c0.1,0.1,0.3,0.1,0.5,0.1c0.4,0,0.7-0.2,0.9-0.5
-		C20.1,15.8,19.9,15.2,19.4,15z"/>
-	<path d="M15.7,17.9c-0.5,0.3-0.6,0.9-0.3,1.4c0.2,0.3,0.5,0.5,0.9,0.5c0.2,0,0.4-0.1,0.5-0.2c0.5-0.3,0.6-0.9,0.3-1.4
-		C16.8,17.7,16.2,17.6,15.7,17.9z"/>
-	<path d="M12.4,19c-0.5,0-1,0.5-0.9,1.1c0,0.5,0.5,0.9,1,0.9c0,0,0.1,0,0.1,0c0.5,0,1-0.5,0.9-1.1C13.5,19.4,13,18.9,12.4,19z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M11.9,3c-2.2,0-4.4,0.8-6,2.3V2h-2v7h7V7H7c1.3-1.3,3-2,4.9-2c3.9,0,7,3.1,7,7c0,0.5,0.5,1,1,1s1-0.5,1-1
+	C20.9,7,16.9,3,11.9,3z" />
+<path d="M4.9,16c-0.5,0.3-0.5,1-0.2,1.4c0,0,0,0,0,0c0.2,0.3,0.5,0.4,0.8,0.4c0.2,0,0.4-0.1,0.6-0.2c0.5-0.3,0.5-1,0.2-1.4
+	C6,15.8,5.4,15.7,4.9,16z" />
+<path d="M5,13c-0.1-0.6-0.6-0.9-1.1-0.9c-0.5,0.1-0.9,0.6-0.8,1.1c0.1,0.5,0.5,0.9,1,0.9c0,0,0.1,0,0.1,0C4.7,14,5.1,13.5,5,13z" />
+<path d="M9,18.4c-0.5-0.2-1.1,0-1.3,0.5c-0.2,0.5,0,1.1,0.5,1.3c0.1,0.1,0.3,0.1,0.4,0.1c0.4,0,0.8-0.2,0.9-0.6
+	C9.7,19.2,9.5,18.6,9,18.4z" />
+<path d="M19.4,15c-0.5-0.3-1.1-0.1-1.4,0.4c-0.3,0.5-0.1,1.1,0.4,1.4c0.1,0.1,0.3,0.1,0.5,0.1c0.4,0,0.7-0.2,0.9-0.5
+	C20.1,15.8,19.9,15.2,19.4,15z" />
+<path d="M15.7,17.9c-0.5,0.3-0.6,0.9-0.3,1.4c0.2,0.3,0.5,0.5,0.9,0.5c0.2,0,0.4-0.1,0.5-0.2c0.5-0.3,0.6-0.9,0.3-1.4
+	C16.8,17.7,16.2,17.6,15.7,17.9z" />
+<path d="M12.4,19c-0.5,0-1,0.5-0.9,1.1c0,0.5,0.5,0.9,1,0.9c0,0,0.1,0,0.1,0c0.5,0,1-0.5,0.9-1.1C13.5,19.4,13,18.9,12.4,19z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Scale.svg b/resources/themes/cura-light/icons/default/Scale.svg
index 35ae3ceb86..51df879f65 100755
--- a/resources/themes/cura-light/icons/default/Scale.svg
+++ b/resources/themes/cura-light/icons/default/Scale.svg
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M15,14h2V7h-7v2h3.6l-4,4H3v5c0,1.7,1.3,3,3,3h5v-6.6l4-4V14z M9,19H5v-4h4V19z"/>
-	<path d="M3,6v5h2V5h14v14h-6v2h5c1.7,0,3-1.3,3-3V6c0-1.7-1.3-3-3-3H6C4.3,3,3,4.3,3,6z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M15,14h2V7h-7v2h3.6l-4,4H3v5c0,1.7,1.3,3,3,3h5v-6.6l4-4V14z M9,19H5v-4h4V19z" />
+<path d="M3,6v5h2V5h14v14h-6v2h5c1.7,0,3-1.3,3-3V6c0-1.7-1.3-3-3-3H6C4.3,3,3,4.3,3,6z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ScaleMax.svg b/resources/themes/cura-light/icons/default/ScaleMax.svg
index ea264786d3..be175f69b3 100755
--- a/resources/themes/cura-light/icons/default/ScaleMax.svg
+++ b/resources/themes/cura-light/icons/default/ScaleMax.svg
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<polygon points="15,14 17,14 17,7 10,7 10,9 13.6,9 3.3,19.3 4.7,20.7 15,10.4 	"/>
-	<path d="M3,6v6h2V5h14v14h-7v2h6c1.7,0,3-1.3,3-3V6c0-1.7-1.3-3-3-3H6C4.3,3,3,4.3,3,6z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="15,14 17,14 17,7 10,7 10,9 13.6,9 3.3,19.3 4.7,20.7 15,10.4" />
+<path d="M3,6v6h2V5h14v14h-7v2h6c1.7,0,3-1.3,3-3V6c0-1.7-1.3-3-3-3H6C4.3,3,3,4.3,3,6z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Shield.svg b/resources/themes/cura-light/icons/default/Shield.svg
index d44cf8ea73..d8a731dcb1 100755
--- a/resources/themes/cura-light/icons/default/Shield.svg
+++ b/resources/themes/cura-light/icons/default/Shield.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M12,22.1l-0.4-0.2C11.3,21.8,4,18.6,4,12V4.2L12,2l8,2.3V12c0,6.6-7.3,9.8-7.6,9.9L12,22.1z M6,5.8
-	V12c0,4.5,4.6,7.2,6,7.9c1.4-0.7,6-3.4,6-7.9V5.8L12,4L6,5.8z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,22.1l-0.4-0.2C11.3,21.8,4,18.6,4,12V4.2L12,2l8,2.3V12c0,6.6-7.3,9.8-7.6,9.9L12,22.1z M6,5.8
+	V12c0,4.5,4.6,7.2,6,7.9c1.4-0.7,6-3.4,6-7.9V5.8L12,4L6,5.8z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Sliders.svg b/resources/themes/cura-light/icons/default/Sliders.svg
index 3b81f79e2b..1806c9268e 100755
--- a/resources/themes/cura-light/icons/default/Sliders.svg
+++ b/resources/themes/cura-light/icons/default/Sliders.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M17.8,5c-0.4-1.2-1.5-2-2.8-2s-2.4,0.8-2.8,2H3v2h9.2c0.4,1.2,1.5,2,2.8,2s2.4-0.8,2.8-2H21V5H17.8z
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M17.8,5c-0.4-1.2-1.5-2-2.8-2s-2.4,0.8-2.8,2H3v2h9.2c0.4,1.2,1.5,2,2.8,2s2.4-0.8,2.8-2H21V5H17.8z
 	 M15,7c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S15.6,7,15,7z M9,9c-1.3,0-2.4,0.8-2.8,2H3v2h3.2c0.4,1.2,1.5,2,2.8,2s2.4-0.8,2.8-2H21
 	v-2h-9.2C11.4,9.8,10.3,9,9,9z M9,13c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S9.6,13,9,13z M15,15c-1.3,0-2.4,0.8-2.8,2H3v2h9.2
 	c0.4,1.2,1.5,2,2.8,2s2.4-0.8,2.8-2H21v-2h-3.2C17.4,15.8,16.3,15,15,15z M15,19c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1
-	S15.6,19,15,19z"/>
+	S15.6,19,15,19z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Solid.svg b/resources/themes/cura-light/icons/default/Solid.svg
index ed44f367b3..34367b7bc7 100644
--- a/resources/themes/cura-light/icons/default/Solid.svg
+++ b/resources/themes/cura-light/icons/default/Solid.svg
@@ -1,11 +1,10 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-282 405.9 30 30">
-    <path fill="none" d="M-253.2 421.1l-13.6 13.6h.4l13.2-13.2zm0-2.2l-15.8 15.8h.4l15.4-15.4zm0 4.4l-11.4 11.4h.4l11-11zm0 2.2l-9.2 9.2h.4l8.8-8.8zm0 9.2v-.4l-.4.4zm0-4.8l-4.8 4.8h.4l4.4-4.4zm0 2.2l-2.6 2.6h.4l2.2-2.2zm0-4.4l-7 7h.4l6.6-6.6zm-14.5-20.6l-13.1 13.1v.4l13.5-13.5zm6.6 0l-19.7 19.7v.4l20.1-20.1zm-10.9 0l-8.8 8.7v.4l9.1-9.1zm2.1 0l-10.9 10.9v.4l11.3-11.3zm4.4 0l-15.3 15.3v.4l15.7-15.7zm-8.7 0l-6.6 6.6v.3l7-6.9zm-4.4 0l-2.2 2.2v.4l2.6-2.6zm-2.2 0v.4l.4-.4zm4.4 0l-4.4 4.4v.4l4.8-4.8zm23.2.9l-26.7 26.7h.4l26.3-26.3zm0 4.3l-22.3 22.4h.3l22-22zm0 2.2l-20.2 20.2h.4l19.8-19.8zm0-4.3l-24.5 24.5h.4l24.1-24.2zm-5.7-3.1l-21.9 21.9v.4l22.3-22.3zm5.7 9.6l-18 18h.4l17.6-17.6zm-1.3-9.6l-26.3 26.3v.4l26.7-26.7zm-2.2 0l-24.1 24.1v.4l24.5-24.5zm-6.6 0l-17.5 17.5v.4l17.9-17.9z"/>
-    <path d="M-280.4 407.1l-.4.4v1.8l2.2-2.2zm2.2 0l-2.6 2.6v1.8l4.4-4.4zm2.2 0l-4.8 4.8v1.8l6.6-6.6zm2.2 0l-7 6.9v1.8l8.8-8.7zm2.1 0l-9.1 9.1v1.8l10.9-10.9zm2.2 0l-11.3 11.3v1.8l13.1-13.1zm2.2 0l-13.5 13.5v1.8l15.3-15.3zm2.2 0l-15.7 15.7v1.8l17.5-17.5zm2.2 0l-17.9 17.9v1.8l19.7-19.7zm2.2 0l-20.1 20.1v1.8l21.9-21.9zm2.2 0l-22.3 22.3v1.8l24.1-24.1zm2.2 0l-24.5 24.5v1.8l26.3-26.3zM-282 435zm28.8-27.9h-.9l-26.7 26.7v.9h.9l26.7-26.7zm0 1.3l-26.3 26.3h1.8l24.5-24.5zm0 2.1l-24.1 24.2h1.8l22.3-22.4zm0 2.2l-22 22h1.8l20.2-20.2zm0 2.2l-19.8 19.8h1.8l18-18zm0 2.2l-17.6 17.6h1.8l15.8-15.8zm0 2.2l-15.4 15.4h1.8l13.6-13.6zm0 2.2l-13.2 13.2h1.8l11.4-11.4zm0 2.2l-11 11h1.8l9.2-9.2zm0 2.2l-8.8 8.8h1.8l7-7zm0 2.2l-6.6 6.6h1.8l4.8-4.8zm0 2.2l-4.4 4.4h1.8l2.6-2.6zm-2.2 4.4h1.8l.4-.4v-1.8zm-25.4-27.6h-1.2v1.6l1.2-1.2zm0 8.7l-1.2 1.2v.4l1.2-1.2zm0 6.6l-1.2 1.2v.4l1.2-1.2zm0-8.7l-1.2 1.2v.3l1.2-1.2zm0 4.3l-1.2 1.2v.4l1.2-1.2zm0-8.7l-1.2 1.2v.4l1.2-1.2zm0 2.2l-1.2 1.2v.4l1.2-1.2zm0 8.7l-1.2 1.2v.4l1.2-1.2zm0 13.6v-.4l-1.2 1.2v.1h.3zm0-4.8l-1.2 1.2v.4l1.2-1.2zm0 2.2l-1.2 1.2v.4l1.2-1.2zm0-6.6l-1.2 1.2v.4l1.2-1.2zm0 2.2l-1.2 1.2v.4l1.2-1.2z"/>
-    <path d="M-280.8 407.5l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.1l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm-.9 3.1h.9v-.9zm28.5-19.8l1.2-1.2v-.4l-1.2 1.2zm0 4.4l1.2-1.2v-.4l-1.2 1.2zm0-11.3v.4l1.2-1.2v-.1h-.3zm0 15.7l1.2-1.2v-.4l-1.2 1.2zm0-6.6l1.2-1.2v-.4l-1.2 1.2zm0-6.6l1.2-1.2v-.3l-1.2 1.2zm0 2.2l1.2-1.2v-.4l-1.2 1.2zm0 8.8l1.2-1.2v-.4l-1.2 1.2zm0 12.8v.4h1.2v-1.6zm0-8.4l1.2-1.2v-.4l-1.2 1.2zm0 2.2l1.2-1.2v-.4l-1.2 1.2zm0 4.4l1.2-1.2v-.4l-1.2 1.2zm0-2.2l1.2-1.2v-.4l-1.2 1.2z"/>
-    <path d="M-252.3 407.1h-.9v.9zm-.9 3.1l1.2-1.2v-1.8l-1.2 1.2zm0 2.1l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm-10.1-27.2h.4l1.2-1.2h-2.2l.9.9zm-2.2 0h.4l1.2-1.2h-2.2l.9.9zm-4.4 0h.4l1.2-1.2h-2.2l.9.9zm13.2 0h.4l1.2-1.2h-2.2l.9.9zm2.2 0h.4l.9-.9v-.3h-1.9l.9.9zm-4.4 0h.4l1.2-1.2h-2.2l.9.9zm-2.2 0h.4l1.2-1.2h-2.2l.9.9zm-19.3 0l1.2-1.2h-1.6v1.2zm4 0h.4l1.2-1.2h-2.2l.9.9z"/>
-    <path d="M-278.6 407.1h.4l1.2-1.2h-2.2l.9.9zm4.4 0h.4l1.2-1.2h-2.2l.9.9zm2.2 0h.3l1.2-1.2h-2.1l.9.9zm4.3 0h.4l1.2-1.2h-2.2l.9.9z"/>
-    <path d="M-278.6 407.1l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.1 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm1.3-.9l-.9.9h.9zm-28.8-.3h1.2v1.2h-1.2zm29.7 1.2h.3v-1.2h-.9l.9.9zm-.6-1.2h-.3v.3z"/>
-    <path d="M-253.2 407.1h.9l.3-.3-.9-.9-.3.3zm-13.2 27.6h-.4l-1.2 1.2h2.2l-.9-.9zm2.2 0h-.4l-1.2 1.2h2.2l-.9-.9zm-6.6 0h-.4l-1.2 1.2h2.2l-.9-.9zm2.2 0h-.4l-1.2 1.2h2.2l-.9-.9zm15 0l-1.2 1.2h1.6v-1.2zm-4 0h-.4l-1.2 1.2h2.2l-.9-.9zm-2.2 0h-.4l-1.2 1.2h2.2l-.9-.9zm4.4 0h-.4l-1.2 1.2h2.2l-.9-.9zm-17.6 0h-.4l-1.2 1.2h2.2l-.9-.9zm11 0h-.4l-1.2 1.2h2.2l-.9-.9zm-15.3 0h-.4l-1.2 1.2h2.2l-.9-.9zm2.1 0h-.3l-1.2 1.2h2.1l-.9-.9zm-4.3 0h-.4l-.9.9v.3h1.9l-.9-.9z"/>
-    <path d="M-280.8 435.6l.9-.9h-.9zm1.3-.9l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.1 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm-26.6 1.2h.9l-.9-.9zm0-1.2v.3l.3-.3zm.9 1.2h.3v-.3z"/>
-    <path d="M-280.8 434.7h-.9l-.3.3.9.9.3-.3zm27.6 0h1.2v1.2h-1.2z"/>
+<path d="M-280.4 407.1l-.4.4v1.8l2.2-2.2zm2.2 0l-2.6 2.6v1.8l4.4-4.4zm2.2 0l-4.8 4.8v1.8l6.6-6.6zm2.2 0l-7 6.9v1.8l8.8-8.7zm2.1 0l-9.1 9.1v1.8l10.9-10.9zm2.2 0l-11.3 11.3v1.8l13.1-13.1zm2.2 0l-13.5 13.5v1.8l15.3-15.3zm2.2 0l-15.7 15.7v1.8l17.5-17.5zm2.2 0l-17.9 17.9v1.8l19.7-19.7zm2.2 0l-20.1 20.1v1.8l21.9-21.9zm2.2 0l-22.3 22.3v1.8l24.1-24.1zm2.2 0l-24.5 24.5v1.8l26.3-26.3zM-282 435zm28.8-27.9h-.9l-26.7 26.7v.9h.9l26.7-26.7zm0 1.3l-26.3 26.3h1.8l24.5-24.5zm0 2.1l-24.1 24.2h1.8l22.3-22.4zm0 2.2l-22 22h1.8l20.2-20.2zm0 2.2l-19.8 19.8h1.8l18-18zm0 2.2l-17.6 17.6h1.8l15.8-15.8zm0 2.2l-15.4 15.4h1.8l13.6-13.6zm0 2.2l-13.2 13.2h1.8l11.4-11.4zm0 2.2l-11 11h1.8l9.2-9.2zm0 2.2l-8.8 8.8h1.8l7-7zm0 2.2l-6.6 6.6h1.8l4.8-4.8zm0 2.2l-4.4 4.4h1.8l2.6-2.6zm-2.2 4.4h1.8l.4-.4v-1.8zm-25.4-27.6h-1.2v1.6l1.2-1.2zm0 8.7l-1.2 1.2v.4l1.2-1.2zm0 6.6l-1.2 1.2v.4l1.2-1.2zm0-8.7l-1.2 1.2v.3l1.2-1.2zm0 4.3l-1.2 1.2v.4l1.2-1.2zm0-8.7l-1.2 1.2v.4l1.2-1.2zm0 2.2l-1.2 1.2v.4l1.2-1.2zm0 8.7l-1.2 1.2v.4l1.2-1.2zm0 13.6v-.4l-1.2 1.2v.1h.3zm0-4.8l-1.2 1.2v.4l1.2-1.2zm0 2.2l-1.2 1.2v.4l1.2-1.2zm0-6.6l-1.2 1.2v.4l1.2-1.2zm0 2.2l-1.2 1.2v.4l1.2-1.2z" />
+<path d="M-280.8 407.5l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.1l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm0 2.2l-1.2 1.2v1.8l1.2-1.2zm-.9 3.1h.9v-.9zm28.5-19.8l1.2-1.2v-.4l-1.2 1.2zm0 4.4l1.2-1.2v-.4l-1.2 1.2zm0-11.3v.4l1.2-1.2v-.1h-.3zm0 15.7l1.2-1.2v-.4l-1.2 1.2zm0-6.6l1.2-1.2v-.4l-1.2 1.2zm0-6.6l1.2-1.2v-.3l-1.2 1.2zm0 2.2l1.2-1.2v-.4l-1.2 1.2zm0 8.8l1.2-1.2v-.4l-1.2 1.2zm0 12.8v.4h1.2v-1.6zm0-8.4l1.2-1.2v-.4l-1.2 1.2zm0 2.2l1.2-1.2v-.4l-1.2 1.2zm0 4.4l1.2-1.2v-.4l-1.2 1.2zm0-2.2l1.2-1.2v-.4l-1.2 1.2z" />
+<path d="M-252.3 407.1h-.9v.9zm-.9 3.1l1.2-1.2v-1.8l-1.2 1.2zm0 2.1l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm0 2.2l1.2-1.2v-1.8l-1.2 1.2zm-10.1-27.2h.4l1.2-1.2h-2.2l.9.9zm-2.2 0h.4l1.2-1.2h-2.2l.9.9zm-4.4 0h.4l1.2-1.2h-2.2l.9.9zm13.2 0h.4l1.2-1.2h-2.2l.9.9zm2.2 0h.4l.9-.9v-.3h-1.9l.9.9zm-4.4 0h.4l1.2-1.2h-2.2l.9.9zm-2.2 0h.4l1.2-1.2h-2.2l.9.9zm-19.3 0l1.2-1.2h-1.6v1.2zm4 0h.4l1.2-1.2h-2.2l.9.9z" />
+<path d="M-278.6 407.1h.4l1.2-1.2h-2.2l.9.9zm4.4 0h.4l1.2-1.2h-2.2l.9.9zm2.2 0h.3l1.2-1.2h-2.1l.9.9zm4.3 0h.4l1.2-1.2h-2.2l.9.9z" />
+<path d="M-278.6 407.1l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.1 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm2.2 0l.3-.3-.9-.9-1.2 1.2zm1.3-.9l-.9.9h.9zm-28.8-.3h1.2v1.2h-1.2zm29.7 1.2h.3v-1.2h-.9l.9.9zm-.6-1.2h-.3v.3z" />
+<path d="M-253.2 407.1h.9l.3-.3-.9-.9-.3.3zm-13.2 27.6h-.4l-1.2 1.2h2.2l-.9-.9zm2.2 0h-.4l-1.2 1.2h2.2l-.9-.9zm-6.6 0h-.4l-1.2 1.2h2.2l-.9-.9zm2.2 0h-.4l-1.2 1.2h2.2l-.9-.9zm15 0l-1.2 1.2h1.6v-1.2zm-4 0h-.4l-1.2 1.2h2.2l-.9-.9zm-2.2 0h-.4l-1.2 1.2h2.2l-.9-.9zm4.4 0h-.4l-1.2 1.2h2.2l-.9-.9zm-17.6 0h-.4l-1.2 1.2h2.2l-.9-.9zm11 0h-.4l-1.2 1.2h2.2l-.9-.9zm-15.3 0h-.4l-1.2 1.2h2.2l-.9-.9zm2.1 0h-.3l-1.2 1.2h2.1l-.9-.9zm-4.3 0h-.4l-.9.9v.3h1.9l-.9-.9z" />
+<path d="M-280.8 435.6l.9-.9h-.9zm1.3-.9l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.1 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm2.2 0l-.3.3.9.9 1.2-1.2zm-26.6 1.2h.9l-.9-.9zm0-1.2v.3l.3-.3zm.9 1.2h.3v-.3z" />
+<path d="M-280.8 434.7h-.9l-.3.3.9.9.3-.3zm27.6 0h1.2v1.2h-1.2z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/SpeedOMeter.svg b/resources/themes/cura-light/icons/default/SpeedOMeter.svg
index 334ccb2309..12db5ec5a3 100755
--- a/resources/themes/cura-light/icons/default/SpeedOMeter.svg
+++ b/resources/themes/cura-light/icons/default/SpeedOMeter.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M4,14c0,2,0.7,3.9,2,5.3l-1.5,1.3C2.9,18.8,2,16.5,2,14C2,8.5,6.5,4,12,4c1.9,0,3.6,0.5,5.1,1.4
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M4,14c0,2,0.7,3.9,2,5.3l-1.5,1.3C2.9,18.8,2,16.5,2,14C2,8.5,6.5,4,12,4c1.9,0,3.6,0.5,5.1,1.4
 	l-1.5,1.5C14.5,6.3,13.3,6,12,6C7.6,6,4,9.6,4,14z M20.6,8.9l-1.5,1.5c0.5,1.1,0.9,2.3,0.9,3.6c0,2-0.7,3.9-2,5.3l1.5,1.3
 	c1.6-1.8,2.5-4.2,2.5-6.7C22,12.1,21.5,10.4,20.6,8.9z M19.7,7.7l-1.4-1.4l-5.8,5.8C12.3,12,12.2,12,12,12c-1.1,0-2,0.9-2,2
-	c0,1.1,0.9,2,2,2s2-0.9,2-2c0-0.2,0-0.3-0.1-0.5L19.7,7.7z"/>
+	c0,1.1,0.9,2,2,2s2-0.9,2-2c0-0.2,0-0.3-0.1-0.5L19.7,7.7z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Spool.svg b/resources/themes/cura-light/icons/default/Spool.svg
index aee874de6b..6b8f5e29ee 100755
--- a/resources/themes/cura-light/icons/default/Spool.svg
+++ b/resources/themes/cura-light/icons/default/Spool.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12v9h2v-3c1.8,2.4,4.7,4,8,4c5.5,0,10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,2C6.5,2,2,6.5,2,12v9h2v-3c1.8,2.4,4.7,4,8,4c5.5,0,10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
 	c-4.4,0-8-3.6-8-8s3.6-8,8-8s8,3.6,8,8S16.4,20,12,20z M12,9c-1.7,0-3,1.3-3,3s1.3,3,3,3s3-1.3,3-3S13.7,9,12,9z M12,13
-	c-0.6,0-1-0.4-1-1c0-0.6,0.4-1,1-1s1,0.4,1,1C13,12.6,12.6,13,12,13z M12,6c1.6,0,3.1,0.6,4.2,1.8l-1.4,1.4C14.1,8.4,13.1,8,12,8V6z
-	"/>
+	c-0.6,0-1-0.4-1-1c0-0.6,0.4-1,1-1s1,0.4,1,1C13,12.6,12.6,13,12,13z M12,6c1.6,0,3.1,0.6,4.2,1.8l-1.4,1.4C14.1,8.4,13.1,8,12,8V6z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Sputnik.svg b/resources/themes/cura-light/icons/default/Sputnik.svg
index 4b8341b0c5..a1449450ed 100755
--- a/resources/themes/cura-light/icons/default/Sputnik.svg
+++ b/resources/themes/cura-light/icons/default/Sputnik.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M22,8c0-1.6-0.6-3.1-1.8-4.2C19.1,2.6,17.6,2,16,2c-1.5,0-3,0.6-4.1,1.6L2.8,8.5
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M22,8c0-1.6-0.6-3.1-1.8-4.2C19.1,2.6,17.6,2,16,2c-1.5,0-3,0.6-4.1,1.6L2.8,8.5
 	C2.3,8.8,2.1,9.4,2.4,9.9c0.2,0.3,0.5,0.5,0.9,0.5c0.2,0,0.3,0,0.5-0.1l6.4-3.4C10,7.2,10,7.6,10,8c0,1.3,0.4,2.5,1.1,3.5l-5.7,5.7
 	c-0.4,0.4-0.4,1,0,1.4c0.2,0.2,0.5,0.3,0.7,0.3s0.5-0.1,0.7-0.3l5.7-5.7c1,0.7,2.2,1.1,3.5,1.1c0.4,0,0.8,0,1.1-0.1l-3.4,6.4
 	c-0.3,0.5-0.1,1.1,0.4,1.4c0.2,0.1,0.3,0.1,0.5,0.1c0.4,0,0.7-0.2,0.9-0.5l4.9-9.1C21.4,11,22,9.5,22,8z M14,11.4l2.7-2.7
 	c0.4-0.4,0.4-1,0-1.4s-1-0.4-1.4,0L12.6,10C12.2,9.4,12,8.7,12,8c0-1.1,0.4-2.1,1.2-2.8v0C13.9,4.4,14.9,4,16,4s2.1,0.4,2.8,1.2
-	C19.6,5.9,20,6.9,20,8s-0.4,2.1-1.2,2.8C18.1,11.6,17.1,12,16,12C15.3,12,14.6,11.8,14,11.4z"/>
+	C19.6,5.9,20,6.9,20,8s-0.4,2.1-1.2,2.8C18.1,11.6,17.1,12,16,12C15.3,12,14.6,11.8,14,11.4z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Star.svg b/resources/themes/cura-light/icons/default/Star.svg
index 3a23b9a1f3..8261bb72d5 100755
--- a/resources/themes/cura-light/icons/default/Star.svg
+++ b/resources/themes/cura-light/icons/default/Star.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M18,21.1l-6-3.2l-6,3.2l1.2-6.7L2.2,9.6l6.7-1l3-6.1l3,6.1l6.7,1l-4.9,4.8L18,21.1z M12,15.6l3.4,1.8
-	l-0.6-3.8l2.7-2.7l-3.8-0.5L12,7l-1.7,3.4L6.5,11l2.7,2.7l-0.6,3.8L12,15.6z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M18,21.1l-6-3.2l-6,3.2l1.2-6.7L2.2,9.6l6.7-1l3-6.1l3,6.1l6.7,1l-4.9,4.8L18,21.1z M12,15.6l3.4,1.8
+	l-0.6-3.8l2.7-2.7l-3.8-0.5L12,7l-1.7,3.4L6.5,11l2.7,2.7l-0.6,3.8L12,15.6z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/StarFilled.svg b/resources/themes/cura-light/icons/default/StarFilled.svg
index a0c7256800..1a265be109 100755
--- a/resources/themes/cura-light/icons/default/StarFilled.svg
+++ b/resources/themes/cura-light/icons/default/StarFilled.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<polygon points="16.9,14.3 18,21.1 12,17.9 6,21.1 7.1,14.3 2.2,9.6 9,8.6 12,2.5 15,8.6 21.8,9.6 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<polygon points="16.9,14.3 18,21.1 12,17.9 6,21.1 7.1,14.3 2.2,9.6 9,8.6 12,2.5 15,8.6 21.8,9.6" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Support.svg b/resources/themes/cura-light/icons/default/Support.svg
index 095e29547d..e53f845120 100755
--- a/resources/themes/cura-light/icons/default/Support.svg
+++ b/resources/themes/cura-light/icons/default/Support.svg
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M12,3.4l6,6l-6,6l-6-6L12,3.4 M5.3,7.3c-1.2,1.2-1.2,3.1,0,4.2l4.6,4.6c1.2,1.2,3.1,1.2,4.2,0l4.6-4.6
-		c1.2-1.2,1.2-3.1,0-4.2l-4.6-4.6c-1.2-1.2-3.1-1.2-4.2,0L5.3,7.3z"/>
-	<polygon points="21,11.8 21,21 19,21 19,13.8 	"/>
-	<polygon points="3,11.8 3,21 5,21 5,13.8 	"/>
-	<path d="M17,15.8V21h-2v-3.2c0.2-0.1,0.3-0.2,0.4-0.4L17,15.8z"/>
-	<path d="M13,18.7V21h-2v-2.3c0.3,0.1,0.7,0.1,1,0.1S12.7,18.8,13,18.7z"/>
-	<path d="M8.6,17.4c0.1,0.1,0.3,0.3,0.4,0.4V21H7v-5.2L8.6,17.4z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,3.4l6,6l-6,6l-6-6L12,3.4 M5.3,7.3c-1.2,1.2-1.2,3.1,0,4.2l4.6,4.6c1.2,1.2,3.1,1.2,4.2,0l4.6-4.6
+	c1.2-1.2,1.2-3.1,0-4.2l-4.6-4.6c-1.2-1.2-3.1-1.2-4.2,0L5.3,7.3z" />
+<polygon points="21,11.8 21,21 19,21 19,13.8" />
+<polygon points="3,11.8 3,21 5,21 5,13.8" />
+<path d="M17,15.8V21h-2v-3.2c0.2-0.1,0.3-0.2,0.4-0.4L17,15.8z" />
+<path d="M13,18.7V21h-2v-2.3c0.3,0.1,0.7,0.1,1,0.1S12.7,18.8,13,18.7z" />
+<path d="M8.6,17.4c0.1,0.1,0.3,0.3,0.4,0.4V21H7v-5.2L8.6,17.4z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/SupportBlocker.svg b/resources/themes/cura-light/icons/default/SupportBlocker.svg
index cd00c2c985..c947f09107 100755
--- a/resources/themes/cura-light/icons/default/SupportBlocker.svg
+++ b/resources/themes/cura-light/icons/default/SupportBlocker.svg
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M12,3.4l6,6l-6,6l-6-6L12,3.4 M5.3,7.3c-1.2,1.2-1.2,3.1,0,4.2l4.6,4.6c1.2,1.2,3.1,1.2,4.2,0l4.6-4.6
-		c1.2-1.2,1.2-3.1,0-4.2l-4.6-4.6c-1.2-1.2-3.1-1.2-4.2,0L5.3,7.3z"/>
-	<polygon points="20.4,18 22,19.6 20.6,21 19,19.4 17.4,21 16,19.6 17.6,18 16,16.4 17.4,15 19,16.6 20.6,15 22,16.4 	"/>
-	<polygon points="3,11.8 3,21 5,21 5,13.8 	"/>
-	<path d="M13,18.7V21h-2v-2.3c0.3,0.1,0.7,0.1,1,0.1S12.7,18.8,13,18.7z"/>
-	<path d="M8.6,17.4c0.1,0.1,0.3,0.3,0.4,0.4V21H7v-5.2L8.6,17.4z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M12,3.4l6,6l-6,6l-6-6L12,3.4 M5.3,7.3c-1.2,1.2-1.2,3.1,0,4.2l4.6,4.6c1.2,1.2,3.1,1.2,4.2,0l4.6-4.6
+	c1.2-1.2,1.2-3.1,0-4.2l-4.6-4.6c-1.2-1.2-3.1-1.2-4.2,0L5.3,7.3z" />
+<polygon points="20.4,18 22,19.6 20.6,21 19,19.4 17.4,21 16,19.6 17.6,18 16,16.4 17.4,15 19,16.6 20.6,15 22,16.4" />
+<polygon points="3,11.8 3,21 5,21 5,13.8" />
+<path d="M13,18.7V21h-2v-2.3c0.3,0.1,0.7,0.1,1,0.1S12.7,18.8,13,18.7z" />
+<path d="M8.6,17.4c0.1,0.1,0.3,0.3,0.4,0.4V21H7v-5.2L8.6,17.4z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ThreeDots.svg b/resources/themes/cura-light/icons/default/ThreeDots.svg
index 51e7214cbb..a73e40d056 100755
--- a/resources/themes/cura-light/icons/default/ThreeDots.svg
+++ b/resources/themes/cura-light/icons/default/ThreeDots.svg
@@ -1,5 +1,5 @@
-<svg id="ICONS2" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="1.5"/>
-    <circle cx="6" cy="12" r="1.5"/>
-    <circle cx="18" cy="12" r="1.5"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<circle cx="12" cy="12" r="1.5" />
+<circle cx="6" cy="12" r="1.5" />
+<circle cx="18" cy="12" r="1.5" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/UltimakerCura.svg b/resources/themes/cura-light/icons/default/UltimakerCura.svg
index d691f27bdd..79ea058674 100755
--- a/resources/themes/cura-light/icons/default/UltimakerCura.svg
+++ b/resources/themes/cura-light/icons/default/UltimakerCura.svg
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g>
-	<path d="M16.4,21H3V7.6L7.6,3H21v13.4L16.4,21z M5,19h10.6l3.4-3.4V5H8.4L5,8.4V19z"/>
-	<path d="M15,16h-3c-2.2,0-4-1.8-4-4s1.8-4,4-4h3v2h-3c-1.1,0-2,0.9-2,2s0.9,2,2,2h3V16z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M16.4,21H3V7.6L7.6,3H21v13.4L16.4,21z M5,19h10.6l3.4-3.4V5H8.4L5,8.4V19z" />
+<path d="M15,16h-3c-2.2,0-4-1.8-4-4s1.8-4,4-4h3v2h-3c-1.1,0-2,0.9-2,2s0.9,2,2,2h3V16z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/View3D.svg b/resources/themes/cura-light/icons/default/View3D.svg
index 5dd5146a24..abc38dba12 100755
--- a/resources/themes/cura-light/icons/default/View3D.svg
+++ b/resources/themes/cura-light/icons/default/View3D.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M20,6.3l-7-4C12.7,2.1,12.3,2,12,2s-0.7,0.1-1,0.3l-7,4C3.4,6.6,3,7.3,3,8v8c0,0.7,0.4,1.4,1,1.7l7,4c0.3,0.2,0.6,0.3,1,0.3
 	s0.7-0.1,1-0.3l7-4c0.6-0.4,1-1,1-1.7V8C21,7.3,20.6,6.6,20,6.3z M12,4l6,3.4l-6,3.4L6,7.4L12,4z M5,9.2l6,3.4v6.9L5,16V9.2z M19,16
-	l-6,3.4v-6.9l6-3.4V16z"/>
+	l-6,3.4v-6.9l6-3.4V16z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ViewFront.svg b/resources/themes/cura-light/icons/default/ViewFront.svg
index 8161a687b3..eca33b887c 100755
--- a/resources/themes/cura-light/icons/default/ViewFront.svg
+++ b/resources/themes/cura-light/icons/default/ViewFront.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M19,3H9C8.5,3,8,3.2,7.6,3.6l-4,4C3.2,8,3,8.5,3,9v10c0,1.1,0.9,2,2,2h10c0.5,0,1-0.2,1.4-0.6l4-4C20.8,16,21,15.5,21,15V5
-	C21,3.9,20.1,3,19,3z M6,8l3-3h9l-3,3H6z M19,15l-3,3v-8l3-3V15z"/>
+	C21,3.9,20.1,3,19,3z M6,8l3-3h9l-3,3H6z M19,15l-3,3v-8l3-3V15z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ViewLeft.svg b/resources/themes/cura-light/icons/default/ViewLeft.svg
index db84384ae9..72699d13f7 100755
--- a/resources/themes/cura-light/icons/default/ViewLeft.svg
+++ b/resources/themes/cura-light/icons/default/ViewLeft.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M3,5v10c0,0.5,0.2,1,0.6,1.4l4,4C8,20.8,8.5,21,9,21h10c1.1,0,2-0.9,2-2V9c0-0.5-0.2-1-0.6-1.4l-4-4C16,3.2,15.5,3,15,3H5
-	C3.9,3,3,3.9,3,5z M9,10h10v9H9V10z M6,5h9l3,3H9L6,5z"/>
+	C3.9,3,3,3.9,3,5z M9,10h10v9H9V10z M6,5h9l3,3H9L6,5z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ViewRight.svg b/resources/themes/cura-light/icons/default/ViewRight.svg
index 2212dc9ee1..2188144461 100755
--- a/resources/themes/cura-light/icons/default/ViewRight.svg
+++ b/resources/themes/cura-light/icons/default/ViewRight.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M19,3H9C8.5,3,8,3.2,7.6,3.6l-4,4C3.2,8,3,8.5,3,9v10c0,1.1,0.9,2,2,2h10c0.5,0,1-0.2,1.4-0.6l4-4C20.8,16,21,15.5,21,15V5
-	C21,3.9,20.1,3,19,3z M15,19H5v-9h10V19z M15,8H6l3-3h9L15,8z"/>
+	C21,3.9,20.1,3,19,3z M15,19H5v-9h10V19z M15,8H6l3-3h9L15,8z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/ViewTop.svg b/resources/themes/cura-light/icons/default/ViewTop.svg
index c70e3f0d81..f7365fc525 100755
--- a/resources/themes/cura-light/icons/default/ViewTop.svg
+++ b/resources/themes/cura-light/icons/default/ViewTop.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 <path d="M19,3H9C8.5,3,8,3.2,7.6,3.6l-4,4C3.2,8,3,8.5,3,9v10c0,1.1,0.9,2,2,2h10c0.5,0,1-0.2,1.4-0.6l4-4C20.8,16,21,15.5,21,15V5
-	C21,3.9,20.1,3,19,3z M14,19H5v-9h9V19z M19,15l-3,3V9.4l3-3V15z"/>
+	C21,3.9,20.1,3,19,3z M14,19H5v-9h9V19z M19,15l-3,3V9.4l3-3V15z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/default/Warning.svg b/resources/themes/cura-light/icons/default/Warning.svg
index 6105030fe6..256e8ede13 100755
--- a/resources/themes/cura-light/icons/default/Warning.svg
+++ b/resources/themes/cura-light/icons/default/Warning.svg
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path style="fill:#000E1A;" d="M22,18L13.7,3.1c-0.4-0.6-1-1-1.7-1s-1.4,0.4-1.7,1L2,18c-0.3,0.6-0.3,1.4,0,2c0.4,0.6,1,1,1.7,1
-	h16.6c0.7,0,1.4-0.4,1.7-1C22.4,19.4,22.4,18.7,22,18z M3.7,19L12,4.1L20.3,19H3.7z M11,8h2v6h-2V8z M13,18h-2v-2h2V18z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<path d="M22,18L13.7,3.1c-0.4-0.6-1-1-1.7-1s-1.4,0.4-1.7,1L2,18c-0.3,0.6-0.3,1.4,0,2c0.4,0.6,1,1,1.7,1
+	h16.6c0.7,0,1.4-0.4,1.7-1C22.4,19.4,22.4,18.7,22,18z M3.7,19L12,4.1L20.3,19H3.7z M11,8h2v6h-2V8z M13,18h-2v-2h2V18z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/low/CheckBlueBG.svg b/resources/themes/cura-light/icons/low/CheckBlueBG.svg
index a4c403598a..d4fa12a354 100644
--- a/resources/themes/cura-light/icons/low/CheckBlueBG.svg
+++ b/resources/themes/cura-light/icons/low/CheckBlueBG.svg
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 12 12" style="enable-background:new 0 0 12 12;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#196EF0;}
-</style>
-<path class="st0" d="M6,0C2.7,0,0,2.7,0,6s2.7,6,6,6s6-2.7,6-6S9.3,0,6,0z M5,9.4L2.3,6.7l1.4-1.4L5,6.6l3.3-3.3l1.4,1.4L5,9.4z"/>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
+<path fill="#196EF0" d="M6,0C2.7,0,0,2.7,0,6s2.7,6,6,6s6-2.7,6-6S9.3,0,6,0z M5,9.4L2.3,6.7l1.4-1.4L5,6.6l3.3-3.3l1.4,1.4L5,9.4z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/low/CloudBlueBG.svg b/resources/themes/cura-light/icons/low/CloudBlueBG.svg
index 7a43843dfd..a3c092992d 100644
--- a/resources/themes/cura-light/icons/low/CloudBlueBG.svg
+++ b/resources/themes/cura-light/icons/low/CloudBlueBG.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 12 12" style="enable-background:new 0 0 12 12;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#196EF0;}
-</style>
-<path class="st0" d="M6,0C2.7,0,0,2.7,0,6s2.7,6,6,6s6-2.7,6-6S9.3,0,6,0z M7,9H4C2.9,9,2,8.1,2,7s0.9-2,2-2c0.1,0,0.1,0,0.2,0
-	C4.6,3.8,5.7,3,7,3c1.7,0,3,1.3,3,3S8.7,9,7,9z"/>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
+<path fill="#196EF0" d="M6,0C2.7,0,0,2.7,0,6s2.7,6,6,6s6-2.7,6-6S9.3,0,6,0z M7,9H4C2.9,9,2,8.1,2,7s0.9-2,2-2c0.1,0,0.1,0,0.2,0
+	C4.6,3.8,5.7,3,7,3c1.7,0,3,1.3,3,3S8.7,9,7,9z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/low/CloudGreyBG.svg b/resources/themes/cura-light/icons/low/CloudGreyBG.svg
index aa2bba0467..0637dd7de9 100644
--- a/resources/themes/cura-light/icons/low/CloudGreyBG.svg
+++ b/resources/themes/cura-light/icons/low/CloudGreyBG.svg
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 12 12" style="enable-background:new 0 0 12 12;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#6C6C6C;}
-</style>
-<path class="st0" d="M6,0C2.7,0,0,2.7,0,6s2.7,6,6,6s6-2.7,6-6S9.3,0,6,0z M7,9H4C2.9,9,2,8.1,2,7s0.9-2,2-2c0.1,0,0.1,0,0.2,0
-	C4.6,3.8,5.7,3,7,3c1.7,0,3,1.3,3,3S8.7,9,7,9z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
+<path fill="#6C6C6C" d="M6,0C2.7,0,0,2.7,0,6s2.7,6,6,6s6-2.7,6-6S9.3,0,6,0z M7,9H4C2.9,9,2,8.1,2,7s0.9-2,2-2c0.1,0,0.1,0,0.2,0
+	C4.6,3.8,5.7,3,7,3c1.7,0,3,1.3,3,3S8.7,9,7,9z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/low/Dot.svg b/resources/themes/cura-light/icons/low/Dot.svg
index 79244caea4..188a487287 100644
--- a/resources/themes/cura-light/icons/low/Dot.svg
+++ b/resources/themes/cura-light/icons/low/Dot.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 415.582 415.582">
-    <circle cx="207.791" cy="207.791" r="207.791"/>
+    <circle cx="207.791" cy="207.791" r="207.791" />
 </svg>
diff --git a/resources/themes/cura-light/icons/medium/Extruder.svg b/resources/themes/cura-light/icons/medium/Extruder.svg
index 1849e8bfdd..e81c1d32b8 100644
--- a/resources/themes/cura-light/icons/medium/Extruder.svg
+++ b/resources/themes/cura-light/icons/medium/Extruder.svg
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<g id="Layer_1">
-	<g>
-		<g>
-			<path d="M15,3C8.37,3,3,8.37,3,15v11h2v-4.36C7.15,24.87,10.83,27,15,27c6.63,0,12-5.37,12-12S21.63,3,15,3z M15,25
-				C9.49,25,5,20.51,5,15S9.49,5,15,5s10,4.49,10,10S20.51,25,15,25z"/>
-		</g>
-	</g>
-</g>
-<g id="Comments">
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+<path d="M15,3C8.37,3,3,8.37,3,15v11h2v-4.36C7.15,24.87,10.83,27,15,27c6.63,0,12-5.37,12-12S21.63,3,15,3z M15,25
+	C9.49,25,5,20.51,5,15S9.49,5,15,5s10,4.49,10,10S20.51,25,15,25z" />
 </svg>
diff --git a/resources/themes/cura-light/icons/medium/PrinterTriple.svg b/resources/themes/cura-light/icons/medium/PrinterTriple.svg
index 9226bdfe11..37c9b012be 100644
--- a/resources/themes/cura-light/icons/medium/PrinterTriple.svg
+++ b/resources/themes/cura-light/icons/medium/PrinterTriple.svg
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<g id="Layer_1">
-	<g>
-		<path d="M24,25h-4.414l-2-2h-5.172l-2,2H6V5h18V25z M20.414,23H22V7H8v16h1.586l2-2h6.828L20.414,23z"/>
-		<rect x="11" y="17" width="8" height="2"/>
-		<polygon points="5,22 2,22 2,8 5,8 5,10 4,10 4,20 5,20 		"/>
-		<polygon points="28,22 25,22 25,20 26,20 26,10 25,10 25,8 28,8 		"/>
-	</g>
-</g>
-<g id="Comments">
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+<path d="M24,25h-4.414l-2-2h-5.172l-2,2H6V5h18V25z M20.414,23H22V7H8v16h1.586l2-2h6.828L20.414,23z" />
+<rect x="11" y="17" width="8" height="2" />
+<polygon points="5,22 2,22 2,8 5,8 5,10 4,10 4,20 5,20" />
+<polygon points="28,22 25,22 25,20 26,20 26,10 25,10 25,8 28,8" />
 </svg>