diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 52cf8bbf..ee95d163 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -104,20 +104,23 @@ in ''
 
   # See https://wiki.hyprland.org/Configuring/Keywords/ for more
   bind = SUPER, F1, exec, ${pkgs.gtklock}/bin/gtklock
+  bind = SUPER, Q, killactive,
+  bind = SUPER SHIFT, Q, exec, wlogout
+  bind = SUPER, V, togglefloating
   bind = SUPER, M, fullscreen, 0
-  bind = SUPER, P, exec, pkill rofi || rofi-pass
-  bind = SUPER, X, exec, swaync-client -t
   bind = SUPER SHIFT, M, fullscreen, 1
-  bind = SUPER SHIFT, Q, killactive,
-  bind = SUPER SHIFT, Space, togglefloating
-  bind = SUPER SHIFT, P, exec, wlogout
+  bind = SUPER, P, exec, pkill rofi || rofi-pass
+  bind = SUPER SHIFT, P, exec, pkill rofi || rofi-pass --last-used
+  bind = SUPER, X, exec, swaync-client -t
 
   # Common program shortcuts
   bind = SUPER, E, exec, emacsclient -c
+  bind = SUPER SHIFT, E, exec, [workspace 2 silent] emacsclient -c
   bind = SUPER, Space, exec, pkill anyrun || anyrun
   bind = SUPER, Return, exec, alacritty
+  bind = SUPER SHIFT, Return, exec, [float] alacritty
 
-  bind = SUPER ALT, W, exec, [workspace 2] firefox
+  bind = SUPER ALT, W, exec, [workspace 3] firefox
   bind = SUPER ALT, C, exec, [workspace 6] ferdium
   bind = SUPER ALT, F, exec, [workspace 4] alacritty -e mc
   bind = SUPER ALT, S, exec, [workspace 5] alacritty -e ncspot
@@ -191,16 +194,16 @@ in ''
   bind = SUPER, A, workspace, 1
   bind = SUPER SHIFT, A, movetoworkspace, 1
 
-  # 2: [b]rowser
-  bind = SUPER, W, moveworkspacetomonitor, 2 current
-  bind = SUPER, W, workspace, 2
-  bind = SUPER SHIFT, W, movetoworkspace, 2
-  windowrule = workspace 2,(firefox)
+  # 2: [d]ev
+  bind = SUPER, D, moveworkspacetomonitor, 2 current
+  bind = SUPER, D, workspace, 2
+  bind = SUPER SHIFT, D, movetoworkspace, 2
 
-  # 3: [d]ev
-  bind = SUPER, D, moveworkspacetomonitor, 3 current
-  bind = SUPER, D, workspace, 3
-  bind = SUPER SHIFT, D, movetoworkspace, 3
+  # 3: [b]rowser
+  bind = SUPER, W, moveworkspacetomonitor, 3 current
+  bind = SUPER, W, workspace, 3
+  bind = SUPER SHIFT, W, movetoworkspace, 3
+  windowrule = workspace 3,(firefox)
 
   # 4: [f]iles
   bind = SUPER, F, moveworkspacetomonitor, 4 current
@@ -224,22 +227,17 @@ in ''
   windowrule = workspace 6,(discord)
   windowrule = workspace 6,(Ferdium)
 
-  # 7: [v]ideo
-  bind = SUPER, V, moveworkspacetomonitor, 7 current
-  bind = SUPER, V, workspace, 7
-  bind = SUPER SHIFT, V, movetoworkspace, 7
+  # 7: [r]emote
+  bind = SUPER, R, moveworkspacetomonitor, 7 current
+  bind = SUPER, R, workspace, 7
+  bind = SUPER SHIFT, R, movetoworkspace, 7
+  windowrule = workspace 7,(Nxplayer.bin)
 
-  # 8: [r]emote
-  bind = SUPER, R, moveworkspacetomonitor, 8 current
-  bind = SUPER, R, workspace, 8
-  bind = SUPER SHIFT, R, movetoworkspace, 8
-  windowrule = workspace 8,(Nxplayer.bin)
-
-  # 9: [g]aming
-  bind = SUPER, G, moveworkspacetomonitor, 9 current
-  bind = SUPER, G, workspace, 9
-  bind = SUPER SHIFT, G, movetoworkspace, 9
-  windowrule = workspace 9,(steam)
+  # 8: [g]aming
+  bind = SUPER, G, moveworkspacetomonitor, 8 current
+  bind = SUPER, G, workspace, 8
+  bind = SUPER SHIFT, G, movetoworkspace, 8
+  windowrule = workspace 8,(steam)
 
   # Special workspaces
   bind = SUPER, comma, workspace, m-1
diff --git a/home/hyprland/waybar/modules/hyprland_workspaces.nix b/home/hyprland/waybar/modules/hyprland_workspaces.nix
index 40f9439a..de0f1cee 100644
--- a/home/hyprland/waybar/modules/hyprland_workspaces.nix
+++ b/home/hyprland/waybar/modules/hyprland_workspaces.nix
@@ -2,14 +2,13 @@
   format = "{icon}";
   format-icons = {
     "1" = "󰟀"; # [a]ny
-    "2" = "󰈹"; # [b]rowser
-    "3" = "󰳼"; # [d]ev
+    "2" = "󰳼"; # [d]ev
+    "3" = "󰈹"; # [b]rowser
     "4" = "󰝰"; # [f]iles
     "5" = "󰓇"; # [s]potify (or mu[s]ic)
     "6" = "󰭹"; # [c]hat
-    "7" = "󰍫"; # [v]ideo
-    "8" = "󰢹"; # [r]emote
-    "9" = "󰓓"; # [g]aming
+    "7" = "󰢹"; # [r]emote
+    "8" = "󰓓"; # [g]aming
     default = "󰛡";
     special = "󰓎";
     urgent = "󰣘";