diff --git a/qrenderdoc/Windows/APIInspector.ui b/qrenderdoc/Windows/APIInspector.ui
index 70b79bad2..5755cdbe4 100644
--- a/qrenderdoc/Windows/APIInspector.ui
+++ b/qrenderdoc/Windows/APIInspector.ui
@@ -18,16 +18,16 @@
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <item>
     <widget class="RDSplitter" name="splitter">
diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 698716387..e8fffee0b 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -1098,6 +1098,7 @@ void BufferViewer::SetupRawView()
   ui->instance->setVisible(false);
 
   ui->vsinData->setWindowTitle(tr("Buffer Contents"));
+  ui->vsinData->setFrameShape(QFrame::NoFrame);
   ui->dockarea->addToolWindow(ui->vsinData, ToolWindowManager::EmptySpace);
   ui->dockarea->setToolWindowProperties(ui->vsinData, ToolWindowManager::HideCloseButton);
 
@@ -1116,7 +1117,7 @@ void BufferViewer::SetupRawView()
   QVBoxLayout *vertical = new QVBoxLayout(this);
 
   vertical->setSpacing(3);
-  vertical->setContentsMargins(0, 0, 0, 0);
+  vertical->setContentsMargins(3, 3, 3, 3);
 
   vertical->addWidget(ui->meshToolbar);
   vertical->addWidget(ui->dockarea);
@@ -1141,18 +1142,21 @@ void BufferViewer::SetupMeshView()
   ui->dockarea->setToolWindowProperties(ui->outputTabs, ToolWindowManager::HideCloseButton);
 
   ui->vsinData->setWindowTitle(tr("VS Input"));
+  ui->vsinData->setFrameShape(QFrame::NoFrame);
   ui->dockarea->addToolWindow(
       ui->vsinData, ToolWindowManager::AreaReference(ToolWindowManager::TopOf,
                                                      ui->dockarea->areaOf(ui->outputTabs), 0.5f));
   ui->dockarea->setToolWindowProperties(ui->vsinData, ToolWindowManager::HideCloseButton);
 
   ui->vsoutData->setWindowTitle(tr("VS Output"));
+  ui->vsoutData->setFrameShape(QFrame::NoFrame);
   ui->dockarea->addToolWindow(
       ui->vsoutData, ToolWindowManager::AreaReference(ToolWindowManager::RightOf,
                                                       ui->dockarea->areaOf(ui->vsinData), 0.5f));
   ui->dockarea->setToolWindowProperties(ui->vsoutData, ToolWindowManager::HideCloseButton);
 
   ui->gsoutData->setWindowTitle(tr("GS/DS Output"));
+  ui->gsoutData->setFrameShape(QFrame::NoFrame);
   ui->dockarea->addToolWindow(
       ui->gsoutData, ToolWindowManager::AreaReference(ToolWindowManager::AddTo,
                                                       ui->dockarea->areaOf(ui->vsoutData), 0.5f));
@@ -1225,7 +1229,7 @@ void BufferViewer::SetupMeshView()
   QVBoxLayout *vertical = new QVBoxLayout(this);
 
   vertical->setSpacing(3);
-  vertical->setContentsMargins(0, 0, 0, 0);
+  vertical->setContentsMargins(3, 3, 3, 3);
 
   vertical->addWidget(ui->meshToolbar);
   vertical->addWidget(ui->dockarea);
diff --git a/qrenderdoc/Windows/BufferViewer.ui b/qrenderdoc/Windows/BufferViewer.ui
index 9428cbe31..27a6838bd 100644
--- a/qrenderdoc/Windows/BufferViewer.ui
+++ b/qrenderdoc/Windows/BufferViewer.ui
@@ -99,6 +99,9 @@
    <property name="currentIndex">
     <number>0</number>
    </property>
+   <property name="documentMode">
+    <bool>true</bool>
+   </property>
    <widget class="QWidget" name="vsinTab">
     <attribute name="title">
      <string>VS In</string>
diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.ui b/qrenderdoc/Windows/ConstantBufferPreviewer.ui
index b6e6a0987..118a76d43 100644
--- a/qrenderdoc/Windows/ConstantBufferPreviewer.ui
+++ b/qrenderdoc/Windows/ConstantBufferPreviewer.ui
@@ -18,16 +18,16 @@
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <item>
     <widget class="QSplitter" name="splitter">
diff --git a/qrenderdoc/Windows/DebugMessageView.ui b/qrenderdoc/Windows/DebugMessageView.ui
index cbc72363e..53c2cc4a7 100644
--- a/qrenderdoc/Windows/DebugMessageView.ui
+++ b/qrenderdoc/Windows/DebugMessageView.ui
@@ -12,16 +12,16 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <item>
     <widget class="QTableView" name="messages">
diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui
index 651fbb381..00fdc7ad1 100644
--- a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui
+++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>578</width>
-    <height>943</height>
+    <height>1025</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,16 +18,16 @@
     <number>4</number>
    </property>
    <property name="leftMargin">
-    <number>6</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>6</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>6</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>6</number>
+    <number>3</number>
    </property>
    <item>
     <widget class="QGroupBox" name="exeGroup">
@@ -787,8 +787,6 @@
    <header>Widgets/Extended/RDLabel.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../../Resources/resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.ui b/qrenderdoc/Windows/Dialogs/LiveCapture.ui
index 5b3abe0f4..d069bcdd1 100644
--- a/qrenderdoc/Windows/Dialogs/LiveCapture.ui
+++ b/qrenderdoc/Windows/Dialogs/LiveCapture.ui
@@ -15,16 +15,16 @@
   </property>
   <layout class="QVBoxLayout" name="mainLayout">
    <property name="leftMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <item>
     <widget class="QFrame" name="connectionFrame">
@@ -401,16 +401,16 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RDListWidget</class>
-   <extends>QListWidget</extends>
-   <header>Widgets/Extended/RDListWidget.h</header>
-  </customwidget>
   <customwidget>
    <class>RDLabel</class>
    <extends>QLabel</extends>
    <header>Widgets/Extended/RDLabel.h</header>
   </customwidget>
+  <customwidget>
+   <class>RDListWidget</class>
+   <extends>QListWidget</extends>
+   <header>Widgets/Extended/RDListWidget.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../Resources/resources.qrc"/>
diff --git a/qrenderdoc/Windows/EventBrowser.ui b/qrenderdoc/Windows/EventBrowser.ui
index d1f1dcbe0..ad82120be 100644
--- a/qrenderdoc/Windows/EventBrowser.ui
+++ b/qrenderdoc/Windows/EventBrowser.ui
@@ -6,34 +6,28 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>275</width>
+    <width>279</width>
     <height>298</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Event Browser</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
index 7bc87327a..773b7c37c 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
@@ -29,10 +29,10 @@
    <item>
     <widget class="QFrame" name="toolbar">
      <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::Panel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="toolbarLayout">
       <property name="spacing">
@@ -48,7 +48,7 @@
        <number>0</number>
       </property>
       <property name="bottomMargin">
-       <number>2</number>
+       <number>0</number>
       </property>
       <item>
        <widget class="QLabel" name="controlsLabel">
@@ -202,22 +202,22 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>857</width>
-            <height>478</height>
+            <width>855</width>
+            <height>476</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
            <property name="leftMargin">
-            <number>2</number>
+            <number>0</number>
            </property>
            <property name="topMargin">
-            <number>2</number>
+            <number>0</number>
            </property>
            <property name="rightMargin">
-            <number>2</number>
+            <number>0</number>
            </property>
            <property name="bottomMargin">
-            <number>2</number>
+            <number>0</number>
            </property>
            <item row="0" column="0" colspan="3">
             <widget class="QGroupBox" name="attribGroup">
@@ -586,16 +586,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="vsShaderGroup">
@@ -735,8 +735,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>853</width>
-            <height>425</height>
+            <width>855</width>
+            <height>427</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -972,16 +972,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="hsShaderGroup">
@@ -1118,8 +1118,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>853</width>
-            <height>425</height>
+            <width>855</width>
+            <height>427</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1355,16 +1355,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="dsShaderGroup">
@@ -1501,8 +1501,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>853</width>
-            <height>425</height>
+            <width>855</width>
+            <height>427</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1738,16 +1738,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_7">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="gsShaderGroup">
@@ -1884,8 +1884,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>853</width>
-            <height>425</height>
+            <width>855</width>
+            <height>427</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2177,16 +2177,16 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item row="1" column="1">
         <widget class="QGroupBox" name="scissorGroup">
@@ -2722,16 +2722,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="psShaderGroup">
@@ -2868,8 +2868,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>853</width>
-            <height>425</height>
+            <width>855</width>
+            <height>427</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -3105,16 +3105,16 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item row="0" column="0">
         <widget class="QScrollArea" name="omScroll">
@@ -3129,8 +3129,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>853</width>
-            <height>474</height>
+            <width>855</width>
+            <height>476</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_6">
@@ -3755,16 +3755,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="csShaderGroup">
@@ -4000,7 +4000,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>837</width>
+            <width>839</width>
             <height>424</height>
            </rect>
           </property>
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
index 957526f7b..4049caa5c 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
@@ -29,10 +29,10 @@
    <item>
     <widget class="QFrame" name="toolbar">
      <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::Panel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="toolbarLayout">
       <property name="spacing">
