diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 385eb5152..f595b880a 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,4 +1,5 @@
 6.99.0
+ - Many changes for better XHTML compliance.
  - Refactored admin bar to be more dynamic.
  - Added version tags menu to admin bar.
  - Added a revisions list to the edit screen of assets, so that you can
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 303aef3d6..a12d4d2a0 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1026,11 +1026,11 @@ sub manageAssets {
 		my $locked;
 		my $edit;
 		if ($child->isLocked) {
-			$locked = '<img src="'.$self->session->config->get("extrasURL").'/assetManager/locked.gif" alt="locked" border="0" />';
+			$locked = '<img src="'.$self->session->config->get("extrasURL").'/assetManager/locked.gif" alt="locked" style="border: 0px;" />';
 			$edit = "'<a href=\"".$child->getUrl("func=edit;proceed=manageAssets")."\">Edit</a> | '+" if ($child->canEditIfLocked && $self->session->scratch->get("versionTag") eq $self->get("tagId"));
 		} else {
 			$edit = "'<a href=\"".$child->getUrl("func=edit;proceed=manageAssets")."\">Edit</a> | '+";
-			$locked = '<img src="'.$self->session->config->get("extrasURL").'/assetManager/unlocked.gif" alt="unlocked" border="0" />';
+			$locked = '<img src="'.$self->session->config->get("extrasURL").'/assetManager/unlocked.gif" alt="unlocked" style="border: 0px;" />';
 		}
 		my $lockLink = ", '<a href=\"".$child->getUrl("func=manageRevisions")."\">".$locked."</a>'" unless ($self->session->setting->get("autoCommit"));
          	$output .= "assetManager.AddLine('"
@@ -1041,7 +1041,7 @@ sub manageAssets {
 			."',".$edit."contextMenu.draw()," 
 			.$child->getRank
 			.",'<a href=\"".$child->getUrl("func=manageAssets")."\">".$title
-			."</a>','<img src=\"".$child->getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
+			."</a>','<img src=\"".$child->getIcon(1)."\" style=\"border: 0px;\" alt=\"".$child->getName."\" /> ".$child->getName
 			."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
 			."','".formatBytes($child->get("assetSize"))."'".$lockLink.");\n";
          	$output .= "assetManager.AddLineSortData('','','','".$title."','".$child->getName
@@ -1066,21 +1066,21 @@ sub manageAssets {
         </div>
 		<div style="float: left; padding-right: 30px; font-size: 14px;width: 28%;"><fieldset><legend>'.$i18n->get(1083).'</legend>';
 	foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","assetContainers")}) {
-		$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" /> 
+		$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" style="border: 0px;" /> 
 			<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
 		$output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
 		$output .= '<br />';
 	}
 	$output .= '<hr />';
 	foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) {
-		$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" /> 
+		$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" style="border: 0px;" /> 
 			<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
 		$output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
 		$output .= '<br />';
 	}
 	$output .= '<hr />';
 	foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","utilityAssets")}) {
-		$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" /> 
+		$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" style="border: 0px;" /> 
 			<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
 		$output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
 		$output .= '<br />';
@@ -1090,7 +1090,7 @@ sub manageAssets {
 	tie %options, 'Tie::IxHash';
 	my $hasClips = 0;
         foreach my $asset (@{$self->getAssetsInClipboard(1)}) {
-              	$options{$asset->getId} = '<img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" border="0" /> '.$asset->getTitle;
+              	$options{$asset->getId} = '<img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" style="border: 0px;" /> '.$asset->getTitle;
 		$hasClips = 1;
         }
 	if ($hasClips) {
@@ -1118,7 +1118,7 @@ sub manageAssets {
 	my $hasPackages = 0;
 	my $packages;
         foreach my $asset (@{$self->getPackageList}) {
-              	$packages  .= '<img src="'.$asset->getIcon(1).'" align="middle" alt="'.$asset->getName.'" border="0" /> 
+              	$packages  .= '<img src="'.$asset->getIcon(1).'" align="middle" alt="'.$asset->getName.'" style="border: 0px;" /> 
 			<a href="'.$self->getUrl("func=deployPackage;assetId=".$asset->getId).'">'.$asset->getTitle.'</a> '
 			.$self->session->icon->edit("func=edit;proceed=manageAssets",$asset->get("url"))
 			.'<br />';
@@ -1188,11 +1188,11 @@ sub manageAssetsSearch {
 		my $locked;
 		my $edit;
 		if ($child->isLocked) {
-			$locked = '<img src="'.$self->session->config->get("extrasURL").'/assetManager/locked.gif" alt="locked" border="0" />';
+			$locked = '<img src="'.$self->session->config->get("extrasURL").'/assetManager/locked.gif" alt="locked" style="border: 0px;" />';
 			$edit = "'<a href=\"".$child->getUrl("func=edit;proceed=manageAssets")."\">Edit</a> | '+" if ($child->canEditIfLocked && $self->session->scratch->get("versionTag") eq $self->get("tagId"));
 		} else {
 			$edit = "'<a href=\"".$child->getUrl("func=edit;proceed=manageAssets")."\">Edit</a> | '+";
-			$locked = '<img src="'.$self->session->config->get("extrasURL").'/assetManager/unlocked.gif" alt="unlocked" border="0" />';
+			$locked = '<img src="'.$self->session->config->get("extrasURL").'/assetManager/unlocked.gif" alt="unlocked" style="border: 0px;" />';
 		}
 		my $lockLink = ", '<a href=\"".$child->getUrl("func=manageRevisions")."\">".$locked."</a>'" unless ($self->session->setting->get("autoCommit"));
          	$output .= "assetManager.AddLine('"
@@ -1203,7 +1203,7 @@ sub manageAssetsSearch {
 			."',".$edit."contextMenu.draw()," 
 			.$child->getRank
 			.",'<a href=\"".$child->getUrl("func=manageAssets&manage=1")."\">".$title
-			."</a>','<img src=\"".$child->getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
+			."</a>','<img src=\"".$child->getIcon(1)."\" style=\"border: 0px;\" alt=\"".$child->getName."\" /> ".$child->getName
 			."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
 			."','".formatBytes($child->get("assetSize"))."'".$lockLink.");\n";
          	$output .= "assetManager.AddLineSortData('','','','".$title."','".$child->getName
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 6b147067c..0765e1963 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -74,7 +74,7 @@ sub definition {
                                         },
 				parameters=>{
 					fieldType=>'textarea',
-					defaultValue=>'border="0"'
+					defaultValue=>'style="border: 0px;"'
 					}
                         }
                 });
diff --git a/lib/WebGUI/Session/Icon.pm b/lib/WebGUI/Session/Icon.pm
index 6b4ec924d..0e963b699 100644
--- a/lib/WebGUI/Session/Icon.pm
+++ b/lib/WebGUI/Session/Icon.pm
@@ -97,7 +97,7 @@ sub copy {
 	my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'copy.gif" align="middle" border="0" alt="'.$i18n->get('Copy').'" title="'.$i18n->get('Copy').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'copy.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Copy').'" title="'.$i18n->get('Copy').'" /></a>';
         return $output;
 }
 
@@ -123,7 +123,7 @@ sub cut {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'cut.gif" align="middle" border="0" alt="'.$i18n->get('Cut').'" title="'.$i18n->get('Cut').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'cut.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Cut').'" title="'.$i18n->get('Cut').'" /></a>';
         return $output;
 }
 
@@ -171,7 +171,7 @@ sub delete {
 	}
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'" '.$confirmText.'>';
-	$output .= '<img src="'.$self->_getBaseURL().'delete.gif" align="middle" border="0" alt="'.$i18n->get('Delete').'" title="'.$i18n->get('Delete').'" /></a>';
+	$output .= '<img src="'.$self->_getBaseURL().'delete.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Delete').'" title="'.$i18n->get('Delete').'" /></a>';
 	return $output;
 }
 
