diff --git a/main/admin/configure_extensions.php b/main/admin/configure_extensions.php
index d01a1fb49c..4cb4f28767 100644
--- a/main/admin/configure_extensions.php
+++ b/main/admin/configure_extensions.php
@@ -320,10 +320,10 @@ Display::display_header($nameTool);
 							{
 								$defaults[$row['subkey']] = $row['selected_value'];
 							}							
-							$form -> addElement('submit', 'activeExtension', get_lang('ReconfigureExtension'));
+							$form -> addElement('style_submit_button', 'activeExtension', get_lang('ReconfigureExtension'),'class="save"');
 						}
 						else {
-							$form -> addElement('submit', 'activeExtension', get_lang('ActivateExtension'));
+							$form -> addElement('style_submit_button', 'activeExtension', get_lang('ActivateExtension'),'class="save"');
 						}
 						$form -> setDefaults($defaults);
 						$form -> display();
@@ -387,13 +387,13 @@ Display::display_header($nameTool);
 							{
 								$defaults[$row['subkey']] = $row['selected_value'];
 							}							
-							$form -> addElement('submit', 'activeExtension', get_lang('ReconfigureExtension'));
+							$form -> addElement('style_submit_button', 'activeExtension', get_lang('ReconfigureExtension'),'class="save"');
 						}
 						else {
 							$defaults['host'] = 'localhost';
 							$defaults['port'] = '2002';
 							$defaults['size'] = '720x540';
-							$form -> addElement('submit', 'activeExtension', get_lang('ActivateExtension'));
+							$form -> addElement('style_submit_button', 'activeExtension', get_lang('ActivateExtension'),'class="save"');
 						}
 						
 						$form -> setDefaults($defaults);
@@ -490,7 +490,7 @@ Display::display_header($nameTool);
 					<td align="center" width="50%">
 						<form method="POST" action="<?php echo api_get_self(); ?>">
 						<input type="hidden" name="extension_code" value="search" />
-						<input type="submit" name="activeExtension" value="<?php echo get_lang('ActivateExtension') ?>" />
+						<button type="submit" class="save" name="activeExtension" value="<?php echo get_lang('ActivateExtension') ?>" ><?php echo get_lang('ActivateExtension') ?></button>
 						</form>
 					</td>
 				</tr>
@@ -513,7 +513,7 @@ Display::display_header($nameTool);
 					<td align="center" width="50%">
 						<form method="POST" action="<?php echo api_get_self(); ?>">
 						<input type="hidden" name="extension_code" value="serverstats" />
-						<input type="submit" name="activeExtension" value="<?php echo get_lang('ActivateExtension') ?>" />
+						<button type="submit" class="save" name="activeExtension" value="<?php echo get_lang('ActivateExtension') ?>" ><?php echo get_lang('ActivateExtension') ?></button>
 						</form>
 					</td>
 				</tr>
@@ -536,8 +536,9 @@ Display::display_header($nameTool);
 					<td align="center" width="50%">
 						<form method="POST" action="<?php echo api_get_self(); ?>">
 						<input type="hidden" name="extension_code" value="bandwidthstats" />
-						<input type="submit" name="activeExtension" value="<?php echo get_lang('ActivateExtension') ?>" />
+						<button type="submit" class="save" name="activeExtension" value="<?php echo get_lang('ActivateExtension') ?>" ><?php echo get_lang('ActivateExtension') ?></button>
 						</form>
+						
 					</td>
 				</tr>
 			</table>
diff --git a/main/admin/course_add.php b/main/admin/course_add.php
index 14bdd4586d..433cad93c9 100644
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: course_add.php 19597 2009-04-07 14:38:36Z pcool $
+// $Id: course_add.php 19608 2009-04-07 18:04:42Z cvargas1 $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -108,7 +108,7 @@ $form->addElement('radio', 'unsubscribe', null, get_lang('NotAllowedToUnsubscrib
 $form->add_textfield('disk_quota',get_lang('CourseQuota'));
 $form->addRule('disk_quota',get_lang('ThisFieldShouldBeNumeric'),'numeric');
 $form->add_progress_bar();
