diff --git a/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui b/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui
index 1dcade1544..6f44b5f3ca 100644
--- a/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui
+++ b/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui
@@ -157,9 +157,9 @@
         <height>589</height>
        </rect>
       </property>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QGroupBox" name="groupBox_3">
+        <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>Text</string>
          </property>
@@ -216,7 +216,7 @@
           <item row="2" column="0">
            <widget class="QLabel" name="label_3">
             <property name="toolTip">
-             <string>The line spacing (relative to the font size)</string>
+             <string>The line spacing for multi-line texts and labels (relative to the font size)</string>
             </property>
             <property name="text">
              <string>Line spacing</string>
@@ -226,12 +226,12 @@
           <item row="2" column="1">
            <widget class="QDoubleSpinBox" name="LineSpacing">
             <property name="toolTip">
-             <string>The line spacing (relative to the font size)</string>
+             <string>The line spacing for multi-line texts and labels (relative to the font size)</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
-           <widget class="QLabel" name="label_16">
+           <widget class="QLabel" name="label_4">
             <property name="toolTip">
              <string>The color of texts, dimension texts and label texts</string>
             </property>
@@ -251,96 +251,13 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>Units</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="toolTip">
-             <string>A multiplier factor that affects the size of texts and markers</string>
-            </property>
-            <property name="text">
-             <string>Scale multiplier</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="ScaleMultiplier">
-            <property name="toolTip">
-             <string>A multiplier factor that affects the size of texts and markers</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_7">
-            <property name="toolTip">
-             <string>If it is checked it will show the unit next to the dimension value</string>
-            </property>
-            <property name="text">
-             <string>Show unit</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QCheckBox" name="ShowUnit">
-            <property name="toolTip">
-             <string>If it is checked it will show the unit next to the dimension value</string>
-            </property>
-            <property name="layoutDirection">
-             <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-         <item row="2" column="0">
-           <widget class="QLabel" name="label_6">
-            <property name="toolTip">
-             <string>Specify a valid length unit like mm, m, in, ft, to force displaying the dimension value in this unit</string>
-            </property>
-            <property name="text">
-             <string>Unit override</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="UnitOverride">
-            <property name="toolTip">
-             <string>Specify a valid length unit like mm, m, in, ft, to force displaying the dimension value in this unit</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="toolTip">
-             <string>The number of decimals to show for dimension values</string>
-            </property>
-            <property name="text">
-             <string>Decimals</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QSpinBox" name="Decimals">
-            <property name="toolTip">
-             <string>The number of decimals to show for dimension values</string>
-            </property>
-           </widget>
-          </item>
-          </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_4">
+        <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
           <string>Lines and arrows</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_3">
+         <layout class="QGridLayout" name="gridLayout_2">
           <item row="0" column="0">
-           <widget class="QLabel" name="label_13">
+           <widget class="QLabel" name="label_5">
             <property name="toolTip">
              <string>If it is checked it will display the dimension line</string>
             </property>
@@ -366,7 +283,7 @@
            </widget>
           </item>
           <item row="2" column="0">
-           <widget class="QLabel" name="label_14">
+           <widget class="QLabel" name="label_6">
             <property name="toolTip">
              <string>The width of the lines</string>
             </property>
@@ -386,7 +303,7 @@
            </widget>
           </item>
           <item row="3" column="0">
-           <widget class="QLabel" name="label_9">
+           <widget class="QLabel" name="label_7">
             <property name="toolTip">
              <string>The type of arrows or markers to use for dimensions and labels</string>
             </property>
@@ -460,7 +377,7 @@
            </widget>
           </item>
           <item row="5" column="0">
-           <widget class="QLabel" name="label_15">
+           <widget class="QLabel" name="label_9">
             <property name="toolTip">
              <string>The color of lines and arrows</string>
             </property>
@@ -476,8 +393,100 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="0">
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
+          <string>Units</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="0" column="0">
            <widget class="QLabel" name="label_10">
+            <property name="toolTip">
+             <string>A multiplier factor that affects the size of texts and markers</string>
+            </property>
+            <property name="text">
+             <string>Scale multiplier</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QDoubleSpinBox" name="ScaleMultiplier">
+            <property name="toolTip">
+             <string>A multiplier factor that affects the size of texts and markers</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="toolTip">
+             <string>If it is checked it will show the unit next to the dimension value</string>
+            </property>
+            <property name="text">
+             <string>Show unit</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="ShowUnit">
+            <property name="toolTip">
+             <string>If it is checked it will show the unit next to the dimension value</string>
+            </property>
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+         <item row="2" column="0">
+           <widget class="QLabel" name="label_12">
+            <property name="toolTip">
+             <string>Specify a valid length unit like mm, m, in, ft, to force displaying the dimension value in this unit</string>
+            </property>
+            <property name="text">
+             <string>Unit override</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="UnitOverride">
+            <property name="toolTip">
+             <string>Specify a valid length unit like mm, m, in, ft, to force displaying the dimension value in this unit</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="toolTip">
+             <string>The number of decimals to show for dimension values</string>
+            </property>
+            <property name="text">
+             <string>Decimals</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QSpinBox" name="Decimals">
+            <property name="toolTip">
+             <string>The number of decimals to show for dimension values</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_5">
+         <property name="title">
+          <string>Dimension details</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_14">
             <property name="toolTip">
              <string>The distance the dimension line is additionally extended</string>
             </property>
