diff --git a/e2e/screenshots/combobox-error-.png b/e2e/screenshots/combobox-error-.png
index 4f1033975..a978a8ff1 100644
Binary files a/e2e/screenshots/combobox-error-.png and b/e2e/screenshots/combobox-error-.png differ
diff --git a/e2e/screenshots/dark--combobox-error-.png b/e2e/screenshots/dark--combobox-error-.png
index ed72e7557..b632f7599 100644
Binary files a/e2e/screenshots/dark--combobox-error-.png and b/e2e/screenshots/dark--combobox-error-.png differ
diff --git a/e2e/screenshots/dark--select-error-.png b/e2e/screenshots/dark--select-error-.png
index 04fc071f7..79c746e57 100644
Binary files a/e2e/screenshots/dark--select-error-.png and b/e2e/screenshots/dark--select-error-.png differ
diff --git a/e2e/screenshots/dark--textfield-error-.png b/e2e/screenshots/dark--textfield-error-.png
index 634f460b3..82c8f903a 100644
Binary files a/e2e/screenshots/dark--textfield-error-.png and b/e2e/screenshots/dark--textfield-error-.png differ
diff --git a/e2e/screenshots/select-error-.png b/e2e/screenshots/select-error-.png
index acf65572d..0dd26a06d 100644
Binary files a/e2e/screenshots/select-error-.png and b/e2e/screenshots/select-error-.png differ
diff --git a/e2e/screenshots/textfield-error-.png b/e2e/screenshots/textfield-error-.png
index c0a8925c4..2af3dd6e4 100644
Binary files a/e2e/screenshots/textfield-error-.png and b/e2e/screenshots/textfield-error-.png differ
diff --git a/packages/styles/forms.css b/packages/styles/forms.css
index 5834dc532..5fc0f530f 100644
--- a/packages/styles/forms.css
+++ b/packages/styles/forms.css
@@ -145,8 +145,7 @@ textarea.Field--has-error,
 [role='listbox'].Field--has-error,
 [role='spinbutton'].Field--has-error {
   border: 1px solid var(--field-border-color-error);
-  box-shadow: 0 0 0 1px var(--field-border-color-error),
-    inset 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 
 .Checkbox__overlay.Field--has-error {
@@ -168,6 +167,8 @@ textarea.Field--has-error:hover,
 [role='listbox'].Field--has-error:hover,
 [role='spinbutton'].Field--has-error:hover {
   border-color: var(--field-border-color-error-hover);
+  box-shadow: 0 0 0 1px var(--field-border-color-error),
+    inset 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 
 input.Field--has-error:focus,
diff --git a/packages/styles/select.css b/packages/styles/select.css
index c13405457..2b0c2cb48 100644
--- a/packages/styles/select.css
+++ b/packages/styles/select.css
@@ -65,20 +65,21 @@
 
 .Field__select--wrapper select:invalid,
 .Field--has-error select {
-  border-width: var(--space-quarter);
+  border-width: 1px;
   border-color: var(--field-border-color-error);
 }
 
 .Field__select--wrapper.Field--has-error select:hover {
   border-color: var(--field-border-color-error-hover);
+  box-shadow: 0 0 0 1px var(--field-border-color-error-hover);
 }
 
 .Field__select--wrapper select:invalid:focus,
 .Field__select--wrapper.Field--has-error select:focus {
-  border-width: var(--space-quarter);
   border-color: var(--field-border-color-error);
   box-shadow: rgba(0, 0, 0, 0.05) 0 1px 2px 0 inset,
-    var(--field-border-color-error-focus-glow) 0 0 4px 0;
+    var(--field-border-color-error) 0 0 0 1px,
+    var(--field-border-color-error-focus-glow) 0 0 5px 0;
 }
 
 .Field__select--wrapper select:invalid:focus:hover,
diff --git a/packages/styles/text-field-wrapper.css b/packages/styles/text-field-wrapper.css
index fe7686232..eee801fe9 100644
--- a/packages/styles/text-field-wrapper.css
+++ b/packages/styles/text-field-wrapper.css
@@ -88,8 +88,7 @@
 
 .TextFieldWrapper--error {
   border: 1px solid var(--text-field-wrapper-error-border-color);
-  box-shadow: 0 0 0 1px var(--text-field-wrapper-error-border-color),
-    inset 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 
 .TextFieldWrapper--error:focus-within {