diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp
index ed936a46b1..45e0076e95 100644
--- a/src/Mod/Part/App/PartFeature.cpp
+++ b/src/Mod/Part/App/PartFeature.cpp
@@ -272,6 +272,7 @@ template class PartExport FeaturePythonT<Part::Feature>;
 }
 
 // ----------------------------------------------------------------
+
 #include <GProp_GProps.hxx>
 #include <BRepGProp.hxx>
 #include <gce_MakeLin.hxx>
@@ -318,4 +319,3 @@ std::vector<Part::cutFaces> Part::findAllFacesCutBy(
 
     return result;
 }
-// --------------------------------------------------------------------
diff --git a/src/Mod/Part/App/PartFeature.h b/src/Mod/Part/App/PartFeature.h
index ed3de37376..9bb4bd49ae 100644
--- a/src/Mod/Part/App/PartFeature.h
+++ b/src/Mod/Part/App/PartFeature.h
@@ -128,6 +128,8 @@ struct cutFaces {
     TopoDS_Face face;
     double distsq;
 };
+
+PartExport
 std::vector<cutFaces> findAllFacesCutBy(const TopoDS_Shape& shape,
                                         const TopoDS_Shape& face, const gp_Dir& dir);
 
diff --git a/src/Mod/PartDesign/App/FeaturePad.cpp b/src/Mod/PartDesign/App/FeaturePad.cpp
index c7742c1f4b..c5791abcd7 100644
--- a/src/Mod/PartDesign/App/FeaturePad.cpp
+++ b/src/Mod/PartDesign/App/FeaturePad.cpp
@@ -26,6 +26,7 @@
 //# include <Bnd_Box.hxx>
 //# include <gp_Pln.hxx>
 # include <BRep_Builder.hxx>
+# include <BRep_Tool.hxx>
 # include <BRepBndLib.hxx>
 # include <BRepPrimAPI_MakePrism.hxx>
 # include <BRepBuilderAPI_Copy.hxx>
@@ -87,7 +88,7 @@ App::DocumentObjectExecReturn *Pad::execute(void)
         return new App::DocumentObjectExecReturn("Length of pad too small");
     double L2 = Length2.getValue();
     if ((std::string(Type.getValueAsString()) == "TwoLengths") && (L < Precision::Confusion()))
-            return new App::DocumentObjectExecReturn("Second length of pad too small");
+        return new App::DocumentObjectExecReturn("Second length of pad too small");
 
     App::DocumentObject* link = Sketch.getValue();
     if (!link)
@@ -178,7 +179,7 @@ App::DocumentObjectExecReturn *Pad::execute(void)
                         it_near = it;
                 upToFace = (std::string(Type.getValueAsString()) == "UpToLast" ? it_far->face : it_near->face);
             } else {
-                if (FaceName.getValue() == "")
+                if (FaceName.isEmpty())
                     return new App::DocumentObjectExecReturn("Cannot extrude up to face: No face selected");
 
                 // Get active object, this is the object that the user referenced when he clicked on the face!
diff --git a/src/Mod/PartDesign/App/FeaturePocket.cpp b/src/Mod/PartDesign/App/FeaturePocket.cpp
index c7f4fa8ace..b6aec7dcdd 100644
--- a/src/Mod/PartDesign/App/FeaturePocket.cpp
+++ b/src/Mod/PartDesign/App/FeaturePocket.cpp
@@ -27,6 +27,7 @@
 # include <gp_Dir.hxx>
 # include <gp_Pln.hxx>
 # include <BRep_Builder.hxx>
+# include <BRep_Tool.hxx>
 # include <BRepAdaptor_Surface.hxx>
 # include <BRepBndLib.hxx>
 # include <BRepPrimAPI_MakePrism.hxx>
diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index d671fbe46e..c69df762fc 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -338,10 +338,11 @@ CmdPartDesignGroove::CmdPartDesignGroove()
     sAppModule    = "PartDesign";
     sGroup        = QT_TR_NOOP("PartDesign");
     sMenuText     = QT_TR_NOOP("Groove");
-    sToolTipText  = QT_TR_NOOP("Revolve a selected sketch");
+    sToolTipText  = QT_TR_NOOP("Groove a selected sketch");
     sWhatsThis    = sToolTipText;
     sStatusTip    = sToolTipText;
-    sPixmap       = "PartDesign_Groove";
+  //sPixmap       = "PartDesign_Groove";
+    sPixmap       = "PartDesign_Revolution";
 }
 
 void CmdPartDesignGroove::activated(int iMsg)