diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index 1242fad14b..06bb05f9c4 100644
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -1,4 +1,4 @@
-<?php //$Id: agenda.inc.php 18979 2009-03-11 22:43:40Z cfasanando $
+<?php //$Id: agenda.inc.php 19254 2009-03-24 22:18:53Z cvargas1 $
 
 /*
 ==============================================================================
@@ -2977,7 +2977,16 @@ function show_add_form($id = '')
 	<tr>
 		<td colspan="3">
 		<br />
-			<input type="button"  value="<?php echo get_lang('Ok'); ?>" onclick="selectAll(document.getElementById('selected_form'),true)" />
+		<?php
+		if(isset($_GET['id'])) {
+			$class="save";
+			$text=get_lang('ModifyEvent');
+		} else {
+			$class="add";
+			$text=get_lang('AgendaAdd'); 
+		}
+		?>
+		<button class="<?php echo $class; ?>" type="button" name="name" onclick="selectAll(document.getElementById('selected_form'),true)"><?php echo $text; ?></button>
 		</td>
 	</tr>
 </table>
diff --git a/main/document/upload.php b/main/document/upload.php
index a38586f2d6..adc6f63cf0 100644
--- a/main/document/upload.php
+++ b/main/document/upload.php
@@ -1,4 +1,4 @@
-<?php // $Id: upload.php 18381 2009-02-09 21:09:07Z herodoto $
+<?php // $Id: upload.php 19254 2009-03-24 22:18:53Z cvargas1 $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -576,7 +576,7 @@ $form->addElement('radio', 'if_exists', get_lang('UplWhatIfFileExists'), get_lan
 $form->addElement('radio', 'if_exists', '', get_lang('UplOverwriteLong'), 'overwrite');
 $form->addElement('radio', 'if_exists', '', get_lang('UplRenameLong'), 'rename');
 
-$form->addElement('style_submit_button', 'submitDocument', get_lang('Send'),'class="save"');
+$form->addElement('style_submit_button', 'submitDocument', get_lang('SendDocument'),'class="save"');
 
 $form->add_real_progress_bar('DocumentUpload','user_upload');
 
diff --git a/main/exercice/exercise_show.php b/main/exercice/exercise_show.php
index 7c17aac276..fb41fabf02 100644
--- a/main/exercice/exercise_show.php
+++ b/main/exercice/exercise_show.php
@@ -4,7 +4,7 @@
 *
 *	@package dokeos.exercise
 * 	@author Julio Montoya Armas Added switchable fill in blank option added
-* 	@version $Id: exercise_show.php 18840 2009-03-08 22:52:35Z yannoo $
+* 	@version $Id: exercise_show.php 19254 2009-03-24 22:18:53Z cvargas1 $
 *
 * 	@todo remove the debug code and use the general debug library
 * 	@todo use the Database:: functions
@@ -1020,7 +1020,7 @@ function display_hotspot_answer($answerId, $answer, $studentChoice, $answerComme
 					
 					if ($origin!='learnpath' && $origin!='student_progress') {
 				?>					
-					 <button type="submit" class="save" value="<?php echo get_lang('Ok'); ?>" onclick="getFCK('<?php echo $strids; ?>','<?php echo $marksid; ?>');"><?php echo get_lang('Ok'); ?></button>					 
+					 <button type="submit" class="save" value="<?php echo get_lang('Ok'); ?>" onclick="getFCK('<?php echo $strids; ?>','<?php echo $marksid; ?>');"><?php echo get_lang('CorrectTest'); ?></button>					 
 					 </form>
 				<?php }
 		 	}  		
diff --git a/main/exercice/hotpotatoes.php b/main/exercice/hotpotatoes.php
index e2ab71d770..1c8adf16ec 100644
--- a/main/exercice/hotpotatoes.php
+++ b/main/exercice/hotpotatoes.php
@@ -22,7 +22,7 @@
 *	Code for Hotpotatoes integration.
 *	@package dokeos.exercise
 * 	@author Istvan Mandak
-* 	@version $Id: hotpotatoes.php 18415 2009-02-10 18:58:55Z cfasanando $
+* 	@version $Id: hotpotatoes.php 19254 2009-03-24 22:18:53Z cvargas1 $
 */
 
 
@@ -279,7 +279,7 @@ if(($is_allowedToEdit) && (($finish == 0) || ($finish == 2)))
 			echo '<td width="250">';
 			echo '</td>';
 			echo '<td>';
-				echo '<button type="submit" name="submit" value="'.get_lang('Send').'">'.get_lang('Send').'</button>';
+				echo '<button type="submit" name="submit" value="'.get_lang('Send').'">'.get_lang('SendFile').'</button>';
 			echo '</td>';
 		echo '</tr>';
 	echo '</table>';
