diff --git a/src/docks/encodedock.ui b/src/docks/encodedock.ui
index de8c411ef1..a94aa22835 100644
--- a/src/docks/encodedock.ui
+++ b/src/docks/encodedock.ui
@@ -23,16 +23,16 @@
      <number>0</number>
     </property>
     <property name="leftMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="topMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="rightMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="bottomMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <item>
      <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -799,7 +799,7 @@ with parallel processing enabled.</string>
                        <string>YADIF - temporal + spatial (better)</string>
                       </property>
                      </item>
-                     <item>
+                    <item>
                       <property name="text">
                        <string>BWDIF (best)</string>
                       </property>
diff --git a/src/docks/filtersdock.cpp b/src/docks/filtersdock.cpp
index 72c5a56961..0c5a558256 100644
--- a/src/docks/filtersdock.cpp
+++ b/src/docks/filtersdock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2024 Meltytech, LLC
+ * Copyright (c) 2013-2023 Meltytech, LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
 #include <QQmlContext>
 #include <QAction>
 #include <QIcon>
-#include <QVBoxLayout>
 #include <Logger.h>
 
 #include "actions.h"
@@ -59,13 +58,7 @@ FiltersDock::FiltersDock(MetadataModel *metadataModel, AttachedFiltersModel *att
 #ifndef Q_OS_MAC
     m_qview.setAttribute(Qt::WA_AcceptTouchEvents);
 #endif
-    auto vboxLayout = new QVBoxLayout;
-    vboxLayout->setSpacing(0);
-    vboxLayout->setContentsMargins(1, 1, 1, 1);
-    vboxLayout->addWidget(&m_qview);
-    auto dockContentsWidget = new QWidget;
-    dockContentsWidget->setLayout(vboxLayout);
-    QDockWidget::setWidget(dockContentsWidget);
+    setWidget(&m_qview);
 
     QmlUtilities::setCommonProperties(m_qview.rootContext());
     m_qview.rootContext()->setContextProperty("view", new QmlView(&m_qview));
diff --git a/src/docks/jobsdock.ui b/src/docks/jobsdock.ui
index 2c01400814..ba9ff06776 100644
--- a/src/docks/jobsdock.ui
+++ b/src/docks/jobsdock.ui
@@ -23,16 +23,16 @@
      <number>0</number>
     </property>
     <property name="leftMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="topMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="rightMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="bottomMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <item>
      <widget class="QScrollArea" name="scrollArea">
diff --git a/src/docks/keyframesdock.cpp b/src/docks/keyframesdock.cpp
index c467f2aaae..c9eb61757c 100644
--- a/src/docks/keyframesdock.cpp
+++ b/src/docks/keyframesdock.cpp
@@ -143,7 +143,7 @@ KeyframesDock::KeyframesDock(QmlProducer *qmlProducer, QWidget *parent)
 
     QVBoxLayout *vboxLayout = new QVBoxLayout();
     vboxLayout->setSpacing(0);
-    vboxLayout->setContentsMargins(1, 1, 1, 1);
+    vboxLayout->setContentsMargins(0, 0, 0, 0);
 
     DockToolBar *toolbar = new DockToolBar(tr("Keyframes Controls"));
     QToolButton *menuButton = new QToolButton();
diff --git a/src/docks/playlistdock.ui b/src/docks/playlistdock.ui
index 507f892285..ed8e945e29 100644
--- a/src/docks/playlistdock.ui
+++ b/src/docks/playlistdock.ui
@@ -23,16 +23,16 @@
      <number>0</number>
     </property>
     <property name="leftMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="topMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="rightMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="bottomMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <item>
      <widget class="QStackedWidget" name="stackedWidget">
diff --git a/src/docks/recentdock.ui b/src/docks/recentdock.ui
index 12f4493b8d..bdeba1d278 100644
--- a/src/docks/recentdock.ui
+++ b/src/docks/recentdock.ui
@@ -29,16 +29,16 @@
      <number>0</number>
     </property>
     <property name="leftMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="topMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="rightMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <property name="bottomMargin">
-     <number>1</number>
+     <number>0</number>
     </property>
     <item>
      <widget class="LineEditClear" name="lineEdit">
diff --git a/src/docks/timelinedock.cpp b/src/docks/timelinedock.cpp
index 1181ed1658..81677cdd8b 100644
--- a/src/docks/timelinedock.cpp
+++ b/src/docks/timelinedock.cpp
@@ -160,7 +160,7 @@ TimelineDock::TimelineDock(QWidget *parent) :
 
     QVBoxLayout *vboxLayout = new QVBoxLayout();
     vboxLayout->setSpacing(0);
-    vboxLayout->setContentsMargins(1, 1, 1, 1);
+    vboxLayout->setContentsMargins(0, 0, 0, 0);
 
     DockToolBar *toolbar = new DockToolBar(tr("Timeline Controls"));
     QToolButton *menuButton = new QToolButton();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 014e593e3c..562b00fa9e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -690,17 +690,6 @@ void MainWindow::setupAndConnectDocks()
     tabifyDockWidget(m_keyframesDock, m_timelineDock);
     m_recentDock->raise();
     resetDockCorners();
-
-    for (auto dock : findChildren<QDockWidget *>()) {
-        connect(qApp, &QApplication::focusChanged, dock, [ = ](QWidget * from, QWidget * to) {
-            while (to && to != dock)
-                to = to->parentWidget();
-            if (to == dock)
-                dock->setStyleSheet(QStringLiteral("QDockWidget > QWidget {border: 1px solid rgb(23, 92, 118)}"));
-            else
-                dock->setStyleSheet(QStringLiteral("QDockWidget > QWidget {border: 1px solid rgba(0, 0, 0, 0)}"));
-        });
-    }
 }
 
 void MainWindow::setupMenuFile()
diff --git a/src/widgets/scopes/videozoomscopewidget.cpp b/src/widgets/scopes/videozoomscopewidget.cpp
index b91c239617..75e68191d4 100644
--- a/src/widgets/scopes/videozoomscopewidget.cpp
+++ b/src/widgets/scopes/videozoomscopewidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2024 Meltytech, LLC
+ * Copyright (c) 2019-2023 Meltytech, LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@ VideoZoomScopeWidget::VideoZoomScopeWidget()
     QWidget::setFont(font);
 
     QHBoxLayout *hlayout = new QHBoxLayout(this);
-    hlayout->setContentsMargins(1, 1, 1, 1);
+    hlayout->setContentsMargins(0, 0, 0, 0);
     hlayout->setSpacing(0);
     QGridLayout *glayout = new QGridLayout();
     glayout->setContentsMargins(5, 5, 2, 0);