diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp
index 575c21d2b6..1c2bb4a1ad 100644
--- a/src/Mod/TechDraw/App/DrawViewSection.cpp
+++ b/src/Mod/TechDraw/App/DrawViewSection.cpp
@@ -192,6 +192,7 @@ void DrawViewSection::onChanged(const App::Property* prop)
 
 App::DocumentObjectExecReturn *DrawViewSection::execute(void)
 {
+//    Base::Console().Message("DVS::execute() - %s \n", getNameInDocument());
     if (!keepUpdated()) {
         return App::DocumentObject::StdReturn;
     }
@@ -532,6 +533,14 @@ bool DrawViewSection::isReallyInBox (const gp_Pnt p, const Bnd_Box& bb) const
     return !bb.IsOut(p);
 }
 
+void DrawViewSection::setNormalFromBase(const std::string sectionName)
+{
+//    Base::Console().Message("DVS::setNormalFromBase(%s)\n", sectionName.c_str());
+    Base::Vector3d normal = getSectionVector(sectionName);
+    Direction.setValue(normal);
+    SectionNormal.setValue(normal);
+}
+
 //! calculate the section Normal/Projection Direction given section name
 //TODO: this should take base view rotation into account.
 Base::Vector3d DrawViewSection::getSectionVector (const std::string sectionName)
diff --git a/src/Mod/TechDraw/App/DrawViewSection.h b/src/Mod/TechDraw/App/DrawViewSection.h
index 4acac38ac4..d1a9a91b7b 100644
--- a/src/Mod/TechDraw/App/DrawViewSection.h
+++ b/src/Mod/TechDraw/App/DrawViewSection.h
@@ -87,6 +87,8 @@ public:
     std::vector<TechDraw::Face*> getFaceGeometry();
 
     Base::Vector3d getSectionVector (const std::string sectionName);
+    void setNormalFromBase(const std::string sectionName);
+
     gp_Ax2 rotateCSCardinal(gp_Ax2 oldCS, int cardinal); 
     gp_Ax2 rotateCSArbitrary(gp_Ax2 oldCS,
                              Base::Vector3d axis,
diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 208ca310db..e6bf3f8deb 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -393,27 +393,27 @@ void CmdTechDrawNewViewSection::activated(int iMsg)
         return;
     }
     TechDraw::DrawViewPart* dvp = static_cast<TechDraw::DrawViewPart*>(*baseObj.begin());
-    std::string BaseName = dvp->getNameInDocument();
-    std::string PageName = page->getNameInDocument();
-    double baseScale = dvp->getScale();
+//    std::string BaseName = dvp->getNameInDocument();
+//    std::string PageName = page->getNameInDocument();
+//    double baseScale = dvp->getScale();
 
-    Gui::WaitCursor wc;
-    openCommand("Create view");
-    std::string FeatName = getUniqueObjectName("Section");
+//    Gui::WaitCursor wc;
+//    openCommand("Create view");
+//    std::string FeatName = getUniqueObjectName("Section");
 
-    doCommand(Doc,"App.activeDocument().addObject('TechDraw::DrawViewSection','%s')",FeatName.c_str());
+//    doCommand(Doc,"App.activeDocument().addObject('TechDraw::DrawViewSection','%s')",FeatName.c_str());
 
-    App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str());
-    TechDraw::DrawViewSection* dsv = dynamic_cast<TechDraw::DrawViewSection *>(docObj);
-    if (!dsv) {
-        throw Base::TypeError("CmdTechDrawNewViewSection DVS not found\n");
-    }
-    dsv->Source.setValues(dvp->Source.getValues());
-    doCommand(Doc,"App.activeDocument().%s.BaseView = App.activeDocument().%s",FeatName.c_str(),BaseName.c_str());
-    doCommand(Doc,"App.activeDocument().%s.ScaleType = App.activeDocument().%s.ScaleType",FeatName.c_str(),BaseName.c_str());
-    doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str());
-    doCommand(Doc,"App.activeDocument().%s.Scale = %0.6f",FeatName.c_str(),baseScale);
-    Gui::Control().showDialog(new TaskDlgSectionView(dvp,dsv));
+//    App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str());
+//    TechDraw::DrawViewSection* dsv = dynamic_cast<TechDraw::DrawViewSection *>(docObj);
+//    if (!dsv) {
+//        throw Base::TypeError("CmdTechDrawNewViewSection DVS not found\n");
+//    }
+//    dsv->Source.setValues(dvp->Source.getValues());
+//    doCommand(Doc,"App.activeDocument().%s.BaseView = App.activeDocument().%s",FeatName.c_str(),BaseName.c_str());
+//    doCommand(Doc,"App.activeDocument().%s.ScaleType = App.activeDocument().%s.ScaleType",FeatName.c_str(),BaseName.c_str());
+//    doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str());
+//    doCommand(Doc,"App.activeDocument().%s.Scale = %0.6f",FeatName.c_str(),baseScale);
+    Gui::Control().showDialog(new TaskDlgSectionView(dvp));
 
     updateActive();             //ok here since dialog doesn't call doc.recompute()
     commitCommand();
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/section-down.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/section-down.svg
index 7fe7fec52c..a48f0e4de0 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/section-down.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/section-down.svg
@@ -1,65 +1,266 @@
 <?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="svg2" inkscape:version="0.48.5 r10040" sodipodi:docname="section-down.svg">
-  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1017" id="namedview24" showgrid="true" inkscape:snap-bbox="true" inkscape:snap-nodes="true" inkscape:zoom="6.8343873" inkscape:cx="71.527077" inkscape:cy="25.386825" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="g7108">
-    <inkscape:grid type="xygrid" id="grid3001" units="px" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" spacingx="1px" spacingy="1px"/>
+
+<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="svg2"
+   inkscape:version="0.92.4 (unknown)"
+   sodipodi:docname="section-down.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1358"
+     inkscape:window-height="703"
+     id="namedview24"
+     showgrid="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true"
+     inkscape:zoom="6.8343873"
+     inkscape:cx="49.140286"
+     inkscape:cy="27.785022"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g7108"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3001"
+       units="px"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1"
+       spacingy="1"
+       originx="0"
+       originy="0" />
+    <sodipodi:guide
+       position="26,34"
+       orientation="0,1"
+       id="guide329"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="-2,36"
+       orientation="0,1"
+       id="guide331"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="22,10"
+       orientation="0,1"
+       id="guide527"
+       inkscape:locked="false" />
   </sodipodi:namedview>
-  <defs id="defs4">
-    <linearGradient inkscape:collect="always" id="linearGradient10855">
-      <stop style="stop-color:#ce5c00;stop-opacity:1" offset="0" id="stop10857"/>
-      <stop style="stop-color:#fcaf3e;stop-opacity:1" offset="1" id="stop10859"/>
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutS"
+       style="overflow:visible">
+      <path
+         id="path4211"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleInS"
+       style="overflow:visible">
+      <path
+         id="path4202"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(-0.2)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3857">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0"
+         id="stop3859" />
+      <stop
+         style="stop-color:#fcaf3e;stop-opacity:1"
+         offset="1"
+         id="stop3861" />
     </linearGradient>
-    <marker inkscape:stockid="TriangleOutS" orient="auto" refY="0.0" refX="0.0" id="TriangleOutS" style="overflow:visible">
-      <path id="path4211" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(0.2)"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutM"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.4,0.4)"
+         id="path3966"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
     </marker>
-    <marker inkscape:stockid="TriangleInS" orient="auto" refY="0.0" refX="0.0" id="TriangleInS" style="overflow:visible">
-      <path id="path4202" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(-0.2)"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleInM"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(-0.4,-0.4)"
+         id="path3957"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
     </marker>
-    <linearGradient inkscape:collect="always" id="linearGradient3857">
-      <stop style="stop-color:#ce5c00;stop-opacity:1" offset="0" id="stop3859"/>
-      <stop style="stop-color:#fcaf3e;stop-opacity:1" offset="1" id="stop3861"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.8,0.8)"
+         id="path3963"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         id="path3824"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleInL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(-0.8,-0.8)"
+         id="path3954"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         id="path3839"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         id="path3821"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="linearGradient3863"
+       x1="27.000002"
+       y1="1004.3622"
+       x2="33.000004"
+       y2="1036.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4029"
+       id="linearGradient10861-3"
+       x1="28.000002"
+       y1="1006.3622"
+       x2="36.000004"
+       y2="1036.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(7e-7,1.64e-5)" />
+    <linearGradient
+       id="linearGradient4029"
+       inkscape:collect="always">
+      <stop
+         id="stop4031"
+         offset="0"
+         style="stop-color:#06989a;stop-opacity:1" />
+      <stop
+         id="stop4033"
+         offset="1"
+         style="stop-color:#16d0d2;stop-opacity:1" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3831">
-      <stop style="stop-color:#c4a000;stop-opacity:1" offset="0" id="stop3833"/>
-      <stop style="stop-color:#fce94f;stop-opacity:1" offset="1" id="stop3835"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3995"
+       id="linearGradient3837-6"
+       x1="24.000002"
+       y1="994.36224"
+       x2="34.000004"
+       y2="1046.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(7e-7,1.64e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3995">
+      <stop
+         style="stop-color:#16d0d2;stop-opacity:1"
+         offset="0"
+         id="stop3997" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3999" />
     </linearGradient>
