diff --git a/qrenderdoc/Widgets/ComputeDebugSelector.ui b/qrenderdoc/Widgets/ComputeDebugSelector.ui
index 0a844cd55..f84095e30 100644
--- a/qrenderdoc/Widgets/ComputeDebugSelector.ui
+++ b/qrenderdoc/Widgets/ComputeDebugSelector.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>ComputeDebugSelector</class>
  <widget class="QDialog" name="ComputeDebugSelector">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -25,9 +28,6 @@
   <property name="modal">
    <bool>true</bool>
   </property>
-  <property name="windowModality">
-   <enum>Qt::ApplicationModal</enum>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="sizeConstraint">
     <enum>QLayout::SetFixedSize</enum>
@@ -96,18 +96,14 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_buttons">
-     <property name="alignment">
-      <set>Qt::AlignRight</set>
-     </property>
      <item>
       <widget class="QPushButton" name="beginDebug">
        <property name="text">
         <string>Debug</string>
        </property>
        <property name="icon">
-        <iconset resource="../../Resources/resources.qrc">
-         <normaloff>:/wrench.png</normaloff>:/wrench.png
-        </iconset>
+        <iconset resource="../Resources/resources.qrc">
+         <normaloff>:/wrench.png</normaloff>:/wrench.png</iconset>
        </property>
       </widget>
      </item>
@@ -122,6 +118,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../Resources/resources.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/qrenderdoc/Widgets/ResourcePreview.ui b/qrenderdoc/Widgets/ResourcePreview.ui
index 7957407d5..461650592 100644
--- a/qrenderdoc/Widgets/ResourcePreview.ui
+++ b/qrenderdoc/Widgets/ResourcePreview.ui
@@ -107,16 +107,16 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>CustomPaintWidget</class>
-   <extends>QWidget</extends>
-   <header>Widgets/CustomPaintWidget.h</header>
-  </customwidget>
   <customwidget>
    <class>RDLabel</class>
    <extends>QLabel</extends>
    <header>Widgets/Extended/RDLabel.h</header>
   </customwidget>
+  <customwidget>
+   <class>CustomPaintWidget</class>
+   <extends>QWidget</extends>
+   <header>Widgets/CustomPaintWidget.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/qrenderdoc/Windows/APIInspector.ui b/qrenderdoc/Windows/APIInspector.ui
index 834ac7cf0..e94cdf7b3 100644
--- a/qrenderdoc/Windows/APIInspector.ui
+++ b/qrenderdoc/Windows/APIInspector.ui
@@ -84,17 +84,17 @@
    <extends>QTreeView</extends>
    <header>Widgets/Extended/RDTreeWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>RDListWidget</class>
+   <extends>QListWidget</extends>
+   <header>Widgets/Extended/RDListWidget.h</header>
+  </customwidget>
   <customwidget>
    <class>RDSplitter</class>
    <extends>QSplitter</extends>
    <header>Widgets/Extended/RDSplitter.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>RDListWidget</class>
-   <extends>QListWidget</extends>
-   <header>Widgets/Extended/RDListWidget.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/qrenderdoc/Windows/BufferViewer.ui b/qrenderdoc/Windows/BufferViewer.ui
index dab90b909..5721d5b1b 100644
--- a/qrenderdoc/Windows/BufferViewer.ui
+++ b/qrenderdoc/Windows/BufferViewer.ui
@@ -422,8 +422,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>181</width>
-                <height>253</height>
+                <width>312</width>
+                <height>308</height>
                </rect>
               </property>
               <property name="sizePolicy">
@@ -938,7 +938,7 @@ Enter 0.0 to use automatic/guessed value derived from data.</string>
     <item>
      <widget class="QDoubleSpinBox" name="byteRangeStart">
       <property name="maximum">
-       <number>999123456</number>
+       <double>999123456.000000000000000</double>
       </property>
      </widget>
     </item>
@@ -952,7 +952,7 @@ Enter 0.0 to use automatic/guessed value derived from data.</string>
     <item>
      <widget class="QDoubleSpinBox" name="byteRangeLength">
       <property name="maximum">
-       <number>999123456</number>
+       <double>999123456.000000000000000</double>
       </property>
      </widget>
     </item>
@@ -1008,16 +1008,16 @@ Enter 0.0 to use automatic/guessed value derived from data.</string>
   </widget>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>ToolWindowManager</class>
