diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index 82d2d45b78..9c21a686ac 100644
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -1,4 +1,4 @@
-<?php // $Id: user_list.php 16958 2008-11-26 15:07:00Z pcool $
+<?php // $Id: user_list.php 17054 2008-12-03 13:38:03Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -386,7 +386,7 @@ function modify_filter($user_id,$url_params,$row)
 	$result .= '<span id="tooltip">
 				<span class="toolbox">
 				<a style="position: relative;" class="tooltipLinkInner" href="#">
-				'.Display::return_icon('edit.gif', get_lang('Edit')).'<img src="../img/.gif" id="coursesofuser'.$user_id.'" onmouseout="document.getElementById(\'user'.$user_id.'\').style.display=\'none\'" onmouseover="xajax_courses_of_user('.$user_id.');" style="vertical-align:middle;"/>
+				<img src="../img/edit.gif" id="coursesofuser'.$user_id.'" onmouseout="document.getElementById(\'user'.$user_id.'\').style.display=\'none\'" onmouseover="xajax_courses_of_user('.$user_id.');" style="vertical-align:middle;"/>
 				<span id="user'.$user_id.'" style="margin-left: -100px; border:1px solid black; width: 200px; background-color:white; z-index:99; padding: 3px; display: none; margin-right:inherit;">
 				<div style="text-align:center;">'.Display::return_icon('anim-loader.gif', '', array('height' => '20')).'</div>
 				</span></a></span></span>';	
diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php
index d14efecc66..085b4d3674 100755
--- a/main/chat/chat_whoisonline.php
+++ b/main/chat/chat_whoisonline.php
@@ -118,7 +118,7 @@ if (!empty($course))
 	
 	if($showPic == $enreg['user_id']): ?>
 	<tr>
-	  <td colspan="2" align="center"><img src="<?php echo $file_url;?>" border="0" width="100" alt="" style="margin-top: 5px;" /></td>
+	  <td colspan="2" align="center"><img src="<?php echo $file_url;?>" border="0" width="100" alt="" /></td>
 	</tr>
 	<?php endif; ?>
 	<?php
