diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 815b3637f5..38d284171b 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -303,7 +303,7 @@ CmdTechDrawView::CmdTechDrawView()
     sToolTipText    = QT_TR_NOOP("Insert a View");
     sWhatsThis      = "TechDraw_View";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-View";
+    sPixmap         = "actions/TechDraw_View";
 }
 
 void CmdTechDrawView::activated(int iMsg)
@@ -733,7 +733,7 @@ bool CmdTechDrawProjectionGroup::isActive(void)
 //    sToolTipText    = QT_TR_NOOP("Insert a new View of a multiple Parts in the active drawing");
 //    sWhatsThis      = "TechDraw_NewMulti";
 //    sStatusTip      = sToolTipText;
-//    sPixmap         = "actions/techdraw-multiview";
+//    sPixmap         = "actions/TechDraw_Multiview";
 //}
 
 //void CmdTechDrawNewMulti::activated(int iMsg)
@@ -1179,7 +1179,7 @@ CmdTechDrawDraftView::CmdTechDrawDraftView()
     sToolTipText  = QT_TR_NOOP("Insert a View of a Draft Workbench object");
     sWhatsThis    = "TechDraw_NewDraft";
     sStatusTip    = sToolTipText;
-    sPixmap       = "actions/techdraw-DraftView";
+    sPixmap       = "actions/TechDraw_DraftView";
 }
 
 void CmdTechDrawDraftView::activated(int iMsg)
@@ -1237,7 +1237,7 @@ CmdTechDrawArchView::CmdTechDrawArchView()
     sToolTipText  = QT_TR_NOOP("Insert a View of a Section Plane from Arch Workbench");
     sWhatsThis    = "TechDraw_NewArch";
     sStatusTip    = sToolTipText;
-    sPixmap       = "actions/techdraw-ArchView";
+    sPixmap       = "actions/TechDraw_ArchView";
 }
 
 void CmdTechDrawArchView::activated(int iMsg)
diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
index bccdde237e..bef6ed17c3 100644
--- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
@@ -107,7 +107,7 @@ CmdTechDrawLeaderLine::CmdTechDrawLeaderLine()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_LeaderLine";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-LeaderLine";
+    sPixmap         = "actions/TechDraw_LeaderLine";
 }
 
 void CmdTechDrawLeaderLine::activated(int iMsg)
@@ -260,7 +260,7 @@ Gui::Action * CmdTechDrawCosmeticVertexGroup::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* p1 = pcAction->addAction(QString());
-    p1->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-CosmeticVertex"));
+    p1->setIcon(Gui::BitmapFactory().iconFromTheme("actions/TechDraw_CosmeticVertex"));
     p1->setObjectName(QString::fromLatin1("TechDraw_CosmeticVertex"));
     p1->setWhatsThis(QString::fromLatin1("TechDraw_CosmeticVertex"));
     QAction* p2 = pcAction->addAction(QString());
@@ -410,7 +410,7 @@ CmdTechDrawCosmeticVertex::CmdTechDrawCosmeticVertex()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_CosmeticVertex";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-CosmeticVertex";
+    sPixmap         = "actions/TechDraw_CosmeticVertex";
 }
 
 void CmdTechDrawCosmeticVertex::activated(int iMsg)
@@ -549,7 +549,7 @@ CmdTechDrawAnnotation::CmdTechDrawAnnotation()
     sToolTipText  = sMenuText;
     sWhatsThis    = "TechDraw_NewAnnotation";
     sStatusTip    = sToolTipText;
-    sPixmap       = "actions/techdraw-annotation";
+    sPixmap       = "actions/TechDraw_Annotation";
 }
 
 void CmdTechDrawAnnotation::activated(int iMsg)
@@ -630,11 +630,11 @@ Gui::Action * CmdTechDrawCenterLineGroup::createAction(void)
     p1->setObjectName(QString::fromLatin1("TechDraw_FaceCenterLine"));
     p1->setWhatsThis(QString::fromLatin1("TechDraw_FaceCenterLine"));
     QAction* p2 = pcAction->addAction(QString());
-    p2->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-2linecenterline"));
+    p2->setIcon(Gui::BitmapFactory().iconFromTheme("actions/TechDraw_2LineCenterline"));
     p2->setObjectName(QString::fromLatin1("TechDraw_2LineCenterLine"));
     p2->setWhatsThis(QString::fromLatin1("TechDraw_2LineCenterLine"));
     QAction* p3 = pcAction->addAction(QString());