@@ -186,7 +186,7 @@ Generates an icon that can be used to drag content.
 sub drag {
 	my $self = shift;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
-        return '<img id="dragTrigger" class="dragTrigger" src="'.$self->_getBaseURL().'drag.gif" align="middle" border="0" alt="'.$i18n->get('Drag').'" title="'.$i18n->get('Drag').'" />';
+        return '<img id="dragTrigger" class="dragTrigger" src="'.$self->_getBaseURL().'drag.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Drag').'" title="'.$i18n->get('Drag').'" />';
 }
 
 #-------------------------------------------------------------------
@@ -211,7 +211,7 @@ sub edit {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'edit.gif" align="middle" border="0" alt="'.$i18n->get('Edit').'" title="'.$i18n->get('Edit').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'edit.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Edit').'" title="'.$i18n->get('Edit').'" /></a>';
         return $output;
 }
 
@@ -237,7 +237,7 @@ sub export {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'export.gif" align="middle" border="0" alt="'.$i18n->get('Export').'" title="'.$i18n->get('Export').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'export.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Export').'" title="'.$i18n->get('Export').'" /></a>';
         return $output;
 }
 
@@ -289,7 +289,7 @@ sub help {
 	my ($output, $namespace);
 	my $i18n = WebGUI::International->new($self->session,'Icon');
 	$output = '<a href="'.$self->session->url->page('op=viewHelp;hid='.$urlParams.';namespace='.$namespace).
-		'" target="_blank"><img src="'.$self->_getBaseURL().'help.gif" border="0" align="right" title="'.$i18n->get('Help').'" Alt="'.$i18n->get('Help').'"></a>';
+		'" target="_blank"><img src="'.$self->_getBaseURL().'help.gif" style="border: 0px;" align="right" title="'.$i18n->get('Help').'" Alt="'.$i18n->get('Help').'"></a>';
 	rneturn $output;
 }
 
