diff --git a/apps/meteor/client/sidebar/RoomList/useSidebarListNavigation.ts b/apps/meteor/client/sidebar/RoomList/useSidebarListNavigation.ts
index 156d006c0a15f..9a2d7c984f4a8 100644
--- a/apps/meteor/client/sidebar/RoomList/useSidebarListNavigation.ts
+++ b/apps/meteor/client/sidebar/RoomList/useSidebarListNavigation.ts
@@ -2,7 +2,7 @@ import { useFocusManager } from '@react-aria/focus';
 import { useCallback } from 'react';
 
 const isListItem = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-item');
-const isCollapseGroup = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-collapse-group__bar');
+const isCollapseGroup = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-collapse-group__bar-button');
 const isListItemMenu = (node: EventTarget) => (node as HTMLElement).classList.contains('rcx-sidebar-v2-item__menu');
 
 /**
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index d855a7c7960b3..67bd67bec29ed 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -103,13 +103,13 @@
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/cron": "workspace:^",
-		"@rocket.chat/css-in-js": "^0.33.0",
+		"@rocket.chat/css-in-js": "^0.33.1",
 		"@rocket.chat/ddp-client": "workspace:^",
 		"@rocket.chat/emitter": "^0.33.0",
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/federation-matrix": "workspace:^",
 		"@rocket.chat/federation-sdk": "0.7.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-forms": "~1.5.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-toastbar": "~0.36.1",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 580d98322370a..1da93bf78f2cd 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -17,8 +17,8 @@
 		"@hello-pangea/dnd": "^17.0.0",
 		"@lezer/highlight": "^1.2.3",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/css-in-js": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/css-in-js": "^0.33.1",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-toastbar": "~0.36.1",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 80a8a3d8f9b04..80ecb04a8a9ef 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -46,7 +46,7 @@
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 317e146e95465..32015af55b282 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -28,9 +28,9 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/css-in-js": "^0.33.0",
+		"@rocket.chat/css-in-js": "^0.33.1",
 		"@rocket.chat/emitter": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
diff --git a/packages/storybook-config/package.json b/packages/storybook-config/package.json
index c8e66b4a2b1d2..869646f08a631 100644
--- a/packages/storybook-config/package.json
+++ b/packages/storybook-config/package.json
@@ -33,7 +33,7 @@
 		"webpack": "~5.104.1"
 	},
 	"devDependencies": {
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/icons": "^0.48.0",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@storybook/react": "^9.1.20",
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index cbc1adb642f11..6f35dffe0cdde 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -17,7 +17,7 @@
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:~",
 		"@rocket.chat/emitter": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index b123db4c60e1d..9dee7d653d454 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -24,9 +24,9 @@
 	"devDependencies": {
 		"@react-aria/toolbar": "^3.0.0-nightly.5042",
 		"@rocket.chat/core-typings": "workspace:~",
-		"@rocket.chat/css-in-js": "^0.33.0",
+		"@rocket.chat/css-in-js": "^0.33.1",
 		"@rocket.chat/emitter": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 6481a3095ac63..8b328cae61362 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -22,7 +22,7 @@
 	"devDependencies": {
 		"@react-aria/toolbar": "^3.0.0-nightly.5042",
 		"@rocket.chat/emitter": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 8c28fa788aa61..7e1bcefaa16ba 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -23,7 +23,7 @@
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/ddp-client": "workspace:~",
 		"@rocket.chat/emitter": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/i18n": "workspace:~",
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 8ac770e30067c..4ca715623dfec 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -21,8 +21,8 @@
 		"@rocket.chat/emitter": "^0.33.0"
 	},
 	"devDependencies": {
-		"@rocket.chat/css-in-js": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/css-in-js": "^0.33.1",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "^0.48.0",
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index 95c2933034c9d..909ac9fb45517 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -30,8 +30,8 @@
 		"@playwright/test": "~1.52.0",
 		"@react-spectrum/test-utils": "~1.0.0-alpha.8",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/css-in-js": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/css-in-js": "^0.33.1",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/fuselage-ui-kit": "workspace:^",
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 18b8f53ab4ddb..2c2baf03428a9 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -21,9 +21,9 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:~",
-		"@rocket.chat/css-in-js": "^0.33.0",
+		"@rocket.chat/css-in-js": "^0.33.1",
 		"@rocket.chat/emitter": "^0.33.0",
-		"@rocket.chat/fuselage": "^0.83.0",
+		"@rocket.chat/fuselage": "^0.84.0",
 		"@rocket.chat/fuselage-hooks": "~0.43.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/i18n": "workspace:~",
diff --git a/yarn.lock b/yarn.lock
index 8c31e00667477..3a24fe4362d20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8933,6 +8933,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rocket.chat/css-in-js@npm:^0.33.1":
+  version: 0.33.1
+  resolution: "@rocket.chat/css-in-js@npm:0.33.1"
+  dependencies:
+    "@emotion/hash": "npm:^0.9.2"
+    "@rocket.chat/css-supports": "npm:^0.31.25"
+    "@rocket.chat/memo": "npm:^0.31.25"
+    "@rocket.chat/stylis-logical-props-middleware": "npm:^0.31.25"
+    stylis: "npm:~4.4.0"
+  checksum: 10/82a8a4dff1ee4a54456f9e77192b9c31e502bab409b50259583bbe8601e6c97f727527a14856baac55a08d4b103060a5b7d2367eafea29195839623f97332e56
+  languageName: node
+  linkType: hard
+
 "@rocket.chat/css-supports@npm:^0.31.25":
   version: 0.31.25
   resolution: "@rocket.chat/css-supports@npm:0.31.25"
@@ -9180,7 +9193,7 @@ __metadata:
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/gazzodown": "workspace:^"
@@ -9235,18 +9248,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:^0.83.0":
-  version: 0.83.0
-  resolution: "@rocket.chat/fuselage@npm:0.83.0"
+"@rocket.chat/fuselage@npm:^0.84.0":
+  version: 0.84.0
+  resolution: "@rocket.chat/fuselage@npm:0.84.0"
   dependencies:
-    "@rocket.chat/css-in-js": "npm:^0.33.0"
-    "@rocket.chat/css-supports": "npm:^0.31.25"
+    "@rocket.chat/css-in-js": "npm:^0.33.1"
     "@rocket.chat/fuselage-tokens": "npm:^0.33.2"
     "@rocket.chat/memo": "npm:^0.31.25"
     invariant: "npm:^2.2.4"
     react-aria: "npm:~3.37.0"
     react-is: "npm:~19.2.7"
-    react-keyed-flatten-children: "npm:~5.1.2"
+    react-keyed-flatten-children: "npm:~5.1.3"
     react-stately: "npm:~3.35.0"
   peerDependencies:
     "@rocket.chat/fuselage-hooks": "*"
@@ -9254,7 +9266,7 @@ __metadata:
     react: "*"
     react-dom: "*"
     react-virtuoso: "*"
-  checksum: 10/b4224929fb7fd193028ec478eb79db696aef4cd0da54a9b2532e39aadf8d83299c965cac2950dfc2b92634baa1dfef3487c674dc038dca2bbe7f533864b2625d
+  checksum: 10/e40dff48ff1a36fa0898fdb40b93bbbc166050d897637a1bfbe919406963d1d133631e70991e197235789b592031f4d356c9fa1e71fe79f9e3f3f3209c88ef4e
   languageName: node
   linkType: hard
 
@@ -9263,9 +9275,9 @@ __metadata:
   resolution: "@rocket.chat/gazzodown@workspace:packages/gazzodown"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/css-in-js": "npm:^0.33.0"
+    "@rocket.chat/css-in-js": "npm:^0.33.1"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
@@ -9691,14 +9703,14 @@ __metadata:
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/cron": "workspace:^"
-    "@rocket.chat/css-in-js": "npm:^0.33.0"
+    "@rocket.chat/css-in-js": "npm:^0.33.1"
     "@rocket.chat/ddp-client": "workspace:^"
     "@rocket.chat/desktop-api": "workspace:~"
     "@rocket.chat/emitter": "npm:^0.33.0"
     "@rocket.chat/favicon": "workspace:^"
     "@rocket.chat/federation-matrix": "workspace:^"
     "@rocket.chat/federation-sdk": "npm:0.7.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-forms": "npm:~1.5.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-toastbar": "npm:~0.36.1"
@@ -10608,7 +10620,7 @@ __metadata:
   resolution: "@rocket.chat/storybook-config@workspace:packages/storybook-config"
   dependencies:
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
@@ -10703,7 +10715,7 @@ __metadata:
   dependencies:
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
@@ -10728,9 +10740,9 @@ __metadata:
   dependencies:
     "@react-aria/toolbar": "npm:^3.0.0-nightly.5042"
     "@rocket.chat/core-typings": "workspace:~"
-    "@rocket.chat/css-in-js": "npm:^0.33.0"
+    "@rocket.chat/css-in-js": "npm:^0.33.1"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
@@ -10787,7 +10799,7 @@ __metadata:
   dependencies:
     "@react-aria/toolbar": "npm:^3.0.0-nightly.5042"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
@@ -10827,7 +10839,7 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:~"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/i18n": "workspace:~"
@@ -10884,9 +10896,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-video-conf@workspace:packages/ui-video-conf"
   dependencies:
-    "@rocket.chat/css-in-js": "npm:^0.33.0"
+    "@rocket.chat/css-in-js": "npm:^0.33.1"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:^0.48.0"
@@ -10930,10 +10942,10 @@ __metadata:
     "@playwright/test": "npm:~1.52.0"
     "@react-spectrum/test-utils": "npm:~1.0.0-alpha.8"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/css-in-js": "npm:^0.33.0"
+    "@rocket.chat/css-in-js": "npm:^0.33.1"
     "@rocket.chat/desktop-api": "workspace:^"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/fuselage-ui-kit": "workspace:^"
@@ -10997,9 +11009,9 @@ __metadata:
     "@hello-pangea/dnd": "npm:^17.0.0"
     "@lezer/highlight": "npm:^1.2.3"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/css-in-js": "npm:^0.33.0"
+    "@rocket.chat/css-in-js": "npm:^0.33.1"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-toastbar": "npm:~0.36.1"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
@@ -11035,9 +11047,9 @@ __metadata:
   resolution: "@rocket.chat/web-ui-registration@workspace:packages/web-ui-registration"
   dependencies:
     "@rocket.chat/core-typings": "workspace:~"
-    "@rocket.chat/css-in-js": "npm:^0.33.0"
+    "@rocket.chat/css-in-js": "npm:^0.33.1"
     "@rocket.chat/emitter": "npm:^0.33.0"
-    "@rocket.chat/fuselage": "npm:^0.83.0"
+    "@rocket.chat/fuselage": "npm:^0.84.0"
     "@rocket.chat/fuselage-hooks": "npm:~0.43.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/i18n": "workspace:~"
@@ -32477,16 +32489,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-keyed-flatten-children@npm:~5.1.2":
-  version: 5.1.2
-  resolution: "react-keyed-flatten-children@npm:5.1.2"
-  peerDependencies:
-    react: ">=18.0.0"
-    react-is: ">=18.0.0"
-  checksum: 10/b8aa894d87d129fc2cfec5fec490d1f21b8c7800149b7e91c004df7b31ce9e2c24370acc42f970a24a251e892fecbf231ec9da8fd1a5c2b54b27326d9fa5f9c4
-  languageName: node
-  linkType: hard
-
 "react-keyed-flatten-children@npm:~5.1.3":
   version: 5.1.3
   resolution: "react-keyed-flatten-children@npm:5.1.3"
@@ -35297,6 +35299,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stylis@npm:~4.4.0":
+  version: 4.4.0
+  resolution: "stylis@npm:4.4.0"
+  checksum: 10/e5a149b571ea88b801b43deb6f6a9f5a5711b7ce501540ac2be18ca63a4cfb3fab86309c661a2f88491a5b98f27f95ef3eb397d412fba532c50f13964d9a1013
+  languageName: node
+  linkType: hard
+
 "superagent@npm:^10.2.3":
   version: 10.2.3
   resolution: "superagent@npm:10.2.3"