-    p3->setIcon(Gui::BitmapFactory().iconFromTheme("actions/techdraw-2pointcenterline"));
+    p3->setIcon(Gui::BitmapFactory().iconFromTheme("actions/TechDraw_2PointCenterline"));
     p3->setObjectName(QString::fromLatin1("TechDraw_2PointCenterLine"));
     p3->setWhatsThis(QString::fromLatin1("TechDraw_2PointCenterLine"));
 
@@ -802,7 +802,7 @@ CmdTechDraw2LineCenterLine::CmdTechDraw2LineCenterLine()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_2LineCenterLine";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-2linecenterline";
+    sPixmap         = "actions/TechDraw_2LineCenterline";
 }
 
 void CmdTechDraw2LineCenterLine::activated(int iMsg)
@@ -878,7 +878,7 @@ CmdTechDraw2PointCenterLine::CmdTechDraw2PointCenterLine()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_2PointCenterLine";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-2pointcenterline";
+    sPixmap         = "actions/TechDraw_2PointCenterline";
 }
 
 void CmdTechDraw2PointCenterLine::activated(int iMsg)
@@ -991,7 +991,7 @@ CmdTechDraw2PointCosmeticLine::CmdTechDraw2PointCosmeticLine()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_2PointCosmeticLine";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-line2points";
+    sPixmap         = "actions/TechDraw_Line2Points";
 }
 
 void CmdTechDraw2PointCosmeticLine::activated(int iMsg)
@@ -1147,7 +1147,7 @@ CmdTechDrawCosmeticEraser::CmdTechDrawCosmeticEraser()
     sToolTipText    = sMenuText;
     sWhatsThis      = "TechDraw_CosmeticEraser";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-CosmeticEraser";
+    sPixmap         = "actions/TechDraw_CosmeticEraser";
 }
 
 void CmdTechDrawCosmeticEraser::activated(int iMsg)
@@ -1268,7 +1268,7 @@ CmdTechDrawDecorateLine::CmdTechDrawDecorateLine()
     sToolTipText    = QT_TR_NOOP("Change Appearance of selected Lines");
     sWhatsThis      = "TechDraw_DecorateLine";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-DecorateLine";
+    sPixmap         = "actions/TechDraw_DecorateLine";
 }
 
 void CmdTechDrawDecorateLine::activated(int iMsg)
diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
index 188d4a29bc..1672bb77f4 100644
--- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
@@ -258,7 +258,7 @@ CmdTechDrawImage::CmdTechDrawImage()
     sToolTipText  = QT_TR_NOOP("Insert Bitmap from a file into a page");
     sWhatsThis    = "TechDraw_Image";
     sStatusTip    = QT_TR_NOOP("Insert Bitmap from a file into a page");
-    sPixmap       = "actions/techdraw-image";
+    sPixmap       = "actions/TechDraw_Image";
 }
 
 void CmdTechDrawImage::activated(int iMsg)
@@ -310,7 +310,7 @@ CmdTechDrawToggleFrame::CmdTechDrawToggleFrame()
     sToolTipText    = QT_TR_NOOP("Turn View Frames On/Off");
     sWhatsThis      = "TechDraw_Toggle";
     sStatusTip      = sToolTipText;
-    sPixmap         = "actions/techdraw-toggleframe";
+    sPixmap         = "actions/TechDraw_ToggleFrame";
 }
 
 void CmdTechDrawToggleFrame::activated(int iMsg)
diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
index 8a5170460a..954981459f 100644
--- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
+++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
@@ -75,40 +75,40 @@
         <file>icons/TechDraw_HorizontalExtentDimension.svg</file>
         <file>icons/TechDraw_VerticalExtentDimension.svg</file>
         <file>icons/TechDraw_LandmarkDimension.svg</file>
-        <file>icons/actions/techdraw-View.svg</file>
+        <file>icons/actions/TechDraw_View.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_Multiview.svg</file>
+        <file>icons/actions/TechDraw_Annotation.svg</file>
         <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-DraftView.svg</file>
-        <file>icons/actions/techdraw-ArchView.svg</file>
+        <file>icons/actions/TechDraw_DraftView.svg</file>
+        <file>icons/actions/TechDraw_ArchView.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_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_Image.svg</file>
         <file>icons/actions/TechDraw_DetailView.svg</file>
