diff --git a/appview.php b/appview.php
index 751838f..e9df9db 100644
--- a/appview.php
+++ b/appview.php
@@ -74,13 +74,13 @@ function get_screenshot_img($appId, $versionId="")
     
     if(!$result || !mysql_num_rows($result))
     {
-        $imgFile = "<img src='".$apidb_root."images/no_screenshot.gif' border=0 alt='No Screenshot' />";
+        $imgFile = "<img src='".$apidb_root."images/no_screenshot.gif' alt='No Screenshot' />";
     }
     else
     {
         $ob = mysql_fetch_object($result);
         $imgFile = "<img src='appimage.php?imageId=$ob->id&width=128&height=128' ".
-                   "border=0 alt='$ob->description' />";
+                   "alt='$ob->description' />";
     }
     
     $img = html_frame_start("",'128','',2);
diff --git a/bugs.php b/bugs.php
index ae63b1c..e9c3122 100644
--- a/bugs.php
+++ b/bugs.php
@@ -29,13 +29,13 @@ function get_screenshot_img($appId, $versionId)
     
     if(!$result || !mysql_num_rows($result))
     {
-	$imgFile = "<img src='".$apidb_root."images/no_screenshot.gif' border=0 alt='No Screenshot'>";
+	$imgFile = "<img src='".$apidb_root."images/no_screenshot.gif' alt='No Screenshot'>";
     }
     else
     {
         $ob = mysql_fetch_object($result);
 	$imgFile = "<img src='appimage.php?appId=$appId&versionId=$versionId&width=128&height=128' ".
-	           "border=0 alt='$ob->description'>";
+	           "alt='$ob->description'>";
     }
     
     $img = html_frame_start("",'128','',2);
diff --git a/include/html.php b/include/html.php
index 734bd3a..3f33de6 100644
--- a/include/html.php
+++ b/include/html.php
@@ -186,7 +186,7 @@ function html_imagebutton($text, $url, $extra = "")
     $java  = "onMouseDown = 'document.img$i.src = \"$img2\"; return true;' ";
     $java .= "onMouseUp = 'document.img$i.src = \"$img1\"; return true;' ";
 
-    return "\n<a href='$url' $extra $java>\n <img src='$img1' name='img$i' alt='$text' border=0> </a>\n";
+    return "\n<a href='$url' $extra $java>\n <img src='$img1' name='img$i' alt='$text'> </a>\n";
 }
 
 
@@ -206,19 +206,19 @@ $str .= '
 <tr><td>
     <table width="100%" border="0" cellpadding="0" cellspacing="0" class="topMenu">
       <tr>
-        <td valign="top" align="left"><img src="'.$apidb_root.'images/winehq_border_top_left.gif" border="0" alt=""></td>
-        <td rowspan="3" valign="middle" align="left"><img src="'.$apidb_root.'images/winehq_border_dot_left.gif" border="0" alt=""></td>
+        <td valign="top" align="left"><img src="'.$apidb_root.'images/winehq_border_top_left.gif" alt=""></td>
+        <td rowspan="3" valign="middle" align="left"><img src="'.$apidb_root.'images/winehq_border_dot_left.gif" alt=""></td>
         <td width="100%" rowspan="3" align="center"><span class="menuTitle">'.$title.'</span></td>
-        <td rowspan="3" valign="middle" align="right"><img src="'.$apidb_root.'images/winehq_border_dot_right.gif" border="0" alt=""></td>
-        <td valign="top" align="left"><img src="'.$apidb_root.'images/winehq_border_top_right.gif" border="0" alt=""></td>
+        <td rowspan="3" valign="middle" align="right"><img src="'.$apidb_root.'images/winehq_border_dot_right.gif" alt=""></td>
+        <td valign="top" align="left"><img src="'.$apidb_root.'images/winehq_border_top_right.gif" alt=""></td>
       </tr>
       <tr>
-        <td><img src="'.$apidb_root.'images/blank.gif" width="1" height="1" border="0" alt=""></td>
-        <td><img src="'.$apidb_root.'images/blank.gif" width="1" height="1" border="0" alt=""></td>
+        <td><img src="'.$apidb_root.'images/blank.gif" width="1" height="1" alt=""></td>
+        <td><img src="'.$apidb_root.'images/blank.gif" width="1" height="1" alt=""></td>
       </tr>
       <tr>
-        <td valign="bottom" align="right"><img src="'.$apidb_root.'images/winehq_border_bottom_left.gif" border="0" alt=""></td>
-        <td valign="bottom" align="right"><img src="'.$apidb_root.'images/winehq_border_bottom_right.gif" border="0" alt=""></td>
+        <td valign="bottom" align="right"><img src="'.$apidb_root.'images/winehq_border_bottom_left.gif" alt=""></td>
+        <td valign="bottom" align="right"><img src="'.$apidb_root.'images/winehq_border_bottom_right.gif" alt=""></td>
       </tr>
     </table>
 </td></tr>
@@ -228,7 +228,7 @@ $str .= '
 
 $str .= '
 <tr>
