diff --git a/main/gradebook/gradebook_edit_all.php b/main/gradebook/gradebook_edit_all.php
index 47797c51a9..e8fc1f767f 100755
--- a/main/gradebook/gradebook_edit_all.php
+++ b/main/gradebook/gradebook_edit_all.php
@@ -158,7 +158,7 @@ if ($my_api_cidreq=='') {
 }
 ?>
 <div class="actions">
-<a href="<?php echo Security::remove_XSS($_SESSION['gradebook_dest']).'?id_session='.api_get_session_id().'&amp;'.$my_api_cidreq ?>&selectcat=<?php echo $category_id ?>"> <?php echo Display::return_icon('back.png',get_lang('FolderView')) . get_lang('FolderView') ?></a>
+<a href="<?php echo Security::remove_XSS($_SESSION['gradebook_dest']).'?id_session='.api_get_session_id().'&amp;'.$my_api_cidreq ?>&selectcat=<?php echo $category_id ?>"> <?php echo Display::return_icon('back.png',get_lang('FolderView'),'','32'); ?></a>
 </div>
 <form method="post" action="gradebook_edit_all.php?id_session=<?php echo $_SESSION['id_session'].'&amp;'.$my_api_cidreq ?>&selectcat=<?php echo $category_id?>">
 <table class="data_table">
diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php
index ce13c96eee..73d0392b46 100755
--- a/main/gradebook/lib/fe/displaygradebook.php
+++ b/main/gradebook/lib/fe/displaygradebook.php
@@ -13,21 +13,23 @@ class DisplayGradebook
 		$status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
 		if (api_is_allowed_to_edit(null, true)) {
 			$header = '<div class="actions">';
-			$header .= '<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat=' . $selectcat . '">'. Display::return_icon(('back.png'),get_lang('FolderView')) . get_lang('FolderView') . '</a>';
+			$header .= '<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat=' . $selectcat . '">'. Display::return_icon(('back.png'),get_lang('FolderView'),'','32').'</a>';
 			if ($evalobj->get_course_code() == null) {
                 //Disabling code when course code is null see issue #2705
 				//$header .= '<a href="gradebook_add_user.php?selecteval=' . $evalobj->get_id() . '"><img src="../img/add_user_big.gif" alt="' . get_lang('AddStudent') . '" align="absmiddle" /> ' . get_lang('AddStudent') . '</a>';
 			} elseif (!$evalobj->has_results()) {
 				$header .= '<a href="gradebook_add_result.php?selectcat=' . $selectcat . '&selecteval=' . $evalobj->get_id() . '"><img src="../img/filenew.gif" alt="' . get_lang('AddResult') . '" align="absmiddle"/> ' . get_lang('AddResult') . '</a>';
 			}
-			$header .= '<a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&import="><img src="../img/import_data.gif" border="0" alt="" />' . ' ' . get_lang('ImportResult') . '</a>';
+			$header .= '<a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&import=">
+			'.Display::return_icon('import_evaluation.png',get_lang('ImportResult'),'','32') . '</a>';			
 			if ($evalobj->has_results()) {
-				$header .= '<a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&export="><img src="../img/file_pdf.gif" border="0" alt="" />' . ' ' . get_lang('ExportResult') . '</a>';
-				$header .= '<a href="gradebook_edit_result.php?selecteval=' . $evalobj->get_id() .'"><img src="../img/edit.gif" alt="' . get_lang('EditResult') . '" align="absmiddle" /> ' . get_lang('EditResult') . '</a>';
-				$header .= '<a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&deleteall=" onclick="return confirmationall();"><img src="../img/delete.gif" border="0" alt="" />' . ' ' . get_lang('DeleteResult') . '</a>';
+				$header .= '<a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&export=">'.Display::return_icon('export_evaluation.png',get_lang('ExportResult'),'','32') . '</a>';
+				$header .= '<a href="gradebook_edit_result.php?selecteval=' . $evalobj->get_id() .'">'.Display::return_icon('edit.png',get_lang('EditResult'),'','32').'</a>';
+				
+				$header .= '<a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&deleteall=" onclick="return confirmationall();">'.Display::return_icon('delete.png',get_lang('DeleteResult'),'','32').'</a>';
 			}
-			$header .= '<a href="' . api_get_self() . '?print=&selecteval=' . $evalobj->get_id() . '" target="_blank"><img src="../img/printmgr.gif" alt="' . get_lang('Print') . '" /> ' . get_lang('Print') . '</a>';
-
+			$header .= '<a href="' . api_get_self() . '?print=&selecteval=' . $evalobj->get_id() . '" target="_blank">
+			'.Display::return_icon('printer.png',get_lang('Print'),'','32').'</a>';
 			$header .= '</div>';
 		}
 		if ($evalobj->is_visible() == '1') {
@@ -58,12 +60,12 @@ class DisplayGradebook
 			$evalinfo .= '<br /><i>' . get_lang('NoResultsInEvaluation') . '</i>';
 		elseif ($scoredisplay->is_custom() && api_get_self() != '/dokeos/main/gradebook/gradebook_statistics.php') {
             if (api_is_allowed_to_edit(null, true)) {    
-                $evalinfo .= '<br /><br /><a href="gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'"> '.Display::return_icon(('gradebook_eval_not_empty.gif'),get_lang('ViewResult')) . '</a>';
+                $evalinfo .= '<br /><br /><a href="gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'"> '.Display::return_icon(('certificate_list.png'),get_lang('ViewResult'),'','32') . '</a>';
             }
         }
         
         if (api_is_allowed_to_edit(null, true)) {
-            $evalinfo .= '<a href="gradebook_statistics.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'"> '.Display::return_icon(('statistics.gif'),get_lang('ViewStatistics')) . '</a>';
+            $evalinfo .= '<a href="gradebook_statistics.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'"> '.Display::return_icon(('statistics.png'),get_lang('ViewStatistics'),'','32').'</a>';
         }
             $evalinfo .= '</td><td><img style="float:right; position:relative;" src="../img/tutorial.gif"></img></td></table>';
         
@@ -100,8 +102,8 @@ class DisplayGradebook
 			$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?selectcat=' . $catobj->get_parent_id() . '"><img src="../img/gradebook.gif" border="0" alt="'.get_lang('Up').'" /></a></td>';
 		}
 		$header .= '<td style="vertical-align: top;">'.$simple_search_form->toHtml().'</td>';
