diff --git a/include/admin/comments.inc.php b/include/admin/comments.inc.php
index 96136b34..02664d1c 100644
--- a/include/admin/comments.inc.php
+++ b/include/admin/comments.inc.php
@@ -62,7 +62,7 @@ if (isset($serendipity['GET']['adminAction']) && $serendipity['GET']['adminActio
     if (!empty($comment['comment'])) {
         if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
             echo '<script type="text/javascript">alert("' . COMMENT_ADDED . '"); parent.focus(); this.close();</script>';
-            echo '<noscript><p class="serendipityAdminMsgError serendipity_backend_msg_notice"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . COMMENT_ADDED . '</p></noscript>';
+            echo '<noscript><p class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . COMMENT_ADDED . '</p></noscript>';
             return true;
         } else {
             $errormsg .= COMMENT_NOT_ADDED;
diff --git a/include/admin/importers/movabletype.inc.php b/include/admin/importers/movabletype.inc.php
index 6215de77..4bee5108 100644
--- a/include/admin/importers/movabletype.inc.php
+++ b/include/admin/importers/movabletype.inc.php
@@ -446,7 +446,7 @@ class Serendipity_Import_MovableType extends Serendipity_Import {
                 unset($entry['s9y_comments']);
 
                 if ( !is_int($r = serendipity_updertEntry($entry)) ) {
-                    echo '<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . $r . '</div>';
+                    echo '<div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . $r . '</div>';
                 } else {
                     $this->debug('Saved entry ' . $r . ' (' . $entry['title'] . ')');
                     $entry['id'] = $r;
@@ -456,7 +456,7 @@ class Serendipity_Import_MovableType extends Serendipity_Import {
                             $cid = serendipity_db_insert_id('comments', 'id');
                             serendipity_approveComment($cid, $entry['id'], true);
                         } else {
-                            echo '<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . $rc . '</div>';
+                            echo '<div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . $rc . '</div>';
                         }
                     }
                     // Let the plugins do some additional stuff. Here it's used with
diff --git a/include/admin/tpl/category.inc.tpl b/include/admin/tpl/category.inc.tpl
index ccc3c916..98f2a5ce 100644
--- a/include/admin/tpl/category.inc.tpl
+++ b/include/admin/tpl/category.inc.tpl
@@ -1,22 +1,22 @@
 {if $post_save}
     {if $new}
-         <div class="serendipityAdminMsgSuccess">
-            <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
+         <div class="serendipityAdminMsgSuccess msg_success">
+            <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
             {$CONST.CATEGORY_SAVED}
          </div>
     {/if}
     {if $edit}
         {if isset($editPermission) && $editPermission == false}
-            <div class="serendipityAdminMsgError">
-                <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />
+            <div class="serendipityAdminMsgError msg_error">
+                <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />
                 {$CONST.PERM_DENIED}
             </div>
         {else}
             {if $subcat}
                 {$subcat}
             {else}
-                <div class="serendipityAdminMsgSuccess">
-                    <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
+                <div class="serendipityAdminMsgSuccess msg_success">
+                    <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
                     {$CONST.CATEGORY_SAVED}
                 </div>
             {/if}
@@ -26,8 +26,8 @@
 
 {if $doDelete}
     {if $deleteSuccess}
-        <div class="serendipityAdminMsgSuccess">
-            <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
+        <div class="serendipityAdminMsgSuccess msg_success">
+            <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
             {if $remainingCat}
                 {$CONST.CATEGORY_DELETED_ARTICLES_MOVED|sprintf:$remainingCat:$cid}
             {else}
@@ -35,8 +35,8 @@
             {/if}
         </div>
     {else}
-        <div class="serendipityAdminMsgError">
-            <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />
+        <div class="serendipityAdminMsgError msg_error">
+            <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />
             {$CONST.INVALID_CATEGORY}
         </div>
     {/if}
diff --git a/include/admin/tpl/comments.inc.tpl b/include/admin/tpl/comments.inc.tpl
index 21a6f224..954a1c59 100644
--- a/include/admin/tpl/comments.inc.tpl
+++ b/include/admin/tpl/comments.inc.tpl
@@ -1,5 +1,5 @@
 {if !empty($errormsg)}
-    <p class="serendipityAdminMsgError serendipity_backend_msg_notice"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />{$errormsg}</p>
+    <p class="serendipityAdminMsgError msg_notice"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />{$errormsg}</p>
 {/if}
 
 <script type="text/javascript">
@@ -153,7 +153,7 @@ function highlightComment(id, checkvalue) {
         <tr>
             <td class="{$comment.header_class}">
             {if !empty($comment.header_class)}
-                <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />
+                <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />
             {/if}
                 <a name="c{$comment.id}"></a>{* NOTE: a $comment.pubdate with 'c' is available *}
                 {($comment.type == 'NORMAL') ? $CONST.COMMENT : (($comment.type == 'TRACKBACK') ? $CONST.TRACKBACK : $CONST.PINGBACK )} #{$comment.id}, {$CONST.IN_REPLY_TO} <strong><a href="{$comment.entry_url}">{$comment.title|escape}</a></strong>{$CONST.ON} {$comment.timestamp|@formatTime:'%b %e %Y, %H:%M'}
diff --git a/include/admin/tpl/configuration.inc.tpl b/include/admin/tpl/configuration.inc.tpl
index 354d016d..58c09d13 100644
--- a/include/admin/tpl/configuration.inc.tpl
+++ b/include/admin/tpl/configuration.inc.tpl
@@ -1,8 +1,8 @@
 {if $installAction == "check"}
     {if $diagnosticError}
         {$CONST.DIAGNOSTIC_ERROR}
-        <div class="serendipityAdminMsgError">-
-            <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />
+        <div class="serendipityAdminMsgError msg_error">-
+            <img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />
             {foreach $res as $r}
                 {$r} <br />
             {/foreach}
@@ -21,8 +21,8 @@
             {/if}
         {/if}
         <br />
-        <div class="serendipityAdminMsgSuccess">
-            <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
+        <div class="serendipityAdminMsgSuccess msg_success">
+            <img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
             {$CONST.WRITTEN_N_SAVED}
         </div>
     {/if}
diff --git a/include/admin/tpl/entries.inc.tpl b/include/admin/tpl/entries.inc.tpl
index 07432fb8..a751a439 100644
--- a/include/admin/tpl/entries.inc.tpl
+++ b/include/admin/tpl/entries.inc.tpl
@@ -224,8 +224,8 @@
     <table class="serendipity_admin_list" cellpadding="0" width="100%">
 
         <tr>
-            <td align="center" class="serendipityAdminMsgNote">
-                <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />
+            <td align="center" class="serendipityAdminMsgNote msg_notice">
+                <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />
                 {$CONST.NO_ENTRIES_TO_PRINT}
             </td>
         </tr>
@@ -243,13 +243,13 @@
 {/if}
 {if ($get.adminAction && $use_legacy)}
     {if $is_draft}
-    <div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.IFRAME_SAVE_DRAFT}</div><br />
+    <div class="serendipityAdminMsgSuccess msg_success"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.IFRAME_SAVE_DRAFT}</div><br />
     {/if}
     {if $is_iframe}
-    <div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.IFRAME_SAVE}</div><br />
+    <div class="serendipityAdminMsgSuccess msg_success"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.IFRAME_SAVE}</div><br />
     {/if}
     {if $is_iframepreview}
-    <div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.IFRAME_PREVIEW}</div><br />
+    <div class="serendipityAdminMsgSuccess msg_success"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.IFRAME_PREVIEW}</div><br />
     {/if}
 {/if}
 {if ($is_doDelete || $is_doMultiDelete )}
