From a3dfd14c2a207fc4fca657ae5e021ef8bd5bdc9d Mon Sep 17 00:00:00 2001
From: carlopav <carlopav@gmail.com>
Date: Sun, 1 Mar 2020 22:09:33 +0100
Subject: [PATCH] [Gui] New Icons for HiddenLine and NoShading

Just an experiment, didn't try to compile
Gui: Changed icons in Draw Style menu

And also saved old icons in pure svg.
---
 src/Gui/CommandView.cpp               | 104 ++---
 src/Gui/Icons/DrawStyleAsIs.svg       | 529 +++++++++++---------------
 src/Gui/Icons/DrawStyleFlatLines.svg  | 302 +++++----------
 src/Gui/Icons/DrawStyleHiddenLine.svg | 124 ++++++
 src/Gui/Icons/DrawStyleNoShading.svg  | 124 ++++++
 src/Gui/Icons/DrawStylePoints.svg     | 340 +++++------------
 src/Gui/Icons/DrawStyleShaded.svg     | 242 ++++--------
 src/Gui/Icons/DrawStyleWireFrame.svg  | 212 ++++-------
 8 files changed, 860 insertions(+), 1117 deletions(-)
 create mode 100644 src/Gui/Icons/DrawStyleHiddenLine.svg
 create mode 100644 src/Gui/Icons/DrawStyleNoShading.svg

diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
index 2672074db6..6d8a8356b5 100644
--- a/src/Gui/CommandView.cpp
+++ b/src/Gui/CommandView.cpp
@@ -597,33 +597,33 @@ Gui::Action * StdCmdDrawStyle::createAction(void)
     a0->setShortcut(QKeySequence(QString::fromUtf8("V,1")));
     QAction* a1 = pcAction->addAction(QString());
     a1->setCheckable(true);
-    a1->setIcon(BitmapFactory().iconFromTheme("DrawStyleFlatLines"));
-    a1->setObjectName(QString::fromLatin1("Std_DrawStyleFlatLines"));
-    a1->setShortcut(QKeySequence(QString::fromUtf8("V,2")));
+    a1->setIcon(BitmapFactory().iconFromTheme("DrawStylePoints"));
+    a1->setObjectName(QString::fromLatin1("Std_DrawStylePoints"));
+    a1->setShortcut(QKeySequence(QString::fromUtf8("V,2")));    
     QAction* a2 = pcAction->addAction(QString());
     a2->setCheckable(true);
-    a2->setIcon(BitmapFactory().iconFromTheme("DrawStyleShaded"));
-    a2->setObjectName(QString::fromLatin1("Std_DrawStyleShaded"));
+    a2->setIcon(BitmapFactory().iconFromTheme("DrawStyleWireFrame"));
+    a2->setObjectName(QString::fromLatin1("Std_DrawStyleWireframe"));
     a2->setShortcut(QKeySequence(QString::fromUtf8("V,3")));
     QAction* a3 = pcAction->addAction(QString());
     a3->setCheckable(true);
-    a3->setIcon(BitmapFactory().iconFromTheme("DrawStyleWireFrame"));
-    a3->setObjectName(QString::fromLatin1("Std_DrawStyleWireframe"));
+    a3->setIcon(BitmapFactory().iconFromTheme("DrawStyleHiddenLine"));
+    a3->setObjectName(QString::fromLatin1("Std_DrawStyleHiddenLine"));
     a3->setShortcut(QKeySequence(QString::fromUtf8("V,4")));
     QAction* a4 = pcAction->addAction(QString());
     a4->setCheckable(true);
-    a4->setIcon(BitmapFactory().iconFromTheme("DrawStylePoints"));
-    a4->setObjectName(QString::fromLatin1("Std_DrawStylePoints"));
+    a4->setIcon(BitmapFactory().iconFromTheme("DrawStyleNoShading"));
+    a4->setObjectName(QString::fromLatin1("Std_DrawStyleNoShading"));
     a4->setShortcut(QKeySequence(QString::fromUtf8("V,5")));
     QAction* a5 = pcAction->addAction(QString());
     a5->setCheckable(true);
-    a5->setIcon(BitmapFactory().iconFromTheme("DrawStyleWireFrame"));
-    a5->setObjectName(QString::fromLatin1("Std_DrawStyleHiddenLine"));
+    a5->setIcon(BitmapFactory().iconFromTheme("DrawStyleShaded"));
+    a5->setObjectName(QString::fromLatin1("Std_DrawStyleShaded"));
     a5->setShortcut(QKeySequence(QString::fromUtf8("V,6")));
     QAction* a6 = pcAction->addAction(QString());
-    a6->setCheckable(true);
-    a6->setIcon(BitmapFactory().iconFromTheme("DrawStyleWireFrame"));
-    a6->setObjectName(QString::fromLatin1("Std_DrawStyleNoShading"));
+    a1->setCheckable(true);
+    a6->setIcon(BitmapFactory().iconFromTheme("DrawStyleFlatLines"));
+    a6->setObjectName(QString::fromLatin1("Std_DrawStyleFlatLines"));
     a6->setShortcut(QKeySequence(QString::fromUtf8("V,7")));
 
 
@@ -649,34 +649,34 @@ void StdCmdDrawStyle::languageChange()
         "Std_DrawStyle", "Normal mode"));
 
     a[1]->setText(QCoreApplication::translate(
-        "Std_DrawStyle", "Flat lines"));
-    a[1]->setToolTip(QCoreApplication::translate(
-        "Std_DrawStyle", "Flat lines mode"));
-
-    a[2]->setText(QCoreApplication::translate(
-        "Std_DrawStyle", "Shaded"));
-    a[2]->setToolTip(QCoreApplication::translate(
-        "Std_DrawStyle", "Shaded mode"));
-
-    a[3]->setText(QCoreApplication::translate(
-        "Std_DrawStyle", "Wireframe"));
-    a[3]->setToolTip(QCoreApplication::translate(
-        "Std_DrawStyle", "Wireframe mode"));
-
-    a[4]->setText(QCoreApplication::translate(
         "Std_DrawStyle", "Points"));