diff --git a/main/course_description/index.php b/main/course_description/index.php
index ad806a8d21..ae58e97de9 100644
--- a/main/course_description/index.php
+++ b/main/course_description/index.php
@@ -1,4 +1,4 @@
-<?php // $Id: index.php 16724 2008-11-12 15:42:23Z pcool $
+<?php // $Id: index.php 17054 2008-12-03 13:38:03Z pcool $
 
 /*
 ==============================================================================
@@ -267,7 +267,7 @@ if ($show_description_list)
 		echo '<div class="actions">';
 		foreach ($categories as $id => $title)
 		{
-			echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&description_id='.$id.'"><img src="'.$default_description_icon[$id].'" height="20" /> '.$title.'</a>';
+			echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&description_id='.$id.'">'.Display::return_icon($default_description_icon[$id], $title, array('height'=>'20')).' '.$title.'</a>';
 			$i++;
 		}
 		echo '</div>';
@@ -281,12 +281,12 @@ if ($show_description_list)
 			{
 				//delete
 				echo '<a href="'.api_get_self().'?action=delete&amp;description_id='.$description->id.'" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">';
-				echo '<img src="../img/delete.gif" alt="'.get_lang("Delete").'" border="0" style="vertical-align:middle;float:right;margin:2px;" />';
+				echo Display::return_icon('delete.gif', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'));
 				echo '</a> ';
 				
 				//edit
 				echo '<a href="'.api_get_self().'?action=edit&amp;description_id='.$description->id.'">';
-				echo '<img src="../img/edit.gif" alt="'.get_lang("Edit").'" border="0" style="vertical-align:middle;float:right;margin:2px;" />';
+				echo Display::return_icon('edit.gif', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right;'));
 				echo '</a> ';
 			}
 			echo $description->title;
diff --git a/main/course_home/2column.php b/main/course_home/2column.php
index f4b697efa1..e242286477 100644
--- a/main/course_home/2column.php
+++ b/main/course_home/2column.php
@@ -159,9 +159,8 @@ function show_tools($course_tool_category)
 					'<a href="', htmlspecialchars($toolsRow['link'])
 						.(($toolsRow['image']=="external.gif" || $toolsRow['image']=="external_na.gif") ? '' : $qm_or_amp.api_get_cidreq()),
 						'" target="' , $toolsRow['target'], '" '.$class.'>',
-					'<img src="', $web_code_path, 'img/',
-						$toolsRow['image'], '" align="absmiddle" border="0" alt="', $toolsRow['image'],'" />',
-					'&nbsp;', ($toolsRow['image']=="external.gif" || $toolsRow['image']=="external_na.gif" || $toolsRow['image']=="scormbuilder.gif" || $toolsRow['image']=="blog.gif") ? htmlspecialchars( $toolsRow['name'],ENT_QUOTES,$charset) : get_lang(ucfirst($toolsRow['name'])),
+						Display::return_icon($toolsRow['image']),
+						'&nbsp;', ($toolsRow['image']=="external.gif" || $toolsRow['image']=="external_na.gif" || $toolsRow['image']=="scormbuilder.gif" || $toolsRow['image']=="blog.gif") ? htmlspecialchars( $toolsRow['name'],ENT_QUOTES,$charset) : get_lang(ucfirst($toolsRow['name'])),
 					"</a>\n ";
 
 			// This part displays the links to hide or remove a tool.
@@ -171,27 +170,27 @@ function show_tools($course_tool_category)
 			{
 				if ($toolsRow["visibility"] == '1')
 				{
-					$link['name'] = '<img src="'.api_get_path(WEB_CODE_PATH).'img/remove.gif" align="absmiddle" alt="'.get_lang("Deactivate").'"/>';
+					$link['name'] = Display::return_icon('remove.gif', get_lang('Deactivate'));
 					$link['cmd'] = "hide=yes";
 					$lnk[] = $link;
 				}
 
 				if ($course_tool_category == TOOL_PUBLIC_BUT_HIDDEN)
 				{
-					$link['name'] = '<img src="'.api_get_path(WEB_CODE_PATH).'img/add.gif" align="absmiddle" alt="'.get_lang("Activate").'"/>';
+					$link['name'] = Display::return_icon('add.gif', get_lang('Activate'));
 					$link['cmd']  = "restore=yes";
 					$lnk[] = $link;
 
 					if($toolsRow["added_tool"] == 1)
 					{
-						$link['name'] = '<img src="'.api_get_path(WEB_CODE_PATH).'img/delete.gif" align="absmiddle" alt="'.get_lang("Remove").'"/>';
+						$link['name'] = Display::return_icon('delete.gif', get_lang('Remove'));
 						$link['cmd']  = "remove=yes";
 						$lnk[] = $link;
 					}
 				}
 				if ($toolsRow['adminlink'])
 				{
-					echo	'<a href="'.$toolsRow['adminlink'].'"><img src="'.api_get_path(WEB_CODE_PATH).'img/edit.gif" align="absmiddle" alt="'.get_lang("Edit").'"/></a>';
+					echo	'<a href="'.$toolsRow['adminlink'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
 					//echo "edit link:".$properties['adminlink'];
 				}
 
@@ -200,7 +199,7 @@ function show_tools($course_tool_category)
 			{
 				if ($toolsRow["visibility"]==2)
 				{
-					$link['name'] = '<img src="'.api_get_path(WEB_CODE_PATH).'img/undelete.gif" align="absmiddle" alt="'.get_lang("Activate").'"/>';
+					$link['name'] = Display::return_icon('undelete.gif', get_lang('Activate'));
 
 					$link['cmd']  = "hide=yes";
 					$lnk[] = $link;
@@ -215,7 +214,7 @@ function show_tools($course_tool_category)
 
 				if ($toolsRow["visibility"] == 0 && $toolsRow["added_tool"] == 0)
 				{
-					$link['name'] = '<img src="'.api_get_path(WEB_CODE_PATH).'img/delete.gif" align="absmiddle" alt="'.get_lang("Remove").'"/>';
+					$link['name'] = Display::return_icon('delete.gif', get_lang('Remove'));
 					$link['cmd'] = "remove=yes";
 					$lnk[] = $link;
 				}
diff --git a/main/course_home/3column.php b/main/course_home/3column.php
index bde42c93bd..56ece0327d 100644
--- a/main/course_home/3column.php
+++ b/main/course_home/3column.php
@@ -100,7 +100,7 @@ if (is_allowed_to_edit())
 		echo 	"<br><br><br>\n";
 		echo	"<table class=\"message\" width=\"70%\" align=\"center\">\n",
 				"<tr><td width=\"7%\" align=\"center\">\n",
-			   	"<a href=\"".$toolsRow['link']."\"><img src=\"",$toolsRow['image'],"\" alt=\"\" align=\"absmiddle\" border=\"0\">","</a></td>\n",
+			   	"<a href=\"".$toolsRow['link']."\">".Display::return_icon($toolsRow['image'], get_lang('Delete')),"</a></td>\n",
 				"<td width=\"28%\" height=\"45\"><small>\n",
 				"<a href=\"".$toolsRow['link']."\">".$tool_name."</a></small></td>\n";
 		echo	"<td align=\"center\">\n",
@@ -171,7 +171,7 @@ if (is_allowed_to_edit())
 
 				"<form method=\"post\" action=\"".api_get_self()."\">\n",
 				"<input type=\"hidden\" name=\"id\" value=\"$id\">\n",
-				"Image : <img alt=\"\" src=\"".$image."\" border=\"0\" align=\"absmiddle\">\n",
+				"Image : ".Display::return_icon($image)."\n",
 				"</td>\n",
 
 				"<td>\n",
diff --git a/main/course_home/activity.php b/main/course_home/activity.php
index 0640175f22..5731a536b5 100644
--- a/main/course_home/activity.php
+++ b/main/course_home/activity.php
@@ -241,7 +241,7 @@ function show_tools_category($course_tool_category)
 
 				if(!empty($toolsRow['adminlink']))
 				{
-					echo	'<a href="'.$toolsRow['adminlink'].'"><img src="'.api_get_path(WEB_CODE_PATH).'img/edit.gif" align="absmiddle" alt="'.get_lang("Edit").'"/></a>';
+					echo	'<a href="'.$toolsRow['adminlink'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
 				}
 
 			}
diff --git a/main/course_home/btf_functions.php b/main/course_home/btf_functions.php
index 06d3c68402..2f701cbb08 100644
--- a/main/course_home/btf_functions.php
+++ b/main/course_home/btf_functions.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: btf_functions.php 13294 2007-09-27 02:14:48Z yannoo $
+// $Id: btf_functions.php 17054 2008-12-03 13:38:03Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -163,7 +163,7 @@ function showtools2($cat)
 		// VISIBLE
 		if ($toolsRow['visibility'] or $cat == 'courseAdmin' or $cat == 'claroAdmin')
 		{
-			$cell_content .= '<a href="'.$toolsRow['link'].$link_annex.'" target="'.$toolsRow['target'].'"><img src="'.$toolsRow['img'].'" alt="" border="0" style="vertical-align:middle;"/></a>'."\n";
+			$cell_content .= '<a href="'.$toolsRow['link'].$link_annex.'" target="'.$toolsRow['target'].'">'.Display::return_icon($toolsRow['img']).'</a>'."\n";
 			$cell_content .= '<a href="'.$toolsRow['link'].$link_annex.'" target="'.$toolsRow['target'].'">'.$tool_name."</a>\n";
 		}
 		// INVISIBLE
@@ -171,12 +171,12 @@ function showtools2($cat)
 		{
 			if (api_is_allowed_to_edit())
 			{
-				$cell_content .= '<a href="'.$toolsRow['link'].$link_annex.'" target="'.$toolsRow['target'].'"><img src="'.str_replace(".gif", "_na.gif", $toolsRow['img']).'" alt="" border="0" style="vertical-align:middle;"/></a>'."\n";
+				$cell_content .= '<a href="'.$toolsRow['link'].$link_annex.'" target="'.$toolsRow['target'].'">'.Display::return_icon(str_replace(".gif", "_na.gif", $toolsRow['img'])).'</a>'."\n";
 				$cell_content .= '<a href="'.$toolsRow['link'].$link_annex.'" target="'.$toolsRow['target'].'" class="invisible">'.$tool_name.'</a>'."\n";
 			}
 			else
 			{
-				$cell_content .= '<img src="'.str_replace(".gif", "_na.gif", $toolsRow['img']).'" alt="" border="0" style="vertical-align:middle;">'."\n";
+				$cell_content .= Display::return_icon(str_replace(".gif", "_na.gif", $toolsRow['img']), '', array('style' => 'vertical-align:middle;'))."\n";
 				$cell_content .= '<span class="invisible">'.$tool_name.'</span>';
 			}
 		}
@@ -186,13 +186,13 @@ function showtools2($cat)
 		{
 			if ($toolsRow["visibility"])
 			{
-				$link['name'] = '<img src="'.api_get_path(WEB_IMG_PATH).'remove.gif"  style="vertical-align:middle;" alt="'.get_lang('Deactivate').'"/>';
+				$link['name'] = Display::return_icon('remove.gif', get_lang('Deactivate'), array('style' => 'vertical-align:middle;'));
 				$link['cmd'] = "hide=yes";
 				$lnk[] = $link;
 			}
 			else
 			{
-				$link['name'] = '<img src="'.api_get_path(WEB_IMG_PATH).'add.gif" style="vertical-align:middle;" alt="'.get_lang('Activate').'"/>';
+				$link['name'] = Display::return_icon('add.gif', get_lang('Activate'), array('style' => 'vertical-align:middle;'));
 				$link['cmd'] = "restore=yes";
 				$lnk[] = $link;
 
@@ -213,7 +213,7 @@ function showtools2($cat)
 				{
 					if ($toolsRow['adminlink'])
 					{
-						$cell_content .= '<a href="'.$properties['adminlink'].'">'.'<img src="'.api_get_path(WEB_IMG_PATH).'edit.gif" alt="'.get_lang('Edit').'"/>'.'</a>';
+						$cell_content .= '<a href="'.$properties['adminlink'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
 						//echo "edit link:".$properties['adminlink'];
 					}
 					else
diff --git a/main/course_info/maintenance.php b/main/course_info/maintenance.php
index 623d595036..288ced379e 100644
--- a/main/course_info/maintenance.php
+++ b/main/course_info/maintenance.php
@@ -48,10 +48,10 @@ api_display_tool_title($nameTools);
 ?>
 
 
-<div class="sectiontitle"><img src="../img/tool_delete.gif">&nbsp;&nbsp;<a href="../course_info/delete_course.php?<?php echo api_get_cidreq();?>"><?php echo get_lang("DelCourse");?></a></div>
+<div class="sectiontitle"><?php Display::display_icon('tool_delete.gif'); ?>&nbsp;&nbsp;<a href="../course_info/delete_course.php?<?php echo api_get_cidreq();?>"><?php echo get_lang("DelCourse");?></a></div>
 <div class="sectioncomment"><?php echo get_lang("DescriptionDeleteCourse");	?></div>	
 
-<div class="sectiontitle"><img src="../img/save_import.gif">&nbsp;&nbsp;<a href="../coursecopy/backup.php?<?php echo api_get_cidreq();?>"><?php echo get_lang("backup");?></a></div>
+<div class="sectiontitle"><?php Display::display_icon('save_import.gif'); ?>&nbsp;&nbsp;<a href="../coursecopy/backup.php?<?php echo api_get_cidreq();?>"><?php echo get_lang("backup");?></a></div>
 <div class="sectioncomment">
 			<ul>
 			    <li><a href="../coursecopy/create_backup.php?<?php echo api_get_cidreq();?>"><?php echo get_lang('CreateBackup')  ?></a><br/>
@@ -63,10 +63,10 @@ api_display_tool_title($nameTools);
 		    </ul>
 </div>
 			
-<div class="sectiontitle"><img src="../img/empty.gif">&nbsp;&nbsp;<a href="../coursecopy/recycle_course.php?<?php echo api_get_cidreq();?>"><?php echo get_lang("recycle_course");?></a></div>
+<div class="sectiontitle"><?php Display::display_icon('empty.gif'); ?>&nbsp;&nbsp;<a href="../coursecopy/recycle_course.php?<?php echo api_get_cidreq();?>"><?php echo get_lang("recycle_course");?></a></div>
 <div class="sectioncomment"><?php echo get_lang("DescriptionRecycleCourse");?></div>
 
-<div class="sectiontitle"><img src="../img/copy.gif">&nbsp;&nbsp;<a href="../coursecopy/copy_course.php?<?php echo api_get_cidreq();?>"><?php echo get_lang("CopyCourse");?></a></div>
+<div class="sectiontitle"><?php Display::display_icon('copy.gif'); ?>&nbsp;&nbsp;<a href="../coursecopy/copy_course.php?<?php echo api_get_cidreq();?>"><?php echo get_lang("CopyCourse");?></a></div>
 <div class="sectioncomment"><?php echo get_lang("DescriptionCopyCourse"); ?></div>
 
 <?php
diff --git a/main/coursecopy/classes/CourseSelectForm.class.php b/main/coursecopy/classes/CourseSelectForm.class.php
index e1938ca49d..a386402100 100644
--- a/main/coursecopy/classes/CourseSelectForm.class.php
+++ b/main/coursecopy/classes/CourseSelectForm.class.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: CourseSelectForm.class.php 16451 2008-10-08 07:57:29Z elixir_inter $
+// $Id: CourseSelectForm.class.php 17054 2008-12-03 13:38:03Z pcool $
 /*
 ============================================================================== 
 	Dokeos - elearning and course management software
@@ -127,7 +127,7 @@ class CourseSelectForm
 					case RESOURCE_SCORM:
 						break;
 					default :
-						echo ' <img id="img_'.$type.'" src="../img/1.gif" onclick="javascript:exp('."'$type'".');" >';
+						echo ' <img id="img_'.$type.'" src="../img/1.gif" onclick="javascript:exp('."'$type'".');" />';
 						echo ' <b  onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
 						echo '<div id="div_'.$type.'">';
 						echo '<blockquote>';
diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index ff47bd9123..61e5e318aa 100644
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -1,4 +1,4 @@
-<?php // $Id: document.inc.php 16752 2008-11-14 22:07:56Z ivantcholakov $
+<?php // $Id: document.inc.php 17054 2008-12-03 13:38:03Z pcool $
 
 /*
 ==============================================================================
@@ -180,7 +180,7 @@ function create_document_link($www,$title,$path,$filetype,$size,$visibility)
 		$url=api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$url_path.$req_gid;
 	}
 	//the little download icon
-	$force_download_html = ($size==0)?'':'<a href="'.$forcedownload_link.'" style="float:right"'.$prevent_multiple_click.'><img width="16" height="16" src="'.api_get_path(WEB_CODE_PATH).'img/'.$forcedownload_icon.'" alt="" /></a>';
+	$force_download_html = ($size==0)?'':'<a href="'.$forcedownload_link.'" style="float:right"'.$prevent_multiple_click.'>'.Display::return_icon($forcedownload_icon, get_lang('Download'),array('height'=>'16', 'width' => '16')).'</a>';
 	
 	$tooltip_title = str_replace('?cidReq='.$_GET['cidReq'],'',basename($path));
 	return '<a href="'.$url.'" title="'.$tooltip_title.'" target="'.$target.'"'.$visibility_class.' style="float:left">'.$title.'</a>'.$force_download_html;
@@ -200,7 +200,7 @@ function build_document_icon_tag($type,$path)
 	{
 		$icon=choose_image(basename($path));
 	}
-	return '<img src="'.api_get_path(WEB_CODE_PATH).'img/'.$icon.'" border="0" hspace="5" align="middle" alt="" />';
+	return Display::return_icon($icon, '', array('hspace'=>'5', 'align' => 'middle'));
 }
 
 /**
@@ -250,10 +250,10 @@ function build_edit_icons($curdirpath,$type,$path,$visibility,$id,$is_template,$
 		
 	if ($is_read_only)
 	{
-		$modify_icons = '<img src="../img/edit_na.gif" border="0" title="'.get_lang('Modify').'" alt="" />';		
-        $modify_icons .= '&nbsp;<img src="../img/delete_na.gif" border="0" title="'.get_lang('Delete').'" alt="" />';
-        $modify_icons .= '&nbsp;<img src="../img/deplacer_fichier_na.gif" border="0" title="'.get_lang('Move').'" alt="" />';
-        $modify_icons .= '&nbsp;<img src="../img/'.$visibility_icon.'_na.gif" border="0" title="'.get_lang('Visible').'" alt="" />';
+		$modify_icons = Display::return_icon('edit_na.gif', get_lang('Modify'));		
+        $modify_icons .= '&nbsp;'.Display::return_icon('delete.gif', get_lang('Delete'));
+        $modify_icons .= '&nbsp;'.Display::return_icon('deplacer_fichier_na.gif', get_lang('Move'));
+        $modify_icons .= '&nbsp;'.Display::return_icon($visibility_icon.'_na.gif', get_lang('Visible'));
 	}
 	else
 	{