diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index a461d41eff..4a46756f92 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -436,7 +436,7 @@ CmdTechDrawActiveView::CmdTechDrawActiveView()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_ActiveView";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-ActiveView";
+    sPixmap         = "actions/TechDraw_ActiveView";
 }
 
 void CmdTechDrawActiveView::activated(int iMsg)
diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
index 31a6581e12..3976423d2d 100644
--- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
@@ -612,7 +612,7 @@ Gui::Action * CmdTechDrawCenterLineGroup::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* p1 = pcAction->addAction(QString());
-    p1->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-facecenterline"));
+    p1->setIcon(Gui::BitmapFactory().iconFromTheme("actions/TechDraw_FaceCenterLine"));
     p1->setObjectName(QString::fromLatin1("TechDraw_FaceCenterLine"));
     p1->setWhatsThis(QString::fromLatin1("TechDraw_FaceCenterLine"));
     QAction* p2 = pcAction->addAction(QString());
@@ -678,7 +678,7 @@ CmdTechDrawFaceCenterLine::CmdTechDrawFaceCenterLine()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_FaceCenterLine";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-facecenterline";
+    sPixmap         = "actions/TechDraw_FaceCenterLine";
 }
 
 void CmdTechDrawFaceCenterLine::activated(int iMsg)
diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
index f2de840fb5..a947b7304e 100644
--- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
+++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
@@ -47,7 +47,7 @@
         <file>icons/actions/techdraw-PageDefault.svg</file>
         <file>icons/actions/techdraw-PageTemplate.svg</file>
         <file>icons/actions/techdraw-View.svg</file>
-        <file>icons/actions/techdraw-ActiveView.svg</file>
+        <file>icons/actions/TechDraw_ActiveView.svg</file>
         <file>icons/actions/techdraw-multiview.svg</file>
         <file>icons/actions/techdraw-annotation.svg</file>
         <file>icons/actions/techdraw-ClipGroup.svg</file>
@@ -72,7 +72,7 @@
         <file>icons/actions/techdraw-CosmeticVertex.svg</file>
         <file>icons/actions/techdraw-Midpoints.svg</file>
         <file>icons/actions/techdraw-Quadrants.svg</file>
-        <file>icons/actions/techdraw-facecenterline.svg</file>
+        <file>icons/actions/TechDraw_FaceCenterLine.svg</file>
         <file>icons/actions/techdraw-2linecenterline.svg</file>
         <file>icons/actions/techdraw-2pointcenterline.svg</file>
         <file>icons/actions/techdraw-line2points.svg</file>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ActiveView.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ActiveView.svg
similarity index 77%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ActiveView.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ActiveView.svg
index 5b814cc300..927dcc7811 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ActiveView.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ActiveView.svg
@@ -6,16 +6,12 @@
    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="64"
    height="64"
    viewBox="0 0 64 64"
    version="1.1"
    id="svg142"
-   sodipodi:docname="techdraw-activeview.svg"
-   style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
-   inkscape:version="0.92.4 (unknown)">
+   style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round">
   <metadata
      id="metadata148">
     <rdf:RDF>
@@ -31,8 +27,7 @@
   <defs
      id="defs146">
     <linearGradient
-       id="linearGradient1328"
-       inkscape:collect="always">
+       id="linearGradient1328">
       <stop
          id="stop1324"
          offset="0"
@@ -43,7 +38,6 @@
          style="stop-color:#16d0d2;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient1310">
       <stop
          style="stop-color:#06989a;stop-opacity:1"
@@ -55,7 +49,6 @@
          id="stop1308" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient1310"
        id="linearGradient1312"
        x1="57.636765"
@@ -64,7 +57,6 @@
        y2="19.189537"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient1328"
        id="radialGradient1322"
        gradientUnits="userSpaceOnUse"
@@ -75,26 +67,6 @@
        fy="35.575535"
        r="16" />
   </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1358"
-     inkscape:window-height="703"
-     id="namedview144"
-     showgrid="false"
-     inkscape:zoom="8.03125"
-     inkscape:cx="23.961976"
-     inkscape:cy="24.054581"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg142" />
   <circle
      style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#06989a;stroke-width:2.61091852;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
      id="path907"
@@ -105,7 +77,6 @@
   <g
      id="g1166">
     <path
-       inkscape:connector-curvature="0"
        id="path138"
        d="m 60.689917,49.407377 a 5.2163485,4.9735365 0 0 1 -5.216349,4.973537 H 8.5264316 A 5.2163485,4.9735365 0 0 1 3.310083,49.407377 V 22.052926 A 5.2163485,4.9735365 0 0 1 8.5264316,17.079389 H 18.959129 l 5.216348,-7.4603035 h 15.649046 l 5.216348,7.4603035 h 10.432697 a 5.2163485,4.9735365 0 0 1 5.216349,4.973537 z"
        style="fill:url(#linearGradient1312);stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1" />
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-facecenterline.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_FaceCenterLine.svg
similarity index 76%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-facecenterline.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_FaceCenterLine.svg
index 5204290391..763ecc0b09 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-facecenterline.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_FaceCenterLine.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,46 +6,13 @@
    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"
    version="1.1"
    width="64"
    height="64"