-    a[4]->setToolTip(QCoreApplication::translate(
+    a[1]->setToolTip(QCoreApplication::translate(
         "Std_DrawStyle", "Points mode"));
 
-    a[5]->setText(QCoreApplication::translate(
+    a[2]->setText(QCoreApplication::translate(
+        "Std_DrawStyle", "Wireframe"));
+    a[2]->setToolTip(QCoreApplication::translate(
+        "Std_DrawStyle", "Wireframe mode"));
+
+    a[3]->setText(QCoreApplication::translate(
         "Std_DrawStyle", "Hidden line"));
-    a[5]->setToolTip(QCoreApplication::translate(
+    a[3]->setToolTip(QCoreApplication::translate(
         "Std_DrawStyle", "Hidden line mode"));
 
-    a[6]->setText(QCoreApplication::translate(
+    a[4]->setText(QCoreApplication::translate(
         "Std_DrawStyle", "No shading"));
-    a[6]->setToolTip(QCoreApplication::translate(
+    a[4]->setToolTip(QCoreApplication::translate(
         "Std_DrawStyle", "No shading mode"));
+
+    a[5]->setText(QCoreApplication::translate(
+        "Std_DrawStyle", "Shaded"));
+    a[5]->setToolTip(QCoreApplication::translate(
+        "Std_DrawStyle", "Shaded mode"));
+
+    a[6]->setText(QCoreApplication::translate(
+        "Std_DrawStyle", "Flat lines"));
+    a[6]->setToolTip(QCoreApplication::translate(
+        "Std_DrawStyle", "Flat lines mode"));
 }
 
 void StdCmdDrawStyle::updateIcon(const MDIView *view)
@@ -692,32 +692,32 @@ void StdCmdDrawStyle::updateIcon(const MDIView *view)
     if (!actionGroup)
         return;
 
-    if (mode == "Flat Lines")
+    if (mode == "Point")
     {
         actionGroup->setCheckedAction(1);
         return;
     }
-    if (mode == "Shaded")
+    if (mode == "Wireframe")
     {
         actionGroup->setCheckedAction(2);
         return;
     }
-    if (mode == "Wireframe")
+    if (mode == "Hidden Line")
     {
         actionGroup->setCheckedAction(3);
         return;
     }
-    if (mode == "Point")
+    if (mode == "No shading")
     {
         actionGroup->setCheckedAction(4);
         return;
     }
-    if (mode == "Hidden Line")
+    if (mode == "Shaded")
     {
         actionGroup->setCheckedAction(5);
         return;
-    }
-    if (mode == "No shading")
+    }    
+    if (mode == "Flat Lines")
     {
         actionGroup->setCheckedAction(6);
         return;
@@ -743,23 +743,23 @@ void StdCmdDrawStyle::activated(int iMsg)
                 switch (iMsg)
                 {
                 case 1:
-                    (oneChangedSignal) ? viewer->updateOverrideMode("Flat Lines") : viewer->setOverrideMode("Flat Lines");
-                    break;
-                case 2:
-                    (oneChangedSignal) ? viewer->updateOverrideMode("Shaded") : viewer->setOverrideMode("Shaded");
-                    break;
-                case 3:
-                    (oneChangedSignal) ? viewer->updateOverrideMode("Wireframe") : viewer->setOverrideMode("Wireframe");
-                    break;
-                case 4:
                     (oneChangedSignal) ? viewer->updateOverrideMode("Point") : viewer->setOverrideMode("Point");
                     break;
-                case 5:
+                case 2:
+                    (oneChangedSignal) ? viewer->updateOverrideMode("Wireframe") : viewer->setOverrideMode("Wireframe");
+                    break;
+                case 3:
                     (oneChangedSignal) ? viewer->updateOverrideMode("Hidden Line") : viewer->setOverrideMode("Hidden Line");
                     break;
-                case 6:
+                case 4:
                     (oneChangedSignal) ? viewer->updateOverrideMode("No Shading") : viewer->setOverrideMode("No Shading");
                     break;
+                case 5:
+                    (oneChangedSignal) ? viewer->updateOverrideMode("Shaded") : viewer->setOverrideMode("Shaded");
+                    break;
+                case 6:
+                    (oneChangedSignal) ? viewer->updateOverrideMode("Flat Lines") : viewer->setOverrideMode("Flat Lines");
+                    break;
                 default:
                     (oneChangedSignal) ? viewer->updateOverrideMode("As Is") : viewer->setOverrideMode("As Is");
                     break;
diff --git a/src/Gui/Icons/DrawStyleAsIs.svg b/src/Gui/Icons/DrawStyleAsIs.svg
index a5a3e5fa45..ffe15faa64 100644
--- a/src/Gui/Icons/DrawStyleAsIs.svg
+++ b/src/Gui/Icons/DrawStyleAsIs.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,297 +6,232 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
+   version="1.1"
    id="svg6248"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="DrawStyleAsIs.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs6250">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3783">
       <stop
-         style="stop-color:#06989a;stop-opacity:1;"
+         id="stop3785"
          offset="0"
-         id="stop3785" />
+         style="stop-color:#06989a;stop-opacity:1;" />
       <stop
-         style="stop-color:#16d0d2;stop-opacity:1"
+         id="stop3787"
          offset="1"
-         id="stop3787" />
+         style="stop-color:#16d0d2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3775">
       <stop
-         style="stop-color:#16d0d2;stop-opacity:1"
+         id="stop3777"
          offset="0"
-         id="stop3777" />
+         style="stop-color:#16d0d2;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3779"
          offset="1"
-         id="stop3779" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3253">
       <stop
-         style="stop-color:#89d5f8;stop-opacity:1;"
+         id="stop3255"
          offset="0"
-         id="stop3255" />
+         style="stop-color:#89d5f8;stop-opacity:1;" />
       <stop
-         style="stop-color:#00899e;stop-opacity:1;"
+         id="stop3257"
          offset="1"
-         id="stop3257" />
+         style="stop-color:#00899e;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6816">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6818"
          offset="0"
-         id="stop6818" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6820"
          offset="1"
-         id="stop6820" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient6781">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop6783"
          offset="0"
-         id="stop6783" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
+         id="stop6785"
          offset="1"
-         id="stop6785" />
+         style="stop-color:#3465a4;stop-opacity:0;" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective6256" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6816"
-       id="radialGradient6822"
-       cx="33.369828"
-       cy="51.929391"
-       fx="33.369828"
-       fy="51.929391"
-       r="25.198714"
-       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3259"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
-       fy="17.013988"
-       r="27.986705"
-       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3270"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
+       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
+       r="25.198714"
+       fy="51.929391"
+       fx="33.369828"
+       cy="51.929391"
+       cx="33.369828"
+       id="radialGradient6822"
+       xlink:href="#linearGradient6816" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
+       r="27.986705"
        fy="17.013988"
-       r="27.986705" />
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       id="radialGradient3259"
+       xlink:href="#linearGradient3253" />
+    <radialGradient
+       r="27.986705"
+       fy="17.013988"
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3270"
+       xlink:href="#linearGradient3253" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3775"
-       id="linearGradient3781"
-       x1="14"
-       y1="46"
-       x2="10"
+       gradientUnits="userSpaceOnUse"
        y2="18"
-       gradientUnits="userSpaceOnUse" />
+       x2="10"
+       y1="46"
+       x1="14"
+       id="linearGradient3781"
+       xlink:href="#linearGradient3775" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3783"
-       id="linearGradient3789"
-       x1="50"
-       y1="44"
-       x2="42"
+       gradientUnits="userSpaceOnUse"
        y2="24"
-       gradientUnits="userSpaceOnUse" />
+       x2="42"
+       y1="44"
+       x1="50"
+       id="linearGradient3789"
+       xlink:href="#linearGradient3783" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3899"
-       id="linearGradient3905"
-       x1="145.72011"
-       y1="158.3524"
-       x2="127.68171"
+       gradientUnits="userSpaceOnUse"
        y2="117.97237"
-       gradientUnits="userSpaceOnUse" />
+       x2="127.68171"
+       y1="158.3524"
+       x1="145.72011"
+       id="linearGradient3905"
+       xlink:href="#linearGradient3899" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3899">
       <stop
-         style="stop-color:#a40000;stop-opacity:1"
+         id="stop3901"
          offset="0"
-         id="stop3901" />
+         style="stop-color:#a40000;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3903"
          offset="1"
-         id="stop3903" />
+         style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3899"
+       y2="117.97237"
+       x2="127.68171"
+       y1="158.3524"
+       x1="145.72011"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient4039"
-       gradientUnits="userSpaceOnUse"
-       x1="145.72011"
-       y1="158.3524"
-       x2="127.68171"
-       y2="117.97237" />
+       xlink:href="#linearGradient3899" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3899"
+       y2="117.97237"
+       x2="127.68171"
+       y1="158.3524"
+       x1="145.72011"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3907"
+       xlink:href="#linearGradient3899" />
+    <linearGradient
        gradientUnits="userSpaceOnUse"
-       x1="145.72011"
-       y1="158.3524"
-       x2="127.68171"
-       y2="117.97237" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3891"
-       id="linearGradient3897"
-       x1="130.56519"
-       y1="118.31313"
-       x2="147.897"
        y2="157.05659"
-       gradientUnits="userSpaceOnUse" />
+       x2="147.897"
+       y1="118.31313"
+       x1="130.56519"
+       id="linearGradient3897"
+       xlink:href="#linearGradient3891" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3891">
       <stop
-         style="stop-color:#a40000;stop-opacity:1"
+         id="stop3893"
          offset="0"
-         id="stop3893" />
+         style="stop-color:#a40000;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3895"
          offset="1"
-         id="stop3895" />
+         style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3891"
+       y2="157.05659"
+       x2="147.897"
+       y1="118.31313"
+       x1="130.56519"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient4041"
-       gradientUnits="userSpaceOnUse"
-       x1="130.56519"
-       y1="118.31313"
-       x2="147.897"
-       y2="157.05659" />
+       xlink:href="#linearGradient3891" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3891"
+       y2="157.05659"
+       x2="147.897"
+       y1="118.31313"
+       x1="130.56519"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient4043"
-       gradientUnits="userSpaceOnUse"
-       x1="130.56519"
-       y1="118.31313"
-       x2="147.897"
-       y2="157.05659" />
+       xlink:href="#linearGradient3891" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3891"
+       y2="157.05659"
+       x2="147.897"
+       y1="118.31313"
+       x1="130.56519"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3047"
-       gradientUnits="userSpaceOnUse"
-       x1="130.56519"
-       y1="118.31313"
-       x2="147.897"
-       y2="157.05659" />
+       xlink:href="#linearGradient3891" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3891"
+       y2="157.05659"
+       x2="147.897"
+       y1="118.31313"
+       x1="130.56519"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3049"
-       gradientUnits="userSpaceOnUse"
-       x1="130.56519"
-       y1="118.31313"
-       x2="147.897"
-       y2="157.05659" />
+       xlink:href="#linearGradient3891" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3891"
+       y2="157.05659"
+       x2="147.897"
+       y1="118.31313"
+       x1="130.56519"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3051"
-       gradientUnits="userSpaceOnUse"
-       x1="130.56519"
-       y1="118.31313"
-       x2="147.897"
-       y2="157.05659" />
+       xlink:href="#linearGradient3891" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3899"
+       y2="117.97237"
+       x2="127.68171"
+       y1="158.3524"
+       x1="145.72011"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3053"
-       gradientUnits="userSpaceOnUse"
-       x1="145.72011"
-       y1="158.3524"
-       x2="127.68171"
-       y2="117.97237" />
+       xlink:href="#linearGradient3899" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3899"
+       y2="117.97237"
+       x2="127.68171"
+       y1="158.3524"
+       x1="145.72011"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3055"
-       gradientUnits="userSpaceOnUse"
-       x1="145.72011"
-       y1="158.3524"
-       x2="127.68171"
-       y2="117.97237" />
+       xlink:href="#linearGradient3899" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3899"
-       id="linearGradient3057"
-       gradientUnits="userSpaceOnUse"
-       x1="145.72011"
-       y1="158.3524"
+       y2="117.97237"
        x2="127.68171"
-       y2="117.97237" />
+       y1="158.3524"
+       x1="145.72011"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3057"
+       xlink:href="#linearGradient3899" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="54.036297"
-     inkscape:cy="34.206622"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3001"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata6253">
     <rdf:RDF>
@@ -307,152 +240,118 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
        id="path3003-2-2-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <g
-       id="g3913"
-       transform="translate(60,0)">
+       transform="translate(60,0)"
+       id="g3913">
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3"
+         style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6"
          d="M -55,45.307692 -28,29.615385 -28,5 -55,16.692308 z"
-         style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6" />
+         id="path3003-5-3" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3-1"
+         style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6"
          d="M -55,45.307692 -28,29.615385 -28,5 -55,16.692308 z"
-         style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6" />
+         id="path3003-5-3-1" />
     </g>
     <path
-       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
        id="path3003-2-2-0-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
+       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 32,59 5,45.307692 5,16.692308 32,30.384615 z"
        id="path3003"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 5,45.307692 5,16.692308 32,30.384615 z"
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 32,59 59,45.307692 59,16.692308 32,30.384615 z"
        id="path3003-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 59,45.307692 59,16.692308 32,30.384615 z"
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,16.692308 32,30.384615 5,16.692308 32,5 z"
        id="path3003-2-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 59,16.692308 32,30.384615 5,16.692308 32,5 z"
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:url(#linearGradient3789);stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="M 32,59 59,45.307692 59,16.692308 32,28.384615 z"
        id="path3003-5-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 59,45.307692 59,16.692308 32,28.384615 z"
+       style="fill:url(#linearGradient3789);stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
     <path
-       style="fill:url(#linearGradient3781);stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="M 32,59 5,45.307692 5,16.692308 32,28.384615 z"
        id="path3003-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 5,45.307692 5,16.692308 32,28.384615 z"
+       style="fill:url(#linearGradient3781);stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
     <path
-       style="fill:#34e0e2;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
        id="path3003-2-2-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
+       style="fill:#34e0e2;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <g
-       id="g3036"
-       transform="matrix(0.85797173,0,0,0.85797173,0.11300939,0.11301801)">
+       transform="matrix(0.85797173,0,0,0.85797173,0.11300939,0.11301801)"
+       id="g3036">
       <g
-         style="fill:none;stroke:#280000;stroke-width:9.04101658;display:inline"
+         transform="matrix(1.031335,0,0,1.031335,-106.32422,-106.32423)"
          id="g3879"
-         transform="matrix(1.031335,0,0,1.031335,-106.32422,-106.32423)">
+         style="fill:none;stroke:#280000;stroke-width:9.04101658;display:inline">
         <circle
-           cx="138"
-           cy="138"
-           r="124"
-           id="circle3869"
-           sodipodi:cx="138"
-           sodipodi:cy="138"
-           sodipodi:rx="124"
-           sodipodi:ry="124"
-           transform="matrix(0.17391304,0,0,0.17391304,114,114)"
+           d="M 262,138 C 262,206.48331 206.48331,262 138,262 69.516691,262 14,206.48331 14,138 14,69.516691 69.516691,14 138,14 c 68.48331,0 124,55.516691 124,124 z"
            style="fill:none;stroke:#280000;stroke-width:51.98584747"
-           d="M 262,138 C 262,206.48331 206.48331,262 138,262 69.516691,262 14,206.48331 14,138 14,69.516691 69.516691,14 138,14 c 68.48331,0 124,55.516691 124,124 z" />
+           transform="matrix(0.17391304,0,0,0.17391304,114,114)"
+           id="circle3869"
+           r="124"
+           cy="138"
+           cx="138" />
         <line
-           x1="121.82609"
-           y1="121.82609"
-           x2="154.17392"
-           y2="154.17392"
+           style="fill:none;stroke:#280000;stroke-width:9.04101658"
            id="line3871"
-           style="fill:none;stroke:#280000;stroke-width:9.04101658" />
-      </g>
-      <g
-         style="fill:none;stroke:url(#linearGradient3051);stroke-width:4.54004622;display:inline"
-         id="g3879-5"
-         transform="matrix(1.0268967,0,0,1.0268966,-105.71173,-105.71173)">
-        <circle
-           cx="138"
-           cy="138"
-           r="124"
-           id="circle3869-3"
-           sodipodi:cx="138"
-           sodipodi:cy="138"
-           sodipodi:rx="124"
-           sodipodi:ry="124"
-           transform="matrix(0.17391304,0,0,0.17391304,114,114)"
-           style="fill:none;stroke:url(#linearGradient3047);stroke-width:26.10526657"
-           d="M 262,138 C 262,206.48331 206.48331,262 138,262 69.516691,262 14,206.48331 14,138 14,69.516691 69.516691,14 138,14 c 68.48331,0 124,55.516691 124,124 z" />
-        <line
-           x1="121.82609"
-           y1="121.82609"
-           x2="154.17392"
            y2="154.17392"
-           id="line3871-5"
-           style="fill:none;stroke:url(#linearGradient3049);stroke-width:4.54004622" />
+           x2="154.17392"
+           y1="121.82609"
+           x1="121.82609" />
       </g>
       <g
-         style="fill:none;stroke:url(#linearGradient3057);stroke-width:2.15652204;display:inline"
-         id="g3879-5-6"
-         transform="matrix(1.0809439,0,0,1.0809438,-113.17025,-113.17024)">
+         transform="matrix(1.0268967,0,0,1.0268966,-105.71173,-105.71173)"
+         id="g3879-5"
+         style="fill:none;stroke:url(#linearGradient3051);stroke-width:4.54004622;display:inline">
         <circle
-           cx="138"
-           cy="138"
-           r="124"
-           id="circle3869-3-2"
-           sodipodi:cx="138"
-           sodipodi:cy="138"
-           sodipodi:rx="124"
-           sodipodi:ry="124"
+           d="M 262,138 C 262,206.48331 206.48331,262 138,262 69.516691,262 14,206.48331 14,138 14,69.516691 69.516691,14 138,14 c 68.48331,0 124,55.516691 124,124 z"
+           style="fill:none;stroke:url(#linearGradient3047);stroke-width:26.10526657"
            transform="matrix(0.17391304,0,0,0.17391304,114,114)"
-           style="fill:none;stroke:url(#linearGradient3053);stroke-width:12.40000343"
-           d="M 262,138 C 262,206.48331 206.48331,262 138,262 69.516691,262 14,206.48331 14,138 14,69.516691 69.516691,14 138,14 c 68.48331,0 124,55.516691 124,124 z" />
+           id="circle3869-3"
+           r="124"
+           cy="138"
+           cx="138" />
         <line
-           x1="123.77466"
-           y1="122.34983"
-           x2="151.6535"
-           y2="150.10345"
+           style="fill:none;stroke:url(#linearGradient3049);stroke-width:4.54004622"
+           id="line3871-5"
+           y2="154.17392"
+           x2="154.17392"
+           y1="121.82609"
+           x1="121.82609" />
+      </g>
+      <g
+         transform="matrix(1.0809439,0,0,1.0809438,-113.17025,-113.17024)"
+         id="g3879-5-6"
+         style="fill:none;stroke:url(#linearGradient3057);stroke-width:2.15652204;display:inline">
+        <circle
+           d="M 262,138 C 262,206.48331 206.48331,262 138,262 69.516691,262 14,206.48331 14,138 14,69.516691 69.516691,14 138,14 c 68.48331,0 124,55.516691 124,124 z"
+           style="fill:none;stroke:url(#linearGradient3053);stroke-width:12.40000343"
+           transform="matrix(0.17391304,0,0,0.17391304,114,114)"
+           id="circle3869-3-2"
+           r="124"
+           cy="138"
+           cx="138" />
+        <line
+           style="fill:none;stroke:url(#linearGradient3055);stroke-width:2.15652227;stroke-linecap:butt"
            id="line3871-5-9"
-           style="fill:none;stroke:url(#linearGradient3055);stroke-width:2.15652227;stroke-linecap:butt" />
+           y2="150.10345"
+           x2="151.6535"
+           y1="122.34983"
+           x1="123.77466" />
       </g>
     </g>
   </g>
diff --git a/src/Gui/Icons/DrawStyleFlatLines.svg b/src/Gui/Icons/DrawStyleFlatLines.svg
index 05d1bcada9..4a4f544b4a 100644
--- a/src/Gui/Icons/DrawStyleFlatLines.svg
+++ b/src/Gui/Icons/DrawStyleFlatLines.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,164 +6,133 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
+   version="1.1"
    id="svg6248"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="DrawStyleFlatLines.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs6250">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3783">
+       id="linearGradient915">
       <stop
-         style="stop-color:#06989a;stop-opacity:1;"
+         id="stop913"
          offset="0"
-         id="stop3785" />
+         style="stop-color:#042a2a;stop-opacity:1" />
       <stop
-         style="stop-color:#16d0d2;stop-opacity:1"
+         id="stop911"
          offset="1"
-         id="stop3787" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3775">
+       id="linearGradient907">
       <stop
-         style="stop-color:#16d0d2;stop-opacity:1"
+         id="stop905"
          offset="0"
-         id="stop3777" />
+         style="stop-color:#042a2a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop903"
          offset="1"
-         id="stop3779" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop897"
+         offset="0"
+         style="stop-color:#042a2a;stop-opacity:1" />
+      <stop
+         id="stop895"
+         offset="1"
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3253">
       <stop
-         style="stop-color:#89d5f8;stop-opacity:1;"
+         id="stop3255"
          offset="0"
-         id="stop3255" />
+         style="stop-color:#89d5f8;stop-opacity:1;" />
       <stop
-         style="stop-color:#00899e;stop-opacity:1;"
+         id="stop3257"
          offset="1"
-         id="stop3257" />
+         style="stop-color:#00899e;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6816">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6818"
          offset="0"
-         id="stop6818" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6820"
          offset="1"
-         id="stop6820" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient6781">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop6783"
          offset="0"
-         id="stop6783" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
+         id="stop6785"
          offset="1"
-         id="stop6785" />
+         style="stop-color:#3465a4;stop-opacity:0;" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective6256" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6816"
-       id="radialGradient6822"
-       cx="33.369828"
-       cy="51.929391"
-       fx="33.369828"
-       fy="51.929391"
-       r="25.198714"
-       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3259"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
-       fy="17.013988"
-       r="27.986705"
-       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3270"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
+       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
+       r="25.198714"
+       fy="51.929391"
+       fx="33.369828"
+       cy="51.929391"
+       cx="33.369828"
+       id="radialGradient6822"
+       xlink:href="#linearGradient6816" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
+       r="27.986705"
        fy="17.013988"
-       r="27.986705" />
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       id="radialGradient3259"
+       xlink:href="#linearGradient3253" />
+    <radialGradient
+       r="27.986705"
+       fy="17.013988"
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3270"
+       xlink:href="#linearGradient3253" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3775"
-       id="linearGradient3781"
-       x1="14"
-       y1="46"
-       x2="10"
-       y2="18"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       y2="14.668943"
+       x2="31.705853"
+       y1="45.151108"
+       x1="55.247467"
+       id="linearGradient865"
+       xlink:href="#linearGradient899" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3783"
-       id="linearGradient3789"
-       x1="50"
-       y1="44"
-       x2="42"
-       y2="24"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       y2="14.668943"
+       x2="31.705853"
+       y1="45.151108"
+       x1="55.247467"
+       id="linearGradient873"
+       xlink:href="#linearGradient907" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="14.668943"
+       x2="31.705853"
+       y1="45.151108"
+       x1="55.247467"
+       id="linearGradient881"
+       xlink:href="#linearGradient915" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="39.107681"
-     inkscape:cy="41.483681"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3001"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata6253">
     <rdf:RDF>
@@ -179,95 +146,36 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
-       id="path3003-2-2-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+     id="layer1">
     <g
-       id="g3913"
-       transform="translate(60,0)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3"
-         d="M -55,45.307692 -28,29.615385 -28,5 -55,16.692308 z"
-         style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3-1"
-         d="M -55,45.307692 -28,29.615385 -28,5 -55,16.692308 z"
-         style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6" />
-    </g>
+       transform="matrix(-1,0,0,0.99363058,4,0.0382165)"
+       id="g3913-7" />
+    <g
+       transform="translate(60,0)"
+       id="g3913" />
     <path
-       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
-       id="path3003-2-2-0-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 32,59 5,45.307692 5,16.692308 32,30.384615 z"
        id="path3003"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 5,47.307692 5,16.692308 32,28.384615 z"
+       style="fill:url(#linearGradient881);stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 32,59 59,45.307692 59,16.692308 32,30.384615 z"
        id="path3003-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 59,47.307692 59,16.692308 32,28.384615 z"
+       style="fill:url(#linearGradient865);stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,16.692308 32,30.384615 5,16.692308 32,5 z"
        id="path3003-2-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:url(#linearGradient3789);stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="M 32,59 59,45.307692 59,16.692308 32,28.384615 z"
-       id="path3003-5-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:url(#linearGradient3781);stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="M 32,59 5,45.307692 5,16.692308 32,28.384615 z"
-       id="path3003-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#34e0e2;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
-       id="path3003-2-2-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       style="fill:url(#linearGradient873);stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
     <path
-       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 35,57.477273 35,30.015875 59.011364,19.875"
-       id="path3853"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path3003-3"
+       d="M 32,59 5,47.307692 5,16.692308 32,28.384615 z"
+       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 5,19.522727 29,30 29,57"
-       id="path3855"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path3003-5-6"
+       d="M 32,59 59,47.307692 59,16.692308 32,28.384615 z"
+       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 60,16 32,28 32,60"
-       id="path3849"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:none;stroke:#042a2a;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 4,16 32,28"
-       id="path3851"
-       inkscape:connector-curvature="0" />
+       id="path3003-2"
+       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
+       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
 </svg>
diff --git a/src/Gui/Icons/DrawStyleHiddenLine.svg b/src/Gui/Icons/DrawStyleHiddenLine.svg
new file mode 100644
index 0000000000..05be5af27d
--- /dev/null
+++ b/src/Gui/Icons/DrawStyleHiddenLine.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   id="svg6248"
+   height="64px"
+   width="64px">
+  <defs
+     id="defs6250">
+    <linearGradient
+       id="linearGradient3253">
+      <stop
+         id="stop3255"
+         offset="0"
+         style="stop-color:#89d5f8;stop-opacity:1;" />
+      <stop
+         id="stop3257"
+         offset="1"
+         style="stop-color:#00899e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6816">
+      <stop
+         id="stop6818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop6820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6781">
+      <stop
+         id="stop6783"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6785"
+         offset="1"
+         style="stop-color:#3465a4;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
+       r="25.198714"
+       fy="51.929391"
+       fx="33.369828"
+       cy="51.929391"
+       cx="33.369828"
+       id="radialGradient6822"
+       xlink:href="#linearGradient6816" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
+       r="27.986705"
+       fy="17.013988"
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       id="radialGradient3259"
+       xlink:href="#linearGradient3253" />
+    <radialGradient
+       r="27.986705"
+       fy="17.013988"
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3270"
+       xlink:href="#linearGradient3253" />
+  </defs>
+  <metadata
+     id="metadata6253">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <g
+       transform="matrix(-1,0,0,0.99363058,4,0.0382165)"
+       id="g3913-7" />
+    <g
+       transform="translate(60,0)"
+       id="g3913" />
+    <path
+       id="path3003"
+       d="M 32,59 5,47.307692 5,16.692308 32,28.384615 z"
+       style="fill:#ffffff;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       id="path3003-5"
+       d="M 32,59 59,47.307692 59,16.692308 32,28.384615 z"
+       style="fill:#ffffff;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       id="path3003-2-2"
+       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
+       style="fill:#ffffff;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       id="path3003-3"
+       d="M 32,59 5,47.307692 5,16.692308 32,28.384615 z"
+       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       id="path3003-5-6"
+       d="M 32,59 59,47.307692 59,16.692308 32,28.384615 z"
+       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       id="path3003-2"
+       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
+       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/src/Gui/Icons/DrawStyleNoShading.svg b/src/Gui/Icons/DrawStyleNoShading.svg
new file mode 100644
index 0000000000..d6e9671509
--- /dev/null
+++ b/src/Gui/Icons/DrawStyleNoShading.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   width="64px"
+   height="64px"
+   id="svg6248"
+   version="1.1">
+  <defs
+     id="defs6250">
+    <linearGradient
+       id="linearGradient3253">
+      <stop
+         style="stop-color:#89d5f8;stop-opacity:1;"
+         offset="0"
+         id="stop3255" />
+      <stop
+         style="stop-color:#00899e;stop-opacity:1;"
+         offset="1"
+         id="stop3257" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6816">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6818" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6820" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6781">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6783" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop6785" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient6816"
+       id="radialGradient6822"
+       cx="33.369828"
+       cy="51.929391"
+       fx="33.369828"
+       fy="51.929391"
+       r="25.198714"
+       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient3253"
+       id="radialGradient3259"
+       cx="18.417862"
+       cy="17.013988"
+       fx="18.417862"
+       fy="17.013988"
+       r="27.986705"
+       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient3253"
+       id="radialGradient3270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
+       cx="18.417862"
+       cy="17.013988"
+       fx="18.417862"
+       fy="17.013988"
+       r="27.986705" />
+  </defs>
+  <metadata
+     id="metadata6253">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <g
+       id="g3913-7"
+       transform="matrix(-1,0,0,0.99363058,4,0.0382165)" />
+    <g
+       id="g3913"
+       transform="translate(60,0)" />
+    <path
+       style="fill:#34e0e2;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       d="M 32,59 5,47.307692 5,16.692308 32,28.384615 z"
+       id="path3003" />
+    <path
+       style="fill:#34e0e2;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       d="M 32,59 59,47.307692 59,16.692308 32,28.384615 z"
+       id="path3003-5" />
+    <path
+       style="fill:#34e0e2;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
+       id="path3003-2-2" />
+    <path
+       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 32,59 5,47.307692 5,16.692308 32,28.384615 z"
+       id="path3003-3" />
+    <path
+       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 32,59 59,47.307692 59,16.692308 32,28.384615 z"
+       id="path3003-5-6" />
+    <path
+       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
+       id="path3003-2" />
+  </g>
+</svg>
diff --git a/src/Gui/Icons/DrawStylePoints.svg b/src/Gui/Icons/DrawStylePoints.svg
index 7f231b5ffe..2f7632e530 100644
--- a/src/Gui/Icons/DrawStylePoints.svg
+++ b/src/Gui/Icons/DrawStylePoints.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,122 +6,76 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
+   version="1.1"
    id="svg6248"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="DrawStyleWireFrame.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs6250">
     <linearGradient
        id="linearGradient3253">
       <stop
-         style="stop-color:#89d5f8;stop-opacity:1;"
+         id="stop3255"
          offset="0"
-         id="stop3255" />
+         style="stop-color:#89d5f8;stop-opacity:1;" />
       <stop
-         style="stop-color:#00899e;stop-opacity:1;"
+         id="stop3257"
          offset="1"
-         id="stop3257" />
+         style="stop-color:#00899e;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6816">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6818"
          offset="0"
-         id="stop6818" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6820"
          offset="1"
-         id="stop6820" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient6781">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop6783"
          offset="0"
-         id="stop6783" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
+         id="stop6785"
          offset="1"
-         id="stop6785" />
+         style="stop-color:#3465a4;stop-opacity:0;" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective6256" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6816"
-       id="radialGradient6822"
-       cx="33.369828"
-       cy="51.929391"
-       fx="33.369828"
-       fy="51.929391"
-       r="25.198714"
-       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3259"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
-       fy="17.013988"
-       r="27.986705"
-       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3270"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
+       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
+       r="25.198714"
+       fy="51.929391"
+       fx="33.369828"
+       cy="51.929391"
+       cx="33.369828"
+       id="radialGradient6822"
+       xlink:href="#linearGradient6816" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
+       r="27.986705"
        fy="17.013988"
-       r="27.986705" />
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       id="radialGradient3259"
+       xlink:href="#linearGradient3253" />
+    <radialGradient
+       r="27.986705"
+       fy="17.013988"
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3270"
+       xlink:href="#linearGradient3253" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.5000001"
-     inkscape:cx="32.205399"
-     inkscape:cy="31.045753"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3001"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata6253">
     <rdf:RDF>
@@ -137,199 +89,117 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
        id="g3028">
       <path
-         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)"
-         d="m 32.012652,57.63604 a 1.5427784,1.4142135 0 1 1 -3.085557,0 1.5427784,1.4142135 0 1 1 3.085557,0 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
-         id="path3008"
          style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)"
+         id="path3008"
          d="m 32.012652,57.63604 a 1.5427784,1.4142135 0 1 1 -3.085557,0 1.5427784,1.4142135 0 1 1 3.085557,0 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
-         id="path3008-3"
+         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)" />
+      <path
          style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709774999999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-         sodipodi:type="arc" />
+         id="path3008-3"
+         d="m 32.012652,57.63604 a 1.5427784,1.4142135 0 1 1 -3.085557,0 1.5427784,1.4142135 0 1 1 3.085557,0 z"
+         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)" />
     </g>
     <g
-       transform="translate(1.6950274e-7,-20.000001)"
-       id="g3028-6">
+       id="g3028-6"
+       transform="translate(1.6950274e-7,-20.000001)">
       <path
-         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)"
-         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-7"
-         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)"
          d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)" />
+      <path
+         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-3-5"
-         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
+         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
+         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)" />
     </g>
     <g
-       transform="translate(-25.000001,-9.9999976)"
-       id="g3028-3">
+       id="g3028-3"
+       transform="translate(-25.000001,-9.9999976)">
       <path
-         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)"
-         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-5"
-         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)"
          d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)" />
+      <path
+         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-3-6"
-         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
+         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
+         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)" />
     </g>
     <g
