diff --git a/src/components/form/field_password/__snapshots__/field_password.test.tsx.snap b/src/components/form/field_password/__snapshots__/field_password.test.tsx.snap
index c2d903dc947..7ce07f9abfe 100644
--- a/src/components/form/field_password/__snapshots__/field_password.test.tsx.snap
+++ b/src/components/form/field_password/__snapshots__/field_password.test.tsx.snap
@@ -226,7 +226,7 @@ exports[`EuiFieldPassword props isInvalid is rendered 1`] = `
     >
       <span
         color="danger"
-        data-euiicon-type="alert"
+        data-euiicon-type="warning"
       />
     </div>
   </div>
diff --git a/src/components/form/form_control_layout/__snapshots__/form_control_layout.test.tsx.snap b/src/components/form/form_control_layout/__snapshots__/form_control_layout.test.tsx.snap
index 1d737b1b648..3207fcb040a 100644
--- a/src/components/form/form_control_layout/__snapshots__/form_control_layout.test.tsx.snap
+++ b/src/components/form/form_control_layout/__snapshots__/form_control_layout.test.tsx.snap
@@ -226,7 +226,7 @@ exports[`EuiFormControlLayout props isInvalid is rendered 1`] = `
     >
       <span
         color="danger"
-        data-euiicon-type="alert"
+        data-euiicon-type="warning"
       />
     </div>
   </div>
diff --git a/src/components/form/form_control_layout/form_control_layout_icons.tsx b/src/components/form/form_control_layout/form_control_layout_icons.tsx
index ade06207357..3c038c9ecc1 100644
--- a/src/components/form/form_control_layout/form_control_layout_icons.tsx
+++ b/src/components/form/form_control_layout/form_control_layout_icons.tsx
@@ -164,7 +164,7 @@ export class EuiFormControlLayoutIcons extends Component<
     }
 
     return (
-      <EuiIcon size={compressed ? 's' : 'm'} color="danger" type="alert" />
+      <EuiIcon size={compressed ? 's' : 'm'} color="danger" type="warning" />
     );
   }
 }
diff --git a/src/components/form/super_select/__snapshots__/super_select_control.test.tsx.snap b/src/components/form/super_select/__snapshots__/super_select_control.test.tsx.snap
index d5875a3c5a8..1c840cb5ecf 100644
--- a/src/components/form/super_select/__snapshots__/super_select_control.test.tsx.snap
+++ b/src/components/form/super_select/__snapshots__/super_select_control.test.tsx.snap
@@ -229,7 +229,7 @@ Array [
       >
         <span
           color="danger"
-          data-euiicon-type="alert"
+          data-euiicon-type="warning"
         />
         <span
           class="euiFormControlLayoutCustomIcon"
diff --git a/src/components/suggest/__snapshots__/suggest.test.tsx.snap b/src/components/suggest/__snapshots__/suggest.test.tsx.snap
index aae480a544a..7391a30aa49 100644
--- a/src/components/suggest/__snapshots__/suggest.test.tsx.snap
+++ b/src/components/suggest/__snapshots__/suggest.test.tsx.snap
@@ -408,7 +408,7 @@ Array [
                 </button>
                 <span
                   color="danger"
-                  data-euiicon-type="alert"
+                  data-euiicon-type="warning"
                 />
               </div>
             </div>
diff --git a/upcoming_changelogs/6629.md b/upcoming_changelogs/6629.md
new file mode 100644
index 00000000000..8d90883cc12
--- /dev/null
+++ b/upcoming_changelogs/6629.md
@@ -0,0 +1,3 @@
+**Bug fixes**
+
+- Fixed broken icons on all `isInvalid` form controls