diff --git a/wlx-overlay-s/src/assets/gui/watch-noset.xml b/wlx-overlay-s/src/assets/gui/watch-noset.xml
index 93e09679..d2faa630 100644
--- a/wlx-overlay-s/src/assets/gui/watch-noset.xml
+++ b/wlx-overlay-s/src/assets/gui/watch-noset.xml
@@ -34,7 +34,7 @@ All overlays are listed on bottom row.
   </template>
 
   <template name="Overlay">
-    <Button macro="button_style" id="overlay_${idx}" sticky="1"
+    <Button macro="button_style" id="overlay_${idx}" 
       tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::SingleSetOverlayToggle ${idx}"
       align_items="center"
       height="40">
@@ -111,13 +111,13 @@ All overlays are listed on bottom row.
 
         <!-- Bottom buttons -->
         <div id="toolbox-condensed" gap="6" width="100%" max_width="400" flex_direction="row" flex_wrap="wrap">
-          <Button id="btn_dashboard" height="40" macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top" sticky="1" >
+          <Button id="btn_dashboard" height="40" macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top" >
             <sprite color="~set_color" width="32" height="32" src="watch/wayvr_dashboard_mono.svg" />
           </Button>
           <Button id="btn_edit_mode" height="40" macro="button_style" _press="::EditToggle" tooltip="WATCH.EDIT_MODE" tooltip_side="top">
             <sprite color="~set_color" width="32" height="32" src="watch/edit.svg" />
           </Button>
-          <Button id="btn_keyboard" height="40" macro="button_style" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd" sticky="1" >
+          <Button id="btn_keyboard" height="40" macro="button_style" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd" >
             <sprite src_builtin="watch/keyboard.svg" width="32" height="32" />
           </Button>
           <!-- Src here may be changed, but maintain `OverlayCategory` order: Panel, Screen, Mirror, WayVR -->
diff --git a/wlx-overlay-s/src/assets/gui/watch.xml b/wlx-overlay-s/src/assets/gui/watch.xml
index df9f075f..36d17f75 100644
--- a/wlx-overlay-s/src/assets/gui/watch.xml
+++ b/wlx-overlay-s/src/assets/gui/watch.xml
@@ -30,7 +30,7 @@
   </template>
 
   <template name="Overlay">
-    <Button macro="button_style" id="overlay_${idx}" sticky="1"
+    <Button macro="button_style" id="overlay_${idx}" 
       tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::EditModeOverlayToggle ${idx}"
       align_items="center"
       height="40">
@@ -120,7 +120,7 @@
           </div>
           <div flex_direction="column" align_items="center" justify_content="center">
             <div id="toolbox" gap="8" width="100%" max_width="400" flex_direction="row" flex_wrap="wrap">
-              <Button id="btn_keyboard" height="40" macro="button_style" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd" sticky="1" >
+              <Button id="btn_keyboard" height="40" macro="button_style" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd" >
                 <sprite src_builtin="watch/keyboard.svg" width="32" height="32" />
                 <label translation="EDIT_MODE.KEYBOARD" size="18" />
               </Button>
@@ -136,7 +136,7 @@
 
         <!-- Bottom buttons -->
         <div flex_direction="row" gap="4">
-          <Button id="btn_dashboard" macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top" sticky="1" >
+          <Button id="btn_dashboard" macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top" >
             <sprite color="~set_color" width="40" height="40" src="watch/wayvr_dashboard_mono.svg" />
           </Button>
           <div id="edit_delete" display="none">