diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index ecaf646488..dbca979549 100644
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -434,7 +434,10 @@ if($show == 'test'){
       <td width="30" align="left"><img src="../img/test.gif"></td>
       <td width="15" valign="left" align="center"><?php echo ($i+($page*$limitExPage)).'.'; ?></td>
       <?php $row['title']=api_parse_tex($row['title']); ?>
-      <td><a href="exercice_submit.php?<?php echo api_get_cidreq()."&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id"; ?>&exerciseId=<?php echo $row['id']; ?>" <?php if(!$row['active']) echo 'class="invisible"'; ?>><?php echo $row['title']; ?></a></td>
+      <td>
+      	<a href="exercice_submit.php?<?php echo api_get_cidreq()."&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id"; ?>&exerciseId=<?php echo $row['id']; ?>" <?php if(!$row['active']) echo 'class="invisible"'; ?>><?php echo $row['title']; ?></a>
+      	<a href="exercise_admin.php?modifyExercise=yes&exerciseId=<?php echo $row[id]; ?>"> <img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify')); ?>" alt="<?php echo htmlentities(get_lang('Modify')); ?>" /></a>
+      </td>
     </tr>
   </table></td>
  <td width="8%" align="center"> <?php 
@@ -443,7 +446,7 @@ if($show == 'test'){
  $sqlresult =mysql_query($sqlquery);
  $rowi = mysql_result($sqlresult,0);
  echo $rowi.' Questions'; ?> </td>
-       <td width="12%" align="center"><a href="admin.php?exerciseId=<?php echo $row[id]; ?>"><img src="../img/wizard_small.gif" border="0" title="<?php echo htmlentities(get_lang('Build')); ?>" alt="<?php echo htmlentities(get_lang('Build')); ?>" /></a><a href="exercise_admin.php?modifyExercise=yes&exerciseId=<?php echo $row[id]; ?>"> <img src="../img/edit.gif" border="0" title="<?php echo htmlentities(get_lang('Modify')); ?>" alt="<?php echo htmlentities(get_lang('Modify')); ?>" /></a> 
+       <td width="12%" align="center"><a href="admin.php?exerciseId=<?php echo $row[id]; ?>"><img src="../img/wizard_small.gif" border="0" title="<?php echo htmlentities(get_lang('Build')); ?>" alt="<?php echo htmlentities(get_lang('Build')); ?>" /></a> 
     <a href="exercice.php?choice=delete&exerciseId=<?php echo $row[id]; ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('areYouSure'))); echo $row['title']; echo "?"; ?>')) return false;"> <img src="../img/delete.gif" border="0" alt="<?php echo htmlentities(get_lang('Delete')); ?>" /></a> 
     <?php
 				// if active
diff --git a/main/exercice/fill_blanks.class.php b/main/exercice/fill_blanks.class.php
index 83410a933b..9abcfef47e 100644
--- a/main/exercice/fill_blanks.class.php
+++ b/main/exercice/fill_blanks.class.php
@@ -44,6 +44,9 @@ if(!class_exists('FillBlanks')):
  
 class FillBlanks extends Question {
 	
+	static $typePicture = 'fill_in_blanks.png';
+	static $explanationLangVar = 'FillBlanks';
+	
 	/**
 	 * Constructor
 	 */
diff --git a/main/exercice/freeanswer.class.php b/main/exercice/freeanswer.class.php
index cc52bd0582..8d6ee91576 100644
--- a/main/exercice/freeanswer.class.php
+++ b/main/exercice/freeanswer.class.php
@@ -44,6 +44,9 @@ if(!class_exists('FreeAnswer')):
  
 class FreeAnswer extends Question {
 	
+	static $typePicture = 'open_answer.png';
+	static $explanationLangVar = 'freeAnswer';
+	
 	/**
 	 * Constructor
 	 */
diff --git a/main/exercice/hotspot.class.php b/main/exercice/hotspot.class.php
index 3e8b9bb9c7..377a0f2310 100644
--- a/main/exercice/hotspot.class.php
+++ b/main/exercice/hotspot.class.php
@@ -43,6 +43,10 @@ if(!class_exists('HotSpot')):
  **/
 
 class HotSpot extends Question {
+	
+	static $typePicture = 'hotspot.png';
+	static $explanationLangVar = 'Hotspot';
+	
 
 	function HotSpot(){
 		parent::question();
diff --git a/main/exercice/matching.class.php b/main/exercice/matching.class.php
index 07a38437b0..11985339d2 100644
--- a/main/exercice/matching.class.php
+++ b/main/exercice/matching.class.php
@@ -44,6 +44,10 @@ if(!class_exists('Matching')):
  
 class Matching extends Question {
 	
+	
+	static $typePicture = 'matching.png';
+	static $explanationLangVar = 'Matching';
+	
 	/**
 	 * Constructor
 	 */
diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php
index d90cd17888..540fdf2ae6 100644
--- a/main/exercice/multiple_answer.class.php
+++ b/main/exercice/multiple_answer.class.php
@@ -44,6 +44,9 @@ if(!class_exists('MultipleAnswer')):
  
 class MultipleAnswer extends Question {
 	
+	static $typePicture = 'mcma.png';
+	static $explanationLangVar = 'MultipleSelect';
+	
 	/**
 	 * Constructor
 	 */
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index 182fd28511..f710ff0d4a 100644
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -1,4 +1,4 @@
-<?php // $Id: question.class.php 10672 2007-01-11 10:40:16Z elixir_inter $
+<?php // $Id: question.class.php 10738 2007-01-15 16:53:22Z elixir_inter $
 /*
 ============================================================================== 
 	Dokeos - elearning and course management software
@@ -60,11 +60,13 @@ abstract class Question
 	var $weighting;
 	var $position;
 	var $type;
+	
 	var $picture;
 
 	var $exerciseList;  // array with the list of exercises which this question is in
 	
-	// list
+	static $typePicture = 'new_question.png';
+	static $explanationLangVar = '';
 	static $questionTypes = array(
 							UNIQUE_ANSWER => array('unique_answer.class.php' , 'UniqueAnswer'),
 							MULTIPLE_ANSWER => array('multiple_answer.class.php' , 'MultipleAnswer'),
@@ -73,7 +75,7 @@ abstract class Question
 							FREE_ANSWER => array('freeanswer.class.php' , 'FreeAnswer'),
 							HOT_SPOT => array('hotspot.class.php' , 'HotSpot')
 							);
-
+	
 	/**
 	 * constructor of the class
 	 *
@@ -789,6 +791,42 @@ abstract class Question
 	 * @param the formvalidator instance 
 	 */
 	abstract function processAnswersCreation ($form);
+	
+	
+	/**
+	 * Displays the menu of question types
+	 */
+	static function display_type_menu ()
+	{
+		?>
+		<script type="text/javascript">
+			function explain(explanation){
+				document.getElementById('answer_type_explanation').innerHTML = explanation;
+			}
+			function hideExplanation(){
+				document.getElementById('answer_type_explanation').innerHTML = '<?php echo get_lang('ChooseQuestionType') ?>';
+			}
+		</script>
+		<?php
+		echo '<div onmouseout="hideExplanation()">';
+		foreach(self::$questionTypes as $i=>$a_type)
+		{
+			include_once($a_type[0]);
+			eval('$img = '.$a_type[1].'::$typePicture;');
+			eval('$explanation = get_lang('.$a_type[1].'::$explanationLangVar);');
+			
+			echo '
+			<div id="answer_type_'.$i.'" style="display: inline">
+				<a href="admin.php?newQuestion=yes&answerType=1" onmouseover="explain(\''.$explanation.'\')"><img src="'.api_get_path(WEB_IMG_PATH).'/'.$img.'" /></a>
+			</div>';
+		}
+		echo '
+		<div id="answer_type_explanation" class="accordion_content" style="display:block">'.get_lang('ChooseQuestionType').' :</div></div>';
+		
+		
+		
+		
+	}
 }
 
 endif;
diff --git a/main/exercice/question_list_admin.inc.php b/main/exercice/question_list_admin.inc.php
index 0b2de3554a..c5e99b08fb 100644
--- a/main/exercice/question_list_admin.inc.php
+++ b/main/exercice/question_list_admin.inc.php
@@ -1,4 +1,4 @@
-<?php // $Id: question_list_admin.inc.php 10691 2007-01-12 12:16:28Z elixir_inter $
+<?php // $Id: question_list_admin.inc.php 10738 2007-01-15 16:53:22Z elixir_inter $
 /*
 ============================================================================== 
 	Dokeos - elearning and course management software
@@ -73,19 +73,11 @@ if($deleteQuestion)
 	// destruction of the Question object
 	unset($objQuestionTmp);
 }
-?>
-
- <a href="question_pool.php?fromExercise=<?php echo $exerciseId; ?>"><?php echo get_lang('GetExistingQuestion'); ?></a> &nbsp; &nbsp; &nbsp;  &nbsp; &nbsp; &nbsp;  &nbsp; &nbsp;&nbsp; <!--<a href="exercice.php?<?php echo api_get_cidreq(); ?>"><?php echo get_lang('backtoTesthome'); ?></a>--><br />
-<br /><?php echo get_lang('NewQu').' : ';?><a href="admin.php?newQuestion=yes&answerType=1"><?php echo get_lang('UniqueSelect'); ?></a> | <a href="admin.php?newQuestion=yes&answerType=2"><?php echo get_lang('MultipleSelect'); ?></a> | <a href="admin.php?newQuestion=yes&answerType=3"><?php echo get_lang('FillBlanks'); ?></a> | <a href="admin.php?newQuestion=yes&answerType=4"><?php echo get_lang('Matching'); ?></a> | <a href="admin.php?newQuestion=yes&answerType=5"><?php echo get_lang('freeAnswer'); ?></a> | <a href="admin.php?newQuestion=yes&answerType=6"><?php echo get_lang('Hotspot'); ?></a>
-&nbsp;&nbsp;
-<br /><br />
 
+Question :: display_type_menu ();
+?>
 
-<!--<form method="get" action="exercice.php" style="margin:10px; margin-left:0px;">
-<input type="submit" value="<?php //echo htmlentities(get_lang('FinishTest')); ?>">
-</form>-->
 
-<?php //echo get_lang('QuestionList'); ?>
 <table border="0" align="center" cellpadding="2" cellspacing="2" width="100%">
 <tr  bgcolor='#e6e6e6'><td width="20%" align="center"><b><?php echo get_lang('Question'); ?></b></td>
 <td width="20%" align="center"><b><?php echo get_lang('Type');?></b></td>
diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php
index 04643066bd..f389085636 100644
--- a/main/exercice/unique_answer.class.php
+++ b/main/exercice/unique_answer.class.php
@@ -44,6 +44,9 @@ if(!class_exists('UniqueAnswer')):
  
 class UniqueAnswer extends Question {
 	
+	static $typePicture = 'mcua.png';
+	static $explanationLangVar = 'UniqueSelect';
+	
 	/**
 	 * Constructor
 	 */
diff --git a/main/img/fill_in_blanks.png b/main/img/fill_in_blanks.png
new file mode 100644
index 0000000000..96d8afc3c9
Binary files /dev/null and b/main/img/fill_in_blanks.png differ
diff --git a/main/img/hotspot.png b/main/img/hotspot.png
new file mode 100644
index 0000000000..69cf630f0c
Binary files /dev/null and b/main/img/hotspot.png differ
diff --git a/main/img/matching.png b/main/img/matching.png
new file mode 100644
index 0000000000..03ec507cb7
Binary files /dev/null and b/main/img/matching.png differ
diff --git a/main/img/mcma.png b/main/img/mcma.png
new file mode 100644
index 0000000000..c9ce6cdf7a
Binary files /dev/null and b/main/img/mcma.png differ
diff --git a/main/img/mcua.png b/main/img/mcua.png
new file mode 100644
index 0000000000..82b9a14bbc
Binary files /dev/null and b/main/img/mcua.png differ
diff --git a/main/img/open_answer.png b/main/img/open_answer.png
new file mode 100644
index 0000000000..ceeb7773a6
Binary files /dev/null and b/main/img/open_answer.png differ