-        <file>icons/actions/techdraw-LeaderLine.svg</file>
+        <file>icons/actions/TechDraw_LeaderLine.svg</file>
         <file>icons/actions/TechDraw_RichTextAnnotation.svg</file>
-        <file>icons/actions/techdraw-CosmeticVertex.svg</file>
+        <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-2linecenterline.svg</file>
-        <file>icons/actions/techdraw-2pointcenterline.svg</file>
-        <file>icons/actions/techdraw-line2points.svg</file>
-        <file>icons/actions/techdraw-CosmeticEraser.svg</file>
-        <file>icons/actions/techdraw-DecorateLine.svg</file>
-        <file>icons/actions/techdraw-facedecor.svg</file>
+        <file>icons/actions/TechDraw_2LineCenterline.svg</file>
+        <file>icons/actions/TechDraw_2PointCenterline.svg</file>
+        <file>icons/actions/TechDraw_Line2Points.svg</file>
+        <file>icons/actions/TechDraw_CosmeticEraser.svg</file>
+        <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_Symbol.svg</file>
         <file>icons/actions/TechDraw_Tile.svg</file>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/bgColor.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/bgColor.svg
index 8c08abefc9..ff5e2be840 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/bgColor.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/bgColor.svg
@@ -556,7 +556,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -564,7 +564,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/fgColor.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/fgColor.svg
index b80c58b424..8e1fc044ea 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/fgColor.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/fgColor.svg
@@ -556,7 +556,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -564,7 +564,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/indentLess.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/indentLess.svg
index 01cd77700f..12dfaf88ff 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/indentLess.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/indentLess.svg
@@ -556,7 +556,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -564,7 +564,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/indentMore.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/indentMore.svg
index 757c638c1f..a4ccf07d19 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/indentMore.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/indentMore.svg
@@ -556,7 +556,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -564,7 +564,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/insertImage.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/insertImage.svg
index d79e3f72f6..e747fd07e8 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/insertImage.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/insertImage.svg
@@ -903,7 +903,7 @@
         <dc:source>http://jimmac.musichall.cz</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-image</dc:title>
+        <dc:title>TechDraw_Image</dc:title>
         <dc:date>2016-11-06</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -911,7 +911,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-image.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Image.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/listBullet.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/listBullet.svg
index 96ed8ef519..0204947373 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/listBullet.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/listBullet.svg
@@ -556,7 +556,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -564,7 +564,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/listNumber.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/listNumber.svg
index c820b63b12..f5d6a04d16 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/listNumber.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/listNumber.svg
@@ -554,7 +554,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -562,7 +562,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textBold.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textBold.svg
index 56b0e7b896..f6e83c298a 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textBold.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textBold.svg
@@ -556,7 +556,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -564,7 +564,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textItalic.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textItalic.svg
index ffe0b367cd..0eaada7b37 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textItalic.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textItalic.svg
@@ -556,7 +556,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -564,7 +564,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textStrike.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textStrike.svg
index d4c1f57e86..c42b0d36a2 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textStrike.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textStrike.svg
@@ -556,7 +556,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -564,7 +564,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textUnderline.svg b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textUnderline.svg
index 3f8d4b5aaa..d352753da5 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textUnderline.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/MRTE/textUnderline.svg
@@ -556,7 +556,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -564,7 +564,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalExtentDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalExtentDimension.svg
index 586971ef96..94ae5a3fe9 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalExtentDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalExtentDimension.svg
@@ -628,7 +628,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -636,7 +636,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalExtentDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalExtentDimension.svg
index 20bff07a7f..b3020bc84f 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalExtentDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalExtentDimension.svg
@@ -628,7 +628,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -636,7 +636,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-2linecenterline.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_2LineCenterline.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-2linecenterline.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_2LineCenterline.svg
index f09054c579..b05c38e046 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-2linecenterline.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_2LineCenterline.svg
@@ -14,7 +14,7 @@
    width="64"
    height="64"
    id="svg3085"
-   sodipodi:docname="techdraw-2linecenterline.svg"
+   sodipodi:docname="TechDraw_2LineCenterline.svg"
    inkscape:version="0.92.4 (unknown)">
   <sodipodi:namedview
      pagecolor="#ffffff"
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-2pointcenterline.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_2PointCenterline.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-2pointcenterline.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_2PointCenterline.svg
index c496977d85..b55eecf5bd 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-2pointcenterline.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_2PointCenterline.svg
@@ -14,7 +14,7 @@
    width="64"
    height="64"
    id="svg3085"
