diff --git a/home/windowManager/i3.nix b/home/windowManager/i3.nix
index 80dde8a..6e921ea 100644
--- a/home/windowManager/i3.nix
+++ b/home/windowManager/i3.nix
@@ -155,11 +155,13 @@ in {
       ];
       "3:💬" = [
         { class = "^Pidgin$"; }
-        { class = "^thunderbird$"; }
         { class = "^chat$"; }
-        { class = "^mail$"; }
         { class = "^phone$"; }
       ];
+      "4:✉" = [
+        { class = "^thunderbird$"; }
+        { class = "^mail$"; }
+      ];
       "5:🎵" = [
         # TODO: Assign cmus, but it is opened within terminal
         # i3-dmenu-desktop does not allow to pass the wm class for the terminal, should I wrap the .desktop call or cmus binary?
@@ -244,7 +246,7 @@ in {
       "${modifier}+1" = "workspace 1";
       "${modifier}+2" = "workspace 2:💶";
       "${modifier}+3" = "workspace 3:💬";
-      "${modifier}+4" = "workspace 4";
+      "${modifier}+4" = "workspace 4:✉";
       "${modifier}+5" = "workspace 5:🎵";
       "${modifier}+6" = "workspace 6:T3";
       "${modifier}+7" = "workspace 7";
@@ -256,7 +258,7 @@ in {
       "${modifier}+Shift+1" = "move container to workspace 1";
       "${modifier}+Shift+2" = "move container to workspace 2:💶";
       "${modifier}+Shift+3" = "move container to workspace 3:💬";
-      "${modifier}+Shift+4" = "move container to workspace 4";
+      "${modifier}+Shift+4" = "move container to workspace workspace 4:✉";
       "${modifier}+Shift+5" = "move container to workspace 5:🎵";
       "${modifier}+Shift+6" = "move container to workspace 6:T3";
       "${modifier}+Shift+7" = "move container to workspace 7";