diff --git a/client/src/app/components/IconedStatus.tsx b/client/src/app/components/IconedStatus.tsx
index e03e0a9562..5955e62398 100644
--- a/client/src/app/components/IconedStatus.tsx
+++ b/client/src/app/components/IconedStatus.tsx
@@ -5,6 +5,7 @@ import CheckCircleIcon from "@patternfly/react-icons/dist/esm/icons/check-circle
 import TimesCircleIcon from "@patternfly/react-icons/dist/esm/icons/times-circle-icon";
 import InProgressIcon from "@patternfly/react-icons/dist/esm/icons/in-progress-icon";
 import ExclamationCircleIcon from "@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon";
+import WarningTriangleIcon from "@patternfly/react-icons/dist/esm/icons/warning-triangle-icon";
 import UnknownIcon from "@patternfly/react-icons/dist/esm/icons/unknown-icon";
 
 export type IconedStatusPreset =
@@ -17,9 +18,9 @@ export type IconedStatusPreset =
   | "Ok"
   | "Scheduled"
   | "Unknown"
-  | "Yes"
-  | "No"
-  | "Maybe";
+  | "LowRisk"
+  | "MediumRisk"
+  | "HighRisk";
 
 export type IconedStatusStatusType =
   | "custom"
@@ -90,16 +91,16 @@ export const IconedStatus: React.FC<IIconedStatusProps> = ({
     Unknown: {
       icon: <UnknownIcon />,
     },
-    Yes: {
+    LowRisk: {
       icon: <CheckCircleIcon />,
       status: "success",
     },
-    No: {
+    HighRisk: {
       icon: <TimesCircleIcon />,
       status: "danger",
     },
-    Maybe: {
-      icon: <InProgressIcon />,
+    MediumRisk: {
+      icon: <WarningTriangleIcon />,
       status: "warning",
     },
   };
diff --git a/client/src/app/pages/assessment-management/questionnaire/components/answer-table.tsx b/client/src/app/pages/assessment-management/questionnaire/components/answer-table.tsx
index 53b6c86d4a..19ea12ac11 100644
--- a/client/src/app/pages/assessment-management/questionnaire/components/answer-table.tsx
+++ b/client/src/app/pages/assessment-management/questionnaire/components/answer-table.tsx
@@ -40,13 +40,13 @@ const AnswerTable: React.FC<IWaveStatusTableProps> = ({ answers }) => {
   const mapRiskToStatus = (risk: string): IconedStatusPreset => {
     switch (risk) {
       case "green":
-        return "Yes";
+        return "LowRisk";
       case "unknown":
         return "Unknown";
       case "red":
-        return "No";
+        return "HighRisk";
       case "yellow":
-        return "Maybe";
+        return "MediumRisk";
       default:
         return "Unknown";
     }
@@ -81,7 +81,7 @@ const AnswerTable: React.FC<IWaveStatusTableProps> = ({ answers }) => {
                     item={answer}
                     rowIndex={rowIndex}
                   >
-                    <Td width={20} {...getTdProps({ columnKey: "choice" })}>
+                    <Td width={40} {...getTdProps({ columnKey: "choice" })}>
                       {answer.choice}
                     </Td>
                     <Td width={20} {...getTdProps({ columnKey: "choice" })}>