diff --git a/src/App/ColorModel.cpp b/src/App/ColorModel.cpp
index b06a9360e9..99c39308e8 100644
--- a/src/App/ColorModel.cpp
+++ b/src/App/ColorModel.cpp
@@ -298,15 +298,18 @@ void ColorGradient::setColorModel ()
 ColorLegend::ColorLegend ()
 : outsideGrayed(false)
 {
-    // default  green, red
+    // default  blue, green, red
+    colorFields.emplace_back(0, 0, 1);
     colorFields.emplace_back(0, 1, 0);
     colorFields.emplace_back(1, 0, 0);
 
     names.push_back("Min");
+    names.push_back("Mid");
     names.push_back("Max");
 
     values.push_back(-1.0f);
-    values.push_back(0.0f);
+    values.push_back(-0.333f);
+    values.push_back(0.333f);
     values.push_back(1.0f);
 }
 
diff --git a/src/Gui/SoFCColorLegend.cpp b/src/Gui/SoFCColorLegend.cpp
index fe8a7c428d..14b728ef14 100644
--- a/src/Gui/SoFCColorLegend.cpp
+++ b/src/Gui/SoFCColorLegend.cpp
@@ -25,6 +25,7 @@
 
 #ifndef _PreComp_
 # include <sstream>
+# include <limits>
 # include <Inventor/fields/SoMFString.h>
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoCoordinate3.h>
@@ -45,18 +46,19 @@ SO_NODE_SOURCE(SoFCColorLegend)
 /*!
   Constructor.
 */
-SoFCColorLegend::SoFCColorLegend() : _fPosX(4.0f), _fPosY(4.0f)
+SoFCColorLegend::SoFCColorLegend() : _bbox(4.0f, -4.0f, 4.5f, 4.0f)
 {
-  SO_NODE_CONSTRUCTOR(SoFCColorLegend);
-  _cColRamp.setStyle(App::ColorGradient::FLOW);
+    SO_NODE_CONSTRUCTOR(SoFCColorLegend);
+    coords = new SoCoordinate3;
+    coords->ref();
+    labelGroup = new SoSeparator;
+    labelGroup->ref();
 
-  coords = new SoCoordinate3;
-  coords->ref();
-  labels = new SoSeparator;
-  labels->ref();
+    valueGroup = new SoSeparator;
+    valueGroup->ref();
 
-  setColorModel(0);
-  setRange(-0.5f,0.5f,1);
+    setColorLegend(_currentLegend);
+    setLegendLabels(_currentLegend, 3);
 }
 
 /*!
@@ -64,181 +66,297 @@ SoFCColorLegend::SoFCColorLegend() : _fPosX(4.0f), _fPosY(4.0f)
 */
 SoFCColorLegend::~SoFCColorLegend()
 {
-  //delete THIS;
-  coords->unref();
-  labels->unref();
+    //delete THIS;
+    coords->unref();
+    labelGroup->unref();
+    valueGroup->unref();
 }
 
 // doc from parent
 void SoFCColorLegend::initClass(void)
 {
-  SO_NODE_INIT_CLASS(SoFCColorLegend,SoFCColorBarBase,"Separator");
+    SO_NODE_INIT_CLASS(SoFCColorLegend,SoFCColorBarBase,"Separator");
 }
 
 void SoFCColorLegend::finish()
 {
-  atexit_cleanup();
+    atexit_cleanup();
 }
 
