diff --git a/ui/components/data-window.slint b/ui/components/data-window.slint
index 62496bb..52ac33d 100644
--- a/ui/components/data-window.slint
+++ b/ui/components/data-window.slint
@@ -54,9 +54,7 @@ export component DataWindow {
     HorizontalLayout {
         padding: 12px;
         Rectangle {
-            area := TouchArea {
-                mouse-cursor: pointer;
-            }
+            area := TouchArea { }
 
             background: Palette.bg-main;
             border-radius: 8px;
@@ -102,7 +100,7 @@ export component DataWindow {
 
             Rectangle {
                 background: transparent;
-                border-color: area.has-hover ? Palette.border-focus : Palette.border;
+                border-color: Palette.border;
                 border-width: 2px;
                 border-radius: 8px;
                 vertical-stretch: 1;
diff --git a/ui/components/map-window.slint b/ui/components/map-window.slint
index f3e396b..1d0c155 100644
--- a/ui/components/map-window.slint
+++ b/ui/components/map-window.slint
@@ -14,9 +14,7 @@ export component MapWindow {
         padding: 12px;
 
         Rectangle {
-            area := TouchArea {
-                mouse-cursor: pointer;
-            }
+            area := TouchArea { }
 
             background: Palette.bg-main;
             border-radius: 8px;
@@ -135,7 +133,7 @@ export component MapWindow {
 
             Rectangle {
                 background: transparent;
-                border-color: area.has-hover ? Palette.border-focus : Palette.border;
+                border-color: Palette.border;
                 border-width: 2px;
                 border-radius: 8px;
                 vertical-stretch: 1;
diff --git a/ui/components/window-header.slint b/ui/components/window-header.slint
index 15a064b..adf9e2b 100644
--- a/ui/components/window-header.slint
+++ b/ui/components/window-header.slint
@@ -31,24 +31,34 @@ export component WindowHeader {
                 }
 
                 HorizontalLayout {
-                    padding: 4px;
+                    padding-right: 4px;
+                    padding-top: 4px;
+                    padding-bottom: 4px;
                     Rectangle {
                         width: 12px;
                         height: 12px;
                         background: Palette.warning;
                         border-radius: self.width / 2;
                         y: (parent.height - self.height) / 2;
+                        TouchArea {
+                            mouse-cursor: pointer;
+                        }
                     }
                 }
 
                 HorizontalLayout {
-                    padding: 4px;
+                    padding-right: 4px;
+                    padding-top: 4px;
+                    padding-bottom: 4px;
                     Rectangle {
                         width: 12px;
                         height: 12px;
                         background: Palette.error;
                         border-radius: self.width / 2;
                         y: (parent.height - self.height) / 2;
+                        TouchArea {
+                            mouse-cursor: pointer;
+                        }
                     }
                 }
             }