diff --git a/frontend/data/themes/Dark/close.svg b/frontend/data/themes/Dark/close.svg
index 2a10db825..c0bceaa07 100644
--- a/frontend/data/themes/Dark/close.svg
+++ b/frontend/data/themes/Dark/close.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 4 4 h 1 h 0.03125 c 0.253906 0.011719 0.511719 0.128906 0.6875 0.3125 l 2.28125 2.28125 l 2.3125 -2.28125 c 0.265625 -0.230469 0.445312 -0.304688 0.6875 -0.3125 h 1 v 1 c 0 0.285156 -0.035156 0.550781 -0.25 0.75 l -2.28125 2.28125 l 2.25 2.25 c 0.1875 0.1875 0.28125 0.453125 0.28125 0.71875 v 1 h -1 c -0.265625 0 -0.53125 -0.09375 -0.71875 -0.28125 l -2.28125 -2.28125 l -2.28125 2.28125 c -0.1875 0.1875 -0.453125 0.28125 -0.71875 0.28125 h -1 v -1 c 0 -0.265625 0.09375 -0.53125 0.28125 -0.71875 l 2.28125 -2.25 l -2.28125 -2.28125 c -0.210938 -0.195312 -0.304688 -0.46875 -0.28125 -0.75 z m 0 0" fill="#fefefe"/>
-</svg>
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><style>.a{fill:#fefefe}</style><path class="a" d="m1 1h1.8c0.5 0 0.9 0.2 1.3 0.6l4 4.1 4.1-4.1c0.5-0.5 0.8-0.6 1.2-0.6h1.8v1.8c0 0.5 0 1-0.4 1.4l-4.1 4.2 4 4.1c0.4 0.3 0.5 0.8 0.5 1.3v1.8h-1.8c-0.4 0-0.9-0.1-1.2-0.5l-4.1-4.2-4 4.2c-0.4 0.4-0.8 0.5-1.3 0.5h-1.8v-1.8c0-0.5 0.2-1 0.5-1.3l4.1-4.1-4.1-4.2c-0.4-0.4-0.5-0.9-0.5-1.4z"/></svg>
diff --git a/frontend/data/themes/Light/close.svg b/frontend/data/themes/Light/close.svg
index ad7aecd94..72f0c33b2 100644
--- a/frontend/data/themes/Light/close.svg
+++ b/frontend/data/themes/Light/close.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 4 4 h 1 h 0.03125 c 0.253906 0.011719 0.511719 0.128906 0.6875 0.3125 l 2.28125 2.28125 l 2.3125 -2.28125 c 0.265625 -0.230469 0.445312 -0.304688 0.6875 -0.3125 h 1 v 1 c 0 0.285156 -0.035156 0.550781 -0.25 0.75 l -2.28125 2.28125 l 2.25 2.25 c 0.1875 0.1875 0.28125 0.453125 0.28125 0.71875 v 1 h -1 c -0.265625 0 -0.53125 -0.09375 -0.71875 -0.28125 l -2.28125 -2.28125 l -2.28125 2.28125 c -0.1875 0.1875 -0.453125 0.28125 -0.71875 0.28125 h -1 v -1 c 0 -0.265625 0.09375 -0.53125 0.28125 -0.71875 l 2.28125 -2.25 l -2.28125 -2.28125 c -0.210938 -0.195312 -0.304688 -0.46875 -0.28125 -0.75 z m 0 0" fill="#202020"/>
-</svg>
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><style>.a{fill:#202020}</style><path class="a" d="m1 1h1.8c0.5 0 0.9 0.2 1.3 0.6l4 4.1 4.1-4.1c0.5-0.5 0.8-0.6 1.2-0.6h1.8v1.8c0 0.5 0 1-0.4 1.4l-4.1 4.2 4 4.1c0.4 0.3 0.5 0.8 0.5 1.3v1.8h-1.8c-0.4 0-0.9-0.1-1.2-0.5l-4.1-4.2-4 4.2c-0.4 0.4-0.8 0.5-1.3 0.5h-1.8v-1.8c0-0.5 0.2-1 0.5-1.3l4.1-4.1-4.1-4.2c-0.4-0.4-0.5-0.9-0.5-1.4z"/></svg>
diff --git a/frontend/data/themes/Yami.obt b/frontend/data/themes/Yami.obt
index 0190ac528..6938cbf8f 100644
--- a/frontend/data/themes/Yami.obt
+++ b/frontend/data/themes/Yami.obt
@@ -651,6 +651,10 @@ QDockWidget::float-button {
     border-radius: var(--border_radius);
     background: transparent;
     margin-right: 1px;
+    min-width: var(--icon_base);
+    min-height: var(--icon_base);
+    icon-size: var(--icon_base);
+    padding: var(--padding_base);
 }
 
 QDockWidget::close-button:hover,
@@ -660,6 +664,7 @@ QDockWidget::float-button:hover {
 
 QDockWidget::close-button:pressed,
 QDockWidget::float-button:pressed {
+    background: var(--button_bg_down);
     padding: 1px -1px -1px 1px;
 }
 
diff --git a/frontend/forms/images/close.svg b/frontend/forms/images/close.svg
index ad7aecd94..72f0c33b2 100644
--- a/frontend/forms/images/close.svg
+++ b/frontend/forms/images/close.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 4 4 h 1 h 0.03125 c 0.253906 0.011719 0.511719 0.128906 0.6875 0.3125 l 2.28125 2.28125 l 2.3125 -2.28125 c 0.265625 -0.230469 0.445312 -0.304688 0.6875 -0.3125 h 1 v 1 c 0 0.285156 -0.035156 0.550781 -0.25 0.75 l -2.28125 2.28125 l 2.25 2.25 c 0.1875 0.1875 0.28125 0.453125 0.28125 0.71875 v 1 h -1 c -0.265625 0 -0.53125 -0.09375 -0.71875 -0.28125 l -2.28125 -2.28125 l -2.28125 2.28125 c -0.1875 0.1875 -0.453125 0.28125 -0.71875 0.28125 h -1 v -1 c 0 -0.265625 0.09375 -0.53125 0.28125 -0.71875 l 2.28125 -2.25 l -2.28125 -2.28125 c -0.210938 -0.195312 -0.304688 -0.46875 -0.28125 -0.75 z m 0 0" fill="#202020"/>
-</svg>
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><style>.a{fill:#202020}</style><path class="a" d="m1 1h1.8c0.5 0 0.9 0.2 1.3 0.6l4 4.1 4.1-4.1c0.5-0.5 0.8-0.6 1.2-0.6h1.8v1.8c0 0.5 0 1-0.4 1.4l-4.1 4.2 4 4.1c0.4 0.3 0.5 0.8 0.5 1.3v1.8h-1.8c-0.4 0-0.9-0.1-1.2-0.5l-4.1-4.2-4 4.2c-0.4 0.4-0.8 0.5-1.3 0.5h-1.8v-1.8c0-0.5 0.2-1 0.5-1.3l4.1-4.1-4.1-4.2c-0.4-0.4-0.5-0.9-0.5-1.4z"/></svg>