-    <marker refX="0" refY="0" orient="auto" id="TriangleOutM" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(0.4,0.4)" id="path3966" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleInM" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(-0.4,-0.4)" id="path3957" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleOutL" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(0.8,0.8)" id="path3963" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow1Lend" style="overflow:visible">
-      <path d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" transform="matrix(-0.8,0,0,-0.8,-10,0)" id="path3824" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleInL" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(-0.8,-0.8)" id="path3954" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow2Lstart" style="overflow:visible">
-      <path d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(1.1,0,0,1.1,1.1,0)" id="path3839" style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow1Lstart" style="overflow:visible">
-      <path d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" transform="matrix(0.8,0,0,0.8,10,0)" id="path3821" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3831" id="linearGradient3837" x1="24.000002" y1="994.36224" x2="34.000004" y2="1046.3622" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3857" id="linearGradient3863" x1="27.000002" y1="1004.3622" x2="33.000004" y2="1036.3622" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient10855" id="linearGradient10861" x1="28.000002" y1="1006.3622" x2="36.000004" y2="1036.3622" gradientUnits="userSpaceOnUse"/>
   </defs>
-  <metadata id="metadata7">
+  <metadata
+     id="metadata7">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>section-down</dc:title>
+        <dc:title>section-right</dc:title>
         <dc:date>2016-10-06</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -67,7 +268,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/section-down.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/section-right.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
@@ -82,14 +283,56 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g transform="translate(0,-988.36218)" id="layer1">
-    <g transform="matrix(-1,0,0,-1,64.000002,2040.7244)" id="g7108">
-      <rect width="58" height="58.000042" x="3.0000019" y="991.36224" id="rect7087" style="color:#000000;fill:url(#linearGradient3837);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <rect width="54" height="54.000065" x="5.0000019" y="993.36224" id="rect7087-3" style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <rect width="34" height="34.000038" x="15.000002" y="1003.3622" id="rect2985" style="color:#000000;fill:url(#linearGradient10861);fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <path d="m 10.000002,1004.3622 0,18 0,0 44,0 0,-18" id="path3041" style="color:#000000;fill:none;stroke:#2e3436;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 8;stroke-dashoffset:10;marker:none;marker-start:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
-      <path style="fill:#2e3436;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 5,45 10,0 -5,9 z" id="path3018" inkscape:connector-curvature="0" transform="matrix(-1,0,0,-1,64.000002,1052.3622)"/>
-      <path style="fill:#2e3436;stroke:none" d="m 15.000002,1007.3622 -10,0 5,-8.99998 z" id="path3018-1" inkscape:connector-curvature="0"/>
+  <g
+     transform="translate(0,-988.36218)"
+     id="layer1">
+    <g
+       transform="matrix(-1,0,0,-1,64.000002,2040.7244)"
+       id="g7108">
+      <g
+         id="g536">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3837-6);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect7087-7"
+           y="991.36218"
+           x="3.0000019"
+           height="58.000042"
+           width="58" />
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#34e0e2;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect7087-3-5"
+           y="993.36218"
+           x="5.0000019"
+           height="54.000065"
+           width="54" />
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10861-3);fill-opacity:1;fill-rule:nonzero;stroke:#06989a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect2985-3"
+           y="1003.3622"
+           x="15.000004"
+           height="34.000038"
+           width="34" />
+        <g
+           transform="rotate(90,32.000018,1020.3622)"
+           id="g169">
+          <path
+             d="m 16.000005,1042.3622 h 18 v 0 -43.99996 h -18"
+             id="path3041-5"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 8;stroke-dashoffset:10;stroke-opacity:1;marker:none;enable-background:accumulate"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:#000000;stroke:none"
+             d="m 19.000005,993.36224 v 9.99996 l -9,-4.99996 z"
+             id="path3018-6"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:#000000;stroke:none"
+             d="m 19.000005,1037.3622 v 10 l -8.99998,-5 z"
+             id="path3018-1-2"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/section-left.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/section-left.svg
index 136d1bc71c..0f1016e848 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/section-left.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/section-left.svg
@@ -1,65 +1,271 @@
 <?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="svg2" inkscape:version="0.48.5 r10040" sodipodi:docname="section-down.svg">
-  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1017" id="namedview24" showgrid="true" inkscape:snap-bbox="true" inkscape:snap-nodes="true" inkscape:zoom="6.8343873" inkscape:cx="71.527077" inkscape:cy="25.386825" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="g7108">
-    <inkscape:grid type="xygrid" id="grid3001" units="px" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" spacingx="1px" spacingy="1px"/>
+
+<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="svg2"
+   inkscape:version="0.92.4 (unknown)"
+   sodipodi:docname="section-left.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1358"
+     inkscape:window-height="703"
+     id="namedview24"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:zoom="6.8343873"
+     inkscape:cx="71.527077"
+     inkscape:cy="30.964392"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g7108"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3001"
+       units="px"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1"
+       spacingy="1"
+       originx="0"
+       originy="0" />
+    <sodipodi:guide
+       position="54,36"
+       orientation="1,0"
+       id="guide1589"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="10,42"
+       orientation="1,0"
+       id="guide1591"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="24,54"
+       orientation="0,1"
+       id="guide1593"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="28,10"
+       orientation="0,1"
+       id="guide1595"
+       inkscape:locked="false" />
   </sodipodi:namedview>
-  <defs id="defs4">
-    <linearGradient inkscape:collect="always" id="linearGradient10855">
-      <stop style="stop-color:#ce5c00;stop-opacity:1" offset="0" id="stop10857"/>
-      <stop style="stop-color:#fcaf3e;stop-opacity:1" offset="1" id="stop10859"/>
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutS"
+       style="overflow:visible">
+      <path
+         id="path4211"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleInS"
+       style="overflow:visible">
+      <path
+         id="path4202"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(-0.2)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3857">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0"
+         id="stop3859" />
+      <stop
+         style="stop-color:#fcaf3e;stop-opacity:1"
+         offset="1"
+         id="stop3861" />
     </linearGradient>
-    <marker inkscape:stockid="TriangleOutS" orient="auto" refY="0.0" refX="0.0" id="TriangleOutS" style="overflow:visible">
-      <path id="path4211" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(0.2)"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutM"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.4,0.4)"
+         id="path3966"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
     </marker>
-    <marker inkscape:stockid="TriangleInS" orient="auto" refY="0.0" refX="0.0" id="TriangleInS" style="overflow:visible">
-      <path id="path4202" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(-0.2)"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleInM"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(-0.4,-0.4)"
+         id="path3957"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
     </marker>
-    <linearGradient inkscape:collect="always" id="linearGradient3857">
-      <stop style="stop-color:#ce5c00;stop-opacity:1" offset="0" id="stop3859"/>
-      <stop style="stop-color:#fcaf3e;stop-opacity:1" offset="1" id="stop3861"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.8,0.8)"
+         id="path3963"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         id="path3824"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleInL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(-0.8,-0.8)"
+         id="path3954"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         id="path3839"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         id="path3821"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="linearGradient3863"
+       x1="27.000002"
+       y1="1004.3622"
+       x2="33.000004"
+       y2="1036.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4029"
+       id="linearGradient10861-3"
+       x1="28.000002"
+       y1="1006.3622"
+       x2="36.000004"
+       y2="1036.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(7e-7,1.64e-5)" />
+    <linearGradient
+       id="linearGradient4029"
+       inkscape:collect="always">
+      <stop
+         id="stop4031"
+         offset="0"
+         style="stop-color:#06989a;stop-opacity:1" />
+      <stop
+         id="stop4033"
+         offset="1"
+         style="stop-color:#16d0d2;stop-opacity:1" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3831">
-      <stop style="stop-color:#c4a000;stop-opacity:1" offset="0" id="stop3833"/>
-      <stop style="stop-color:#fce94f;stop-opacity:1" offset="1" id="stop3835"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3995"
+       id="linearGradient3837-6"
+       x1="24.000002"
+       y1="994.36224"
+       x2="34.000004"
+       y2="1046.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(7e-7,1.64e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3995">
+      <stop
+         style="stop-color:#16d0d2;stop-opacity:1"
+         offset="0"
+         id="stop3997" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3999" />
     </linearGradient>
-    <marker refX="0" refY="0" orient="auto" id="TriangleOutM" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(0.4,0.4)" id="path3966" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleInM" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(-0.4,-0.4)" id="path3957" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleOutL" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(0.8,0.8)" id="path3963" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow1Lend" style="overflow:visible">
-      <path d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" transform="matrix(-0.8,0,0,-0.8,-10,0)" id="path3824" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleInL" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(-0.8,-0.8)" id="path3954" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow2Lstart" style="overflow:visible">
-      <path d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(1.1,0,0,1.1,1.1,0)" id="path3839" style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow1Lstart" style="overflow:visible">
-      <path d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" transform="matrix(0.8,0,0,0.8,10,0)" id="path3821" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3831" id="linearGradient3837" x1="24.000002" y1="994.36224" x2="34.000004" y2="1046.3622" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3857" id="linearGradient3863" x1="27.000002" y1="1004.3622" x2="33.000004" y2="1036.3622" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient10855" id="linearGradient10861" x1="28.000002" y1="1006.3622" x2="36.000004" y2="1036.3622" gradientUnits="userSpaceOnUse"/>
   </defs>
