From c04f3b0c7dda935354f9ee8e6690e87c8a1efd4e Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Thu, 29 Jan 2026 12:22:41 -0300
Subject: [PATCH 1/4] chore: bump fuselage packages

---
 apps/meteor/ee/server/services/package.json   |   2 +-
 apps/meteor/package.json                      |  16 +-
 apps/uikit-playground/package.json            |  10 +-
 ee/apps/account-service/package.json          |   2 +-
 ee/apps/authorization-service/package.json    |   2 +-
 ee/apps/ddp-streamer/package.json             |   2 +-
 ee/apps/omnichannel-transcript/package.json   |   2 +-
 ee/apps/presence-service/package.json         |   2 +-
 ee/apps/queue-worker/package.json             |   2 +-
 ee/packages/federation-matrix/package.json    |   2 +-
 ee/packages/media-calls/package.json          |   2 +-
 ee/packages/omnichannel-services/package.json |   2 +-
 ee/packages/ui-theming/package.json           |   6 +-
 packages/fuselage-ui-kit/package.json         |   6 +-
 packages/gazzodown/package.json               |   6 +-
 packages/livechat/package.json                |   6 +-
 packages/logger/package.json                  |   2 +-
 packages/media-signaling/package.json         |   2 +-
 packages/mock-providers/package.json          |   2 +-
 packages/storybook-config/package.json        |   6 +-
 packages/ui-avatar/package.json               |   6 +-
 packages/ui-client/package.json               |   8 +-
 packages/ui-composer/package.json             |   6 +-
 packages/ui-contexts/package.json             |   6 +-
 packages/ui-video-conf/package.json           |   6 +-
 packages/ui-voip/package.json                 |   6 +-
 packages/web-ui-registration/package.json     |   8 +-
 yarn.lock                                     | 210 +++++++++---------
 28 files changed, 167 insertions(+), 171 deletions(-)

diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 00fab35b7a7fa..25701424dea7b 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -19,7 +19,7 @@
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index e3039593fad59..cb6f14e01c59a 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -96,14 +96,14 @@
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/cron": "workspace:^",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/federation-matrix": "workspace:^",
 		"@rocket.chat/federation-sdk": "0.3.9",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-forms": "~0.1.1",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
-		"@rocket.chat/fuselage-toastbar": "~0.35.1",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-forms": "^1.0.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
+		"@rocket.chat/fuselage-toastbar": "^0.35.2",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/fuselage-ui-kit": "workspace:^",
 		"@rocket.chat/gazzodown": "workspace:^",
@@ -112,11 +112,11 @@
 		"@rocket.chat/icons": "~0.46.0",
 		"@rocket.chat/instance-status": "workspace:^",
 		"@rocket.chat/jwt": "workspace:^",
-		"@rocket.chat/layout": "~0.34.1",
+		"@rocket.chat/layout": "^0.34.2",
 		"@rocket.chat/license": "workspace:^",
 		"@rocket.chat/log-format": "workspace:^",
 		"@rocket.chat/logger": "workspace:^",
-		"@rocket.chat/logo": "~0.32.3",
+		"@rocket.chat/logo": "^0.32.4",
 		"@rocket.chat/media-calls": "workspace:^",
 		"@rocket.chat/media-signaling": "workspace:^",
 		"@rocket.chat/memo": "~0.31.25",
@@ -130,7 +130,7 @@
 		"@rocket.chat/omni-core": "workspace:^",
 		"@rocket.chat/omni-core-ee": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
-		"@rocket.chat/onboarding-ui": "~0.36.1",
+		"@rocket.chat/onboarding-ui": "^0.36.2",
 		"@rocket.chat/password-policies": "workspace:^",
 		"@rocket.chat/patch-injection": "workspace:^",
 		"@rocket.chat/pdf-worker": "workspace:^",
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index a3cb8e27d41be..352b59f7d092b 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -18,13 +18,13 @@
     "@lezer/highlight": "^1.2.3",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/css-in-js": "~0.31.25",
-    "@rocket.chat/fuselage": "^0.70.2",
-    "@rocket.chat/fuselage-hooks": "~0.38.1",
-    "@rocket.chat/fuselage-toastbar": "~0.35.1",
+    "@rocket.chat/fuselage": "^0.71.0",
+    "@rocket.chat/fuselage-hooks": "^0.39.0",
+    "@rocket.chat/fuselage-toastbar": "^0.35.2",
     "@rocket.chat/fuselage-tokens": "~0.33.2",
     "@rocket.chat/fuselage-ui-kit": "workspace:~",
     "@rocket.chat/icons": "~0.46.0",
-    "@rocket.chat/logo": "~0.32.3",
+    "@rocket.chat/logo": "^0.32.4",
     "@rocket.chat/styled": "~0.32.0",
     "@rocket.chat/ui-avatar": "workspace:^",
     "@rocket.chat/ui-contexts": "workspace:~",