-       transform="translate(25,-9.9999976)"
-       id="g3028-2">
+       id="g3028-2"
+       transform="translate(25,-9.9999976)">
       <path
-         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)"
-         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-9"
-         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)"
          d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)" />
+      <path
+         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-3-1"
-         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
+         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
+         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)" />
     </g>
     <g
-       transform="translate(1.6950274e-7,-29.999998)"
-       id="g3028-27">
+       id="g3028-27"
+       transform="translate(1.6950274e-7,-29.999998)">
       <path
-         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)"
-         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-0"
-         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)"
          d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)" />
+      <path
+         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-3-9"
-         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
+         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
+         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)" />
     </g>
     <g
-       transform="translate(25,-41.999998)"
-       id="g3028-36">
+       id="g3028-36"
+       transform="translate(25,-41.999998)">
       <path
-         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)"
-         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-06"
-         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)"
          d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)" />
+      <path
+         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-3-2"
-         style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
+         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
+         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)" />
     </g>
     <g
-       transform="translate(-25.000001,-41.999998)"
-       id="g3028-61">
+       id="g3028-61"
+       transform="translate(-25.000001,-41.999998)">
       <path
-         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)"
-         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
+         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
          id="path3008-8"
-         style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)"
          d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
-         id="path3008-3-7"
+         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)" />
+      <path
          style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