-   <extends>QWidget</extends>
-   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
-  </customwidget>
   <customwidget>
    <class>CustomPaintWidget</class>
    <extends>QWidget</extends>
    <header>Widgets/CustomPaintWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>ToolWindowManager</class>
+   <extends>QWidget</extends>
+   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
+  </customwidget>
   <customwidget>
    <class>RDTableView</class>
    <extends>QTableView</extends>
diff --git a/qrenderdoc/Windows/Dialogs/AxisMappingDialog.ui b/qrenderdoc/Windows/Dialogs/AxisMappingDialog.ui
index 77c1f4277..71111b10f 100644
--- a/qrenderdoc/Windows/Dialogs/AxisMappingDialog.ui
+++ b/qrenderdoc/Windows/Dialogs/AxisMappingDialog.ui
@@ -81,7 +81,6 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../Resources/resources.qrc"/>
- </resources>
+ <resources/>
+ <connections/>
 </ui>
diff --git a/qrenderdoc/Windows/Dialogs/EnvironmentEditor.ui b/qrenderdoc/Windows/Dialogs/EnvironmentEditor.ui
index 8d67cc484..ff00bd9d9 100644
--- a/qrenderdoc/Windows/Dialogs/EnvironmentEditor.ui
+++ b/qrenderdoc/Windows/Dialogs/EnvironmentEditor.ui
@@ -186,16 +186,16 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RDLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>Widgets/Extended/RDLineEdit.h</header>
-  </customwidget>
   <customwidget>
    <class>RDTreeWidget</class>
    <extends>QTreeView</extends>
    <header>Widgets/Extended/RDTreeWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>RDLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>Widgets/Extended/RDLineEdit.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>
diff --git a/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.ui b/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.ui
index dad35ac45..bcaf88e67 100644
--- a/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.ui
+++ b/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.ui
@@ -26,7 +26,7 @@
      <item>
       <widget class="RDTreeWidget" name="counterTree">
        <attribute name="headerDefaultSectionSize">
-        <number>0</number>
+        <number>31</number>
        </attribute>
       </widget>
      </item>
@@ -42,8 +42,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QTextEdit" name="counterDescription">
-      </widget>
+      <widget class="QTextEdit" name="counterDescription"/>
      </item>
      <item>
       <widget class="QLabel" name="enabledCountersLabel">
diff --git a/qrenderdoc/Windows/Dialogs/UpdateDialog.ui b/qrenderdoc/Windows/Dialogs/UpdateDialog.ui
index 455c22a24..c6ea33e45 100644
--- a/qrenderdoc/Windows/Dialogs/UpdateDialog.ui
+++ b/qrenderdoc/Windows/Dialogs/UpdateDialog.ui
@@ -171,7 +171,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap>:/logo.svg</pixmap>
+         <pixmap resource="../../Resources/resources.qrc">:/logo.svg</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
@@ -410,6 +410,8 @@
    <header>Widgets/Extended/RDLabel.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../Resources/resources.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/qrenderdoc/Windows/EventBrowser.ui b/qrenderdoc/Windows/EventBrowser.ui
index 321f65eb1..03b1aa760 100644
--- a/qrenderdoc/Windows/EventBrowser.ui
+++ b/qrenderdoc/Windows/EventBrowser.ui
@@ -296,7 +296,8 @@
       </item>
      </layout>
     </widget>
-   </item><item>
+   </item>
+   <item>
     <widget class="QWidget" name="filterStrip" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout_7">
       <property name="spacing">
@@ -374,8 +375,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QWidget" name="breadcrumbStrip" native="true">
-    </widget>
+    <widget class="QWidget" name="breadcrumbStrip" native="true"/>
    </item>
    <item>
     <widget class="QWidget" name="bookmarkStrip" native="true">
@@ -487,6 +487,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>RDLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>Widgets/Extended/RDLineEdit.h</header>
+  </customwidget>
   <customwidget>
    <class>RDTreeView</class>
    <extends>QTreeView</extends>
@@ -497,11 +502,6 @@
    <extends>QTextEdit</extends>
    <header>Widgets/Extended/RDTextEdit.h</header>
   </customwidget>
-  <customwidget>
-   <class>RDLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>Widgets/Extended/RDLineEdit.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../Resources/resources.qrc"/>
diff --git a/qrenderdoc/Windows/PerformanceCounterViewer.ui b/qrenderdoc/Windows/PerformanceCounterViewer.ui
index bd243b1b5..1b1863fd2 100644
--- a/qrenderdoc/Windows/PerformanceCounterViewer.ui
+++ b/qrenderdoc/Windows/PerformanceCounterViewer.ui
@@ -179,7 +179,7 @@
  <customwidgets>
   <customwidget>
    <class>RDTableView</class>
