diff --git a/src/lib/components/toast/Toast.component.tsx b/src/lib/components/toast/Toast.component.tsx
index 1b68f36262..bf292556da 100644
--- a/src/lib/components/toast/Toast.component.tsx
+++ b/src/lib/components/toast/Toast.component.tsx
@@ -44,11 +44,11 @@ const useGetRgbBackgroundColor = (status: string) => {
   const theme = useTheme();
   switch (status) {
     case 'success':
-      return 'rgba(10, 173, 166, 0.4)';
+      return `rgba(${theme.statusHealthyRGB}, 0.4)`;
     case 'error':
-      return 'rgba(232, 72, 85, 0.4)';
+      return `rgba(${theme.statusCriticalRGB}, 0.4)`;
     case 'warning':
-      return 'rgba(248, 243, 43, 0.4)';
+      return `rgba(${theme.statusWarningRGB}, 0.4)`;
     default:
       return theme.infoSecondary;
   }
@@ -132,7 +132,7 @@ function Toast({
   return (
     <div
       ref={ref}
-      role="alert"
+      role="status"
       aria-live="polite"
       style={{
         position: 'fixed',
diff --git a/src/lib/components/toast/useMutationsHandler.ts b/src/lib/components/toast/useMutationsHandler.ts
index c4a32be5d0..c74dbbdfc4 100644
--- a/src/lib/components/toast/useMutationsHandler.ts
+++ b/src/lib/components/toast/useMutationsHandler.ts
@@ -2,18 +2,18 @@ import { ReactNode, useCallback, useEffect } from 'react';
 import { UseMutationResult } from 'react-query';
 import { useToast } from './ToastProvider';
 
-export type MutationConfig<Data, Variables> = {
+export type MutationConfig<Data = unknown, Variables = unknown> = {
   mutation: UseMutationResult<Data, unknown, Variables, unknown>;
   name: string;
 };
 
-type DescriptionBuilder<Data> = {
+type DescriptionBuilder<Data = unknown> = {
   data?: Data;
   error?: unknown;
   name: string;
 };
 
-type MutationsHandlerProps<Data, Variables> = {
+type MutationsHandlerProps<Data = unknown, Variables = unknown> = {
   mainMutation: MutationConfig<Data, Variables>;
   dependantMutations?: MutationConfig<Data, Variables>[];
   messageDescriptionBuilder: (
@@ -24,7 +24,7 @@ type MutationsHandlerProps<Data, Variables> = {
   onMainMutationSuccess?: () => void;
 };
 
-export const useMutationsHandler = <Data, Variables>({
+export const useMutationsHandler = <Data = unknown, Variables = unknown>({
   mainMutation,
   dependantMutations,
   messageDescriptionBuilder,
diff --git a/src/lib/style/theme.ts b/src/lib/style/theme.ts
index 90d54c36c8..598e711200 100644
--- a/src/lib/style/theme.ts
+++ b/src/lib/style/theme.ts
@@ -31,8 +31,11 @@ export const grayLightest = '#E9EBED';
 export const defaultTheme = {
   darkRebrand: {
     statusHealthy: '#0AADA6',
+    statusHealthyRGB: '10,173,166',
     statusWarning: '#F8F32B',
+    statusWarningRGB: '248,243,43',
     statusCritical: '#E84855',
+    statusCriticalRGB: '232,72,85',
     selectedActive: '#037AFF',
     highlight: '#1A3C75',
     border: '#4A4A4A',