diff --git a/modules/sway/config/config.d/applications.conf b/modules/sway/config/config.d/applications.conf
index 00eecef3..caa62ff5 100644
--- a/modules/sway/config/config.d/applications.conf
+++ b/modules/sway/config/config.d/applications.conf
@@ -1,15 +1,17 @@
 # switch to workspace with urgent window automatically
 for_window [urgent=latest] focus
 
+assign [app_id="Element"] $ws7
+assign [app_id="Signal"] $ws7
+assign [app_id="telegramdesktop"] $ws7
+assign [app_id="rambox"] $ws7
+assign [class="Mattermost"] $ws7
+
 for_window [app_id="keepassxc"] floating disable
 assign [app_id="keepassxc"] $ws8
 
-for_window [app_id="virt-manager"] floating disable
-assign [app_id="virt-manager"] $ws9
-
-assign [instance="element"] $ws4
-assign [app_id="Signal"] $ws4
-assign [app_id="telegramdesktop"] $ws4
+assign [app_id=thunderbird title="^.+$"] $ws9
+for_window [app_id=thunderbird title="^$"] floating enable
 
 # Launcher
 for_window [app_id="launcher" title="Alacritty"] floating enable, border pixel 10, sticky enable