diff --git a/lib/component/button/Button.tsx b/lib/component/button/Button.tsx
index 3db8919..5b95a4c 100644
--- a/lib/component/button/Button.tsx
+++ b/lib/component/button/Button.tsx
@@ -19,7 +19,6 @@ const Button = forwardRef<HTMLButtonElement, ButtonProps>(({
 			data-testid="mattrixwv-button"
 			ref={ref}
 			type={type}
-			{...buttonProps}
 			disabled={disabled}
 			className={clsx(
 				className,
@@ -57,6 +56,7 @@ const Button = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"cursor-not-allowed opacity-75": disabled
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/DangerButton.tsx b/lib/component/button/DangerButton.tsx
index e20f9f4..39d13ea 100644
--- a/lib/component/button/DangerButton.tsx
+++ b/lib/component/button/DangerButton.tsx
@@ -14,7 +14,6 @@ const DangerButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-danger-button"
-			{...buttonProps}
 			ref={ref}
 			variant={variant}
 			disabled={disabled}
@@ -42,6 +41,7 @@ const DangerButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-danger hover:text-white active:text-white": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/DarkButton.tsx b/lib/component/button/DarkButton.tsx
index 844c43d..6561550 100644
--- a/lib/component/button/DarkButton.tsx
+++ b/lib/component/button/DarkButton.tsx
@@ -13,7 +13,6 @@ const DarkButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-dark-button"
-			{...buttonProps}
 			ref={ref}
 			variant={variant}
 			disabled={disabled}
@@ -41,6 +40,7 @@ const DarkButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-dark hover:text-white active:text-white": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/InfoButton.tsx b/lib/component/button/InfoButton.tsx
index 282e727..e3a80e1 100644
--- a/lib/component/button/InfoButton.tsx
+++ b/lib/component/button/InfoButton.tsx
@@ -13,7 +13,6 @@ const InfoButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-info-button"
-			{...buttonProps}
 			variant={variant}
 			disabled={disabled}
 			ref={ref}
@@ -41,6 +40,7 @@ const InfoButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-info hover:text-black active:text-black": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/LightButton.tsx b/lib/component/button/LightButton.tsx
index b60c5d4..e6d63f6 100644
--- a/lib/component/button/LightButton.tsx
+++ b/lib/component/button/LightButton.tsx
@@ -13,7 +13,6 @@ const LightButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-light-button"
-			{...buttonProps}
 			ref={ref}
 			variant={variant}
 			disabled={disabled}
@@ -41,6 +40,7 @@ const LightButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-light hover:text-black active:text-black": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/MoltenButton.tsx b/lib/component/button/MoltenButton.tsx
index d4e6942..b3e1fdd 100644
--- a/lib/component/button/MoltenButton.tsx
+++ b/lib/component/button/MoltenButton.tsx
@@ -13,7 +13,6 @@ const MoltenButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-molten-button"
-			{...buttonProps}
 			ref={ref}
 			variant={variant}
 			disabled={disabled}
@@ -41,6 +40,7 @@ const MoltenButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-molten hover:text-black active:text-black": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/PrimaryButton.tsx b/lib/component/button/PrimaryButton.tsx
index ff73cbb..27c59bf 100644
--- a/lib/component/button/PrimaryButton.tsx
+++ b/lib/component/button/PrimaryButton.tsx
@@ -13,7 +13,6 @@ const PrimaryButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-primary-button"
-			{...buttonProps}
 			ref={ref}
 			variant={variant}
 			disabled={disabled}
@@ -41,6 +40,7 @@ const PrimaryButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-primary hover:text-white active:text-white": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/SecondaryButton.tsx b/lib/component/button/SecondaryButton.tsx
index 1446390..781a354 100644
--- a/lib/component/button/SecondaryButton.tsx
+++ b/lib/component/button/SecondaryButton.tsx
@@ -13,7 +13,6 @@ const SecondaryButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-secondary-button"
-			{...buttonProps}
 			ref={ref}
 			variant={variant}
 			disabled={disabled}
@@ -41,6 +40,7 @@ const SecondaryButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-secondary hover:text-white active:text-white": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/SuccessButton.tsx b/lib/component/button/SuccessButton.tsx
index 1c726e6..a2a5863 100644
--- a/lib/component/button/SuccessButton.tsx
+++ b/lib/component/button/SuccessButton.tsx
@@ -13,7 +13,6 @@ const SuccessButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-success-button"
-			{...buttonProps}
 			ref={ref}
 			variant={variant}
 			disabled={disabled}
@@ -41,6 +40,7 @@ const SuccessButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-success hover:text-black active:text-black": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/TertiaryButton.tsx b/lib/component/button/TertiaryButton.tsx
index 51e303c..6118e44 100644
--- a/lib/component/button/TertiaryButton.tsx
+++ b/lib/component/button/TertiaryButton.tsx
@@ -13,7 +13,6 @@ const TertiaryButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-tertiary-button"
-			{...buttonProps}
 			ref={ref}
 			variant={variant}
 			disabled={disabled}
@@ -41,6 +40,7 @@ const TertiaryButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-tertiary hover:text-white active:text-white": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/button/WarningButton.tsx b/lib/component/button/WarningButton.tsx
index 7ec3235..a48d3b9 100644
--- a/lib/component/button/WarningButton.tsx
+++ b/lib/component/button/WarningButton.tsx
@@ -13,7 +13,6 @@ const WarningButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 	return (
 		<Button
 			data-testid="mattrixwv-warning-button"
-			{...buttonProps}
 			ref={ref}
 			variant={variant}
 			disabled={disabled}
@@ -41,6 +40,7 @@ const WarningButton = forwardRef<HTMLButtonElement, ButtonProps>(({
 					"text-warning hover:text-black active:text-black": (variant === "ghost" || variant === "outline-ghost") && (!disabled)
 				}
 			)}
+			{...buttonProps}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/DangerCheckbox.tsx b/lib/component/input/checkbox/DangerCheckbox.tsx
index 1328173..8fbaa03 100644
--- a/lib/component/input/checkbox/DangerCheckbox.tsx
+++ b/lib/component/input/checkbox/DangerCheckbox.tsx
@@ -19,8 +19,8 @@ const DangerCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/DarkCheckbox.tsx b/lib/component/input/checkbox/DarkCheckbox.tsx
index fa6a5f9..3e5ea7d 100644
--- a/lib/component/input/checkbox/DarkCheckbox.tsx
+++ b/lib/component/input/checkbox/DarkCheckbox.tsx
@@ -19,8 +19,8 @@ const DarkCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/InfoCheckbox.tsx b/lib/component/input/checkbox/InfoCheckbox.tsx
index d99e103..b939674 100644
--- a/lib/component/input/checkbox/InfoCheckbox.tsx
+++ b/lib/component/input/checkbox/InfoCheckbox.tsx
@@ -19,8 +19,8 @@ const InfoCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/LightCheckbox.tsx b/lib/component/input/checkbox/LightCheckbox.tsx
index 0652d55..55f9d9d 100644
--- a/lib/component/input/checkbox/LightCheckbox.tsx
+++ b/lib/component/input/checkbox/LightCheckbox.tsx
@@ -19,8 +19,8 @@ const LightCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/MoltenCheckbox.tsx b/lib/component/input/checkbox/MoltenCheckbox.tsx
index 00f0c94..54d8442 100644
--- a/lib/component/input/checkbox/MoltenCheckbox.tsx
+++ b/lib/component/input/checkbox/MoltenCheckbox.tsx
@@ -19,8 +19,8 @@ const MoltenCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/PrimaryCheckbox.tsx b/lib/component/input/checkbox/PrimaryCheckbox.tsx
index 1c954ef..b08170e 100644
--- a/lib/component/input/checkbox/PrimaryCheckbox.tsx
+++ b/lib/component/input/checkbox/PrimaryCheckbox.tsx
@@ -19,8 +19,8 @@ const PrimaryCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/SecondaryCheckbox.tsx b/lib/component/input/checkbox/SecondaryCheckbox.tsx
index b08308c..a408685 100644
--- a/lib/component/input/checkbox/SecondaryCheckbox.tsx
+++ b/lib/component/input/checkbox/SecondaryCheckbox.tsx
@@ -19,8 +19,8 @@ const SecondaryCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/SuccessCheckbox.tsx b/lib/component/input/checkbox/SuccessCheckbox.tsx
index 8d409e4..3a8d854 100644
--- a/lib/component/input/checkbox/SuccessCheckbox.tsx
+++ b/lib/component/input/checkbox/SuccessCheckbox.tsx
@@ -19,8 +19,8 @@ const SuccessCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/TertiaryCheckbox.tsx b/lib/component/input/checkbox/TertiaryCheckbox.tsx
index 481e8d8..391e27a 100644
--- a/lib/component/input/checkbox/TertiaryCheckbox.tsx
+++ b/lib/component/input/checkbox/TertiaryCheckbox.tsx
@@ -19,8 +19,8 @@ const TertiaryCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/checkbox/WarningCheckbox.tsx b/lib/component/input/checkbox/WarningCheckbox.tsx
index ad3bac1..89071b2 100644
--- a/lib/component/input/checkbox/WarningCheckbox.tsx
+++ b/lib/component/input/checkbox/WarningCheckbox.tsx
@@ -19,8 +19,8 @@ const WarningCheckbox = forwardRef<HTMLInputElement, CheckboxProps>(({
 				}
 			)}
 			showBox={showBox}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/radio/DarkRadioButton.tsx b/lib/component/input/radio/DarkRadioButton.tsx
index e0d9bc1..0e436d5 100644
--- a/lib/component/input/radio/DarkRadioButton.tsx
+++ b/lib/component/input/radio/DarkRadioButton.tsx
@@ -14,8 +14,8 @@ const DarkRadioButton = forwardRef<HTMLInputElement, RadioButtonProps>(({
 				"group-data-checked:bg-dark",
 				className
 			)}
-			{...props}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/DangerSwitch.tsx b/lib/component/input/switch/DangerSwitch.tsx
index f06dc92..a20caf3 100644
--- a/lib/component/input/switch/DangerSwitch.tsx
+++ b/lib/component/input/switch/DangerSwitch.tsx
@@ -12,7 +12,6 @@ const DangerSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-neutral-mid",
 				className,
@@ -30,6 +29,7 @@ const DangerSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/DarkSwitch.tsx b/lib/component/input/switch/DarkSwitch.tsx
index 10281f3..953b9a4 100644
--- a/lib/component/input/switch/DarkSwitch.tsx
+++ b/lib/component/input/switch/DarkSwitch.tsx
@@ -12,7 +12,6 @@ const DarkSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-neutral-mid",
 				className,
@@ -30,6 +29,7 @@ const DarkSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/InfoSwitch.tsx b/lib/component/input/switch/InfoSwitch.tsx
index 2a8a278..7b423bb 100644
--- a/lib/component/input/switch/InfoSwitch.tsx
+++ b/lib/component/input/switch/InfoSwitch.tsx
@@ -12,7 +12,6 @@ const InfoSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-gray-400",
 				className,
@@ -30,6 +29,7 @@ const InfoSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/LightSwitch.tsx b/lib/component/input/switch/LightSwitch.tsx
index 10accfa..5452b9a 100644
--- a/lib/component/input/switch/LightSwitch.tsx
+++ b/lib/component/input/switch/LightSwitch.tsx
@@ -12,7 +12,6 @@ const LightSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-neutral-mid",
 				className,
@@ -30,6 +29,7 @@ const LightSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/MoltenSwitch.tsx b/lib/component/input/switch/MoltenSwitch.tsx
index 4a2c177..24b984e 100644
--- a/lib/component/input/switch/MoltenSwitch.tsx
+++ b/lib/component/input/switch/MoltenSwitch.tsx
@@ -12,7 +12,6 @@ const MoltenSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-neutral-mid",
 				className,
@@ -30,6 +29,7 @@ const MoltenSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/PrimarySwitch.tsx b/lib/component/input/switch/PrimarySwitch.tsx
index fdd48ea..dce5ce8 100644
--- a/lib/component/input/switch/PrimarySwitch.tsx
+++ b/lib/component/input/switch/PrimarySwitch.tsx
@@ -12,7 +12,6 @@ const PrimarySwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-neutral-mid",
 				className,
@@ -30,6 +29,7 @@ const PrimarySwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/SecondarySwitch.tsx b/lib/component/input/switch/SecondarySwitch.tsx
index 5d6eb7f..8863e1c 100644
--- a/lib/component/input/switch/SecondarySwitch.tsx
+++ b/lib/component/input/switch/SecondarySwitch.tsx
@@ -12,7 +12,6 @@ const SecondarySwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-neutral-mid",
 				className,
@@ -30,6 +29,7 @@ const SecondarySwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/SuccessDangerSwitch.tsx b/lib/component/input/switch/SuccessDangerSwitch.tsx
index 9475e30..60996cb 100644
--- a/lib/component/input/switch/SuccessDangerSwitch.tsx
+++ b/lib/component/input/switch/SuccessDangerSwitch.tsx
@@ -12,7 +12,6 @@ const SuccessDangerSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				className,
 				{
@@ -29,6 +28,7 @@ const SuccessDangerSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/SuccessSwitch.tsx b/lib/component/input/switch/SuccessSwitch.tsx
index 1f3f1f4..b6f0d7c 100644
--- a/lib/component/input/switch/SuccessSwitch.tsx
+++ b/lib/component/input/switch/SuccessSwitch.tsx
@@ -12,7 +12,6 @@ const SuccessSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-neutral-mid",
 				className,
@@ -30,6 +29,7 @@ const SuccessSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/TertiarySwitch.tsx b/lib/component/input/switch/TertiarySwitch.tsx
index ed3068d..f16227c 100644
--- a/lib/component/input/switch/TertiarySwitch.tsx
+++ b/lib/component/input/switch/TertiarySwitch.tsx
@@ -12,7 +12,6 @@ const TertiarySwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-gray-400",
 				className,
@@ -30,6 +29,7 @@ const TertiarySwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/input/switch/WarningSwitch.tsx b/lib/component/input/switch/WarningSwitch.tsx
index 8b5452b..d71c80b 100644
--- a/lib/component/input/switch/WarningSwitch.tsx
+++ b/lib/component/input/switch/WarningSwitch.tsx
@@ -12,7 +12,6 @@ const WarningSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 }, ref ) => {
 	return (
 		<MattrixwvSwitch
-			{...props}
 			className={clsx(
 				"bg-neutral-mid",
 				className,
@@ -30,6 +29,7 @@ const WarningSwitch = forwardRef<HTMLButtonElement, MattrixwvSwitchProps>(({
 			)}
 			disabled={disabled}
 			ref={ref}
+			{...props}
 		/>
 	);
 });
diff --git a/lib/component/message/TertiaryMessageBlock.tsx b/lib/component/message/TertiaryMessageBlock.tsx
index 496769f..f36b0ad 100644
--- a/lib/component/message/TertiaryMessageBlock.tsx
+++ b/lib/component/message/TertiaryMessageBlock.tsx
@@ -11,12 +11,12 @@ const TertiaryMessageBlock = forwardRef<HTMLDivElement, MessageBlockProps>(({
 	return (
 		<MessageBlock
 			data-testid="mattrixwv-tertiary-message-block"
-			{...messageProps}
 			className={clsx(
 				className,
 				"bg-tertiary-xlight text-tertiary-mid"
 			)}
 			ref={ref}
+			{...messageProps}
 		/>
 	);
 });