diff --git a/eww/eww.scss b/eww/eww.scss
index 0a4190be..1fcaf46b 100644
--- a/eww/eww.scss
+++ b/eww/eww.scss
@@ -7,3 +7,4 @@
 @import "actions/actions.scss";
 @import "powermenu/powermenu.scss";
 @import "dashboard/dashboard.scss";
+@import "traybuttons/traybuttons.scss";
diff --git a/eww/eww.yuck b/eww/eww.yuck
index f404425c..7105c498 100644
--- a/eww/eww.yuck
+++ b/eww/eww.yuck
@@ -4,3 +4,4 @@
 (include "powermenu/powermenu.yuck")
 (include "dashboard/dashboard.yuck")
 (include "closer/closer.yuck")
+(include "traybuttons/traybuttons.yuck")
diff --git a/eww/scripts/close-opened.sh b/eww/scripts/close-opened.sh
index 82481858..2c8df312 100755
--- a/eww/scripts/close-opened.sh
+++ b/eww/scripts/close-opened.sh
@@ -10,8 +10,10 @@ do
 	array[i]=${array[i]%-reveal}
 done
 
-# Print the elements of the array
+# Close every window except permanent ones
 for element in "${array[@]}"
 do
-	$HOME/.config/eww/scripts/close.sh "$element"
+	if [[ "$element" != "tablet-toggle" ]]; then
+		$HOME/.config/eww/scripts/close.sh "$element"
+	fi
 done
diff --git a/eww/variables.yuck b/eww/variables.yuck
index 1cb8c11b..857d70bd 100644
--- a/eww/variables.yuck
+++ b/eww/variables.yuck
@@ -43,4 +43,4 @@
 (defpoll cpu :interval "3s" "~/.config/eww/scripts/cpu.sh")
 (defpoll ram :interval "3s" "~/.config/eww/scripts/ram.sh ram")
 (defpoll temp :interval "3s" "~/.config/eww/scripts/temp.sh get")
-(defpoll disk :interval "3s" "~/.config/eww/scripts/disk.sh")
\ No newline at end of file
+(defpoll disk :interval "3s" "~/.config/eww/scripts/disk.sh")
diff --git a/sway/scripts/tablet/laptop-mode.sh b/sway/scripts/tablet/laptop-mode.sh
index 8b8c6de8..1af9c9ad 100755
--- a/sway/scripts/tablet/laptop-mode.sh
+++ b/sway/scripts/tablet/laptop-mode.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+eww update toggle-state=false
 /usr/bin/setsysmode laptop
 
 gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled false
@@ -8,3 +9,4 @@ brightnessctl -d tpacpi::kbd_backlight s 2
 killall autorotate.sh
 swaymsg output eDP-1 transform 0
 $HOME/.config/lisgd/config
+
diff --git a/sway/scripts/tablet/tablet-mode.sh b/sway/scripts/tablet/tablet-mode.sh
index c407c614..6f1d4118 100755
--- a/sway/scripts/tablet/tablet-mode.sh
+++ b/sway/scripts/tablet/tablet-mode.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+eww update toggle-state=true
 setsysmode tablet
 
 gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
@@ -6,3 +7,4 @@ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
 brightnessctl -d tpacpi::kbd_backlight s 0
 
 $HOME/.config/sway/scripts/tablet/autorotate.sh
+
diff --git a/waybar/config b/waybar/config
index 963a7cfd..c1358650 100644
--- a/waybar/config
+++ b/waybar/config
@@ -95,7 +95,7 @@
     
     "custom/tablet": {
         "format":" 󰦧 ",
-        "on-click": "$HOME/.config/sway/scripts/tablet/tablet-toggle.sh",
+//        "on-click": "$HOME/.config/sway/scripts/tablet/tablet-toggle.sh",
         "restart-interval": 1,
     },