+         id="path3008-3-7"
+         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
+         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)" />
     </g>
     <g
-       transform="translate(3.7385835e-8,-50)"
-       id="g3028-9">
+       id="g3028-9"
+       transform="translate(3.7385835e-8,-50)">
       <path
-         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)"
-         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
-         id="path3008-2"
          style="fill:#34e0e2;stroke:#042a2a;stroke-width:0.73854911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)"
+         id="path3008-2"
          d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
-         sodipodi:ry="1.4142135"
-         sodipodi:rx="1.5427784"
-         sodipodi:cy="57.63604"
-         sodipodi:cx="30.469873"
-         id="path3008-3-0"
+         transform="matrix(2.5927246,0,0,2.8284261,-46.99999,-106.01928)" />
+      <path
          style="fill:#06989a;stroke:#34e0e2;stroke-width:1.47709775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-         sodipodi:type="arc" />
+         id="path3008-3-0"
+         d="m 32.012652,57.63604 c 0,0.781048 -0.690726,1.414213 -1.542779,1.414213 -0.852053,0 -1.542778,-0.633165 -1.542778,-1.414213 0,-0.781049 0.690725,-1.414214 1.542778,-1.414214 0.852053,0 1.542779,0.633165 1.542779,1.414214 z"
+         transform="matrix(1.2963623,0,0,1.4142139,-7.4999963,-24.509687)" />
     </g>
   </g>
 </svg>
