diff --git a/src/shell/components/global-notifications/GlobalNotifications.js b/src/shell/components/global-notifications/GlobalNotifications.js
index f6fdd277e3..d5473849d6 100644
--- a/src/shell/components/global-notifications/GlobalNotifications.js
+++ b/src/shell/components/global-notifications/GlobalNotifications.js
@@ -213,55 +213,92 @@ export const CustomNotification = forwardRef(({ id, ...props }, ref) => {
     closeSnackbar(id);
   }, [id, closeSnackbar]);
 
-  return (
-    <SnackbarContent ref={ref}>
-      <Alert
-        data-cy="toast"
-        key={id}
-        variant="filled"
-        severity={props.severity}
-        icon={props.icon}
-        action={
-          <Stack direction="row">
-            <IconButton onClick={handleDismiss}>
-              <CloseIcon sx={{ width: 20, height: 20, color: "white" }} />
-            </IconButton>
-          </Stack>
-        }
-        sx={{
-          width: 540,
-          height: props.heading ? "auto" : 44,
-        }}
-      >
-        <Stack>
-          <Typography
-            variant="body2"
-            noWrap={props.severity === "success"}
-            sx={{
-              maxWidth: "540px",
-              overflow: "hidden",
-              textOverflow: "ellipsis",
-              fontWeight: props.heading ? 700 : "normal",
-            }}
-          >
-            {props.heading ? props.heading : props.message}
+  const parseStrToBold = (str, isHeading = false) => {
+    const styles = {
+      variant: "body2",
+      fontWeight: 700,
+      component: "span",
+    };
+    if (str.indexOf(":") !== -1) {
+      return (
+        <>
+          <Typography {...styles}>
+            {str.substring(0, str.indexOf(":") + 1)}
           </Typography>
+          {str.substring(str.indexOf(":") + 1)}
+        </>
+      );
+    } else if (str.indexOf(":") === -1 && isHeading)
+      return <Typography {...styles}>{str}</Typography>;
+    else if (str.indexOf(":") === -1 && [undefined, ""].includes(props.heading))
+      return <Typography {...styles}>{str}</Typography>;
+    else return str;
+  };
 
-          {props.heading && (
+  const typograpySX = {
+    maxWidth: "540px",
+    overflow: "hidden",
+    textOverflow: "ellipsis",
+    // this will only show 1 or 2 lines to prevent exceeding on the expected height
+    // depending what type of notification will be displayed.
+    display: props.severity === "success" ? "block" : "-webkit-box",
+    "-webkit-line-clamp": props.heading && props.message ? "1" : "2",
+    "-webkit-box-orient": "vertical",
+  };
+
+  return (
+    <SnackbarContent ref={ref}>
+      {typeof props.message === "object" ? (
+        ""
+      ) : (
+        <Alert
+          data-cy="toast"
+          key={id}
+          variant="filled"
+          severity={props.severity}
+          icon={props.icon}
+          action={
+            <Stack direction="row">
+              <IconButton onClick={handleDismiss}>
+                <CloseIcon sx={{ width: 20, height: 20, color: "white" }} />
+              </IconButton>
+            </Stack>
+          }
+          sx={{
+            width: 540,
+            padding:
+              !(props.heading && props.message) || props.severity === "success"
+                ? "4px 8px"
+                : "0px 8px",
+          }}
+        >
+          <Stack>
             <Typography
               variant="body2"
               noWrap={props.severity === "success"}
               sx={{
-                maxWidth: "540px",
-                overflow: "hidden",
-                textOverflow: "ellipsis",
+                ...typograpySX,
               }}
             >
-              {props.message}
+              {props.heading
+                ? props.heading && parseStrToBold(props.heading, true)
+                : props.message && parseStrToBold(props.message)}
             </Typography>
-          )}
-        </Stack>
-      </Alert>
+
+            {props.heading && (
+              <Typography
+                variant="body2"
+                noWrap={props.severity === "success"}
+                sx={{
+                  ...typograpySX,
+                }}
+              >
+                {parseStrToBold(props.message)}
+              </Typography>
+            )}
+          </Stack>
+        </Alert>
+      )}
     </SnackbarContent>
   );
 });