-   <extends>QTableWidget</extends>
+   <extends>QTableView</extends>
    <header>Widgets/Extended/RDTableView.h</header>
   </customwidget>
  </customwidgets>
diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
index 61350dae5..0635f0af4 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
@@ -3582,14 +3582,14 @@
                 </property>
                 <item row="1" column="1">
                  <widget class="QLabel" name="depthWrite">
-                  <property name="text">
-                   <string/>
-                  </property>
                   <property name="font">
                    <font>
                     <pointsize>12</pointsize>
                    </font>
                   </property>
+                  <property name="text">
+                   <string/>
+                  </property>
                   <property name="pixmap">
                    <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                   </property>
@@ -4097,8 +4097,7 @@
             </property>
             <property name="icon">
              <iconset resource="../../Resources/resources.qrc">
-              <normaloff>:/wrench.png</normaloff>:/wrench.png
-             </iconset>
+              <normaloff>:/wrench.png</normaloff>:/wrench.png</iconset>
             </property>
             <property name="toolButtonStyle">
              <enum>Qt::ToolButtonTextBesideIcon</enum>
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
index 33ae8bdbf..835f19763 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
@@ -219,8 +219,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>515</height>
+            <width>454</width>
+            <height>196</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
@@ -627,8 +627,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>466</height>
+            <width>101</width>
+            <height>344</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -1033,8 +1033,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>466</height>
+            <width>101</width>
+            <height>344</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1439,8 +1439,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>466</height>
+            <width>101</width>
+            <height>344</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1845,8 +1845,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>466</height>
+            <width>101</width>
+            <height>430</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2898,8 +2898,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>466</height>
+            <width>101</width>
+            <height>344</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -3187,8 +3187,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>868</width>
-            <height>515</height>
+            <width>698</width>
+            <height>318</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_6">
@@ -3554,14 +3554,14 @@
               </item>
               <item row="2" column="1">
                <widget class="QLabel" name="depthWrite">
-                <property name="text">
-                 <string/>
-                </property>
                 <property name="font">
                  <font>
                   <pointsize>12</pointsize>
                  </font>
                 </property>
+                <property name="text">
+                 <string/>
+                </property>
                 <property name="pixmap">
                  <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                 </property>
@@ -3958,8 +3958,7 @@
             </property>
             <property name="icon">
              <iconset resource="../../Resources/resources.qrc">
-              <normaloff>:/wrench.png</normaloff>:/wrench.png
-             </iconset>
+              <normaloff>:/wrench.png</normaloff>:/wrench.png</iconset>
             </property>
             <property name="toolButtonStyle">
              <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -4284,11 +4283,6 @@
    <header>Widgets/CollapseGroupBox.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ToolWindowManager</class>
-   <extends>QWidget</extends>
-   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../Resources/resources.qrc"/>
diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
index fa5a924c4..5cea6de78 100644
--- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
@@ -3812,7 +3812,7 @@
             <x>0</x>
             <y>0</y>
             <width>488</width>
-            <height>311</height>
+            <height>345</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
@@ -4126,14 +4126,14 @@
               </item>
               <item row="3" column="1">
                <widget class="QLabel" name="depthBounds">
-                <property name="text">
-                 <string/>
-                </property>
                 <property name="font">
                  <font>
                   <pointsize>12</pointsize>
                  </font>
                 </property>
+                <property name="text">
+                 <string/>
+                </property>
                 <property name="pixmap">
                  <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                 </property>
@@ -4157,14 +4157,14 @@
               </item>
               <item row="2" column="1">
                <widget class="QLabel" name="depthWrite">
-                <property name="text">
-                 <string/>
-                </property>
                 <property name="font">
                  <font>
                   <pointsize>12</pointsize>
                  </font>
                 </property>
+                <property name="text">
+                 <string/>
+                </property>
                 <property name="pixmap">
                  <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                 </property>
diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
index d7048e93a..2c2cc818c 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
@@ -646,8 +646,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>458</height>
+            <width>96</width>
+            <height>172</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -958,8 +958,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>458</height>
+            <width>96</width>
+            <height>172</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1270,8 +1270,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>458</height>
+            <width>96</width>
+            <height>172</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1582,8 +1582,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>458</height>
+            <width>117</width>
+            <height>258</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -2955,8 +2955,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>458</height>
+            <width>96</width>
+            <height>172</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_15">
@@ -3134,8 +3134,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>507</height>
+            <width>488</width>
+            <height>348</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
@@ -3501,14 +3501,14 @@
               </item>
               <item row="2" column="1">
                <widget class="QLabel" name="depthWrite">
-                <property name="text">
-                 <string/>
-                </property>
                 <property name="font">
                  <font>
                   <pointsize>12</pointsize>
                  </font>
                 </property>
+                <property name="text">
+                 <string/>
+                </property>
                 <property name="pixmap">
                  <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                 </property>
@@ -3724,8 +3724,7 @@
                </property>
                <property name="icon">
                 <iconset resource="../../Resources/resources.qrc">
-                 <normaloff>:/action.png</normaloff>:/action.png
-                </iconset>
+                 <normaloff>:/action.png</normaloff>:/action.png</iconset>
                </property>
                <property name="toolButtonStyle">
                 <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -3745,8 +3744,7 @@
                </property>
                <property name="icon">
                 <iconset resource="../../Resources/resources.qrc">
-                 <normaloff>:/page_white_edit.png</normaloff>:/page_white_edit.png
-                </iconset>
+                 <normaloff>:/page_white_edit.png</normaloff>:/page_white_edit.png</iconset>
                </property>
                <property name="popupMode">
                 <enum>QToolButton::MenuButtonPopup</enum>
@@ -3769,8 +3767,7 @@
                </property>
                <property name="icon">
                 <iconset resource="../../Resources/resources.qrc">
-                 <normaloff>:/save.png</normaloff>:/save.png
-                </iconset>
+                 <normaloff>:/save.png</normaloff>:/save.png</iconset>
                </property>
                <property name="toolButtonStyle">
                 <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -3810,8 +3807,7 @@
             </property>
             <property name="icon">
              <iconset resource="../../Resources/resources.qrc">
-              <normaloff>:/wrench.png</normaloff>:/wrench.png
-             </iconset>
+              <normaloff>:/wrench.png</normaloff>:/wrench.png</iconset>
             </property>
             <property name="toolButtonStyle">
              <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -3925,8 +3921,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>911</width>
-            <height>394</height>
+            <width>96</width>
+            <height>172</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_16">
diff --git a/qrenderdoc/Windows/ResourceInspector.ui b/qrenderdoc/Windows/ResourceInspector.ui
index a61f8c01f..fe7c12e9b 100644
--- a/qrenderdoc/Windows/ResourceInspector.ui
+++ b/qrenderdoc/Windows/ResourceInspector.ui
@@ -318,6 +318,11 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>RDTreeWidget</class>
+   <extends>QTreeView</extends>
+   <header>Widgets/Extended/RDTreeWidget.h</header>
+  </customwidget>
   <customwidget>
    <class>RDLineEdit</class>
    <extends>QLineEdit</extends>
@@ -329,20 +334,15 @@
    <header>Widgets/Extended/RDTreeView.h</header>
   </customwidget>
   <customwidget>
-   <class>RDTreeWidget</class>
-   <extends>QTreeView</extends>
-   <header>Widgets/Extended/RDTreeWidget.h</header>
+   <class>ToolWindowManager</class>
+   <extends>QWidget</extends>
+   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
   </customwidget>
   <customwidget>
    <class>RDListView</class>
    <extends>QListView</extends>
    <header>Widgets/Extended/RDListView.h</header>
   </customwidget>
-  <customwidget>
-   <class>ToolWindowManager</class>
-   <extends>QWidget</extends>
-   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../Resources/resources.qrc"/>
diff --git a/qrenderdoc/Windows/ShaderMessageViewer.ui b/qrenderdoc/Windows/ShaderMessageViewer.ui
index 4c07747e2..8a2aa1394 100644
--- a/qrenderdoc/Windows/ShaderMessageViewer.ui
+++ b/qrenderdoc/Windows/ShaderMessageViewer.ui
@@ -28,55 +28,54 @@
    </property>
    <item>
     <layout class="QHBoxLayout" name="toolbarHorizontalLayout">
