diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.h b/src/Mod/PartDesign/Gui/ViewProviderBody.h
index 34aa9b5a2..6c2539a95 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBody.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderBody.h
@@ -37,7 +37,7 @@ namespace PartDesignGui {
  */
 class PartDesignGuiExport ViewProviderBody : public PartGui::ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderBody);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderBody);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderGroove.h b/src/Mod/PartDesign/Gui/ViewProviderGroove.h
index c569d3dfc..92f3e4b4a 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderGroove.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderGroove.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderGroove : public ViewProvider
 {
-    PROPERTY_HEADER(PartGui::ViewProviderGroove);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderGroove);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderHole.h b/src/Mod/PartDesign/Gui/ViewProviderHole.h
index c8bd8d7dd..6eaca17b7 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderHole.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderHole.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderHole : public ViewProvider
 {
-    PROPERTY_HEADER(PartGui::ViewProviderHole);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderHole);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp
index f23c64b89..ab22de86d 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp
@@ -36,7 +36,7 @@
 
 using namespace PartDesignGui;
 
-PROPERTY_SOURCE(PartDesignGui::ViewProviderLinearPattern,PartDesignGui::ViewProvider)
+PROPERTY_SOURCE(PartDesignGui::ViewProviderLinearPattern,PartDesignGui::ViewProviderTransformed)
 
 bool ViewProviderLinearPattern::setEdit(int ModNum)
 {
diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h
index 454062eb5..04a4eef4d 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderLinearPattern : public ViewProviderTransformed
 {
-    PROPERTY_HEADER(PartGui::ViewProviderLinearPattern);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderLinearPattern);
 public:
     ViewProviderLinearPattern()
         { featureName = std::string("LinearPattern");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMainPart.h b/src/Mod/PartDesign/Gui/ViewProviderMainPart.h
index cda6bfec5..343bfda17 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMainPart.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderMainPart.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderMainPart : public PartGui::ViewProviderPart
 {
-    PROPERTY_HEADER(PartGui::ViewProviderMainPart);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderMainPart);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp
index cd7c14c56..8c7384cb2 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp
@@ -36,7 +36,7 @@
 
 using namespace PartDesignGui;
 
-PROPERTY_SOURCE(PartDesignGui::ViewProviderMirrored,PartDesignGui::ViewProvider)
+PROPERTY_SOURCE(PartDesignGui::ViewProviderMirrored,PartDesignGui::ViewProviderTransformed)
 
 bool ViewProviderMirrored::setEdit(int ModNum)
 {
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h
index 3d0899079..0bbb3018d 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderMirrored : public ViewProviderTransformed
 {
-    PROPERTY_HEADER(PartGui::ViewProviderMirrored);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderMirrored);
 public:
     ViewProviderMirrored()
         { featureName = std::string("Mirrored");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
index 86105a19b..72c777b2c 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
@@ -36,7 +36,7 @@
 
 using namespace PartDesignGui;
 
-PROPERTY_SOURCE(PartDesignGui::ViewProviderMultiTransform,PartDesignGui::ViewProvider)
+PROPERTY_SOURCE(PartDesignGui::ViewProviderMultiTransform,PartDesignGui::ViewProviderTransformed)
 
 bool ViewProviderMultiTransform::setEdit(int ModNum)
 {
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h
index 253fec609..261497a0c 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderMultiTransform : public ViewProviderTransformed
 {
-    PROPERTY_HEADER(PartGui::ViewProviderMultiTransform);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderMultiTransform);
 public:
     ViewProviderMultiTransform()
         { featureName = std::string("MultiTransform");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.h b/src/Mod/PartDesign/Gui/ViewProviderPad.h
index 71fb2c334..7f7b82ed6 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPad.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPad.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderPad : public ViewProvider
 {
-    PROPERTY_HEADER(PartGui::ViewProviderPad);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderPad);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp
index 7ec126da5..d72468c48 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp
@@ -36,7 +36,7 @@
 
 using namespace PartDesignGui;
 
-PROPERTY_SOURCE(PartDesignGui::ViewProviderPolarPattern,PartDesignGui::ViewProvider)
+PROPERTY_SOURCE(PartDesignGui::ViewProviderPolarPattern,PartDesignGui::ViewProviderTransformed)
 
 bool ViewProviderPolarPattern::setEdit(int ModNum)
 {
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h
index f75f5e80d..cf0dc4984 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderPolarPattern : public ViewProviderTransformed
 {
-    PROPERTY_HEADER(PartGui::ViewProviderPolarPattern);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderPolarPattern);
 public:
     ViewProviderPolarPattern()
         { featureName = std::string("PolarPattern");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h
index a2dbeaeaf..42d17ecd3 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h
@@ -31,7 +31,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderRevolution : public ViewProvider
 {
-    PROPERTY_HEADER(PartGui::ViewProviderRevolution);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderRevolution);
 
 public:
     /// constructor
diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp
index 9a4e8f455..ff09edb24 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp
@@ -36,7 +36,7 @@
 
 using namespace PartDesignGui;
 
-PROPERTY_SOURCE(PartDesignGui::ViewProviderScaled,PartDesignGui::ViewProvider)
+PROPERTY_SOURCE(PartDesignGui::ViewProviderScaled,PartDesignGui::ViewProviderTransformed)
 
 bool ViewProviderScaled::setEdit(int ModNum)
 {
diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.h b/src/Mod/PartDesign/Gui/ViewProviderScaled.h
index f3bc99d7d..a7fde745f 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderScaled.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.h
@@ -30,7 +30,7 @@ namespace PartDesignGui {
 
 class PartDesignGuiExport ViewProviderScaled : public ViewProviderTransformed
 {
-    PROPERTY_HEADER(PartGui::ViewProviderScaled);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderScaled);
 public:
     ViewProviderScaled()
         { featureName = std::string("Scaled");
diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
index b7228e827..41e4f96ac 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
@@ -115,24 +115,7 @@ bool ViewProviderTransformed::setEdit(int ModNum)
 
 void ViewProviderTransformed::unsetEdit(int ModNum)
 {
-    // return to the WB we were in before editing the PartDesign feature
-    Gui::Command::assureWorkbench(oldWb.c_str());
-
-    if (ModNum == ViewProvider::Default) {
-        // when pressing ESC make sure to close the dialog
-        Gui::Control().closeDialog();        
-        if ((PartDesignGui::ActivePartObject != NULL) && (oldTip != NULL)) {
-            Gui::Selection().clearSelection();
-            Gui::Selection().addSelection(oldTip->getDocument()->getName(), oldTip->getNameInDocument());
-            Gui::Command::doCommand(Gui::Command::Gui,"FreeCADGui.runCommand('PartDesign_MoveTip')");
-            oldTip = NULL;
-        } else {
-            oldTip = NULL;
-        }
-    }
-    else {
-        PartGui::ViewProviderPart::unsetEdit(ModNum);
-    }
+    ViewProvider::unsetEdit(ModNum);
 
     while (pcRejectedRoot->getNumChildren() > 7) {
         SoSeparator* sep = static_cast<SoSeparator*>(pcRejectedRoot->getChild(7));
diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h
index 8ecd67e7d..962676cc1 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h
@@ -26,19 +26,13 @@
 
 #include "ViewProvider.h"
 
-class SoCoordinate3;
-class SoIndexedFaceSet;
-class SoMultipleCopy;
-class SoNormal;
-class SoSeparator;
-
 namespace PartDesignGui {
 
 class TaskDlgTransformedParameters;
 
 class PartDesignGuiExport ViewProviderTransformed : public ViewProvider
 {
-    PROPERTY_HEADER(PartGui::ViewProviderTransformed);
+    PROPERTY_HEADER(PartDesignGui::ViewProviderTransformed);
 
 public:
     /// constructor