diff --git a/include/admin/tpl/groups.inc.tpl b/include/admin/tpl/groups.inc.tpl
index 06e5776d..14cb5d42 100644
--- a/include/admin/tpl/groups.inc.tpl
+++ b/include/admin/tpl/groups.inc.tpl
@@ -1,19 +1,19 @@
 {if $delete_yes}
-    <div class="serendipityAdminMsgSuccess">
+    <div class="serendipityAdminMsgSuccess msg_success">
         <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
         {$CONST.DELETED_GROUP|sprintf:"{$group_id|escape:"html"}":"{$group.name|escape:"html"}"}
     </div>
 {/if}
 
 {if $save_new}
-    <div class="serendipityAdminMsgSuccess">
+    <div class="serendipityAdminMsgSuccess msg_success">
         <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
         {$CONST.CREATED_GROUP|sprintf:"{$group_id|escape:"html"}":"{$group.name|escape:"html"}"}
     </div>
 {/if}
 
 {if $save_edit}
-    <div class="serendipityAdminMsgSuccess">
+    <div class="serendipityAdminMsgSuccess msg_success">
         <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
         {$CONST.MODIFIED_GROUP|sprintf:"{$name|escape:"html"}"}
     </div>
diff --git a/include/admin/tpl/installer.inc.tpl b/include/admin/tpl/installer.inc.tpl
index aedbe015..404664de 100644
--- a/include/admin/tpl/installer.inc.tpl
+++ b/include/admin/tpl/installer.inc.tpl
@@ -2,7 +2,7 @@
 {if $is_errors && is_array($errors)}
 
     {foreach $errors AS $error}
