diff --git a/src/resources/themes/v_moonlight/v_moonlight.qss b/src/resources/themes/v_moonlight/v_moonlight.qss
index 0bdbe4e6..a8e797ae 100644
--- a/src/resources/themes/v_moonlight/v_moonlight.qss
+++ b/src/resources/themes/v_moonlight/v_moonlight.qss
@@ -162,11 +162,27 @@ QDockWidget::Title {
 
 QDockWidget::close-button, QDockWidget::float-button {
     border: none;
+    icon-size: $16px;
+    width: $16px;
 }
 
 QDockWidget::close-button:hover, QDockWidget::float-button:hover {
     background: @dockwidget_button_hover_bg;
 }
+
+QDockWidget::close-button {
+    subcontrol-position: top right;
+    subcontrol-origin: margin;
+    position: absolute;
+    top: 0px; right: 0px; bottom: 0px;
+}
+
+QDockWidget::float-button {
+    subcontrol-position: top right;
+    subcontrol-origin: margin;
+    position: absolute;
+    top: 0px; right: $18px; bottom: 0px;
+}
 /* End DockWidget */
 
 /* QPushButton */
diff --git a/src/resources/themes/v_native/v_native.qss b/src/resources/themes/v_native/v_native.qss
index 69f71b9a..6ac088ae 100644
--- a/src/resources/themes/v_native/v_native.qss
+++ b/src/resources/themes/v_native/v_native.qss
@@ -29,11 +29,27 @@ QDockWidget::Title {
 
 QDockWidget::close-button, QDockWidget::float-button {
     border: none;
+    icon-size: $16px;
+    width: $16px;
 }
 
 QDockWidget::close-button:hover, QDockWidget::float-button:hover {
     background: @dockwidget_button_hover_bg;
 }
+
+QDockWidget::close-button {
+    subcontrol-position: top right;
+    subcontrol-origin: margin;
+    position: absolute;
+    top: 0px; right: 0px; bottom: 0px;
+}
+
+QDockWidget::float-button {
+    subcontrol-position: top right;
+    subcontrol-origin: margin;
+    position: absolute;
+    top: 0px; right: $18px; bottom: 0px;
+}
 /* End DockWidget */
 
 /* QPushButton */
diff --git a/src/resources/themes/v_pure/v_pure.qss b/src/resources/themes/v_pure/v_pure.qss
index de0faa2b..3f8df397 100644
--- a/src/resources/themes/v_pure/v_pure.qss
+++ b/src/resources/themes/v_pure/v_pure.qss
@@ -162,11 +162,27 @@ QDockWidget::Title {
 
 QDockWidget::close-button, QDockWidget::float-button {
     border: none;
+    icon-size: $16px;
+    width: $16px;
 }
 
 QDockWidget::close-button:hover, QDockWidget::float-button:hover {
     background: @dockwidget_button_hover_bg;
 }
+
+QDockWidget::close-button {
+    subcontrol-position: top right;
+    subcontrol-origin: margin;
+    position: absolute;
+    top: 0px; right: 0px; bottom: 0px;
+}
+
+QDockWidget::float-button {
+    subcontrol-position: top right;
+    subcontrol-origin: margin;
+    position: absolute;
+    top: 0px; right: $18px; bottom: 0px;
+}
 /* End DockWidget */
 
 /* QPushButton */