diff --git a/awx/ui_next/src/components/AlertModal/AlertModal.jsx b/awx/ui_next/src/components/AlertModal/AlertModal.jsx
index 8b47a8d3f9..a0e3048672 100644
--- a/awx/ui_next/src/components/AlertModal/AlertModal.jsx
+++ b/awx/ui_next/src/components/AlertModal/AlertModal.jsx
@@ -24,11 +24,36 @@ export default function AlertModal({
   ...props
 }) {
   const variantIcons = {
-    danger: <ExclamationCircleIcon size="lg" css="color: #c9190b" />,
-    error: <TimesCircleIcon size="lg" css="color: #c9190b" />,
-    info: <InfoCircleIcon size="lg" css="color: #73bcf7" />,
-    success: <CheckCircleIcon size="lg" css="color: #92d400" />,
-    warning: <ExclamationTriangleIcon size="lg" css="color: #f0ab00" />,
+    danger: (
+      <ExclamationCircleIcon
+        size="lg"
+        css="color: var(--pf-global--danger-color--100)"
+      />
+    ),
+    error: (
+      <TimesCircleIcon
+        size="lg"
+        css="color: var(--pf-global--danger-color--100)"
+      />
+    ),
+    info: (
+      <InfoCircleIcon
+        size="lg"
+        css="color: var(--pf-global--info-color--100)"
+      />
+    ),
+    success: (
+      <CheckCircleIcon
+        size="lg"
+        css="color: var(--pf-global--success-color--100)"
+      />
+    ),
+    warning: (
+      <ExclamationTriangleIcon
+        size="lg"
+        css="color: var(--pf-global--warning-color--100)"
+      />
+    ),
   };
 
   const customHeader = (
diff --git a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap
index d97266c627..635476e44d 100644
--- a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap
+++ b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap
@@ -104,7 +104,7 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                     >
                       <svg
                         aria-hidden="true"
-                        class="sc-bdVaJa bkDjEn"
+                        class="sc-bdVaJa hIExGP"
                         fill="currentColor"
                         height="2em"
                         role="img"
@@ -223,7 +223,7 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                     >
                       <svg
                         aria-hidden="true"
-                        class="sc-bdVaJa bkDjEn"
+                        class="sc-bdVaJa hIExGP"
                         fill="currentColor"
                         height="2em"
                         role="img"
@@ -474,9 +474,9 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                                       "componentStyle": ComponentStyle {
                                         "componentId": "sc-bdVaJa",
                                         "isStatic": true,
-                                        "lastClassName": "bkDjEn",
+                                        "lastClassName": "hIExGP",
                                         "rules": Array [
-                                          "color: #c9190b",
+                                          "color: var(--pf-global--danger-color--100)",
                                         ],
                                       },
                                       "displayName": "Styled(ExclamationCircleIcon)",
@@ -493,7 +493,7 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                                   size="lg"
                                 >
                                   <ExclamationCircleIcon
-                                    className="sc-bdVaJa bkDjEn"
+                                    className="sc-bdVaJa hIExGP"
                                     color="currentColor"
                                     noVerticalAlign={false}
                                     size="lg"
@@ -502,7 +502,7 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
                                     <svg
                                       aria-hidden={true}
                                       aria-labelledby={null}
-                                      className="sc-bdVaJa bkDjEn"
+                                      className="sc-bdVaJa hIExGP"
                                       fill="currentColor"
                                       height="2em"
                                       role="img"
diff --git a/awx/ui_next/src/screens/Inventory/shared/InventoryForm.jsx b/awx/ui_next/src/screens/Inventory/shared/InventoryForm.jsx
index 42fd8379c6..dca8b78102 100644
--- a/awx/ui_next/src/screens/Inventory/shared/InventoryForm.jsx
+++ b/awx/ui_next/src/screens/Inventory/shared/InventoryForm.jsx
@@ -7,7 +7,7 @@ import { func, number, shape } from 'prop-types';
 import { VariablesField } from '@components/CodeMirrorInput';
 import { Form } from '@patternfly/react-core';
 import FormField, { FormSubmitError } from '@components/FormField';
-import FormActionGroup from '@components/FormActionGroup/FormActionGroup';
+import FormActionGroup from '@components/FormActionGroup';
 import { required } from '@util/validators';
 import InstanceGroupsLookup from '@components/Lookup/InstanceGroupsLookup';
 import OrganizationLookup from '@components/Lookup/OrganizationLookup';
diff --git a/awx/ui_next/src/screens/Job/JobList/JobListItem.jsx b/awx/ui_next/src/screens/Job/JobList/JobListItem.jsx
index 30cdd1feaa..28649f1edc 100644
--- a/awx/ui_next/src/screens/Job/JobList/JobListItem.jsx
+++ b/awx/ui_next/src/screens/Job/JobList/JobListItem.jsx
@@ -38,7 +38,7 @@ class JobListItem extends Component {
               <DataListCell key="status" isFilled={false}>
                 {job.status && <StatusIcon status={job.status} />}
               </DataListCell>,
-              <DataListCell key="name" css="display: inline-flex;">
+              <DataListCell key="name">
                 <span>
                   <Link
                     to={`/jobs/${JOB_TYPE_URL_SEGMENTS[job.type]}/${job.id}`}