diff --git a/core/themes/classy/css/components/form.css b/core/themes/classy/css/components/form.css
index 66edc39..ad73446 100644
--- a/core/themes/classy/css/components/form.css
+++ b/core/themes/classy/css/components/form.css
@@ -88,16 +88,11 @@ abbr.ajax-changed {
 }
 .form-item input.error,
 .form-item textarea.error,
-.form-item select.error {
+.form-item select.error,
+fieldset.error .form-checkboxes,
+fieldset.error .form-radios {
   border: 2px solid red;
 }
-.form-item input[type="checkbox"].error,
-.form-item input[type="radio"].error {
-  border: none;
-  outline-color: red;
-  outline-style: solid;
-  outline-width: 2px;
-}
 
 /* Inline error messages. */
 .form-item--error-message:before {
diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index e8f8963..483271b 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -71,20 +71,15 @@ label[for] {
 }
 .form-item input.error,
 .form-item textarea.error,
-.form-item select.error {
+.form-item select.error,
+fieldset.error .form-checkboxes,
+fieldset.error .form-radios {
   border-width: 1px;
   border-color: #e62600;
   background-color: hsla(15, 75%, 97%, 1);
   box-shadow: inset 0 5px 5px -5px #b8b8b8;
   color: #a51b00;
 }
-.form-item input[type="checkbox"].error,
-.form-item input[type="radio"].error {
-  border: none;
-  outline-color: #e62600;
-  outline-style: solid;
-  outline-width: 1px;
-}
 .form-item textarea.error + .cke {
   border-width: 1px;
   border-color: #e62600;