-		$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?exportpdf=&offset='.Security::remove_XSS($_GET['offset']).'&search=' . Security::remove_XSS($_GET['search']).'&selectcat=' . $catobj->get_id() . '"><img src=../img/file_pdf.gif alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
-		$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?print=&selectcat=' . $catobj->get_id() . '" target="_blank"><img src="../img/printmgr.gif" alt=' . get_lang('Print') . '/> ' . get_lang('Print') . '</a>';
+		$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?exportpdf=&offset='.Security::remove_XSS($_GET['offset']).'&search=' . Security::remove_XSS($_GET['search']).'&selectcat=' . $catobj->get_id() . '"><img src=../img/icons/32/pdf.png alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
+		$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?print=&selectcat=' . $catobj->get_id() . '" target="_blank"><img src="../img/icons/32/printer.png" alt=' . get_lang('Print') . '/> ' . get_lang('Print') . '</a>';
 		$header .= '</td></tr></table>';
 		if (!$catobj->get_id() == '0') {
 			$header .= '<table border="0" cellpadding="5"><tr><td><form name="itemfilter" method="post" action="' . api_get_self() . '?selectcat=' . $catobj->get_id() . '"><input type="checkbox" name="showeval" onclick="document.itemfilter.submit()" ' . (($showeval == '1') ? 'checked' : '') . '>Show Evaluations &nbsp;';
@@ -121,7 +123,7 @@ class DisplayGradebook
 	*/
 	function display_header_reduce_flatview($catobj, $showeval, $showlink,$simple_search_form) {
 		$header = '<div class="actions">';
-		$header .= '<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).'?'.api_get_cidreq().'">'. Display::return_icon('back.png',get_lang('FolderView')) . get_lang('FolderView') . '</a>';
+		$header .= '<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).'?'.api_get_cidreq().'">'. Display::return_icon('back.png',get_lang('FolderView'),'','32').'</a>';
 //		$header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?exportpdf=&offset='.Security::remove_XSS($_GET['offset']).'&search=' . Security::remove_XSS($_GET['search']).'&selectcat=' . $catobj->get_id() . '"><img src=../img/file_pdf.gif alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
 
 		// this MUST be a GET variable not a POST
@@ -143,10 +145,10 @@ class DisplayGradebook
 		echo '<input type="hidden" name="export_format" value="xls">';
 		echo '</form>';
 
-		$header .= '<a  href="javascript: void(0);" onclick="javascript: document.form1a.submit();">'.Display::return_icon('csv.gif', get_lang('ExportAsCSV')).' '.get_lang('ExportAsCSV').'</a>';
-		$header .= '<span><a " href="javascript: void(0);" onclick="javascript: document.form1b.submit();">'.Display::return_icon('excel.gif', get_lang('ExportAsXLS')).' '.get_lang('ExportAsXLS').'</a></span>';
-		$header .= '<a href="' . api_get_self() . '?print=&selectcat=' . $catobj->get_id() . '" target="_blank">'.Display::return_icon('printmgr.gif', get_lang('Print')).' ' . get_lang('Print') . '</a>';
-		$header .= '<a href="' . api_get_self() . '?exportpdf=&selectcat=' . $catobj->get_id() . '" >'.Display::return_icon('file_pdf.gif', get_lang('ExportToPDF')).' ' . get_lang('ExportToPDF') . '</a>';
+		$header .= '<a  href="javascript: void(0);" onclick="javascript: document.form1a.submit();">'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'','32').'</a>';
+		$header .= '<span><a " href="javascript: void(0);" onclick="javascript: document.form1b.submit();">'.Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'','32').'</a></span>';
+		$header .= '<a href="' . api_get_self() . '?print=&selectcat=' . $catobj->get_id() . '" target="_blank">'.Display::return_icon('printer.png', get_lang('Print'),'','32').'</a>';
+		$header .= '<a href="' . api_get_self() . '?exportpdf=&selectcat=' . $catobj->get_id() . '" >'.Display::return_icon('pdf.png', get_lang('ExportToPDF'),'','32').'</a>';
 
 		//exportpdf
 		//<div class="clear">
