diff --git a/src/duckstation-qt/advancedsettingswidget.ui b/src/duckstation-qt/advancedsettingswidget.ui
index 529184056..a460ac327 100644
--- a/src/duckstation-qt/advancedsettingswidget.ui
+++ b/src/duckstation-qt/advancedsettingswidget.ui
@@ -28,36 +28,32 @@
      <property name="title">
       <string>Logging</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <layout class="QFormLayout" name="formLayout_4">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>Log Level:</string>
+     <layout class="QGridLayout" name="gridLayout_3" columnstretch="0,1">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Log Level:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QComboBox" name="logLevel"/>
+        </item>
+        <item>
+         <widget class="QToolButton" name="logChannels">
+          <property name="toolTip">
+           <string>Log Channels</string>
+          </property>
+          <property name="icon">
+           <iconset theme="filter-line"/>
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QComboBox" name="logLevel"/>
-          </item>
-          <item>
-           <widget class="QToolButton" name="logChannels">
-            <property name="toolTip">
-             <string>Log Channels</string>
-            </property>
-            <property name="icon">
-             <iconset theme="filter-line"/>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
        </layout>
       </item>
-      <item>
+      <item row="1" column="0" colspan="2">
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0">
          <widget class="QCheckBox" name="logToConsole">
diff --git a/src/duckstation-qt/biossettingswidget.ui b/src/duckstation-qt/biossettingswidget.ui
index 82519a2ea..68578679d 100644
--- a/src/duckstation-qt/biossettingswidget.ui
+++ b/src/duckstation-qt/biossettingswidget.ui
@@ -145,7 +145,7 @@
      <property name="title">
       <string>Parallel Port</string>
      </property>
-     <layout class="QFormLayout" name="formLayout">
+     <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,1">
       <item row="0" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
diff --git a/src/duckstation-qt/consolesettingswidget.ui b/src/duckstation-qt/consolesettingswidget.ui
index 274e83fd4..88ca42766 100644
--- a/src/duckstation-qt/consolesettingswidget.ui
+++ b/src/duckstation-qt/consolesettingswidget.ui
@@ -28,7 +28,7 @@
      <property name="title">
       <string>Console</string>
      </property>
-     <layout class="QFormLayout" name="formLayout">
+     <layout class="QGridLayout" name="gridLayout_3" columnstretch="0,1">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -39,6 +39,16 @@
       <item row="0" column="1">
        <widget class="QComboBox" name="region"/>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="forceVideoTimingLabel">
+        <property name="text">
+         <string>Frame Rate:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="forceVideoTiming"/>
+      </item>
       <item row="2" column="0" colspan="2">
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0">
@@ -71,16 +81,6 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="forceVideoTimingLabel">
-        <property name="text">
-         <string>Frame Rate:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="forceVideoTiming"/>
-      </item>
      </layout>
     </widget>
    </item>
@@ -89,7 +89,7 @@
      <property name="title">
       <string>CPU Emulation</string>
      </property>
-     <layout class="QFormLayout" name="formLayout_3">
+     <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,1">
       <item row="0" column="0">
        <widget class="QLabel" name="cpuExecutionModeLabel">
         <property name="text">
@@ -175,7 +175,7 @@
      <property name="title">
       <string>CD-ROM Emulation</string>
      </property>
-     <layout class="QFormLayout" name="formLayout_4">
+     <layout class="QGridLayout" name="gridLayout_5" columnstretch="0,1">
       <item row="0" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
@@ -252,7 +252,7 @@
       <item row="1" column="1">
        <widget class="QComboBox" name="cdromSeekSpeedup">
         <property name="currentText">
-         <string/>
+         <string>None (Normal Speed)</string>
         </property>
         <item>
          <property name="text">
diff --git a/src/duckstation-qt/controllerglobalsettingswidget.ui b/src/duckstation-qt/controllerglobalsettingswidget.ui
index e9e790310..2985798fe 100644
--- a/src/duckstation-qt/controllerglobalsettingswidget.ui
+++ b/src/duckstation-qt/controllerglobalsettingswidget.ui
@@ -79,7 +79,7 @@
      <property name="title">
       <string>Controller Multitap</string>
      </property>
-     <layout class="QFormLayout" name="formLayout">
+     <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
       <item row="0" column="0" colspan="2">
        <widget class="QLabel" name="label">
         <property name="text">
diff --git a/src/duckstation-qt/emulationsettingswidget.ui b/src/duckstation-qt/emulationsettingswidget.ui
index 37a4d3ebe..06bb7b367 100644
--- a/src/duckstation-qt/emulationsettingswidget.ui
+++ b/src/duckstation-qt/emulationsettingswidget.ui
@@ -28,7 +28,7 @@
      <property name="title">
       <string>Speed Control</string>
      </property>
