Index: modules/dblog/dblog.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v
retrieving revision 1.5
diff -u -r1.5 dblog.admin.inc
--- modules/dblog/dblog.admin.inc	19 Dec 2007 17:45:42 -0000	1.5
+++ modules/dblog/dblog.admin.inc	4 Jan 2008 14:51:46 -0000
@@ -31,14 +31,24 @@
   $filter = dblog_build_filter_query();
   $rows = array();
   $icons = array(
-    WATCHDOG_NOTICE  => '',
-    WATCHDOG_WARNING => theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning')),
-    WATCHDOG_ERROR   => theme('image', 'misc/watchdog-error.png', t('error'), t('error')),
+    WATCHDOG_DEBUG    => theme('image', 'misc/debug.png', t('debug'), t('debug')),
+    WATCHDOG_INFO     => theme('image', 'misc/info.png', t('info'), t('info')),
+    WATCHDOG_NOTICE   => theme('image', 'misc/notice.png', t('notice'), t('notice')),
+    WATCHDOG_WARNING  => theme('image', 'misc/warning.png', t('warning'), t('warning')),
+    WATCHDOG_ERROR    => theme('image', 'misc/error.png', t('error'), t('error')),
+    WATCHDOG_CRITICAL => theme('image', 'misc/critical.png', t('critical'), t('critical')),
+    WATCHDOG_ALERT    => theme('image', 'misc/alert.png', t('alert'), t('alert')),
+    WATCHDOG_EMERG    => theme('image', 'misc/emerg.png', t('emerg'), t('emerg'))
   );
   $classes = array(
-    WATCHDOG_NOTICE => 'dblog-notice',
-    WATCHDOG_WARNING => 'dblog-warning',
-    WATCHDOG_ERROR => 'dblog-error',
+    WATCHDOG_DEBUG    => 'dblog-debug',
+    WATCHDOG_INFO     => 'dblog-info',
+    WATCHDOG_NOTICE   => 'dblog-notice',
+    WATCHDOG_WARNING  => 'dblog-warning',
+    WATCHDOG_ERROR    => 'dblog-error',
+    WATCHDOG_CRITICAL => 'dblog-critical',
+    WATCHDOG_ALERT    => 'dblog-alert',
+    WATCHDOG_EMERG    => 'dblog-emerg'
   );

   $output = drupal_get_form('dblog_filter_form');