@@ -315,7 +315,7 @@ sub locked {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'locked.gif" align="middle" border="0" alt="'.$i18n->get('locked').'" title="'.$i18n->get('locked').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'locked.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('locked').'" title="'.$i18n->get('locked').'" /></a>';
         return $output;
 }
 
@@ -341,7 +341,7 @@ sub manage {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'manage.gif" align="middle" border="0" alt="'.$i18n->get('Manage').'" title="'.$i18n->get('Manage').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'manage.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Manage').'" title="'.$i18n->get('Manage').'" /></a>';
         return $output;
 }
 
@@ -367,7 +367,7 @@ sub moveBottom {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'moveBottom.gif" align="middle" border="0" alt="'.$i18n->get('Move To Bottom').'" title="'.$i18n->get('Move To Bottom').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'moveBottom.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Move To Bottom').'" title="'.$i18n->get('Move To Bottom').'" /></a>';
         return $output;
 }
 
@@ -393,7 +393,7 @@ sub moveDown {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'moveDown.gif" align="middle" border="0" alt="'.$i18n->get('Move Down').'" title="'.$i18n->get('Move Down').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'moveDown.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Move Down').'" title="'.$i18n->get('Move Down').'" /></a>';
         return $output;
 }
 
@@ -419,7 +419,7 @@ sub moveLeft {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'moveLeft.gif" align="middle" border="0" alt="'.$i18n->get('Move Left').'" title="'.$i18n->get('Move Left').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'moveLeft.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Move Left').'" title="'.$i18n->get('Move Left').'" /></a>';
         return $output;
 }
 
@@ -445,7 +445,7 @@ sub moveRight {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'moveRight.gif" align="middle" border="0" alt="'.$i18n->get('Move Right').'" title="'.$i18n->get('Move Right').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'moveRight.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Move Right').'" title="'.$i18n->get('Move Right').'" /></a>';
         return $output;
 }
 
@@ -471,7 +471,7 @@ sub moveTop {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'moveTop.gif" align="middle" border="0" alt="'.$i18n->get('Move To Top').'" title="'.$i18n->get('Move To Top').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'moveTop.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Move To Top').'" title="'.$i18n->get('Move To Top').'" /></a>';
         return $output;
 }
 
@@ -497,7 +497,7 @@ sub moveUp {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'moveUp.gif" align="middle" border="0" alt="'.$i18n->get('Move Up').'" title="'.$i18n->get('Move Up').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'moveUp.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Move Up').'" title="'.$i18n->get('Move Up').'" /></a>';
         return $output;
 }
 
@@ -543,7 +543,7 @@ sub paste {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'paste.gif" align="middle" border="0" alt="'.$i18n->get('Paste').'" title="'.$i18n->get('Paste').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'paste.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Paste').'" title="'.$i18n->get('Paste').'" /></a>';
         return $output;
 }
 
@@ -583,7 +583,7 @@ sub shortcut {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'shortcut.gif" align="middle" border="0" alt="'.$i18n->get('Create Shortcut').'" title="'.$i18n->get('Create Shortcut').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'shortcut.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('Create Shortcut').'" title="'.$i18n->get('Create Shortcut').'" /></a>';
         return $output;
 }
 
@@ -609,7 +609,7 @@ sub view {
         my $pageURL = shift || $self->session->url->getRequestedUrl;
 	my $i18n = WebGUI::International->new($self->session,'Icon');
         my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
-        $output .= '<img src="'.$self->_getBaseURL().'view.gif" align="middle" border="0" alt="'.$i18n->get('View').'" title="'.$i18n->get('View').'" /></a>';
+        $output .= '<img src="'.$self->_getBaseURL().'view.gif" align="middle" style="border: 0px;" alt="'.$i18n->get('View').'" title="'.$i18n->get('View').'" /></a>';
         return $output;
 }