diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
index 6816875fed..1fb0ad68cd 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
@@ -418,36 +418,64 @@
            <property name="text">
             <string>Circular</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/circular.svg</normaloff>:/icons/circular.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>None</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/none.svg</normaloff>:/icons/none.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>Triangle</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/triangle.svg</normaloff>:/icons/triangle.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>Inspection</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/inspection.svg</normaloff>:/icons/inspection.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>Hexagon</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/hexagon.svg</normaloff>:/icons/hexagon.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>Square</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/square.svg</normaloff>:/icons/square.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>Rectangle</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/rectangle.svg</normaloff>:/icons/rectangle.svg</iconset>
+           </property>
           </item>
          </widget>
         </item>
diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.ui b/src/Mod/TechDraw/Gui/TaskBalloon.ui
index 63c5147544..1fda937b37 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.ui
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.ui
@@ -40,7 +40,7 @@
           <item row="2" column="0">
            <widget class="QLabel" name="label_3">
             <property name="text">
-             <string>Symbol:</string>
+             <string>Shape:</string>
             </property>
            </widget>
           </item>
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.ui b/src/Mod/TechDraw/Gui/TaskCenterLine.ui
index cf7bcd1d72..61a3237803 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.ui
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.ui
@@ -174,7 +174,7 @@
            </widget>
           </item>
           <item row="0" column="3">
-           <widget class="Gui::QuantitySpinBox" name="qsbVertShift">
+           <widget class="Gui::QuantitySpinBox" name="qsbVertShift" native="true">
             <property name="toolTip">
              <string>Move line +Up or -Down</string>
             </property>
@@ -184,7 +184,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="Gui::QuantitySpinBox" name="qsbHorizShift">
+           <widget class="Gui::QuantitySpinBox" name="qsbHorizShift" native="true">
             <property name="toolTip">
              <string>Move line -Left or +Right</string>
             </property>
@@ -216,7 +216,7 @@
           </item>
           <item row="2" column="1">
            <widget class="Gui::ColorButton" name="cpLineColor">
-            <property name="color">
+            <property name="color" stdset="0">
              <color>
               <red>0</red>
               <green>0</green>
@@ -258,26 +258,46 @@
              <property name="text">
               <string>Continuous</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/continuous-line.svg</normaloff>:/icons/continuous-line.svg</iconset>
+             </property>
             </item>
             <item>
              <property name="text">
               <string>Dash</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/dash-line.svg</normaloff>:/icons/dash-line.svg</iconset>
+             </property>
             </item>
             <item>
              <property name="text">
               <string>Dot</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/dot-line.svg</normaloff>:/icons/dot-line.svg</iconset>
+             </property>
             </item>
             <item>
              <property name="text">
               <string>DashDot</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/dashDot-line.svg</normaloff>:/icons/dashDot-line.svg</iconset>
+             </property>
             </item>
             <item>
              <property name="text">
               <string>DashDotDot</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/dashDotDot-line.svg</normaloff>:/icons/dashDotDot-line.svg</iconset>
+             </property>
             </item>
            </widget>
           </item>
@@ -289,14 +309,14 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="Gui::QuantitySpinBox" name="qsbExtend">
+           <widget class="Gui::QuantitySpinBox" name="qsbExtend" native="true">
             <property name="toolTip">
              <string>Make the line a little longer.</string>
             </property>
             <property name="unit" stdset="0">
              <string>mm</string>
             </property>
-            <property name="value">
+            <property name="value" stdset="0">
              <double>3.000000000000000</double>
             </property>
            </widget>
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.ui b/src/Mod/TechDraw/Gui/TaskLeaderLine.ui
index 72dac5950e..34a0e450e3 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.ui
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.ui
@@ -199,7 +199,7 @@ You can pick further points to get line segments.</string>
             <property name="toolTip">
              <string>Line color</string>
             </property>
-            <property name="color">
+            <property name="color" stdset="0">
              <color>
               <red>0</red>
               <green>0</green>
@@ -216,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">
+           <widget class="Gui::QuantitySpinBox" name="dsbWeight" native="true">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="toolTip">
              <string>Line width</string>
             </property>
-            <property name="singleStep">
+            <property name="singleStep" stdset="0">
              <double>0.100000000000000</double>
             </property>
-            <property name="value">
+            <property name="value" stdset="0">
              <double>0.500000000000000</double>
             </property>
            </widget>
@@ -250,31 +250,55 @@ You can pick further points to get line segments.</string>
              <property name="text">
               <string>NoLine</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/none.svg</normaloff>:/icons/none.svg</iconset>
+             </property>
             </item>
             <item>
              <property name="text">
               <string>Continuous</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/continuous-line.svg</normaloff>:/icons/continuous-line.svg</iconset>
+             </property>
             </item>
             <item>
              <property name="text">
               <string>Dash</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/dash-line.svg</normaloff>:/icons/dash-line.svg</iconset>
+             </property>
             </item>
             <item>
              <property name="text">
               <string>Dot</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/dot-line.svg</normaloff>:/icons/dot-line.svg</iconset>
+             </property>
             </item>
             <item>
              <property name="text">
               <string>DashDot</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/dashDot-line.svg</normaloff>:/icons/dashDot-line.svg</iconset>
+             </property>
             </item>
             <item>
              <property name="text">
               <string>DashDotDot</string>
              </property>
+             <property name="icon">
+              <iconset resource="Resources/TechDraw.qrc">
+               <normaloff>:/icons/dashDotDot-line.svg</normaloff>:/icons/dashDotDot-line.svg</iconset>
+             </property>
             </item>
            </widget>
           </item>