diff --git a/src/Gui/Icons/DrawStyleShaded.svg b/src/Gui/Icons/DrawStyleShaded.svg
index 12899e746c..595c633e06 100644
--- a/src/Gui/Icons/DrawStyleShaded.svg
+++ b/src/Gui/Icons/DrawStyleShaded.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,164 +6,76 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
+   version="1.1"
    id="svg6248"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="view-isometric.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs6250">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3783">
-      <stop
-         style="stop-color:#06989a;stop-opacity:1;"
-         offset="0"
-         id="stop3785" />
-      <stop
-         style="stop-color:#16d0d2;stop-opacity:1"
-         offset="1"
-         id="stop3787" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3775">
-      <stop
-         style="stop-color:#16d0d2;stop-opacity:1"
-         offset="0"
-         id="stop3777" />
-      <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
-         offset="1"
-         id="stop3779" />
-    </linearGradient>
     <linearGradient
        id="linearGradient3253">
       <stop
-         style="stop-color:#89d5f8;stop-opacity:1;"
+         id="stop3255"
          offset="0"
-         id="stop3255" />
+         style="stop-color:#89d5f8;stop-opacity:1;" />
       <stop
-         style="stop-color:#00899e;stop-opacity:1;"
+         id="stop3257"
          offset="1"