Index: modules/system/admin.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/admin.css,v
retrieving revision 1.18
diff -u -r1.18 admin.css
--- modules/system/admin.css	22 Dec 2007 23:24:25 -0000	1.18
+++ modules/system/admin.css	4 Jan 2008 14:51:46 -0000
@@ -74,13 +74,13 @@
   padding-bottom: 6px;
 }
 table.system-status-report tr.error th {
-  background-image: url(../../misc/watchdog-error.png);
+  background-image: url(../../misc/error.png);
 }
 table.system-status-report tr.warning th {
-  background-image: url(../../misc/watchdog-warning.png);
+  background-image: url(../../misc/warning.png);
 }
 table.system-status-report tr.ok th {
-  background-image: url(../../misc/watchdog-ok.png);
+  background-image: url(../../misc/ok.png);
 }

 /**
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.48
diff -u -r1.48 system.admin.inc
--- modules/system/system.admin.inc	31 Dec 2007 17:20:20 -0000	1.48
+++ modules/system/system.admin.inc	4 Jan 2008 14:51:47 -0000
@@ -2060,12 +2060,12 @@
       $description = drupal_render($form['description'][$key]);
       if (isset($form['status']['#incompatible_modules_core'][$key])) {
         unset($form['status'][$key]);
-        $status = theme('image', 'misc/watchdog-error.png', t('incompatible'), t('Incompatible with this version of Drupal core'));
+        $status = theme('image', 'misc/error.png', t('incompatible'), t('Incompatible with this version of Drupal core'));
         $description .= '<div class="incompatible">'. t('This version is incompatible with the !core_version version of Drupal core.', array('!core_version' => VERSION)) .'</div>';
       }
       elseif (isset($form['status']['#incompatible_modules_php'][$key])) {
         unset($form['status'][$key]);
-        $status = theme('image', 'misc/watchdog-error.png', t('incompatible'), t('Incompatible with this version of PHP'));
+        $status = theme('image', 'misc/error.png', t('incompatible'), t('Incompatible with this version of PHP'));
         $php_required = $form['status']['#incompatible_modules_php'][$key];
         if (substr_count($php_required, '.') < 2) {
           $php_required .= '.*';
@@ -2190,12 +2190,12 @@
     // Make sure it is compatible and render the checkbox if so.
     if (isset($form['status']['#incompatible_themes_core'][$key])) {
       unset($form['status'][$key]);
-      $status = theme('image', 'misc/watchdog-error.png', t('incompatible'), t('Incompatible with this version of Drupal core'));
+      $status = theme('image', 'misc/error.png', t('incompatible'), t('Incompatible with this version of Drupal core'));
       $description .= '<div class="incompatible">'. t('This version is incompatible with the !core_version version of Drupal core.', array('!core_version' => VERSION)) .'</div>';
     }
     elseif (isset($form['status']['#incompatible_themes_php'][$key])) {
       unset($form['status'][$key]);
-      $status = theme('image', 'misc/watchdog-error.png', t('incompatible'), t('Incompatible with this version of PHP'));
+      $status = theme('image', 'misc/error.png', t('incompatible'), t('Incompatible with this version of PHP'));
       $php_required = $form['status']['#incompatible_themes_php'][$key];
       if (substr_count($php_required, '.') < 2) {
         $php_required .= '.*';
Index: modules/update/update.report.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.report.inc,v
retrieving revision 1.7
diff -u -r1.7 update.report.inc
--- modules/update/update.report.inc	1 Jan 2008 18:03:12 -0000	1.7
+++ modules/update/update.report.inc	4 Jan 2008 14:51:47 -0000
@@ -45,20 +45,20 @@
     switch ($project['status']) {
       case UPDATE_CURRENT:
         $class = 'ok';
-        $icon = theme('image', 'misc/watchdog-ok.png');
+        $icon = theme('image', 'misc/ok.png');
         break;
       case UPDATE_NOT_SECURE:
       case UPDATE_NOT_CURRENT:
         if ($notification_level == 'all'
             || $project['status'] == UPDATE_NOT_SECURE) {
           $class = 'error';
-          $icon = theme('image', 'misc/watchdog-error.png');
+          $icon = theme('image', 'misc/error.png');
           break;
         }
         // Otherwise, deliberate no break and use the warning class/icon.
       default:
         $class = 'warning';
-        $icon = theme('image', 'misc/watchdog-warning.png');
+        $icon = theme('image', 'misc/warning.png');
         break;
     }

Index: themes/garland/style-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style-rtl.css,v
retrieving revision 1.6
diff -u -r1.6 style-rtl.css
--- themes/garland/style-rtl.css	17 Dec 2007 15:05:10 -0000	1.6
+++ themes/garland/style-rtl.css	4 Jan 2008 14:51:47 -0000
@@ -64,7 +64,7 @@
 }

 ol.task-list li.done {
-  background: transparent url(../../misc/watchdog-ok.png) no-repeat 100% 50%;
+  background: transparent url(../../misc/ok.png) no-repeat 100% 50%;
 }

 ol.task-list li.active {
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.36
diff -u -r1.36 style.css
--- themes/garland/style.css	29 Dec 2007 16:02:52 -0000	1.36
+++ themes/garland/style.css	4 Jan 2008 14:51:47 -0000
@@ -163,7 +163,7 @@
 }
 ol.task-list li.done {
   color: #393;
-  background: transparent url(../../misc/watchdog-ok.png) no-repeat 0px 50%; /* LTR */
+  background: transparent url(../../misc/ok.png) no-repeat 0px 50%; /* LTR */
 }
 ol.task-list li.active {
   margin-right: 1em; /* LTR */