@@ -42,7 +42,7 @@
     "reactflow": "^11.11.4"
   },
   "devDependencies": {
-    "@rocket.chat/emitter": "~0.31.25",
+    "@rocket.chat/emitter": "^0.32.0",
     "@rocket.chat/tsconfig": "workspace:*",
     "@types/lodash": "~4.17.23",
     "@types/react": "~18.3.27",
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index bc9a407fedafb..32bc52202546d 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -21,7 +21,7 @@
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index c3d2182449968..4466878fb6bd0 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -22,7 +22,7 @@
 		"@rocket.chat/abac": "workspace:^",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 0a800a3d91cae..fcf9e689a1318 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -21,7 +21,7 @@
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/instance-status": "workspace:^",
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index ebbe3688f5d55..20f691589be62 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -22,7 +22,7 @@
 		"@react-pdf/renderer": "^3.4.5",
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/i18n": "workspace:^",
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index a71fe814e3601..21866fa5a2cfb 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -21,7 +21,7 @@
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 54d11e03729f1..a98040d5c4e6e 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -21,7 +21,7 @@
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
diff --git a/ee/packages/federation-matrix/package.json b/ee/packages/federation-matrix/package.json
index 7e205339a76df..91d695237a180 100644
--- a/ee/packages/federation-matrix/package.json
+++ b/ee/packages/federation-matrix/package.json
@@ -21,7 +21,7 @@
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "^0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/federation-sdk": "0.3.9",
 		"@rocket.chat/http-router": "workspace:^",
 		"@rocket.chat/license": "workspace:^",
diff --git a/ee/packages/media-calls/package.json b/ee/packages/media-calls/package.json
index 8c5e72bc6ecc6..91339bc5b7488 100644
--- a/ee/packages/media-calls/package.json
+++ b/ee/packages/media-calls/package.json
@@ -17,7 +17,7 @@
 	},
 	"dependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/media-signaling": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 0b1187f61da9f..7034385dc272c 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -19,7 +19,7 @@
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/i18n": "workspace:^",
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/message-types": "workspace:~",
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 999880ef583fc..c821cd71bcdbd 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -15,9 +15,9 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/emitter": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/emitter": "^0.32.0",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "~0.46.0",
 		"@rocket.chat/ui-contexts": "workspace:~",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 35e37bdd602e6..20123d24ce4ba 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -45,10 +45,10 @@
 	"devDependencies": {
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "~0.46.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 4921e3401e817..96e05dc36b597 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -30,9 +30,9 @@
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/emitter": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/emitter": "^0.32.0",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "~0.46.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 8c77fe5dcc5e2..421af18d4e009 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -28,7 +28,7 @@
 		"Firefox ESR"
 	],
 	"dependencies": {
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/gazzodown": "workspace:^",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/random": "workspace:~",
@@ -60,9 +60,9 @@
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/ddp-client": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
-		"@rocket.chat/logo": "~0.32.3",
+		"@rocket.chat/logo": "^0.32.4",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@storybook/addon-essentials": "^8.6.15",
 		"@storybook/addon-styling-webpack": "^1.0.1",
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 5bce9f94bdba9..f3badf5003616 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -14,7 +14,7 @@
 		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix"
 	},
 	"dependencies": {
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"pino": "^8.21.0"
 	},
 	"devDependencies": {
diff --git a/packages/media-signaling/package.json b/packages/media-signaling/package.json
index 39541a748504c..a6f3b5ce88fa8 100644
--- a/packages/media-signaling/package.json
+++ b/packages/media-signaling/package.json
@@ -16,7 +16,7 @@
 		"test": "jest"
 	},
 	"dependencies": {
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"ajv": "^8.17.1"
 	},
 	"devDependencies": {
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index 33f24ad86bd08..07650c772379c 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -14,7 +14,7 @@
 		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix"
 	},
 	"dependencies": {
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/i18n": "workspace:~",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@storybook/react": "^8.6.15",
diff --git a/packages/storybook-config/package.json b/packages/storybook-config/package.json
index e08fbc69b70db..7870763257554 100644
--- a/packages/storybook-config/package.json
+++ b/packages/storybook-config/package.json
@@ -19,8 +19,8 @@
 		"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix"
 	},
 	"dependencies": {
-		"@rocket.chat/emitter": "~0.31.25",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/emitter": "^0.32.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@storybook/addon-a11y": "^8.6.15",
 		"@storybook/addon-essentials": "^8.6.15",
@@ -37,7 +37,7 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
-		"@rocket.chat/fuselage": "^0.70.2",
+		"@rocket.chat/fuselage": "^0.71.0",
 		"@rocket.chat/icons": "~0.46.0",
 		"@rocket.chat/tsconfig": "workspace:*",
 		"@storybook/react": "^8.6.15",
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 61ce679d993d0..2344309160988 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -16,9 +16,9 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:~",
-		"@rocket.chat/emitter": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/emitter": "^0.32.0",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "~0.46.0",
 		"@rocket.chat/ui-contexts": "workspace:^",
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index c1a5265afbfa9..33b320621e588 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -18,16 +18,16 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@rocket.chat/onboarding-ui": "~0.36.1",
+		"@rocket.chat/onboarding-ui": "~0.36.2",
 		"dompurify": "~3.2.7"
 	},
 	"devDependencies": {
 		"@react-aria/toolbar": "^3.0.0-nightly.5042",
 		"@rocket.chat/core-typings": "workspace:~",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/emitter": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/emitter": "^0.32.0",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "~0.46.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 9c3f9d8756d1a..187c4600eb2ec 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -21,10 +21,10 @@
 	},
 	"devDependencies": {
 		"@react-aria/toolbar": "^3.0.0-nightly.5042",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "~0.46.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 3c44fce3bf9f8..8a6aabd95edc8 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -21,9 +21,9 @@
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/ddp-client": "workspace:~",
-		"@rocket.chat/emitter": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/emitter": "^0.32.0",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/i18n": "workspace:~",
 		"@rocket.chat/icons": "~0.46.0",
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index d3693a88f3457..6527f8e6a5c42 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -18,13 +18,13 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@rocket.chat/emitter": "~0.31.25"
+		"@rocket.chat/emitter": "^0.32.0"
 	},
 	"devDependencies": {
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/icons": "~0.46.0",
 		"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index ea2c7ea58bd2c..ffd783d1ab62d 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -20,7 +20,7 @@
 	},
 	"dependencies": {
 		"@rocket.chat/desktop-api": "workspace:^",
-		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/media-signaling": "workspace:~",
 		"@tanstack/react-query": "~5.65.1",
 		"react-i18next": "~13.2.2"
@@ -31,8 +31,8 @@
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/fuselage-ui-kit": "workspace:^",
 		"@rocket.chat/icons": "~0.46.0",
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index ce6461b4be4a0..bbdb252c15636 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -22,13 +22,13 @@
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:~",
 		"@rocket.chat/css-in-js": "~0.31.25",
-		"@rocket.chat/emitter": "~0.31.25",
-		"@rocket.chat/fuselage": "^0.70.2",
-		"@rocket.chat/fuselage-hooks": "~0.38.1",
+		"@rocket.chat/emitter": "^0.32.0",
+		"@rocket.chat/fuselage": "^0.71.0",
+		"@rocket.chat/fuselage-hooks": "^0.39.0",
 		"@rocket.chat/fuselage-tokens": "~0.33.2",
 		"@rocket.chat/i18n": "workspace:~",
 		"@rocket.chat/icons": "~0.46.0",
-		"@rocket.chat/layout": "~0.34.1",
+		"@rocket.chat/layout": "^0.34.2",
 		"@rocket.chat/mock-providers": "workspace:~",
 		"@rocket.chat/rest-typings": "workspace:~",
 		"@rocket.chat/tools": "workspace:~",
diff --git a/yarn.lock b/yarn.lock
index 5cf4496547f33..f9e87af2d5928 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7923,7 +7923,7 @@ __metadata:
   dependencies:
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
@@ -8061,7 +8061,7 @@ __metadata:
     "@rocket.chat/abac": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
@@ -8229,7 +8229,7 @@ __metadata:
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:~"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/instance-status": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
@@ -8279,13 +8279,20 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/emitter@npm:^0.31.25, @rocket.chat/emitter@npm:~0.31.25":
+"@rocket.chat/emitter@npm:^0.31.25":
   version: 0.31.25
   resolution: "@rocket.chat/emitter@npm:0.31.25"
   checksum: 10/fee26d0200d60eadb246e4e2b40f99bbfaa6f748d11cb8fbbe350219a178630950b1ecbd6145a5dc93f8ff0298afdaef665f544f82bde7b3d0c687a298b9a1e3
   languageName: node
   linkType: hard
 
+"@rocket.chat/emitter@npm:^0.32.0":
+  version: 0.32.0
+  resolution: "@rocket.chat/emitter@npm:0.32.0"
+  checksum: 10/cf423b52ab01c620e748e089e7645bd2b0b99a921d3c95c7fad1a7ffacbb44a0f2573431c437c9a735d4fb020247356a82eb2f0bba6366e6d55145374811092e
+  languageName: node
+  linkType: hard
+
 "@rocket.chat/eslint-config@workspace:^, @rocket.chat/eslint-config@workspace:packages/eslint-config, @rocket.chat/eslint-config@workspace:~":
   version: 0.0.0-use.local
   resolution: "@rocket.chat/eslint-config@workspace:packages/eslint-config"
@@ -8325,7 +8332,7 @@ __metadata:
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:^"
-    "@rocket.chat/emitter": "npm:^0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/federation-sdk": "npm:0.3.9"
     "@rocket.chat/http-router": "workspace:^"
@@ -8372,46 +8379,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-forms@npm:~0.1.1":
-  version: 0.1.1
-  resolution: "@rocket.chat/fuselage-forms@npm:0.1.1"
+"@rocket.chat/fuselage-forms@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@rocket.chat/fuselage-forms@npm:1.0.0"
   dependencies:
-    "@rocket.chat/emitter": "npm:^0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     react-aria: "npm:~3.37.0"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/fuselage-hooks": ^0.38.1
+    "@rocket.chat/fuselage-hooks": ^0.39.0
     react: "*"
     react-dom: "*"
-  checksum: 10/4baf273825d2008a7eac670202f54245c0ebdbb4737f04cd424ec54ec77062f38f25d5fa9e8ef1dc5926ad149f35a75b47bf24d6ae668332d47b41faeb32cd03
-  languageName: node
-  linkType: hard
-
-"@rocket.chat/fuselage-hooks@npm:^0.38.0":
-  version: 0.38.0
-  resolution: "@rocket.chat/fuselage-hooks@npm:0.38.0"
-  peerDependencies:
-    "@rocket.chat/emitter": "*"
-    "@rocket.chat/fuselage-tokens": "*"
-    react: "*"
-  checksum: 10/675fdc99a87f09f68beaddb3a8fa26abb2638fe681154320c7aea8e971f26b664ff937e92a15f9e0beea8082cc4a38d47092a72f212f8213e11b8b4a1328eb95
+  checksum: 10/6e2ed8ebc37d8ece86222906166c3b766cc1ba83d0b5edca1c52c7cb59141e3379b4984bde990de0551bc9aba3dd61e4ae63028c091427fb2e067a34a5d2f51b
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-hooks@npm:~0.38.1":
-  version: 0.38.1
-  resolution: "@rocket.chat/fuselage-hooks@npm:0.38.1"
+"@rocket.chat/fuselage-hooks@npm:^0.39.0":
+  version: 0.39.0
+  resolution: "@rocket.chat/fuselage-hooks@npm:0.39.0"
   peerDependencies:
     "@rocket.chat/emitter": "*"
     "@rocket.chat/fuselage-tokens": "*"
     react: "*"
-  checksum: 10/f5f8a7214cd6eb56c616f02acffd375a9f8495246c1173b76079ce331284131e98846687e072fe510fd6e07450565a753c2d0043c8ed730f9221d9a81fc62574
+  checksum: 10/33b0ba2fd2316a2b0278d2c10c9363bcd15419ca67d8bf818ab9ccb18e075001d9582dc38ff26da1dedbb631c3c798c48d4fc114d32385f6ef4c387782b1208b
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-toastbar@npm:~0.35.1":
-  version: 0.35.1
-  resolution: "@rocket.chat/fuselage-toastbar@npm:0.35.1"
+"@rocket.chat/fuselage-toastbar@npm:^0.35.2":
+  version: 0.35.2
+  resolution: "@rocket.chat/fuselage-toastbar@npm:0.35.2"
   dependencies:
     react-timing-hooks: "npm:~4.0.2"
   peerDependencies:
@@ -8420,7 +8416,7 @@ __metadata:
     "@rocket.chat/styled": "*"
     react: "*"
     react-dom: "*"
-  checksum: 10/83f762e37da51e6e83282714914423e9118f9e755a644a8f1b2858c268bedd9af81b15462b62af14a5666a49c43ed08bb8f74c0938a2fe0efa17f486e1ffbe6d
+  checksum: 10/bfd28f73ea016ffa87845369ff82fbedc4344b03337fb4d890dde4a16d2b1cd3f88b34ea71f58a47493c3792f6759690f755a54d3a0723aa618396e9bfad2ed0
   languageName: node
   linkType: hard
 
@@ -8437,10 +8433,10 @@ __metadata:
   dependencies:
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/gazzodown": "workspace:^"
     "@rocket.chat/icons": "npm:~0.46.0"
@@ -8501,9 +8497,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:^0.70.2":
-  version: 0.70.2
-  resolution: "@rocket.chat/fuselage@npm:0.70.2"
+"@rocket.chat/fuselage@npm:^0.71.0":
+  version: 0.71.0
+  resolution: "@rocket.chat/fuselage@npm:0.71.0"
   dependencies:
     "@rocket.chat/css-in-js": "npm:^0.31.25"
     "@rocket.chat/css-supports": "npm:^0.31.25"
@@ -8520,7 +8516,7 @@ __metadata:
     react: "*"
     react-dom: "*"
     react-virtuoso: "*"
-  checksum: 10/d05c1f6506fbf92e316226dd3581fa084d1336cafc625d0fd3ee0fe595e007655fb9a7c38c8a25012b91b36f36699074c86f1619dfba3835523d34acc5932c4e
+  checksum: 10/aa3e7ccaf9eaf04dbd1382688cba50fcc2e4077fa4d520cbf3ff948dfc8e015e58fd9b98b9d087dd6a6a3d7095c32a08e080cd64be3f7e9cab7d4d756226013c
   languageName: node
   linkType: hard
 
@@ -8530,9 +8526,9 @@ __metadata:
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
-    "@rocket.chat/emitter": "npm:~0.31.25"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/emitter": "npm:^0.32.0"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:~0.46.0"
     "@rocket.chat/jest-presets": "workspace:~"
@@ -8697,15 +8693,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/layout@npm:~0.34.1":
-  version: 0.34.1
-  resolution: "@rocket.chat/layout@npm:0.34.1"
+"@rocket.chat/layout@npm:^0.34.2":
+  version: 0.34.2
+  resolution: "@rocket.chat/layout@npm:0.34.2"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
     react: "*"
     react-dom: "*"
     react-i18next: "*"
-  checksum: 10/160516513967e502633cf1f58b1409c6d3f628261c86ddd060ab453cbd05e36882a63935caee9e76910a7e88b4ec06713d9e8abc3f6e07e4890a2ef784ff5e74
+  checksum: 10/435ff744a7107cd8da22cfb9fe64d798b825d652c9327c375f076bf737a029601808072cb453e86903e846234ef9643041888b11b652ff02b5a97bc81c073b4d
   languageName: node
   linkType: hard
 
@@ -8740,12 +8736,12 @@ __metadata:
     "@babel/preset-typescript": "npm:~7.27.1"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/gazzodown": "workspace:^"
-    "@rocket.chat/logo": "npm:~0.32.3"
+    "@rocket.chat/logo": "npm:^0.32.4"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/random": "workspace:~"
     "@rocket.chat/ui-contexts": "workspace:^"
@@ -8845,23 +8841,23 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/logger@workspace:packages/logger"
   dependencies:
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     eslint: "npm:~8.45.0"
     pino: "npm:^8.21.0"
     typescript: "npm:~5.9.3"
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/logo@npm:~0.32.3":
-  version: 0.32.3
-  resolution: "@rocket.chat/logo@npm:0.32.3"
+"@rocket.chat/logo@npm:^0.32.4":
+  version: 0.32.4
+  resolution: "@rocket.chat/logo@npm:0.32.4"
   dependencies:
-    "@rocket.chat/fuselage-hooks": "npm:^0.38.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/styled": "npm:^0.32.0"
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: 10/1474dd78fe94c3cb827dac8c2a1ec9428a69b59c790bce0ff0fe95199b1646cf8a4e18f69bd82f2f010da3bdff75269c35df769677a15b79f67247c10334123e
+  checksum: 10/c29108182e7dfa25257bc21f6822cbb31323fdb7bcecfc24befea6986e80164fdc54f1b678aab09de314811b2680da4cae3bbf1178c867b46a8dac87beb53d25
   languageName: node
   linkType: hard
 
@@ -8870,7 +8866,7 @@ __metadata:
   resolution: "@rocket.chat/media-calls@workspace:ee/packages/media-calls"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/media-signaling": "workspace:^"
     "@rocket.chat/models": "workspace:^"
@@ -8886,7 +8882,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/media-signaling@workspace:packages/media-signaling"
   dependencies:
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/tsconfig": "workspace:*"
     "@types/jest": "npm:~30.0.0"
@@ -8991,15 +8987,15 @@ __metadata:
     "@rocket.chat/cron": "workspace:^"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
     "@rocket.chat/desktop-api": "workspace:~"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/favicon": "workspace:^"
     "@rocket.chat/federation-matrix": "workspace:^"
     "@rocket.chat/federation-sdk": "npm:0.3.9"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-forms": "npm:~0.1.1"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
-    "@rocket.chat/fuselage-toastbar": "npm:~0.35.1"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-forms": "npm:^1.0.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
+    "@rocket.chat/fuselage-toastbar": "npm:^0.35.2"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/fuselage-ui-kit": "workspace:^"
     "@rocket.chat/gazzodown": "workspace:^"
@@ -9009,12 +9005,12 @@ __metadata:
     "@rocket.chat/instance-status": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/jwt": "workspace:^"
-    "@rocket.chat/layout": "npm:~0.34.1"
+    "@rocket.chat/layout": "npm:^0.34.2"
     "@rocket.chat/license": "workspace:^"
     "@rocket.chat/livechat": "workspace:^"
     "@rocket.chat/log-format": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
-    "@rocket.chat/logo": "npm:~0.32.3"
+    "@rocket.chat/logo": "npm:^0.32.4"
     "@rocket.chat/media-calls": "workspace:^"
     "@rocket.chat/media-signaling": "workspace:^"
     "@rocket.chat/memo": "npm:~0.31.25"
@@ -9029,7 +9025,7 @@ __metadata:
     "@rocket.chat/omni-core": "workspace:^"
     "@rocket.chat/omni-core-ee": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
-    "@rocket.chat/onboarding-ui": "npm:~0.36.1"
+    "@rocket.chat/onboarding-ui": "npm:^0.36.2"
     "@rocket.chat/password-policies": "workspace:^"
     "@rocket.chat/patch-injection": "workspace:^"
     "@rocket.chat/pdf-worker": "workspace:^"
@@ -9357,7 +9353,7 @@ __metadata:
   dependencies:
     "@faker-js/faker": "npm:~8.0.2"
     "@rocket.chat/ddp-client": "workspace:~"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/mongo-adapter": "workspace:~"
     "@rocket.chat/tools": "workspace:~"
@@ -9505,7 +9501,7 @@ __metadata:
   dependencies:
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/i18n": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
@@ -9543,7 +9539,7 @@ __metadata:
     "@react-pdf/renderer": "npm:^3.4.5"
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/i18n": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
@@ -9581,9 +9577,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/onboarding-ui@npm:~0.36.1":
-  version: 0.36.1
-  resolution: "@rocket.chat/onboarding-ui@npm:0.36.1"
+"@rocket.chat/onboarding-ui@npm:^0.36.2, @rocket.chat/onboarding-ui@npm:~0.36.2":
+  version: 0.36.2
+  resolution: "@rocket.chat/onboarding-ui@npm:0.36.2"
   dependencies:
     i18next: "npm:~23.4.9"
     react-hook-form: "npm:~7.54.2"
@@ -9597,7 +9593,7 @@ __metadata:
     react: "*"
     react-dom: "*"
     react-i18next: "*"
-  checksum: 10/f9b9c1d00c722479b8a61646ca821fb5e3350c23e0ed7307474eec5a533f6fb7981297e59d7a7bad43d88ba951bfc6653cb4871d04f1d9c982522aef9ce85371
+  checksum: 10/2201758c345332158bb1dc0b3627cc15f220c600731348b78bc187f8cc93c232b4efdbaed63603ea554170613ba04e734d3bc616546ad618913a07721e913d0d
   languageName: node
   linkType: hard
 
@@ -9698,7 +9694,7 @@ __metadata:
   dependencies:
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
@@ -9759,7 +9755,7 @@ __metadata:
   dependencies:
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
@@ -9897,10 +9893,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/storybook-config@workspace:packages/storybook-config"
   dependencies:
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:~"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:~0.46.0"
     "@rocket.chat/tsconfig": "workspace:*"
@@ -9996,9 +9992,9 @@ __metadata:
   resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
   dependencies:
     "@rocket.chat/core-typings": "workspace:~"
-    "@rocket.chat/emitter": "npm:~0.31.25"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/emitter": "npm:^0.32.0"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:~0.46.0"
     "@rocket.chat/ui-contexts": "workspace:^"
@@ -10027,15 +10023,15 @@ __metadata:
     "@react-aria/toolbar": "npm:^3.0.0-nightly.5042"
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
-    "@rocket.chat/emitter": "npm:~0.31.25"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/emitter": "npm:^0.32.0"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:~0.46.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/mock-providers": "workspace:^"
     "@rocket.chat/models": "workspace:~"
-    "@rocket.chat/onboarding-ui": "npm:~0.36.1"
+    "@rocket.chat/onboarding-ui": "npm:~0.36.2"
     "@rocket.chat/storybook-config": "workspace:~"
     "@rocket.chat/tsconfig": "workspace:*"
     "@rocket.chat/ui-avatar": "workspace:~"
@@ -10086,10 +10082,10 @@ __metadata:
   resolution: "@rocket.chat/ui-composer@workspace:packages/ui-composer"
   dependencies:
     "@react-aria/toolbar": "npm:^3.0.0-nightly.5042"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:~0.46.0"
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10131,9 +10127,9 @@ __metadata:
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:~"
-    "@rocket.chat/emitter": "npm:~0.31.25"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/emitter": "npm:^0.32.0"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/icons": "npm:~0.46.0"
@@ -10190,9 +10186,9 @@ __metadata:
   resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming"
   dependencies:
     "@rocket.chat/css-in-js": "npm:~0.31.25"
-    "@rocket.chat/emitter": "npm:~0.31.25"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/emitter": "npm:^0.32.0"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:~0.46.0"
     "@rocket.chat/ui-contexts": "workspace:~"
@@ -10223,10 +10219,10 @@ __metadata:
   resolution: "@rocket.chat/ui-video-conf@workspace:packages/ui-video-conf"
   dependencies:
     "@rocket.chat/css-in-js": "npm:~0.31.25"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/icons": "npm:~0.46.0"
     "@rocket.chat/jest-presets": "workspace:~"
@@ -10280,10 +10276,10 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
     "@rocket.chat/desktop-api": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/fuselage-ui-kit": "workspace:^"
     "@rocket.chat/icons": "npm:~0.46.0"
@@ -10355,14 +10351,14 @@ __metadata:
     "@lezer/highlight": "npm:^1.2.3"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
-    "@rocket.chat/emitter": "npm:~0.31.25"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
-    "@rocket.chat/fuselage-toastbar": "npm:~0.35.1"
+    "@rocket.chat/emitter": "npm:^0.32.0"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
+    "@rocket.chat/fuselage-toastbar": "npm:^0.35.2"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/fuselage-ui-kit": "workspace:~"
     "@rocket.chat/icons": "npm:~0.46.0"
-    "@rocket.chat/logo": "npm:~0.32.3"
+    "@rocket.chat/logo": "npm:^0.32.4"
     "@rocket.chat/styled": "npm:~0.32.0"
     "@rocket.chat/tsconfig": "workspace:*"
     "@rocket.chat/ui-avatar": "workspace:^"
@@ -10401,13 +10397,13 @@ __metadata:
   dependencies:
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
-    "@rocket.chat/emitter": "npm:~0.31.25"
-    "@rocket.chat/fuselage": "npm:^0.70.2"
-    "@rocket.chat/fuselage-hooks": "npm:~0.38.1"
+    "@rocket.chat/emitter": "npm:^0.32.0"
+    "@rocket.chat/fuselage": "npm:^0.71.0"
+    "@rocket.chat/fuselage-hooks": "npm:^0.39.0"
     "@rocket.chat/fuselage-tokens": "npm:~0.33.2"
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/icons": "npm:~0.46.0"
-    "@rocket.chat/layout": "npm:~0.34.1"
+    "@rocket.chat/layout": "npm:^0.34.2"
     "@rocket.chat/mock-providers": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:~"
     "@rocket.chat/tools": "workspace:~"
@@ -32292,7 +32288,7 @@ __metadata:
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": "npm:~0.31.25"
+    "@rocket.chat/emitter": "npm:^0.32.0"
     "@rocket.chat/icons": "npm:~0.46.0"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"

From 4bbc27180d66cbd9202bc4ef566bb5195074b0ce Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Thu, 29 Jan 2026 12:56:34 -0300
Subject: [PATCH 2/4] chore: update snapshots

---
 .../ABACUpsellModal.spec.tsx.snap             |   4 +-
 .../CreateDiscussion.spec.tsx.snap            |   4 +-
 .../GenericUpsellModal.spec.tsx.snap          |  20 +--
 .../TimestampPicker.spec.tsx.snap             |   4 +-
 .../AttributesForm.spec.tsx.snap              |   8 +-
 .../DeleteRoomModal.spec.tsx.snap             |   4 +-
 .../UsersInRoleTable.spec.tsx.snap            |   2 +-
 .../EnterE2EPasswordModal.spec.tsx.snap       |   4 +-
 .../AppLogsFilterContextualBar.spec.tsx.snap  |   6 +-
 .../__snapshots__/DateTimeModal.spec.tsx.snap |   4 +-
 .../ExportLogsModal.spec.tsx.snap             |   4 +-
 .../CannedResponseList.spec.tsx.snap          |   6 +-
 .../__snapshots__/MessageStep.spec.tsx.snap   |   8 +-
 .../__snapshots__/RecipientStep.spec.tsx.snap |   4 +-
 .../__snapshots__/RepliesStep.spec.tsx.snap   |   8 +-
 .../__snapshots__/ReviewStep.spec.tsx.snap    |   4 +-
 .../RoomInviteBody.spec.tsx.snap              |  12 +-
 .../__snapshots__/InviteUsers.spec.tsx.snap   |  24 +--
 .../__snapshots__/RoomMembers.spec.tsx.snap   |  24 +--
 .../FileUploadModal.spec.tsx.snap             |   4 +-
 .../MessageComposer.spec.tsx.snap             | 156 +++++++++---------
 .../VideoConfMessage.spec.tsx.snap            |  10 +-
 .../VideoConfPopup.spec.tsx.snap              |   6 +-
 .../CallHistoryContextualbar.spec.tsx.snap    |  26 +--
 .../MediaCallWidget.spec.tsx.snap             |  24 +--
 .../PermissionFlowModal.spec.tsx.snap         |  14 +-
 26 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap b/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap
index 5fb1e343d0358..3d544cb7d96a3 100644
--- a/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap
+++ b/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap
@@ -84,7 +84,7 @@ exports[`ABACUpsellModal should render the modal with correct content 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -94,7 +94,7 @@ exports[`ABACUpsellModal should render the modal with correct content 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
diff --git a/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap b/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap
index acf289d347203..675af5a40d946 100644
--- a/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap
+++ b/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap
@@ -303,7 +303,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -313,7 +313,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="submit"
             >
               <span
diff --git a/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap b/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap
index c30192176c3b2..5344392b04317 100644
--- a/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap
+++ b/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap
@@ -84,7 +84,7 @@ exports[`GenericUpsellModal renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -94,7 +94,7 @@ exports[`GenericUpsellModal renders Default without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
@@ -200,7 +200,7 @@ exports[`GenericUpsellModal renders WithAnnotation without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -210,7 +210,7 @@ exports[`GenericUpsellModal renders WithAnnotation without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
@@ -311,7 +311,7 @@ exports[`GenericUpsellModal renders WithCustomButtons without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -321,7 +321,7 @@ exports[`GenericUpsellModal renders WithCustomButtons without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
@@ -422,7 +422,7 @@ exports[`GenericUpsellModal renders WithCustomTagLine without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -432,7 +432,7 @@ exports[`GenericUpsellModal renders WithCustomTagLine without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
@@ -533,7 +533,7 @@ exports[`GenericUpsellModal renders WithFixedWidthAndHeight without crashing 1`]
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -543,7 +543,7 @@ exports[`GenericUpsellModal renders WithFixedWidthAndHeight without crashing 1`]
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
diff --git a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap
index 2853d75da96ba..70b7c237a1b2f 100644
--- a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap
+++ b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap
@@ -478,7 +478,7 @@ exports[`Story Tests renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -488,7 +488,7 @@ exports[`Story Tests renders Default without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               disabled=""
               type="button"
             >
diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
index e1cd08ce40471..df304a6a2d272 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
@@ -140,7 +140,7 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button"
             type="button"
           >
             <span
@@ -150,7 +150,7 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
             </span>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--primary rcx-button"
             disabled=""
             form=":r0:"
             type="submit"
@@ -360,7 +360,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button"
             type="button"
           >
             <span
@@ -370,7 +370,7 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
             </span>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--primary rcx-button"
             disabled=""
             form=":r3:"
             type="submit"
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap
index ebb41e2b66cfd..86444ff598207 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap
@@ -71,7 +71,7 @@ exports[`DeleteRoomModal should render without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -81,7 +81,7 @@ exports[`DeleteRoomModal should render without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--danger rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--danger rcx-button"
               type="button"
             >
               <span
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/__snapshots__/UsersInRoleTable.spec.tsx.snap b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/__snapshots__/UsersInRoleTable.spec.tsx.snap
index a2cb6444a9291..e1a1e54446fca 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/__snapshots__/UsersInRoleTable.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/__snapshots__/UsersInRoleTable.spec.tsx.snap
@@ -558,7 +558,7 @@ exports[`renders withError without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
diff --git a/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap b/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap
index 2f03c6e9e5468..843a22623e8e6 100644
--- a/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap
+++ b/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap
@@ -121,7 +121,7 @@ exports[`renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
               type="button"
             >
               <span
@@ -131,7 +131,7 @@ exports[`renders Default without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="submit"
             >
               <span
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap
index 6aa7bee928f2d..acb09f873de0c 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap
@@ -24,7 +24,7 @@ exports[`renders AppLogsItem without crashing 1`] = `
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
               <i
                 aria-hidden="true"
@@ -32,12 +32,12 @@ exports[`renders AppLogsItem without crashing 1`] = `
               >
                 
               </i>
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Filters
-              </div>
+              </h5>
               <button
                 aria-label="Close"
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/DateTimeModal.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/DateTimeModal.spec.tsx.snap
index b98ab83cddf0d..5489ed4013760 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/DateTimeModal.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/DateTimeModal.spec.tsx.snap
@@ -172,7 +172,7 @@ exports[`renders AppLogsItem without crashing 1`] = `
               role="group"
             >
               <button
-                class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button"
                 type="button"
               >
                 <span
@@ -182,7 +182,7 @@ exports[`renders AppLogsItem without crashing 1`] = `
                 </span>
               </button>
               <button
-                class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button--primary rcx-button"
                 disabled=""
                 type="button"
               >
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/ExportLogsModal.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/ExportLogsModal.spec.tsx.snap
index e2ad93f963075..2b3c6feb26978 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/ExportLogsModal.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/ExportLogsModal.spec.tsx.snap
@@ -204,7 +204,7 @@ exports[`renders without crashing 1`] = `
               role="group"
             >
               <button
-                class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button"
                 type="button"
               >
                 <span
@@ -214,7 +214,7 @@ exports[`renders without crashing 1`] = `
                 </span>
               </button>
               <button
-                class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button--primary rcx-button"
                 disabled=""
                 type="button"
               >
diff --git a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap
index 3d57cb14def72..8aa5179e1a90b 100644
--- a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap
+++ b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap
@@ -23,14 +23,14 @@ exports[`CannedResponseList Storybook Stories renders Default without crashing 1
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Canned_Responses
-              </div>
+              </h5>
               <button
                 aria-label="Close"
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
diff --git a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/MessageStep.spec.tsx.snap b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/MessageStep.spec.tsx.snap
index c60d28eb8f14d..9de60c26e65a6 100644
--- a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/MessageStep.spec.tsx.snap
+++ b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/MessageStep.spec.tsx.snap
@@ -17,7 +17,7 @@ exports[`MessageStep renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               type="button"
             >
               <span
@@ -27,7 +27,7 @@ exports[`MessageStep renders Default without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="submit"
             >
               <span
@@ -61,7 +61,7 @@ exports[`MessageStep renders WithDefaultValues without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               type="button"
             >
               <span
@@ -71,7 +71,7 @@ exports[`MessageStep renders WithDefaultValues without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="submit"
             >
               <span
diff --git a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/RecipientStep.spec.tsx.snap b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/RecipientStep.spec.tsx.snap
index 8141b4b06a536..12c3af2f774e4 100644
--- a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/RecipientStep.spec.tsx.snap
+++ b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/RecipientStep.spec.tsx.snap
@@ -17,7 +17,7 @@ exports[`RecipientStep renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="submit"
             >
               <span
@@ -51,7 +51,7 @@ exports[`RecipientStep renders WithDefaultValues without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="submit"
             >
               <span
diff --git a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/RepliesStep.spec.tsx.snap b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/RepliesStep.spec.tsx.snap
index e3249db6dbd08..59e7a169cf5b3 100644
--- a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/RepliesStep.spec.tsx.snap
+++ b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/RepliesStep.spec.tsx.snap
@@ -17,7 +17,7 @@ exports[`RepliesStep renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               type="button"
             >
               <span
@@ -27,7 +27,7 @@ exports[`RepliesStep renders Default without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="submit"
             >
               <span
@@ -61,7 +61,7 @@ exports[`RepliesStep renders WithDefaultValues without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               type="button"
             >
               <span
@@ -71,7 +71,7 @@ exports[`RepliesStep renders WithDefaultValues without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="submit"
             >
               <span
diff --git a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/ReviewStep.spec.tsx.snap b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/ReviewStep.spec.tsx.snap
index 7d94b2c310d55..77df65c2d2b6e 100644
--- a/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/ReviewStep.spec.tsx.snap
+++ b/apps/meteor/client/views/omnichannel/components/outboundMessage/components/OutboundMessageWizard/steps/__snapshots__/ReviewStep.spec.tsx.snap
@@ -36,7 +36,7 @@ exports[`ReviewStep renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               type="button"
             >
               <span
@@ -46,7 +46,7 @@ exports[`ReviewStep renders Default without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
diff --git a/apps/meteor/client/views/room/body/__snapshots__/RoomInviteBody.spec.tsx.snap b/apps/meteor/client/views/room/body/__snapshots__/RoomInviteBody.spec.tsx.snap
index 80bed86156878..8e9de74d07856 100644
--- a/apps/meteor/client/views/room/body/__snapshots__/RoomInviteBody.spec.tsx.snap
+++ b/apps/meteor/client/views/room/body/__snapshots__/RoomInviteBody.spec.tsx.snap
@@ -58,7 +58,7 @@ exports[`RoomInvite renders Default without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--secondary-danger rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--secondary-danger rcx-button"
             type="button"
           >
             <span
@@ -68,7 +68,7 @@ exports[`RoomInvite renders Default without crashing 1`] = `
             </span>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button"
             type="button"
           >
             <span
@@ -142,7 +142,7 @@ exports[`RoomInvite renders Loading without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--loading rcx-button--secondary-danger rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--loading rcx-button--secondary-danger rcx-button"
             disabled=""
             type="button"
           >
@@ -159,7 +159,7 @@ exports[`RoomInvite renders Loading without crashing 1`] = `
             </span>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--loading rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--loading rcx-button"
             disabled=""
             type="button"
           >
@@ -240,7 +240,7 @@ exports[`RoomInvite renders WithInfoLink without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--secondary-danger rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--secondary-danger rcx-button"
             type="button"
           >
             <span
@@ -250,7 +250,7 @@ exports[`RoomInvite renders WithInfoLink without crashing 1`] = `
             </span>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button"
             type="button"
           >
             <span
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap
index 19e6873a213b8..6f67d3a27b48a 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap
@@ -23,7 +23,7 @@ exports[`renders Default without crashing 1`] = `
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
               <button
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
@@ -37,12 +37,12 @@ exports[`renders Default without crashing 1`] = `
                   ⦉
                 </i>
               </button>
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Invite users
-              </div>
+              </h5>
               <button
                 aria-label="Close"
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
@@ -221,7 +221,7 @@ exports[`renders InviteEdit without crashing 1`] = `
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
               <button
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
@@ -235,12 +235,12 @@ exports[`renders InviteEdit without crashing 1`] = `
                   ⦉
                 </i>
               </button>
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Invite users
-              </div>
+              </h5>
               <button
                 aria-label="Close"
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
@@ -551,7 +551,7 @@ exports[`renders InviteError without crashing 1`] = `
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
               <button
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
@@ -565,12 +565,12 @@ exports[`renders InviteError without crashing 1`] = `
                   ⦉
                 </i>
               </button>
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Invite users
-              </div>
+              </h5>
               <button
                 aria-label="Close"
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
@@ -732,7 +732,7 @@ exports[`renders InviteLoading without crashing 1`] = `
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
               <button
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
@@ -746,12 +746,12 @@ exports[`renders InviteLoading without crashing 1`] = `
                   ⦉
                 </i>
               </button>
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Invite users
-              </div>
+              </h5>
               <button
                 aria-label="Close"
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap
index 9838f4a365451..5bcec7746337c 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/__snapshots__/RoomMembers.spec.tsx.snap
@@ -23,7 +23,7 @@ exports[`renders Default without crashing 1`] = `
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
               <i
                 aria-hidden="true"
@@ -31,12 +31,12 @@ exports[`renders Default without crashing 1`] = `
               >
                 
               </i>
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Members
-              </div>
+              </h5>
             </div>
           </div>
           <div
@@ -234,7 +234,7 @@ exports[`renders Loading without crashing 1`] = `
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
               <i
                 aria-hidden="true"
@@ -242,12 +242,12 @@ exports[`renders Loading without crashing 1`] = `
               >
                 
               </i>
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Members
-              </div>
+              </h5>
             </div>
           </div>
           <div
@@ -417,7 +417,7 @@ exports[`renders WithABACRoom without crashing 1`] = `
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
               <i
                 aria-hidden="true"
@@ -425,12 +425,12 @@ exports[`renders WithABACRoom without crashing 1`] = `
               >
                 
               </i>
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Members
-              </div>
+              </h5>
             </div>
           </div>
           <div
@@ -628,7 +628,7 @@ exports[`renders WithInvitedMember without crashing 1`] = `
             class="rcx-box rcx-box--full rcx-css-142wtci"
           >
             <div
-              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+              class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
             >
               <i
                 aria-hidden="true"
@@ -636,12 +636,12 @@ exports[`renders WithInvitedMember without crashing 1`] = `
               >
                 
               </i>
-              <div
+              <h5
                 class="rcx-box rcx-box--full rcx-css-1spko5i"
                 id="contextualbarTitle"
               >
                 Members
-              </div>
+              </h5>
             </div>
           </div>
           <div
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/__snapshots__/FileUploadModal.spec.tsx.snap b/apps/meteor/client/views/room/modals/FileUploadModal/__snapshots__/FileUploadModal.spec.tsx.snap
index 920eec6e41461..5dc343ef6191c 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/__snapshots__/FileUploadModal.spec.tsx.snap
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/__snapshots__/FileUploadModal.spec.tsx.snap
@@ -125,7 +125,7 @@ exports[`renders Default without crashing 1`] = `
               role="group"
             >
               <button
-                class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button--secondary rcx-button"
                 type="button"
               >
                 <span
@@ -135,7 +135,7 @@ exports[`renders Default without crashing 1`] = `
                 </span>
               </button>
               <button
-                class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button--primary rcx-button"
                 type="submit"
               >
                 <span
diff --git a/packages/ui-composer/src/MessageComposer/__snapshots__/MessageComposer.spec.tsx.snap b/packages/ui-composer/src/MessageComposer/__snapshots__/MessageComposer.spec.tsx.snap
index 5cfae06dd1a6c..a6b54b51ea279 100644
--- a/packages/ui-composer/src/MessageComposer/__snapshots__/MessageComposer.spec.tsx.snap
+++ b/packages/ui-composer/src/MessageComposer/__snapshots__/MessageComposer.spec.tsx.snap
@@ -21,7 +21,7 @@ exports[`renders Default without crashing 1`] = `
           role="toolbar"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="emoji"
             type="button"
           >
@@ -33,10 +33,10 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <hr
-            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
           />
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="bold"
             type="button"
           >
@@ -48,7 +48,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="italic"
             type="button"
           >
@@ -60,7 +60,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="underline"
             type="button"
           >
@@ -72,7 +72,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="strike"
             type="button"
           >
@@ -84,7 +84,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="code"
             type="button"
           >
@@ -96,7 +96,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="multiline"
             type="button"
           >
@@ -108,7 +108,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="link"
             type="button"
           >
@@ -120,7 +120,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="katex"
             type="button"
           >
@@ -132,10 +132,10 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <hr
-            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
           />
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="mic"
             type="button"
           >
@@ -147,7 +147,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="video"
             type="button"
           >
@@ -159,7 +159,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="attachment"
             type="button"
           >
@@ -171,7 +171,7 @@ exports[`renders Default without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="more"
             type="button"
           >
@@ -226,7 +226,7 @@ exports[`renders Expandable without crashing 1`] = `
           role="toolbar"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="emoji"
             type="button"
           >
@@ -238,10 +238,10 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <hr
-            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
           />
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="bold"
             type="button"
           >
@@ -253,7 +253,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="italic"
             type="button"
           >
@@ -265,7 +265,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="underline"
             type="button"
           >
@@ -277,7 +277,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="strike"
             type="button"
           >
@@ -289,7 +289,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="code"
             type="button"
           >
@@ -301,7 +301,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="multiline"
             type="button"
           >
@@ -313,7 +313,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="link"
             type="button"
           >
@@ -325,7 +325,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="katex"
             type="button"
           >
@@ -337,10 +337,10 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <hr
-            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
           />
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="mic"
             type="button"
           >
@@ -352,7 +352,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="video"
             type="button"
           >
@@ -364,7 +364,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="attachment"
             type="button"
           >
@@ -376,7 +376,7 @@ exports[`renders Expandable without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="more"
             type="button"
           >
@@ -425,7 +425,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
       role="toolbar"
     >
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="emoji"
         type="button"
       >
@@ -437,10 +437,10 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <hr
-        class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+        class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
       />
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="bold"
         type="button"
       >
@@ -452,7 +452,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="italic"
         type="button"
       >
@@ -464,7 +464,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="underline"
         type="button"
       >
@@ -476,7 +476,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="strike"
         type="button"
       >
@@ -488,7 +488,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="code"
         type="button"
       >
@@ -500,7 +500,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="multiline"
         type="button"
       >
@@ -512,7 +512,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="link"
         type="button"
       >
@@ -524,7 +524,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="katex"
         type="button"
       >
@@ -536,10 +536,10 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <hr
-        class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+        class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
       />
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="mic"
         type="button"
       >
@@ -551,7 +551,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="video"
         type="button"
       >
@@ -563,7 +563,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="attachment"
         type="button"
       >
@@ -575,7 +575,7 @@ exports[`renders ToolbarActions without crashing 1`] = `
         </i>
       </button>
       <button
-        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+        class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
         title="more"
         type="button"
       >
@@ -643,7 +643,7 @@ exports[`renders WithHints without crashing 1`] = `
           role="toolbar"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="emoji"
             type="button"
           >
@@ -655,10 +655,10 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <hr
-            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
           />
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="bold"
             type="button"
           >
@@ -670,7 +670,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="italic"
             type="button"
           >
@@ -682,7 +682,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="underline"
             type="button"
           >
@@ -694,7 +694,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="strike"
             type="button"
           >
@@ -706,7 +706,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="code"
             type="button"
           >
@@ -718,7 +718,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="multiline"
             type="button"
           >
@@ -730,7 +730,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="link"
             type="button"
           >
@@ -742,7 +742,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="katex"
             type="button"
           >
@@ -754,10 +754,10 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <hr
-            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
           />
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="mic"
             type="button"
           >
@@ -769,7 +769,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="video"
             type="button"
           >
@@ -781,7 +781,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="attachment"
             type="button"
           >
@@ -793,7 +793,7 @@ exports[`renders WithHints without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="more"
             type="button"
           >
@@ -811,7 +811,7 @@ exports[`renders WithHints without crashing 1`] = `
         >
           <button
             aria-label="Send"
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--icon-secondary-info rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--icon-secondary-info rcx-button--square rcx-button--icon rcx-button"
             type="button"
           >
             <i
@@ -849,7 +849,7 @@ exports[`renders WithSubmit without crashing 1`] = `
           role="toolbar"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="emoji"
             type="button"
           >
@@ -861,10 +861,10 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <hr
-            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
           />
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="bold"
             type="button"
           >
@@ -876,7 +876,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="italic"
             type="button"
           >
@@ -888,7 +888,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="underline"
             type="button"
           >
@@ -900,7 +900,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="strike"
             type="button"
           >
@@ -912,7 +912,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="code"
             type="button"
           >
@@ -924,7 +924,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="multiline"
             type="button"
           >
@@ -936,7 +936,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="link"
             type="button"
           >
@@ -948,7 +948,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="katex"
             type="button"
           >
@@ -960,10 +960,10 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <hr
-            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-button-group__item rcx-css-1ey0eb8"
+            class="rcx-box rcx-box--full rcx-divider--vertical rcx-divider rcx-css-1ey0eb8"
           />
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="mic"
             type="button"
           >
@@ -975,7 +975,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="video"
             type="button"
           >
@@ -987,7 +987,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="attachment"
             type="button"
           >
@@ -999,7 +999,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
             title="more"
             type="button"
           >
@@ -1016,7 +1016,7 @@ exports[`renders WithSubmit without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--small rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small rcx-button"
             type="button"
           >
             <span
@@ -1026,7 +1026,7 @@ exports[`renders WithSubmit without crashing 1`] = `
             </span>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--small rcx-button--primary rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--small rcx-button--primary rcx-button"
             type="button"
           >
             <span
diff --git a/packages/ui-video-conf/src/VideoConfMessage/__snapshots__/VideoConfMessage.spec.tsx.snap b/packages/ui-video-conf/src/VideoConfMessage/__snapshots__/VideoConfMessage.spec.tsx.snap
index aab06a643a986..154c5af04cf9c 100644
--- a/packages/ui-video-conf/src/VideoConfMessage/__snapshots__/VideoConfMessage.spec.tsx.snap
+++ b/packages/ui-video-conf/src/VideoConfMessage/__snapshots__/VideoConfMessage.spec.tsx.snap
@@ -126,7 +126,7 @@ exports[`renders CallEnded without crashing 1`] = `
                 >
                   <button
                     aria-label="info"
-                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
                     type="button"
                   >
                     <i
@@ -296,7 +296,7 @@ exports[`renders CallEndedDM without crashing 1`] = `
                 >
                   <button
                     aria-label="info"
-                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
                     type="button"
                   >
                     <i
@@ -466,7 +466,7 @@ exports[`renders CallOngoing without crashing 1`] = `
                 >
                   <button
                     aria-label="info"
-                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
                     type="button"
                   >
                     <i
@@ -646,7 +646,7 @@ exports[`renders CallingDM without crashing 1`] = `
                 >
                   <button
                     aria-label="info"
-                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
                     type="button"
                   >
                     <i
@@ -937,7 +937,7 @@ exports[`renders NoAvatars without crashing 1`] = `
                 >
                   <button
                     aria-label="info"
-                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
                     type="button"
                   >
                     <i
diff --git a/packages/ui-video-conf/src/VideoConfPopup/__snapshots__/VideoConfPopup.spec.tsx.snap b/packages/ui-video-conf/src/VideoConfPopup/__snapshots__/VideoConfPopup.spec.tsx.snap
index c94eff2c16e70..510b44c1380c5 100644
--- a/packages/ui-video-conf/src/VideoConfPopup/__snapshots__/VideoConfPopup.spec.tsx.snap
+++ b/packages/ui-video-conf/src/VideoConfPopup/__snapshots__/VideoConfPopup.spec.tsx.snap
@@ -82,7 +82,7 @@ exports[`renders StartCall without crashing 1`] = `
               <button
                 aria-label="video"
                 aria-live="assertive"
-                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
                 type="button"
               >
                 <i
@@ -95,7 +95,7 @@ exports[`renders StartCall without crashing 1`] = `
               <button
                 aria-label="mic"
                 aria-live="assertive"
-                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--icon-secondary-info rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--icon-secondary-info rcx-button--square rcx-button--icon rcx-button"
                 type="button"
               >
                 <i
@@ -147,7 +147,7 @@ exports[`renders StartCall without crashing 1`] = `
               role="group"
             >
               <button
-                class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item rcx-css-1qcz93u"
+                class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-css-1qcz93u"
                 type="button"
               >
                 <span
diff --git a/packages/ui-voip/src/views/CallHistoryContextualbar/__snapshots__/CallHistoryContextualbar.spec.tsx.snap b/packages/ui-voip/src/views/CallHistoryContextualbar/__snapshots__/CallHistoryContextualbar.spec.tsx.snap
index 5e972d70323b8..8b255193f5e36 100644
--- a/packages/ui-voip/src/views/CallHistoryContextualbar/__snapshots__/CallHistoryContextualbar.spec.tsx.snap
+++ b/packages/ui-voip/src/views/CallHistoryContextualbar/__snapshots__/CallHistoryContextualbar.spec.tsx.snap
@@ -20,7 +20,7 @@ exports[`renders Default without crashing 1`] = `
           class="rcx-box rcx-box--full rcx-css-142wtci"
         >
           <div
-            class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+            class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
           >
             <i
               aria-hidden="true"
@@ -28,12 +28,12 @@ exports[`renders Default without crashing 1`] = `
             >
               
             </i>
-            <div
+            <h5
               class="rcx-box rcx-box--full rcx-css-1spko5i"
               id="contextualbarTitle"
             >
               Call info
-            </div>
+            </h5>
             <div
               class="rcx-button-group rcx-button-group--align-start"
               role="group"
@@ -42,7 +42,7 @@ exports[`renders Default without crashing 1`] = `
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="Options"
-                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
                 id="react-aria-:r1:"
                 title="Options"
                 type="button"
@@ -56,7 +56,7 @@ exports[`renders Default without crashing 1`] = `
               </button>
               <button
                 aria-label="Close"
-                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item rcx-css-ue04py"
+                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
                 data-qa="ContextualbarActionClose"
                 type="button"
               >
@@ -285,7 +285,7 @@ exports[`renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               type="button"
             >
               <span
@@ -301,7 +301,7 @@ exports[`renders Default without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--success rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--success rcx-button"
               type="button"
             >
               <span
@@ -386,7 +386,7 @@ exports[`renders ExternalContact without crashing 1`] = `
           class="rcx-box rcx-box--full rcx-css-142wtci"
         >
           <div
-            class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1tmbvtv"
+            class="rcx-box rcx-box--full rcx-css-1bdyjik rcx-css-1l4fxfb"
           >
             <i
               aria-hidden="true"
@@ -394,12 +394,12 @@ exports[`renders ExternalContact without crashing 1`] = `
             >
               
             </i>
-            <div
+            <h5
               class="rcx-box rcx-box--full rcx-css-1spko5i"
               id="contextualbarTitle"
             >
               Call info
-            </div>
+            </h5>
             <div
               class="rcx-button-group rcx-button-group--align-start"
               role="group"
@@ -408,7 +408,7 @@ exports[`renders ExternalContact without crashing 1`] = `
                 aria-expanded="false"
                 aria-haspopup="true"
                 aria-label="Options"
-                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button"
                 id="react-aria-:r4:"
                 title="Options"
                 type="button"
@@ -422,7 +422,7 @@ exports[`renders ExternalContact without crashing 1`] = `
               </button>
               <button
                 aria-label="Close"
-                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item rcx-css-ue04py"
+                class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ue04py"
                 data-qa="ContextualbarActionClose"
                 type="button"
               >
@@ -622,7 +622,7 @@ exports[`renders ExternalContact without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--success rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--success rcx-button"
               type="button"
             >
               <span
diff --git a/packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap b/packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap
index 4836017cf412a..6a80b6805e0dc 100644
--- a/packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap
+++ b/packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap
@@ -114,7 +114,7 @@ exports[`renders IncomingCall without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--medium rcx-button--danger rcx-button rcx-button-group__item rcx-css-t3n91h"
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--danger rcx-button rcx-css-t3n91h"
             name="phone"
             type="button"
           >
@@ -131,7 +131,7 @@ exports[`renders IncomingCall without crashing 1`] = `
             </span>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button rcx-button-group__item rcx-css-t3n91h"
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button rcx-css-t3n91h"
             name="phone"
             type="button"
           >
@@ -282,7 +282,7 @@ exports[`renders IncomingCallTransfer without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--medium rcx-button--danger rcx-button rcx-button-group__item rcx-css-t3n91h"
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--danger rcx-button rcx-css-t3n91h"
             name="phone"
             type="button"
           >
@@ -299,7 +299,7 @@ exports[`renders IncomingCallTransfer without crashing 1`] = `
             </span>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button rcx-button-group__item rcx-css-t3n91h"
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button rcx-css-t3n91h"
             name="phone"
             type="button"
           >
@@ -524,7 +524,7 @@ exports[`renders NewCall without crashing 1`] = `
             </i>
           </button>
           <button
-            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button rcx-button-group__item rcx-css-t3n91h"
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--success rcx-button rcx-css-t3n91h"
             type="button"
           >
             <span
@@ -671,7 +671,7 @@ exports[`renders OngoingCall without crashing 1`] = `
         >
           <button
             aria-label="Dialpad"
-            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button"
             label="Dialpad"
             title="Open_dialpad"
             type="button"
@@ -685,7 +685,7 @@ exports[`renders OngoingCall without crashing 1`] = `
           </button>
           <button
             aria-label="Mute"
-            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button"
             label="Mute"
             title="Mute"
             type="button"
@@ -699,7 +699,7 @@ exports[`renders OngoingCall without crashing 1`] = `
           </button>
           <button
             aria-label="Hold"
-            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button"
             label="Hold"
             title="Hold"
             type="button"
@@ -713,7 +713,7 @@ exports[`renders OngoingCall without crashing 1`] = `
           </button>
           <button
             aria-label="Forward"
-            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button"
             label="Forward"
             title="Forward"
             type="button"
@@ -727,7 +727,7 @@ exports[`renders OngoingCall without crashing 1`] = `
           </button>
           <button
             aria-label="Voice_call__user__hangup"
-            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary-danger rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+            class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary-danger rcx-button--square rcx-button--icon rcx-button"
             label="Voice_call__user__hangup"
             title="Voice_call__user__hangup"
             type="button"
@@ -864,7 +864,7 @@ exports[`renders OutgoingCall without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--medium rcx-button--danger rcx-button rcx-button-group__item rcx-css-t3n91h"
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--danger rcx-button rcx-css-t3n91h"
             name="phone"
             type="button"
           >
@@ -1015,7 +1015,7 @@ exports[`renders OutgoingCallTransfer without crashing 1`] = `
           role="group"
         >
           <button
-            class="rcx-box rcx-box--full rcx-button--medium rcx-button--danger rcx-button rcx-button-group__item rcx-css-t3n91h"
+            class="rcx-box rcx-box--full rcx-button--medium rcx-button--danger rcx-button rcx-css-t3n91h"
             name="phone"
             type="button"
           >
diff --git a/packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap b/packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap
index fae1c8a2b5fb5..83f3d40d5ac35 100644
--- a/packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap
+++ b/packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap
@@ -61,7 +61,7 @@ Allow speaker and microphone access in your browser settings to prevent seeing t
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               type="button"
             >
               <span
@@ -139,7 +139,7 @@ Allow speaker and microphone access in your browser settings to prevent seeing t
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               type="button"
             >
               <span
@@ -149,7 +149,7 @@ Allow speaker and microphone access in your browser settings to prevent seeing t
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
@@ -227,7 +227,7 @@ Allow speaker and microphone access in your browser settings to prevent seeing t
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--danger rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--danger rcx-button"
               type="button"
             >
               <span
@@ -243,7 +243,7 @@ Allow speaker and microphone access in your browser settings to prevent seeing t
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--success rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--success rcx-button"
               type="button"
             >
               <span
@@ -327,7 +327,7 @@ Allow speaker and microphone access in your browser settings to prevent seeing t
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               type="button"
             >
               <span
@@ -337,7 +337,7 @@ Allow speaker and microphone access in your browser settings to prevent seeing t
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--success rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--success rcx-button"
               type="button"
             >
               <span

From 552632a5b1cdc55d454396d2d54f9da307d49929 Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Thu, 29 Jan 2026 15:17:10 -0300
Subject: [PATCH 3/4] chore: update snapshots

---
 .../components/Wizard/__snapshots__/Wizard.spec.tsx.snap  | 4 ++--
 .../Wizard/__snapshots__/WizardActions.spec.tsx.snap      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/ui-client/src/components/Wizard/__snapshots__/Wizard.spec.tsx.snap b/packages/ui-client/src/components/Wizard/__snapshots__/Wizard.spec.tsx.snap
index 8a8c5ff408a72..5c0959d9a2c0c 100644
--- a/packages/ui-client/src/components/Wizard/__snapshots__/Wizard.spec.tsx.snap
+++ b/packages/ui-client/src/components/Wizard/__snapshots__/Wizard.spec.tsx.snap
@@ -70,7 +70,7 @@ exports[`renders BasicWizard without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
@@ -157,7 +157,7 @@ exports[`renders OrderedTabsWizard without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
diff --git a/packages/ui-client/src/components/Wizard/__snapshots__/WizardActions.spec.tsx.snap b/packages/ui-client/src/components/Wizard/__snapshots__/WizardActions.spec.tsx.snap
index c1b1be710df80..230b8569cee2b 100644
--- a/packages/ui-client/src/components/Wizard/__snapshots__/WizardActions.spec.tsx.snap
+++ b/packages/ui-client/src/components/Wizard/__snapshots__/WizardActions.spec.tsx.snap
@@ -17,7 +17,7 @@ exports[`renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               disabled=""
               type="button"
             >
@@ -28,7 +28,7 @@ exports[`renders Default without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span
@@ -67,7 +67,7 @@ exports[`renders WithAnnotation without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button"
               disabled=""
               type="button"
             >
@@ -78,7 +78,7 @@ exports[`renders WithAnnotation without crashing 1`] = `
               </span>
             </button>
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               type="button"
             >
               <span

From 111bf4a995afbf9947836c6dc5c60507b04aef6a Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Tue, 3 Feb 2026 11:11:55 -0300
Subject: [PATCH 4/4] chore: update snapshot

---
 .../modals/__snapshots__/ForwardChatModal.spec.tsx.snap         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/client/views/omnichannel/modals/__snapshots__/ForwardChatModal.spec.tsx.snap b/apps/meteor/client/views/omnichannel/modals/__snapshots__/ForwardChatModal.spec.tsx.snap
index f5d91edf70b0a..4b1a4a85a5b29 100644
--- a/apps/meteor/client/views/omnichannel/modals/__snapshots__/ForwardChatModal.spec.tsx.snap
+++ b/apps/meteor/client/views/omnichannel/modals/__snapshots__/ForwardChatModal.spec.tsx.snap
@@ -180,7 +180,7 @@ exports[`renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button--primary rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--primary rcx-button"
               disabled=""
               type="button"
             >