diff --git a/settings/hyprland.nix b/settings/hyprland.nix
index 11d5c41..cffa2a8 100644
--- a/settings/hyprland.nix
+++ b/settings/hyprland.nix
@@ -298,7 +298,7 @@
 
           modules-left   = [ "hyprland/workspaces" ];
           modules-center = [ "clock" ];
-          modules-right  = [ "pulseaudio" "network" "tray" "custom/power" ];
+          modules-right  = [ "pulseaudio" "tray" "custom/power" ];
 
           "hyprland/workspaces" = {
             format = "{name}";
@@ -311,6 +311,7 @@
             tooltip-format = "<big>{:%A, %d %B %Y}</big>\n<tt><small>{calendar}</small></tt>";
           };
 
+          # Pulseaudio module, now conditionally visible
           pulseaudio = {
             format = "{icon} {volume}%";
             format-muted = "  muted";
@@ -321,19 +322,14 @@
             };
             on-click = "pavucontrol";
             scroll-step = 5;
+            exec-if = "test -f /tmp/waybar-tray-drawer-state"; # Only show if drawer is "open"
           };
 
-          network = {
-            format-wifi = "󰖩  {essid}";
-            format-ethernet = "󰈀";
-            format-disconnected = "󰖪";
-            tooltip-format = "{ifname}";
-            on-click = "nm-connection-editor";
-          };
-
+          # Tray module, now conditionally visible
           tray = {
             icon-size = 16;
             spacing = 8;
+            exec-if = "test -f /tmp/waybar-tray-drawer-state"; # Only show if drawer is "open"
           };
 
           "custom/power" = {
@@ -396,8 +392,7 @@
           }
 
           #pulseaudio,
-          #network,
-          #tray,
+          #tray, # Removed #taskbar as it's not present in this config
           #custom-power {
             padding: 0 10px;
             color: @base05;
@@ -419,6 +414,11 @@
           #tray {
             margin-right: 0;
           }
+
+          #custom-tray-toggle {
+            padding: 0 10px;
+            color: @base05;
+          }
         '';
       };
     };