diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
index 3c83058c5b..3321684c22 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
@@ -138,7 +138,7 @@
            <string>Preferred arrowhead style</string>
           </property>
           <property name="currentIndex">
-           <number>0</number>
+           <number>-1</number>
           </property>
           <property name="maxVisibleItems">
            <number>5</number>
@@ -149,75 +149,6 @@
           <property name="prefPath" stdset="0">
            <cstring>Mod/TechDraw/Dimensions</cstring>
           </property>
-          <item>
-           <property name="text">
-            <string>0 - Filled Triangle</string>
-           </property>
-           <property name="icon">
-            <iconset>
-             <normalon>:/icons/arrowfilled.svg</normalon>
-            </iconset>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>1 - Open Arrowhead</string>
-           </property>
-           <property name="icon">
-            <iconset>
-             <normalon>:/icons/arrowopen.svg</normalon>
-            </iconset>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>2 - Tick</string>
-           </property>
-           <property name="icon">
-            <iconset>
-             <normalon>:/icons/arrowtick.svg</normalon>
-            </iconset>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>3 - Dot</string>
-           </property>
-           <property name="icon">
-            <iconset>
-             <normalon>:/icons/arrowdot.svg</normalon>
-            </iconset>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>4 - Open Circle</string>
-           </property>
-           <property name="icon">
-            <iconset>
-             <normalon>:/icons/arrowopendot.svg</normalon>
-            </iconset>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>5 - Fork</string>
-           </property>
-           <property name="icon">
-            <iconset resource="Resources/TechDraw.qrc">
-             <normaloff>:/icons/arrowfork.svg</normaloff>:/icons/arrowfork.svg</iconset>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>6 - Pyramid</string>
-           </property>
-           <property name="icon">
-            <iconset>
-             <normalon>:/icons/arrowpyramid.svg</normalon>
-            </iconset>
-           </property>
-          </item>
          </widget>
         </item>
         <item row="3" column="0">
@@ -638,46 +569,6 @@
           <property name="prefPath" stdset="0">
            <cstring>Mod/TechDraw/Decorations</cstring>
           </property>
-          <item>
-           <property name="text">
-            <string>Filled Triangle</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Open Arrow</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Hash Mark</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Dot</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Open Circle</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Fork</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Pyramid</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>None</string>
-           </property>
-          </item>
          </widget>
         </item>
         <item row="2" column="2">
diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.ui b/src/Mod/TechDraw/Gui/TaskBalloon.ui
index 66cdec699e..63c5147544 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.ui
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.ui
@@ -28,76 +28,7 @@
         <item>
          <layout class="QGridLayout" name="gridLayout">
           <item row="3" column="1">
-           <widget class="QComboBox" name="comboEndType">
-            <item>
-             <property name="text">
-              <string>FILLED_TRIANGLE</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowfilled.svg</normaloff>:/icons/arrowfilled.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>OPEN_ARROW</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowopen.svg</normaloff>:/icons/arrowopen.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>HASH_MARK</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowtick.svg</normaloff>:/icons/arrowtick.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>DOT</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowdot.svg</normaloff>:/icons/arrowdot.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>OPEN_CIRCLE</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowopendot.svg</normaloff>:/icons/arrowopendot.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>FORK</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowfork.svg</normaloff>:/icons/arrowfork.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>PYRAMID</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowpyramid.svg</normaloff>:/icons/arrowpyramid.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>NONE</string>
-             </property>
-            </item>
-           </widget>
+           <widget class="QComboBox" name="comboEndType"/>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_4">
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.ui b/src/Mod/TechDraw/Gui/TaskLeaderLine.ui
index 2a36cf6b1d..72dac5950e 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.ui
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.ui
@@ -173,76 +173,8 @@ You can pick further points to get line segments.</string>
           <item row="1" column="1">
            <widget class="QComboBox" name="cboxStartSym">
             <property name="currentIndex">
-             <number>0</number>
+             <number>-1</number>
             </property>
-            <item>
-             <property name="text">
-              <string>No Symbol</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Filled Triangle</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowfilled.svg</normaloff>:/icons/arrowfilled.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Open Triangle</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowopen.svg</normaloff>:/icons/arrowopen.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Tick</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowtick.svg</normaloff>:/icons/arrowtick.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Dot</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowdot.svg</normaloff>:/icons/arrowdot.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Open Circle</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowopendot.svg</normaloff>:/icons/arrowopendot.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Fork</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowfork.svg</normaloff>:/icons/arrowfork.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Pyramid</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowpyramid.svg</normaloff>:/icons/arrowpyramid.svg</iconset>
-             </property>
-            </item>
            </widget>
           </item>
           <item row="2" column="0">
@@ -253,76 +185,7 @@ You can pick further points to get line segments.</string>
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="QComboBox" name="cboxEndSym">
-            <item>
-             <property name="text">
-              <string>No Symbol</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Filled Triangle</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowfilled.svg</normaloff>:/icons/arrowfilled.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Open Triangle</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowopen.svg</normaloff>:/icons/arrowopen.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Tick</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowtick.svg</normaloff>:/icons/arrowtick.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Dot</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowdot.svg</normaloff>:/icons/arrowdot.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Open Circle</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowopendot.svg</normaloff>:/icons/arrowopendot.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Fork</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowfork.svg</normaloff>:/icons/arrowfork.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Pyramid</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/TechDraw.qrc">
-               <normaloff>:/icons/arrowpyramid.svg</normaloff>:/icons/arrowpyramid.svg</iconset>
-             </property>
-            </item>
-           </widget>
+           <widget class="QComboBox" name="cboxEndSym"/>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label">
@@ -336,7 +199,7 @@ You can pick further points to get line segments.</string>
             <property name="toolTip">
              <string>Line color</string>
             </property>
-            <property name="color" stdset="0">
+            <property name="color">
              <color>
               <red>0</red>
               <green>0</green>
@@ -353,17 +216,17 @@ You can pick further points to get line segments.</string>
            </widget>
           </item>
           <item row="4" column="1">
-           <widget class="Gui::QuantitySpinBox" name="dsbWeight" native="true">
+           <widget class="Gui::QuantitySpinBox" name="dsbWeight">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="toolTip">
              <string>Line width</string>
             </property>
-            <property name="singleStep" stdset="0">
+            <property name="singleStep">
              <double>0.100000000000000</double>
             </property>
-            <property name="value" stdset="0">
+            <property name="value">
              <double>0.500000000000000</double>
             </property>
            </widget>
@@ -441,16 +304,16 @@ You can pick further points to get line segments.</string>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>Gui::ColorButton</class>
-   <extends>QPushButton</extends>
-   <header>Gui/Widgets.h</header>
-  </customwidget>
   <customwidget>
    <class>Gui::QuantitySpinBox</class>
    <extends>QWidget</extends>
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
+  <customwidget>
+   <class>Gui::ColorButton</class>
+   <extends>QPushButton</extends>
+   <header>Gui/Widgets.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="Resources/TechDraw.qrc"/>