diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index f272310..7db0a7f 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -62,12 +62,18 @@ label[for] {
 .form-item input.error,
 .form-item textarea.error,
 .form-item select.error {
-  border-width: 2px;
+  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 textarea.error + .cke {
+  border-width: 1px;
+  border-color: #e62600;
+}
+
 .form-item input.error:focus,
 .form-item textarea.error:focus,
 .form-item select.error:focus {
@@ -84,9 +90,22 @@ label[for] {
 }
 
 .form-error-message {
+  margin-top: 0.15em;
   color: #ea2800;
 }
 
+.fieldset-wrapper > .form-error-message {
+  margin-top: 0;
+}
+
+.text-format-wrapper .form-error-message {
+  border: solid #ccc;
+  border-width: 0 1px;
+  margin: 0;
+  padding: 0.25em 0.666em 0;
+}
+
+
 /* Filter */
 ul.tips,
 div.description,