@@ -486,7 +495,7 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="1">
+          <item row="0" column="1">
            <widget class="Gui::InputField" name="DimOvershoot">
             <property name="toolTip">
              <string>The distance the dimension line is additionally extended</string>
@@ -496,8 +505,8 @@
             </property>
            </widget>
           </item>
-          <item row="7" column="0">
-           <widget class="QLabel" name="label_11">
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_15">
             <property name="toolTip">
              <string>The length of the extension lines</string>
             </property>
@@ -506,7 +515,7 @@
             </property>
            </widget>
           </item>
-          <item row="7" column="1">
+          <item row="1" column="1">
            <widget class="Gui::InputField" name="ExtLines">
             <property name="toolTip">
              <string>The length of the extension lines</string>
@@ -516,8 +525,8 @@
             </property>
            </widget>
           </item>
-          <item row="8" column="0">
-           <widget class="QLabel" name="label_12">
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_16">
             <property name="toolTip">
              <string>The distance the extension lines are additionally extended beyond the dimension line</string>
             </property>
@@ -526,7 +535,7 @@
             </property>
            </widget>
           </item>
-          <item row="8" column="1">
+          <item row="2" column="1">
            <widget class="Gui::InputField" name="ExtOvershoot">
             <property name="toolTip">
              <string>The distance the extension lines are additionally extended beyond the dimension line</string>
@@ -536,6 +545,26 @@
             </property>
            </widget>
           </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_17">
+            <property name="toolTip">
+             <string>The distance between the dimension text and the dimension line</string>
+            </property>
+            <property name="text">
+             <string>Text spacing</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="Gui::InputField" name="TextSpacing">
+            <property name="toolTip">
+             <string>The distance between the dimension text and the dimension line</string>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true"/>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/src/Mod/Draft/draftutils/utils.py b/src/Mod/Draft/draftutils/utils.py
index 46865956a7..c13d10091f 100644
--- a/src/Mod/Draft/draftutils/utils.py
+++ b/src/Mod/Draft/draftutils/utils.py
@@ -60,22 +60,23 @@ param_draft = App.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
 param_view  = App.ParamGet("User parameter:BaseApp/Preferences/View")
 
 ANNOTATION_STYLE = {
-    "FontName":        ("font",  param_draft.GetString("textfont", "Sans")),
-    "FontSize":        ("float", param_draft.GetFloat("textheight", 100)),
-    "LineSpacing":     ("float", param_draft.GetFloat("LineSpacing", 1)),
-    "TextColor":       ("color", param_draft.GetUnsigned("DefaultTextColor", 255)),
-    "ScaleMultiplier": ("float", 1),
-    "ShowUnit":        ("bool",  param_draft.GetBool("showUnit", True)),
-    "UnitOverride":    ("str",   param_draft.GetString("overrideUnit", "")),
-    "Decimals":        ("int",   param_draft.GetInt("dimPrecision", 2)),
-    "ShowLine":        ("bool",  True),
-    "LineWidth":       ("int",   param_view.GetInt("DefaultShapeLineWidth", 1)),
-    "ArrowType":       ("index", param_draft.GetInt("dimsymbol", 0)),
     "ArrowSize":       ("float", param_draft.GetFloat("arrowsize", 20)),
-    "LineColor":       ("color", param_view.GetUnsigned("DefaultShapeLineColor", 255)),
+    "ArrowType":       ("index", param_draft.GetInt("dimsymbol", 0)),
+    "Decimals":        ("int",   param_draft.GetInt("dimPrecision", 2)),
     "DimOvershoot":    ("float", param_draft.GetFloat("dimovershoot", 20)),
     "ExtLines":        ("float", param_draft.GetFloat("extlines", 300)),
     "ExtOvershoot":    ("float", param_draft.GetFloat("extovershoot", 20)),
+    "FontName":        ("font",  param_draft.GetString("textfont", "Sans")),
+    "FontSize":        ("float", param_draft.GetFloat("textheight", 100)),
+    "LineColor":       ("color", param_view.GetUnsigned("DefaultShapeLineColor", 255)),
+    "LineSpacing":     ("float", param_draft.GetFloat("LineSpacing", 1)),
+    "LineWidth":       ("int",   param_view.GetInt("DefaultShapeLineWidth", 1)),
+    "ScaleMultiplier": ("float", 1),
+    "ShowLine":        ("bool",  True),
+    "ShowUnit":        ("bool",  param_draft.GetBool("showUnit", True)),
+    "TextColor":       ("color", param_draft.GetUnsigned("DefaultTextColor", 255)),
+    "TextSpacing":     ("float", param_draft.GetFloat("dimspacing", 20)),
+    "UnitOverride":    ("str",   param_draft.GetString("overrideUnit", "")),
 }