diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 567b5b13a4..4d03e7e607 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -217,7 +217,7 @@ class DraftToolBar:
         self.sourceCmd = None
         self.cancel = None
         self.pointcallback = None
-        self.taskmode = Draft.getParam("UiMode",1)
+        self.taskmode = 1  # Draft.getParam("UiMode",1)
         #print("taskmode: ",str(self.taskmode))
         self.paramcolor = Draft.getParam("color",255)>>8
         self.color = QtGui.QColor(self.paramcolor)
diff --git a/src/Mod/Draft/Resources/ui/preferences-draft.ui b/src/Mod/Draft/Resources/ui/preferences-draft.ui
index ff68e34407..ef6084ad49 100644
--- a/src/Mod/Draft/Resources/ui/preferences-draft.ui
+++ b/src/Mod/Draft/Resources/ui/preferences-draft.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>486</width>
-    <height>808</height>
+    <width>584</width>
+    <height>881</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,16 @@
    <property name="spacing">
     <number>6</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
     <number>9</number>
    </property>
    <item>
@@ -36,6 +45,11 @@
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QLabel" name="label_19">
+          <property name="toolTip">
+           <string>The &quot;taskview&quot; mode will use the task panel system for user interaction.
+
+The &quot;toolbar&quot; mode is obsolete, and is disabled. It always uses the &quot;taskview&quot; mode regardless of this setting.</string>
+          </property>
           <property name="text">
            <string>Draft interface mode</string>
           </property>
@@ -60,7 +74,15 @@
         <item>
          <widget class="Gui::PrefComboBox" name="gui::prefcombobox_4">
           <property name="toolTip">
-           <string>This is the UI mode in which the Draft module will work: Toolbar mode will place all Draft settings in a separate toolbar, while taskbar mode will use the FreeCAD Taskview system for all its user interaction</string>
+           <string>The &quot;taskview&quot; mode will use the task panel system for user interaction.
+
+The &quot;toolbar&quot; mode is obsolete, and is disabled. It always uses the &quot;taskview&quot; mode regardless of this setting.</string>
+          </property>
+          <property name="editable">
+           <bool>false</bool>
+          </property>
+          <property name="currentText">
+           <string>Taskview</string>
           </property>
           <property name="currentIndex">
            <number>1</number>
@@ -515,15 +537,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutRelative</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -565,15 +587,15 @@ Values with differences below this value will be treated as same. This value wil
               <property name="placeholderText">
                <string/>
               </property>
+              <property name="clearButtonEnabled">
+               <bool>false</bool>
+              </property>
               <property name="prefEntry" stdset="0">
                <cstring>inCommandShortcutContinue</cstring>
               </property>
               <property name="prefPath" stdset="0">
                <cstring>Mod/Draft</cstring>
               </property>
-              <property name="clearButtonEnabled" stdset="0">
-               <bool>false</bool>
-              </property>
              </widget>
             </item>
            </layout>
@@ -615,15 +637,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutClose</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -667,15 +689,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutCopy</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -715,15 +737,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutSubelementMode</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -763,15 +785,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutFill</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -815,15 +837,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutExit</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -863,15 +885,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutSelectEdge</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -911,15 +933,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutAddHold</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -963,15 +985,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutLength</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -1011,15 +1033,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutWipe</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -1059,15 +1081,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutSetWP</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -1111,15 +1133,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutCycleSnap</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -1169,15 +1191,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutSnap</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -1217,15 +1239,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutIncreaseRadius</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -1265,15 +1287,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutDecreaseRadius</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -1317,15 +1339,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutRestrictX</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -1365,15 +1387,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>inCommandShortcutRestrictY</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>
@@ -1413,15 +1435,15 @@ Values with differences below this value will be treated as same. This value wil
             <property name="placeholderText">
              <string/>
             </property>
+            <property name="clearButtonEnabled">
+             <bool>false</bool>
+            </property>
             <property name="prefEntry" stdset="0">
              <cstring>RestrictZ</cstring>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Draft</cstring>
             </property>
-            <property name="clearButtonEnabled" stdset="0">
-             <bool>false</bool>
-            </property>
            </widget>
           </item>
          </layout>