diff --git a/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.ui b/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.ui
index 340305ed43..a6ec62404a 100644
--- a/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.ui
+++ b/src/Mod/Sketcher/Gui/ConstraintSettingsDialog.ui
@@ -35,31 +35,6 @@
       <string>List control</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
-      <item row="1" column="0">
-       <widget class="Gui::PrefCheckBox" name="filterInternalAlignment">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip">
-         <string>Internal alignments will be hidden</string>
-        </property>
-        <property name="text">
-         <string>Hide internal alignment</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>HideInternalAlignment</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/Sketcher</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="Gui::PrefCheckBox" name="extendedInformation">
         <property name="sizePolicy">
@@ -85,7 +60,32 @@
         </property>
        </widget>
       </item>
-     </layout>
+     <item row="1" column="0">
+       <widget class="Gui::PrefCheckBox" name="filterInternalAlignment">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Internal alignments will be hidden</string>
+        </property>
+        <property name="text">
+         <string>Hide internal alignment</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>HideInternalAlignment</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Mod/Sketcher</cstring>
+        </property>
+       </widget>
+      </item>
+      </layout>
     </widget>
    </item>
    <item>
diff --git a/src/Mod/Sketcher/Gui/SketchMirrorDialog.ui b/src/Mod/Sketcher/Gui/SketchMirrorDialog.ui
index e1e5ab2036..0b46c3f993 100644
--- a/src/Mod/Sketcher/Gui/SketchMirrorDialog.ui
+++ b/src/Mod/Sketcher/Gui/SketchMirrorDialog.ui
@@ -47,16 +47,6 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -70,7 +60,17 @@
      </property>
     </spacer>
    </item>
-  </layout>
+  <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   </layout>
  </widget>
  <resources/>
  <connections>
diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui b/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui
index b15ad0c8cc..ddf7005ffc 100644
--- a/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui
+++ b/src/Mod/Sketcher/Gui/SketcherSettingsColors.ui
@@ -22,8 +22,8 @@
      <layout class="QGridLayout" name="gridLayout_7">
       <item row="0" column="1">
        <layout class="QGridLayout" name="gridLayout">
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_5">
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_6">
           <property name="minimumSize">
            <size>
             <width>240</width>
@@ -31,7 +31,7 @@
            </size>
           </property>
           <property name="text">
-           <string>Coordinate text</string>
+           <string>Creating line</string>
           </property>
          </widget>
         </item>
@@ -55,29 +55,21 @@
           </property>
          </widget>
         </item>
-        <item row="5" column="1">
-         <widget class="Gui::PrefColorButton" name="CursorCrosshairColor">
-          <property name="toolTip">
-           <string>Color of crosshair cursor.
-(The one you get when creating a new sketch element.)</string>
+        <item row="3" column="2">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-          <property name="color" stdset="0">
-           <color>
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
           </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>CursorCrosshairColor</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
+         </spacer>
         </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_6">
+       <item row="4" column="0">
+         <widget class="QLabel" name="label_5">
           <property name="minimumSize">
            <size>
             <width>240</width>
@@ -85,7 +77,7 @@
            </size>
           </property>
           <property name="text">
-           <string>Creating line</string>
+           <string>Coordinate text</string>
           </property>
          </widget>
         </item>
@@ -116,20 +108,28 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="2">
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+        <item row="5" column="1">
+         <widget class="Gui::PrefColorButton" name="CursorCrosshairColor">
+          <property name="toolTip">
+           <string>Color of crosshair cursor.
+(The one you get when creating a new sketch element.)</string>
           </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
+          <property name="color" stdset="0">
+           <color>
+            <red>255</red>
+            <green>255</green>
+            <blue>255</blue>
+           </color>
           </property>
-         </spacer>
+          <property name="prefEntry" stdset="0">
+           <cstring>CursorCrosshairColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>View</cstring>
+          </property>
+         </widget>
         </item>
-       </layout>
+        </layout>
       </item>
      </layout>
     </widget>
@@ -142,16 +142,16 @@
      <layout class="QGridLayout" name="gridLayout_6">
       <item row="1" column="0">
        <layout class="QGridLayout" name="gridLayout_3">
-        <item row="8" column="0">
-         <widget class="QLabel" name="label_ia">
+        <item row="1" column="2">
+         <widget class="QLabel" name="label_7">
           <property name="minimumSize">
            <size>
-            <width>240</width>
+            <width>120</width>
             <height>0</height>
            </size>
           </property>
           <property name="text">
-           <string>Internal alignment edge</string>
+           <string>Constrained</string>
           </property>
          </widget>
         </item>
@@ -168,6 +168,52 @@
           </property>
          </widget>
         </item>
+        <item row="1" column="5">
+         <spacer name="horizontalSpacer_6">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       <item row="3" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Edge</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2">
+         <widget class="Gui::PrefColorButton" name="FullyConstraintElementColor">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Color of fully constrained edge color in edit mode</string>
+          </property>
+          <property name="color" stdset="0">
+           <color>
+            <red>128</red>
+            <green>208</green>
+            <blue>160</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>FullyConstraintElementColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>View</cstring>
+          </property>
+         </widget>
+        </item>
         <item row="3" column="4">
          <widget class="Gui::PrefColorButton" name="EditedEdgeColor">
           <property name="sizePolicy">