@@ -48,7 +48,7 @@
        <number>0</number>
       </property>
       <property name="bottomMargin">
-       <number>2</number>
+       <number>0</number>
       </property>
       <item>
        <widget class="QLabel" name="controlsLabel">
@@ -469,16 +469,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="vsShaderGroup">
@@ -615,8 +615,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>864</width>
-            <height>383</height>
+            <width>868</width>
+            <height>387</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -852,16 +852,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="hsShaderGroup">
@@ -998,8 +998,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>864</width>
-            <height>383</height>
+            <width>868</width>
+            <height>387</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1235,16 +1235,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="dsShaderGroup">
@@ -1381,8 +1381,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>864</width>
-            <height>383</height>
+            <width>868</width>
+            <height>387</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1618,16 +1618,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_7">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="gsShaderGroup">
@@ -1764,8 +1764,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>864</width>
-            <height>383</height>
+            <width>868</width>
+            <height>387</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2057,16 +2057,16 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item row="1" column="1">
         <widget class="QGroupBox" name="scissorGroup">
@@ -2604,16 +2604,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="psShaderGroup">
@@ -2750,8 +2750,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>864</width>
-            <height>383</height>
+            <width>868</width>
+            <height>387</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -2987,16 +2987,16 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item row="0" column="0">
         <widget class="QScrollArea" name="omScroll">
@@ -3011,8 +3011,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>864</width>
-            <height>432</height>
+            <width>868</width>
+            <height>436</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_6">
@@ -3612,16 +3612,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="csShaderGroup">
@@ -3848,7 +3848,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>848</width>
+            <width>852</width>
             <height>338</height>
            </rect>
           </property>
diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
index 055b6adb5..7d9ccc730 100644
--- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
@@ -29,10 +29,10 @@
    <item>
     <widget class="QFrame" name="toolbar">
      <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::Panel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="toolbarLayout">
       <property name="spacing">
@@ -48,7 +48,7 @@
        <number>0</number>
       </property>
       <property name="bottomMargin">
-       <number>2</number>
+       <number>0</number>
       </property>
       <item>
        <widget class="QLabel" name="controlsLabel">
@@ -469,16 +469,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="vsShaderGroup">
@@ -615,8 +615,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>869</width>
-            <height>424</height>
+            <width>873</width>
+            <height>428</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_16">
@@ -904,16 +904,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="tcsShaderGroup">
@@ -1050,8 +1050,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>869</width>
-            <height>424</height>
+            <width>873</width>
+            <height>428</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_15">
@@ -1339,16 +1339,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="tesShaderGroup">
@@ -1485,8 +1485,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>869</width>
-            <height>424</height>
+            <width>873</width>
+            <height>428</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -1774,16 +1774,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_7">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="gsShaderGroup">
@@ -1920,7 +1920,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>853</width>
+            <width>857</width>
             <height>454</height>
            </rect>
           </property>
@@ -2308,16 +2308,16 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item row="1" column="0" colspan="2">
         <widget class="QGroupBox" name="MSAAGroup">
@@ -3184,16 +3184,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="fsShaderGroup">
@@ -3330,8 +3330,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>869</width>
-            <height>424</height>
+            <width>873</width>
+            <height>428</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -3619,16 +3619,16 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item row="0" column="0">
         <widget class="QScrollArea" name="fbScroll">
@@ -3643,8 +3643,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>869</width>
-            <height>473</height>
+            <width>873</width>
+            <height>477</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
@@ -4095,16 +4095,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="csShaderGroup">
@@ -4241,8 +4241,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>869</width>
-            <height>424</height>
+            <width>873</width>
+            <height>428</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.ui
index 457dd8595..59bf84763 100644
--- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.ui
@@ -18,16 +18,16 @@
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>3</number>
    </property>
   </layout>
  </widget>
diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
index c80a05e1a..79026fc29 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
@@ -29,10 +29,10 @@
    <item>
     <widget class="QFrame" name="toolbar">
      <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::Panel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="toolbarLayout">
       <property name="spacing">
@@ -48,7 +48,7 @@
        <number>0</number>
       </property>
       <property name="bottomMargin">
-       <number>2</number>
+       <number>0</number>
       </property>
       <item>
        <widget class="QLabel" name="controlsLabel">