-  <metadata id="metadata7">
+  <metadata
+     id="metadata7">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>section-left</dc:title>
+        <dc:title>section-right</dc:title>
         <dc:date>2016-10-06</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -67,7 +273,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/section-left.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/section-right.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
@@ -82,15 +288,52 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g transform="translate(0,-988.36218)" id="layer1">
-    <g transform="matrix(-1,0,0,-1,64.000002,2040.7244)" id="g7108">
-      <rect width="58" height="58.000042" x="3.0000019" y="991.36224" id="rect7087" style="color:#000000;fill:url(#linearGradient3837);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <rect width="54" height="54.000065" x="5.0000019" y="993.36224" id="rect7087-3" style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <rect width="34" height="34.000038" x="15.000002" y="1003.3622" id="rect2985" style="color:#000000;fill:url(#linearGradient10861);fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <g id="g4256" transform="matrix(0,1,-1,0,1052.3622,988.36222)">
-        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="color:#000000;fill:none;stroke:#2e3436;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 8;stroke-dashoffset:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path3041" d="m 10.000002,1004.3622 0,18 0,0 44,0 0,-18"/>
-        <path transform="matrix(-1,0,0,-1,64.000002,1052.3622)" inkscape:connector-curvature="0" id="path3018" d="m 5,45 10,0 -5,9 z" style="fill:#2e3436;stroke:none"/>
-        <path inkscape:connector-curvature="0" id="path3018-1" d="m 15.000002,1007.3622 -10,0 5,-8.99998 z" style="fill:#2e3436;stroke:none"/>
+  <g
+     transform="translate(0,-988.36218)"
+     id="layer1">
+    <g
+       transform="matrix(-1,0,0,-1,64.000002,2040.7244)"
+       id="g7108">
+      <rect
+         width="58"
+         height="58.000042"
+         x="3.0000019"
+         y="991.36218"
+         id="rect7087-7"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3837-6);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="54"
+         height="54.000065"
+         x="5.0000019"
+         y="993.36218"
+         id="rect7087-3-5"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#34e0e2;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="34"
+         height="34.000038"
+         x="15.000004"
+         y="1003.3622"
+         id="rect2985-3"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10861-3);fill-opacity:1;fill-rule:nonzero;stroke:#06989a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <g
+         id="g1587"
+         transform="matrix(-1,0,0,1,64.00001,0)">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 8;stroke-dashoffset:10;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="path3041-5"
+           d="m 16.000005,1042.3622 h 18 v 0 -43.99996 h -18" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3018-6"
+           d="m 19.000005,993.36224 v 9.99996 l -9,-4.99996 z"
+           style="fill:#000000;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3018-1-2"
+           d="m 19.000005,1037.3622 v 10 l -8.99998,-5 z"
+           style="fill:#000000;stroke:none" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/section-right.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/section-right.svg
index 7a1505b644..e99464de4f 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/section-right.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/section-right.svg
@@ -1,59 +1,243 @@
 <?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="svg2" inkscape:version="0.48.5 r10040" sodipodi:docname="section-left.svg">
-  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1017" id="namedview24" showgrid="true" inkscape:snap-bbox="true" inkscape:snap-nodes="true" inkscape:zoom="6.8343873" inkscape:cx="71.527077" inkscape:cy="25.386825" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="g7108">
-    <inkscape:grid type="xygrid" id="grid3001" units="px" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" spacingx="1px" spacingy="1px"/>
+
+<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="svg2"
+   inkscape:version="0.92.4 (unknown)"
+   sodipodi:docname="section-right.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1358"
+     inkscape:window-height="703"
+     id="namedview24"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:zoom="6.8343873"
+     inkscape:cx="71.527077"
+     inkscape:cy="30.964392"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g7108">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3001"
+       units="px"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1"
+       spacingy="1"
+       originx="0"
+       originy="0" />
   </sodipodi:namedview>
-  <defs id="defs4">
-    <linearGradient inkscape:collect="always" id="linearGradient10855">
-      <stop style="stop-color:#ce5c00;stop-opacity:1" offset="0" id="stop10857"/>
-      <stop style="stop-color:#fcaf3e;stop-opacity:1" offset="1" id="stop10859"/>
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutS"
+       style="overflow:visible">
+      <path
+         id="path4211"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleInS"
+       style="overflow:visible">
+      <path
+         id="path4202"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(-0.2)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3857">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0"
+         id="stop3859" />
+      <stop
+         style="stop-color:#fcaf3e;stop-opacity:1"
+         offset="1"
+         id="stop3861" />
     </linearGradient>
-    <marker inkscape:stockid="TriangleOutS" orient="auto" refY="0.0" refX="0.0" id="TriangleOutS" style="overflow:visible">
-      <path id="path4211" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(0.2)"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutM"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.4,0.4)"
+         id="path3966"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
     </marker>
-    <marker inkscape:stockid="TriangleInS" orient="auto" refY="0.0" refX="0.0" id="TriangleInS" style="overflow:visible">
-      <path id="path4202" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(-0.2)"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleInM"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(-0.4,-0.4)"
+         id="path3957"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
     </marker>
-    <linearGradient inkscape:collect="always" id="linearGradient3857">
-      <stop style="stop-color:#ce5c00;stop-opacity:1" offset="0" id="stop3859"/>
-      <stop style="stop-color:#fcaf3e;stop-opacity:1" offset="1" id="stop3861"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.8,0.8)"
+         id="path3963"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         id="path3824"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleInL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(-0.8,-0.8)"
+         id="path3954"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         id="path3839"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         id="path3821"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="linearGradient3863"
+       x1="27.000002"
+       y1="1004.3622"
+       x2="33.000004"
+       y2="1036.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4029"
+       id="linearGradient10861-3"
+       x1="28.000002"
+       y1="1006.3622"
+       x2="36.000004"
+       y2="1036.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.000002,-1)" />
+    <linearGradient
+       id="linearGradient4029"
+       inkscape:collect="always">
+      <stop
+         id="stop4031"
+         offset="0"
+         style="stop-color:#06989a;stop-opacity:1" />
+      <stop
+         id="stop4033"
+         offset="1"
+         style="stop-color:#16d0d2;stop-opacity:1" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3831">
-      <stop style="stop-color:#c4a000;stop-opacity:1" offset="0" id="stop3833"/>
-      <stop style="stop-color:#fce94f;stop-opacity:1" offset="1" id="stop3835"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3995"
+       id="linearGradient3837-6"
+       x1="24.000002"
+       y1="994.36224"
+       x2="34.000004"
+       y2="1046.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.000002,-1)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3995">
+      <stop
+         style="stop-color:#16d0d2;stop-opacity:1"
+         offset="0"
+         id="stop3997" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3999" />
     </linearGradient>
-    <marker refX="0" refY="0" orient="auto" id="TriangleOutM" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(0.4,0.4)" id="path3966" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleInM" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(-0.4,-0.4)" id="path3957" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleOutL" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(0.8,0.8)" id="path3963" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow1Lend" style="overflow:visible">
-      <path d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" transform="matrix(-0.8,0,0,-0.8,-10,0)" id="path3824" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleInL" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(-0.8,-0.8)" id="path3954" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow2Lstart" style="overflow:visible">
-      <path d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(1.1,0,0,1.1,1.1,0)" id="path3839" style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow1Lstart" style="overflow:visible">
-      <path d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" transform="matrix(0.8,0,0,0.8,10,0)" id="path3821" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3831" id="linearGradient3837" x1="24.000002" y1="994.36224" x2="34.000004" y2="1046.3622" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3857" id="linearGradient3863" x1="27.000002" y1="1004.3622" x2="33.000004" y2="1036.3622" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient10855" id="linearGradient10861" x1="28.000002" y1="1006.3622" x2="36.000004" y2="1036.3622" gradientUnits="userSpaceOnUse"/>
   </defs>