-         id="stop3257" />
+         style="stop-color:#00899e;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6816">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6818"
          offset="0"
-         id="stop6818" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6820"
          offset="1"
-         id="stop6820" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient6781">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop6783"
          offset="0"
-         id="stop6783" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
+         id="stop6785"
          offset="1"
-         id="stop6785" />
+         style="stop-color:#3465a4;stop-opacity:0;" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective6256" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6816"
-       id="radialGradient6822"
-       cx="33.369828"
-       cy="51.929391"
-       fx="33.369828"
-       fy="51.929391"
-       r="25.198714"
-       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3259"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
-       fy="17.013988"
-       r="27.986705"
-       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3270"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
+       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
+       r="25.198714"
+       fy="51.929391"
+       fx="33.369828"
+       cy="51.929391"
+       cx="33.369828"
+       id="radialGradient6822"
+       xlink:href="#linearGradient6816" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
+       r="27.986705"
        fy="17.013988"
-       r="27.986705" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3775"
-       id="linearGradient3781"
-       x1="14"
-       y1="46"
-       x2="10"
-       y2="18"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3783"
-       id="linearGradient3789"
-       x1="50"
-       y1="44"
-       x2="42"
-       y2="24"
-       gradientUnits="userSpaceOnUse" />
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       id="radialGradient3259"
+       xlink:href="#linearGradient3253" />
+    <radialGradient
+       r="27.986705"
+       fy="17.013988"
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3270"
+       xlink:href="#linearGradient3253" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="21.55105"
-     inkscape:cy="29.594545"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3001"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata6253">
     <rdf:RDF>
