diff --git a/launcher/ui/pages/global/ExternalToolsPage.ui b/launcher/ui/pages/global/ExternalToolsPage.ui
index 6667f34d9..b094e3693 100644
--- a/launcher/ui/pages/global/ExternalToolsPage.ui
+++ b/launcher/ui/pages/global/ExternalToolsPage.ui
@@ -106,13 +106,6 @@
             <item>
              <widget class="QLineEdit" name="mceditPathEdit"/>
             </item>
-            <item>
-             <widget class="QPushButton" name="mceditCheckBtn">
-              <property name="text">
-               <string>Check</string>
-              </property>
-             </widget>
-            </item>
             <item>
              <widget class="QPushButton" name="mceditPathBtn">
               <property name="text">
@@ -122,6 +115,19 @@
             </item>
            </layout>
           </item>
+          <item>
+           <widget class="QPushButton" name="mceditCheckBtn">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Check</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QLabel" name="mceditLink">
             <property name="text">
@@ -179,13 +185,6 @@
             <item>
              <widget class="QLineEdit" name="jprofilerPathEdit"/>
             </item>
-            <item>
-             <widget class="QPushButton" name="jprofilerCheckBtn">
-              <property name="text">
-               <string>Check</string>
-              </property>
-             </widget>
-            </item>
             <item>
              <widget class="QPushButton" name="jprofilerPathBtn">
               <property name="text">
@@ -195,6 +194,19 @@
             </item>
            </layout>
           </item>
+          <item>
+           <widget class="QPushButton" name="jprofilerCheckBtn">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Check</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QLabel" name="jprofilerLink">
             <property name="text">
@@ -233,13 +245,6 @@
             <item>
              <widget class="QLineEdit" name="jvisualvmPathEdit"/>
             </item>
-            <item>
-             <widget class="QPushButton" name="jvisualvmCheckBtn">
-              <property name="text">
-               <string>Check</string>
-              </property>
-             </widget>
-            </item>
             <item>
              <widget class="QPushButton" name="jvisualvmPathBtn">
               <property name="text">
@@ -249,6 +254,19 @@
             </item>
            </layout>
           </item>
+          <item>
+           <widget class="QPushButton" name="jvisualvmCheckBtn">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Check</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QLabel" name="jvisualvmLink">
             <property name="text">
diff --git a/launcher/ui/widgets/JavaSettingsWidget.ui b/launcher/ui/widgets/JavaSettingsWidget.ui
index 8a8b20935..4028ca544 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.ui
+++ b/launcher/ui/widgets/JavaSettingsWidget.ui
@@ -29,21 +29,15 @@
       <bool>false</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
+      <item row="7" column="0">
+       <widget class="QCheckBox" name="autodetectJavaCheckBox">
         <property name="text">
-         <string>Java &amp;Executable</string>
-        </property>
-        <property name="buddy">
-         <cstring>javaPathTextBox</cstring>
+         <string>Auto-&amp;detect Java version</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <layout class="QHBoxLayout" name="horizontalLayout_8">
-        <item>
-         <widget class="QLineEdit" name="javaPathTextBox"/>
-        </item>
+      <item row="2" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QPushButton" name="javaDetectBtn">
           <property name="text">
@@ -53,57 +47,27 @@
         </item>
         <item>
          <widget class="QPushButton" name="javaBrowseBtn">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
           <property name="text">
            <string>&amp;Browse</string>
           </property>
          </widget>
         </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <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>
       </item>
-      <item row="7" column="0">
-       <widget class="QCheckBox" name="autodownloadJavaCheckBox">
-        <property name="toolTip">
-         <string>Automatically downloads and selects the Java build recommended by Mojang.</string>
-        </property>
-        <property name="text">
-         <string>Auto-download &amp;Mojang Java</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QCheckBox" name="skipWizardCheckBox">
-        <property name="toolTip">
-         <string>If enabled, the launcher won't prompt you to choose a Java version if one is not found on startup.</string>
-        </property>
-        <property name="text">
-         <string>Skip Java setup prompt on startup</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QCheckBox" name="autodetectJavaCheckBox">
-        <property name="text">
-         <string>Auto-&amp;detect Java version</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="skipCompatibilityCheckBox">
-        <property name="toolTip">
-         <string>If enabled, the launcher will not check if an instance is compatible with the selected Java version.</string>
-        </property>
-        <property name="text">
-         <string>Skip Java compatibility checks</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0">
+      <item row="10" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
          <widget class="QPushButton" name="javaTestBtn">
@@ -134,6 +98,81 @@
         </item>
        </layout>
       </item>
+      <item row="9" column="0">
+       <spacer name="verticalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>6</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="8" column="0">
+       <widget class="QCheckBox" name="autodownloadJavaCheckBox">
+        <property name="toolTip">
+         <string>Automatically downloads and selects the Java build recommended by Mojang.</string>
+        </property>
+        <property name="text">
+         <string>Auto-download &amp;Mojang Java</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QCheckBox" name="skipCompatibilityCheckBox">
+        <property name="toolTip">
+         <string>If enabled, the launcher will not check if an instance is compatible with the selected Java version.</string>
+        </property>
+        <property name="text">
+         <string>Skip Java compatibility checks</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="javaPathTextBox"/>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Java &amp;Executable</string>
+        </property>
+        <property name="buddy">
+         <cstring>javaPathTextBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="skipWizardCheckBox">
+        <property name="toolTip">
+         <string>If enabled, the launcher won't prompt you to choose a Java version if one is not found on startup.</string>
+        </property>
+        <property name="text">
+         <string>Skip Java setup prompt on startup</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <spacer name="verticalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>6</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -350,9 +389,6 @@
  <tabstops>
   <tabstop>javaTestBtn</tabstop>
   <tabstop>javaDownloadBtn</tabstop>
-  <tabstop>javaPathTextBox</tabstop>
-  <tabstop>javaDetectBtn</tabstop>
-  <tabstop>javaBrowseBtn</tabstop>
   <tabstop>skipCompatibilityCheckBox</tabstop>
   <tabstop>skipWizardCheckBox</tabstop>
   <tabstop>autodetectJavaCheckBox</tabstop>