-<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$error}</div>
+<div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$error}</div>
     {/foreach}
 
 {/if}
@@ -204,12 +204,12 @@
     </table>
 
     {if $showWritableNote}
-    <div class="serendipityAdminMsgNote"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />{$CONST.PROBLEM_PERMISSIONS_HOWTO|sprintf:'chmod 1777'}</div>
+    <div class="serendipityAdminMsgNote msg_notice"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />{$CONST.PROBLEM_PERMISSIONS_HOWTO|sprintf:'chmod 1777'}</div>
     {/if}
 
     <div align="center">
     {if $errorCount > 0}
-        <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$CONST.PROBLEM_DIAGNOSTIC}</div>
+        <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$CONST.PROBLEM_DIAGNOSTIC}</div>
         <h2><a href="serendipity_admin.php">{$CONST.RECHECK_INSTALLATION}</a></h2>
     {else}
         {$CONST.SELECT_INSTALLATION_TYPE}:
@@ -274,16 +274,16 @@
 {else}
     <strong>{$CONST.FAILED}</strong><br />
     {foreach $errors_sif AS $error_f}
-    <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$error_f}</div>
+    <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$error_f}</div>
     {/foreach}
 {/if}
 
 {if $s9y_installed}
-    <div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.SERENDIPITY_INSTALLED}</div>
+    <div class="serendipityAdminMsgSuccess msg_success"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.SERENDIPITY_INSTALLED}</div>
     <div align="center" style="font-size: large"><a href="{$smarty.post.serendipityHTTPPath}">{$CONST.VISIT_BLOG_HERE}</a></div>
     <div align="center">{$CONST.THANK_YOU_FOR_CHOOSING}</div>
 {else}
-    <div class="serendipityAdminMsgError"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$CONST.ERROR_DETECTED_IN_INSTALL}</div>
+    <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$CONST.ERROR_DETECTED_IN_INSTALL}</div>
 {/if}
 
 {/if}{* getstepint3 end *}
diff --git a/include/admin/tpl/personal.inc.tpl b/include/admin/tpl/personal.inc.tpl
index aa422d50..53439b8c 100644
--- a/include/admin/tpl/personal.inc.tpl
+++ b/include/admin/tpl/personal.inc.tpl
@@ -1,12 +1,12 @@
 {if $adminAction == "save"}
     {if $not_authorized}
-        <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</div>
+        <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</div>
     {elseif $empty_username}
-        <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.USERCONF_CHECK_USERNAME_ERROR}</div>
+        <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.USERCONF_CHECK_USERNAME_ERROR}</div>
     {elseif $password_check_fail}
-        <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.USERCONF_CHECK_PASSWORD_ERROR}</div>
+        <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.USERCONF_CHECK_PASSWORD_ERROR}</div>
     {else}
-        <div class="serendipityAdminMsgSuccess"><img width="22px" height="22px" style="border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />{$CONST.MODIFIED_USER|sprintf:"{$realname|escape:"html"}"} ?></div>
+        <div class="serendipityAdminMsgSuccess msg_success"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />{$CONST.MODIFIED_USER|sprintf:"{$realname|escape:"html"}"} ?></div>
     {/if}
 {/if}
 
diff --git a/include/admin/tpl/plugins.inc.tpl b/include/admin/tpl/plugins.inc.tpl
index caf628ed..37a117ce 100644
--- a/include/admin/tpl/plugins.inc.tpl
+++ b/include/admin/tpl/plugins.inc.tpl
@@ -1,7 +1,7 @@
 {if $plugin_to_conf}
     {if is_array($save_errors)}
-        <div class="serendipityAdminMsgError">
-            <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />
+        <div class="serendipityAdminMsgError msg_error">
+            <img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />
             {$CONST.ERROR}:<br />
             <ul>
                 {foreach $save_errors as $save_error}
@@ -10,8 +10,8 @@
             </ul>
         </div>
     {elseif $saveconf}
-        <div class="serendipityAdminMsgSuccess">
-            <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
+        <div class="serendipityAdminMsgSuccess msg_success">
+            <img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
             {$CONST.DONE}: {$CONST.SETTINGS_SAVED_AT|sprintf:"$timestamp"}
         </div>
     {/if}
@@ -165,8 +165,8 @@
     </table>
 {else}
     {if $save}
-        <div class="serendipityAdminMsgSuccess">
-            <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
+        <div class="serendipityAdminMsgSuccess msg_success">
+            <img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
             {$CONST.DONE}:{$CONST.SETTINGS_SAVED_AT|sprintf:"$timestamp"}</div>
     {/if}
     <div>{$CONST.BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS}</div>
@@ -179,7 +179,7 @@
     
     <h3>{$CONST.SIDEBAR_PLUGINS}</h3>
     <a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew" class="serendipityIconLink">