-      <property name="spacing">
-        <number>5</number>
-      </property>
-      <property name="leftMargin">
-        <number>0</number>
-      </property>
-      <property name="topMargin">
-        <number>2</number>
-      </property>
-      <property name="rightMargin">
-        <number>6</number>
-      </property>
-      <property name="bottomMargin">
-        <number>2</number>
-      </property>
-      <item>
-        <widget class="QToolButton" name="exportButton">
-          <property name="text">
-            <string>Export</string>
-          </property>
-          <property name="icon">
-            <iconset resource="../Resources/resources.qrc">
-              <normaloff>:/save.png</normaloff>:/save.png
-            </iconset>
-          </property>
-          <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonTextBesideIcon</enum>
-          </property>
-          <property name="popupMode">
-            <enum>QToolButton::MenuButtonPopup</enum>
-          </property>
-          <property name="autoRaise">
-            <bool>true</bool>
-          </property>
-        </widget>
-      </item>
-      <item>
-        <spacer name="toolbarHorizontalSpacer">
-          <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-            <size>
-              <width>40</width>
-              <height>20</height>
-            </size>
-          </property>
-        </spacer>
-      </item>
+     <property name="spacing">
+      <number>5</number>
+     </property>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>2</number>
+     </property>
+     <property name="rightMargin">
+      <number>6</number>
+     </property>
+     <property name="bottomMargin">
+      <number>2</number>
+     </property>
+     <item>
+      <widget class="QToolButton" name="exportButton">
+       <property name="text">
+        <string>Export</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../Resources/resources.qrc">
+         <normaloff>:/save.png</normaloff>:/save.png</iconset>
+       </property>
+       <property name="popupMode">
+        <enum>QToolButton::MenuButtonPopup</enum>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="toolbarHorizontalSpacer">
+       <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>
@@ -233,15 +232,15 @@
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
      </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
      <property name="selectionMode">
       <enum>QAbstractItemView::ContiguousSelection</enum>
      </property>
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
-     <property name="showDropIndicator" stdset="0">
-      <bool>false</bool>
-     </property>
      <property name="indentation">
       <number>0</number>
      </property>
@@ -251,15 +250,15 @@
      <property name="itemsExpandable">
       <bool>false</bool>
      </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
      <property name="allColumnsShowFocus">
       <bool>true</bool>
      </property>
      <property name="expandsOnDoubleClick">
       <bool>false</bool>
      </property>
-     <property name="sortingEnabled">
-      <bool>true</bool>
-     </property>
      <attribute name="headerStretchLastSection">
       <bool>false</bool>
      </attribute>
@@ -284,6 +283,8 @@
    <header>Widgets/Extended/RDLineEdit.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../Resources/resources.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/qrenderdoc/Windows/ShaderViewer.ui b/qrenderdoc/Windows/ShaderViewer.ui
index b0c740eb5..7f74ae0a8 100644
--- a/qrenderdoc/Windows/ShaderViewer.ui
+++ b/qrenderdoc/Windows/ShaderViewer.ui
@@ -388,12 +388,12 @@
     </item>
     <item>
      <widget class="QLabel" name="editStatusLabel">
-      <property name="text">
-       <string>Status: Original Shader Active</string>
-      </property>
       <property name="toolTip">
        <string>The replay currently has the original shader active</string>
       </property>
+      <property name="text">
+       <string>Status: Original Shader Active</string>
+      </property>
      </widget>
     </item>
     <item>
@@ -775,16 +775,16 @@
   </widget>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RDTableWidget</class>
-   <extends>QTableWidget</extends>
-   <header>Widgets/Extended/RDTableWidget.h</header>
-  </customwidget>
   <customwidget>
    <class>RDTreeWidget</class>
    <extends>QTreeView</extends>
    <header>Widgets/Extended/RDTreeWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>RDTableWidget</class>
+   <extends>QTableWidget</extends>
+   <header>Widgets/Extended/RDTableWidget.h</header>
+  </customwidget>
   <customwidget>
    <class>ToolWindowManager</class>
    <extends>QWidget</extends>
diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui
index ab7ad2f44..ec6e10345 100644
--- a/qrenderdoc/Windows/TextureViewer.ui
+++ b/qrenderdoc/Windows/TextureViewer.ui
@@ -1096,24 +1096,24 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
         </property>
        </widget>
       </item>