@@ -194,10 +240,36 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label">
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>Edge</string>
+           <string>Vertex</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="2">
+         <widget class="Gui::PrefColorButton" name="FullyConstraintConstructionPointColor">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Color of fully constrained vertex color in edit mode</string>
+          </property>
+          <property name="color" stdset="0">
+           <color>
+            <red>255</red>
+            <green>149</green>
+            <blue>128</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>FullyConstraintConstructionPointColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>View</cstring>
           </property>
          </widget>
         </item>
@@ -227,10 +299,10 @@
           </property>
          </widget>
         </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="label_2">
+        <item row="7" column="0">
+         <widget class="QLabel" name="label_3">
           <property name="text">
-           <string>Vertex</string>
+           <string>Construction geometry</string>
           </property>
          </widget>
         </item>
@@ -260,39 +332,6 @@
           </property>
          </widget>
         </item>
-        <item row="7" column="0">
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>Construction geometry</string>
-          </property>
-         </widget>
-        </item>
-        <item row="8" column="4">
-         <widget class="Gui::PrefColorButton" name="InternalAlignedGeoColor">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Color of edges of internal alignment geometry</string>
-          </property>
-          <property name="color" stdset="0">
-           <color>
-            <red>178</red>
-            <green>178</green>
-            <blue>127</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>InternalAlignedGeoColor</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
-        </item>
         <item row="7" column="4">
          <widget class="Gui::PrefColorButton" name="ConstructionColor">
           <property name="sizePolicy">
@@ -319,29 +358,16 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="2">
-         <widget class="Gui::PrefColorButton" name="FullyConstraintElementColor">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
+        <item row="8" column="0">
+         <widget class="QLabel" name="label_ia">
+          <property name="minimumSize">
+           <size>
+            <width>240</width>
+            <height>0</height>
+           </size>
           </property>
-          <property name="toolTip">
-           <string>Color of fully constrained edge color in edit mode</string>
-          </property>
-          <property name="color" stdset="0">
-           <color>
-            <red>128</red>
-            <green>208</green>
-            <blue>160</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>FullyConstraintElementColor</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
+          <property name="text">
+           <string>Internal alignment edge</string>
           </property>
          </widget>
         </item>
@@ -371,6 +397,39 @@
           </property>
          </widget>
         </item>
+        <item row="8" column="4">
+         <widget class="Gui::PrefColorButton" name="InternalAlignedGeoColor">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Color of edges of internal alignment geometry</string>
+          </property>
+          <property name="color" stdset="0">
+           <color>
+            <red>178</red>
+            <green>178</green>
+            <blue>127</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>InternalAlignedGeoColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>View</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="9" column="0">
+         <widget class="QLabel" name="label_20">
+          <property name="text">
+           <string>External geometry</string>
+          </property>
+         </widget>
+        </item>
         <item row="9" column="2">
          <widget class="Gui::PrefColorButton" name="ExternalColor">
           <property name="sizePolicy">
@@ -397,76 +456,10 @@
           </property>
          </widget>
         </item>
-        <item row="9" column="0">
-         <widget class="QLabel" name="label_20">
-          <property name="text">
-           <string>External geometry</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="2">
-         <widget class="Gui::PrefColorButton" name="FullyConstraintConstructionPointColor">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Color of fully constrained vertex color in edit mode</string>
-          </property>
-          <property name="color" stdset="0">
-           <color>
-            <red>255</red>
-            <green>149</green>
-            <blue>128</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>FullyConstraintConstructionPointColor</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="2">
-         <widget class="QLabel" name="label_7">
-          <property name="minimumSize">
-           <size>
-            <width>120</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Constrained</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="5">
-         <spacer name="horizontalSpacer_6">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+        </layout>
       </item>
       <item row="2" column="0">
        <layout class="QGridLayout" name="gridLayout_5">
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string>Invalid Sketch</string>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="0">
          <widget class="QLabel" name="label_45">
           <property name="minimumSize">
@@ -506,6 +499,26 @@
           </property>
          </widget>
         </item>
+        <item row="1" column="2">
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       <item row="2" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Invalid Sketch</string>
+          </property>
+         </widget>
+        </item>
         <item row="2" column="1">
          <widget class="Gui::PrefColorButton" name="InvalidSketchColor">
           <property name="sizePolicy">
@@ -532,20 +545,7 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2">
-         <spacer name="horizontalSpacer_5">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+        </layout>
       </item>
      </layout>
     </widget>
@@ -725,23 +725,16 @@
      <layout class="QGridLayout" name="gridLayout_8">
       <item row="0" column="0">
        <layout class="QGridLayout" name="gridLayout_4">
-        <item row="3" column="1">
-         <widget class="Gui::PrefColorButton" name="SketchVertexColor">
-          <property name="toolTip">
-           <string>Color of vertices</string>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_17">
+          <property name="minimumSize">
+           <size>
+            <width>240</width>
+            <height>0</height>
+           </size>
           </property>