-        <img src="{serendipity_getFile file="admin/img/install.png"}" style="border: 0px none ; vertical-align: middle; display: inline;" alt="" />
+        <img src="{serendipity_getFile file="admin/img/install.png"}" style="border: 0px none; vertical-align: middle; display: inline;" alt="" />
         {$CONST.CLICK_HERE_TO_INSTALL_PLUGIN|sprintf:"{$CONST.SIDEBAR_PLUGIN}"}
     </a>
     {$backend_plugins_sidebar_header}
diff --git a/include/admin/tpl/templates.inc.tpl b/include/admin/tpl/templates.inc.tpl
index 8244bbca..4c8dbafc 100644
--- a/include/admin/tpl/templates.inc.tpl
+++ b/include/admin/tpl/templates.inc.tpl
@@ -1,13 +1,13 @@
 {if $adminAction == "install"}
-    <div class="serendipityAdminMsgSuccess">
-        <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
+    <div class="serendipityAdminMsgSuccess msg_success">
+        <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
             {$install_template|string_format:"{$CONST.TEMPLATE_SET}"}
     </div>
 {/if}
 
 {if $deprecated}
-    <div class="serendipityAdminMsgNote">
-        <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />
+    <div class="serendipityAdminMsgNote msg_notice">
+        <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />
         {$CONST.WARNING_TEMPLATE_DEPRECATED}
     </div>
 {/if}
@@ -16,8 +16,8 @@
 
 {if $has_config}
     {if $adminAction == "configure"}
-        <div class="serendipityAdminMsgSuccess">
-            <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
+        <div class="serendipityAdminMsgSuccess msg_success">
+            <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
             {$CONST.DONE}: {$save_time}
         </div>
     {/if}
@@ -49,7 +49,7 @@
             <td colspan="2"><span class="serendipityTemplateSelectName"><strong>{$info.info.name}</strong></span></td>
             <td valign="middle" align="center" width="70" rowspan="2">
     {if $template != $cur_template}
-        {if ! $info.unmetRequirements}
+        {if !$info.unmetRequirements}
             <a href="?serendipity[adminModule]=templates&amp;serendipity[adminAction]=install&amp;serendipity[theme]={$template}{$info.info.customURI}">
                 <img src="{serendipity_getFile file="admin/img/install_now{$info.info.customIcon}.png"}" alt="{$CONST.SET_AS_TEMPLATE}" title="{$CONST.SET_AS_TEMPLATE}" border="0" />
             </a>
diff --git a/include/admin/tpl/upgrader.inc.tpl b/include/admin/tpl/upgrader.inc.tpl
index 28013b95..3bf3df7a 100644
--- a/include/admin/tpl/upgrader.inc.tpl
+++ b/include/admin/tpl/upgrader.inc.tpl
@@ -11,7 +11,7 @@
 
     {if $errors}
         {$CONST.DIAGNOSTIC_ERROR}<br /><br />
-        <div class="serendipityAdminMsgError">- <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{foreach $errors AS $implode_err}{$implode_err}{if (count($errors) > 1) && !$implode_err@last}<br /> {/if}{/foreach}</div><br /><br />
+        <div class="serendipityAdminMsgError msg_error">- <img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{foreach $errors AS $implode_err}{$implode_err}{if (count($errors) > 1) && !$implode_err@last}<br /> {/if}{/foreach}</div><br /><br />
     {/if}
 
 {/if}
@@ -21,11 +21,12 @@
     {if $get.action == 'ignore'}
         {$CONST.SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED}
     {elseif $get.action == 'upgrade'}
-        <div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.SERENDIPITY_UPGRADER_NOW_UPGRADED|sprintf:$s9y_version}</div>
+        <div class="serendipityAdminMsgSuccess msg_success"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />{$CONST.SERENDIPITY_UPGRADER_NOW_UPGRADED|sprintf:$s9y_version}</div>
     {/if}
     <br />
     {if $return_here}
     <div align="center">{$print_UPGRADER_RETURN_HERE}</div>
+{* could also be used as:   <div align="center">{$CONST.SERENDIPITY_UPGRADER_RETURN_HERE|sprintf:'<a href="{$serendipityHTTPPath}">':'</a>'}</div> *}
     {/if}
 {else}
     <h2>{$CONST.SERENDIPITY_UPGRADER_WELCOME}</h2>
@@ -88,12 +89,12 @@
         </div>
 
     {if $showWritableNote}
