diff --git a/hypr/config/rules.conf b/hypr/config/rules.conf
index eb97085..0cf0818 100644
--- a/hypr/config/rules.conf
+++ b/hypr/config/rules.conf
@@ -12,20 +12,22 @@ windowrulev2 = nomaxsize, class:.* # You'll probably like this.
 
 windowrule = float, title:rofi
 
-windowrule = workspace special:terminal, kitty
+# windowrule = workspace special:terminal, kitty
 windowrule = workspace special:music, initialClass:Spotify
 windowrulev2 = opacity 0.85 0.8, initialClass:Spotify
 
-windowrulev2 = workspace 1,class:(discord)
+windowrule = workspace 1, thunderbird
 
-windowrulev2 = workspace 1,class:(Caprine)
+windowrulev2 = workspace 2,class:(discord)
+
+windowrulev2 = workspace 2,class:(Caprine)
 windowrule = opacity 0.999, Caprine
 
-windowrule = workspace 2, firefox
+windowrule = workspace 3, firefox
 windowrule = opacity 0.999, firefox
 
-windowrulev2 = workspace 4,float,class:(steam)
-windowrule = workspace 4, class:^(steam_app_*)$
+windowrulev2 = workspace 5,float,class:(steam)
+windowrule = workspace 5, class:^(steam_app_*)$
 
 # Workspaces
 workspace = 1, persistent:true
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 854b743..7d87e02 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -42,10 +42,10 @@
     "format": "{icon}",
     "format-icons": {
       "default": "",
-      "1": "󰭹",
-      "2": "󰈹",
-      "3": "",
-      "4": "",
+      "1": "",
+      "2": "󰭹",
+      "3": "󰈹",
+      "4": "",
     },
     "persistent-workspaces": {
       "*": 4, // 5 workspaces by default on every monitor