Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.605
diff -u -r1.605 theme.inc
--- includes/theme.inc	8 Aug 2010 19:35:48 -0000	1.605
+++ includes/theme.inc	12 Aug 2010 20:13:13 -0000
@@ -1310,7 +1310,6 @@
  *     of that type.
  */
 function theme_status_messages($variables) {
-  $display = $variables['display'];
   $output = '';
 
   $status_heading = array(
@@ -1318,23 +1317,16 @@
     'error' => t('Error message'),
     'warning' => t('Warning message'),
   );
-  foreach (drupal_get_messages($display) as $type => $messages) {
-    $output .= "<div class=\"messages $type\">\n";
-    if (!empty($status_heading[$type])) {
-      $output .= '<h2 class="element-invisible">' . $status_heading[$type] . "</h2>\n";
-    }
-    if (count($messages) > 1) {
-      $output .= " <ul>\n";
-      foreach ($messages as $message) {
-        $output .= '  <li>' . $message . "</li>\n";
-      }
-      $output .= " </ul>\n";
-    }
-    else {
-      $output .= $messages[0];
+
+  foreach (drupal_get_messages($variables['display']) as $type => $messages) {
+    $output .= '<h2 class="element-invisible">' . $status_heading[$type] . "</h2>\n";
+    $output .= "<ul class=\"messages\">\n";
+    foreach ($messages as $message) {
+      $output .= " <li class=\"message $type\">$message</li>\n";
     }
-    $output .= "</div>\n";
+    $output .= "</ul>\n";
   }
+
   return $output;
 }
 
Index: includes/theme.maintenance.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v
retrieving revision 1.64
diff -u -r1.64 theme.maintenance.inc
--- includes/theme.maintenance.inc	8 Aug 2010 19:35:49 -0000	1.64
+++ includes/theme.maintenance.inc	12 Aug 2010 20:13:13 -0000
@@ -80,6 +80,7 @@
   drupal_add_css(drupal_get_path('module', 'system') . '/system.css');
   drupal_add_css(drupal_get_path('module', 'system') . '/system-behavior.css');
   drupal_add_css(drupal_get_path('module', 'system') . '/system-menus.css');
+  drupal_add_css(drupal_get_path('module', 'system') . '/system-messages.css');
   drupal_add_css(drupal_get_path('module', 'system') . '/maintenance.css');
   drupal_add_css(drupal_get_path('module', 'system') . '/admin.css');
 }
Index: modules/system/system-messages.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system-messages.css,v
retrieving revision 1.2
diff -u -r1.2 system-messages.css
--- modules/system/system-messages.css	26 May 2010 19:51:01 -0000	1.2
+++ modules/system/system-messages.css	12 Aug 2010 20:13:13 -0000
@@ -1,36 +1,23 @@
-/* $Id */
-
-div.messages {
-  background-color: #dfd;
-  color: #000;
-  margin-bottom: 0.25em;
-  padding: 0.25em 0.5em;
-}
-
-.error {
-  color: #e55;
-}
-
-div.error,
-tr.error {
-  background-color: #fcc;
-}
-
-.warning {
-  color: #e09010;
-}
-
-div.warning,
-tr.warning {
-  background-color: #fcfca7;
-}
-
-.ok {
-  color: #008000;
-}
-
-div.ok,
-tr.ok {
-  background-color: #dfd;
-  color: #020;
+ul.messages {
+  margin: 0;
+  padding: 0;
+}
+ul.messages li.message {
+  list-style: none;
+  background: no-repeat 10px 10px;
+  padding: 9px 9px 9px 35px;
+  border: 1px solid;
+  margin: 6px 0;
+}
+ul.messages li.status {
+  background-image: url(../../misc/watchdog-ok.png);
+}
+ul.messages li.warning {
+  background-image: url(../../misc/watchdog-warning.png);
+}
+ul.messages li.error {
+  background-image: url(../../misc/watchdog-error.png);
+}
+ul.messages p {
+  margin-top: 0;
 }
Index: themes/bartik/css/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/css/style.css,v
retrieving revision 1.3
diff -u -r1.3 style.css
--- themes/bartik/css/style.css	6 Aug 2010 01:40:29 -0000	1.3
+++ themes/bartik/css/style.css	12 Aug 2010 20:13:13 -0000
@@ -841,21 +841,22 @@
   padding: 20px 0 5px;
   margin: 0 auto;
 }
-div.messages {
-  padding: 1.2em 2em 1em;
+ul.messages li.message {
+  padding: 1.2em 3em 1em;
   margin: 8px 0;
+  background-position: 12px 15px;
 }
-div.status, tr.status {
+ul.messages li.status {
+  border-color: #89d47f;
   background-color: #c7ffc0;
-  border: 1px solid #89d47f;
 }
-div.warning, tr.warning {
+ul.messages li.warning {
+  border-color: #e1c46b;
   background-color: #fcfca7;
-  border: 1px solid #e1c46b;
 }
-div.error, tr.error {
+ul.messages li.error {
+  border-color: #fb6b6b;
   background-color: #ffcccc;
-  border: 1px solid #fb6b6b;
 }
 
 /* -------------- Breadcrumbs   -------------- */
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.84
diff -u -r1.84 style.css
--- themes/garland/style.css	28 Jul 2010 01:40:39 -0000	1.84
+++ themes/garland/style.css	12 Aug 2010 20:13:13 -0000
@@ -290,20 +290,6 @@
   padding: .5em 1em;
 }
 
-div.messages {
-  margin: .75em 0 .75em;
-  padding: .1em .5em .15em;
-}
-
-.messages ul {
-  margin: 0;
-}
-
-.messages li {
-  margin: 0;
-  padding: 0 0 0 1.3em; /* LTR */
-}
-
 .form-checkboxes,
 .form-radios,
 .form-checkboxes .form-item,
@@ -1196,38 +1182,16 @@
 /**
  * Generic elements.
  */
-div.messages {
-  background-color: #fff;
-  border: 1px solid #b8d3e5;
-}
-
 .preview {
   background-color: #fcfce8;
   border: 1px solid #e5e58f;
 }
 
-div.status {
-  background-color: #fff;
-  border-color: #c7f2c8;
-  color: #33a333;
-}
-
-div.error {
-  border: 1px solid #d77;
-}
-
-div.error,
 tr.error {
   color: #a30000;
   background-color: #FFCCCC;
 }
 
-div.warning {
-  background-color: #ffd;
-  border: 1px solid #f0c020;
-  color: #220;
-}
-
 .form-item input.error,
 .form-item textarea.error {
   border: 1px solid #c52020;
@@ -1235,6 +1199,27 @@
 }
 
 /**
+ * Messages.
+ */
+ul.messages li.status {
+  color: #33a333;
+  border-color: #c7f2c8;
+  background-color: #fff;
+}
+
+ul.messages li.warning {
+  color: #220;
+  border-color: #f0c020;
+  background-color: #ffd;
+}
+
+ul.messages li.error {
+  color: #a30000;
+  border-color: #d77;
+  background-color: #FFCCCC;
+}
+
+/**
  * dblog.module
  */
 tr.dblog-user {
Index: themes/seven/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/style.css,v
retrieving revision 1.62
diff -u -r1.62 style.css
--- themes/seven/style.css	6 Aug 2010 01:40:29 -0000	1.62
+++ themes/seven/style.css	12 Aug 2010 20:13:13 -0000
@@ -243,31 +243,29 @@
 /**
  * Messages.
  */
-div.messages {
-  padding: 9px;
-  margin: 0.5em 0 0;
-  color: #036;
-  background: #f8fff0;
-  border-left: 16px solid #be7;
-}
-div.warning {
-  color: #840;
-  background: #fffce5;
-  border-left: 16px solid #ed5;
+/*
+text: 28
+border: 93
+background: 100
+*/
+ul.messages li.status { /* hue 90 */
+  color: #244700;
+  border-color: #d3edb9;
+  background-color: #f7fff0;
+}
+ul.messages li.warning { /* hue 53 */
+  color: #473f00;
+  border-color: #eee6a2;
+  background-color: #fffef2;
+}
+ul.messages li.error { /* hue 16 */
+  color: #471300;
+  border-color: #edc3b4;
+  background-color: #fef4f1;
 }
-div.error {
-  color: #8c2e0b;
-  background: #fef5f1;
-  border-left: 16px solid #ed541d;
-}
-div.error p.error {
+ul.messages li.error p.error {
   color: #333;
 }
-div.status {
-  color: #234600;
-  background: #f8fff0;
-  border-left: 16px solid #be7;
-}
 
 /**
  * Page title.
@@ -640,6 +638,15 @@
   background-color: #eee;
   color: #777;
 }
+.form-item input.error,
+.form-item textarea.error,
+.form-item select.error {
+  border: 2px solid #ed541d;
+}
+.marker,
+.form-required {
+  color: #ed541d;
+}
 
 /* Filter */
 .filter-wrapper {