-  <metadata id="metadata7">
+  <metadata
+     id="metadata7">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
@@ -82,15 +266,52 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g transform="translate(0,-988.36218)" id="layer1">
-    <g transform="matrix(-1,0,0,-1,64.000002,2040.7244)" id="g7108">
-      <rect width="58" height="58.000042" x="3.0000019" y="991.36224" id="rect7087" style="color:#000000;fill:url(#linearGradient3837);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <rect width="54" height="54.000065" x="5.0000019" y="993.36224" id="rect7087-3" style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <rect width="34" height="34.000038" x="15.000002" y="1003.3622" id="rect2985" style="color:#000000;fill:url(#linearGradient10861);fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <g id="g4256" transform="matrix(0,-1,1,0,-988.3622,1052.3622)">
-        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="color:#000000;fill:none;stroke:#2e3436;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 8;stroke-dashoffset:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path3041" d="m 10.000002,1004.3622 0,18 0,0 44,0 0,-18"/>
-        <path transform="matrix(-1,0,0,-1,64.000002,1052.3622)" inkscape:connector-curvature="0" id="path3018" d="m 5,45 10,0 -5,9 z" style="fill:#2e3436;stroke:none"/>
-        <path inkscape:connector-curvature="0" id="path3018-1" d="m 15.000002,1007.3622 -10,0 5,-8.99998 z" style="fill:#2e3436;stroke:none"/>
+  <g
+     transform="translate(0,-988.36218)"
+     id="layer1">
+    <g
+       transform="matrix(-1,0,0,-1,64.000002,2040.7244)"
+       id="g7108">
+      <g
+         id="g1576"
+         transform="translate(1.0000027,1.0000164)">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3837-6);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect7087-7"
+           y="990.36218"
+           x="1.9999993"
+           height="58.000042"
+           width="58" />
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#34e0e2;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect7087-3-5"
+           y="992.36218"
+           x="3.9999993"
+           height="54.000065"
+           width="54" />
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10861-3);fill-opacity:1;fill-rule:nonzero;stroke:#06989a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect2985-3"
+           y="1002.3622"
+           x="14.000001"
+           height="34.000038"
+           width="34" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 8;stroke-dashoffset:10;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="path3041-5"
+           d="m 15.000002,1041.3622 h 18 v 0 -43.99998 h -18" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3018-6"
+           d="m 18.000002,992.36222 v 9.99998 l -9,-4.99998 z"
+           style="fill:#000000;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3018-1-2"
+           d="m 18.000002,1036.3622 v 10 l -8.99998,-5 z"
+           style="fill:#000000;stroke:none" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/section-up.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/section-up.svg
index 742ef6e882..e6e64c2c62 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/section-up.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/section-up.svg
@@ -1,65 +1,266 @@
 <?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="svg2" inkscape:version="0.48.5 r10040" sodipodi:docname="section-right.svg">
-  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1017" id="namedview24" showgrid="true" inkscape:snap-bbox="true" inkscape:snap-nodes="true" inkscape:zoom="6.8343873" inkscape:cx="71.527077" inkscape:cy="25.386825" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="g7108">
-    <inkscape:grid type="xygrid" id="grid3001" units="px" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" spacingx="1px" spacingy="1px"/>
+
+<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="svg2"
+   inkscape:version="0.92.4 (unknown)"
+   sodipodi:docname="section-up.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1358"
+     inkscape:window-height="703"
+     id="namedview24"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:zoom="6.8343873"
+     inkscape:cx="71.527077"
+     inkscape:cy="30.964392"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g7108"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3001"
+       units="px"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1"
+       spacingy="1"
+       originx="0"
+       originy="0" />
+    <sodipodi:guide
+       position="-8,32"
+       orientation="0,1"
+       id="guide329"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="-2,36"
+       orientation="0,1"
+       id="guide331"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="-6,54"
+       orientation="0,1"
+       id="guide395"
+       inkscape:locked="false" />
   </sodipodi:namedview>
-  <defs id="defs4">
-    <linearGradient inkscape:collect="always" id="linearGradient10855">
-      <stop style="stop-color:#ce5c00;stop-opacity:1" offset="0" id="stop10857"/>
-      <stop style="stop-color:#fcaf3e;stop-opacity:1" offset="1" id="stop10859"/>
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutS"
+       style="overflow:visible">
+      <path
+         id="path4211"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleInS"
+       style="overflow:visible">
+      <path
+         id="path4202"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(-0.2)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3857">
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="0"
+         id="stop3859" />
+      <stop
+         style="stop-color:#fcaf3e;stop-opacity:1"
+         offset="1"
+         id="stop3861" />
     </linearGradient>
-    <marker inkscape:stockid="TriangleOutS" orient="auto" refY="0.0" refX="0.0" id="TriangleOutS" style="overflow:visible">
-      <path id="path4211" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(0.2)"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutM"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.4,0.4)"
+         id="path3966"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
     </marker>
-    <marker inkscape:stockid="TriangleInS" orient="auto" refY="0.0" refX="0.0" id="TriangleInS" style="overflow:visible">
-      <path id="path4202" d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt" transform="scale(-0.2)"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleInM"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(-0.4,-0.4)"
+         id="path3957"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
     </marker>
-    <linearGradient inkscape:collect="always" id="linearGradient3857">
-      <stop style="stop-color:#ce5c00;stop-opacity:1" offset="0" id="stop3859"/>
-      <stop style="stop-color:#fcaf3e;stop-opacity:1" offset="1" id="stop3861"/>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.8,0.8)"
+         id="path3963"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         id="path3824"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleInL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(-0.8,-0.8)"
+         id="path3954"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         id="path3839"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         id="path3821"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="linearGradient3863"
+       x1="27.000002"
+       y1="1004.3622"
+       x2="33.000004"
+       y2="1036.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4029"
+       id="linearGradient10861-3"
+       x1="28.000002"
+       y1="1006.3622"
+       x2="36.000004"
+       y2="1036.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(7e-7,1.64e-5)" />
+    <linearGradient
+       id="linearGradient4029"
+       inkscape:collect="always">
+      <stop
+         id="stop4031"
+         offset="0"
+         style="stop-color:#06989a;stop-opacity:1" />
+      <stop
+         id="stop4033"
+         offset="1"
+         style="stop-color:#16d0d2;stop-opacity:1" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3831">
-      <stop style="stop-color:#c4a000;stop-opacity:1" offset="0" id="stop3833"/>
-      <stop style="stop-color:#fce94f;stop-opacity:1" offset="1" id="stop3835"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3995"
+       id="linearGradient3837-6"
+       x1="24.000002"
+       y1="994.36224"
+       x2="34.000004"
+       y2="1046.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(7e-7,1.64e-5)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3995">
+      <stop
+         style="stop-color:#16d0d2;stop-opacity:1"
+         offset="0"
+         id="stop3997" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3999" />
     </linearGradient>
-    <marker refX="0" refY="0" orient="auto" id="TriangleOutM" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(0.4,0.4)" id="path3966" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleInM" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(-0.4,-0.4)" id="path3957" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleOutL" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(0.8,0.8)" id="path3963" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow1Lend" style="overflow:visible">
-      <path d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" transform="matrix(-0.8,0,0,-0.8,-10,0)" id="path3824" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="TriangleInL" style="overflow:visible">
-      <path d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" transform="scale(-0.8,-0.8)" id="path3954" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow2Lstart" style="overflow:visible">
-      <path d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(1.1,0,0,1.1,1.1,0)" id="path3839" style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"/>
-    </marker>
-    <marker refX="0" refY="0" orient="auto" id="Arrow1Lstart" style="overflow:visible">
-      <path d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" transform="matrix(0.8,0,0,0.8,10,0)" id="path3821" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"/>
-    </marker>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3831" id="linearGradient3837" x1="24.000002" y1="994.36224" x2="34.000004" y2="1046.3622" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3857" id="linearGradient3863" x1="27.000002" y1="1004.3622" x2="33.000004" y2="1036.3622" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient10855" id="linearGradient10861" x1="28.000002" y1="1006.3622" x2="36.000004" y2="1036.3622" gradientUnits="userSpaceOnUse"/>
   </defs>
-  <metadata id="metadata7">
+  <metadata
+     id="metadata7">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>section-up</dc:title>
+        <dc:title>section-right</dc:title>
         <dc:date>2016-10-06</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -67,7 +268,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/section-up.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/section-right.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
@@ -82,15 +283,52 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g transform="translate(0,-988.36218)" id="layer1">
-    <g transform="matrix(-1,0,0,-1,64.000002,2040.7244)" id="g7108">
-      <rect width="58" height="58.000042" x="3.0000019" y="991.36224" id="rect7087" style="color:#000000;fill:url(#linearGradient3837);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <rect width="54" height="54.000065" x="5.0000019" y="993.36224" id="rect7087-3" style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <rect width="34" height="34.000038" x="15.000002" y="1003.3622" id="rect2985" style="color:#000000;fill:url(#linearGradient10861);fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-      <g id="g4256" transform="matrix(-1,0,0,-1,64.000004,2040.7244)">
-        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" style="color:#000000;fill:none;stroke:#2e3436;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 8;stroke-dashoffset:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path3041" d="m 10.000002,1004.3622 0,18 0,0 44,0 0,-18"/>
-        <path transform="matrix(-1,0,0,-1,64.000002,1052.3622)" inkscape:connector-curvature="0" id="path3018" d="m 5,45 10,0 -5,9 z" style="fill:#2e3436;stroke:none"/>
-        <path inkscape:connector-curvature="0" id="path3018-1" d="m 15.000002,1007.3622 -10,0 5,-8.99998 z" style="fill:#2e3436;stroke:none"/>
+  <g
+     transform="translate(0,-988.36218)"
+     id="layer1">
+    <g
+       transform="matrix(-1,0,0,-1,64.000002,2040.7244)"
+       id="g7108">
+      <rect
+         width="58"
+         height="58.000042"
+         x="3.0000019"
+         y="991.36218"
+         id="rect7087-7"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3837-6);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="54"
+         height="54.000065"
+         x="5.0000019"
+         y="993.36218"
+         id="rect7087-3-5"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#34e0e2;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         width="34"
+         height="34.000038"
+         x="15.000004"
+         y="1003.3622"
+         id="rect2985-3"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient10861-3);fill-opacity:1;fill-rule:nonzero;stroke:#06989a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <g
+         id="g169"
+         transform="matrix(0,-1,-1,0,1052.3622,1051.3622)">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:4, 8;stroke-dashoffset:10;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="path3041-5"
+           d="m 16.000005,1042.3622 h 18 v 0 -43.99996 h -18" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3018-6"
+           d="m 19.000005,993.36224 v 9.99996 l -9,-4.99996 z"
+           style="fill:#000000;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3018-1-2"
+           d="m 19.000005,1037.3622 v 10 l -8.99998,-5 z"
+           style="fill:#000000;stroke:none" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
index 3f7a7e19bd..dc7a4e449e 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
@@ -26,55 +26,121 @@
 #include <cmath>
 #endif // #ifndef _PreComp_
 