@@ -469,16 +469,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="vsShaderGroup">
@@ -615,8 +615,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>907</width>
-            <height>458</height>
+            <width>911</width>
+            <height>462</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -748,16 +748,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="tcsShaderGroup">
@@ -894,8 +894,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>907</width>
-            <height>458</height>
+            <width>911</width>
+            <height>462</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1027,16 +1027,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="tesShaderGroup">
@@ -1173,8 +1173,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>907</width>
-            <height>458</height>
+            <width>911</width>
+            <height>462</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1306,16 +1306,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_7">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="gsShaderGroup">
@@ -1452,8 +1452,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>907</width>
-            <height>458</height>
+            <width>911</width>
+            <height>462</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -1585,16 +1585,16 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item row="0" column="0">
         <widget class="QGroupBox" name="rasterizerGroup">
@@ -2221,16 +2221,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="fsShaderGroup">
@@ -2367,8 +2367,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>907</width>
-            <height>458</height>
+            <width>911</width>
+            <height>462</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_15">
@@ -2500,16 +2500,16 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item row="0" column="0">
         <widget class="QScrollArea" name="fbScroll">
@@ -2524,8 +2524,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>907</width>
-            <height>507</height>
+            <width>911</width>
+            <height>511</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
@@ -3020,16 +3020,16 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_9">
        <property name="leftMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="topMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QGroupBox" name="csShaderGroup">
@@ -3166,8 +3166,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>907</width>
-            <height>458</height>
+            <width>911</width>
+            <height>462</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_16">
diff --git a/qrenderdoc/Windows/PixelHistoryView.ui b/qrenderdoc/Windows/PixelHistoryView.ui
index 6b462fa88..88a60b5f4 100644
--- a/qrenderdoc/Windows/PixelHistoryView.ui
+++ b/qrenderdoc/Windows/PixelHistoryView.ui
@@ -15,16 +15,16 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <item>
     <widget class="QLabel" name="label">
diff --git a/qrenderdoc/Windows/PythonShell.ui b/qrenderdoc/Windows/PythonShell.ui
index e630038fc..d201e42bd 100644
--- a/qrenderdoc/Windows/PythonShell.ui
+++ b/qrenderdoc/Windows/PythonShell.ui
@@ -18,16 +18,16 @@
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index 22969f17e..266870bd7 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -132,7 +132,7 @@ ShaderViewer::ShaderViewer(ICaptureContext &ctx, QWidget *parent)
 
     QHBoxLayout *toolbarlayout = new QHBoxLayout(disasmToolbar);
     toolbarlayout->setSpacing(2);
-    toolbarlayout->setContentsMargins(2, 2, 2, 2);
+    toolbarlayout->setContentsMargins(3, 3, 3, 3);
 
     m_DisassemblyType = new QComboBox(disasmToolbar);
     m_DisassemblyType->setMaxVisibleItems(12);
diff --git a/qrenderdoc/Windows/StatisticsViewer.ui b/qrenderdoc/Windows/StatisticsViewer.ui
index 20f4beefc..70763f300 100644
--- a/qrenderdoc/Windows/StatisticsViewer.ui
+++ b/qrenderdoc/Windows/StatisticsViewer.ui
@@ -15,16 +15,16 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <property name="leftMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <property name="bottomMargin">
-    <number>2</number>
+    <number>3</number>
    </property>
    <item>
     <widget class="QTextEdit" name="statistics">
diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 7defd7cc0..75374cf74 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -576,7 +576,7 @@ TextureViewer::TextureViewer(ICaptureContext &ctx, QWidget *parent)
   QVBoxLayout *vertical = new QVBoxLayout(this);
 
   vertical->setSpacing(3);
-  vertical->setContentsMargins(0, 0, 0, 0);
+  vertical->setContentsMargins(3, 3, 3, 3);
 
   QWidget *flow1widget = new QWidget(this);
   QWidget *flow2widget = new QWidget(this);
diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui
index 0ac2dc22c..c90b1cbcb 100644
--- a/qrenderdoc/Windows/TextureViewer.ui
+++ b/qrenderdoc/Windows/TextureViewer.ui
@@ -13,12 +13,6 @@
   <property name="windowTitle">
    <string>Texture Viewer</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <widget class="ToolWindowManager" name="dockarea" native="true">
    <property name="geometry">
     <rect>
@@ -1266,6 +1260,11 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>RDLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>Widgets/Extended/RDLineEdit.h</header>
+  </customwidget>
   <customwidget>
    <class>ToolWindowManager</class>
    <extends>QWidget</extends>
@@ -1276,11 +1275,6 @@ See FAQ on &quot;Gamma display of linear data&quot;</string>
    <extends>QWidget</extends>
    <header>Widgets/CustomPaintWidget.h</header>
   </customwidget>
-  <customwidget>
-   <class>RDLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>Widgets/Extended/RDLineEdit.h</header>
-  </customwidget>
   <customwidget>
    <class>ThumbnailStrip</class>
    <extends>QWidget</extends>