diff --git a/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui b/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui
index 2c8d9b56f5..1c64273e1d 100644
--- a/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui
+++ b/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui
@@ -17,16 +17,7 @@
    <property name="spacing">
     <number>6</number>
    </property>
-   <property name="leftMargin">
-    <number>9</number>
-   </property>
-   <property name="topMargin">
-    <number>9</number>
-   </property>
-   <property name="rightMargin">
-    <number>9</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>9</number>
    </property>
    <item>
@@ -527,7 +518,7 @@
    <item>
     <widget class="QGroupBox" name="verticalGroupBox">
      <property name="toolTip">
-      <string>Draft edit preferences</string>
+      <string>Draft Edit preferences</string>
      </property>
      <property name="title">
       <string>Edit</string>
@@ -535,22 +526,13 @@
      <layout class="QVBoxLayout" name="verticalLayout_9">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_16" stretch="0,0,0">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
+        <property name="margin">
          <number>0</number>
         </property>
         <item>
          <widget class="QLabel" name="label_8">
           <property name="toolTip">
-           <string>Sets the maximum number of objects Draft Edit can handle at the same time</string>
+           <string/>
           </property>
           <property name="text">
            <string>Maximum number of contemporary edited objects</string>
@@ -576,7 +558,7 @@
            <bool>true</bool>
           </property>
           <property name="toolTip">
-           <string>Mainlines will be drawn thicker. Specify here how many squares between mainlines.</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sets the maximum number of objects Draft Edit&lt;/p&gt;&lt;p&gt;can process at the same time&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -590,7 +572,7 @@
           <property name="value">
            <number>5</number>
           </property>
-          <property name="displayIntegerBase">
+          <property name="displayIntegerBase" stdset="0">
            <number>10</number>
           </property>
           <property name="prefEntry" stdset="0">
@@ -605,22 +587,13 @@
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
+        <property name="margin">
          <number>0</number>
         </property>
         <item>
          <widget class="QLabel" name="label_3">
           <property name="toolTip">
-           <string>Controls pick radius of edit nodes</string>
+           <string/>
           </property>
           <property name="text">
            <string>Draft edit pick radius</string>
@@ -646,7 +619,7 @@
            <bool>true</bool>
           </property>
           <property name="toolTip">
-           <string>Mainlines will be drawn thicker. Specify here how many squares between mainlines.</string>
+           <string>Controls pick radius of edit nodes</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>