+#include <QApplication>
+#include <QStatusBar>
+#include <QGraphicsScene>
+#include <QMessageBox>
+
 #include <Base/Console.h>
-#include <Base/Vector3D.h>
+#include <Base/Tools.h>
+#include <Base/UnitsApi.h>
 
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
+#include <Gui/Control.h>
 #include <Gui/Document.h>
+#include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
+#include <Gui/WaitCursor.h>
 
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 
-#include <Mod/Part/App/PartFeature.h>
-
 #include <Mod/TechDraw/App/DrawPage.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
+#include <Mod/TechDraw/App/DrawViewSection.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
 
-#include "TaskSectionView.h"
+#include "DrawGuiStd.h"
+#include "Rez.h"
+#include "MDIViewPage.h"
+#include "QGVPage.h"
+#include "QGIView.h"
+
+//#include "ViewProviderPage.h"
+//#include "ViewProviderViewPart.h"
+
 #include <Mod/TechDraw/Gui/ui_TaskSectionView.h>
 
+#include "TaskSectionView.h"
+
 using namespace Gui;
 using namespace TechDraw;
 using namespace TechDrawGui;
 
-void _printVect(char* label, Base::Vector3d v);
-
-TaskSectionView::TaskSectionView(TechDraw::DrawViewPart* base, TechDraw::DrawViewSection* section) :
+//ctor for create 
+TaskSectionView::TaskSectionView(TechDraw::DrawViewPart* base) :
     ui(new Ui_TaskSectionView),
     m_base(base),