@@ -226,7 +228,7 @@ class DisplayGradebook
 			$header .= '<tr>';
 
 			if (!$selectcat == '0') {
-				$header .= '<td style=" "><a href="' . api_get_self() . '?selectcat=' . $catobj->get_parent_id() . '">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('RootCat')).get_lang('BackTo').' '.get_lang('RootCat').'</a></td>';
+				$header .= '<td style=" "><a href="' . api_get_self() . '?selectcat=' . $catobj->get_parent_id() . '">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('RootCat'),'','32').'</a></td>';
 			}
 
 			$header .= '<td style=" ">' . get_lang('CurrentCategory') . '</td>' .
@@ -263,7 +265,7 @@ class DisplayGradebook
 					//$header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat=' . $catobj->get_id() . '"><img src="../img/view_list.gif" alt="' . get_lang('FlatView') . '" /> ' . get_lang('FlatView') . '</a>';
 				}
 			} else {
-				$header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank"><img src="../img/file_pdf.gif" alt="' . get_lang('ExportPDF') . '" /> ' . get_lang('ExportPDF') . '</a>';
+				$header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank"><img src="../img/icons/32/.png" alt="' . get_lang('ExportPDF') . '" /> ' . get_lang('ExportPDF') . '</a>';
 			}
 			$header .= '</td></tr>';
 		}