-   sodipodi:docname="techdraw-2pointcenterline.svg"
+   sodipodi:docname="TechDraw_2PointCenterline.svg"
    inkscape:version="0.92.4 (unknown)">
   <sodipodi:namedview
      pagecolor="#ffffff"
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-annotation.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Annotation.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-annotation.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Annotation.svg
index 263d331c20..3f6ff1b25b 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-annotation.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Annotation.svg
@@ -19,7 +19,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <title
-     id="title2043">Techdraw-annotation</title>
+     id="title2043">TechDraw_Annotation</title>
   <defs
      id="defs2768">
     <linearGradient
@@ -557,7 +557,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Techdraw-annotation</dc:title>
+        <dc:title>TechDraw_Annotation</dc:title>
         <cc:license
            rdf:resource="http://artlibre.org/licence/lal" />
         <dc:date>2019-01-14</dc:date>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ArchView.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ArchView.svg
similarity index 100%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-ArchView.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ArchView.svg
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-CosmeticEraser.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_CosmeticEraser.svg
similarity index 100%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-CosmeticEraser.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_CosmeticEraser.svg
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-CosmeticVertex.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_CosmeticVertex.svg
similarity index 100%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-CosmeticVertex.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_CosmeticVertex.svg
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-DecorateLine.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_DecorateLine.svg
similarity index 100%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-DecorateLine.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_DecorateLine.svg
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-DraftView.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_DraftView.svg
similarity index 100%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-DraftView.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_DraftView.svg
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-facedecor.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_FaceDecor.svg
similarity index 100%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-facedecor.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_FaceDecor.svg
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-image.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Image.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-image.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Image.svg
index 8b4e9adfcd..7f74ae46f5 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-image.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Image.svg
@@ -13,7 +13,7 @@
    width="64"
    version="1.1"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="techdraw-image.svg">
+   sodipodi:docname="TechDraw_Image.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -901,7 +901,7 @@
         <dc:source>http://jimmac.musichall.cz</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-image</dc:title>
+        <dc:title>TechDraw_Image</dc:title>
         <dc:date>2016-11-06</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -909,7 +909,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-image.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Image.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-LeaderLine.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_LeaderLine.svg
similarity index 100%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-LeaderLine.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_LeaderLine.svg
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-line2points.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Line2Points.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-line2points.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Line2Points.svg
index 83216418c2..12e2203d47 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-line2points.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Line2Points.svg
@@ -14,7 +14,7 @@
    width="64"
    height="64"
    id="svg3085"
-   sodipodi:docname="techdraw-line2points.svg"
+   sodipodi:docname="TechDraw_Line2Points.svg"
    inkscape:version="0.92.4 (unknown)">
   <sodipodi:namedview
      pagecolor="#ffffff"
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_MoveView.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_MoveView.svg
index 6c11f9efab..2b69f8647d 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_MoveView.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_MoveView.svg
@@ -560,7 +560,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -568,7 +568,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-multiview.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Multiview.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-multiview.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Multiview.svg
index 9a0d4a57c8..736e07c359 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-multiview.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Multiview.svg
@@ -1,6 +1,6 @@
 <?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#" 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" 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="svg249" inkscape:version="0.48.5 r10040" sodipodi:docname="techdraw-multiview.svg">
+<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" 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="svg249" inkscape:version="0.48.5 r10040" sodipodi:docname="TechDraw_Multiview.svg">
   <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1600" inkscape:window-height="837" id="namedview91" showgrid="true" inkscape:snap-global="true" inkscape:snap-bbox="true" inkscape:snap-nodes="false" inkscape:zoom="7.2844566" inkscape:cx="10.74494" inkscape:cy="29.920153" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="svg249">
     <inkscape:grid type="xygrid" id="grid3068" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
   </sodipodi:namedview>
@@ -141,7 +141,7 @@
         </dc:creator>
         <dc:source>http://agryson.net</dc:source>
         <cc:license rdf:resource="https://www.gnu.org/copyleft/lesser.html"/>
