diff --git a/core/modules/system/css/system.admin.css b/core/modules/system/css/system.admin.css
index fd0875e..c63d76b 100644
--- a/core/modules/system/css/system.admin.css
+++ b/core/modules/system/css/system.admin.css
@@ -206,6 +206,7 @@ table.system-status-report td.status-icon div {
   background-repeat: no-repeat;
   height: 16px;
   width: 16px;
+  margin-top: 2px;
 }
 table.system-status-report tr.error td.status-icon div {
   background-image: url(../../../misc/icons/ea2800/error.svg);
diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index f397a5a..76f17ae 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -514,10 +514,11 @@ ul.tabs {
  * Styles for system messages.
  */
 .messages {
-  background: no-repeat 10px 18px;  /* LTR */
+  background: no-repeat 10px 17px;  /* LTR */
   border: 1px solid;
   border-width: 1px 1px 1px 0;  /* LTR */
   border-radius: 2px;
+  margin-left: 8px; /* LTR */
   padding: 15px 20px 15px 35px; /* LTR */
   word-wrap: break-word;
   overflow-wrap: break-word;
@@ -525,6 +526,7 @@ ul.tabs {
 [dir="rtl"] .messages {
   border-width: 1px 0 1px 1px;
   background-position-x: 99%;
+  margin-right: 8px;
   padding-left: 20px;
   padding-right: 35px;
   text-align: right;
@@ -547,13 +549,11 @@ ul.tabs {
   background-image: url(../../../misc/icons/73b355/check.svg);
   background-position: 12px 19px;  /* LTR */
   box-shadow: -8px 0 0 #77b259; /* LTR */
-  margin-left: 8px; /* LTR */
 }
 [dir="rtl"] .messages--status {
   background-position: 99.3% 19px;
   border-color: #c9e1bd transparent #c9e1bd #c9e1bd;
   box-shadow: 8px 0 0 #77b259;
-  margin-right: 8px;
 }
 .no-svg .messages--status {
   background-image: url(../../../misc/icons/73b355/check.png);
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 95daa96..48416b4 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -140,7 +140,18 @@ ul.menu li.expanded {
  * Console.
  */
 #console {
-  margin: 9px 0 10px;
+  margin: 9px 0 10px 8px;
+}
+
+/**
+ * Messages.
+ */
+.messages pre {
+  margin: 0;
+}
+
+.content .messages {
+  margin-left: 8px;
 }
 
 /**
@@ -1489,7 +1500,7 @@ details.fieldset-no-legend {
 
   [class*="page-node-add-"] #console,
   .page-node-edit #console {
-    margin: 0 2em;
+    margin: 0 0 0 8px;
   }
   [class*="page-node-add-"] .messages,
   .page-node-edit .messages {