diff --git a/main/link/link.php b/main/link/link.php
index c2cb6bcb77..bf52601baf 100644
--- a/main/link/link.php
+++ b/main/link/link.php
@@ -1,4 +1,4 @@
-<?php // $Id: link.php 18319 2009-02-07 00:03:42Z herodoto $
+<?php // $Id: link.php 19254 2009-03-24 22:18:53Z cvargas1 $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -294,7 +294,7 @@ if (is_allowed_to_edit() and isset($_GET['action']))
 			"<tr><td align=\"right\" valign=\"top\">".get_lang("Description")." :</td>",
 			"<td><textarea rows=\"3\" cols=\"50\" name=\"description\">",htmlentities($description,ENT_QUOTES,$charset)."</textarea></td></tr>",
 			//"<tr><td></td><td><input type=\"Submit\" name=\"submitCategory\"value=\"".get_lang("Ok")."\"/></td></tr>",
-			"<tr><td></td><td><button class=\"save\" type=\"submit\" name=\"submitCategory\">".get_lang('Save')." </button></td></tr>",
+			"<tr><td></td><td><button class=\"save\" type=\"submit\" name=\"submitCategory\">".get_lang('CreateCategory')." </button></td></tr>",
 			"</table>",
 			"</form>";
 	}
diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php
index 8c77a0622a..ac1646fdae 100644
--- a/main/survey/create_new_survey.php
+++ b/main/survey/create_new_survey.php
@@ -25,7 +25,7 @@
 * 	@author unknown, the initial survey that did not make it in 1.8 because of bad code
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts (if not all) of the code
 *	@author Julio Montoya Armas <gugli100@gmail.com>, Dokeos: Personality Test modification and rewriting large parts of the code
-* 	@version $Id: create_new_survey.php 19004 2009-03-12 18:04:08Z juliomontoya $
+* 	@version $Id: create_new_survey.php 19254 2009-03-24 22:18:53Z cvargas1 $
 *
 * 	@todo only the available platform languages should be used => need an api get_languages and and api_get_available_languages (or a parameter)
 */
@@ -263,7 +263,14 @@ if ((isset($_GET['action']) && $_GET['action'] == 'edit') && !empty($survey_id)
  	
 }
 $form -> addElement('html','</div><br />');
-$form->addElement('style_submit_button', 'submit_survey', get_lang('Ok'), 'class="save"');
+if(isset($_GET['survey_id']) && $_GET['action']=='edit') {
+	$class="save";
+	$text=get_lang('ModifySurvey');
+} else {
+	$class="add";
+	$text=get_lang('CreateSurvey'); 
+}
+$form->addElement('style_submit_button', 'submit_survey', $text, 'class="'.$class.'"');
 
 // setting the rules
 if ($_GET['action'] == 'add')
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index 3aab5f3d93..7189ac16db 100644
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -24,7 +24,7 @@
 *	@package dokeos.survey
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts (if not all) of the code
 	@author Julio Montoya Armas <gugli100@gmail.com>, Dokeos: Personality Test modification and rewriting large parts of the code
-* 	@version $Id: survey.lib.php 19045 2009-03-13 23:33:29Z derrj $
+* 	@version $Id: survey.lib.php 19254 2009-03-24 22:18:53Z cvargas1 $
 *
 * 	@todo move this file to inc/lib
 * 	@todo use consistent naming for the functions (save vs store for instance)
@@ -1406,9 +1406,16 @@ class question
 	 */
 	function render_form()
 	{
+		if(isset($_GET['question_id']) and !empty($_GET['question_id'])) {
+			$class="save";
+			$text=get_lang('ModifyQuestionSurvey');
+		} else {
+			$class="add";
+			$text=get_lang('CreateQuestionSurvey'); 
+		}		
 		$this->html .= '	<tr>';
 		$this->html .= '		<td>&nbsp;</td>';
-		$this->html .= '		<td><button class="save"type="submit" name="save_question">'.get_lang('Save').'</button></td>';
+		$this->html .= '		<td><button class="'.$class.'"type="submit" name="save_question">'.$text.'</button></td>';
 		$this->html .= '		<td>&nbsp;</td>';
 		$this->html .= '	</tr>';
 		$this->html .= '</table>';
@@ -3715,7 +3722,7 @@ class SurveyUtil {
 			}
 		}
 		echo '</select><br /><br />';
-		echo '<button class="save" type="submit" name="Submit" value="Submit">'.get_lang('Ok').'</button>';
+		echo '<button class="save" type="submit" name="Submit" value="Submit">'.get_lang('CompareQuestions').'</button>';
 		echo '</form>';
 	
 		// getting all the information of the x axis