-        <dc:title>techdraw-multiview</dc:title>
+        <dc:title>TechDraw_Multiview</dc:title>
         <dc:date>2016-10-29</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -149,7 +149,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-multiview.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Multiview.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ProjectShape.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ProjectShape.svg
index 604a2516c6..ee862fff7a 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ProjectShape.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ProjectShape.svg
@@ -547,7 +547,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -555,7 +555,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ShareView.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ShareView.svg
index 0451f24034..a75e70cebd 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ShareView.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ShareView.svg
@@ -545,7 +545,7 @@
         <dc:source>http://agryson.net</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -553,7 +553,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-toggleframe.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ToggleFrame.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-toggleframe.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ToggleFrame.svg
index b34da822aa..c20ee4cc5e 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-toggleframe.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ToggleFrame.svg
@@ -15,7 +15,7 @@
    id="svg249"
    sodipodi:version="0.32"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="techdraw-toggleframe.svg"
+   sodipodi:docname="TechDraw_ToggleFrame.svg"
    inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
    inkscape:export-xdpi="240.00000"
    inkscape:export-ydpi="240.00000"
@@ -760,7 +760,7 @@
         <dc:source>http://jimmac.musichall.cz</dc:source>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>techdraw-toggleframe</dc:title>
+        <dc:title>TechDraw_ToggleFrame</dc:title>
         <dc:date>2016-01-30</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -768,7 +768,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-toggleframe.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_ToggleFrame.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-View.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg
similarity index 99%
rename from src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-View.svg
rename to src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg
index 318bdf06d8..666acc1e2e 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-View.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg
@@ -1,6 +1,6 @@
 <?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#" 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" 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="svg249" inkscape:version="0.48.5 r10040" sodipodi:docname="techdraw-view.svg">
+<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" 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="svg249" inkscape:version="0.48.5 r10040" sodipodi:docname="TechDraw_View.svg">
   <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1600" inkscape:window-height="837" id="namedview91" showgrid="true" inkscape:snap-global="true" inkscape:snap-bbox="true" inkscape:snap-nodes="false" inkscape:zoom="5.1508887" inkscape:cx="24.236802" inkscape:cy="27.017432" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="svg249">
     <inkscape:grid type="xygrid" id="grid3068" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
   </sodipodi:namedview>
@@ -141,7 +141,7 @@
         </dc:creator>
         <dc:source>http://agryson.net</dc:source>
         <cc:license rdf:resource="https://www.gnu.org/copyleft/lesser.html"/>
