diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 4a46756f92..9dbdcad86a 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -114,7 +114,7 @@ CmdTechDrawPageDefault::CmdTechDrawPageDefault()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_PageDefault";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-PageDefault";
+    sPixmap         = "actions/TechDraw_PageDefault";
 }
 
 void CmdTechDrawPageDefault::activated(int iMsg)
@@ -177,7 +177,7 @@ CmdTechDrawPageTemplate::CmdTechDrawPageTemplate()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_PageTemplate";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-PageTemplate";
+    sPixmap         = "actions/TechDraw_PageTemplate";
 }
 
 void CmdTechDrawPageTemplate::activated(int iMsg)
@@ -1058,7 +1058,7 @@ CmdTechDrawSymbol::CmdTechDrawSymbol()
     sToolTipText  = QT_TR_NOOP("Insert symbol from an SVG file");
     sWhatsThis    = "TechDraw_Symbol";
     sStatusTip    = sToolTipText;
-    sPixmap       = "actions/techdraw-symbol";
+    sPixmap       = "actions/TechDraw_Symbol";
 }
 
 void CmdTechDrawSymbol::activated(int iMsg)
@@ -1307,7 +1307,7 @@ CmdTechDrawExportPageSVG::CmdTechDrawExportPageSVG()
     sToolTipText  = sMenuText;
     sWhatsThis    = "TechDraw_ExportPageSVG";
     sStatusTip    = sToolTipText;
-    sPixmap       = "actions/techdraw-ExportPageSVG";
+    sPixmap       = "actions/TechDraw_ExportPageSVG";
 }
 
 void CmdTechDrawExportPageSVG::activated(int iMsg)
@@ -1351,7 +1351,7 @@ CmdTechDrawExportPageDXF::CmdTechDrawExportPageDXF()
     sToolTipText  = sMenuText;
     sWhatsThis    = "TechDraw_ExportPageDXF";
     sStatusTip    = sToolTipText;
-    sPixmap       = "actions/techdraw-ExportPageDXF";
+    sPixmap       = "actions/TechDraw_ExportPageDXF";
 }
 
 void CmdTechDrawExportPageDXF::activated(int iMsg)
diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
index 0096539fee..fcdfed6e63 100644
--- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
@@ -1401,7 +1401,7 @@ CmdTechDrawWeldSymbol::CmdTechDrawWeldSymbol()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_WeldSymbol";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-weldsymbol";
+    sPixmap         = "actions/TechDraw_WeldSymbol";
 }
 
 void CmdTechDrawWeldSymbol::activated(int iMsg)
diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
index a947b7304e..dfb31be550 100644
--- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
+++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
@@ -36,16 +36,6 @@
         <file>icons/TechDraw_VerticalExtentDimension.svg</file>
         <file>icons/techdraw-landmarkdistance.svg</file>
         <file>icons/preferences-techdraw.svg</file>
-        <file>icons/arrownone.svg</file>
-        <file>icons/arrowdot.svg</file>
-        <file>icons/arrowopendot.svg</file>
-        <file>icons/arrowfilled.svg</file>
-        <file>icons/arrowopen.svg</file>
-        <file>icons/arrowtick.svg</file>
-        <file>icons/arrowfork.svg</file>
-        <file>icons/arrowpyramid.svg</file>
-        <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-multiview.svg</file>
@@ -53,17 +43,18 @@
         <file>icons/actions/techdraw-ClipGroup.svg</file>
         <file>icons/actions/techdraw-ClipGroupAdd.svg</file>
         <file>icons/actions/techdraw-ClipGroupRemove.svg</file>
-        <file>icons/actions/techdraw-symbol.svg</file>
         <file>icons/actions/techdraw-DraftView.svg</file>
         <file>icons/actions/techdraw-ArchView.svg</file>
-        <file>icons/actions/techdraw-ExportPageSVG.svg</file>
-        <file>icons/actions/techdraw-ExportPageDXF.svg</file>
+        <file>icons/actions/TechDraw_ExportPageDXF.svg</file>
+        <file>icons/actions/TechDraw_ExportPageSVG.svg</file>
         <file>icons/actions/techdraw-SectionView.svg</file>
         <file>icons/actions/techdraw-hatch.svg</file>
         <file>icons/actions/techdraw-GeometricHatch.svg</file>
         <file>icons/actions/techdraw-toggleframe.svg</file>
         <file>icons/actions/TechDraw_RedrawPage.svg</file>
         <file>icons/actions/techdraw-ProjectionGroup.svg</file>
+        <file>icons/actions/TechDraw_PageDefault.svg</file>
+        <file>icons/actions/TechDraw_PageTemplate.svg</file>
         <file>icons/actions/techdraw-SpreadsheetView.svg</file>
         <file>icons/actions/techdraw-image.svg</file>
         <file>icons/actions/techdraw-DetailView.svg</file>
@@ -80,8 +71,9 @@
         <file>icons/actions/techdraw-DecorateLine.svg</file>
         <file>icons/actions/techdraw-facedecor.svg</file>
         <file>icons/actions/techdraw-showall.svg</file>
-        <file>icons/actions/techdraw-weldsymbol.svg</file>
-        <file>icons/actions/techdraw-tile.svg</file>
+        <file>icons/actions/TechDraw_Symbol.svg</file>
+        <file>icons/actions/TechDraw_Tile.svg</file>
+        <file>icons/actions/TechDraw_WeldSymbol.svg</file>
         <file>icons/actions/section-up.svg</file>  
         <file>icons/actions/section-down.svg</file>
         <file>icons/actions/section-left.svg</file>