-    m_section(section)
+    m_section(nullptr),
+    m_dirName(""),
+    m_createMode(true),
+    m_saved(false)
 {
+//    Base::Console().Message("TSV::TSV() - create mode\n");
+    if  (m_base == nullptr)  {
+        //should be caught in CMD caller
+        std::string msg = Base::Tools::toStdString(tr("TaskSectionView - bad parameters.  Can not proceed."));
+        Base::Console().Error((msg + "\n").c_str());
+        return;
+    }
+ 
+   ui->setupUi(this);
+
+    connect(ui->pbUp, SIGNAL(clicked(bool)),
+            this, SLOT(onUpClicked(bool)));
+    connect(ui->pbDown, SIGNAL(clicked(bool)),
+            this, SLOT(onDownClicked(bool)));
+    connect(ui->pbRight, SIGNAL(clicked(bool)),
+            this, SLOT(onRightClicked(bool)));
+    connect(ui->pbLeft, SIGNAL(clicked(bool)),
+            this, SLOT(onLeftClicked(bool)));
+
+    setUiPrimary();
+}
+
+
+//ctor for edit
+TaskSectionView::TaskSectionView(TechDraw::DrawViewSection* section) :
+    ui(new Ui_TaskSectionView),
+    m_base(nullptr),
+    m_section(section),
+    m_createMode(false),
+    m_saved(false)
+{
+//    Base::Console().Message("TS::TS() - edit mode\n");
+
+    if  (m_section == nullptr)  {
+        //should be caught in CMD caller
+        std::string msg = Base::Tools::toStdString(tr("TaskSectionView - bad parameters.  Can not proceed."));
+        Base::Console().Error((msg + "\n").c_str());
+        return;
+    }
+
+    App::DocumentObject* newObj = m_section->BaseView.getValue();
+    m_base = dynamic_cast<TechDraw::DrawViewPart*>(newObj);
+    if ( (newObj == nullptr) ||
+         (m_base == nullptr) ) {
+        throw Base::RuntimeError("TaskSectionView - BaseView not found");
+    }
+
     ui->setupUi(this);
 
-    connect(ui->pb_Up, SIGNAL(clicked(bool)),
+    connect(ui->pbUp, SIGNAL(clicked(bool)),
             this, SLOT(onUpClicked(bool)));
-    connect(ui->pb_Down, SIGNAL(clicked(bool)),
+    connect(ui->pbDown, SIGNAL(clicked(bool)),
             this, SLOT(onDownClicked(bool)));
-    connect(ui->pb_Right, SIGNAL(clicked(bool)),
+    connect(ui->pbRight, SIGNAL(clicked(bool)),
             this, SLOT(onRightClicked(bool)));
-    connect(ui->pb_Left, SIGNAL(clicked(bool)),
+    connect(ui->pbLeft, SIGNAL(clicked(bool)),
             this, SLOT(onLeftClicked(bool)));
-    connect(ui->pbReset, SIGNAL(clicked(bool)),
-            this, SLOT(onResetClicked(bool)));
 
-    sectionDir = "unset";
-    saveInitialValues();
-    resetValues();
+    m_dirName = m_section->SectionDirection.getValue();
+    saveSectionState();
+    setUiEdit();
 }
 
 TaskSectionView::~TaskSectionView()
@@ -82,223 +148,294 @@ TaskSectionView::~TaskSectionView()
     delete ui;
 }
 
-
-void TaskSectionView::saveInitialValues()
+void TaskSectionView::setUiPrimary()
 {
-    saveSym              = m_section->SectionSymbol.getValue();
-    saveSectionOrigin    = m_base->getCentroid();
-    saveSectionProjDir   = m_section->Direction.getValue();
-    saveSectionNormal    = m_section->SectionNormal.getValue();
-    saveLabel            = m_section->Label.getValue();
+//    Base::Console().Message("TSV::setUiPrimary()\n");
+    setWindowTitle(QObject::tr("Create SectionView"));
+    std::string temp = m_base->getNameInDocument();
+    QString qTemp    = Base::Tools::fromStdString(temp);
+    ui->leBaseView->setText(qTemp);
+
+    //TODO: get next symbol from page
+//    ui->leSymbol->setText();
+
+    Base::Vector3d origin = m_base->getCentroid();
+    ui->sbOrgX->setValue(origin.x);
+    ui->sbOrgY->setValue(origin.y);
+    ui->sbOrgZ->setValue(origin.z);
 }
 
-//set the screen back to original values
-void TaskSectionView::resetValues()
+void TaskSectionView::setUiEdit()
 {
-    ui->leSymbol->setText(QString::fromUtf8(saveSym.data(), saveSym.size()));
+//    Base::Console().Message("TSV::setUiEdit()\n");
+    setWindowTitle(QObject::tr("Edit SectionView"));
 
-    checkAll(false);
-    enableAll(true);
+    std::string temp = m_base->getNameInDocument();
+    QString qTemp    = Base::Tools::fromStdString(temp);
+    ui->leBaseView->setText(qTemp);
 
-    sectionDir = "unset";
-    sectionProjDir = saveSectionProjDir;
-    sectionNormal = saveSectionNormal;
-
-    ui->sb_OrgX->setValue(saveSectionOrigin.x);
-    ui->sb_OrgY->setValue(saveSectionOrigin.y);
-    ui->sb_OrgZ->setValue(saveSectionOrigin.z);
-
-    ui->leProjDir->setReadOnly(true);
-    ui->leProjDir->setText(formatVector(saveSectionProjDir));
-    ui->leNormal->setReadOnly(true);
-    ui->leNormal->setText(formatVector(saveSectionNormal));
-
-    m_section->Label.setValue(saveLabel.c_str());
-    Base::Console().Message("");
+    temp = m_section->SectionSymbol.getValue();
+    qTemp    = Base::Tools::fromStdString(temp);
+    ui->leSymbol->setText(qTemp);
+    
+    Base::Vector3d origin = m_section->SectionOrigin.getValue();
+    ui->sbOrgX->setValue(origin.x);
+    ui->sbOrgY->setValue(origin.y);
+    ui->sbOrgZ->setValue(origin.z);
 }
 
-//calculate good starting points from base view and push buttons
-bool TaskSectionView::calcValues()
+//save the start conditions
+void TaskSectionView::saveSectionState()
 {
-    bool result = true;
-
-    if (ui->pb_Up->isChecked()) {
-        sectionDir = "Up";
-    } else if (ui->pb_Down->isChecked()) {
-        sectionDir = "Down";
-    } else if (ui->pb_Left->isChecked()) {
-        sectionDir = "Left";
-    } else if (ui->pb_Right->isChecked()) {
-        sectionDir = "Right";
-    } else {
-        Base::Console().Message("Select a direction\n");
-        result = false;
+//    Base::Console().Message("TSV::saveSectionState()\n");
+    if (m_section != nullptr) {
+        m_saveSymbol = m_section->SectionSymbol.getValue();
+        m_saveNormal = m_section->SectionNormal.getValue();
+        m_saveDirection = m_section->Direction.getValue();
+        m_saveOrigin    = m_section->SectionOrigin.getValue();
+        m_saveDirName   = m_section->SectionDirection.getValue();
+        m_saved = true;
     }
-    sectionProjDir = m_section->getSectionVector(sectionDir);
-
-    sectionNormal = sectionProjDir;
-    if (result) {
-        ui->leNormal->setText(formatVector(sectionNormal));
-        ui->leProjDir->setText(formatVector(sectionProjDir));
-
-        Base::Console().Message("Press Reset, OK or Cancel to continue \n");
-    }
-    return result;
 }
 
-//move values from screen to DocObjs
-void TaskSectionView::updateValues()
+//restore the start conditions
+void TaskSectionView::restoreSectionState()
 {
-    if (strcmp(sectionDir,"unset") != 0) {
-        m_section->SectionDirection.setValue(sectionDir);
+//    Base::Console().Message("TSV::restoreSectionState()\n");
+    if (m_section != nullptr) {
+        m_section->SectionSymbol.setValue(m_saveSymbol);
+        m_section->SectionNormal.setValue(m_saveNormal);
+        m_section->Direction.setValue(m_saveDirection);
+        m_section->SectionOrigin.setValue(m_saveOrigin);
+        m_section->SectionDirection.setValue(m_saveDirName.c_str());
     }
-    m_section->Direction.setValue(sectionProjDir);
-    m_section->SectionNormal.setValue(sectionNormal);
-    Base::Vector3d origin(ui->sb_OrgX->value().getValue(),
-                          ui->sb_OrgY->value().getValue(),
-                          ui->sb_OrgZ->value().getValue());
-    m_section->SectionOrigin.setValue(origin);
-    m_section->SectionSymbol.setValue(ui->leSymbol->text().toUtf8().constData());
-
-    m_base->getDocument()->recompute();
 }
 
 void TaskSectionView::blockButtons(bool b)
 {
-    ui->pb_Up->blockSignals(b);
-    ui->pb_Down->blockSignals(b);
-    ui->pb_Left->blockSignals(b);
-    ui->pb_Right->blockSignals(b);
+    Q_UNUSED(b);
 }
 
-void TaskSectionView::turnOnUp()
-{
-    blockButtons(true);
-    checkAll(false);
-    enableAll(false);
-    ui->pb_Up->setChecked(true);
-    ui->pb_Up->setEnabled(true);
-    blockButtons(false);
-    if (calcValues()) {
-        updateValues();
-    }
-}
-
-void TaskSectionView::turnOnDown()
-{
-    blockButtons(true);
-    checkAll(false);
-    enableAll(false);
-    ui->pb_Down->setChecked(true);
-    ui->pb_Down->setEnabled(true);
-    blockButtons(false);
-    if (calcValues()) {
-        updateValues();
-    }
-}
-
-void TaskSectionView::turnOnLeft()
-{
-    blockButtons(true);
-    checkAll(false);
-    enableAll(false);
-    ui->pb_Left->setChecked(true);
-    ui->pb_Left->setEnabled(true);
-    blockButtons(false);
-    if (calcValues()) {
-        updateValues();
-    }
-}
-
-void TaskSectionView::turnOnRight()
-{
-    blockButtons(true);
-    checkAll(false);
-    enableAll(false);
-    ui->pb_Right->setChecked(true);
-    ui->pb_Right->setEnabled(true);
-    blockButtons(false);
-    if (calcValues()) {
-        updateValues();
-    }
-}
-
-void TaskSectionView::checkAll(bool b)
-{
-    blockButtons(true);
-    ui->pb_Up->setChecked(b);
-    ui->pb_Down->setChecked(b);
-    ui->pb_Left->setChecked(b);
-    ui->pb_Right->setChecked(b);
-    blockButtons(false);
-}
-
-void TaskSectionView::enableAll(bool b)
-{
-    blockButtons(true);
-    ui->pb_Up->setEnabled(b);
-    ui->pb_Down->setEnabled(b);
-    ui->pb_Left->setEnabled(b);
-    ui->pb_Right->setEnabled(b);
-    blockButtons(false);
-}
-
-
+// cardinal: 0 - left, 1 - right, 2 - up, 3 - down
 void TaskSectionView::onUpClicked(bool b)
 {
+//    Base::Console().Message("TSV::onUpClicked()\n");
     Q_UNUSED(b);
-    turnOnUp();
+    checkAll(false);
+    ui->pbUp->setChecked(true);
+    applyQuick("Up");
 }
 
 void TaskSectionView::onDownClicked(bool b)
 {
+//    Base::Console().Message("TSV::onDownClicked()\n");
     Q_UNUSED(b);
-    turnOnDown();
+    checkAll(false);
+    ui->pbDown->setChecked(true);
+    applyQuick("Down");
 }
 
 void TaskSectionView::onLeftClicked(bool b)
 {
+//    Base::Console().Message("TSV::onLeftClicked()\n");
+    checkAll(false);
+    ui->pbLeft->setChecked(true);
     Q_UNUSED(b);
-    turnOnLeft();
+    applyQuick("Left");
 }
 
 void TaskSectionView::onRightClicked(bool b)
 {
+//    Base::Console().Message("TSV::onRightClicked()\n");
     Q_UNUSED(b);
-    turnOnRight();
+    checkAll(false);
+    ui->pbRight->setChecked(true);
+    applyQuick("Right");
 }
 
-void TaskSectionView::onResetClicked(bool b)
+bool TaskSectionView::apply()
 {
-    Q_UNUSED(b);
-    resetValues();
-    updateValues();
-    m_section->Label.setValue(saveLabel.c_str());
+//    Base::Console().Message("TSV::apply()\n");
+    if (m_dirName.empty()) {
+        std::string msg = Base::Tools::toStdString(tr("TSV::apply - No section direction picked yet"));
+        Base::Console().Error((msg + "\n").c_str());
+    } else {
+        checkAll(false);
+        applyQuick(m_dirName);
+    }
+    return true;
 }
 
+void TaskSectionView::checkAll(bool b)
+{
+    ui->pbUp->setChecked(b);
+    ui->pbDown->setChecked(b);
+    ui->pbRight->setChecked(b);
+    ui->pbLeft->setChecked(b);
+}
+
+//******************************************************************************
+void TaskSectionView::applyQuick(std::string dir)
+{
+//    Base::Console().Message("TSV::applyQuick(%s)\n", dir.c_str());
+    m_dirName = dir;
+    Gui::Command::openCommand("Apply Quick");
+    m_dirName = dir;
+    if (m_section == nullptr) {
+        m_section = createSectionView();
+    }
+    updateSectionView();
+    m_section->recomputeFeature();
+//    m_section->requestPaint();
+    m_base->requestPaint();
+}
+
+void TaskSectionView::applyAligned(void) 
+{
+    Base::Console().Message("TSV::applyAligned() - not implemented yet\n");
+    Gui::Command::openCommand("Apply Aligned");
+    m_dirName = "Aligned";
+    //fiddle with directions here
+
+//    m_section->recomputeFeature(); //????
+    m_section->requestPaint();
+    m_base->requestPaint();
+}
+
+TechDraw::DrawViewSection* TaskSectionView::createSectionView(void)
+{
+//    Base::Console().Message("TSV::createSectionView()\n");
+
+    std::string sectionName;
+    std::string baseName = m_base->getNameInDocument();
+
+    Gui::Command::openCommand("Create SectionView");
+    TechDraw::DrawViewSection* newSection = nullptr;
+    if (m_section == nullptr) {
+        sectionName = m_base->getDocument()->getUniqueObjectName("DrawViewSection");
+        std::string sectionType = "TechDraw::DrawViewSection";
+
+        TechDraw::DrawPage* page = m_base->findParentPage();
+        std::string pageName = page->getNameInDocument();
+
+        Command::doCommand(Command::Doc,"App.activeDocument().addObject('%s','%s')",
+                           sectionType.c_str(),sectionName.c_str());
+        Command::doCommand(Command::Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",
+                           pageName.c_str(), sectionName.c_str());
+        Command::doCommand(Command::Doc,"App.activeDocument().%s.BaseView = App.activeDocument().%s",
+                           sectionName.c_str(),baseName.c_str());
+        Command::doCommand(Command::Doc,"App.activeDocument().%s.Source = App.activeDocument().%s.Source",
+                           sectionName.c_str(),baseName.c_str());
+        App::DocumentObject* newObj = m_base->getDocument()->getObject(sectionName.c_str());
+        newSection = dynamic_cast<TechDraw::DrawViewSection*>(newObj);
+        if ( (newObj == nullptr) ||
+             (newSection == nullptr) ) {
+            throw Base::RuntimeError("TaskSectionView - new section object not found");
+         }
+    }
+    return newSection;
+}
+
+void TaskSectionView::updateSectionView(void)
+{
+//    Base::Console().Message("TSV::updateSectionView()\n");
+    if (m_section != nullptr) {
+        std::string sectionName = m_section->getNameInDocument();
+        Command::doCommand(Command::Doc,"App.activeDocument().%s.SectionDirection = '%s'",
+                           sectionName.c_str(),m_dirName.c_str());
+        Command::doCommand(Command::Doc,
+                           "App.activeDocument().%s.SectionOrigin = FreeCAD.Vector(%.3f,%.3f,%.3f)",
+                           sectionName.c_str(), 
+                           ui->sbOrgX->value().getValue(),
+                           ui->sbOrgY->value().getValue(),
+                           ui->sbOrgZ->value().getValue());
+        QString qTemp    = ui->leSymbol->text();
+        std::string temp = Base::Tools::toStdString(qTemp);
+        Command::doCommand(Command::Doc,"App.activeDocument().%s.SectionSymbol = '%s'",
+                           sectionName.c_str(),
+                           temp.c_str());
+        m_section->setNormalFromBase(m_dirName.c_str());
+    }
+}
+
+void TaskSectionView::saveButtons(QPushButton* btnOK,
+                             QPushButton* btnCancel,
+                             QPushButton* btnApply)
+{
+    m_btnOK = btnOK;
+    m_btnCancel = btnCancel;
+    m_btnApply = btnApply;
+}
+
+//std::string TaskSectionView::prefViewSection()
+//{
+////    Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")->
+////                                         GetGroup("Preferences")->GetGroup("Mod/TechDraw/Section");
+////                                    
+////    std::string prefString = hGrp->GetASCII("SectionPref", "default");
+////    return prefString;
+//}
+
+//******************************************************************************
 
 bool TaskSectionView::accept()
 {
-    if (strcmp(sectionDir,"unset") == 0) {
-        Base::Console().Message("No direction selected!\n");
-        return reject();
+//    Base::Console().Message("TSV::accept()\n");
+    if (m_createMode) {
+        if (m_section == nullptr) {
+            apply();
+        }
+        Gui::Command::updateActive();
+        Gui::Command::commitCommand();
     } else {
-        updateValues();
-        Gui::Command::doCommand(Gui::Command::Gui,"Gui.ActiveDocument.resetEdit()");
-        return true;
+        Gui::Command::openCommand("Edit SectionView");
+        try {
+            updateSectionView();
+        }
+        catch (...) {
+            Base::Console().Error("TSV::accept - failed to update section\n");
+        }
+
+        Gui::Command::updateActive();
+        Gui::Command::commitCommand();
     }
+    Gui::Command::doCommand(Gui::Command::Gui,"Gui.ActiveDocument.resetEdit()");
+//    m_section->recomputeFeature();
+    if (m_section != nullptr) {
+        m_section->requestPaint();
+    }
+    if (m_base != nullptr) {
+        m_base->requestPaint();
+    }
+    return true;
 }
 
 bool TaskSectionView::reject()
 {
-    std::string BaseName = m_base->getNameInDocument();
+//    Base::Console().Message("TSV::reject()\n");
     std::string PageName = m_base->findParentPage()->getNameInDocument();
-    std::string SectionName = m_section->getNameInDocument();
-    Gui::Command::doCommand(Gui::Command::Gui,"App.activeDocument().%s.removeView(App.activeDocument().%s)",
-                            PageName.c_str(),SectionName.c_str());
-    Gui::Command::doCommand(Gui::Command::Gui,"App.activeDocument().removeObject('%s')",SectionName.c_str());
+    if (m_section != nullptr) {
+        if (m_createMode) {
+            std::string SectionName = m_section->getNameInDocument();
+            Gui::Command::doCommand(Gui::Command::Gui,
+                                    "App.activeDocument().%s.removeView(App.activeDocument().%s)",
+                                    PageName.c_str(),SectionName.c_str());
+            Gui::Command::doCommand(Gui::Command::Gui,
+                                    "App.activeDocument().removeObject('%s')",
+                                    SectionName.c_str());
+        } else {
+            Base::Console().Message("TSV::reject() - edit mode\n");
+            restoreSectionState();
+            //check undo stack?
+            m_section->requestPaint();
+            m_base->requestPaint();
+        }
+
+    }
+
+    Gui::Command::doCommand(Gui::Command::Gui,"App.activeDocument().recompute()");
     Gui::Command::doCommand(Gui::Command::Gui,"Gui.ActiveDocument.resetEdit()");
-    m_base->findParentPage()->requestPaint();
+
     return false;
 }
 
@@ -309,31 +446,26 @@ void TaskSectionView::changeEvent(QEvent *e)
     }
 }
 
-QString TaskSectionView::formatVector(Base::Vector3d v)
-{
-    QString data = QString::fromLatin1("[%1 %2 %3]")
-        .arg(QLocale::system().toString(v.x, 'f', 2))
-        .arg(QLocale::system().toString(v.y, 'f', 2))
-        .arg(QLocale::system().toString(v.z, 'f', 2));
-    return data;
-}
-
-void _printVect(char* label, Base::Vector3d v)
-{
-    Base::Console().Message("printVect: %s (%3f,%.3f,%.3f)\n",label,v.x,v.y,v.z);
-}
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-TaskDlgSectionView::TaskDlgSectionView(TechDraw::DrawViewPart* base, TechDraw::DrawViewSection* section) :
+TaskDlgSectionView::TaskDlgSectionView(TechDraw::DrawViewPart* base) :
     TaskDialog()
 {
-    widget  = new TaskSectionView(base,section);
-    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_Tree_View"),
+    widget  = new TaskSectionView(base);
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-viewsection"),
                                          widget->windowTitle(), true, 0);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
 }
 
+TaskDlgSectionView::TaskDlgSectionView(TechDraw::DrawViewSection* section) :
+    TaskDialog()
+{
+    widget  = new TaskSectionView(section);
+    taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-viewsection"),
+                                         widget->windowTitle(), true, 0);
+    taskbox->groupLayout()->addWidget(widget);
+    Content.push_back(taskbox);
+}
 TaskDlgSectionView::~TaskDlgSectionView()
 {
 }
@@ -343,6 +475,15 @@ void TaskDlgSectionView::update()
     //widget->updateTask();
 }
 
+void TaskDlgSectionView::modifyStandardButtons(QDialogButtonBox* box)
+{
+    QPushButton* btnOK = box->button(QDialogButtonBox::Ok);
+    QPushButton* btnCancel = box->button(QDialogButtonBox::Cancel);
+    QPushButton* btnApply = box->button(QDialogButtonBox::Apply);
+    widget->saveButtons(btnOK, btnCancel, btnApply);
+}
+
+
 //==== calls from the TaskView ===============================================================
 void TaskDlgSectionView::open()
 {
@@ -350,7 +491,11 @@ void TaskDlgSectionView::open()
 
 void TaskDlgSectionView::clicked(int i)
 {
-    Q_UNUSED(i);
+//    Q_UNUSED(i);
+//    Base::Console().Message("TDSV::clicked(%X)\n",i);
+    if (i == QMessageBox::Apply) {
+        widget->apply();
+    }
 }
 
 bool TaskDlgSectionView::accept()
@@ -359,6 +504,13 @@ bool TaskDlgSectionView::accept()
     return true;
 }
 
+//bool TaskDlgSectionView::apply()
+//{
+//    Base::Console().Message("TDSV::apply()\n");
+//    widget->apply();
+//    return true;
+//}
+
 bool TaskDlgSectionView::reject()
 {
     widget->reject();
diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.h b/src/Mod/TechDraw/Gui/TaskSectionView.h
index 939a18cddd..b9823230b8 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.h
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.h
@@ -42,52 +42,69 @@ class TaskSectionView : public QWidget
     Q_OBJECT
 
 public:
-    TaskSectionView(TechDraw::DrawViewPart* base, TechDraw::DrawViewSection* section);
+    TaskSectionView(TechDraw::DrawViewPart* base);
+    TaskSectionView(TechDraw::DrawViewSection* section);
     ~TaskSectionView();
 
 public:
     virtual bool accept();
+    virtual bool apply();
     virtual bool reject();
+    void modifyStandardButtons(QDialogButtonBox* box);
+    void saveButtons(QPushButton* btnOK,
+                     QPushButton* btnCancel,
+                     QPushButton* btnApply);
+
 
 protected Q_SLOTS:
     void onUpClicked(bool b);
     void onDownClicked(bool b);
     void onLeftClicked(bool b);
     void onRightClicked(bool b);
-    void onResetClicked(bool b);
 
 protected:
-    void turnOnUp(void);
-    void turnOnDown(void);
-    void turnOnLeft(void);
-    void turnOnRight(void);
-    void checkAll(bool b);
-    void enableAll(bool b);
     void blockButtons(bool b);
+
     void changeEvent(QEvent *e);
-    void resetValues();
-    bool calcValues();
-    void saveInitialValues();
-    void updateValues();
-    QString formatVector(Base::Vector3d v);
+    void saveSectionState();
+    void restoreSectionState();
+
+    void applyQuick(std::string dir);
+    void applyAligned(void);
+
+    TechDraw::DrawViewSection* createSectionView(void);
+    void updateSectionView(void);
+
+    void setUiPrimary();
+    void setUiEdit();
+
+    void checkAll(bool b);
+
+//    std::string prefViewSection();
 
 private:
     Ui_TaskSectionView * ui;
     TechDraw::DrawViewPart* m_base;
     TechDraw::DrawViewSection* m_section;
-    Base::Vector3d sectionNormal;
-    Base::Vector3d sectionProjDir;
-    Base::Vector3d sectionOrigin;
-    char* sectionDir;
-    Base::Vector3d arrowDir;
+    std::string m_symbol;
+    Base::Vector3d m_normal;
+    Base::Vector3d m_direction;
+    Base::Vector3d m_origin;
+    
+    std::string m_saveSymbol;
+    std::string m_saveDirName;
+    Base::Vector3d m_saveNormal;
+    Base::Vector3d m_saveDirection;
+    Base::Vector3d m_saveOrigin;
 
-    std::string saveSym;
-    std::string saveLabel;
-  //bool saveHorizSectionLine;
-  //bool saveArrowUpSection;
-    Base::Vector3d saveSectionProjDir;
-    Base::Vector3d saveSectionOrigin;
-    Base::Vector3d saveSectionNormal;
+    std::string m_dirName;
+
+    QPushButton* m_btnOK;
+    QPushButton* m_btnCancel;
+    QPushButton* m_btnApply;
+
+    bool m_createMode;
+    bool m_saved;
 
 };
 
@@ -96,7 +113,8 @@ class TaskDlgSectionView : public Gui::TaskView::TaskDialog
     Q_OBJECT
 
 public:
-    TaskDlgSectionView(TechDraw::DrawViewPart* base, TechDraw::DrawViewSection* section);
+    TaskDlgSectionView(TechDraw::DrawViewPart* base);
+    TaskDlgSectionView(TechDraw::DrawViewSection* section);
     ~TaskDlgSectionView();
 
 public:
@@ -110,9 +128,14 @@ public:
     virtual bool reject();
     /// is called by the framework if the user presses the help button
     virtual void helpRequested() { return;}
+
     virtual bool isAllowedAlterDocument(void) const
     { return false; }
 
+    virtual QDialogButtonBox::StandardButtons getStandardButtons() const
+    { return QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel; }
+    virtual void modifyStandardButtons(QDialogButtonBox* box);
+
     void update();
 
 protected:
diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.ui b/src/Mod/TechDraw/Gui/TaskSectionView.ui
index 3e3eacdc6e..0fa2e1758a 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.ui
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>410</width>
-    <height>492</height>
+    <width>434</width>
+    <height>368</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,103 +19,109 @@
   <property name="minimumSize">
    <size>
     <width>250</width>
-    <height>0</height>
+    <height>300</height>
    </size>
   </property>
   <property name="windowTitle">
-   <string>Quick Section Parameters</string>
+   <string>Section Parameters</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QFrame" name="frame">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="title">
-      <string>Define Your Section</string>
+     <property name="minimumSize">
+      <size>
+       <width>350</width>
+       <height>350</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <layout class="QGridLayout" name="gridLayout_3">
-        <item row="0" column="0">
+       <layout class="QFormLayout" name="formLayout_2">
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_7">
+          <property name="text">
+           <string>BaseView</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="leBaseView">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
            <string>Symbol</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="2">
+        <item row="2" column="1">
          <widget class="QLineEdit" name="leSymbol">
           <property name="toolTip">
            <string>Identifier for this section</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="3">
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QGridLayout" name="gridLayout_2">
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string>Origin Y</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="Gui::QuantitySpinBox" name="sb_OrgX">
-          <property name="toolTip">
-           <string>Location of section plane</string>
-          </property>
-          <property name="unit" stdset="0">
-           <string notr="true"/>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
+        <item row="3" column="0">
          <widget class="QLabel" name="label">
           <property name="text">
-           <string>Origin X</string>
+           <string>Section Origin X</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>Origin Z</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="Gui::QuantitySpinBox" name="sb_OrgY">
+        <item row="3" column="1">
+         <widget class="Gui::QuantitySpinBox" name="sbOrgX">
           <property name="toolTip">
-           <string>Location of section plane</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Location of section plane in 3D coordinates&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="unit" stdset="0">
            <string notr="true"/>
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
-         <widget class="Gui::QuantitySpinBox" name="sb_OrgZ">
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Section Origin Y</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <widget class="Gui::QuantitySpinBox" name="sbOrgY">
           <property name="toolTip">
-           <string>Location of section plane</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Location of section plane in 3D coordinates&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="unit" stdset="0">
+           <string notr="true"/>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>Section Origin Z</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1">
+         <widget class="Gui::QuantitySpinBox" name="sbOrgZ">
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Location of section plane in 3D coordinates&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="unit" stdset="0">
            <string notr="true"/>
@@ -125,46 +131,9 @@
        </layout>
       </item>
       <item>
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="2">
-         <widget class="QPushButton" name="pb_Down">
-          <property name="toolTip">
-           <string>Looking down</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset>
-            <normalon>:/icons/actions/section-down.svg</normalon>
-           </iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>48</width>
-            <height>48</height>
-           </size>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="0" column="6">
-         <widget class="QPushButton" name="pb_Right">
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="1" column="3">
+         <widget class="QPushButton" name="pbRight">
           <property name="toolTip">
            <string>Looking right</string>
           </property>
@@ -187,32 +156,8 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="4">
-         <widget class="QPushButton" name="pb_Left">
-          <property name="toolTip">
-           <string>Looking left</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset>
-            <normalon>:/icons/actions/section-left.svg</normalon>
-           </iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>48</width>
-            <height>48</height>
-           </size>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <widget class="QPushButton" name="pb_Up">
+        <item row="1" column="0">
+         <widget class="QPushButton" name="pbUp">
           <property name="toolTip">
            <string>Looking up</string>
           </property>
@@ -241,124 +186,85 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="3">
-         <spacer name="horizontalSpacer_4">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+        <item row="1" column="2">
+         <widget class="QPushButton" name="pbLeft">
+          <property name="toolTip">
+           <string>Looking left</string>
           </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="0" column="5">
-         <spacer name="horizontalSpacer_5">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="Line" name="line_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_3">
-     <property name="title">
-      <string>Calculated Values</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
-       <layout class="QFormLayout" name="formLayout_5">
-        <property name="fieldGrowthPolicy">
-         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-        </property>
-        <item row="0" column="0">
-         <widget class="QLabel" name="lblProjDir">
           <property name="text">
-           <string>Projection Direction</string>
+           <string/>
           </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="leProjDir">
-          <property name="enabled">
+          <property name="icon">
+           <iconset>
+            <normalon>:/icons/actions/section-left.svg</normalon>
+           </iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>48</width>
+            <height>48</height>
+           </size>
+          </property>
+          <property name="checkable">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="lblSectNormal">
+        <item row="1" column="1">
+         <widget class="QPushButton" name="pbDown">
+          <property name="toolTip">
+           <string>Looking down</string>
+          </property>
           <property name="text">
-           <string>Section Normal</string>
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset>
+            <normalon>:/icons/actions/section-down.svg</normalon>
+           </iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>48</width>
+            <height>48</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
-         <widget class="QLineEdit" name="leNormal"/>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_9">
+          <property name="font">
+           <font>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Apply</string>
+          </property>
+         </widget>
         </item>
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pbReset">
-          <property name="toolTip">
-           <string>Start over</string>
-          </property>
-          <property name="text">
-           <string>Reset</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
index 3f3c014b6d..b974ca13ab 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
@@ -37,6 +37,17 @@
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 
+#include <Gui/Application.h>
+#include <Gui/Command.h>
+#include <Gui/Control.h>
+#include <Gui/Document.h>
+#include <Gui/MainWindow.h>
+#include <Gui/Selection.h>
+#include <Gui/ViewProvider.h>
+#include <Gui/WaitCursor.h>
+
+#include "TaskSectionView.h"
+
 #include "ViewProviderViewSection.h"
 
 using namespace TechDrawGui;
@@ -124,6 +135,40 @@ void ViewProviderViewSection::updateGraphic(void)
     }
 }
 
