diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
index 60886c58c7..d70d227761 100644
--- a/src/Mod/Part/Gui/AppPartGui.cpp
+++ b/src/Mod/Part/Gui/AppPartGui.cpp
@@ -127,6 +127,7 @@ PyMOD_INIT_FUNC(PartGui)
 
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/booleans"));
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/create"));
+    Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/measure"));
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/parametric"));
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/tools"));
 
diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
index a180b7e4f6..c756a88b53 100644
--- a/src/Mod/Part/Gui/Command.cpp
+++ b/src/Mod/Part/Gui/Command.cpp
@@ -2337,21 +2337,22 @@ bool CmdMeasureToggleAll::isActive(void)
 }
 
 //===========================================================================
-// Part_Measure_Toggle_3d
+// Part_Measure_Toggle_3D
 //===========================================================================
 
 DEF_STD_CMD_A(CmdMeasureToggle3d)
 
 CmdMeasureToggle3d::CmdMeasureToggle3d()
-  : Command("Part_Measure_Toggle_3d")
+  : Command("Part_Measure_Toggle_3D")
 {
     sAppModule    = "Part";
     sGroup        = QT_TR_NOOP("Part");
-    sMenuText     = QT_TR_NOOP("Toggle 3d");
-    sToolTipText  = QT_TR_NOOP("Toggle 3d");
-    sWhatsThis    = "Part_Measure_Toggle_3d";
+    sMenuText     = QT_TR_NOOP("Toggle 3D");
+    sToolTipText  = QT_TR_NOOP("Toggle on and off "
+                               "the dimensions on the 3D view");
+    sWhatsThis    = "Part_Measure_Toggle_3D";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Measure_Toggle_3d";
+    sPixmap       = "Part_Measure_Toggle_3D";
 }
 
 void CmdMeasureToggle3d::activated(int iMsg)
diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc
index 217f6728fe..955aa4c6f5 100644
--- a/src/Mod/Part/Gui/Resources/Part.qrc
+++ b/src/Mod/Part/Gui/Resources/Part.qrc
@@ -30,6 +30,15 @@
         <file>icons/create/Part_Torus.svg</file>
         <file>icons/create/Part_Tube.svg</file>
     </qresource>
+    <qresource>
+        <file>icons/measure/Part_Measure_Angular.svg</file>
+        <file>icons/measure/Part_Measure_Linear.svg</file>
+        <file>icons/measure/Part_Measure_Refresh.svg</file>
+        <file>icons/measure/Part_Measure_Step_Active.svg</file>
+        <file>icons/measure/Part_Measure_Step_Done.svg</file>
+        <file>icons/measure/Part_Measure_Toggle_3D.svg</file>
+        <file>icons/measure/Part_Measure_Toggle_Delta.svg</file>
+    </qresource>
     <qresource>
         <file>icons/parametric/Part_Box_Parametric.svg</file>
         <file>icons/parametric/Part_Circle_Parametric.svg</file>
@@ -72,13 +81,6 @@
         <file>icons/Part_Feature.svg</file>
         <file>icons/Part_FeatureImport.svg</file>
         <file>icons/Part_Import.svg</file>
-        <file>icons/Part_Measure_Angular.svg</file>
-        <file>icons/Part_Measure_Linear.svg</file>
-        <file>icons/Part_Measure_Refresh.svg</file>
-        <file>icons/Part_Measure_Step_Active.svg</file>
-        <file>icons/Part_Measure_Step_Done.svg</file>
-        <file>icons/Part_Measure_Toggle_3d.svg</file>
-        <file>icons/Part_Measure_Toggle_Delta.svg</file>
         <file>icons/Part_Points_from_Mesh.svg</file>
         <file>icons/Part_Refine_Shape.svg</file>
         <file>icons/Part_Reverse_Shape.svg</file>
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Angular.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Angular.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Angular.svg
rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Angular.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Linear.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Linear.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Linear.svg
rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Linear.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Refresh.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Refresh.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Refresh.svg
rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Refresh.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Step_Active.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Step_Active.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Step_Active.svg
rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Step_Active.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Step_Done.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Step_Done.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Step_Done.svg
rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Step_Done.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Toggle_3d.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Toggle_3D.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Toggle_3d.svg
rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Toggle_3D.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Toggle_Delta.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Toggle_Delta.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Toggle_Delta.svg
rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Toggle_Delta.svg
diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp
index 1447796a93..2c9e4595d9 100644
--- a/src/Mod/Part/Gui/TaskDimension.cpp
+++ b/src/Mod/Part/Gui/TaskDimension.cpp
@@ -1457,8 +1457,8 @@ PartGui::DimensionControl::DimensionControl(QWidget* parent): QWidget(parent)
 				QObject::tr("Reset Dialog"), this);
   commandLayout->addWidget(resetButton);
 
-  QPushButton *toggle3dButton = new QPushButton(Gui::BitmapFactory().pixmap("Part_Measure_Toggle_3d"),
-						QObject::tr("Toggle 3d"), this);
+  QPushButton *toggle3dButton = new QPushButton(Gui::BitmapFactory().pixmap("Part_Measure_Toggle_3D"),
+						QObject::tr("Toggle 3D"), this);
   QObject::connect(toggle3dButton, SIGNAL(clicked(bool)), this, SLOT(toggle3dSlot(bool)));
   commandLayout->addWidget(toggle3dButton);
 
diff --git a/src/Mod/Part/Gui/Workbench.cpp b/src/Mod/Part/Gui/Workbench.cpp
index 89d21570be..33687de77c 100644
--- a/src/Mod/Part/Gui/Workbench.cpp
+++ b/src/Mod/Part/Gui/Workbench.cpp
@@ -154,7 +154,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
              << "Part_Measure_Refresh"
              << "Part_Measure_Clear_All"
              << "Part_Measure_Toggle_All"
-             << "Part_Measure_Toggle_3d"
+             << "Part_Measure_Toggle_3D"
              << "Part_Measure_Toggle_Delta";
 
     // leave this for 0.14 until #0000477 is fixed
@@ -223,7 +223,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
              << "Part_Measure_Refresh"
              << "Part_Measure_Clear_All"
              << "Part_Measure_Toggle_All"
-             << "Part_Measure_Toggle_3d"
+             << "Part_Measure_Toggle_3D"
              << "Part_Measure_Toggle_Delta";
 
     return root;