-     <layout class="QFormLayout" name="formLayout_2">
+     <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
       <item row="0" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
@@ -135,8 +135,8 @@
      <property name="title">
       <string>Rewind/Runahead</string>
      </property>
-     <layout class="QFormLayout" name="formLayout">
-      <item row="0" column="0" colspan="2">
+     <layout class="QGridLayout" name="gridLayout_3" columnstretch="0,1">
+      <item row="0" column="0">
        <widget class="QCheckBox" name="rewindEnable">
         <property name="text">
          <string>Enable Rewinding</string>
@@ -278,7 +278,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="resources/resources.qrc"/>
+  <include location="resources/duckstation-qt.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/duckstation-qt/graphicssettingswidget.ui b/src/duckstation-qt/graphicssettingswidget.ui
index ddf596f5c..df7501dc8 100644
--- a/src/duckstation-qt/graphicssettingswidget.ui
+++ b/src/duckstation-qt/graphicssettingswidget.ui
@@ -31,7 +31,7 @@
      <property name="title">
       <string/>
      </property>
-     <layout class="QFormLayout" name="formLayout">
+     <layout class="QGridLayout" name="gridLayout_18" columnstretch="0,1">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -85,7 +85,7 @@
          <property name="title">
           <string/>
          </property>
-         <layout class="QFormLayout" name="formLayout_2">
+         <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,1">
           <property name="topMargin">
            <number>6</number>
           </property>
@@ -146,6 +146,26 @@
           <item row="3" column="1">
            <widget class="QComboBox" name="spriteTextureFiltering"/>
           </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="gpuDitheringModeLabel">
+            <property name="text">
+             <string>Dithering:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QComboBox" name="gpuDitheringMode"/>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="text">
+             <string>Deinterlacing:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QComboBox" name="displayDeinterlacing"/>
+          </item>
           <item row="6" column="0">
            <widget class="QLabel" name="label_6">
             <property name="text">
@@ -187,29 +207,6 @@
             </item>
            </layout>
           </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="gpuDitheringModeLabel">
-            <property name="text">
-             <string>Dithering:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QComboBox" name="gpuDitheringMode"/>
-          </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>Deinterlacing:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1">
-           <widget class="QComboBox" name="displayDeinterlacing"/>
-          </item>
-          <item row="7" column="1">
-           <widget class="QComboBox" name="displayCropMode"/>
-          </item>
           <item row="7" column="0">
            <widget class="QLabel" name="label_7">
             <property name="text">
@@ -217,6 +214,9 @@
             </property>
            </widget>
           </item>
+          <item row="7" column="1">
+           <widget class="QComboBox" name="displayCropMode"/>
+          </item>
           <item row="8" column="0">
            <widget class="QLabel" name="label_8">
             <property name="text">
@@ -306,7 +306,7 @@
          <property name="title">
           <string>Display Options</string>
          </property>
-         <layout class="QFormLayout" name="formLayout_7">
+         <layout class="QGridLayout" name="gridLayout_11" columnstretch="0,1">
           <item row="0" column="0">
            <widget class="QLabel" name="exclusiveFullscreenLabel">
             <property name="text">
@@ -331,6 +331,16 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QComboBox" name="displayAlignment"/>
+            </item>
+            <item>
+             <widget class="QComboBox" name="displayRotation"/>
+            </item>
+           </layout>
+          </item>
           <item row="2" column="0" colspan="2">
            <layout class="QGridLayout" name="advancedDisplayOptionsLayout">
             <item row="0" column="0">
@@ -363,16 +373,6 @@
             </item>
            </layout>
           </item>
-          <item row="1" column="1">
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QComboBox" name="displayAlignment"/>
-            </item>
-            <item>
-             <widget class="QComboBox" name="displayRotation"/>
-            </item>
-           </layout>
-          </item>
          </layout>
         </widget>
        </item>
@@ -381,7 +381,7 @@
          <property name="title">
           <string>Rendering Options</string>
          </property>
-         <layout class="QFormLayout" name="formLayout_6">
+         <layout class="QGridLayout" name="gridLayout_12" columnstretch="0,1">
           <item row="0" column="0">
            <widget class="QLabel" name="msaaModeLabel">
             <property name="text">
@@ -495,7 +495,7 @@
          <property name="title">
           <string/>
          </property>
-         <layout class="QFormLayout" name="formLayout_4">
+         <layout class="QGridLayout" name="gridLayout_13" columnstretch="0,1">
           <property name="topMargin">
            <number>6</number>
           </property>
