diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index 23ee794..7a8d8d5 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -113,21 +113,15 @@ abbr.ajax-changed {
   margin-right: 0;
 }
 
-.form-error {
-  background-color: #fef5f1;
-  border: 1px solid #ed541d;
-  color: #8c2e0b;
-  padding: 5px;
-}
-.form-error-message {
-  margin-bottom: 10px;
-  min-height: 25px;
-}
-.form-error legend {
-  position: absolute;
-}
-.form-error .fieldset-wrapper {
-  margin-top: 35px;
+/* Inline error messages. */
+.form-error-message:before {
+  content: '';
+  display: inline-block;
+  height: 14px;
+  width: 14px;
+  vertical-align: sub;
+  background: url(../../../misc/icons/ea2800/error.svg) no-repeat;
+  background-size: contain;
 }
 
 /**
diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index 3221df1..7deb2e6 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -83,24 +83,8 @@ label[for] {
   height: 7px;
 }
 
-/* Inline errors. */
-div.form-error {
-  margin-top: 0.385em;
-  padding: inherit;
-  border: inherit;
-  background: inherit;
-}
-.form-error .fieldset-wrapper {
-  margin-top: 1.75em;
-}
-.form-error .form-error-message {
-  margin-bottom: 0;
-  padding-left: 1.231em;
-  min-height: inherit;
-  background: transparent url("../../images/misc-icons-ea2800-error.svg") no-repeat scroll 0.1em center / 0.76em 0.76em;
-}
-.form-error .form-error-message + .description {
-  margin-top: 0;
+.form-error-message {
+  color: #ea2800;
 }
 
 /* Filter */
@@ -115,6 +99,7 @@ div.description,
   font-size: 0.9em;
 }
 .form-item .description.error {
+  margin-top: 0;
   color: #a51b00;
 }
 
diff --git a/core/themes/seven/images/misc-icons-ea2800-error.svg b/core/themes/seven/images/misc-icons-ea2800-error.svg
deleted file mode 100644
index a715b96..0000000
--- a/core/themes/seven/images/misc-icons-ea2800-error.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#ea2800"><path d="M8.002 1c-3.868 0-7.002 3.134-7.002 7s3.134 7 7.002 7c3.865 0 7-3.134 7-7s-3.135-7-7-7zm4.025 9.284c.062.063.1.149.1.239 0 .091-.037.177-.1.24l-1.262 1.262c-.064.062-.15.1-.24.1s-.176-.036-.24-.1l-2.283-2.283-2.286 2.283c-.064.062-.15.1-.24.1s-.176-.036-.24-.1l-1.261-1.262c-.063-.062-.1-.148-.1-.24 0-.088.036-.176.1-.238l2.283-2.285-2.283-2.284c-.063-.064-.1-.15-.1-.24s.036-.176.1-.24l1.262-1.262c.063-.063.149-.1.24-.1.089 0 .176.036.24.1l2.285 2.284 2.283-2.284c.064-.063.15-.1.24-.1s.176.036.24.1l1.262 1.262c.062.063.1.149.1.24 0 .089-.037.176-.1.24l-2.283 2.284 2.283 2.284z"/></svg>
\ No newline at end of file