diff --git a/dot_config/sway/executable_config.tmpl b/dot_config/sway/executable_config.tmpl
index 87091f7..da01acc 100644
--- a/dot_config/sway/executable_config.tmpl
+++ b/dot_config/sway/executable_config.tmpl
@@ -370,9 +370,6 @@ exec /usr/bin/lxqt-policykit-agent
 # Clipboard Manager
 exec wl-paste -t text --watch clipman store
 
-# wvkbd - On-screen keyboard for wlroots that sucks less
-exec wvkbd-mobintl --hidden --fn 'DejaVuSansMono Nerd Font 14' -l 'simple,special,emoji,arabic' -L 240
-
 exec swayidle -w \
          timeout 300 'swaylock -f' \
          timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index 8027537..bbd6a80 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -251,11 +251,14 @@
         "return-type": "json"
     },
     "custom/wvkbd": {
+        "tooltip": false,
         "format": "{icon}",
         "format-icons": {
             "default": ""
         },
-        "on-click": "pkill --signal SIGRTMIN wvkbd-mobintl"
+        //"interval": "once",
+        //"exec": "if pgrep wvkbd-mobintl >/dev/null; then echo \"󰌐\"; else echo \"󰌌\"; fi",
+        "on-click": "if pgrep wvkbd-mobintl >/dev/null; then pkill wvkbd-mobintl; else wvkbd-mobintl --fn 'DejaVuSansMono Nerd Font 14' -l 'simple,special,emoji,arabic' -L 240; fi"
     },
     "custom/notification": {
         "tooltip": false,