-void SoFCColorLegend::setMarkerLabel( const SoMFString& label )
+namespace {
+std::vector<SbVec3f> getLabelPositions(int num, const SbBox2f& bbox)
 {
-  coinRemoveAllChildren(labels);
+    std::vector<SbVec3f> pos;
+    float fMinY = bbox.getMin()[1];
+    float fMaxX = bbox.getMax()[0];
+    float fMaxY = bbox.getMax()[1] - 0.5f;
 
-  int num = label.getNum();
-  if ( num > 1 )
-  {
-    float fStep = 8.0f / ((float)num-1);
-    SoTransform* trans = new SoTransform;
-    trans->translation.setValue(_fPosX+0.1f,_fPosY-0.05f+fStep,0.0f);
-    labels->addChild(trans);
-
-    for ( int i=0; i<num; i++ )
-    {
-      SoTransform* trans = new SoTransform;
-      SoBaseColor* color = new SoBaseColor;
-      SoText2    * text2 = new SoText2;
-
-      trans->translation.setValue(0,-fStep,0);
-      color->rgb.setValue(0,0,0);
-      text2->string.setValue( label[i] );
-      labels->addChild(trans);
-      labels->addChild(color);
-      labels->addChild(text2);
-    }
-  }
-}
-
-void SoFCColorLegend::setViewportSize( const SbVec2s& size )
-{
-  float fRatio = ((float)size[0])/((float)size[1]);
-  float fMinX=  4.0f, fMaxX=4.5f;
-  float fMinY= -4.0f, fMaxY=4.0f;
-
-  if ( fRatio > 1.0f )
-  {
-    fMinX = 4.0f * fRatio;
-    fMaxX = fMinX+0.5f;
-  }
-  else if ( fRatio < 1.0f )
-  {
-    fMinY =  -4.0f / fRatio;
-    fMaxY =   4.0f / fRatio;
-  }
-
-  _fPosX = fMaxX;
-  _fPosY = fMaxY;
-
-  // search for the labels
-  int num=0;
-  for ( int i=0; i<labels->getNumChildren(); i++ )
-  {
-    if ( labels->getChild(i)->getTypeId() == SoTransform::getClassTypeId() )
-      num++;
-  }
-
-  if ( num > 2 )
-  {
-    bool first=true;
-    float fStep = (fMaxY-fMinY) / ((float)num-2);
-
-    for ( int j=0; j<labels->getNumChildren(); j++ )
-    {
-      if ( labels->getChild(j)->getTypeId() == SoTransform::getClassTypeId() )
-      {
-        if ( first )
-        {
-          first = false;
-          static_cast<SoTransform*>(labels->getChild(j))->translation.setValue(fMaxX+0.1f,fMaxY-0.05f+fStep,0.0f);
+    if (num > 1) {
+        float fStep = (fMaxY-fMinY) / static_cast<float>(num - 1);
+        pos.emplace_back(fMaxX + 0.1f, fMaxY + 0.20f + fStep, 0.0f);
+        for (int i=0; i<num; i++) {
+            pos.emplace_back(0.0f, -fStep, 0.0f);
         }
-        else
-        {
-          static_cast<SoTransform*>(labels->getChild(j))->translation.setValue(0,-fStep,0.0f);
-        }
-      }
     }
-  }
 
-  // set the vertices spanning the faces for the color gradient
-  int ct = coords->point.getNum()/2;
-  for ( int j=0; j<ct; j++ )
-  {
-    float w = (float)j/(float)(ct-1);
-    float fPosY = (1.0f-w)*fMaxY + w*fMinY;
-    coords->point.set1Value(2*j, fMinX, fPosY, 0.0f);
-    coords->point.set1Value(2*j+1, fMaxX, fPosY, 0.0f);
-  }
+    return pos;
 }
 
-void SoFCColorLegend::setRange( float fMin, float fMax, int prec )
+std::vector<SbVec3f> getValuePositions(int num, const SbBox2f& bbox)
 {
-  SoMFString label;
-  for (int j=0; j<9; j++)
-  {
-    std::stringstream s;
-    s.precision(prec);
-    s.setf(std::ios::fixed | std::ios::showpoint | std::ios::showpos);
-    float fValue = (1.0f-0.125f*(float)j)*fMax + (0.125f*(float)j)*fMin;
-    s << fValue;
-    label.set1Value(j, s.str().c_str());
-  }
+    std::vector<SbVec3f> pos;
+    float fMinY = bbox.getMin()[1];
+    float fMaxX = bbox.getMax()[0];
+    float fMaxY = bbox.getMax()[1] - 0.5f;
 
-  setMarkerLabel( label );
-  _cColRamp.setRange(fMin, fMax);
+    if (num > 2) {
+        float fStep = (fMaxY-fMinY) / static_cast<float>(num - 2);
+        float eps = fStep / 4.0f;
+
+        pos.emplace_back(fMaxX + 0.1f, fMaxY + 0.25f + 1.5f * fStep, 0.0f);
+        for (int i=0; i<num; i++) {
+            pos.emplace_back(0.0f, -fStep, 0.0f);
+        }
+
+        SbVec3f v;
+        v = pos[1];
+        v[1] -= eps;
+        pos[1] = v;
+
+        v = pos[2];
+        v[1] += eps;
+        pos[2] = v;
+
+        v = pos.back();
+        v[1] += eps;
+        pos.back() = v;
+    }
+
+    return pos;
+}
 }
 
-void SoFCColorLegend::setColorModel(std::size_t index)
+void SoFCColorLegend::setMarkerLabel(const SoMFString& label)
 {
-  _cColRamp.setColorModel(index);
-  App::ColorModel model = _cColRamp.getColorModel();
-  int uCtColors = (int)model.getCountColors();
+    coinRemoveAllChildren(labelGroup);
 
-  // don't know why the parameter range isn't between [-1,+1]
-  float fMinX=  4.0f, fMaxX=4.5f;
-  float fMinY= -4.0f, fMaxY=4.0f;
-  coords->point.setNum(2*uCtColors);
-  for ( int i=0; i<uCtColors; i++ )
-  {
-    float w = (float)i/(float)(uCtColors-1);
-    float fPosY = (1.0f-w)*fMaxY + w*fMinY;
-    coords->point.set1Value(2*i, fMinX, fPosY, 0.0f);
-    coords->point.set1Value(2*i+1, fMaxX, fPosY, 0.0f);
-  }
+    int num = label.getNum();
+    if (num > 1) {
+        std::vector<SbVec3f> pos = getLabelPositions(num, _bbox);
 
-  // for uCtColors colors we need 2*(uCtColors-1) facets and therefore an array with
-  // 8*(uCtColors-1) face indices
-  SoIndexedFaceSet * faceset = new SoIndexedFaceSet;
-  faceset->coordIndex.setNum(8*(uCtColors-1));
-  for ( int j=0; j<uCtColors-1; j++ )
-  {
-    faceset->coordIndex.set1Value(8*j,   2*j);
-    faceset->coordIndex.set1Value(8*j+1, 2*j+3);
-    faceset->coordIndex.set1Value(8*j+2, 2*j+1);
-    faceset->coordIndex.set1Value(8*j+3, SO_END_FACE_INDEX);
-    faceset->coordIndex.set1Value(8*j+4, 2*j);
-    faceset->coordIndex.set1Value(8*j+5, 2*j+2);
-    faceset->coordIndex.set1Value(8*j+6, 2*j+3);
-    faceset->coordIndex.set1Value(8*j+7, SO_END_FACE_INDEX);
-  }
+        SoTransform* trans = new SoTransform;
+        trans->translation.setValue(pos[0]);
+        labelGroup->addChild(trans);
 
-  SoMaterial* mat = new SoMaterial;
-  //mat->transparency = 0.3f;
-  mat->diffuseColor.setNum(2*uCtColors);
-  for ( int k=0; k<uCtColors; k++ )
-  {
-    App::Color col = model.colors[uCtColors-k-1];
-    mat->diffuseColor.set1Value(2*k, col.r, col.g, col.b);
-    mat->diffuseColor.set1Value(2*k+1, col.r, col.g, col.b);
-  }
+        for (int i=0; i<num; i++) {
+            SoTransform* trans = new SoTransform;
+            SoBaseColor* color = new SoBaseColor;
+            SoText2    * text2 = new SoText2;
 
-  SoMaterialBinding* matBinding = new SoMaterialBinding;
-  matBinding->value = SoMaterialBinding::PER_VERTEX_INDEXED;
-
-  // first clear the children
-  if ( getNumChildren() > 0 )
-    coinRemoveAllChildren(this);
-  addChild(labels);
-  addChild(coords);
-  addChild(mat);
-  addChild(matBinding);
-  addChild(faceset);
+            trans->translation.setValue(pos[i+1]);
+            color->rgb.setValue(0, 0, 0);
+            text2->string.setValue(label[i]);
+            labelGroup->addChild(trans);
+            labelGroup->addChild(color);
+            labelGroup->addChild(text2);
+        }
+    }
+}
+
+void SoFCColorLegend::setMarkerValue(const SoMFString& value)
+{
+    coinRemoveAllChildren(valueGroup);
+
+    int num = value.getNum();
+    if (num > 1) {
+        std::vector<SbVec3f> pos = getValuePositions(num, _bbox);
+
+        SoTransform* trans = new SoTransform;
+        trans->translation.setValue(pos[0]);
+        valueGroup->addChild(trans);
+
+        for (int i=0; i<num; i++) {
+            SoTransform* trans = new SoTransform;
+            SoBaseColor* color = new SoBaseColor;
+            SoText2    * text2 = new SoText2;
+
+            trans->translation.setValue(pos[i+1]);
+            color->rgb.setValue(0, 0, 0);
+            text2->string.setValue(value[i]);
+            valueGroup->addChild(trans);
+            valueGroup->addChild(color);
+            valueGroup->addChild(text2);
+        }
+    }
+}
+
+void SoFCColorLegend::setViewportSize(const SbVec2s& size)
+{
+    // don't know why the parameter range isn't between [-1,+1]
+    float fRatio = static_cast<float>(size[0]) / static_cast<float>(size[1]);
+    float fMinX =  4.0f, fMaxX = 4.5f;
+    float fMinY = -4.0f, fMaxY = 4.0f;
+
+    if (fRatio > 1.0f) {
+        fMinX = 4.0f * fRatio;
+        fMaxX = fMinX + 0.5f;
+    }
+    else if (fRatio < 1.0f) {
+        fMinY = -4.0f / fRatio;
+        fMaxY =  4.0f / fRatio;
+    }
+
+    _bbox.setBounds(fMinX, fMinY, fMaxX, fMaxY);
+
+    arrangeLabels(_bbox);
+    arrangeValues(_bbox);
+    modifyPoints(_bbox);
+}
+
+void SoFCColorLegend::setRange(float fMin, float fMax, int prec)
+{
+    std::size_t numFields = _currentLegend.hasNumberOfFields();
+    for (std::size_t i = 0; i <= numFields; i++) {
+        float factor = static_cast<float>(i) / numFields;
+        float value = (1 - factor) * fMin + factor * fMax;
+        _currentLegend.setValue(i, value);
+    }
+
+    setColorLegend(_currentLegend);
+    setLegendLabels(_currentLegend, prec);
+}
+
+void SoFCColorLegend::setLegendLabels(const App::ColorLegend& legend, int prec)
+{
+    float fMin = legend.getMinValue();
+    float fMax = legend.getMaxValue();
+
+    std::size_t numFields = legend.hasNumberOfFields();
+
+    SoMFString labels, values;
+
+    float eps = std::pow(10.0f, static_cast<float>(-prec));
+    float value = std::min<float>(fabs(fMin), fabs(fMax));
+    std::ios::fmtflags flags = value < eps ? (std::ios::scientific | std::ios::showpoint | std::ios::showpos)
+                                           : (std::ios::fixed | std::ios::showpoint | std::ios::showpos);
+
+    for (std::size_t i=0; i < numFields; i++) {
+        std::stringstream s;
+        s << legend.getText(numFields - 1 - i);
+        labels.set1Value(i, s.str().c_str());
+    }
+
+    for (std::size_t i=0; i <= numFields; i++) {
+        std::stringstream s;
+        s.precision(prec);
+        s.setf(flags);
+        float fValue = legend.getValue(numFields - i);
+        s << fValue;
+        values.set1Value(i, s.str().c_str());
+    }
+
+    setMarkerLabel(labels);
+    setMarkerValue(values);
+}
+
+void SoFCColorLegend::modifyPoints(const SbBox2f& box)
+{
+    float fMinX = box.getMin()[0];
+    float fMinY = box.getMin()[1];
+    float fMaxX = box.getMax()[0];
+    float fMaxY = box.getMax()[1] - 0.5f;
+
+    // set the vertices spanning the faces for the color legend
+    int intFields = coords->point.getNum() / 4;
+    for (int i = 0; i < intFields; i++) {
+        float w = static_cast<float>(i) / (intFields - 1);
+        float fPosY1 = w * fMaxY + (1.0f - w) * fMinY;
+        float fPosY2 = fPosY1 + 0.5f;
+        coords->point.set1Value(4 * i,     fMinX, fPosY1, 0.0f);
+        coords->point.set1Value(4 * i + 1, fMaxX, fPosY1, 0.0f);
+        coords->point.set1Value(4 * i + 2, fMaxX, fPosY2, 0.0f);
+        coords->point.set1Value(4 * i + 3, fMinX, fPosY2, 0.0f);
+    }
+}
+
+void SoFCColorLegend::arrangeLabels(const SbBox2f& box)
+{
+    // search for the labels
+    int num=0;
+    for (int i=0; i<labelGroup->getNumChildren(); i++) {
+        if (labelGroup->getChild(i)->getTypeId() == SoTransform::getClassTypeId())
+            num++;
+    }
+
+    if (num > 2) {
+        std::vector<SbVec3f> pos = getLabelPositions(num-1, box);
+
+        int index = 0;
+        for (int j=0; j<labelGroup->getNumChildren(); j++) {
+            if (labelGroup->getChild(j)->getTypeId() == SoTransform::getClassTypeId()) {
+                static_cast<SoTransform*>(labelGroup->getChild(j))->translation.setValue(pos[index++]);
+            }
+        }
+    }
+}
+
+void SoFCColorLegend::arrangeValues(const SbBox2f& box)
+{
+    // search for the labels
+    int num=0;
+    for (int i=0; i<valueGroup->getNumChildren(); i++) {
+        if (valueGroup->getChild(i)->getTypeId() == SoTransform::getClassTypeId())
+            num++;
+    }
+
+    if (num > 3) {
+        std::vector<SbVec3f> pos = getValuePositions(num-1, box);
+
+        int index = 0;
+        for (int j=0; j<valueGroup->getNumChildren(); j++) {
+            if (valueGroup->getChild(j)->getTypeId() == SoTransform::getClassTypeId()) {
+                static_cast<SoTransform*>(valueGroup->getChild(j))->translation.setValue(pos[index++]);
+            }
+        }
+    }
+}
+
+void SoFCColorLegend::setColorLegend(const App::ColorLegend& legend)
+{
+    // create top value field
+    std::size_t numFields = legend.hasNumberOfFields();
+    int intFields = static_cast<int>(numFields);
+    coords->point.setNum(4 * intFields);
+    modifyPoints(_bbox);
+
+    // for numFields colors we need numFields quads
+    SoIndexedFaceSet * faceset = new SoIndexedFaceSet;
+    faceset->coordIndex.setNum(5 * intFields);
+    for (int j = 0; j < intFields; j++) {
+        faceset->coordIndex.set1Value(5*j,   4*j);
+        faceset->coordIndex.set1Value(5*j+1, 4*j+1);
+        faceset->coordIndex.set1Value(5*j+2, 4*j+2);
+        faceset->coordIndex.set1Value(5*j+3, 4*j+3);
+        faceset->coordIndex.set1Value(5*j+4, SO_END_FACE_INDEX);
+    }
+
+    SoMaterial* mat = new SoMaterial;
+    mat->diffuseColor.setNum(intFields);
+    for (std::size_t k = 0; k < numFields; k++) {
+        App::Color col = legend.getColor(k);
+        mat->diffuseColor.set1Value(k, col.r, col.g, col.b);
+    }
+
+    SoMaterialBinding* matBinding = new SoMaterialBinding;
+    matBinding->value = SoMaterialBinding::PER_FACE;
+
+    // first clear the children
+    if (getNumChildren() > 0)
+        coinRemoveAllChildren(this);
+    addChild(labelGroup);
+    addChild(valueGroup);
+    addChild(coords);
+    addChild(mat);
+    addChild(matBinding);
+    addChild(faceset);
 }
diff --git a/src/Gui/SoFCColorLegend.h b/src/Gui/SoFCColorLegend.h
index 40aacbdfcd..4d1034a890 100644
--- a/src/Gui/SoFCColorLegend.h
+++ b/src/Gui/SoFCColorLegend.h
@@ -25,6 +25,7 @@
 #define GUI_SOFCCOLORLEGEND_H
 
 #include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/SbBox2f.h>
 #include "SoFCColorBar.h"
 #include <App/ColorModel.h>
 
@@ -44,7 +45,7 @@ public:
   static void finish(void);
   SoFCColorLegend(void);
 
-  void setMarkerLabel( const SoMFString& label );
+  void setLegendLabels(const App::ColorLegend& legend, int prec=3);
 
   /**
    * Sets the range of the colorbar from the maximum \a fMax to the minimum \a fMin.
@@ -52,17 +53,17 @@ public:
    */
   void setRange( float fMin, float fMax, int prec=3 );
   /**
-   * Sets the color model of the underlying color ramp to \a index.
+   * Updates the node with the given color legend.
    */
-  void setColorModel (std::size_t index);
+  void setColorLegend (const App::ColorLegend& legend);
 
-  unsigned short getColorIndex (float fVal) const { return _cColRamp.getColorIndex(fVal);  }
-  App::Color getColor (float fVal) const { return _cColRamp.getColor(fVal); }
-  void setOutsideGrayed (bool bVal) { _cColRamp.setOutsideGrayed(bVal); }
+  unsigned short getColorIndex (float fVal) const { return _currentLegend.getColorIndex(fVal);  }
+  App::Color getColor (float fVal) const { return _currentLegend.getColor(fVal); }
+  void setOutsideGrayed (bool bVal) { _currentLegend.setOutsideGrayed(bVal); }
   bool isVisible (float) const { return false; }
-  float getMinValue (void) const { return _cColRamp.getMinValue(); }
-  float getMaxValue (void) const { return _cColRamp.getMaxValue(); }
-  unsigned long countColors (void) const { return _cColRamp.getCountColors(); }
+  float getMinValue (void) const { return _currentLegend.getMinValue(); }
+  float getMaxValue (void) const { return _currentLegend.getMaxValue(); }
+  std::size_t countColors (void) const { return _currentLegend.hasNumberOfFields(); }
 
   bool customize() { return false; }
   const char* getColorBarName() const { return "Color Legend"; }
@@ -75,13 +76,19 @@ protected:
   void setViewportSize( const SbVec2s& size );
   virtual ~SoFCColorLegend();
 //  virtual void redrawHighlighted(SoAction * act, SbBool  flag);
-
-  SoCoordinate3* coords;
-  SoSeparator* labels;
+private:
+  void setMarkerLabel(const SoMFString& label);
+  void setMarkerValue(const SoMFString& value);
+  void modifyPoints(const SbBox2f&);
+  void arrangeLabels(const SbBox2f&);
+  void arrangeValues(const SbBox2f&);
 
 private:
-  float _fPosX, _fPosY;
-  App::ColorGradient _cColRamp;
+  SoCoordinate3* coords;
+  SoSeparator* labelGroup;
+  SoSeparator* valueGroup;
+  SbBox2f _bbox;
+  App::ColorLegend _currentLegend;
 };
 
 } // namespace Gui