-          <property name="color" stdset="0">
-           <color>
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>SketchVertexColor</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>View</cstring>
+          <property name="text">
+           <string>Edge</string>
           </property>
          </widget>
         </item>
@@ -765,26 +758,6 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_18">
-          <property name="text">
-           <string>Vertex</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_17">
-          <property name="minimumSize">
-           <size>
-            <width>240</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Edge</string>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="2">
          <spacer name="horizontalSpacer">
           <property name="orientation">
@@ -798,7 +771,34 @@
           </property>
          </spacer>
         </item>
-       </layout>
+       <item row="3" column="0">
+         <widget class="QLabel" name="label_18">
+          <property name="text">
+           <string>Vertex</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="Gui::PrefColorButton" name="SketchVertexColor">
+          <property name="toolTip">
+           <string>Color of vertices</string>
+          </property>
+          <property name="color" stdset="0">
+           <color>
+            <red>255</red>
+            <green>255</green>
+            <blue>255</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>SketchVertexColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>View</cstring>
+          </property>
+         </widget>
+        </item>
+        </layout>
       </item>
      </layout>
     </widget>
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui b/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui
index 7190708227..4cb0ca39f4 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui
+++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui
@@ -14,29 +14,32 @@
    <string>Sketcher validation</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <item row="5" column="0">
-    <widget class="QGroupBox" name="groupBox_3">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox_0">
      <property name="title">
-      <string>Reversed external geometry</string>
+      <string>Open and non-manifold vertexes</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_4">
+     <layout class="QGridLayout" name="gridLayout_7">
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="topMargin">
+       <number>6</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <property name="bottomMargin">
+       <number>6</number>
+      </property>
       <item row="0" column="0">
-       <widget class="QPushButton" name="findReversed">
+       <widget class="QPushButton" name="highlightButton">
         <property name="toolTip">
-         <string>Finds reversed external geometries</string>
+         <string>Highlights open and non-manifold vertexes that could lead to error if sketch is used to generate solids
+This is purely based on topological shape of the sketch and not on its geometry/constrain set.</string>
         </property>
         <property name="text">
-         <string>Find</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QPushButton" name="swapReversed">
-        <property name="toolTip">
-         <string>Fixes found reversed external geometries by swapping their endpoints</string>
-        </property>
-        <property name="text">
-         <string>Swap endpoints in constraints</string>
+         <string>Highlight troublesome vertexes</string>
         </property>
        </widget>
       </item>
@@ -52,7 +55,21 @@
       <string>Missing coincidences</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="0" colspan="2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Tolerance:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxTolerance">
+        <property name="toolTip">
+         <string>Defines the X/Y tolerance inside which missing coincidences are searched.</string>
+        </property>
+       </widget>
+      </item>
+     <item row="1" column="0" colspan="2">
        <widget class="QCheckBox" name="checkBoxIgnoreConstruction">
         <property name="toolTip">
          <string>If checked, construction geometries are ignored in the search</string>
@@ -76,13 +93,6 @@ This is done by analyzing the sketch geometries and constraints</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Tolerance:</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="1">
        <widget class="QPushButton" name="fixButton">
         <property name="text">
@@ -90,14 +100,7 @@ This is done by analyzing the sketch geometries and constraints</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboBoxTolerance">
-        <property name="toolTip">
-         <string>Defines the X/Y tolerance inside which missing coincidences are searched.</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      </layout>
     </widget>
    </item>
    <item row="2" column="0">
@@ -139,38 +142,6 @@ This is done by analyzing the sketch geometries and constraints</string>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="groupBox_0">
-     <property name="title">
-      <string>Open and non-manifold vertexes</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_7">
-      <property name="leftMargin">
-       <number>6</number>
-      </property>
-      <property name="topMargin">
-       <number>6</number>
-      </property>
-      <property name="rightMargin">
-       <number>6</number>
-      </property>
-      <property name="bottomMargin">
-       <number>6</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QPushButton" name="highlightButton">
-        <property name="toolTip">
-         <string>Highlights open and non-manifold vertexes that could lead to error if sketch is used to generate solids
-This is purely based on topological shape of the sketch and not on its geometry/constrain set.</string>
-        </property>
-        <property name="text">
-         <string>Highlight troublesome vertexes</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="3" column="0">
     <widget class="QGroupBox" name="groupBox_6">
      <property name="title">
@@ -200,6 +171,35 @@ This is purely based on topological shape of the sketch and not on its geometry/
      </layout>
     </widget>
    </item>
+   <item row="5" column="0">
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
+      <string>Reversed external geometry</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="0" column="0">
+       <widget class="QPushButton" name="findReversed">
+        <property name="toolTip">
+         <string>Finds reversed external geometries</string>
+        </property>
+        <property name="text">
+         <string>Find</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QPushButton" name="swapReversed">
+        <property name="toolTip">
+         <string>Fixes found reversed external geometries by swapping their endpoints</string>
+        </property>
+        <property name="text">
+         <string>Swap endpoints in constraints</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="6" column="0">
     <widget class="QGroupBox" name="groupBox_4">
      <property name="title">