diff --git a/main/glossary/index.php b/main/glossary/index.php
index 0de33643db..7190c39ef1 100755
--- a/main/glossary/index.php
+++ b/main/glossary/index.php
@@ -35,7 +35,7 @@ event_access_tool(TOOL_GLOSSARY);
 
 if (isset($_GET['action']) && ($_GET['action'] == 'addglossary' || $_GET['action'] == 'edit_glossary')) {
 $tool=get_lang('GlossaryManagement');
-$interbreadcrumb[] = array ("url"=>"index.php", "name"=> api_ucfirst(get_lang(TOOL_GLOSSARY)));
+$interbreadcrumb[] = array ("url"=>"index.php", "name"=> get_lang('Glossary'));
 }
 
 Display::display_header(get_lang(ucfirst($tool)));
diff --git a/main/survey/survey.php b/main/survey/survey.php
index 5c9cc96ce5..6be2afc238 100644
--- a/main/survey/survey.php
+++ b/main/survey/survey.php
@@ -1,4 +1,4 @@
-<?php // $Id: survey.php 21034 2009-05-28 11:45:43Z pcool $
+<?php // $Id: survey.php 21053 2009-05-28 22:59:15Z cvargas1 $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -23,7 +23,7 @@
 *	@package dokeos.survey
 * 	@author unknown
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
-* 	@version $Id: survey.php 21034 2009-05-28 11:45:43Z pcool $
+* 	@version $Id: survey.php 21053 2009-05-28 22:59:15Z cvargas1 $
 *
 * 	@todo use quickforms for the forms
 */
@@ -162,7 +162,7 @@ echo '<div class="actions">'.$survey_actions.'</div>';
 if ($survey_data['survey_type']==0) {	
 	echo '<div class="actionsbig">';	
 	echo '<a style="padding-left:0px;" href="question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('yesno.gif').'<br/>'.get_lang('YesNo').'</a>';	 
-	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('mcua.gif').'<br />'.get_lang('MultipleChoice').'</a>';	
+	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('mcua.gif').'<br />'.get_lang('UniqueSelect').'</a>';	
 	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('mcma.gif').'<br />'.get_lang('MultipleResponse').'</a>';
 	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('open_answer.gif').'<br />'.get_lang('Open').'</a>';
 	echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$_GET['survey_id'].'">'.Display::return_icon('dropdown.gif').'<br />'.get_lang('Dropdown').'</a>';	
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 2d7e44a22b..879f722f73 100644
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -1,4 +1,4 @@
-<?php //$Id: work.lib.php 21043 2009-05-28 14:35:45Z pcool $
+<?php //$Id: work.lib.php 21053 2009-05-28 22:59:15Z cvargas1 $
 /* For licensing terms, see /dokeos_license.txt */
 /**
 *	@package dokeos.work
@@ -6,7 +6,7 @@
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
 * 	@author Roan Embrechts, code refactoring and virtual course support
 * 	@author Frederic Vauthier, directories management
-* 	@version $Id: work.lib.php 21043 2009-05-28 14:35:45Z pcool $
+* 	@version $Id: work.lib.php 21053 2009-05-28 22:59:15Z cvargas1 $
 */
 /**
  * Displays action links (for admins, authorized groups members and authorized students)
@@ -609,16 +609,15 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
 				$add_to_name = '';
 			}
 			$show_as_icon = get_work_id($mydir); //true or false
-				if ($cant_files>0) {
-					$zip='<a href="'.api_get_self().'?cidReq='.api_get_course_id().'&gradebook='.$gradebook.'&action=downloadfolder&path=/'.$mydir.'"><img src="../img/zip_save.gif" style="float:right;" alt="'.get_lang('Save').'" title="'.get_lang('Save').'" width="17" height="17"/></a>';	
-				}		
-				if ($show_as_icon) {
-					$row[] = $zip.'<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&curdirpath='.$mydir.'"'.$class.'>'.$dir.'</a>'.$add_to_name.'<br>'.$cant_files.' '.$text_file.$dirtext;
-				} else {
-					$row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&gradebook='.$gradebook.'&curdirpath='.$mydir.'"'.$class.'>'.$dir.'</a>'.$add_to_name.'<br>'.$cant_files.' '.$text_file.$dirtext;	
-				}								
+			if ($show_as_icon){
+				if (is_allowed_to_edit()) {
+					$zip='<a href="'.api_get_self().'?cidReq='.api_get_course_id().'&gradebook='.$gradebook.'&action=downloadfolder&path=/'.$mydir.'"><img src="../img/zip_save.gif" style="float:right;" alt="'.get_lang('Save').'" title="'.get_lang('Save').'" width="17" height="17"/></a>';
+				}
+				$row[] = $zip.'<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&curdirpath='.$mydir.'"'.$class.'>'.$dir.'</a>'.$add_to_name.'<br>'.$cant_files.' '.$text_file.$dirtext;
+			} else {
+				$row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&gradebook='.$gradebook.'&curdirpath='.$mydir.'"'.$class.'>'.$dir.'</a>'.$add_to_name.'<br>'.$cant_files.' '.$text_file.$dirtext;	
+			}								
 		}
-		
 		if ($count_files!=0) {
 			$row[] = "";
 		}