diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index f8fa08358bb..6e825008fdb 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -910,7 +910,7 @@ function  glossary_print_entry_approval($cm, $entry, $mode,$align="right",$insid
         if ($insidetable) {
             echo '<table class="glossaryapproval" align="'.$align.'"><tr><td align="'.$align.'">';
         }
-        echo '<a title="'.get_string('approve','glossary').'" href="approve.php?id='.$cm->id.'&amp;eid='.$entry->id.'&amp;mode='.$mode.'"><img align="'.$align.'" src="check.gif" border="0" width="34" height="34" alt="'.get_string('approve','glossary').'" /></a>';
+        echo '<a title="'.get_string('approve','glossary').'" href="approve.php?id='.$cm->id.'&amp;eid='.$entry->id.'&amp;mode='.$mode.'"><img align="'.$align.'" src="check.gif" style="border:0px; width:34px; height:34px" alt="'.get_string('approve','glossary').'" /></a>';
         if ($insidetable) {
             echo '</td></tr></table>';
         }
diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php
index 1898666c905..1d15ee6e9f9 100644
--- a/mod/hotpot/index.php
+++ b/mod/hotpot/index.php
@@ -307,7 +307,7 @@
                     // Show the zoom boxes
                     if ($displaysection==$hotpot->section) {
                         $strshowall = get_string('showall'.$course->format);
-                        $printsection .= '<br /><a href="index.php?id='.$course->id.'&section=all" title="'.$strshowall.'"><img src="'.$CFG->pixpath.'/i/all.gif" height=25 width=16 border=0 alt="'.$strshowall.'"></a><br />';
+                        $printsection .= '<br /><a href="index.php?id='.$course->id.'&section=all" title="'.$strshowall.'"><img src="'.$CFG->pixpath.'/i/all.gif" style="height:25px; width:16px; border:0px" alt="'.$strshowall.'"></a><br />';
                     } else {
                         $strshowone = get_string('showonly'.preg_replace('|s$|', '', $course->format, 1), '', $hotpot->section);
                         $printsection .=  '<br /><a href="index.php?id='.$course->id.'&section='.$hotpot->section.'" title="'.$strshowone.'"><img src="'.$CFG->pixpath.'/i/one.gif" class="icon" alt="'.$strshowone.'"></a><br />';
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 5cfc20dc10a..7d5ebcd5035 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -212,15 +212,15 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true, $r
                 echo '<td><hr noshade="noshade" /></td><td width="45">';
                 if ($count > 1) {
                     echo "<a title=\"$strmoveup\" href=\"edit.php?up=$count&amp;quizid=$quiz->id&amp;sesskey=$USER->sesskey\"><img
-                         src=\"$CFG->pixpath/t/up.gif\" border=\"0\" alt=\"$strmoveup\" /></a>";
+                         src=\"$CFG->pixpath/t/up.gif\" class=\"iconsmall\" alt=\"$strmoveup\" /></a>";
                 }
                 echo '&nbsp;';
                 if ($count < $lastindex) {
                     echo "<a title=\"$strmovedown\" href=\"edit.php?down=$count&amp;quizid=$quiz->id&amp;sesskey=$USER->sesskey\"><img
-                         src=\"$CFG->pixpath/t/down.gif\" border=\"0\" alt=\"$strmovedown\" /></a>";
+                         src=\"$CFG->pixpath/t/down.gif\" class=\"iconsmall\" alt=\"$strmovedown\" /></a>";
 
                     echo "<a title=\"$strremove\" href=\"edit.php?delete=$count&amp;quizid=$quiz->id&amp;sesskey=$USER->sesskey\">
-                          <img src=\"$CFG->pixpath/t/delete.gif\" border=\"0\" alt=\"$strremove\" /></a>";
+                          <img src=\"$CFG->pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strremove\" /></a>";
                 }
                 echo '</td></tr></table></td>';
                 echo '<td colspan="2">&nbsp;</td>';
@@ -236,13 +236,13 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true, $r
         echo "<td>";
         if ($count != 0) {
             echo "<a title=\"$strmoveup\" href=\"edit.php?up=$count&amp;quizid=$quiz->id&amp;sesskey=$USER->sesskey\"><img
-                 src=\"$CFG->pixpath/t/up.gif\" border=\"0\" alt=\"$strmoveup\" /></a>";
+                 src=\"$CFG->pixpath/t/up.gif\" class=\"iconsmall\" alt=\"$strmoveup\" /></a>";
         }
         echo "</td>";
         echo "<td>";
         if ($count < $lastindex-1) {
             echo "<a title=\"$strmovedown\" href=\"edit.php?down=$count&amp;quizid=$quiz->id&amp;sesskey=$USER->sesskey\"><img
-                 src=\"$CFG->pixpath/t/down.gif\" border=\"0\" alt=\"$strmovedown\" /></a>";
+                 src=\"$CFG->pixpath/t/down.gif\" class=\"iconsmall\" alt=\"$strmovedown\" /></a>";
         }
         echo "</td>";
 
@@ -272,15 +272,15 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true, $r
         if ($question->qtype != 'random') {
             echo "<a title=\"$strpreview\" href=\"javascript:void(0)\" onClick=\"openpopup('/question/preview.php?id=$qnum$quiz_id','questionpreview', " . 
                     QUESTION_PREVIEW_POPUP_OPTIONS . ", false)\">
-                    <img src=\"$CFG->pixpath/t/preview.gif\" border=\"0\" alt=\"$strpreview\" /></a>";
+                    <img src=\"$CFG->pixpath/t/preview.gif\" class=\"iconsmall\" alt=\"$strpreview\" /></a>";
         }
         if ($canedit) {
             echo "<a title=\"$stredit\" href=\"$CFG->wwwroot/question/question.php?id=$qnum$context\">
-                    <img src=\"$CFG->pixpath/t/edit.gif\" border=\"0\" alt=\"$stredit\" /></a>";
+                    <img src=\"$CFG->pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /></a>";
         }
         if ($allowdelete) {
             echo "<a title=\"$strremove\" href=\"edit.php?delete=$count&amp;quizid=$quiz->id&amp;sesskey=$USER->sesskey\">
-                    <img src=\"$CFG->pixpath/t/removeright.gif\" border=\"0\" alt=\"$strremove\" /></a>";
+                    <img src=\"$CFG->pixpath/t/removeright.gif\" class=\"iconsmall\" alt=\"$strremove\" /></a>";
         }
 
         echo "</td></tr>";
diff --git a/theme/cornflower/footer.html b/theme/cornflower/footer.html
index a2f239082ae..c47adbd0fd3 100644
--- a/theme/cornflower/footer.html
+++ b/theme/cornflower/footer.html
@@ -10,7 +10,7 @@
 ?>
 
 <?php echo $loggedinas ?>
-<p align="center"><a href="http://moodle.org" target="_blank"><img src="<?php echo $CFG->themewww .'/'. current_theme() ?>/images/moodlelogo.gif" border="0" /></a></p>
+<p align="center"><a href="http://moodle.org" target="_blank"><img src="<?php echo $CFG->themewww .'/'. current_theme() ?>/images/moodlelogo.gif" style="border:0px" /></a></p>
 
 </div>
 </div>
diff --git a/userpix/index.php b/userpix/index.php
index 9e4e5e3885f..865c162447a 100644
--- a/userpix/index.php
+++ b/userpix/index.php
@@ -27,10 +27,10 @@
              "title=\"$fullname\">";
         if ($CFG->slasharguments) {        // Use this method if possible for better caching
             echo '<img src="'. $CFG->wwwroot .'/user/pix.php/'.$user->id.'/f1.jpg"'.
-                 ' border="0" width="100" height="100" alt="'.$fullname.'" />';
+                 ' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
         } else {
             echo '<img src="'. $CFG->wwwroot .'/user/pix.php?file=/'. $user->id .'/f1.jpg"'.
-                 ' border="0" width="100" height="100" alt="'.$fullname.'" />';
+                 ' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
         }
         echo "</a> \n";
     }
diff --git a/userpix/upgrade.php b/userpix/upgrade.php
index 8c0ae933ccf..c423181cb59 100644
--- a/userpix/upgrade.php
+++ b/userpix/upgrade.php
@@ -24,10 +24,10 @@
              "title=\"$fullname\">";
         if ($CFG->slasharguments) {        // Use this method if possible for better caching
             echo '<img src="'. $CFG->wwwroot .'/user/pix.php/'.$user->id.'/f1.jpg"'.
-                 ' border="0" width="100" height="100" alt="'.$fullname.'" />';
+                 ' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
         } else {
             echo '<img src="'. $CFG->wwwroot .'/user/pix.php?file=/'. $user->id .'/f1.jpg"'.
-                 ' border="0" width="100" height="100" alt="'.$fullname.'" />';
+                 ' style="border:0px; width:100px; height:100px" alt="'.$fullname.'" />';
         }
         echo "</a> \n";
     }