@@ -293,28 +295,28 @@ class DisplayGradebook
 					$my_api_cidreq='cidReq='.$my_category['course_code'];
 				}
                 if ($show_add_link && !$message_resource) {
-    				$header .= '<td><a href="gradebook_add_eval.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '" >'.Display::return_icon('filenew.gif', get_lang('NewEvaluation')).' ' . get_lang('NewEvaluation') . '</a>&nbsp;';
+    				$header .= '<td><a href="gradebook_add_eval.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '" >'.Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'),'','32').'</a>';
                     $cats= Category :: load($selectcat);
                     if ($cats[0]->get_course_code() != null && !$message_resource) {
                         //$header .= '<td><a href="gradebook_add_link.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>';
-                        $header .= '<td><a href="gradebook_add_link.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('link.gif', get_lang('MakeLink')).' ' . get_lang('MakeLink') . '</a>&nbsp;';
+                        $header .= '<td><a href="gradebook_add_link.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('link.png', get_lang('MakeLink'),'','32').'</a>';
 
                     } else {
-                        $header .= '<td><a href="gradebook_add_link_select_course.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('link.gif', get_lang('MakeLink')).' ' . get_lang('MakeLink') . '</a>&nbsp;';
+                        $header .= '<td><a href="gradebook_add_link_select_course.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('link.png', get_lang('MakeLink'),'','32').'</a>';
                     }
                 }
 
                 if (!$message_resource) {
                 	$myname=$catobj->shows_all_information_an_category($catobj->get_id());
-                 	$header .= '<td><a href="gradebook_edit_all.php?id_session='.intval($_SESSION['id_session']).'&amp;'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('statistics.gif', get_lang('EditAllWeights')).' ' . get_lang('EditAllWeights') . '</a>';
+                 	$header .= '<td><a href="gradebook_edit_all.php?id_session='.intval($_SESSION['id_session']).'&amp;'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('percentage.png', get_lang('EditAllWeights'),'','32').'</a>';
                 	$my_course_id=api_get_course_id();
                 	$my_file= substr($_SESSION['gradebook_dest'],0,5);
 
 					if (api_is_allowed_to_edit(null, true)) {
-                		$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
-						$header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('stats_access.gif', get_lang('FlatView')).' ' . get_lang('FlatView') . '</a>';
-						$header .= '<td style="vertical-align: top;"><a href="../document/document.php?curdirpath=/certificates&'.$my_api_cidreq.'&origin=gradebook&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('certificate.png', get_lang('AttachCertificate')).' ' . get_lang('AttachCertificate') . '</a>';
-						$header .= '<td style="vertical-align: top;"><a href="gradebook_display_certificate.php?'.$my_api_cidreq.'&amp;cat_id='.(int)$_GET['selectcat'].'">'.Display::return_icon('gradebook_eval_not_empty.gif', get_lang('GradebookSeeListOfStudentsCertificates')).' ' . get_lang('GradebookSeeListOfStudentsCertificates') . '</a>';
+                		$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('settings.png', get_lang('ScoreEdit'),'','32').'</a>';
+						$header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('stats.png', get_lang('FlatView'),'','32').'</a>';
+						$header .= '<td style="vertical-align: top;"><a href="../document/document.php?curdirpath=/certificates&'.$my_api_cidreq.'&origin=gradebook&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('certificate.png', get_lang('AttachCertificate'),'','32').'</a>';
+						$header .= '<td style="vertical-align: top;"><a href="gradebook_display_certificate.php?'.$my_api_cidreq.'&amp;cat_id='.(int)$_GET['selectcat'].'">'.Display::return_icon('certificate_list.png', get_lang('GradebookSeeListOfStudentsCertificates'),'','32').'</a>';
 
 					}
                 }
@@ -348,12 +350,12 @@ class DisplayGradebook
 			$header = '<div class="actions">';
 
 			if ($is_course_admin) {
-				$header .= '<a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('stats_access.gif', get_lang('FlatView')).' '. get_lang('FlatView') . '</a>';
-				$header .= '<a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
+				$header .= '<a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('stats.png', get_lang('FlatView'),'','32').'</a>';
+				$header .= '<a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('settings.png', get_lang('ScoreEdit'),'','32').'</a>';
 			} elseif (!(isset ($_GET['studentoverview']))) {
 				$header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('view_list.gif', get_lang('FlatView')).' ' . get_lang('FlatView') . '</a>';
 			} else {
-				$header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank">'.Display::return_icon('file_pdf.gif', get_lang('ExportPDF')).' ' . get_lang('ExportPDF') . '</a>';
+				$header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank">'.Display::return_icon('pdf.png', get_lang('ExportPDF'),'','32').'</a>';
 			}
 		$header.='</div>';
 		echo $header;
