diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
index 7982c67f753640adea282b5ad8daa248fdb3f887..3d636f220ef23cbc061830497ca46ac28fd2f482 100644
--- a/UI/data/themes/Acri.qss
+++ b/UI/data/themes/Acri.qss
@@ -154,6 +154,11 @@ QListWidget QLineEdit {
 }
 
 /* Dock stuff */
+QDockWidget {
+	titlebar-close-icon: url('./Dark/Close.svg');
+	titlebar-normal-icon: url('./Dark/Popout.svg');
+}
+
 QDockWidget {
 	background: #181819;
 	border: none;
@@ -182,6 +187,7 @@ QDockWidget::float-button {
 	subcontrol-position: top right;
 	subcontrol-origin: padding;
 	right: 0px;
+	margin: 0px;
 }
 
 QDockWidget::float-button {
diff --git a/UI/data/themes/Dark.qss b/UI/data/themes/Dark.qss
index 6420926f1bc656949c72659bc23951e2b005cb09..7feb6a0c4d7a4d7bb3a61efae9f9c373cd27a26a 100644
--- a/UI/data/themes/Dark.qss
+++ b/UI/data/themes/Dark.qss
@@ -119,6 +119,11 @@ SourceTree QLineEdit {
 
 /* Dock Widget */
 
+QDockWidget {
+	titlebar-close-icon: url('./Dark/Close.svg');
+	titlebar-normal-icon: url('./Dark/Popout.svg');
+}
+
 QDockWidget::title {
     text-align: center;
     background-color: rgb(70,69,70);
diff --git a/UI/data/themes/Dark/close.svg b/UI/data/themes/Dark/close.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9b44a5cca381f576319d29e6c8c34626eb1722c0
--- /dev/null
+++ b/UI/data/themes/Dark/close.svg
@@ -0,0 +1 @@
+<svg class="feather feather-plus" fill="none" stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" version="1.1" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg"><line x1="2" x2="28" y1="2" y2="28" /><line x1="2" x2="28" y1="28" y2="2" /></svg>
diff --git a/UI/data/themes/Dark/popout.svg b/UI/data/themes/Dark/popout.svg
new file mode 100644
index 0000000000000000000000000000000000000000..afba03a27dd3035631b043f4a981f54f9428464c
--- /dev/null
+++ b/UI/data/themes/Dark/popout.svg
@@ -0,0 +1 @@
+<svg class="feather feather-plus" fill="none" stroke="#FFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" version="1.1" viewBox="0 0 40 40" xmlns="http://www.w3.org/2000/svg"><rect x="2" y="2" width="24" height="20" /><rect x="2" y="2" width="24" height="4" style="fill:#fff" /><rect x="14" y="18" width="24" height="20" /><rect x="14" y="18" width="24" height="4" style="fill:#fff" /></svg>
diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss
index f77f011f562af5222a78a9960be93645f2dbdf99..253061bf6e330716086e6cf5346e5b3afa1102ab 100644
--- a/UI/data/themes/Rachni.qss
+++ b/UI/data/themes/Rachni.qss
@@ -188,6 +188,11 @@ QListWidget::item:hover:!active {
 /* --- Dock widget --- */
 /***********************/
 
+QDockWidget {
+	titlebar-close-icon: url('./Dark/Close.svg');
+	titlebar-normal-icon: url('./Dark/Popout.svg');
+}
+
 QDockWidget {
 	background: rgb(49, 54, 59); /* Blue-gray */
 	border: 1px solid rgb(58, 64, 69); /* Light Blue-gray */