diff --git a/wlx-overlay-s/src/assets/gui/watch-noset.xml b/wlx-overlay-s/src/assets/gui/watch-noset.xml
index 722b077..cb72c69 100644
--- a/wlx-overlay-s/src/assets/gui/watch-noset.xml
+++ b/wlx-overlay-s/src/assets/gui/watch-noset.xml
@@ -54,7 +54,7 @@ All overlays are listed on bottom row.
       padding="32" interactable="0"
       flex_direction="column" gap="8">
       <!-- Top elements (device battery levels) -->
-      <div flex_direction="row" id="devices" interactable="0" gap="8">
+      <div id="devices" interactable="0" gap="6" width="100%" max_width="400" flex_direction="row" flex_wrap="wrap">
         <!-- Src here may be changed, but maintain `TrackedDeviceRole` order: HMD, Left, Right, Tracker -->
         <Device src="watch/hmd.svg" idx="0" />
         <Device src="watch/controller_l.svg" idx="1" />
diff --git a/wlx-overlay-s/src/assets/gui/watch.xml b/wlx-overlay-s/src/assets/gui/watch.xml
index 2e6bd45..960babe 100644
--- a/wlx-overlay-s/src/assets/gui/watch.xml
+++ b/wlx-overlay-s/src/assets/gui/watch.xml
@@ -59,7 +59,7 @@
       padding="32" interactable="0"
       flex_direction="column" gap="8">
       <!-- Top elements (device battery levels) -->
-      <div flex_direction="row" id="devices" interactable="0" gap="8">
+      <div id="devices" interactable="0" gap="6" width="100%" max_width="400" flex_direction="row" flex_wrap="wrap">
         <!-- Src here may be changed, but maintain `TrackedDeviceRole` order: HMD, Left, Right, Tracker -->
         <Device src="watch/hmd.svg" idx="0" />
         <Device src="watch/controller_l.svg" idx="1" />
diff --git a/wlx-overlay-s/src/overlays/watch.rs b/wlx-overlay-s/src/overlays/watch.rs
index c201fe4..df50df7 100644
--- a/wlx-overlay-s/src/overlays/watch.rs
+++ b/wlx-overlay-s/src/overlays/watch.rs
@@ -42,7 +42,7 @@ use crate::{
 
 pub const WATCH_NAME: &str = "watch";
 const MAX_TOOLBOX_BUTTONS: usize = 16;
-const MAX_DEVICES: usize = 9;
+const MAX_DEVICES: usize = 12;
 
 pub const WATCH_POS: Vec3 = vec3(-0.03, -0.01, 0.125);
 pub const WATCH_ROT: Quat = Quat::from_xyzw(-0.707_106_6, 0.000_796_361_8, 0.707_106_6, 0.0);