diff --git a/.changeset/sweet-ravens-refuse.md b/.changeset/sweet-ravens-refuse.md
new file mode 100644
index 0000000000000..52c0ee8214565
--- /dev/null
+++ b/.changeset/sweet-ravens-refuse.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where header toolbox items are missing the proper margin in e2ee setup room header
diff --git a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
index 36bf5701f2152..1d87a4887084e 100644
--- a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
+++ b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
@@ -1,4 +1,6 @@
+import type { Box } from '@rocket.chat/fuselage';
 import { useStableArray } from '@rocket.chat/fuselage-hooks';
+import type { ComponentProps } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
@@ -8,7 +10,11 @@ import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext'
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import { getRoomGroup } from '../../lib/getRoomGroup';
 
-const RoomToolboxE2EESetup = () => {
+type RoomToolboxE2EESetupProps = {
+	className?: ComponentProps<typeof Box>['className'];
+};
+
+const RoomToolboxE2EESetup = ({ className }: RoomToolboxE2EESetupProps) => {
 	const { t } = useTranslation();
 	const toolbox = useRoomToolbox();
 	const room = useRoom();
@@ -29,6 +35,7 @@ const RoomToolboxE2EESetup = () => {
 			{actions.map(({ id, icon, title, action, disabled, tooltip }, index) => (
 				<HeaderToolbarAction
 					key={id}
+					className={className}
 					index={index}
 					id={id}
 					icon={icon}
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
index 4fb37de2e3365..75cc0aca7c800 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
@@ -1,4 +1,6 @@
+import type { Box } from '@rocket.chat/fuselage';
 import { useStableArray } from '@rocket.chat/fuselage-hooks';
+import type { ComponentProps } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
@@ -6,7 +8,11 @@ import { roomActionHooksForE2EESetup } from '../../../../ui';
 import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 
-const RoomToolboxE2EESetup = () => {
+type RoomToolboxE2EESetupProps = {
+	className?: ComponentProps<typeof Box>['className'];
+};
+
+const RoomToolboxE2EESetup = ({ className }: RoomToolboxE2EESetupProps) => {
 	const { t } = useTranslation();
 	const toolbox = useRoomToolbox();
 
@@ -23,6 +29,7 @@ const RoomToolboxE2EESetup = () => {
 			{actions.map(({ id, icon, title, action, disabled, tooltip }, index) => (
 				<HeaderToolbarAction
 					key={id}
+					className={className}
 					index={index}
 					id={id}
 					icon={icon}