@@ -179,72 +89,50 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
        id="path3003-2-2-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <g
-       id="g3913"
-       transform="translate(60,0)">
+       transform="translate(60,0)"
+       id="g3913">
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3"
+         style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6"
          d="M -55,45.307692 -28,29.615385 -28,5 -55,16.692308 z"
-         style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6" />
+         id="path3003-5-3" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3-1"
+         style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6"
          d="M -55,45.307692 -28,29.615385 -28,5 -55,16.692308 z"
-         style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6" />
+         id="path3003-5-3-1" />
     </g>
     <path
-       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
        id="path3003-2-2-0-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 59,45.307693 32,59 5,45.307693 32,29.615385 z"
+       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 32,59 5,45.307692 5,16.692308 32,30.384615 z"
        id="path3003"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 5,45.307692 5,16.692308 32,30.384615 z"
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 32,59 59,45.307692 59,16.692308 32,30.384615 z"
        id="path3003-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 59,45.307692 59,16.692308 32,30.384615 z"
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,16.692308 32,30.384615 5,16.692308 32,5 z"
        id="path3003-2-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 59,16.692308 32,30.384615 5,16.692308 32,5 z"
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:url(#linearGradient3789);stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="M 32,59 59,45.307692 59,16.692308 32,28.384615 z"
        id="path3003-5-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 59,45.307692 59,16.692308 32,28.384615 z"
+       style="fill:#06989a;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
     <path
-       style="fill:url(#linearGradient3781);stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="M 32,59 5,45.307692 5,16.692308 32,28.384615 z"
        id="path3003-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,59 5,45.307692 5,16.692308 32,28.384615 z"
+       style="fill:#16d0d2;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
     <path
-       style="fill:#34e0e2;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
        id="path3003-2-2-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
+       style="fill:#34e0e2;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
 </svg>
diff --git a/src/Gui/Icons/DrawStyleWireFrame.svg b/src/Gui/Icons/DrawStyleWireFrame.svg
index 3a4e751a02..3f7686a9c3 100644
--- a/src/Gui/Icons/DrawStyleWireFrame.svg
+++ b/src/Gui/Icons/DrawStyleWireFrame.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,122 +6,76 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
+   version="1.1"
    id="svg6248"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="DrawStyleWireFrame.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs6250">
     <linearGradient
        id="linearGradient3253">
       <stop
-         style="stop-color:#89d5f8;stop-opacity:1;"
+         id="stop3255"
          offset="0"
-         id="stop3255" />
+         style="stop-color:#89d5f8;stop-opacity:1;" />
       <stop
-         style="stop-color:#00899e;stop-opacity:1;"
+         id="stop3257"
          offset="1"
-         id="stop3257" />
+         style="stop-color:#00899e;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6816">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6818"
          offset="0"
-         id="stop6818" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6820"
          offset="1"
-         id="stop6820" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient6781">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop6783"
          offset="0"
-         id="stop6783" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
+         id="stop6785"
          offset="1"
-         id="stop6785" />
+         style="stop-color:#3465a4;stop-opacity:0;" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective6256" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6816"
-       id="radialGradient6822"
-       cx="33.369828"
-       cy="51.929391"
-       fx="33.369828"
-       fy="51.929391"
-       r="25.198714"
-       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3259"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
-       fy="17.013988"
-       r="27.986705"
-       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3270"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
-       cx="18.417862"
-       cy="17.013988"
-       fx="18.417862"
+       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
+       r="25.198714"
+       fy="51.929391"
+       fx="33.369828"
+       cy="51.929391"
+       cx="33.369828"
+       id="radialGradient6822"
+       xlink:href="#linearGradient6816" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9724373,-0.105657,5.0523169e-2,0.4650009,-0.3519546,9.5854384)"
+       r="27.986705"
        fy="17.013988"
