diff --git a/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui b/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui
index 99cfb93ea7..fa96f538e1 100644
--- a/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui
+++ b/src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>251</width>
-    <height>461</height>
+    <width>245</width>
+    <height>531</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,279 +15,296 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QGridLayout" name="gridLayout_2">
-     <item row="8" column="0">
-      <widget class="QLabel" name="label_7">
-       <property name="text">
-        <string>Text color</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Shape color</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Line width</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="2">
-      <widget class="Gui::ColorButton" name="ShapeColor">
-       <property name="toolTip">
-        <string>The color of faces</string>
-       </property>
-      </widget>
-     </item>
-     <item row="9" column="2">
-      <widget class="QComboBox" name="ArrowStyle">
-       <property name="toolTip">
-        <string>The type of dimension arrows</string>
-       </property>
-       <item>
-        <property name="text">
-         <string>Dot</string>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Lines and faces</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" columnstretch="1,0" columnminimumwidth="0,120">
+      <property name="sizeConstraint">
+       <enum>QLayout::SetDefaultConstraint</enum>
+      </property>
+      <item row="4" column="1">
+       <widget class="Gui::ColorButton" name="ShapeColor">
+        <property name="toolTip">
+         <string>The color of faces</string>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_10">
         <property name="text">
-         <string>Circle</string>
+         <string>Draw style</string>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string>Arrow</string>
+         <string>Line color</string>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Tick</string>
+         <string>Line width</string>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="Gui::ColorButton" name="LineColor">
+        <property name="toolTip">
+         <string>The color of lines</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QComboBox" name="DrawStyle">
+        <property name="toolTip">
+         <string>The line style</string>
+        </property>
+        <item>
+         <property name="text">
+          <string>Solid</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Dashed</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Dotted</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>DashDot</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="LineWidth">
+        <property name="suffix">
+         <string> px</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_11">
         <property name="text">
-         <string>Tick-2</string>
+         <string>Display mode</string>
         </property>
-       </item>
-      </widget>
-     </item>
-     <item row="8" column="2">
-      <widget class="Gui::ColorButton" name="TextColor">
-       <property name="toolTip">
-        <string>The color of texts and dimension texts</string>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="2">
-      <widget class="Gui::InputField" name="TextSize">
-       <property name="toolTip">
-        <string>The size of texts and dimension texts</string>
-       </property>
-       <property name="unit" stdset="0">
-        <string notr="true"/>
-       </property>
-      </widget>
-     </item>
-     <item row="11" column="0">
-      <widget class="QLabel" name="label_13">
-       <property name="text">
-        <string>Show unit</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Line color</string>
-       </property>
-      </widget>
-     </item>
-     <item row="10" column="2">
-      <widget class="Gui::InputField" name="ArrowSize">
-       <property name="toolTip">
-        <string>The size of dimension arrows</string>
-       </property>
-       <property name="unit" stdset="0">
-        <string notr="true"/>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="2">
-      <widget class="QFontComboBox" name="TextFont">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string>The font to use for texts and dimensions</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2">
-      <widget class="QComboBox" name="DrawStyle">
-       <property name="toolTip">
-        <string>The line style</string>
-       </property>
-       <item>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="DisplayMode">
+        <property name="toolTip">
+         <string>The display mode for faces</string>
+        </property>
+        <item>
+         <property name="text">
+          <string>Flat Lines</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Wireframe</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Shaded</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Points</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>Solid</string>
+         <string>Shape color</string>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_12">
         <property name="text">
-         <string>Dashed</string>
+         <string>Transparency</string>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QSpinBox" name="Transparency">
+        <property name="toolTip">
+         <string>The transparency of faces</string>
+        </property>
+        <property name="suffix">
+         <string> %</string>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Annotations</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3" columnstretch="1,0" columnminimumwidth="0,120">
+      <item row="3" column="1">
+       <widget class="QComboBox" name="ArrowStyle">
+        <property name="toolTip">
+         <string>The type of dimension arrows</string>
+        </property>
+        <item>
+         <property name="text">
+          <string>Dot</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Circle</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Arrow</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Tick</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Tick-2</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>Dotted</string>
+         <string>Text font</string>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_7">
         <property name="text">
-         <string>DashDot</string>
+         <string>Text color</string>
         </property>
-       </item>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>Text size</string>
-       </property>
-      </widget>
-     </item>
-     <item row="12" column="0">
-      <widget class="QLabel" name="label_14">
-       <property name="text">
-        <string>Unit override</string>
-       </property>
-      </widget>
-     </item>
-     <item row="11" column="2">
-      <widget class="QCheckBox" name="ShowUnit">
-       <property name="toolTip">
-        <string>If the unit siffix is shown on dimension texts or not</string>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="12" column="2">
-      <widget class="QLineEdit" name="UnitOverride">
-       <property name="toolTip">
-        <string>The unit to use for dimensions. Leave blank to use current FreeCAD unit</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="2">
-      <widget class="QSpinBox" name="Transparency">
-       <property name="toolTip">
-        <string>The transparency of faces</string>
-       </property>
-       <property name="suffix">
-        <string> %</string>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label_12">
-       <property name="text">
-        <string>Transparency</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_11">
-       <property name="text">
-        <string>Display mode</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Text font</string>
-       </property>
-      </widget>
-     </item>
-     <item row="10" column="0">
-      <widget class="QLabel" name="label_8">
-       <property name="text">
-        <string>Arrow size</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="2">
-      <widget class="QComboBox" name="DisplayMode">
-       <property name="toolTip">
-        <string>The display mode for faces</string>
-       </property>
-       <item>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QFontComboBox" name="TextFont">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>The font to use for texts and dimensions</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_5">
         <property name="text">
-         <string>Flat Lines</string>
+         <string>Text size</string>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="Gui::ColorButton" name="TextColor">
+        <property name="toolTip">
+         <string>The color of texts and dimension texts</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="Gui::InputField" name="TextSize">
+        <property name="toolTip">
+         <string>The size of texts and dimension texts</string>
+        </property>
+        <property name="unit" stdset="0">
+         <string notr="true"/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_6">
         <property name="text">
-         <string>Wireframe</string>
+         <string>Arrow style</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QCheckBox" name="ShowUnit">
+        <property name="toolTip">
+         <string>If the unit siffix is shown on dimension texts or not</string>
+        </property>
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
         </property>
-       </item>
-       <item>
         <property name="text">
-         <string>Shaded</string>
+         <string/>
         </property>
-       </item>
-       <item>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="Gui::InputField" name="ArrowSize">
+        <property name="toolTip">
+         <string>The size of dimension arrows</string>
+        </property>
+        <property name="unit" stdset="0">
+         <string notr="true"/>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_13">
         <property name="text">
-         <string>Points</string>
+         <string>Show unit</string>
         </property>
-       </item>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_10">
-       <property name="text">
-        <string>Draw style</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="Gui::ColorButton" name="LineColor">
-       <property name="toolTip">
-        <string>The color of lines</string>
-       </property>
-      </widget>
-     </item>
-     <item row="9" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>Arrow style</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2">
-      <widget class="QSpinBox" name="LineWidth">
-       <property name="suffix">
-        <string> px</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Arrow size</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_14">
+        <property name="text">
+         <string>Unit override</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
+       <widget class="QLineEdit" name="UnitOverride">
+        <property name="toolTip">
+         <string>The unit to use for dimensions. Leave blank to use current FreeCAD unit</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <widget class="QPushButton" name="applyButton">