diff --git a/src/Mod/Sketcher/Gui/ConstraintFilters.h b/src/Mod/Sketcher/Gui/ConstraintFilters.h
index 5517592305..25a3defdd7 100644
--- a/src/Mod/Sketcher/Gui/ConstraintFilters.h
+++ b/src/Mod/Sketcher/Gui/ConstraintFilters.h
@@ -36,19 +36,19 @@ namespace ConstraintFilter {
         Datums = 2,
         Named = 3,
         NonDriving = 4,
-        Horizontal = 5,
-        Vertical = 6,
-        Coincident = 7,
-        PointOnObject = 8,
+        Coincident = 5,
+        PointOnObject = 6,
+        Vertical = 7,
+        Horizontal = 8,
         Parallel = 9,
         Perpendicular = 10,
         Tangent = 11,
         Equality = 12,
         Symmetric = 13,
         Block = 14,
-        Distance = 15,
-        HorizontalDistance = 16,
-        VerticalDistance = 17,
+        HorizontalDistance = 15,
+        VerticalDistance = 16,
+        Distance = 17,
         Radius = 18,
         Weight = 19,
         Diameter = 20,
@@ -76,19 +76,19 @@ namespace ConstraintFilter {
         1 << FilterValue::Datums | 1 << FilterValue::NonDriving | 1 << FilterValue::Distance | 1 << FilterValue::HorizontalDistance | 1 << FilterValue::VerticalDistance | 1 << FilterValue::Radius | 1 << FilterValue::Weight | 1 << FilterValue::Diameter | 1 << FilterValue::Angle | 1 << FilterValue::SnellsLaw, // Datum = all others not being geometric (2)
         1 << FilterValue::Named, // Named = Just this (3)
         1 << FilterValue::NonDriving, // NonDriving = Just this (4)
-        1 << FilterValue::Horizontal, // Horizontal = Just this (5)
-        1 << FilterValue::Vertical, // Vertical = Just this (6)
-        1 << FilterValue::Coincident, // Coincident = Just this (7)
-        1 << FilterValue::PointOnObject, // PointOnObject = Just this (8)
+        1 << FilterValue::Coincident, // Coincident = Just this (5)
+        1 << FilterValue::PointOnObject, // PointOnObject = Just this (6)
+        1 << FilterValue::Vertical, // Vertical = Just this (7)
+        1 << FilterValue::Horizontal, // Horizontal = Just this (8)
         1 << FilterValue::Parallel, // Parallel = Just this (9)
         1 << FilterValue::Perpendicular, // Perpendicular = Just this (10)
         1 << FilterValue::Tangent, // Tangent = Just this (11)
         1 << FilterValue::Equality, // Equality = Just this (12)
         1 << FilterValue::Symmetric, // Symmetric = Just this (13)
         1 << FilterValue::Block, // Block = Just this (14)
-        1 << FilterValue::Distance, // Distance = Just this (15)
-        1 << FilterValue::HorizontalDistance, // HorizontalDistance = Just this (16)
-        1 << FilterValue::VerticalDistance, // VerticalDistance = Just this (17)
+        1 << FilterValue::HorizontalDistance, // HorizontalDistance = Just this (15)
+        1 << FilterValue::VerticalDistance, // VerticalDistance = Just this (16)
+        1 << FilterValue::Distance, // Distance = Just this (17)
         1 << FilterValue::Radius, // Radius = Just this (18)
         1 << FilterValue::Weight, // Weight = Just this (19)
         1 << FilterValue::Diameter, // Diameter = Just this (20)
diff --git a/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.ui b/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.ui
index edbae5fc42..80dab0c6de 100644
--- a/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.ui
+++ b/src/Mod/Sketcher/Gui/ConstraintMultiFilterDialog.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>274</width>
-    <height>512</height>
+    <height>600</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -69,17 +69,7 @@
      </item>
      <item>
       <property name="text">
-       <string>Non-Driving</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Horizontal</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Vertical</string>
+       <string>Reference</string>
       </property>
      </item>
      <item>
@@ -92,6 +82,16 @@
        <string>Point on Object</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Vertical</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Horizontal</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>Parallel</string>
@@ -122,11 +122,6 @@
        <string>Block</string>
       </property>
      </item>
-     <item>
-      <property name="text">
-       <string>Distance</string>
-      </property>
-     </item>
      <item>
       <property name="text">
        <string>Horizontal Distance</string>
@@ -137,6 +132,11 @@
        <string>Vertical Distance</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Distance</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>Radius</string>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.ui b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.ui
index 83149c0f26..5ede5770f6 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.ui
+++ b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>325</width>
+    <width>357</width>
     <height>388</height>
    </rect>
   </property>
@@ -67,7 +67,12 @@
        </item>
        <item>
         <property name="text">
-         <string>Horizontal</string>
+         <string>Coincident</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Point on Object</string>
         </property>
        </item>
        <item>
@@ -77,12 +82,7 @@
        </item>
        <item>
         <property name="text">
-         <string>Coincident</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Point on Object</string>
+         <string>Horizontal</string>
         </property>
        </item>
        <item>
@@ -115,11 +115,6 @@
          <string>Block</string>
         </property>
        </item>
-       <item>
-        <property name="text">
-         <string>Distance</string>
-        </property>
-       </item>
        <item>
         <property name="text">
          <string>Horizontal Distance</string>
@@ -130,6 +125,11 @@
          <string>Vertical Distance</string>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>Distance</string>
+        </property>
+       </item>
        <item>
         <property name="text">
          <string>Radius</string>