-        <dc:title>techdraw-view</dc:title>
+        <dc:title>TechDraw_View</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -149,7 +149,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-view.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp
index 955f6e3c16..6aef6e97bb 100644
--- a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp
@@ -362,7 +362,7 @@ TaskDlgCosVertex::TaskDlgCosVertex(TechDraw::DrawViewPart* baseFeat,
     : TaskDialog()
 {
     widget  = new TaskCosVertex(baseFeat, page);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-CosmeticVertex"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_CosmeticVertex"),
                                              widget->windowTitle(), true, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.ui b/src/Mod/TechDraw/Gui/TaskCosVertex.ui
index f635b72878..ddeaa080f7 100644
--- a/src/Mod/TechDraw/Gui/TaskCosVertex.ui
+++ b/src/Mod/TechDraw/Gui/TaskCosVertex.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources/TechDraw.qrc">
-    <normaloff>:/icons/actions/techdraw-CosmeticVertex.svg</normaloff>:/icons/actions/techdraw-CosmeticVertex.svg</iconset>
+    <normaloff>:/icons/actions/TechDraw_CosmeticVertex.svg</normaloff>:/icons/actions/TechDraw_CosmeticVertex.svg</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
index cfcd17bd8e..75bdb29360 100644
--- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
@@ -289,7 +289,7 @@ TaskDlgCosmeticLine::TaskDlgCosmeticLine(TechDraw::DrawViewPart* partFeat,
     : TaskDialog()
 {
     widget  = new TaskCosmeticLine(partFeat, points, is3d);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-line2points"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_Line2Points"),
                                              widget->windowTitle(), true, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
@@ -300,7 +300,7 @@ TaskDlgCosmeticLine::TaskDlgCosmeticLine(TechDraw::DrawViewPart* partFeat,
     : TaskDialog()
 {
     widget  = new TaskCosmeticLine(partFeat, edgeName);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-line2points"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_Line2Points"),
                                              widget->windowTitle(), true, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
index b914c901c4..fce762a5db 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
@@ -873,7 +873,7 @@ TaskDlgLeaderLine::TaskDlgLeaderLine(TechDraw::DrawView* baseFeat,
     : TaskDialog()
 {
     widget  = new TaskLeaderLine(baseFeat,page);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-LeaderLine"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_LeaderLine"),
                                              widget->windowTitle(), true, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
@@ -883,7 +883,7 @@ TaskDlgLeaderLine::TaskDlgLeaderLine(TechDrawGui::ViewProviderLeader* leadVP)
     : TaskDialog()
 {
     widget  = new TaskLeaderLine(leadVP);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-LeaderLine"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_LeaderLine"),
                                              widget->windowTitle(), true, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.ui b/src/Mod/TechDraw/Gui/TaskLeaderLine.ui
index 897270d990..a6f5fcf8dd 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.ui
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.ui
@@ -27,7 +27,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources/TechDraw.qrc">
-    <normaloff>:/icons/actions/techdraw-LeaderLine.svg</normaloff>:/icons/actions/techdraw-LeaderLine.svg</iconset>
+    <normaloff>:/icons/actions/TechDraw_LeaderLine.svg</normaloff>:/icons/actions/TechDraw_LeaderLine.svg</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp
index d9599c6a4c..98852dd7b4 100644
--- a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp
@@ -437,7 +437,7 @@ TaskDlgLineDecor::TaskDlgLineDecor(TechDraw::DrawViewPart* partFeat,
     TaskDialog()
 {
     widget  = new TaskLineDecor(partFeat, edgeNames);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-DecorateLine"),
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_DecorateLine"),
                                          widget->windowTitle(), true, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
@@ -448,7 +448,7 @@ TaskDlgLineDecor::TaskDlgLineDecor(TechDraw::DrawViewPart* partFeat,
     TaskLineDecor* parent = dynamic_cast<TaskLineDecor*>(widget);
     if (parent != nullptr) {
         restore = new TaskRestoreLines(partFeat, parent);
-        restoreBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-DecorateLine"),
+        restoreBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_DecorateLine"),
                                              tr("Restore Invisible Lines"), true, nullptr);
         restoreBox->groupLayout()->addWidget(restore);
         Content.push_back(restoreBox);
diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
index 826120500b..6180ad9935 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
@@ -40,7 +40,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderAnnotation, TechDrawGui::ViewProviderDr
 
 ViewProviderAnnotation::ViewProviderAnnotation()
 {
-    sPixmap = "actions/techdraw-annotation";
+    sPixmap = "actions/TechDraw_Annotation";
 }
 
 ViewProviderAnnotation::~ViewProviderAnnotation()
diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
index 2458fd4fd5..c669b2fb0c 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
@@ -40,7 +40,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderImage, TechDrawGui::ViewProviderDrawing
 
 ViewProviderImage::ViewProviderImage()
 {
-    sPixmap = "actions/techdraw-image";
+    sPixmap = "actions/TechDraw_Image";
 
     ADD_PROPERTY_TYPE(Crop ,(false),"Image", App::Prop_None, "Crop image to Width x Height");
 }
diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp
index 1cb24cfbad..cbcb473798 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp
@@ -63,7 +63,7 @@ const char* ViewProviderLeader::LineStyleEnums[] = { "NoLine",
 
 ViewProviderLeader::ViewProviderLeader()
 {
-    sPixmap = "actions/techdraw-LeaderLine";
+    sPixmap = "actions/TechDraw_LeaderLine";
 
     static const char *group = "Line Format";
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
index 0bd5472ad0..b9f3f25c90 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
@@ -83,7 +83,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderDraft, TechDrawGui::ViewProviderSymbol)
 
 ViewProviderDraft::ViewProviderDraft()
 {
-    sPixmap = "actions/techdraw-DraftView.svg";
+    sPixmap = "actions/TechDraw_DraftView.svg";
 }
 
 ViewProviderDraft::~ViewProviderDraft()
@@ -98,7 +98,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderArch, TechDrawGui::ViewProviderSymbol)
 
 ViewProviderArch::ViewProviderArch()
 {
-    sPixmap = "actions/techdraw-ArchView.svg";
+    sPixmap = "actions/TechDraw_ArchView.svg";
 }
 
 ViewProviderArch::~ViewProviderArch()