@@ -642,7 +642,7 @@
          <property name="title">
           <string/>
          </property>
-         <layout class="QFormLayout" name="formLayout_5">
+         <layout class="QGridLayout" name="gridLayout_14" columnstretch="0,1">
           <property name="topMargin">
            <number>6</number>
           </property>
@@ -666,6 +666,33 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>Screen Margins:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="osdMargin">
+            <property name="suffix">
+             <string>px</string>
+            </property>
+            <property name="maximum">
+             <number>200</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Theme:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="fullscreenUITheme"/>
+          </item>
           <item row="3" column="0" colspan="2">
            <layout class="QGridLayout" name="gridLayout_3">
             <item row="1" column="1">
@@ -754,33 +781,6 @@
             </item>
            </layout>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_10">
-            <property name="text">
-             <string>Screen Margins:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="osdMargin">
-            <property name="suffix">
-             <string>px</string>
-            </property>
-            <property name="maximum">
-             <number>200</number>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Theme:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="fullscreenUITheme"/>
-          </item>
          </layout>
         </widget>
        </item>
@@ -821,7 +821,7 @@
          <property name="title">
           <string>Screenshots</string>
          </property>
-         <layout class="QFormLayout" name="formLayout_3">
+         <layout class="QGridLayout" name="gridLayout_15" columnstretch="0,1">
           <item row="0" column="0">
            <widget class="QLabel" name="label_21">
             <property name="text">
@@ -867,7 +867,7 @@
          <property name="title">
           <string>Media Capture</string>
          </property>
-         <layout class="QFormLayout" name="captureTabGroupBoxLayout">
+         <layout class="QGridLayout" name="gridLayout_16" columnstretch="0,1">
           <item row="0" column="0">
            <widget class="QLabel" name="label_2">
             <property name="text">
@@ -1160,53 +1160,46 @@
          <property name="title">
           <string>Texture Replacement</string>
          </property>
-         <layout class="QFormLayout" name="formLayout_8">
-          <item row="0" column="0" colspan="2">
-           <layout class="QGridLayout" name="gridLayout_6">
-            <item row="3" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_4"/>
-            </item>
-            <item row="0" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_6">
-              <item>
-               <widget class="QCheckBox" name="enableTextureDumping">
-                <property name="text">
-                 <string>Enable Texture Dumping</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="textureReplacementOptions">
-                <property name="icon">
-                 <iconset theme="settings-3-line"/>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="enableTextureReplacements">
+         <layout class="QGridLayout" name="gridLayout_6">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="enableTextureReplacements">
+            <property name="text">
+             <string>Enable Texture Replacement</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_6">
+            <item>
+             <widget class="QCheckBox" name="enableTextureDumping">
               <property name="text">
-               <string>Enable Texture Replacement</string>
+               <string>Enable Texture Dumping</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QCheckBox" name="dumpReplacedTextures">
-              <property name="text">
-               <string>Dump Replaced Textures</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="alwaysTrackUploads">
-              <property name="text">
-               <string>Always Track Uploads</string>
+            <item>
+             <widget class="QToolButton" name="textureReplacementOptions">
+              <property name="icon">
+               <iconset theme="settings-3-line"/>
               </property>
              </widget>
             </item>
            </layout>
           </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="alwaysTrackUploads">
+            <property name="text">
+             <string>Always Track Uploads</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="dumpReplacedTextures">
+            <property name="text">
+             <string>Dump Replaced Textures</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -1215,31 +1208,27 @@
          <property name="title">
           <string>VRAM Write (Background) Replacement</string>
          </property>
-         <layout class="QFormLayout" name="formLayout_9">
-          <item row="0" column="0" colspan="2">
-           <layout class="QGridLayout" name="gridLayout_7">
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="vramWriteReplacement">
-              <property name="text">
-               <string>Enable VRAM Write Replacement</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="useOldMDECRoutines">
-              <property name="text">
-               <string>Use Old MDEC Routines</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QCheckBox" name="vramWriteDumping">
-              <property name="text">
-               <string>Enable VRAM Write Dumping</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
+         <layout class="QGridLayout" name="gridLayout_7">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="vramWriteReplacement">
+            <property name="text">
+             <string>Enable VRAM Write Replacement</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QCheckBox" name="vramWriteDumping">
+            <property name="text">
+             <string>Enable VRAM Write Dumping</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="useOldMDECRoutines">
+            <property name="text">
+             <string>Use Old MDEC Routines</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
@@ -1321,7 +1310,7 @@
          <property name="title">
           <string>GPU Dump Recording/Playback</string>
          </property>