-       <item>
-         <widget class="QLabel" name="texStatusFormat">
-           <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-             </sizepolicy>
-           </property>
-           <property name="font">
-             <font>
-               <family>Consolas</family>
-             </font>
-           </property>
-           <property name="text">
-             <string>texStatusFormat</string>
-           </property>
-         </widget>
-       </item>
+      <item>
+       <widget class="QLabel" name="texStatusFormat">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <family>Consolas</family>
+         </font>
+        </property>
+        <property name="text">
+         <string>texStatusFormat</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QWidget" name="pickSwatch" native="true">
         <property name="sizePolicy">
@@ -1213,7 +1213,7 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
          <string>History</string>
         </property>
         <property name="icon">
-         <iconset resource="../../Resources/resources.qrc">
+         <iconset resource="../Resources/resources.qrc">
           <normaloff>:/pixel_history.png</normaloff>:/pixel_history.png</iconset>
         </property>
        </widget>
@@ -1224,7 +1224,7 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
          <string>Debug</string>
         </property>
         <property name="icon">
-         <iconset resource="../../Resources/resources.qrc">
+         <iconset resource="../Resources/resources.qrc">
           <normaloff>:/wrench.png</normaloff>:/wrench.png</iconset>
         </property>
        </widget>
@@ -1317,21 +1317,20 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
        </widget>
       </item>
       <item>
-        <widget class="QToolButton" name="colSelect">
-          <property name="toolTip">
-            <string>Select visible columns</string>
-          </property>
-          <property name="icon">
-            <iconset resource="../Resources/resources.qrc">
-              <normaloff>:/timeline_marker.png</normaloff>:/timeline_marker.png
-            </iconset>
-          </property>
-          <property name="autoRaise">
-            <bool>true</bool>
-          </property>
-        </widget>
+       <widget class="QToolButton" name="colSelect">
+        <property name="toolTip">
+         <string>Select visible columns</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../Resources/resources.qrc">
+          <normaloff>:/timeline_marker.png</normaloff>:/timeline_marker.png</iconset>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
       </item>
-      </layout>
+     </layout>
     </item>
     <item>
      <widget class="RDTreeWidget" name="textureList">
@@ -1348,28 +1347,28 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
        <bool>false</bool>
       </property>
       <property name="indentation">
-        <number>0</number>
+       <number>0</number>
       </property>
       <property name="rootIsDecorated">
-        <bool>true</bool>
-      </property>
-      <property name="allColumnsShowFocus">
-        <bool>true</bool>
+       <bool>true</bool>
       </property>
       <property name="uniformRowHeights">
-        <bool>true</bool>
-      </property>
-      <property name="clearSelectionOnFocusLoss">
-        <bool>false</bool>
+       <bool>true</bool>
       </property>
       <property name="itemsExpandable">
-        <bool>false</bool>
+       <bool>false</bool>
       </property>
       <property name="sortingEnabled">
        <bool>true</bool>
       </property>
+      <property name="allColumnsShowFocus">
+       <bool>true</bool>
+      </property>
       <property name="wordWrap">
-        <bool>false</bool>
+       <bool>false</bool>
+      </property>
+      <property name="clearSelectionOnFocusLoss" stdset="0">
+       <bool>false</bool>
       </property>
      </widget>
     </item>
@@ -1378,9 +1377,9 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>ToolWindowManager</class>
-   <extends>QWidget</extends>
-   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
+   <class>RDTreeWidget</class>
+   <extends>QTreeView</extends>
+   <header>Widgets/Extended/RDTreeWidget.h</header>
   </customwidget>
   <customwidget>
    <class>CustomPaintWidget</class>
@@ -1392,17 +1391,17 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
    <extends>QLineEdit</extends>
    <header>Widgets/Extended/RDLineEdit.h</header>
   </customwidget>
+  <customwidget>
+   <class>ToolWindowManager</class>
+   <extends>QWidget</extends>
+   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
+  </customwidget>
   <customwidget>
    <class>ThumbnailStrip</class>
    <extends>QWidget</extends>
    <header>Widgets/ThumbnailStrip.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>RDListView</class>
-   <extends>QListView</extends>
-   <header>Widgets/Extended/RDListView.h</header>
-  </customwidget>
   <customwidget>
    <class>RangeHistogram</class>
    <extends>QWidget</extends>
@@ -1414,11 +1413,6 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
    <extends>QToolButton</extends>
    <header>Widgets/Extended/RDToolButton.h</header>
   </customwidget>
-  <customwidget>
-    <class>RDTreeWidget</class>
-    <extends>QTreeView</extends>
-    <header>Widgets/Extended/RDTreeWidget.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../Resources/resources.qrc"/>