diff --git a/main/survey/survey_invite.php b/main/survey/survey_invite.php
index a165ecd428..83ce81570c 100644
--- a/main/survey/survey_invite.php
+++ b/main/survey/survey_invite.php
@@ -152,7 +152,7 @@ if ($survey_data['anonymous'] != 1) {
 // allow resending to all selected users
 $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers'));
 // submit button
-$form->addElement('style_submit_button', 'submit', get_lang('Send'), 'class="save"');
+$form->addElement('style_submit_button', 'submit', get_lang('PublishSurvey'), 'class="save"');
 // The rules (required fields)
 $form->addRule('mail_title', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('mail_text', get_lang('ThisFieldIsRequired'), 'required');
diff --git a/main/user/userInfo.php b/main/user/userInfo.php
index 58ad2e5048..d13f4d7f84 100644
--- a/main/user/userInfo.php
+++ b/main/user/userInfo.php
@@ -1,4 +1,4 @@
-<?php // $Id: userInfo.php 18287 2009-02-06 16:23:12Z ndieschburg $
+<?php // $Id: userInfo.php 19254 2009-03-24 22:18:53Z cvargas1 $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -415,7 +415,7 @@ elseif ($displayMode == "viewMainInfoEdit")
 
 		}
 
-		echo "<td><button class=\"save\" type=\"submit\" name=\"submit\">Ok</button></td>\n", "</tr>", "</table>", "</form>\n";
+		echo "<td><button class=\"save\" type=\"submit\" name=\"submit\">".get_lang('SaveChanges')."</button></td>\n", "</tr>", "</table>", "</form>\n";
 
 		echo "<p>".Display :: encrypted_mailto_link($mainUserInfo['email'], $mainUserInfo['email'])."</p>";
 		
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 5240844d0a..5948ac524e 100644
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -1,4 +1,4 @@
-<?php //$Id: work.lib.php 18636 2009-02-23 18:44:54Z yannoo $
+<?php //$Id: work.lib.php 19254 2009-03-24 22:18:53Z 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 18636 2009-02-23 18:44:54Z yannoo $
+* 	@version $Id: work.lib.php 19254 2009-03-24 22:18:53Z cvargas1 $
 */
 /**
  * Displays action links (for admins, authorized groups members and authorized students)
@@ -455,7 +455,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
 						$form_folder -> addElement('html','</div>');  		
 				}
 
-				$form_folder -> addElement('submit','submit_edit_dir',get_lang('Ok'));
+				$form_folder -> addElement('style_submit_button','submit',get_lang('ModifyDirectory'),'class="save"');
 
 				if($there_is_a_end_date == true) {
 					$defaults = array_merge($defaults,convert_date_to_array($homework['ends_on'],'ends'));
diff --git a/main/work/work.php b/main/work/work.php
index 50400c1a2a..eb2857fc67 100644
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -1,4 +1,4 @@
-<?php //$Id: work.php 18636 2009-02-23 18:44:54Z yannoo $
+<?php //$Id: work.php 19254 2009-03-24 22:18:53Z 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.php 18636 2009-02-23 18:44:54Z yannoo $
+*  	@version $Id: work.php 19254 2009-03-24 22:18:53Z cvargas1 $
 *
 * 	@todo refactor more code into functions, use quickforms, coding standards, ...
 */
@@ -1152,10 +1152,10 @@ if ($is_course_member) {
 		// fix the Ok button when we see the tool in the learn path
 		if ($origin== 'learnpath') {
 			$form->addElement('html', '<div style="margin-left:137px">');		
-			$form->addElement('submit', 'submitWork', get_lang('Ok'));		
+			$form->addElement('style_submit_button','submit', get_lang('SendFile'),'class="save"');		
 			$form->addElement('html', '</div>');
 		} else {
-			$form->addElement('submit', 'submitWork', get_lang('Ok'));
+			$form->addElement('style_submit_button','submit', get_lang('SendFile'),'class="save"');
 		}
 		
 		if (!empty($_POST['submitWork']) || $edit) {
@@ -1228,7 +1228,7 @@ function draw_date_picker($prefix,$default='') {
 		$new_folder_text .= '<div id="msg_error1" style="display:none;color:red"></div>';
 		$new_folder_text .= get_lang('NewDir') . ' ';		
 		$new_folder_text .= '<input type="text" name="new_dir" onfocus="document.getElementById(\'msg_error1\').style.display=\'none\';"/>';
-		$new_folder_text .= '<input type="button" name="create_dir" onClick="validate();" value="' . get_lang('Ok') . '"/>';
+		$new_folder_text .= '<button type="button" name="create_dir" class="add" onClick="validate();" value="' . get_lang('Ok') . '"/>'.get_lang('CreateDirectory').'</button>';
 		//new additional fields inside the "if condition" just to agroup
 		if(true):
 
@@ -1270,7 +1270,7 @@ function draw_date_picker($prefix,$default='') {
 		$new_folder_text .= $addtext;
 		endif;
 		
-		$new_folder_text .= '<input type="button" name="create_dir" onClick="validate();" value="' . get_lang('Ok') . '"/>';
+		$new_folder_text .= '<button type="button" class="add" name="create_dir" onClick="validate();" value="' . get_lang('CreateDirectory') . '"/>' . get_lang('CreateDirectory') . '</button>';
 		
 		$new_folder_text .= '<br /><br /></form>';
 		//show the form