-         <layout class="QFormLayout" name="formLayout_12">
+         <layout class="QGridLayout" name="gridLayout_17" columnstretch="0,1">
           <item row="0" column="0">
            <widget class="QLabel" name="groupDumpCompressionModeLabel">
             <property name="text">
@@ -1347,87 +1336,83 @@
          <property name="title">
           <string>Device Options</string>
          </property>
-         <layout class="QFormLayout" name="formLayout_10">
-          <item row="0" column="0" colspan="2">
-           <layout class="QGridLayout" name="gridLayout_8">
-            <item row="5" column="0">
-             <widget class="QCheckBox" name="disableComputeShaders">
-              <property name="text">
-               <string>Disable Compute Shaders</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QCheckBox" name="disableDualSource">
-              <property name="text">
-               <string>Disable Dual-Source Blending</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="useDebugDevice">
-              <property name="text">
-               <string>Use Debug Device</string>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="0">
-             <widget class="QCheckBox" name="disableMemoryImport">
-              <property name="text">
-               <string>Disable Memory Import</string>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="1">
-             <widget class="QCheckBox" name="disableRasterOrderViews">
-              <property name="text">
-               <string>Disable Rasterizer Order Views</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <widget class="QCheckBox" name="disableTextureCopyToSelf">
-              <property name="text">
-               <string>Disable Texture Copy To Self</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="0">
-             <widget class="QCheckBox" name="disableTextureBuffers">
-              <property name="text">
-               <string>Disable Texture Buffers</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QCheckBox" name="disableFramebufferFetch">
-              <property name="text">
-               <string>Disable Framebuffer Fetch</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QCheckBox" name="disableCompressedTextures">
-              <property name="text">
-               <string>Disable Compressed Textures</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="disableShaderCache">
-              <property name="text">
-               <string>Disable Shader Cache</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QCheckBox" name="useGPUBasedValidation">
-              <property name="text">
-               <string>Use GPU-Based Validation</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
+         <layout class="QGridLayout" name="gridLayout_8">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="useDebugDevice">
+            <property name="text">
+             <string>Use Debug Device</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QCheckBox" name="useGPUBasedValidation">
+            <property name="text">
+             <string>Use GPU-Based Validation</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="disableShaderCache">
+            <property name="text">
+             <string>Disable Shader Cache</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="disableCompressedTextures">
+            <property name="text">
+             <string>Disable Compressed Textures</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="disableDualSource">
+            <property name="text">
+             <string>Disable Dual-Source Blending</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QCheckBox" name="disableFramebufferFetch">
+            <property name="text">
+             <string>Disable Framebuffer Fetch</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="disableTextureBuffers">
+            <property name="text">
+             <string>Disable Texture Buffers</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="disableTextureCopyToSelf">
+            <property name="text">
+             <string>Disable Texture Copy To Self</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="disableMemoryImport">
+            <property name="text">
+             <string>Disable Memory Import</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QCheckBox" name="disableRasterOrderViews">
+            <property name="text">
+             <string>Disable Rasterizer Order Views</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QCheckBox" name="disableComputeShaders">
+            <property name="text">
+             <string>Disable Compute Shaders</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
diff --git a/src/duckstation-qt/interfacesettingswidget.ui b/src/duckstation-qt/interfacesettingswidget.ui
index 38e874d5a..2618a2be9 100644
--- a/src/duckstation-qt/interfacesettingswidget.ui
+++ b/src/duckstation-qt/interfacesettingswidget.ui
@@ -173,7 +173,7 @@
      <property name="title">
       <string>Updates</string>
      </property>
-     <layout class="QFormLayout" name="formLayout_2">
+     <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
       <item row="0" column="0">
        <widget class="QLabel" name="autoUpdateTagLabel">
         <property name="text">
diff --git a/src/duckstation-qt/postprocessingoverlayconfigwidget.ui b/src/duckstation-qt/postprocessingoverlayconfigwidget.ui
index 187142201..d1910e459 100644
--- a/src/duckstation-qt/postprocessingoverlayconfigwidget.ui
+++ b/src/duckstation-qt/postprocessingoverlayconfigwidget.ui
@@ -19,17 +19,7 @@
      <property name="title">
       <string>Basic Configuration</string>
      </property>
-     <layout class="QFormLayout" name="formLayout_3">
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Selected Preset:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="overlayName"/>
-      </item>
+     <layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
       <item row="0" column="0" colspan="2">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -40,6 +30,16 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Selected Preset:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="overlayName"/>
+      </item>
      </layout>
     </widget>
    </item>