-<td><img src="'.$apidb_root.'images/blank.gif" border=0 width=5 height=1 alt="-"></td>
+<td><img src="'.$apidb_root.'images/blank.gif" width=5 height=1 alt="-"></td>
 <td width="100%"><table width="100%" border=0 cellpadding=0 cellspacing=0>
     <tr><td class=topMenu>
         <table width="100%" border=0 cellpadding="'.$innerPad.'" cellspacing="1" '.$extra.'><tr><td class=white>
@@ -245,7 +245,7 @@ $str = '
         </td></tr></table></td></tr>
     </table>
 </td>
-<td><img src="'.$apidb_root.'images/blank.gif" border=0 width=5 height=1 alt="-"></td>
+<td><img src="'.$apidb_root.'images/blank.gif" width=5 height=1 alt="-"></td>
 </tr>
 </table>
 <br>
diff --git a/include/menu.php b/include/menu.php
index 4ef7b87..e365d08 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -16,14 +16,14 @@ class htmlmenu {
     <table width="100%" border="0" cellpadding="0" cellspacing="0" class="topMenu">
       <tr>
         <td width="100%" rowspan="3" align="left"><span class="menuTitle">&nbsp; '.$name.'</span></td>
-        <td rowspan="3" valign="middle" align="right"><img src="'.$apidb_root.'images/winehq_border_dot_right.gif" border="0" alt=""></td>
-        <td valign="top" align="left"><img src="'.$apidb_root.'images/winehq_border_top_right.gif" border="0" alt=""></td>
+        <td rowspan="3" valign="middle" align="right"><img src="'.$apidb_root.'images/winehq_border_dot_right.gif" alt=""></td>
+        <td valign="top" align="left"><img src="'.$apidb_root.'images/winehq_border_top_right.gif" alt=""></td>
       </tr>
       <tr>
-        <td><img src="'.$apidb_root.'images/blank.gif" width="1" height="1" border="0" alt=""></td>
+        <td><img src="'.$apidb_root.'images/blank.gif" width="1" height="1" alt=""></td>
       </tr>
       <tr>
-        <td valign="bottom" align="right"><img src="'.$apidb_root.'images/winehq_border_bottom_right.gif" border="0" alt=""></td>
+        <td valign="bottom" align="right"><img src="'.$apidb_root.'images/winehq_border_bottom_right.gif" alt=""></td>
       </tr>
     </table>
 </td>
@@ -63,7 +63,7 @@ class htmlmenu {
         </td></tr>
         </table>
         </td>
-        <td><img src="'.$apidb_root.'images/blank.gif" border=0 width=5 height=1 alt="-"></td>
+        <td><img src="'.$apidb_root.'images/blank.gif" width=5 height=1 alt="-"></td>
         </tr>
         </table>
         </div>
diff --git a/include/rating.php b/include/rating.php
index 7b015c3..a2c7b05 100644
--- a/include/rating.php
+++ b/include/rating.php
@@ -29,8 +29,8 @@ function rating_menu()
 {
     global $apidb_root;
 
-    $s = '<img src="'.$apidb_root.'images/s1.gif" border=0 alt="s1">';
-    $n = '<img src="'.$apidb_root.'images/s0.gif" border=0 alt="s0">';
+    $s = '<img src="'.$apidb_root.'images/s1.gif" alt="s1">';
+    $n = '<img src="'.$apidb_root.'images/s0.gif" alt="s0">';
     
     $j = new htmlmenu("Compatibility Rating","updaterating.php");
 
@@ -101,9 +101,9 @@ function rating_stars_for_version($versionId, $system)
 
     $r = rating_for_version($versionId, $system);
 
-    $s = '<img src="'.$apidb_root.'images/s1.gif" border=0 alt="s1">';
-    $n = '<img src="'.$apidb_root.'images/s0.gif" border=0 alt="s0">';
-    $h = '<img src="'.$apidb_root.'images/s2.gif" border=0 alt="s2">';
+    $s = '<img src="'.$apidb_root.'images/s1.gif" alt="s1">';
+    $n = '<img src="'.$apidb_root.'images/s0.gif" alt="s0">';
+    $h = '<img src="'.$apidb_root.'images/s2.gif" alt="s2">';
 
     if ($system == "fake")
     {
diff --git a/index.php b/index.php
index fba1c5c..a19561e 100644
--- a/index.php
+++ b/index.php
@@ -10,7 +10,7 @@ apidb_header("Wine Application Database");
 
 ?>
 
-    <img src="images/appdb_montage.jpg" width=391 height=266 border=0 align=right alt="Wine AppDB">
+    <img src="images/appdb_montage.jpg" width=391 height=266 align=right alt="Wine AppDB">
     
 <h1>Welcome</h1>
 
diff --git a/screenshots.php b/screenshots.php
index cd1a5f0..c43dfb3 100644
--- a/screenshots.php
+++ b/screenshots.php
@@ -132,7 +132,7 @@ if((!$result || !mysql_num_rows($result)) && (!havepriv("admin") && !isMaintaine
                 echo "<div align=center><table><tr>\n";
             }
             // set img tag
-            $imgSRC = '<img src="appimage.php?imageId='.$ob->id.'&width=128&height=128" border=0 alt="'.$ob->description.'">';
+            $imgSRC = '<img src="appimage.php?imageId='.$ob->id.'&width=128&height=128" alt="'.$ob->description.'">';
 
             // get image size
             $size = getimagesize("data/screenshots/".$ob->url);