diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 1f684b7f..e41b93ec 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -201,28 +201,27 @@ in ''
   windowrulev2 = float,title:(Steam Settings),class:(steam)
 
   # Workspace definitions
-  # 1: [t]erminal
-  bind = SUPER, T, moveworkspacetomonitor, 1 current
-  bind = SUPER, T, workspace, 1
-  bind = SUPER SHIFT, T, movetoworkspace, 1
+  # 1: [a]ny (or def[a]ult)
+  bind = SUPER, A, moveworkspacetomonitor, 1 current
+  bind = SUPER, A, workspace, 1
+  bind = SUPER SHIFT, A, movetoworkspace, 1
 
-  # 2: [d]ev
-  bind = SUPER, D, moveworkspacetomonitor, 2 current
-  bind = SUPER, D, workspace, 2
-  bind = SUPER SHIFT, D, movetoworkspace, 2
-  windowrule = workspace 2 silent,(emacs)
+  # 2: [t]erminal
+  bind = SUPER, T, moveworkspacetomonitor, 2 current
+  bind = SUPER, T, workspace, 2
+  bind = SUPER SHIFT, T, movetoworkspace, 2
 
-  # 3: [b]rowser
-  bind = SUPER, W, moveworkspacetomonitor, 3 current
-  bind = SUPER, W, workspace, 3
-  bind = SUPER SHIFT, W, movetoworkspace, 3
-  windowrule = workspace 3 silent,(firefox)
+  # 3: [d]ev
+  bind = SUPER, D, moveworkspacetomonitor, 3 current
+  bind = SUPER, D, workspace, 3
+  bind = SUPER SHIFT, D, movetoworkspace, 3
+  windowrule = workspace 3 silent,(emacs)
 
-  # 4: [a]genda (or c[a]lendar)
-  bind = SUPER, A, moveworkspacetomonitor, 4 current
-  bind = SUPER, A, workspace, 4
-  bind = SUPER SHIFT, A, movetoworkspace, 4
-  windowrulev2 = workspace 5 silent,class:(Alacritty),title:(khal interactive)
+  # 4: [b]rowser
+  bind = SUPER, W, moveworkspacetomonitor, 4 current
+  bind = SUPER, W, workspace, 4
+  bind = SUPER SHIFT, W, movetoworkspace, 4
+  windowrule = workspace 4 silent,(firefox)
 
   # 5: [f]iles
   bind = SUPER, F, moveworkspacetomonitor, 5 current
diff --git a/home/hyprland/waybar/modules/hyprland_workspaces.nix b/home/hyprland/waybar/modules/hyprland_workspaces.nix
index c5c24cf0..b2e34fc0 100644
--- a/home/hyprland/waybar/modules/hyprland_workspaces.nix
+++ b/home/hyprland/waybar/modules/hyprland_workspaces.nix
@@ -1,10 +1,10 @@
 {
   format = "{icon}";
   format-icons = {
-    "1" = "󰟀"; # [t]erminal
-    "2" = "󰳼"; # [d]ev
-    "3" = "󰖟"; # [b]rowser
-    "4" = "󰃭"; # [a]genda (or c[a]lendar)
+    "1" = "󰛡"; # [a]ny (or def[a]ult)
+    "2" = "󰟀"; # [t]erminal
+    "3" = "󰳼"; # [d]ev
+    "4" = "󰖟"; # [b]rowser
     "5" = "󰝰"; # [f]iles
     "6" = "󰲸"; # [s]potify (or mu[s]ic)
     "7" = "󰭹"; # [c]hat