diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp
index 5964ea35b..fd476bb08 100644
--- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp
@@ -78,8 +78,6 @@ TaskPipeParameters::TaskPipeParameters(ViewProviderPipe *PipeView,bool newObj, Q
             this, SLOT(onButtonRefAdd(bool)));
     connect(ui->buttonRefRemove, SIGNAL(toggled(bool)),
             this, SLOT(onButtonRefRemove(bool)));
-    connect(ui->tangent, SIGNAL(toggled(bool)), 
-            this, SLOT(onTangentChanged(bool)));
     connect(ui->buttonProfileBase, SIGNAL(toggled(bool)),
             this, SLOT(onBaseButton(bool)));
     
@@ -106,8 +104,7 @@ TaskPipeParameters::TaskPipeParameters(ViewProviderPipe *PipeView,bool newObj, Q
         ui->listWidgetReferences->addItem(QString::fromStdString(*i));
         
     ui->comboBoxTransition->setCurrentIndex(pipe->Transition.getValue());
-    ui->tangent->setChecked(pipe->SpineTangent.getValue());
-
+ 
     updateUI();
 }
 
diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.ui b/src/Mod/PartDesign/Gui/TaskPipeParameters.ui
index 5006d1c81..a987ebf3f 100644
--- a/src/Mod/PartDesign/Gui/TaskPipeParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.ui
@@ -121,13 +121,6 @@
       <item>
        <widget class="QListWidget" name="listWidgetReferences"/>
       </item>
-      <item>
-       <widget class="QCheckBox" name="tangent">
-        <property name="text">
-         <string>Extend to tangent edges</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
index 7489cffff..60b2bb873 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
@@ -37,6 +37,7 @@
 #include <Gui/Control.h>
 #include <Gui/Command.h>
 #include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
 #include <TopExp.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
@@ -46,7 +47,6 @@ PROPERTY_SOURCE(PartDesignGui::ViewProviderPipe,PartDesignGui::ViewProvider)
 
 ViewProviderPipe::ViewProviderPipe()
 {
-    sPixmap = "PartDesign_Additive_Pipe.svg"; 
 }
 
 ViewProviderPipe::~ViewProviderPipe()
@@ -189,3 +189,15 @@ void ViewProviderPipe::highlightReferences(const bool on, bool auxillery)
     }
 }
 
+QIcon ViewProviderPipe::getIcon(void) const {
+    QString str = QString::fromAscii("PartDesign_");
+    auto* prim = static_cast<PartDesign::Pipe*>(getObject());
+    if(prim->getAddSubType() == PartDesign::FeatureAddSub::Additive)
+        str += QString::fromAscii("Additive_");
+    else
+        str += QString::fromAscii("Subtractive_");
+ 
+    str += QString::fromAscii("Pipe.svg");
+    return Gui::BitmapFactory().pixmap(str.toStdString().c_str());
+}
+
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.h b/src/Mod/PartDesign/Gui/ViewProviderPipe.h
index 8608ccae1..e83b4d492 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPipe.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.h
@@ -49,6 +49,7 @@ public:
 protected:
     virtual bool setEdit(int ModNum);
     virtual void unsetEdit(int ModNum);
+    virtual QIcon getIcon(void) const;
     
 private:
     std::vector<App::Color> originalLineColors;
diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index f96580212..dec8a8079 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -652,6 +652,8 @@ void Workbench::activated()
         "PartDesign_Pocket",
         "PartDesign_Revolution",
         "PartDesign_Groove",
+        "PartDesign_AdditivePipe",
+        "PartDesign_SubtractivePipe",
         0};
     Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
         "SELECT Sketcher::SketchObject COUNT 1",