-$form->addElement('submit', null, get_lang('Ok'));
+$form->addElement('style_submit_button','submit', get_lang('CreateCourse'),'class="add"');
 // Set some default values
 $values['course_language'] = get_setting('platformLanguage');
 $values['disk_quota'] = get_setting('default_document_quotum');
diff --git a/main/admin/course_edit.php b/main/admin/course_edit.php
index 3120c2d8c6..0cdd9696a5 100644
--- a/main/admin/course_edit.php
+++ b/main/admin/course_edit.php
@@ -1,4 +1,4 @@
-<?php // $Id: course_edit.php 19261 2009-03-25 00:10:44Z cvargas1 $
+<?php // $Id: course_edit.php 19608 2009-04-07 18:04:42Z cvargas1 $
 /* For licensing terms, see /dokeos_license.txt */
 /**
 ==============================================================================
@@ -146,7 +146,7 @@ $form->addElement('radio', 'unsubscribe', null, get_lang('NotAllowedToUnsubscrib
 $form->addElement('text','disk_quota',get_lang('CourseQuota'));
 $form->addRule('disk_quota', get_lang('ThisFieldIsRequired'),'required');
 $form->addRule('disk_quota',get_lang('ThisFieldShouldBeNumeric'),'numeric');
-$form->addElement('style_submit_button', 'button', get_lang('ModifyCourseInfo'),'onclick="valide()"; class="search"');
+$form->addElement('style_submit_button', 'button', get_lang('ModifyCourseInfo'),'onclick="valide()"; class="save"');
 // Set some default values
 
 $course_db_name = $course['db_name'];
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 43d17a97b4..ccbdf7064b 100644
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -1,4 +1,4 @@
-<?php //$Id: announcements.php 19571 2009-04-06 19:34:52Z juliomontoya $
+<?php //$Id: announcements.php 19608 2009-04-07 18:04:42Z cvargas1 $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -1144,18 +1144,26 @@ if ($display_form == true) {
 		$oFCKeditor->ToolbarSet = "Announcements";
 	}		
 	
+	if ($_GET['action']=='add') {
+		$class='add';
+		$text=get_lang('SendAnnouncement');
+	} elseif ($_GET['action']=='modify') {
+		$class='save';
+		$text=get_lang('ModifyAnnouncement');		
+	}
+	
 	$oFCKeditor->Value		= $content_to_modify;       
 	echo $oFCKeditor->CreateHtml();        
 	echo'<br />';
 	if(empty($_SESSION['toolgroup'])) {
 		echo '<input type="hidden" name="submitAnnouncement" value="OK">';
         //echo '<br /><input type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[3],true)" /><br /><br />';
-        echo '<br /><button class="save"type="submit"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[3],true)" >'.get_lang('Send').'</button><br /><br />';
+        echo '<br /><button class="'.$class.'"type="submit"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[3],true)" >'.$text.'</button><br /><br />';
         
 	} else {
 		echo '<input type="hidden" name="submitAnnouncement" value="OK">';
 		//echo '<br /><input type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" /><br /><br />';
-	    echo '<br /><button class="save"type="submit"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" >'.get_lang('Send').'</button><br /><br />';
+	    echo '<br /><button class="'.$class.'"type="submit"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" >'.$text.'</button><br /><br />';
 		
 	}
 	echo '</form><br />';
diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php
index 849f45aaec..bcc1336554 100644
--- a/main/inc/lib/blog.lib.php
+++ b/main/inc/lib/blog.lib.php
@@ -1589,7 +1589,7 @@ class Blog
 
 						/* edit by Kevin Van Den Haute (kevin@develop-it.be) */
 						echo "\t" . '<tr>' . "\n";