+bool ViewProviderViewSection::setEdit(int ModNum)
+{
+    if (ModNum == ViewProvider::Default ) {
+        if (Gui::Control().activeDialog())  {         //TaskPanel already open!
+            return false;
+        }
+        // clear the selection (convenience)
+        Gui::Selection().clearSelection();
+        Gui::Control().showDialog(new TaskDlgSectionView(getViewObject()));
+        return true;
+    } else {
+        return ViewProviderDrawingView::setEdit(ModNum);
+    }
+    return true;
+}
+
+void ViewProviderViewSection::unsetEdit(int ModNum)
+{
+    Q_UNUSED(ModNum);
+    if (ModNum == ViewProvider::Default) {
+        Gui::Control().closeDialog();
+    }
+    else {
+        ViewProviderDrawingView::unsetEdit(ModNum);
+    }
+}
+
+bool ViewProviderViewSection::doubleClicked(void)
+{
+    setEdit(ViewProvider::Default);
+    return true;
+}
+
+
 void ViewProviderViewSection::getParameters(void)
 {
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h
index a9047be9c3..911fdbc923 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h
@@ -57,12 +57,17 @@ public:
     virtual std::vector<std::string> getDisplayModes(void) const;
     virtual void updateData(const App::Property*);
     virtual void onChanged(const App::Property *prop);
+    virtual bool setEdit(int ModNum);
+    virtual void unsetEdit(int ModNum);
+    virtual bool doubleClicked(void);
 
     virtual std::vector<App::DocumentObject*> claimChildren(void) const;
 
     void updateGraphic(void);
     void getParameters(void);
 
+
+
     virtual TechDraw::DrawViewSection* getViewObject() const;
 };