-        <div class="serendipityAdminMsgNote"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />{$CONST.PROBLEM_PERMISSIONS_HOWTO|sprintf:'chmod 1777'}</div>
+        <div class="serendipityAdminMsgNote msg_notice"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_note.png'}" alt="" />{$CONST.PROBLEM_PERMISSIONS_HOWTO|sprintf:'chmod 1777'}</div>
     {/if}
 
     {if ($errorCount > 0)}
         <div align="center">
-            <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$CONST.PROBLEM_DIAGNOSTIC}</div>
+            <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$CONST.PROBLEM_DIAGNOSTIC}</div>
             <h2><a href="serendipity_admin.php">{$CONST.RECHECK_INSTALLATION}</a></h2>
         </div>
     {/if}
diff --git a/include/admin/tpl/users.inc.tpl b/include/admin/tpl/users.inc.tpl
index dfa0b57a..50080f8a 100644
--- a/include/admin/tpl/users.inc.tpl
+++ b/include/admin/tpl/users.inc.tpl
@@ -1,17 +1,17 @@
 {if $delete_yes}
     {if $no_delete_permission}
-        <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED}</div>
+        <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED}</div>
     {else}
         {if $no_delete_permission_userlevel}
-            <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</div>
+            <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</div>
         {else}
             {if $delete_permission}
-                <div class="serendipityAdminMsgSuccess">
-                    <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
+                <div class="serendipityAdminMsgSuccess msg_success">
+                    <img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
                     {$CONST.DELETED_USER|sprintf:"{$user|escape:"html"}":"{$realname|escape:"html"}"}
                 </div>
             {else}
-                <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</div>
+                <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</div>
             {/if}
         {/if}
     {/if}
@@ -19,13 +19,13 @@
 
 {if $save_new}
     {if $no_save_permission}
-        <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED}</div>
+        <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED}</div>
     {else}
         {if $no_group_selected}
-            <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.WARNING_NO_GROUPS_SELECTED}</div>
+            <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.WARNING_NO_GROUPS_SELECTED}</div>
         {/if}
-        <div class="serendipityAdminMsgSuccess">
-            <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
+        <div class="serendipityAdminMsgSuccess msg_success">
+            <img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
             {$CONST.CREATED_USER|sprintf:"# {$user|escape:"html"}":"{$realname|escape:"html"}"}
             </div>
     {/if}
@@ -33,19 +33,19 @@
 
 {if $save_edit}
     {if $no_edit_permission}
-        <div class="serendipityAdminMsgError">
-            <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />
+        <div class="serendipityAdminMsgError msg_error">
+            <img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />
             {$CONST.CREATE_NOT_AUTHORIZED}
         </div>
     {else}
         {if $no_edit_permission_userlevel}
-            <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</div>
+            <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.CREATE_NOT_AUTHORIZED_USERLEVEL}</div>
         {else}
             {if $no_group_selected}
-                <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.WARNING_NO_GROUPS_SELECTED}</div>
+                <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />{$CONST.WARNING_NO_GROUPS_SELECTED}</div>
             {/if}
-            <div class="serendipityAdminMsgSuccess">
-                <img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
+            <div class="serendipityAdminMsgSuccess msg_success">
+                <img class="img_error" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
                 {$CONST.MODIFIED_USER|sprintf:"{$realname|escape:"html"}"}
                 </div>
         {/if}
diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 5c45b3f5..63d02258 100644
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -815,7 +815,7 @@ function serendipity_iframe(&$entry, $mode = null, $use_smarty = true) {
                     echo '<script type="text/javascript">parent.document.forms[\'serendipityEntry\'][\'serendipity[id]\'].value = "' . $serendipity['lastSavedEntry'] . '";</script>';
                 }
                 $entrylink = serendipity_archiveURL($res, $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp']));
-                echo '<div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_success.png') . '" alt="" />' . ENTRY_SAVED . ' (<a href="' . $entrylink . '" target="_blank">' . VIEW . '</a>)</div>';
+                echo '<div class="serendipityAdminMsgSuccess msg_success"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_success.png') . '" alt="" />' . ENTRY_SAVED . ' (<a href="' . $entrylink . '" target="_blank">' . VIEW . '</a>)</div>';
             }
             echo '<br style="clear: both" />';
 