-							echo "\t\t" . '<td style="text-align:right; vertical-align:top;">Task management:&nbsp;&nbsp;</td>' . "\n";
+							echo "\t\t" . '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>' . "\n";
 							echo "\t\t" . '<td>' . "\n";
 								echo "\t\t\t" . '<table class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
 									echo "\t\t\t\t" . '<tr>' . "\n";
@@ -1679,7 +1679,7 @@ class Blog
 							$arrPermissions[] = $row['action'];
 
 						echo "\t" . '<tr>' . "\n";
-							echo "\t\t" . '<td style="text-align:right; vertical-align:top;">Task management:&nbsp;&nbsp;</td>' . "\n";
+							echo "\t\t" . '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>' . "\n";
 							echo "\t\t" . '<td>' . "\n";
 								echo "\t\t\t" . '<table  class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
 									echo "\t\t\t\t" . '<tr>' . "\n";
diff --git a/main/reservation/m_category.php b/main/reservation/m_category.php
index 08c7b0370e..46241a09f2 100644
--- a/main/reservation/m_category.php
+++ b/main/reservation/m_category.php
@@ -65,7 +65,7 @@ switch ($_GET['action']) {
 		api_display_tool_title(get_lang('AddNewResourceType'));
 		$form = new FormValidator('category', 'post', 'm_category.php?action=add');
 		$form->add_textfield('name', get_lang('ResourceTypeName'), true, array ('maxlength' => '128'));
-		$form->addElement('submit', 'submit', get_lang('Ok'));
+		$form->addElement('style_submit_button', 'submit', get_lang('CreateResourceType'),'class="add"');
 		if ($form->validate()) {
 			$values = $form->exportValues();
 			if (Rsys :: add_category($values['name']))
@@ -82,7 +82,7 @@ switch ($_GET['action']) {
 		$form = new FormValidator('category', 'post', 'm_category.php?action=edit');
 		$form->add_textfield('name', get_lang('ResourceTypeName'), true, array ('maxlength' => '128'));
 		$form->addElement('hidden', 'id', $_GET['id']);
-		$form->addElement('submit', 'submit', get_lang('Ok'));
+		$form->addElement('style_submit_button', 'submit', get_lang('ModifyResourceType'),'class="save"');
 		$form->setDefaults(Rsys :: get_category($_GET['id']));
 		if ($form->validate()) {
 			$values = $form->exportValues();
diff --git a/main/reservation/m_item.php b/main/reservation/m_item.php
index ba48394eae..68af7352cd 100644
--- a/main/reservation/m_item.php
+++ b/main/reservation/m_item.php
@@ -279,7 +279,7 @@ switch ($_GET['action']) {
 				$item_right['m_reservation'] = $item_rights[0]['m_reservation'];
 				$form->setDefaults($item_right);
 
-				$form->addElement('submit', 'submit', get_lang('Ok'));
+				$form->addElement('style_submit_button', 'submit', get_lang('Ok'),'class="save"');
 				if ($form->validate()) {
 					$values = $form->exportValues();
 					Rsys :: edit_item_right($values['item_id'], $values['class_id'], $values['edit_right'], $values['delete_right'], $values['m_reservation']);
@@ -373,7 +373,7 @@ switch ($_GET['action']) {
 		//$form->addElement('select', 'course_code', get_lang('ItemCourse'),array(''=>'','value'=>'tag'));
 		//$form->addRule('course', get_lang('ThisFieldIsRequired'), 'required');
 
-		$form->addElement('submit', 'submit', get_lang('Ok'));
+		$form->addElement('style_submit_button', 'submit', get_lang('AddNewResource'),'class="add"');
 		if ($form->validate()) {
 			$values = $form->exportValues();
 			if (Rsys :: add_item($values['name'], $values['description'], $values['category'], $values['course_code']))
@@ -405,7 +405,7 @@ switch ($_GET['action']) {
 		$form->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3', 'cols' => '40'));
 		$form->addRule('category_id', get_lang('ThisFieldIsRequired'), 'required');
 		$form->addElement('hidden', 'id', $item['id']);
-		$form->addElement('submit', 'submit', get_lang('Ok'));
+		$form->addElement('style_submit_button', 'submit', get_lang('EditResource'),'class="save"');
 		$form->setDefaults($item);
 		if ($form->validate()) {
 			$values = $form->exportValues();
diff --git a/main/reservation/m_reservation.php b/main/reservation/m_reservation.php
index e1c0a35ed2..c0bd61d29e 100644
--- a/main/reservation/m_reservation.php
+++ b/main/reservation/m_reservation.php
@@ -103,7 +103,7 @@ switch ($_GET['action']) {
 		echo '<div class="actions">';   
 		echo '<form id="cat_form" action="m_reservation.php" method="get">';		
 		echo '<input type="hidden" name="action" value="overviewsubscriptions"/>';
-		echo '<input type="text" name="keyword" /><input type="submit" value="'.get_lang('Search').'" /></form>';
+		echo '<input type="text" name="keyword" /><button type="submit" class="search" value="'.get_lang('Search').'" >'.get_lang('Search').'</button></form>';
 		echo '</div><br>';		
 		
 		$table = new SortableTable('reservation', array ('Rsys', 'get_num_subscriptions_overview'), array ('Rsys', 'get_table_subcribed_reservations'), 1);		
@@ -234,7 +234,7 @@ switch ($_GET['action']) {
 		$form->add_datepicker('recurrence_until',get_lang('RepeatUntil'));
 		$form->addElement('html', '</div>');
 		$form->addElement('textarea', 'notes', get_lang('Notes'), array ('cols' => 40, 'rows' => 4));
-		$form->addElement('submit', 'submit', get_lang('Ok'));
+		$form->addElement('style_submit_button', 'submit', get_lang('AddNewBookingPeriod'),'class="add"');
 		$str='';
 		
 		if(!$_POST['forever']) $str.="window_hide('forever_timewindow');";
@@ -469,7 +469,7 @@ switch ($_GET['action']) {
 			$form->addElement('checkbox', 'auto_accept', get_lang('AutoAccept'));
 			$form->addElement('checkbox', 'timepicker', get_lang('TimePicker'),'',array('disabled'=>'disabled'));
 			$form->addElement('textarea', 'notes', get_lang('Notes'), array ('cols' => 40, 'rows' => 4));
-			$form->addElement('submit', 'submit', get_lang('Ok'));
+			$form->addElement('style_submit_button', 'submit', get_lang('EditNewBookingPeriod'),'class="save"');
 			$form->addElement('hidden', 'id', $Reservation_id);
 			$form->addElement('hidden', 'timepicker2');
 			$form->addElement('hidden', 'period', ($reservation[0][7] == '0000-00-00 00:00:00' && $reservation[0][8] == '0000-00-00 00:00:00' ? 0 : 1));
@@ -568,7 +568,7 @@ switch ($_GET['action']) {
 		echo '<a href="m_reservation.php?action=add"><img src="../img/view_more_stats.gif" border="0" alt="" title="'.get_lang('AddNewBookingPeriod').'"/>'.get_lang('AddNewBookingPeriod').'</a>';
 		echo '&nbsp;&nbsp;&nbsp;<a href="m_reservation.php?action=overviewsubscriptions">'.get_lang('OverviewReservedPeriods').'</a>';
 		echo '</div>';
-		echo '<div style="text-align: right; "><input type="text" name="keyword" /><input type="submit" value="'.get_lang('Search').'" /></div></form>';
+		echo '<div style="text-align: right; "><input type="text" name="keyword" /><button type="submit" class="search" value="'.get_lang('Search').'" >'.get_lang('Search').'</button></div></form>';
 		
 		echo '<br>';
 		if (isset ($_POST['action'])) {