diff --git a/src/Mod/TechDraw/Symbols/misc/1st_Angle_Projection.svg b/src/Mod/TechDraw/Symbols/misc/1st_Angle_Projection.svg
new file mode 100644
index 0000000000..38729b69e4
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/1st_Angle_Projection.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-09-01 14:12:14 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="31.2483mm" height="13.4966mm" viewBox="-24.5 -6.7483 31.2483 13.4966" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Circle -->
+        <circle cx="0" cy="0" r="5" style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M0,5.7483 L0,1.7145 M0,0.5715 L0,-0.5715 M0,-1.7145 L0,-5.7483 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M-12.5,5 L-12.5,-5 " style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M-22.5,2.3205 L-22.5,-2.3205 " style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M-23.5,0 L-22.9,0 M-22.36,0 L-22.36,0 M-21.82,0 L-19.66,0 M-19.12,0 L-19.12,0 M-18.58,0 L-16.42,0 M-15.88,0 L-15.88,0 M-15.34,0 L-13.18,0 M-12.64,0 L-12.64,0 M-12.1,0 L-11.5,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M-12.5,5 L-22.5,2.3205 " style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M-12.5,-5 L-22.5,-2.3205 " style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M-5.7483,0 L-1.7145,0 M-0.5715,0 L0.5715,0 M1.7145,0 L5.7483,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Circle -->
+        <circle cx="0" cy="0" r="2.320508075688771" style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M-15.9438,0 L-15.8347,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M-12.6961,0 L-12.587,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M-19.1721,0 L-19.063,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M-22.4247,0 L-22.3156,0 " style="stroke:#000000;stroke-width:0.18;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/3rd_Angle_Projection.svg b/src/Mod/TechDraw/Symbols/misc/3rd_Angle_Projection.svg
new file mode 100644
index 0000000000..32dc680c8b
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/3rd_Angle_Projection.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-09-01 14:12:32 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="31.2483mm" height="13.4966mm" viewBox="-6.7483 -6.7483 31.2483 13.4966" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Circle -->
+        <circle cx="0" cy="0" r="5" style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M0,5.7483 L0,1.7145 M0,0.5715 L0,-0.5715 M0,-1.7145 L0,-5.7483 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M22.5,5 L22.5,-5 " style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M12.5,2.3205 L12.5,-2.3205 " style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M11.5,0 L12.1,0 M12.64,0 L12.64,0 M13.18,0 L15.34,0 M15.88,0 L15.88,0 M16.42,0 L18.58,0 M19.12,0 L19.12,0 M19.66,0 L21.82,0 M22.36,0 L22.36,0 M22.9,0 L23.5,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M22.5,5 L12.5,2.3205 " style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M22.5,-5 L12.5,-2.3205 " style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M-5.7483,0 L-1.7145,0 M-0.5715,0 L0.5715,0 M1.7145,0 L5.7483,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Circle -->
+        <circle cx="0" cy="0" r="2.3205080756887706" style="stroke:#000000;stroke-width:0.3;"/>
+        <!-- Line -->
+        <path d="M15.8211,0 L15.9302,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M19.0587,0 L19.1678,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M22.3111,0 L22.4202,0 " style="stroke:#000000;stroke-width:0.18;"/>
+        <!-- Line -->
+        <path d="M12.5775,0 L12.6866,0 " style="stroke:#000000;stroke-width:0.18;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Arrow_Long_Filled.svg b/src/Mod/TechDraw/Symbols/misc/Arrow_Long_Filled.svg
new file mode 100644
index 0000000000..a06d46dcaa
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Arrow_Long_Filled.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-29 18:27:15 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="42mm" height="4.3941mm" viewBox="-41 -2.1971 42 4.3941" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M-1,0 L-40,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M-3.2889,-1.1971 L0,0 L-3.2889,1.1971 Z" style="fill:#000000;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Arrow_Long_Open.svg b/src/Mod/TechDraw/Symbols/misc/Arrow_Long_Open.svg
new file mode 100644
index 0000000000..0ee98d0839
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Arrow_Long_Open.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-29 18:28:33 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="42mm" height="4.3941mm" viewBox="-41 -2.1971 42 4.3941" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,0 L-40,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-3.2889,1.1971 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-3.2889,-1.1971 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Arrow_Medium_Filled.svg b/src/Mod/TechDraw/Symbols/misc/Arrow_Medium_Filled.svg
new file mode 100644
index 0000000000..ac6fb48f18
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Arrow_Medium_Filled.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-29 18:25:45 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="27mm" height="4.3941mm" viewBox="-26 -2.1971 27 4.3941" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M-1,0 L-25,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M-3.2889,-1.1971 L0,0 L-3.2889,1.1971 Z" style="fill:#000000;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Arrow_Medium_Open.svg b/src/Mod/TechDraw/Symbols/misc/Arrow_Medium_Open.svg
new file mode 100644
index 0000000000..91f58c3706
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Arrow_Medium_Open.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-29 18:24:01 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="27mm" height="4.3941mm" viewBox="-26 -2.1971 27 4.3941" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,0 L-25,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-3.2889,1.1971 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-3.2889,-1.1971 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Arrow_Short_Filled.svg b/src/Mod/TechDraw/Symbols/misc/Arrow_Short_Filled.svg
new file mode 100644
index 0000000000..d6fb109ffd
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Arrow_Short_Filled.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-29 18:17:43 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="14mm" height="4.3941mm" viewBox="-13 -2.1971 14 4.3941" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M-1,0 L-12,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M-3.2889,-1.1971 L-3.2889,1.1971 L0,0 Z" style="fill:#000000;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Arrow_Short_Open.svg b/src/Mod/TechDraw/Symbols/misc/Arrow_Short_Open.svg
new file mode 100644
index 0000000000..cefdf76f10
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Arrow_Short_Open.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-29 18:21:52 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="14mm" height="4.3941mm" viewBox="-13 -2.1971 14 4.3941" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,0 L-12,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-3.2889,1.1971 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-3.2889,-1.1971 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Balloon_Editable_Text.svg b/src/Mod/TechDraw/Symbols/misc/Balloon_Editable_Text.svg
new file mode 100644
index 0000000000..08441a8c70
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Balloon_Editable_Text.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 2021-09-01 10:58:06 Generated by QCAD 3.26.4.5 SVG Exporter -->
+
+<svg
+   xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12mm"
+   height="12mm"
+   viewBox="-5.7631 -9 12 12"
+   version="1.1"
+   style="fill:none;stroke-linecap:round;stroke-linejoin:round"
+   id="svg10"
+   sodipodi:docname="Balloon_Editable_Text.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1654"
+     inkscape:window-height="864"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="3.045935"
+     inkscape:cx="-44.950188"
+     inkscape:cy="19.370079"
+     inkscape:window-x="192"
+     inkscape:window-y="84"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10" />
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652"
+     freecad:editable="ID"
+     x="0.60000002"
+     y="-0.43749997"
+     id="text57">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55">1</tspan>
+  </text>
+  <g
+     style="fill:none;stroke-linecap:round;stroke-linejoin:round"
+     transform="matrix(1,0,0,-1,-0.06903208,0.76864402)"
+     id="g4">
+    <!-- Arc -->
+    <circle
+       cx="0"
+       cy="3"
+       r="5"
+       style="stroke:#000000;stroke-width:0.2"
+       id="circle2" />
+  </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Balloon_Long.svg b/src/Mod/TechDraw/Symbols/misc/Balloon_Long.svg
new file mode 100644
index 0000000000..8ad7d81900
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Balloon_Long.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 15:03:45 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="12mm" height="76.6445mm" viewBox="-6 -59 12 76.6445" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M-1.1971,-13.3555 L1.1971,-13.3555 L0,-16.6445 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M0,48 L0,-15 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <circle cx="0" cy="53" r="5" style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Balloon_Medium.svg b/src/Mod/TechDraw/Symbols/misc/Balloon_Medium.svg
new file mode 100644
index 0000000000..05a4448b08
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Balloon_Medium.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 15:02:33 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="12mm" height="38.6445mm" viewBox="-6 -21 12 38.6445" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M-1.1971,-13.3555 L1.1971,-13.3555 L0,-16.6445 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M0,10 L0,-15 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <circle cx="0" cy="15" r="5" style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Balloon_Short.svg b/src/Mod/TechDraw/Symbols/misc/Balloon_Short.svg
new file mode 100644
index 0000000000..87a13f6afa
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Balloon_Short.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 15:01:24 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="12mm" height="26.6445mm" viewBox="-6 -9 12 26.6445" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M-1.1971,-13.3555 L1.1971,-13.3555 L0,-16.6445 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M0,-2 L0,-15 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <circle cx="0" cy="3" r="5" style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/CallOut.svg b/src/Mod/TechDraw/Symbols/misc/CallOut.svg
new file mode 100644
index 0000000000..0740d05a61
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/CallOut.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:08:31 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="52mm" height="59.1314mm" viewBox="-1 -36 52 59.1314" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Polyline -->
+        <path d="M27.2394,0 L45,0 A5,5 0 0 1 50,5 L50,30 A5,5 0 0 1 45,35 L5,35 A5,5 0 0 1 0,30 L0,5 A5,5 0 0 1 5,0 L22.7606,0" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M27.2394,0 L25.0182,-22.1314 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M22.7606,0 L24.9818,-22.1314 " style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/CallOut_Left.svg b/src/Mod/TechDraw/Symbols/misc/CallOut_Left.svg
new file mode 100644
index 0000000000..01f51bc5f4
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/CallOut_Left.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:08:41 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="57.0981mm" height="51.8309mm" viewBox="-1 -36 57.0981 51.8309" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Polyline -->
+        <path d="M38.5453,0 L5,0 A5,5 0 0 0 0,5 L0,30 A5,5 0 0 0 5,35 L45,35 A5,5 0 0 0 50,30 L50,5 A5,5 0 0 0 45,0" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M45,0 A22.1492,22.1492 0 0,1 55.0981,-14.8309" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M55.0981,-14.8309 A23.47,23.47 0 0,0 38.5453,0" style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/CallOut_Right.svg b/src/Mod/TechDraw/Symbols/misc/CallOut_Right.svg
new file mode 100644
index 0000000000..341dcd6bbe
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/CallOut_Right.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:08:23 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="57.0981mm" height="51.8309mm" viewBox="-6.0981 -36 57.0981 51.8309" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Polyline -->
+        <path d="M11.4547,0 L45,0 A5,5 0 0 1 50,5 L50,30 A5,5 0 0 1 45,35 L5,35 A5,5 0 0 1 0,30 L0,5 A5,5 0 0 1 5,0" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M5,0 A22.1492,22.1492 0 0,0 -5.0981,-14.8309" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M-5.0981,-14.8309 A23.47,23.47 0 0,1 11.4547,0" style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Centre_Justified_Text_10_Lines.svg b/src/Mod/TechDraw/Symbols/misc/Centre_Justified_Text_10_Lines.svg
new file mode 100644
index 0000000000..430d09f317
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Centre_Justified_Text_10_Lines.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 2021-09-01 16:32:00 Generated by QCAD 3.26.4.5 SVG Exporter -->
+
+<svg
+   xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="14mm"
+   height="14mm"
+   viewBox="-7 -10 14 14"
+   version="1.1"
+   style="stroke-linecap:round;stroke-linejoin:round;fill:none"
+   id="svg8"
+   sodipodi:docname="Centre_Justified_Text_10_Lines.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1661"
+     inkscape:window-height="946"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="4.460119"
+     inkscape:cx="30.465896"
+     inkscape:cy="-18.38516"
+     inkscape:window-x="2152"
+     inkscape:window-y="70"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8" />
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="-6"
+     id="text57">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="-2"
+     id="text57-5">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="2"
+     id="text57-5-5">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-2">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="6"
+     id="text57-5-54">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-7">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="10"
+     id="text57-5-4">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-4">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="14"
+     id="text57-5-3">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-0">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="18"
+     id="text57-5-7">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-8">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="22"
+     id="text57-5-6">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-88">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="26"
+     id="text57-5-7-3">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-8-1">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="30"
+     id="text57-5-7-4">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-8-9">??</tspan>
+  </text>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Cloud.svg b/src/Mod/TechDraw/Symbols/misc/Cloud.svg
new file mode 100644
index 0000000000..602fc7bd0f
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Cloud.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:11:37 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="53.5387mm" height="42.2065mm" viewBox="-1.8138 -43.3806 53.5387 42.2065" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Arc -->
+        <path d="M20.7988,37.4201 A10.7817,10.7817 0 0,1 5.729,25.6581" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M5.729,25.6581 A8.8229,8.8229 0 0,1 8.8845,8.3556" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M8.8845,8.3556 A8.0442,8.0442 0 0,1 23.8495,6.5119" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M23.8495,6.5119 A9.1688,9.1688 0 0,1 39.9186,10.9566" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M39.9186,10.9566 A8.3549,8.3549 0 1,1 44.7906,26.9402" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M44.7906,26.9402 A7.1418,7.1418 0 0,1 35.4739,35.744" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M35.4739,35.744 A7.606,7.606 0 0,1 20.7988,37.4201" style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Cosmetic_Break_Long.svg b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Break_Long.svg
new file mode 100644
index 0000000000..b82560ac94
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Break_Long.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-31 17:54:21 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="14.0432mm" height="122mm" viewBox="-3.0216 -61 14.0432 122" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,-60 L0,-3.6429 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M0,2.7571 L0,60 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M8,3.2 L8,60 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M8,-60 L8,-3.2 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M0,-3.6429 L2.0216,-2.4757 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-2.0216,1.5899 L0,2.7571 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M8,-3.2 L10.0216,-2.0328 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M5.9784,2.0328 L8,3.2 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-2.0216,1.5899 L2.0216,-2.4757 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M5.9784,2.0328 L10.0216,-2.0328 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Hatch -->
+        <path d="M0.15,59.85 L7.85,59.85 L7.85,3.2866 L5.7346,2.0653 L9.7778,-2.0004 L7.85,-3.1134 L7.85,-59.85 L0.15,-59.85 L0.15,-3.7295 L2.2654,-2.5082 L-1.7778,1.5575 L0.15,2.6705 Z" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Cosmetic_Break_Medium.svg b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Break_Medium.svg
new file mode 100644
index 0000000000..0ae2f65b40
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Break_Medium.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-31 17:52:54 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="10.0432mm" height="65.2mm" viewBox="-3.0216 -32.3786 10.0432 65.2" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,2.7571 L0,31.3786 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M0,-31.8214 L0,-3.6429 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M4,3.2 L4,31.3786 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M4,-31.8214 L4,-3.2 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M0,-3.6429 L2.0216,-2.4757 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-2.0216,1.5899 L0,2.7571 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M4,-3.2 L6.0216,-2.0328 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M1.9784,2.0328 L4,3.2 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-2.0216,1.5899 L2.0216,-2.4757 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M1.9784,2.0328 L6.0216,-2.0328 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Hatch -->
+        <path d="M0.15,-3.7295 L2.2654,-2.5082 L-1.7778,1.5575 L0.15,2.6705 L0.15,31.2286 L3.85,31.2286 L3.85,3.2866 L1.7346,2.0653 L5.7778,-2.0004 L3.85,-3.1134 L3.85,-31.6714 L0.15,-31.6714 Z" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Cosmetic_Break_Small.svg b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Break_Small.svg
new file mode 100644
index 0000000000..3f1a3e6eff
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Break_Small.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-31 17:55:41 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="9.0432mm" height="36.8mm" viewBox="-3.0216 -18.0678 9.0432 36.8" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,2.7571 L0,17.0678 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,-17.7322 L0,-3.6429 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3,3.2 L3,17.0678 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3,-17.7322 L3,-3.2 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,-3.6429 L2.0216,-2.4757 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-2.0216,1.5899 L0,2.7571 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3,-3.2 L5.0216,-2.0328 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0.9784,2.0328 L3,3.2 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-2.0216,1.5899 L2.0216,-2.4757 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0.9784,2.0328 L5.0216,-2.0328 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M0.15,16.9178 L2.85,16.9178 L2.85,3.2866 L0.7346,2.0653 L4.7778,-2.0004 L2.85,-3.1134 L2.85,-17.5822 L0.15,-17.5822 L0.15,-3.7295 L2.2654,-2.5082 L-1.7778,1.5575 L0.15,2.6705 Z" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_End.svg b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_End.svg
new file mode 100644
index 0000000000..9b5c2e24b5
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_End.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-31 17:08:23 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="14.5667mm" height="24.5882mm" viewBox="-12.5817 -12.3007 14.5667 24.5882" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Arc -->
+        <path d="M-7.1081,2.6918 A3.9182,3.9182 0 0,1 -6.759,3.3483" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.759,3.3483 A6.4326,6.4326 0 0,1 -6.2907,5.7578" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.2907,5.7578 A6.4326,6.4326 0 0,1 -6.759,8.1673" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.759,8.1673 A3.9182,3.9182 0 0,1 -7.1081,8.8238" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.1081,8.8238 A3.1751,3.1751 0 0,1 -7.3946,9.2049" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.3946,9.2049 A2.6752,2.6752 0 0,1 -7.6465,9.4613" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.6465,9.4613 A2.3121,2.3121 0 0,1 -7.8821,9.6484" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.8821,9.6484 A2.0337,2.0337 0 0,1 -8.1185,9.792" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.1185,9.792 A1.7844,1.7844 0 0,1 -8.3841,9.9063" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.3841,9.9063 A1.6796,1.6796 0 0,1 -8.9371,10" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.7248,-2.6053 A3.1749,3.1749 0 0,1 -10.7652,-2.6661" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.7652,-2.6661 A3.9182,3.9182 0 0,1 -11.1142,-3.3228" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-11.1142,-3.3228 A6.4326,6.4326 0 0,1 -11.5817,-5.7324" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-11.5817,-5.7324 A6.4326,6.4326 0 0,1 -11.1125,-8.1417" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-11.1125,-8.1417 A3.9182,3.9182 0 0,1 -10.7632,-8.7982" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.7632,-8.7982 A3.1751,3.1751 0 0,1 -10.4766,-9.1791" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.4766,-9.1791 A2.6752,2.6752 0 0,1 -10.2246,-9.4355" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.2246,-9.4355 A2.3121,2.3121 0 0,1 -9.9889,-9.6224" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-9.9889,-9.6224 A2.0337,2.0337 0 0,1 -9.7524,-9.7659" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-9.7524,-9.7659 A1.7844,1.7844 0 0,1 -9.4868,-9.8802" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-9.4868,-9.8802 A1.6796,1.6796 0 0,1 -8.9338,-9.9737" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.9371,-9.9737 A1.6796,1.6796 0 0,1 -8.3808,-9.8799" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.3808,-9.8799 A1.7844,1.7844 0 0,1 -8.1152,-9.7654" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.1152,-9.7654 A2.0337,2.0337 0 0,1 -7.8789,-9.6217" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.8789,-9.6217 A2.3121,2.3121 0 0,1 -7.6433,-9.4346" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.6433,-9.4346 A2.6752,2.6752 0 0,1 -7.3915,-9.1781" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.3915,-9.1781 A3.1751,3.1751 0 0,1 -7.1052,-8.7969" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.1052,-8.7969 A3.9182,3.9182 0 0,1 -6.7562,-8.1403" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.7562,-8.1403 A6.4326,6.4326 0 0,1 -6.2887,-5.7306" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.2887,-5.7306 A6.4326,6.4326 0 0,1 -6.7578,-3.3213" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.7578,-3.3213 A3.9182,3.9182 0 0,1 -7.1072,-2.6648" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.1072,-2.6648 A3.1747,3.1747 0 0,1 -7.2511,-2.46" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-7.1081,2.6918 L-9.0241,-0.1144 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-9.0241,-0.1144 L-7.2511,-2.46 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-10.7652,-2.6661 L-9.0241,-0.1144 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Hatch -->
+        <path d="M0.9851,11.3007 L-8.9371,11.3007 L-8.9371,10.2 A2.1078,2.1078 0 0 0 -7.5129,9.6102 A5.15382,5.15382 0 0 0 -6.0907,5.7578 A6.10364,6.10364 0 0 0 -6.9412,2.5815 L-8.7779,-0.1085 L-6.9398,-2.5555 A4.11817,4.11817 0 0 0 -6.5732,-3.2445 A6.63251,6.63251 0 0 0 -6.5708,-8.2151 A3.41462,3.41462 0 0 0 -8.3148,-10.0687 A1.87959,1.87959 0 0 0 -8.9371,-10.1737 L-8.9371,-11.2876 L0.9851,-11.2876 Z" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_End_Large.svg b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_End_Large.svg
new file mode 100644
index 0000000000..a8f5848ab0
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_End_Large.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-31 17:06:07 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="27.1335mm" height="47.1765mm" viewBox="-24.1633 -23.6013 27.1335 47.1765" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Arc -->
+        <path d="M-14.2163,5.3835 A7.8363,7.8363 0 0,1 -13.5179,6.6967" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-13.5179,6.6967 A12.8651,12.8651 0 0,1 -12.5813,11.5156" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-12.5813,11.5156 A12.8651,12.8651 0 0,1 -13.5179,16.3346" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-13.5179,16.3346 A7.8363,7.8363 0 0,1 -14.2163,17.6477" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.2163,17.6477 A6.3501,6.3501 0 0,1 -14.7892,18.4098" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.7892,18.4098 A5.3505,5.3505 0 0,1 -15.293,18.9227" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-15.293,18.9227 A4.6243,4.6243 0 0,1 -15.7643,19.2967" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-15.7643,19.2967 A4.0673,4.0673 0 0,1 -16.237,19.5839" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-16.237,19.5839 A3.5688,3.5688 0 0,1 -16.7682,19.8127" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-16.7682,19.8127 A3.3592,3.3592 0 0,1 -17.8743,20" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-21.4495,-5.2106 A6.3498,6.3498 0 0,1 -21.5305,-5.3322" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-21.5305,-5.3322 A7.8363,7.8363 0 0,1 -22.2283,-6.6455" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-22.2283,-6.6455 A12.8651,12.8651 0 0,1 -23.1633,-11.4648" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-23.1633,-11.4648 A12.8651,12.8651 0 0,1 -22.2251,-16.2834" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-22.2251,-16.2834 A7.8363,7.8363 0 0,1 -21.5263,-17.5963" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-21.5263,-17.5963 A6.3501,6.3501 0 0,1 -20.9531,-18.3582" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-20.9531,-18.3582 A5.3505,5.3505 0 0,1 -20.4491,-18.871" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-20.4491,-18.871 A4.6243,4.6243 0 0,1 -19.9777,-19.2448" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-19.9777,-19.2448 A4.0673,4.0673 0 0,1 -19.5049,-19.5319" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-19.5049,-19.5319 A3.5688,3.5688 0 0,1 -18.9737,-19.7604" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-18.9737,-19.7604 A3.3592,3.3592 0 0,1 -17.8675,-19.9474" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-17.8743,-19.9474 A3.3592,3.3592 0 0,1 -16.7615,-19.7597" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-16.7615,-19.7597 A3.5688,3.5688 0 0,1 -16.2305,-19.5308" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-16.2305,-19.5308 A4.0673,4.0673 0 0,1 -15.7578,-19.2434" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-15.7578,-19.2434 A4.6243,4.6243 0 0,1 -15.2867,-18.8692" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-15.2867,-18.8692 A5.3505,5.3505 0 0,1 -14.783,-18.3561" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.783,-18.3561 A6.3501,6.3501 0 0,1 -14.2103,-17.5939" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.2103,-17.5939 A7.8363,7.8363 0 0,1 -13.5125,-16.2805" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-13.5125,-16.2805 A12.8651,12.8651 0 0,1 -12.5774,-11.4612" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-12.5774,-11.4612 A12.8651,12.8651 0 0,1 -13.5157,-6.6426" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-13.5157,-6.6426 A7.8363,7.8363 0 0,1 -14.2144,-5.3297" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.2144,-5.3297 A6.3494,6.3494 0 0,1 -14.5021,-4.92" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-14.2163,5.3835 L-18.0482,-0.2289 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-18.0482,-0.2289 L-14.5021,-4.92 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-21.5305,-5.3322 L-18.0482,-0.2289 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Hatch -->
+        <path d="M1.9702,22.6013 L-17.8743,22.6013 L-17.8743,20.4 A4.21561,4.21561 0 0 0 -15.0258,19.2204 A10.3076,10.3076 0 0 0 -12.1813,11.5156 A12.2073,12.2073 0 0 0 -13.8825,5.1631 L-17.5558,-0.217 L-13.8795,-5.111 A8.23634,8.23634 0 0 0 -13.1464,-6.489 A13.265,13.265 0 0 0 -13.1415,-16.4302 A6.82923,6.82923 0 0 0 -16.6297,-20.1374 A3.75918,3.75918 0 0 0 -17.8743,-20.3474 L-17.8743,-22.5752 L1.9702,-22.5752 Z" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_Middle.svg b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_Middle.svg
new file mode 100644
index 0000000000..998c3faca8
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_Middle.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-31 16:49:49 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="15.7152mm" height="24.5882mm" viewBox="-12.5817 -12.3007 15.7152 24.5882" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Arc -->
+        <path d="M-2.34,-2.6787 A3.9182,3.9182 0 0,1 -2.6892,-3.3353" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.6892,-3.3353 A6.4326,6.4326 0 0,1 -3.1575,-5.7447" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-3.1575,-5.7447 A6.4326,6.4326 0 0,1 -2.6892,-8.1542" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.6892,-8.1542 A3.9182,3.9182 0 0,1 -2.34,-8.8108" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.34,-8.8108 A3.1751,3.1751 0 0,1 -2.0536,-9.1918" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.0536,-9.1918 A2.6752,2.6752 0 0,1 -1.8016,-9.4483" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-1.8016,-9.4483 A2.3121,2.3121 0 0,1 -1.566,-9.6353" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-1.566,-9.6353 A2.0337,2.0337 0 0,1 -1.3296,-9.7789" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-1.3296,-9.7789 A1.7844,1.7844 0 0,1 -1.064,-9.8933" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-1.064,-9.8933 A1.6796,1.6796 0 0,1 -0.5149,-9.9869" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.1081,2.6918 A3.9182,3.9182 0 0,1 -6.759,3.3483" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.759,3.3483 A6.4326,6.4326 0 0,1 -6.2907,5.7578" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.2907,5.7578 A6.4326,6.4326 0 0,1 -6.759,8.1673" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.759,8.1673 A3.9182,3.9182 0 0,1 -7.1081,8.8238" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.1081,8.8238 A3.1751,3.1751 0 0,1 -7.3946,9.2049" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.3946,9.2049 A2.6752,2.6752 0 0,1 -7.6465,9.4613" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.6465,9.4613 A2.3121,2.3121 0 0,1 -7.8821,9.6484" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.8821,9.6484 A2.0337,2.0337 0 0,1 -8.1185,9.792" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.1185,9.792 A1.7844,1.7844 0 0,1 -8.3841,9.9063" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.3841,9.9063 A1.6796,1.6796 0 0,1 -8.9371,10" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M1.2766,2.6183 A3.1749,3.1749 0 0,1 1.3171,2.6791" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M1.3171,2.6791 A3.9182,3.9182 0 0,1 1.666,3.3358" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M1.666,3.3358 A6.4326,6.4326 0 0,1 2.1335,5.7455" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M2.1335,5.7455 A6.4326,6.4326 0 0,1 1.6644,8.1548" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M1.6644,8.1548 A3.9182,3.9182 0 0,1 1.315,8.8112" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M1.315,8.8112 A3.1751,3.1751 0 0,1 1.0284,9.1922" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M1.0284,9.1922 A2.6752,2.6752 0 0,1 0.7764,9.4485" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M0.7764,9.4485 A2.3121,2.3121 0 0,1 0.5407,9.6355" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M0.5407,9.6355 A2.0337,2.0337 0 0,1 0.3043,9.779" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M0.3043,9.779 A1.7844,1.7844 0 0,1 0.0387,9.8933" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M0.0387,9.8933 A1.6796,1.6796 0 0,1 -0.5144,9.9868" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-0.5149,9.9868 A1.6796,1.6796 0 0,1 -1.0674,9.8929" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-1.0674,9.8929 A1.7844,1.7844 0 0,1 -1.3329,9.7784" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-1.3329,9.7784 A2.0337,2.0337 0 0,1 -1.5692,9.6348" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-1.5692,9.6348 A2.3121,2.3121 0 0,1 -1.8048,9.4477" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-1.8048,9.4477 A2.6752,2.6752 0 0,1 -2.0566,9.1911" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.0566,9.1911 A3.1751,3.1751 0 0,1 -2.343,8.81" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.343,8.81 A3.9182,3.9182 0 0,1 -2.6919,8.1533" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.6919,8.1533 A6.4326,6.4326 0 0,1 -3.1594,5.7437" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-3.1594,5.7437 A6.4326,6.4326 0 0,1 -2.6903,3.3344" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.6903,3.3344 A3.9182,3.9182 0 0,1 -2.3409,2.6779" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.3409,2.6779 A3.1747,3.1747 0 0,1 -2.1971,2.4731" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.7248,-2.6053 A3.1749,3.1749 0 0,1 -10.7652,-2.6661" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.7652,-2.6661 A3.9182,3.9182 0 0,1 -11.1142,-3.3228" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-11.1142,-3.3228 A6.4326,6.4326 0 0,1 -11.5817,-5.7324" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-11.5817,-5.7324 A6.4326,6.4326 0 0,1 -11.1125,-8.1417" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-11.1125,-8.1417 A3.9182,3.9182 0 0,1 -10.7632,-8.7982" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.7632,-8.7982 A3.1751,3.1751 0 0,1 -10.4766,-9.1791" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.4766,-9.1791 A2.6752,2.6752 0 0,1 -10.2246,-9.4355" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-10.2246,-9.4355 A2.3121,2.3121 0 0,1 -9.9889,-9.6224" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-9.9889,-9.6224 A2.0337,2.0337 0 0,1 -9.7524,-9.7659" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-9.7524,-9.7659 A1.7844,1.7844 0 0,1 -9.4868,-9.8802" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-9.4868,-9.8802 A1.6796,1.6796 0 0,1 -8.9338,-9.9737" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.9371,-9.9737 A1.6796,1.6796 0 0,1 -8.3808,-9.8799" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.3808,-9.8799 A1.7844,1.7844 0 0,1 -8.1152,-9.7654" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-8.1152,-9.7654 A2.0337,2.0337 0 0,1 -7.8789,-9.6217" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.8789,-9.6217 A2.3121,2.3121 0 0,1 -7.6433,-9.4346" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.6433,-9.4346 A2.6752,2.6752 0 0,1 -7.3915,-9.1781" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.3915,-9.1781 A3.1751,3.1751 0 0,1 -7.1052,-8.7969" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.1052,-8.7969 A3.9182,3.9182 0 0,1 -6.7562,-8.1403" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.7562,-8.1403 A6.4326,6.4326 0 0,1 -6.2887,-5.7306" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.2887,-5.7306 A6.4326,6.4326 0 0,1 -6.7578,-3.3213" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.7578,-3.3213 A3.9182,3.9182 0 0,1 -7.1072,-2.6648" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-7.1072,-2.6648 A3.1747,3.1747 0 0,1 -7.2511,-2.46" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-2.34,-2.6787 L-0.424,0.1275 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-7.1081,2.6918 L-9.0241,-0.1144 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-0.424,0.1275 L-2.1971,2.4731 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-9.0241,-0.1144 L-7.2511,-2.46 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-10.7652,-2.6661 L-9.0241,-0.1144 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M1.3171,2.6791 L-0.424,0.1275 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Hatch -->
+        <path d="M-2.5052,-2.5659 L-0.6703,0.1216 L-2.5084,2.5686 A5.6253,5.6253 0 0 0 -3.3594,5.7436 A6.22917,6.22917 0 0 0 -2.5107,8.919 A2.48495,2.48495 0 0 0 -0.5149,10.1868 L-0.5149,11.3007 L-8.9371,11.3007 L-8.9371,10.2 A2.1078,2.1078 0 0 0 -7.5129,9.6102 A5.15382,5.15382 0 0 0 -6.0907,5.7578 A6.10364,6.10364 0 0 0 -6.9412,2.5815 L-8.7779,-0.1085 L-6.9398,-2.5555 A4.11817,4.11817 0 0 0 -6.5732,-3.2445 A6.63251,6.63251 0 0 0 -6.5708,-8.2151 A3.41462,3.41462 0 0 0 -8.3148,-10.0687 A1.87959,1.87959 0 0 0 -8.9371,-10.1737 L-8.9371,-11.2876 L-0.5149,-11.2876 L-0.5149,-10.1869 A1.87959,1.87959 0 0 0 -1.1299,-10.0821 A3.14043,3.14043 0 0 0 -2.8746,-8.2291 A6.69725,6.69725 0 0 0 -2.5052,-2.5659" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_Middle_Large.svg b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_Middle_Large.svg
new file mode 100644
index 0000000000..bf6674f171
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Cosmetic_Round_Section_Middle_Large.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-31 16:54:08 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="29.4304mm" height="47.1765mm" viewBox="-24.1633 -23.6013 29.4304 47.1765" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Arc -->
+        <path d="M-4.68,-5.3574 A7.8363,7.8363 0 0,1 -5.3783,-6.6705" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-5.3783,-6.6705 A12.8651,12.8651 0 0,1 -6.315,-11.4895" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.315,-11.4895 A12.8651,12.8651 0 0,1 -5.3783,-16.3084" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-5.3783,-16.3084 A7.8363,7.8363 0 0,1 -4.68,-17.6216" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-4.68,-17.6216 A6.3501,6.3501 0 0,1 -4.1071,-18.3836" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-4.1071,-18.3836 A5.3505,5.3505 0 0,1 -3.6033,-18.8966" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-3.6033,-18.8966 A4.6243,4.6243 0 0,1 -3.132,-19.2706" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-3.132,-19.2706 A4.0673,4.0673 0 0,1 -2.6592,-19.5578" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.6592,-19.5578 A3.5688,3.5688 0 0,1 -2.1281,-19.7866" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.1281,-19.7866 A3.3592,3.3592 0 0,1 -1.0298,-19.9739" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.2163,5.3835 A7.8363,7.8363 0 0,1 -13.5179,6.6967" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-13.5179,6.6967 A12.8651,12.8651 0 0,1 -12.5813,11.5156" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-12.5813,11.5156 A12.8651,12.8651 0 0,1 -13.5179,16.3346" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-13.5179,16.3346 A7.8363,7.8363 0 0,1 -14.2163,17.6477" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.2163,17.6477 A6.3501,6.3501 0 0,1 -14.7892,18.4098" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.7892,18.4098 A5.3505,5.3505 0 0,1 -15.293,18.9227" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-15.293,18.9227 A4.6243,4.6243 0 0,1 -15.7643,19.2967" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-15.7643,19.2967 A4.0673,4.0673 0 0,1 -16.237,19.5839" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-16.237,19.5839 A3.5688,3.5688 0 0,1 -16.7682,19.8127" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-16.7682,19.8127 A3.3592,3.3592 0 0,1 -17.8743,20" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M2.5532,5.2367 A6.3498,6.3498 0 0,1 2.6342,5.3583" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M2.6342,5.3583 A7.8363,7.8363 0 0,1 3.332,6.6716" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M3.332,6.6716 A12.8651,12.8651 0 0,1 4.267,11.4909" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M4.267,11.4909 A12.8651,12.8651 0 0,1 3.3288,16.3096" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M3.3288,16.3096 A7.8363,7.8363 0 0,1 2.63,17.6225" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M2.63,17.6225 A6.3501,6.3501 0 0,1 2.0568,18.3843" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M2.0568,18.3843 A5.3505,5.3505 0 0,1 1.5528,18.8971" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M1.5528,18.8971 A4.6243,4.6243 0 0,1 1.0815,19.2709" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M1.0815,19.2709 A4.0673,4.0673 0 0,1 0.6086,19.558" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M0.6086,19.558 A3.5688,3.5688 0 0,1 0.0774,19.7866" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M0.0774,19.7866 A3.3592,3.3592 0 0,1 -1.0288,19.9735" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-1.0298,19.9735 A3.3592,3.3592 0 0,1 -2.1348,19.7858" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.1348,19.7858 A3.5688,3.5688 0 0,1 -2.6658,19.5569" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-2.6658,19.5569 A4.0673,4.0673 0 0,1 -3.1385,19.2695" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-3.1385,19.2695 A4.6243,4.6243 0 0,1 -3.6096,18.8954" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-3.6096,18.8954 A5.3505,5.3505 0 0,1 -4.1133,18.3822" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-4.1133,18.3822 A6.3501,6.3501 0 0,1 -4.686,17.62" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-4.686,17.62 A7.8363,7.8363 0 0,1 -5.3838,16.3066" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-5.3838,16.3066 A12.8651,12.8651 0 0,1 -6.3188,11.4874" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-6.3188,11.4874 A12.8651,12.8651 0 0,1 -5.3806,6.6687" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-5.3806,6.6687 A7.8363,7.8363 0 0,1 -4.6818,5.3558" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-4.6818,5.3558 A6.3494,6.3494 0 0,1 -4.3942,4.9462" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-21.4495,-5.2106 A6.3498,6.3498 0 0,1 -21.5305,-5.3322" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-21.5305,-5.3322 A7.8363,7.8363 0 0,1 -22.2283,-6.6455" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-22.2283,-6.6455 A12.8651,12.8651 0 0,1 -23.1633,-11.4648" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-23.1633,-11.4648 A12.8651,12.8651 0 0,1 -22.2251,-16.2834" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-22.2251,-16.2834 A7.8363,7.8363 0 0,1 -21.5263,-17.5963" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-21.5263,-17.5963 A6.3501,6.3501 0 0,1 -20.9531,-18.3582" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-20.9531,-18.3582 A5.3505,5.3505 0 0,1 -20.4491,-18.871" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-20.4491,-18.871 A4.6243,4.6243 0 0,1 -19.9777,-19.2448" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-19.9777,-19.2448 A4.0673,4.0673 0 0,1 -19.5049,-19.5319" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-19.5049,-19.5319 A3.5688,3.5688 0 0,1 -18.9737,-19.7604" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-18.9737,-19.7604 A3.3592,3.3592 0 0,1 -17.8675,-19.9474" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-17.8743,-19.9474 A3.3592,3.3592 0 0,1 -16.7615,-19.7597" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-16.7615,-19.7597 A3.5688,3.5688 0 0,1 -16.2305,-19.5308" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-16.2305,-19.5308 A4.0673,4.0673 0 0,1 -15.7578,-19.2434" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-15.7578,-19.2434 A4.6243,4.6243 0 0,1 -15.2867,-18.8692" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-15.2867,-18.8692 A5.3505,5.3505 0 0,1 -14.783,-18.3561" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.783,-18.3561 A6.3501,6.3501 0 0,1 -14.2103,-17.5939" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.2103,-17.5939 A7.8363,7.8363 0 0,1 -13.5125,-16.2805" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-13.5125,-16.2805 A12.8651,12.8651 0 0,1 -12.5774,-11.4612" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-12.5774,-11.4612 A12.8651,12.8651 0 0,1 -13.5157,-6.6426" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-13.5157,-6.6426 A7.8363,7.8363 0 0,1 -14.2144,-5.3297" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Arc -->
+        <path d="M-14.2144,-5.3297 A6.3494,6.3494 0 0,1 -14.5021,-4.92" style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-4.68,-5.3574 L-0.8481,0.255 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-14.2163,5.3835 L-18.0482,-0.2289 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-0.8481,0.255 L-4.3942,4.9462 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-18.0482,-0.2289 L-14.5021,-4.92 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M-21.5305,-5.3322 L-18.0482,-0.2289 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Line -->
+        <path d="M2.6342,5.3583 L-0.8481,0.255 " style="stroke:#000000;stroke-width:0.25;"/>
+        <!-- Hatch -->
+        <path d="M-5.0104,-5.1319 L-1.3405,0.2432 L-5.0168,5.1371 A11.2506,11.2506 0 0 0 -6.7188,11.4872 A12.4583,12.4583 0 0 0 -5.0214,17.838 A4.96991,4.96991 0 0 0 -1.0298,20.3735 L-1.0298,22.6013 L-17.8743,22.6013 L-17.8743,20.4 A4.21561,4.21561 0 0 0 -15.0258,19.2204 A10.3076,10.3076 0 0 0 -12.1813,11.5156 A12.2073,12.2073 0 0 0 -13.8825,5.1631 L-17.5558,-0.217 L-13.8795,-5.111 A8.23634,8.23634 0 0 0 -13.1464,-6.489 A13.265,13.265 0 0 0 -13.1415,-16.4302 A6.82923,6.82923 0 0 0 -16.6297,-20.1374 A3.75918,3.75918 0 0 0 -17.8743,-20.3474 L-17.8743,-22.5752 L-1.0298,-22.5752 L-1.0298,-20.3739 A3.75918,3.75918 0 0 0 -2.2598,-20.1642 A6.28086,6.28086 0 0 0 -5.7492,-16.4583 A13.3945,13.3945 0 0 0 -5.0104,-5.1319" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Datum_Left.svg b/src/Mod/TechDraw/Symbols/misc/Datum_Left.svg
new file mode 100644
index 0000000000..a8522c0f4a
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Datum_Left.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:07:57 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="23.0681mm" height="24.2384mm" viewBox="-15.6681 -23.2384 23.0681 24.2384" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,0 L6.4,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M6.4,0 L3.2,5.5426 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L3.2,18.3703 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-6.9319,22.2384 L-14.6681,22.2384 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-14.6681,22.2384 L-14.6681,14.5022 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-14.6681,14.5022 L-6.9319,14.5022 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-6.9319,14.5022 L-6.9319,22.2384 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M3.2,5.5426 L0,0 L6.4,0 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M-6.9319,18.3703 L3.2,18.3703 " style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Datum_Point.svg b/src/Mod/TechDraw/Symbols/misc/Datum_Point.svg
new file mode 100644
index 0000000000..df2c1b02e7
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Datum_Point.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:07:30 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="12.3608mm" height="12.3608mm" viewBox="-6.1804 -6.1804 12.3608 12.3608" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Arc -->
+        <path d="M0,-3.5 A3.5,3.5 0 0,1 3.5,0" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M-3.5,0 A3.5,3.5 0 0,1 0,-3.5" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M0,3.5 A3.5,3.5 0 0,1 -3.5,0" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <path d="M3.5,0 A3.5,3.5 0 0,1 0,3.5" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,-3.5 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,0 L3.5,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.5,0 L5.1804,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,3.5 L0,5.1804 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,-3.5 L0,-5.1804 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-3.5,0 L-5.1804,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,0 L0,3.5 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,0 L-3.5,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M0,0 L0,3.5 A3.5,3.5 0 0 1 -3.5,0 L0,0 L3.5,0 A3.5,3.5 0 0 0 0,-3.5 Z" style="fill:#000000;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Datum_Right.svg b/src/Mod/TechDraw/Symbols/misc/Datum_Right.svg
new file mode 100644
index 0000000000..041cf3b21a
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Datum_Right.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:07:49 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="23.0681mm" height="24.2384mm" viewBox="-1 -23.2384 23.0681 24.2384" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,0 L6.4,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M6.4,0 L3.2,5.5426 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L3.2,18.3703 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M13.3319,22.2384 L21.0681,22.2384 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M21.0681,22.2384 L21.0681,14.5022 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M21.0681,14.5022 L13.3319,14.5022 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M13.3319,14.5022 L13.3319,22.2384 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M3.2,5.5426 L0,0 L6.4,0 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M13.3319,18.3703 L3.2,18.3703 " style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Datum_Target_Left.svg b/src/Mod/TechDraw/Symbols/misc/Datum_Target_Left.svg
new file mode 100644
index 0000000000..9c86ddf19c
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Datum_Target_Left.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:55:43 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="21.8907mm" height="21.8907mm" viewBox="-7 -10 21.8907 21.8907" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M10.7187,-9.4116 L12.4116,-7.7187 L13.8907,-10.8907 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M-6,3 L6,3 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M4.2426,-1.2426 L12.7279,-9.7279 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <circle cx="0" cy="3" r="6" style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Datum_Target_Plain.svg b/src/Mod/TechDraw/Symbols/misc/Datum_Target_Plain.svg
new file mode 100644
index 0000000000..b17f82823c
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Datum_Target_Plain.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 2021-09-01 16:32:00 Generated by QCAD 3.26.4.5 SVG Exporter -->
+
+<svg
+   xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="14mm"
+   height="14mm"
+   viewBox="-7 -10 14 14"
+   version="1.1"
+   style="stroke-linecap:round;stroke-linejoin:round;fill:none"
+   id="svg8"
+   sodipodi:docname="Datum_Target_Plain.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1661"
+     inkscape:window-height="946"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="4.460119"
+     inkscape:cx="-17.264113"
+     inkscape:cy="26.456693"
+     inkscape:window-x="2152"
+     inkscape:window-y="70"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8" />
+  <g
+     transform="scale(1,-1)"
+     id="g6">
+    <!-- Line -->
+    <path
+       d="M-6,3 L6,3 "
+       style="stroke:#000000;stroke-width:0.2;"
+       id="path2" />
+    <!-- Arc -->
+    <circle
+       cx="0"
+       cy="3"
+       r="6"
+       style="stroke:#000000;stroke-width:0.2;"
+       id="circle4" />
+  </g>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01
+"
+     x="0.60000002"
+     y="-3.7111788"
+     id="text57">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0.60000002"
+     y="1.0345836"
+     id="text57-5">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2">A1</tspan>
+  </text>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Datum_Target_Right.svg b/src/Mod/TechDraw/Symbols/misc/Datum_Target_Right.svg
new file mode 100644
index 0000000000..41ba634ed1
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Datum_Target_Right.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:54:59 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="21.8907mm" height="21.8907mm" viewBox="-14.8907 -10 21.8907 21.8907" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M-12.4116,-7.7187 L-10.7187,-9.4116 L-13.8907,-10.8907 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M-6,3 L6,3 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-4.2426,-1.2426 L-12.7279,-9.7279 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <circle cx="0" cy="3" r="6" style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Datum_Target_Up.svg b/src/Mod/TechDraw/Symbols/misc/Datum_Target_Up.svg
new file mode 100644
index 0000000000..5f1ecfcdff
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Datum_Target_Up.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:53:44 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="14mm" height="27.6445mm" viewBox="-7 -10 14 27.6445" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M-1.1971,-13.3555 L1.1971,-13.3555 L0,-16.6445 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M-6,3 L6,3 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,-3 L0,-15 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Arc -->
+        <circle cx="0" cy="3" r="6" style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Datum_Up.svg b/src/Mod/TechDraw/Symbols/misc/Datum_Up.svg
new file mode 100644
index 0000000000..4c5fa8add7
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Datum_Up.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:07:40 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="9.7362mm" height="24.2384mm" viewBox="-1.6681 -23.2384 9.7362 24.2384" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,0 L6.4,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M6.4,0 L3.2,5.5426 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L3.2,14.5022 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M7.0681,22.2384 L-0.6681,22.2384 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-0.6681,22.2384 L-0.6681,14.5022 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-0.6681,14.5022 L7.0681,14.5022 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M7.0681,14.5022 L7.0681,22.2384 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M3.2,5.5426 L0,0 L6.4,0 Z" style="fill:#000000;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Feature_Left.svg b/src/Mod/TechDraw/Symbols/misc/Feature_Left.svg
new file mode 100644
index 0000000000..9156fbf2f7
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Feature_Left.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:44:39 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="15.3319mm" height="24.2384mm" viewBox="-7.9319 -23.2384 15.3319 24.2384" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,0 L6.4,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M6.4,0 L3.2,5.5426 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L3.2,18.3703 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-6.9319,14.5022 L-6.9319,22.2384 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M3.2,5.5426 L0,0 L6.4,0 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M-6.9319,18.3703 L3.2,18.3703 " style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Feature_Right.svg b/src/Mod/TechDraw/Symbols/misc/Feature_Right.svg
new file mode 100644
index 0000000000..f187725551
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Feature_Right.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:47:35 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="15.3319mm" height="24.2384mm" viewBox="-1 -23.2384 15.3319 24.2384" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,0 L6.4,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M6.4,0 L3.2,5.5426 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L3.2,18.3703 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M13.3319,14.5022 L13.3319,22.2384 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M3.2,5.5426 L0,0 L6.4,0 Z" style="fill:#000000;fill-rule:evenodd;"/>
+        <!-- Line -->
+        <path d="M13.3319,18.3703 L3.2,18.3703 " style="stroke:#000000;stroke-width:0.2;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Feature_Up.svg b/src/Mod/TechDraw/Symbols/misc/Feature_Up.svg
new file mode 100644
index 0000000000..2593c15862
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Feature_Up.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 14:45:30 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="9.7362mm" height="16.5022mm" viewBox="-1.6681 -15.5022 9.7362 16.5022" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Line -->
+        <path d="M0,0 L6.4,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M6.4,0 L3.2,5.5426 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L0,0 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.2,5.5426 L3.2,14.5022 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-0.6681,14.5022 L7.0681,14.5022 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M3.2,5.5426 L0,0 L6.4,0 Z" style="fill:#000000;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Left_Justified_Text_10_Lines.svg b/src/Mod/TechDraw/Symbols/misc/Left_Justified_Text_10_Lines.svg
new file mode 100644
index 0000000000..baf82207e2
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Left_Justified_Text_10_Lines.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 2021-09-01 16:32:00 Generated by QCAD 3.26.4.5 SVG Exporter -->
+
+<svg
+   xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="14mm"
+   height="14mm"
+   viewBox="-7 -10 14 14"
+   version="1.1"
+   style="stroke-linecap:round;stroke-linejoin:round;fill:none"
+   id="svg8"
+   sodipodi:docname="Left_Justified_Text_10_Lines.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1661"
+     inkscape:window-height="946"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="4.460119"
+     inkscape:cx="30.23296"
+     inkscape:cy="-27.35353"
+     inkscape:window-x="2152"
+     inkscape:window-y="70"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8" />
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:left;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="-6"
+     id="text57">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:left;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="-2"
+     id="text57-5">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:left;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="2"
+     id="text57-5-5">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-2">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="6"
+     id="text57-5-54">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-7">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="10"
+     id="text57-5-4">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-4">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="14"
+     id="text57-5-3">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-0">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="18"
+     id="text57-5-7">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-8">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="22"
+     id="text57-5-6">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-88">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="26"
+     id="text57-5-7-3">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-8-1">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID"
+     x="0"
+     y="30"
+     id="text57-5-7-4">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55-2-8-9">??</tspan>
+  </text>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/North.svg b/src/Mod/TechDraw/Symbols/misc/North.svg
new file mode 100644
index 0000000000..c9a081a3c7
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/North.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-08-30 15:07:21 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="12mm" height="12mm" viewBox="-6 -6 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Circle -->
+        <circle cx="0" cy="0" r="5" style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,5 L-3.5684,-3.5024 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M0,5 L3.5684,-3.5024 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M-3.5684,-3.5024 L0,-1.0718 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Line -->
+        <path d="M3.5684,-3.5024 L0,-1.0718 " style="stroke:#000000;stroke-width:0.2;"/>
+        <!-- Hatch -->
+        <path d="M-3.5684,-3.5024 L0,-1.0718 L3.5684,-3.5024 L0,5 Z" style="fill:#000000;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Revision_Triangle.svg b/src/Mod/TechDraw/Symbols/misc/Revision_Triangle.svg
new file mode 100644
index 0000000000..cd0c58e12e
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Revision_Triangle.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 2021-09-01 10:58:06 Generated by QCAD 3.26.4.5 SVG Exporter -->
+
+<svg
+   xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.5263mm"
+   height="10.25mm"
+   viewBox="-5.7631 -9 11.5263 10.25"
+   version="1.1"
+   style="stroke-linecap:round;stroke-linejoin:round;fill:none"
+   id="svg10"
+   sodipodi:docname="Revision_Triangle.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1596"
+     inkscape:window-height="864"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="6.0918699"
+     inkscape:cx="-0.29662163"
+     inkscape:cy="19.370079"
+     inkscape:window-x="2187"
+     inkscape:window-y="107"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10" />
+  <g
+     transform="scale(1,-1)"
+     id="g8">
+    <!-- Line -->
+    <path
+       d="M0,8 L-4.7631,-0.25 "
+       style="stroke:#000000;stroke-width:0.2;"
+       id="path2" />
+    <!-- Line -->
+    <path
+       d="M-4.7631,-0.25 L4.7631,-0.25 "
+       style="stroke:#000000;stroke-width:0.2;"
+       id="path4" />
+    <!-- Line -->
+    <path
+       d="M4.7631,-0.25 L0,8 "
+       style="stroke:#000000;stroke-width:0.2;"
+       id="path6" />
+  </g>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:center;text-anchor:middle;fill:#000000;stroke-width:1.01955652"
+     freecad:editable="ID"
+     x="0.60000002"
+     y="-0.60000002"
+     id="text57">
+    <tspan
+       style="font-size:4.23333359px;text-align:center;text-anchor:middle;stroke-width:1.01955652"
+       id="tspan55">B</tspan>
+  </text>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Right_Justified_Text_10_Lines.svg b/src/Mod/TechDraw/Symbols/misc/Right_Justified_Text_10_Lines.svg
new file mode 100644
index 0000000000..b8d4e7678f
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Right_Justified_Text_10_Lines.svg
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 2021-09-01 16:32:00 Generated by QCAD 3.26.4.5 SVG Exporter -->
+
+<svg
+   xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="14mm"
+   height="14mm"
+   viewBox="-7 -10 14 14"
+   version="1.1"
+   style="stroke-linecap:round;stroke-linejoin:round;fill:none"
+   id="svg8"
+   sodipodi:docname="Right_Justified_Text_10_Lines.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1661"
+     inkscape:window-height="946"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="4.460119"
+     inkscape:cx="-26.905111"
+     inkscape:cy="-18.38516"
+     inkscape:window-x="2152"
+     inkscape:window-y="70"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8" />
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="-6"
+     id="text57">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55">??</tspan>
+  </text>
+  <flowRoot
+     xml:space="preserve"
+     id="flowRoot834"
+     style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;letter-spacing:0px;word-spacing:0px;text-anchor:end;text-align:end;"><flowRegion
+       id="flowRegion836"
+       style="text-anchor:end;text-align:end;"><rect
+         id="rect838"
+         width="21.748299"
+         height="160.53383"
+         x="15.02202"
+         y="-4.0357666"
+         style="text-anchor:end;text-align:end;" /></flowRegion><flowPara
+       id="flowPara840"></flowPara></flowRoot>  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="-2"
+     id="text57-7"
+     inkscape:transform-center-x="-0.059322034"
+     inkscape:transform-center-y="-0.41525424">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55-4">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="2"
+     id="text57-4">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55-3">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="6"
+     id="text57-0">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55-7">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="10"
+     id="text57-8">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55-43">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="14"
+     id="text57-1">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55-49">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="18"
+     id="text57-2">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55-0">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="22"
+     id="text57-6">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55-8">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="26"
+     id="text57-9">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55-2">??</tspan>
+  </text>
+  <text
+     style="font-size:4.23333359px;font-family:tahoma;text-align:end;text-anchor:end;fill:#000000;stroke-width:1.01955652;stroke-linecap:round;stroke-linejoin:round"
+     freecad:editable="ID_01 "
+     x="0"
+     y="30"
+     id="text57-66">
+    <tspan
+       style="font-size:4.23333359px;text-align:end;text-anchor:end;stroke-width:1.01955652"
+       id="tspan55-495">??</tspan>
+  </text>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Whiteout_Rectangle_Long.svg b/src/Mod/TechDraw/Symbols/misc/Whiteout_Rectangle_Long.svg
new file mode 100644
index 0000000000..abf2b6d8a0
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Whiteout_Rectangle_Long.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-09-01 14:58:00 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="152mm" height="27mm" viewBox="-1 -26 152 27" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M0,0 L150,0 L150,25 L0,25 Z" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Whiteout_Rectangle_Medium.svg b/src/Mod/TechDraw/Symbols/misc/Whiteout_Rectangle_Medium.svg
new file mode 100644
index 0000000000..7a07ed7e46
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Whiteout_Rectangle_Medium.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-09-01 14:57:21 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="102mm" height="27mm" viewBox="-1 -26 102 27" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M0,0 L100,0 L100,25 L0,25 Z" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Whiteout_Rectangle_Short.svg b/src/Mod/TechDraw/Symbols/misc/Whiteout_Rectangle_Short.svg
new file mode 100644
index 0000000000..fde4258060
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Whiteout_Rectangle_Short.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-09-01 14:56:25 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="52mm" height="27mm" viewBox="-1 -26 52 27" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M0,0 L50,0 L50,25 L0,25 Z" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>
diff --git a/src/Mod/TechDraw/Symbols/misc/Whiteout_Square.svg b/src/Mod/TechDraw/Symbols/misc/Whiteout_Square.svg
new file mode 100644
index 0000000000..58901b06b5
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/misc/Whiteout_Square.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 2021-09-01 14:55:33 Generated by QCAD 3.26.4.5 SVG Exporter -->
+<svg width="27mm" height="27mm" viewBox="-1 -26 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
+    <g transform="scale(1,-1)">
+        <!-- Hatch -->
+        <path d="M0,0 L25,0 L25,25 L0,25 Z" style="fill:#fefefe;fill-rule:evenodd;"/>
+    </g>
+</svg>