@@ -92,6 +84,14 @@
         <file>icons/arrow-down.svg</file>
         <file>icons/arrow-ccw.svg</file>
         <file>icons/arrow-cw.svg</file>
+        <file>icons/arrowdot.svg</file>
+        <file>icons/arrowfilled.svg</file>
+        <file>icons/arrowfork.svg</file>
+        <file>icons/arrownone.svg</file>
+        <file>icons/arrowopen.svg</file>
+        <file>icons/arrowopendot.svg</file>
+        <file>icons/arrowpyramid.svg</file>
+        <file>icons/arrowtick.svg</file>
         <file>icons/continuous-line.svg</file>
         <file>icons/dot-line.svg</file>
         <file>icons/dashDot-line.svg</file>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageDXF.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageDXF.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageDXF.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageDXF.svg
index f187bfc7ec..9c6c19b996 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageDXF.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageDXF.svg
@@ -24,7 +24,7 @@
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>techdraw-symbol</dc:title>
+        <dc:title>TechDraw_ExportPageDXF</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -32,7 +32,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageDXF.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageSVG.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageSVG.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageSVG.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageSVG.svg
index 763e2e7382..f5b104c478 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ExportPageSVG.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageSVG.svg
@@ -15,7 +15,7 @@
    height="64"
    id="svg2160"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="techdraw-saveSVG.svg">
+   sodipodi:docname="TechDraw_ExportPageSVG.svg">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -30,7 +30,7 @@
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>techdraw-symbol</dc:title>
+        <dc:title>TechDraw_ExportPageSVG</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -38,7 +38,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ExportPageSVG.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageDefault.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_PageDefault.svg
similarity index 100%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageDefault.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_PageDefault.svg
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageTemplate.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_PageTemplate.svg
similarity index 100%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-PageTemplate.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_PageTemplate.svg
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg
index 211de461ba..246f289925 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg
@@ -15,7 +15,7 @@
    height="64"
    id="svg2160"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="techdraw-symbol.svg">
+   sodipodi:docname="TechDraw_Symbol.svg">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -30,7 +30,7 @@
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>techdraw-symbol</dc:title>
+        <dc:title>TechDraw_Symbol</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -38,7 +38,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-tile.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Tile.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-tile.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Tile.svg
index e746e04f5a..e6a39f3c39 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-tile.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Tile.svg
@@ -14,7 +14,7 @@
    width="64"
    height="64"
    id="svg3085"
-   sodipodi:docname="techdraw-tile.svg"
+   sodipodi:docname="TechDraw_Tile.svg"
    inkscape:version="0.92.4 (unknown)">
   <sodipodi:namedview
      pagecolor="#ffffff"
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-weldsymbol.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_WeldSymbol.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-weldsymbol.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_WeldSymbol.svg
index 578a705c73..b7a541195d 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-weldsymbol.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_WeldSymbol.svg
@@ -14,7 +14,7 @@
    width="64"
    height="64"
    id="svg3085"
-   sodipodi:docname="techdraw-weldsymbol.svg"
+   sodipodi:docname="TechDraw_WeldSymbol.svg"
    inkscape:version="0.92.4 (unknown)">
   <sodipodi:namedview
      pagecolor="#ffffff"
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
index 4e8b5ce3b6..4cf922102f 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
@@ -691,7 +691,7 @@ TaskDlgWeldingSymbol::TaskDlgWeldingSymbol(TechDraw::DrawLeaderLine* leader)
     : TaskDialog()
 {
     widget  = new TaskWeldingSymbol(leader);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-weldsymbol"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_WeldSymbol"),
                                              widget->windowTitle(), true, 0);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
@@ -701,7 +701,7 @@ TaskDlgWeldingSymbol::TaskDlgWeldingSymbol(TechDraw::DrawWeldSymbol* weld)
     : TaskDialog()
 {
     widget  = new TaskWeldingSymbol(weld);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-weldsymbol"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_WeldSymbol"),
                                              widget->windowTitle(), true, 0);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui
index 504f12f6b9..dd2fa839df 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui
@@ -27,7 +27,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources/TechDraw.qrc">
-    <normaloff>:/icons/actions/techdraw-weldsymbol.svg</normaloff>:/icons/actions/techdraw-weldsymbol.svg</iconset>
+    <normaloff>:/icons/actions/TechDraw_WeldSymbol.svg</normaloff>:/icons/actions/TechDraw_WeldSymbol.svg</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
index 2cf4ad10c5..6e888a97dd 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
@@ -48,7 +48,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderTile, Gui::ViewProviderDocumentObject)
 
 ViewProviderTile::ViewProviderTile()
 {
-    sPixmap = "actions/techdraw-tile";
+    sPixmap = "actions/TechDraw_Tile";
 }
 
 ViewProviderTile::~ViewProviderTile()
diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp
index 89baae9274..8bd2fd00c1 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp
@@ -59,7 +59,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderWeld, TechDrawGui::ViewProviderDrawingV
 
 ViewProviderWeld::ViewProviderWeld()
 {
-    sPixmap = "actions/techdraw-weldsymbol";
+    sPixmap = "actions/TechDraw_WeldSymbol";
     static const char *group = "Text";
 
     ADD_PROPERTY_TYPE(Font, (prefFontName().c_str()),group,App::Prop_None, "The name of the font to use");