-       r="27.986705" />
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       id="radialGradient3259"
+       xlink:href="#linearGradient3253" />
+    <radialGradient
+       r="27.986705"
+       fy="17.013988"
+       fx="18.417862"
+       cy="17.013988"
+       cx="18.417862"
+       gradientTransform="matrix(0.9724373,-0.105657,0.05052317,0.4650009,-0.3519546,9.5854384)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3270"
+       xlink:href="#linearGradient3253" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.7781748"
-     inkscape:cx="9.8880633"
-     inkscape:cy="36.899061"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3001"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata6253">
     <rdf:RDF>
@@ -137,76 +89,54 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3913-7"
-       transform="matrix(-1,0,0,0.99363058,4,0.0382165)">
+       transform="matrix(-1,0,0,0.99363058,4,0.0382165)"
+       id="g3913-7">
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3-0"
+         style="fill:none;stroke:#042a2a;stroke-width:6.01919985;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.01920039"
          d="M -55,47.282051 -28,35.564103 -28,4.974359 -55,16.692308 z"
-         style="fill:none;stroke:#042a2a;stroke-width:6.01919985;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.01920039" />
+         id="path3003-5-3-0" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3-1-9"
+         style="fill:none;stroke:#16d0d2;stroke-width:2.00640011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.01920003"
          d="M -55,47.282051 -28,35.564103 -28,4.974359 -55,16.692308 z"
-         style="fill:none;stroke:#16d0d2;stroke-width:2.00640011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.01920003" />
+         id="path3003-5-3-1-9" />
     </g>
     <g
-       id="g3913"
-       transform="translate(60,0)">
+       transform="translate(60,0)"
+       id="g3913">
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3"
+         style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6"
          d="M -55,47.307692 -28,35.615385 -28,5 -55,16.692308 z"
-         style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6" />
+         id="path3003-5-3" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3003-5-3-1"
+         style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6"
          d="M -55,47.307692 -28,35.615385 -28,5 -55,16.692308 z"
-         style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6" />
+         id="path3003-5-3-1" />
     </g>
     <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 32,59 5,47.307692 5,16.692308 32,28.384615 z"
        id="path3003"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 32,59 59,47.307692 59,16.692308 32,28.384615 z"
-       id="path3003-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
-       id="path3003-2-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 32,59 5,47.307692 5,16.692308 32,28.384615 z"
-       id="path3003-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3003-5"
        d="M 32,59 59,47.307692 59,16.692308 32,28.384615 z"
-       id="path3003-5-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3003-2-2"
        d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
+       style="fill:none;stroke:#042a2a;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       id="path3003-3"
+       d="M 32,59 5,47.307692 5,16.692308 32,28.384615 z"
+       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       id="path3003-5-6"
+       d="M 32,59 59,47.307692 59,16.692308 32,28.384615 z"
+       style="fill:none;stroke:#16d0d2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
        id="path3003-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 59,16.692308 32,28.384615 5,16.692308 32,5 z"
+       style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
 </svg>