-   id="svg3085"
-   sodipodi:docname="techdraw-facecenterline.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1358"
-     inkscape:window-height="703"
-     id="namedview983"
-     showgrid="true"
-     inkscape:zoom="5.6789513"
-     inkscape:cx="20.691663"
-     inkscape:cy="25.597028"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g1010"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid985"
-       empspacing="2"
-       color="#ff423f"
-       opacity="0.1254902" />
-  </sodipodi:namedview>
+   id="svg3085">
   <defs
      id="defs3087">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient1043-3">
       <stop
          style="stop-color:#729fcf;stop-opacity:1;"
@@ -59,13 +24,11 @@
          id="stop1041" />
     </linearGradient>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1120"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
@@ -73,13 +36,11 @@
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleInM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleInM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1111"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
@@ -87,13 +48,11 @@
          transform="scale(-0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleInL"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleInL"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1108"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
@@ -101,13 +60,11 @@
          transform="scale(-0.8)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible;">
       <path
          id="path1081"
          style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
@@ -115,13 +72,11 @@
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1078"
          style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
@@ -129,13 +84,11 @@
          transform="scale(0.6) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible;">
       <path
          id="path1075"
          style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
@@ -143,13 +96,11 @@
          transform="scale(1.1) rotate(180) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1072"
          style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
@@ -157,13 +108,11 @@
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Lend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible;">
       <path
          id="path1057"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
@@ -171,13 +120,11 @@
          transform="scale(0.8) rotate(180) translate(12.5,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1054"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
@@ -185,7 +132,6 @@
          transform="scale(0.8) translate(12.5,0)" />
     </marker>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5062-3">
       <stop
          style="stop-color:#729fcf;stop-opacity:1"
@@ -207,20 +153,6 @@
          offset="1"
          style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect3066"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="single_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="0"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
     <linearGradient
        id="linearGradient7597">
       <stop
@@ -263,7 +195,6 @@
          id="stop3840-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5062-3"
        id="linearGradient5088"
        x1="43.818283"
@@ -272,7 +203,6 @@
        y2="11.684036"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient1043-3"
        id="linearGradient1278"
        x1="52"
@@ -282,7 +212,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0.99999965,-0.9999994)" />
     <filter
-       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
        id="filter1334"
        x="-0.0097777778"
@@ -290,7 +219,6 @@
        y="-0.015529412"
        height="1.0310588">
       <feGaussianBlur
-         inkscape:collect="always"
          stdDeviation="0.22"
          id="feGaussianBlur1336" />
     </filter>
@@ -312,7 +240,7 @@
      y="46.145554"
      id="text3130"
      xml:space="preserve"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28200001;marker:none;enable-background:accumulate"><tspan
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.282;marker:none;enable-background:accumulate"><tspan
        x="13.788582"
        y="46.145554"
        id="tspan3132" /></text>
@@ -335,10 +263,8 @@
           <path
              style="fill:none;fill-rule:evenodd;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:8, 4;stroke-dashoffset:0;stroke-opacity:1"
              d="M 32.400348,3.4254362 V 61.358668"
-             id="path384"
-             inkscape:connector-curvature="0" />
+             id="path384" />
           <path
-             inkscape:connector-curvature="0"
              id="path386"
              d="M 31.343815,2.8971697 V 60.830401"
              style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:8, 4;stroke-dashoffset:0;stroke-opacity:1" />
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
index ecffa22108..d96c780e1e 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
@@ -219,7 +219,7 @@ TaskDlgActiveView::TaskDlgActiveView(TechDraw::DrawPage* page)
     : TaskDialog()
 {
     widget  = new TaskActiveView(page);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-ActiveView"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_ActiveView"),
                                              widget->windowTitle(), true, 0);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.ui b/src/Mod/TechDraw/Gui/TaskActiveView.ui
index d8631f3525..ca22f4ae2c 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.ui
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.ui
@@ -27,7 +27,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources/TechDraw.qrc">
-    <normaloff>:/icons/actions/techdraw-ActiveView.svg</normaloff>:/icons/actions/techdraw-ActiveView.svg</iconset>
+    <normaloff>:/icons/actions/TechDraw_ActiveView.svg</normaloff>:/icons/actions/TechDraw_ActiveView.svg</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
index ab959eecbb..2daeb0c60e 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
@@ -515,7 +515,7 @@ TaskDlgCenterLine::TaskDlgCenterLine(TechDraw::DrawViewPart* partFeat,
     : TaskDialog()
 {
     widget  = new TaskCenterLine(partFeat,page,subNames, editMode);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-facecenterline"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_FaceCenterLine"),
                                              widget->windowTitle(), true, 0);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
@@ -528,7 +528,7 @@ TaskDlgCenterLine::TaskDlgCenterLine(TechDraw::DrawViewPart* partFeat,
     : TaskDialog()
 {
     widget  = new TaskCenterLine(partFeat,page, edgeName, editMode);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-facecenterline"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_FaceCenterLine"),
                                              widget->windowTitle(), true, 0);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.ui b/src/Mod/TechDraw/Gui/TaskCenterLine.ui
index 278d2cc5a9..e905c2d9c9 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.ui
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.ui
@@ -30,7 +30,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources/TechDraw.qrc">
-    <normaloff>:/icons/actions/techdraw-facecenterline.svg</normaloff>:/icons/actions/techdraw-facecenterline.svg</iconset>
+    <normaloff>:/icons/actions/TechDraw_FaceCenterLine.svg</normaloff>:/icons/actions/TechDraw_FaceCenterLine.svg</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>