@@ -1999,7 +1999,7 @@ function serendipity_reportXSRF($type = 0, $reset = true, $use_config = false) {
     // Set this in your serendipity_config_local.inc.php if you want HTTP Referrer blocking:
     // $serendipity['referrerXSRF'] = true;
 
-    $string = '<div class="serendipityAdminMsgError XSRF_' . $type . '"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . ERROR_XSRF . '</div>';
+    $string = '<div class="serendipityAdminMsgError msg_error XSRF_' . $type . '"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . ERROR_XSRF . '</div>';
     if ($reset) {
         // Config key "referrerXSRF" can be set to enable blocking based on HTTP Referrer. Recommended for Paranoia.
         if (($use_config && isset($serendipity['referrerXSRF']) && $serendipity['referrerXSRF']) || $use_config === false) {
diff --git a/include/functions_entries_admin.inc.php b/include/functions_entries_admin.inc.php
index a163d50b..2c1faa6a 100644
--- a/include/functions_entries_admin.inc.php
+++ b/include/functions_entries_admin.inc.php
@@ -187,7 +187,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
     /* HTML CODE BELOW IS FOR FALLBACK PORTABILITY ONLY - MODIFY CODE IN TEMPLATE ADMIN/ENTRIES.TPL INSTEAD! */
     if (!empty($errMsg)) {
 ?>
-        <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="<?php echo serendipity_getTemplateFile('admin/img/admin_msg_error.png'); ?>" alt="" /><?php echo $errMsg; ?></div>
+        <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="<?php echo serendipity_getTemplateFile('admin/img/admin_msg_error.png'); ?>" alt="" /><?php echo $errMsg; ?></div>
 <?php } ?>
         <form <?php echo $entry['entry_form']; ?> action="<?php echo $targetURL; ?>" method="post" id="serendipityEntry" style="margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px">
         <?php echo $hidden; ?>
diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 5e2a55c5..11d28a6b 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -668,7 +668,7 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb
             }
             exec($cmd, $output, $result);
             if ($result != 0) {
-                echo '<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
+                echo '<div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
                 $r = false; // return failure
             } else {
                touch($outfile);
@@ -712,7 +712,7 @@ function serendipity_scaleImg($id, $width, $height) {
         $cmd = escapeshellcmd($serendipity['convert']) . ' -scale ' .  serendipity_escapeshellarg($width . 'x' . $height) . ' ' . serendipity_escapeshellarg($infile) . ' ' . serendipity_escapeshellarg($outfile);
         exec($cmd, $output, $result);
         if ( $result != 0 ) {
-            echo '<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
+            echo '<div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
         }
         unset($output, $result);
     }
@@ -759,7 +759,7 @@ function serendipity_rotateImg($id, $degrees) {
         $cmd = escapeshellcmd($serendipity['convert']) . ' -rotate ' . serendipity_escapeshellarg($degrees) . ' ' . serendipity_escapeshellarg($infile) . ' ' . serendipity_escapeshellarg($outfile);
         exec($cmd, $output, $result);
         if ( $result != 0 ) {
-            echo '<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
+            echo '<div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
         }
         unset($output, $result);
 
@@ -767,7 +767,7 @@ function serendipity_rotateImg($id, $degrees) {
         $cmd = escapeshellcmd($serendipity['convert']) . ' -rotate ' . serendipity_escapeshellarg($degrees) . ' ' . serendipity_escapeshellarg($infileThumb) . ' ' . serendipity_escapeshellarg($outfileThumb);
         exec($cmd, $output, $result);
         if ( $result != 0 ) {
-            echo '<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />'. sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
+            echo '<div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />'. sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
         }
         unset($output, $result);
 
@@ -827,7 +827,7 @@ function serendipity_generateThumbs() {
                     }
                     echo '<li>' . $sThumb . ': ' . $returnsize[0] . 'x' . $returnsize[1] . "</li>\n";
                     if (!file_exists($newThumb)) {
-                        printf('<li><div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . THUMBNAIL_FAILED_COPY . '</div></li>' . "\n", $sThumb);
+                        printf('<li><div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . THUMBNAIL_FAILED_COPY . '</div></li>' . "\n", $sThumb);
                     } else {
                         $update = true;
                     }
@@ -843,7 +843,7 @@ function serendipity_generateThumbs() {
                     printf('<li>' . THUMBNAIL_USING_OWN . '</li>' . "\n", $sThumb);
                     $update = true;
                 } else {
-                    printf('<li><div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . THUMBNAIL_FAILED_COPY . '</div></li>' . "\n", $sThumb);
+                    printf('<li><div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . THUMBNAIL_FAILED_COPY . '</div></li>' . "\n", $sThumb);
                 }
             }
 
diff --git a/plugins/serendipity_event_karma/serendipity_event_karma.php b/plugins/serendipity_event_karma/serendipity_event_karma.php
index 73bbe564..382d17be 100644
--- a/plugins/serendipity_event_karma/serendipity_event_karma.php
+++ b/plugins/serendipity_event_karma/serendipity_event_karma.php
@@ -1727,7 +1727,7 @@ function invertSelection() {
 ");
                     } else {
                         print("
-<div class='serendipityAdminMsgNotice'>No entries to display.</div>
+<div class='serendipityAdminMsgNote msg_notice'>No entries to display.</div>
 ");
                     }
 
diff --git a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
index da433490..a79ba22a 100644
--- a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
+++ b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
@@ -63,13 +63,13 @@ class serendipity_event_nl2br extends serendipity_event
         if ( serendipity_db_bool($this->get_config('isobr')) === true ) { 
             if( serendipity_db_bool($this->get_config('clean_tags')) === true ) { 
                 $this->set_config('clean_tags', false);
-                echo '<div class="serendipityAdminMsgError"><img class="backend_attention" src="' . $serendipity['serendipityHTTPPath'] . 'templates/default/admin/img/admin_msg_note.png" alt="" />';
+                echo '<div class="serendipityAdminMsgError msg_error"><img class="backend_attention" src="' . $serendipity['serendipityHTTPPath'] . 'templates/default/admin/img/admin_msg_note.png" alt="" />';
                 echo sprintf(PLUGIN_EVENT_NL2BR_CONFIG_ERROR, 'clean_tags', 'ISOBR') . '</div>';
                 return false;
             }
             if ( serendipity_db_bool($this->get_config('p_tags')) === true ) { 
                 $this->set_config('p_tags', false);
-                echo '<div class="serendipityAdminMsgError"><img class="backend_attention" src="' . $serendipity['serendipityHTTPPath'] . 'templates/default/admin/img/admin_msg_note.png" alt="" />';
+                echo '<div class="serendipityAdminMsgError msg_error"><img class="backend_attention" src="' . $serendipity['serendipityHTTPPath'] . 'templates/default/admin/img/admin_msg_note.png" alt="" />';
                 echo sprintf(PLUGIN_EVENT_NL2BR_CONFIG_ERROR, 'p_tags', 'ISOBR') . '</div>';
                 return false;
             }
@@ -77,7 +77,7 @@ class serendipity_event_nl2br extends serendipity_event
         /* check possible config mismatch setting in combination with P_TAGS */
         if ( serendipity_db_bool($this->get_config('p_tags')) === true && serendipity_db_bool($this->get_config('clean_tags')) === true ) { 
             $this->set_config('clean_tags', false);
-            echo '<div class="serendipityAdminMsgError"><img class="backend_attention" src="' . $serendipity['serendipityHTTPPath'] . 'templates/default/admin/img/admin_msg_note.png" alt="" />';
+            echo '<div class="serendipityAdminMsgError msg_error"><img class="backend_attention" src="' . $serendipity['serendipityHTTPPath'] . 'templates/default/admin/img/admin_msg_note.png" alt="" />';
             echo sprintf(PLUGIN_EVENT_NL2BR_CONFIG_ERROR, 'clean_tags', 'P_TAGS') . '</div>';
             return false;
         }
diff --git a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
index 8fe0b719..8ce6aa3d 100644
--- a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
+++ b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
@@ -352,16 +352,16 @@ class serendipity_event_spartacus extends serendipity_event
     function outputMSG($status, $msg) {
         switch($status) {
             case 'notice':
-                echo '<div class="serendipityAdminMsgNotice"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_note.png') . '" alt="" />' . $msg . '</div>' . "\n";
+                echo '<div class="serendipityAdminMsgNote msg_notice"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_note.png') . '" alt="" />' . $msg . '</div>' . "\n";
                 break;
 
             case 'error':
-                echo '<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . $msg . '</div>' . "\n";
+                echo '<div class="serendipityAdminMsgError msg_error"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . $msg . '</div>' . "\n";
                 break;
 
             default:
             case 'success':
-                echo '<div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_success.png') . '" alt="" />' . $msg . '</div>' . "\n";
+                echo '<div class="serendipityAdminMsgSuccess msg_success"><img class="img_error" src="' . serendipity_getTemplateFile('admin/img/admin_msg_success.png') . '" alt="" />' . $msg . '</div>' . "\n";
                 break;
         }
     }
@@ -1089,7 +1089,7 @@ class serendipity_event_spartacus extends serendipity_event
 
                 case 'backend_pluginlisting_header':
                     if (serendipity_db_bool($this->get_config('enable_plugins'))) {
-                        echo '<br /><div id="upgrade_notice" class="serendipityAdminMsgSuccess">';
+                        echo '<br /><div id="upgrade_notice" class="serendipityAdminMsgSuccess msg_success">';
                         echo '<a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[only_group]=UPGRADE" class="serendipityIconLink upgrade_sidebar"><img src="' . serendipity_getTemplateFile('admin/img/upgrade_now.png') . '" style="border: 0px none ; vertical-align: middle; display: inline;" alt="" />' . PLUGIN_EVENT_SPARTACUS_CHECK_SIDEBAR . '</a> &nbsp; ';
                         echo '<a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[only_group]=UPGRADE&amp;serendipity[type]=event" class="serendipityIconLink upgrade_event"><img src="' . serendipity_getTemplateFile('admin/img/upgrade_now.png') . '" style="border: 0px none ; vertical-align: middle; display: inline;" alt="" />' . PLUGIN_EVENT_SPARTACUS_CHECK_EVENT . '</a> ';
                         echo '</div>';
diff --git a/serendipity_admin.php b/serendipity_admin.php
index a52e1c77..6d674042 100644
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -237,16 +237,16 @@ if (!$use_installer && $is_logged_in) {
             echo '<div class="serendipity_admin_title">' . INTEGRITY . '</div>';
             $badsums = array();
             if (!is_readable(S9Y_INCLUDE_PATH . 'checksums.inc.php')) {
-                echo '<span class="serendipityAdminMsgNote">' . CHECKSUMS_NOT_FOUND . '</span>';
+                echo '<span class="serendipityAdminMsgNote msg_notice">' . CHECKSUMS_NOT_FOUND . '</span>';
                 break;
             }
             $badsums = serendipity_verifyFTPChecksums();
             if (count($badsums) == 0) {
-                echo '<span class="serendipityAdminMsgSuccess">' . CHECKSUMS_PASS . '</span>';
+                echo '<span class="serendipityAdminMsgSuccess msg_success">' . CHECKSUMS_PASS . '</span>';
             } else {
                 echo '<ul>';
                 foreach ($badsums as $rpath => $calcsum) {
-                    echo '<li class="serendipityAdminMsgError">' . sprintf(CHECKSUM_FAILED, $rpath) . '</li>';
+                    echo '<li class="serendipityAdminMsgError msg_error">' . sprintf(CHECKSUM_FAILED, $rpath) . '</li>';
                 }
                 echo '</ul>';
             }
@@ -372,7 +372,7 @@ if ($use_installer) {
                     <h3><?php echo PLEASE_ENTER_CREDENTIALS ?></h3></div>
                     <?php echo $out['header']; ?>
                     <?php if ($post_action != '' && !$is_logged_in ) { ?>
-                    <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="<?php echo serendipity_getTemplateFile('admin/img/admin_msg_error.png'); ?>" alt="" /><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>
+                    <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="<?php echo serendipity_getTemplateFile('admin/img/admin_msg_error.png'); ?>" alt="" /><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>
                     <?php } ?>
                     <form action="serendipity_admin.php" method="post">
                         <input type="hidden" name="serendipity[action]" value="admin" />
diff --git a/templates/default/admin/entries.tpl b/templates/default/admin/entries.tpl
index f34944cd..93c44cb2 100644
--- a/templates/default/admin/entries.tpl
+++ b/templates/default/admin/entries.tpl
@@ -1,7 +1,7 @@
 <!-- ADMIN-ENTRY TEMPLATE: entries.tpl START -->
 {*** POSSIBLE ERROR MESSAGES START ***}
 {if $entry_vars.errMsg}
-    <div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$entry_vars.errMsg}</div>
+    <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$entry_vars.errMsg}</div>
 {/if}
 {*** POSSIBLE ERROR MESSAGES END ***}
 {*** MAIN ENTRY FORM START ***}
diff --git a/templates/default/admin/index.tpl b/templates/default/admin/index.tpl
index a2ff82fe..f8321d56 100644
--- a/templates/default/admin/index.tpl
+++ b/templates/default/admin/index.tpl
@@ -85,7 +85,7 @@
                         {$admin_vars.out.header}
                     </div>
                     {if $admin_vars.post_action != '' AND NOT $admin_vars.is_logged_in}
-                        <div class="serendipityAdminMsgError"><img width="22px" height="22px" style="border: 0px; padding-right: 2px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$CONST.WRONG_USERNAME_OR_PASSWORD}</div>
+                        <div class="serendipityAdminMsgError msg_error"><img class="img_error" src="{serendipity_getFile file='admin/img/admin_msg_error.png'}" alt="" />{$CONST.WRONG_USERNAME_OR_PASSWORD}</div>
                     {/if}
                     <form action="serendipity_admin.php" method="post">
                         <input type="hidden" name="serendipity[action]" value="admin" />
diff --git a/templates/default/admin/style.css b/templates/default/admin/style.css
index a2da7c9a..caf7c247 100644
--- a/templates/default/admin/style.css
+++ b/templates/default/admin/style.css
@@ -130,7 +130,13 @@ body {
     margin: 10px;
 }
 
-
+.img_error { 
+    width: 22px; 
+    height: 22px; 
+    border: 0px; 
+    padding-right: 4px; 
+    vertical-align: middle;
+}
 
 td, th {
     font-size: 0.8em;