diff --git a/main/gradebook/lib/gradebook_functions.inc.php b/main/gradebook/lib/gradebook_functions.inc.php
index b6c5b0e641..ca9187d1be 100755
--- a/main/gradebook/lib/gradebook_functions.inc.php
+++ b/main/gradebook/lib/gradebook_functions.inc.php
@@ -141,13 +141,13 @@ function build_type_icon_tag($kind) {
 function get_icon_file_name ($type) {
 	switch ($type) {
 		case 'cat':
-			$icon = 'gradebook.gif';
+			$icon = 'icons/22/gradebook.png';
 			break;
 		case 'evalempty':
-			$icon = 'empty.gif';
+			$icon = 'icons/22/empty_evaluation.png';
 			break;
 		case 'evalnotempty':
-			$icon = 'gradebook_eval_not_empty.gif';
+			$icon = 'icons/22/no_empty_evaluation.png';
 			break;
 		case 'exercise':
 		case LINK_EXERCISE:
@@ -155,7 +155,7 @@ function get_icon_file_name ($type) {
 			break;
 		case 'learnpath':
 		case LINK_LEARNPATH:
-			$icon = '/icons/22/learnpath.png';
+			$icon = 'icons/22/learnpath.png';
 			break;
 		case 'studentpublication':
 		case LINK_STUDENTPUBLICATION:
diff --git a/main/gradebook/user_stats.php b/main/gradebook/user_stats.php
index 507bf3a6d4..786a9920fc 100755
--- a/main/gradebook/user_stats.php
+++ b/main/gradebook/user_stats.php
@@ -84,7 +84,7 @@ $actions = '<div class="actions">';
 
 if (isset ($_GET['selectcat'])) {
 	$interbreadcrumb[]= array ('url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
-	$actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '>' . Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView')).get_lang('BackTo').' '.get_lang('FlatView').'</a>&nbsp&nbsp';
+	$actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '>' . Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'),'','32').'</a>';
 
 }
 if (isset ($_GET['selecteval'])) {
@@ -94,7 +94,7 @@ if (isset ($_GET['selecteval'])) {
 	));
 	$actions.= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '><img src=../img/lp_leftarrow.gif alt=' . get_lang('BackToEvaluation') . ' align=absmiddle/> ' . get_lang('BackToEvaluation') . '</a>&nbsp&nbsp';
 }
-$actions.= '<a href="' . api_get_self() . '?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat=' . $category[0]->get_id() . '" target="_blank"><img src=../img/file_pdf.gif alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
+$actions.= '<a href="' . api_get_self() . '?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat=' . $category[0]->get_id() . '" target="_blank"><img src=../img/icons/32/pdf.png alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
 $actions.='</div>';
 
 Display :: display_header(get_lang('ResultsPerUser'));
diff --git a/main/img/icons/22/empty_evaluation.png b/main/img/icons/22/empty_evaluation.png
new file mode 100644
index 0000000000..b19b83f627
Binary files /dev/null and b/main/img/icons/22/empty_evaluation.png differ
diff --git a/main/img/icons/22/gradebook.png b/main/img/icons/22/gradebook.png
new file mode 100644
index 0000000000..bf1e5c79da
Binary files /dev/null and b/main/img/icons/22/gradebook.png differ
diff --git a/main/img/icons/22/gradebook_na.png b/main/img/icons/22/gradebook_na.png
new file mode 100644
index 0000000000..eaca319d41
Binary files /dev/null and b/main/img/icons/22/gradebook_na.png differ
diff --git a/main/img/icons/22/no_empty_evaluation.png b/main/img/icons/22/no_empty_evaluation.png
new file mode 100644
index 0000000000..1b985ab5a8
Binary files /dev/null and b/main/img/icons/22/no_empty_evaluation.png differ
diff --git a/main/img/icons/22/scorms.gif b/main/img/icons/22/scorms.gif
new file mode 100644
index 0000000000..cd96858f84
Binary files /dev/null and b/main/img/icons/22/scorms.gif differ
diff --git a/main/img/icons/22/scorms_na.gif b/main/img/icons/22/scorms_na.gif
new file mode 100644
index 0000000000..1136dc6a7b
Binary files /dev/null and b/main/img/icons/22/scorms_na.gif differ
diff --git a/main/img/icons/22/scorms_na.png b/main/img/icons/22/scorms_na.png
new file mode 100644
index 0000000000..1136dc6a7b
Binary files /dev/null and b/main/img/icons/22/scorms_na.png differ
diff --git a/main/img/icons/32/certificate.png b/main/img/icons/32/certificate.png
new file mode 100644
index 0000000000..cd4387b22f
Binary files /dev/null and b/main/img/icons/32/certificate.png differ
diff --git a/main/img/icons/32/certificate_list.png b/main/img/icons/32/certificate_list.png
new file mode 100644
index 0000000000..e8753baeb3
Binary files /dev/null and b/main/img/icons/32/certificate_list.png differ
diff --git a/main/img/icons/32/delete.png b/main/img/icons/32/delete.png
new file mode 100644
index 0000000000..2d5e260a5f
Binary files /dev/null and b/main/img/icons/32/delete.png differ
diff --git a/main/img/icons/32/empty_evaluation.png b/main/img/icons/32/empty_evaluation.png
new file mode 100644
index 0000000000..1d91855f2b
Binary files /dev/null and b/main/img/icons/32/empty_evaluation.png differ
diff --git a/main/img/icons/32/export_evaluation.png b/main/img/icons/32/export_evaluation.png
new file mode 100644
index 0000000000..d2ecc98461
Binary files /dev/null and b/main/img/icons/32/export_evaluation.png differ
diff --git a/main/img/icons/32/gradebook.png b/main/img/icons/32/gradebook.png
new file mode 100644
index 0000000000..ec1fcd660e
Binary files /dev/null and b/main/img/icons/32/gradebook.png differ
diff --git a/main/img/icons/32/import_evaluation.png b/main/img/icons/32/import_evaluation.png
new file mode 100644
index 0000000000..5aac1bbfa3
Binary files /dev/null and b/main/img/icons/32/import_evaluation.png differ
diff --git a/main/img/icons/32/new_evaluation.png b/main/img/icons/32/new_evaluation.png
new file mode 100644
index 0000000000..ae37dbac0e
Binary files /dev/null and b/main/img/icons/32/new_evaluation.png differ
diff --git a/main/img/icons/32/pdf.png b/main/img/icons/32/pdf.png
new file mode 100644
index 0000000000..79622266d1
Binary files /dev/null and b/main/img/icons/32/pdf.png differ
diff --git a/main/img/icons/32/percentage.png b/main/img/icons/32/percentage.png
new file mode 100644
index 0000000000..b63c13631f
Binary files /dev/null and b/main/img/icons/32/percentage.png differ
diff --git a/main/img/icons/32/printer.png b/main/img/icons/32/printer.png
new file mode 100644
index 0000000000..16b7f8f589
Binary files /dev/null and b/main/img/icons/32/printer.png differ
diff --git a/main/img/icons/32/statistics.png b/main/img/icons/32/statistics.png
new file mode 100644
index 0000000000..42dc708b0e
Binary files /dev/null and b/main/img/icons/32/statistics.png differ
diff --git a/main/img/icons/32/stats.png b/main/img/icons/32/stats.png
new file mode 100644
index 0000000000..943b8bd106
Binary files /dev/null and b/main/img/icons/32/stats.png differ
diff --git a/main/img/icons/48/sum.txt b/main/img/icons/48/_sum.txt
similarity index 75%
rename from main/img/icons/48/sum.txt
rename to main/img/icons/48/_sum.txt
index 9665a5789a..a4890e9bcd 100644
--- a/main/img/icons/48/sum.txt
+++ b/main/img/icons/48/_sum.txt
@@ -51,7 +51,8 @@ learnpath_section 	modif nuvola (16 px lp_dokeos_chapter.png and lp_dir.png into
 view_left_right		nuvola
 move_learnpath		modif nuvola
 move_learnpath_na	modif nuvola
-scorms			nuvola
+scorms			nuvola (and 22 px gif version for home page)
+scorms_na		modif nuvola (and 22 px gif version for home page)
 view_remove.png		nuvola
 view_remove_na.png	modif nuvola
 export_scorm		modif nuvola
@@ -71,4 +72,17 @@ settings_na		modif nuvola
 export_excel		modif mix crystal
 exercice_check		modif mix nuvola crystal
 exercice_uncheck	modif mix nuvola crystal
+--------
+statistics		crystal
+percentage		nuvola
+pdf			crystal
+printer			nuvola
+gradebook		crystal (and 22 px gif version for home page)
+gradebook_na		modif crystal (and 22 px gif version for home page)
+empty_evaluation	crystal
+no_empty_evaluation	modif crystal
+new_evaluation		modif crystal
+delete			nuvola
+import_evaluation	modif crystal
+export_evaluation	modif crystal	
 
diff --git a/main/img/icons/48/certificate.png b/main/img/icons/48/certificate.png
new file mode 100644
index 0000000000..715f124ccd
Binary files /dev/null and b/main/img/icons/48/certificate.png differ
diff --git a/main/img/icons/48/certificate_list.png b/main/img/icons/48/certificate_list.png
new file mode 100644
index 0000000000..5cce5b25d7
Binary files /dev/null and b/main/img/icons/48/certificate_list.png differ
diff --git a/main/img/icons/48/delete.png b/main/img/icons/48/delete.png
new file mode 100644
index 0000000000..6b4497d5ef
Binary files /dev/null and b/main/img/icons/48/delete.png differ
diff --git a/main/img/icons/48/empty_evaluation.png b/main/img/icons/48/empty_evaluation.png
new file mode 100644
index 0000000000..800c8aa5d1
Binary files /dev/null and b/main/img/icons/48/empty_evaluation.png differ
diff --git a/main/img/icons/48/export_evaluation.png b/main/img/icons/48/export_evaluation.png
new file mode 100644
index 0000000000..39dfba4d96
Binary files /dev/null and b/main/img/icons/48/export_evaluation.png differ
diff --git a/main/img/icons/48/gradebook.png b/main/img/icons/48/gradebook.png
new file mode 100644
index 0000000000..ab6e9e92cf
Binary files /dev/null and b/main/img/icons/48/gradebook.png differ
diff --git a/main/img/icons/48/gradebook_na.png b/main/img/icons/48/gradebook_na.png
new file mode 100644
index 0000000000..2d37356012
Binary files /dev/null and b/main/img/icons/48/gradebook_na.png differ
diff --git a/main/img/icons/48/import_evaluation.png b/main/img/icons/48/import_evaluation.png
new file mode 100644
index 0000000000..37e82e8abc
Binary files /dev/null and b/main/img/icons/48/import_evaluation.png differ
diff --git a/main/img/icons/48/new_evaluation.png b/main/img/icons/48/new_evaluation.png
new file mode 100644
index 0000000000..c25c0cedb0
Binary files /dev/null and b/main/img/icons/48/new_evaluation.png differ
diff --git a/main/img/icons/48/no_empty_evaluation.png b/main/img/icons/48/no_empty_evaluation.png
new file mode 100644
index 0000000000..4d51222693
Binary files /dev/null and b/main/img/icons/48/no_empty_evaluation.png differ
diff --git a/main/img/icons/48/pdf.png b/main/img/icons/48/pdf.png
new file mode 100644
index 0000000000..34f1b26c0e
Binary files /dev/null and b/main/img/icons/48/pdf.png differ
diff --git a/main/img/icons/48/percentage.png b/main/img/icons/48/percentage.png
new file mode 100644
index 0000000000..3ba9bf2982
Binary files /dev/null and b/main/img/icons/48/percentage.png differ
diff --git a/main/img/icons/48/printer.png b/main/img/icons/48/printer.png
new file mode 100644
index 0000000000..1e160cd7ff
Binary files /dev/null and b/main/img/icons/48/printer.png differ
diff --git a/main/img/icons/48/scorms_na.png b/main/img/icons/48/scorms_na.png
new file mode 100644
index 0000000000..74b38287cd
Binary files /dev/null and b/main/img/icons/48/scorms_na.png differ
diff --git a/main/img/icons/48/statistics.png b/main/img/icons/48/statistics.png
new file mode 100644
index 0000000000..6aea1be8e8
Binary files /dev/null and b/main/img/icons/48/statistics.png differ
diff --git a/main/img/icons/48/stats.png b/main/img/icons/48/stats.png
new file mode 100644
index 0000000000..280131bd78
Binary files /dev/null and b/main/img/icons/48/stats.png differ
diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index f4ab1c873f..b35bcb0b49 100755
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -2144,7 +2144,7 @@ function fill_Db_course($course_db_name, $course_repository, $language, $default
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_COURSE_DESCRIPTION . "','course_description/','info.gif','".string2binary(api_get_setting('course_create_active_tools', 'course_description')) . "','0','squaregrey.gif','NO','_self','authoring','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_CALENDAR_EVENT . "','calendar/agenda.php','agenda.gif','".string2binary(api_get_setting('course_create_active_tools', 'agenda')) . "','0','squaregrey.gif','NO','_self','interaction','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_DOCUMENT . "','document/document.php','folder_document.gif','".string2binary(api_get_setting('course_create_active_tools', 'documents')) . "','0','squaregrey.gif','NO','_self','authoring','0')");
-    Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_LEARNPATH . "','newscorm/lp_controller.php','icons/22/scorms.png','".string2binary(api_get_setting('course_create_active_tools', 'learning_path')) . "','0','squaregrey.gif','NO','_self','authoring','0')");
+    Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_LEARNPATH . "','newscorm/lp_controller.php','icons/22/scorms.gif','".string2binary(api_get_setting('course_create_active_tools', 'learning_path')) . "','0','squaregrey.gif','NO','_self','authoring','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_LINK . "','link/link.php','links.gif','".string2binary(api_get_setting('course_create_active_tools', 'links')) . "','0','squaregrey.gif','NO','_self','authoring','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_QUIZ . "','exercice/exercice.php','quiz.gif','".string2binary(api_get_setting('course_create_active_tools', 'quiz')) . "','0','squaregrey.gif','NO','_self','authoring','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_ANNOUNCEMENT . "','announcements/announcements.php','valves.gif','".string2binary(api_get_setting('course_create_active_tools', 'announcements')) . "','0','squaregrey.gif','NO','_self','authoring','0')");
@@ -2156,7 +2156,7 @@ function fill_Db_course($course_db_name, $course_repository, $language, $default
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_STUDENTPUBLICATION . "','work/work.php','works.gif','".string2binary(api_get_setting('course_create_active_tools', 'student_publications')) . "','0','squaregrey.gif','NO','_self','interaction','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_SURVEY."','survey/survey_list.php','survey.gif','".string2binary(api_get_setting('course_create_active_tools', 'survey')) . "','0','squaregrey.gif','NO','_self','interaction','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_WIKI ."','wiki/index.php','wiki.gif','".string2binary(api_get_setting('course_create_active_tools', 'wiki')) . "','0','squaregrey.gif','NO','_self','interaction','0')");
-    Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_GRADEBOOK."','gradebook/index.php','gradebook.gif','".string2binary(api_get_setting('course_create_active_tools', 'gradebook')). "','0','squaregrey.gif','NO','_self','authoring','0')");
+    Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_GRADEBOOK."','gradebook/index.php','icons/22/gradebook.gif','".string2binary(api_get_setting('course_create_active_tools', 'gradebook')). "','0','squaregrey.gif','NO','_self','authoring','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_GLOSSARY."','glossary/index.php','glossary.gif','".string2binary(api_get_setting('course_create_active_tools', 'glossary')). "','0','squaregrey.gif','NO','_self','authoring','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_NOTEBOOK."','notebook/index.php','notebook.gif','".string2binary(api_get_setting('course_create_active_tools', 'notebook'))."','0','squaregrey.gif','NO','_self','interaction','0')");
     Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_ATTENDANCE."','attendance/index.php','attendance.gif','".string2binary(api_get_setting('course_create_active_tools', 'attendances'))."','0','squaregrey.gif','NO','_self','authoring','0')");
diff --git a/main/install/db_main.sql b/main/install/db_main.sql
index 10d5a418b4..cf010f735c 100755
--- a/main/install/db_main.sql
+++ b/main/install/db_main.sql
@@ -280,13 +280,13 @@ INSERT INTO course_module VALUES
 (17,'AddedLearnpath','','scormbuilder.gif',0,0,'external'),
 (18,'conference','conference/index.php?type=conference','conf.gif',0,0,'external'),
 (19,'conference','conference/index.php?type=classroom','conf.gif',0,0,'external'),
-(20,'learnpath','newscorm/lp_controller.php','icons/22/scorms.png',5,1,'basic'),
+(20,'learnpath','newscorm/lp_controller.php','icons/22/scorms.gif',5,1,'basic'),
 (21,'blog','blog/blog.php','blog.gif',1,2,'basic'),
 (22,'blog_management','blog/blog_admin.php','blog_admin.gif',1,2,'courseadmin'),
 (23,'course_maintenance','course_info/maintenance.php','backup.gif',2,3,'courseadmin'),
 (24,'survey','survey/survey_list.php','survey.gif',2,1,'basic'),
 (25,'wiki','wiki/index.php','wiki.gif',2,3,'basic'),
-(26,'gradebook','gradebook/index.php','gradebook.gif',2,2,'basic'),
+(26,'gradebook','gradebook/index.php','icons/22/gradebook.gif',2,2,'basic'),
 (27,'glossary','glossary/index.php','glossary.gif',2,1,'basic'),
 (28,'notebook','notebook/index.php','notebook.gif',2,1,'basic'),
 (29,'attendance','attendance/index.php','attendance.gif',2,1,'basic'),