diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 8672307217..e013fbc62b 100644
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -741,7 +741,11 @@ class Exercise {
 		$form->addElement('html','<div class="row">
 		<div class="label"></div>
 		<div class="formw" style="height:50px">
-			<a href="javascript://" onclick=" return show_media()"> <span id="media_icon"> <img style="vertical-align: middle;" src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('ExerciseDescription').'</span></a>
+			<a href="javascript://" onclick=" return show_media()"> 
+				<span id="media_icon">
+					<img style="vertical-align: middle;" src="../img/looknfeel.png" alt="" /> '.addslashes(api_htmlentities(get_lang('ExerciseDescription'))).'
+					</span>
+			</a>
 		</div>
 		</div>');
 
@@ -757,7 +761,8 @@ class Exercise {
 		$form->addElement('html','<div class="row">
 			<div class="label">&nbsp;</div>
 			<div class="formw">
-				<a href="javascript://" onclick=" return advanced_parameters()"><span id="img_plus_and_minus"><div style="vertical-align:top;" ><img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'</div></span></a>
+				<a href="javascript://" onclick=" return advanced_parameters()"><span id="img_plus_and_minus"><div style="vertical-align:top;" >
+				<img style="vertical-align:middle;" src="../img/div_show.gif" alt="" /> '.addslashes(api_htmlentities(get_lang('AdvancedParameters'))).'</div></span></a>
 			</div>
 			</div>');
 
diff --git a/main/exercice/exercise_admin.php b/main/exercice/exercise_admin.php
old mode 100755
new mode 100644
index b747c73790..e3b1691835
--- a/main/exercice/exercise_admin.php
+++ b/main/exercice/exercise_admin.php
@@ -28,10 +28,10 @@ $htmlHeadXtra[] = '<script type="text/javascript">
 		function advanced_parameters() {
 			if(document.getElementById(\'options\').style.display == \'none\') {
 				document.getElementById(\'options\').style.display = \'block\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img style="vertical-align:middle;" src="../img/div_hide.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\';
+				document.getElementById(\'img_plus_and_minus\').innerHTML=\' <img style="vertical-align:middle;" src="../img/div_hide.gif" alt="" /> '.addslashes(api_htmlentities(get_lang('AdvancedParameters'))).'\';
 			} else {
 				document.getElementById(\'options\').style.display = \'none\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\';
+				document.getElementById(\'img_plus_and_minus\').innerHTML=\' <img style="vertical-align:middle;" src="../img/div_show.gif" alt="" /> '.addslashes(api_htmlentities(get_lang('AdvancedParameters'))).'\';
 			}
 		}
 
@@ -50,13 +50,12 @@ $htmlHeadXtra[] = '<script type="text/javascript">
 		
 		function show_media() {
 			var my_display = document.getElementById(\'HiddenFCKexerciseDescription\').style.display;
-				if(my_display== \'none\' || my_display == \'\')
-				{
+				if(my_display== \'none\' || my_display == \'\') {
 					document.getElementById(\'HiddenFCKexerciseDescription\').style.display = \'block\';
-					document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img src="../img/looknfeelna.png" alt="" />&nbsp;'.get_lang('ExerciseDescription').'\';
+					document.getElementById(\'media_icon\').innerHTML=\' <img src="../img/looknfeelna.png" alt="" /> '.addslashes(api_htmlentities(get_lang('ExerciseDescription'))).'\';
 				} else {
 					document.getElementById(\'HiddenFCKexerciseDescription\').style.display = \'none\';
-					document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('ExerciseDescription').'\';
+					document.getElementById(\'media_icon\').innerHTML=\' <img src="../img/looknfeel.png" alt="" /> '.addslashes(api_htmlentities(get_lang('ExerciseDescription'))).'\';
 				}
 		}
 
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index 6dba25789d..fabf10361f 100644
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -1007,8 +1007,7 @@ abstract class Question
 		echo '<script>
 			// hack to hide http://cksource.com/forums/viewtopic.php?f=6&t=8700
 
-			function FCKeditor_OnComplete( editorInstance )
-			{
+			function FCKeditor_OnComplete( editorInstance ) {
 			   if (document.getElementById ( \'HiddenFCK\' + editorInstance.Name )) {
 			      HideFCKEditorByInstanceName (editorInstance.Name);
 			   }
@@ -1019,16 +1018,14 @@ abstract class Question
 			      document.getElementById ( \'HiddenFCK\' + editorInstanceName ).className = "media";
 			      }
 			}
-
-			function show_media()
-			{
+			function show_media() {
 				var my_display = document.getElementById(\'HiddenFCKquestionDescription\').style.display;
 				if(my_display== \'none\' || my_display == \'\') {
 				document.getElementById(\'HiddenFCKquestionDescription\').style.display = \'block\';
-				document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img style="vertical-align: middle;" src="../img/looknfeelna.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'\';
+				document.getElementById(\'media_icon\').innerHTML=\' <img style="vertical-align: middle;" src="../img/looknfeelna.png" alt="" /> '.addslashes(api_htmlentities(get_lang('EnrichQuestion'))).'\';
 			} else {
 				document.getElementById(\'HiddenFCKquestionDescription\').style.display = \'none\';
-				document.getElementById(\'media_icon\').innerHTML=\'&nbsp;<img style="vertical-align: middle;" src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'\';
+				document.getElementById(\'media_icon\').innerHTML=\' <img style="vertical-align: middle;" src="../img/looknfeel.png" alt="" /> '.addslashes(api_htmlentities(get_lang('EnrichQuestion'))).'\';
 			}
 		}
 		</script>';
@@ -1074,7 +1071,10 @@ abstract class Question
 		$form -> addElement('html','<div class="row">
 		<div class="label"></div>
 		<div class="formw" style="height:50px">
-			<a href="javascript://" onclick=" return show_media()"> <span id="media_icon"> <img style="vertical-align: middle;" src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'</span></a>
+			<a href="javascript://" onclick=" return show_media()">
+				<span id="media_icon">
+				<img style="vertical-align: middle;" src="../img/looknfeel.png" alt="" /> '.addslashes(api_htmlentities(get_lang('EnrichQuestion'))).'
+				</span></a>
 		</div>
 		</div>');
 
diff --git a/main/inc/lib/fckeditor/editor/plugins/audio/lang/ca.js b/main/inc/lib/fckeditor/editor/plugins/audio/lang/ca.js
index d1dcc6531c..dd239dca85 100644
--- a/main/inc/lib/fckeditor/editor/plugins/audio/lang/ca.js
+++ b/main/inc/lib/fckeditor/editor/plugins/audio/lang/ca.js
@@ -4,5 +4,4 @@
 
 FCKLang['DlgAudioTitle'] = 'Insert audio / Audio properties' ;
 FCKLang['DlgAudioPlayback'] = 'Playback' ;
-FCKLang['DlgAudioAutoplay'] = 'Autoplay' ;
-
+FCKLang['DlgAudioAutoplay'] = 'Autoplay' ;
\ No newline at end of file