diff --git a/main/chat/chat_message.php b/main/chat/chat_message.php
index 1ed8996501..c20db75893 100755
--- a/main/chat/chat_message.php
+++ b/main/chat/chat_message.php
@@ -45,7 +45,7 @@ require('../inc/global.inc.php');
 $course=api_get_course_id();
 
 /////
-// Juan Carlos Raña insert smileys and self-closing window
+// Juan Carlos Ra�a insert smileys and self-closing window
 ////
 ?>
 <script language="javascript" type="text/javascript">
diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php
index 57e19e4add..1a4c954739 100644
--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
@@ -1,4 +1,4 @@
-<?php // $Id: infocours.php 17548 2009-01-06 16:12:51Z cvargas1 $
+<?php // $Id: infocours.php 18287 2009-02-06 16:23:12Z ndieschburg $
 
 /*
 ==============================================================================
@@ -238,7 +238,7 @@ if (api_get_setting('allow_course_theme') == 'true')
 
 if (is_settings_editable())
 	{
-	$form->addElement('submit', null, get_lang('Ok'));
+	$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
 	}
 else
 {
diff --git a/main/css/academica/default.css b/main/css/academica/default.css
index 111ad57551..9aca8685af 100644
--- a/main/css/academica/default.css
+++ b/main/css/academica/default.css
@@ -1614,15 +1614,3 @@ button.search {
 button.login {
     background-image:url(/main/img/button_login.gif);
 }
-/*including "add" image*/
-button.add{
-	 margin:0 10px -3px -3px !important;
-    padding:3px 1px 1px 23px;
-    /*text-decoration:none;
-    text-align:right;*/
-    width:auto;
-    height:100%;
-    background-position:3%;
-    background-image:url(/main/img/addd.gif);
-    background-repeat:no-repeat;
-}
\ No newline at end of file
diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css
index 6d67bcec76..170f6f2bbc 100644
--- a/main/css/baby_orange/default.css
+++ b/main/css/baby_orange/default.css
@@ -1615,15 +1615,3 @@ button.search {
 button.login {
     background-image:url(/main/img/button_login.gif);
 }
-/*including "add" image*/
-button.add{
-	 margin:0 10px -3px -3px !important;
-    padding:3px 1px 1px 23px;
-    /*text-decoration:none;
-    text-align:right;*/
-    width:auto;
-    height:100%;
-    background-position:3%;
-    background-image:url(/main/img/addd.gif);
-    background-repeat:no-repeat;
-}
\ No newline at end of file
diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css
index 396151ebdb..826e4d92fa 100644
--- a/main/css/corporate/default.css
+++ b/main/css/corporate/default.css
@@ -1622,15 +1622,3 @@ button.search {
 button.login {
     background-image:url(/main/img/button_login.gif);
 }
-/*including "add" image*/
-button.add{
-	 margin:0 10px -3px -3px !important;
-    padding:3px 1px 1px 23px;
-    /*text-decoration:none;
-    text-align:right;*/
-    width:auto;
-    height:100%;
-    background-position:3%;
-    background-image:url(/main/img/addd.gif);
-    background-repeat:no-repeat;
-}
\ No newline at end of file
diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css
index afffb9248e..31e0d62c15 100644
--- a/main/css/cosmic_campus/default.css
+++ b/main/css/cosmic_campus/default.css
@@ -1648,15 +1648,3 @@ button.search {
 button.login {
     background-image:url(/main/img/button_login.gif);
 }
-/*including "add" image*/
-button.add{
-	 margin:0 10px -3px -3px !important;
-    padding:3px 1px 1px 23px;
-    /*text-decoration:none;
-    text-align:right;*/
-    width:auto;
-    height:100%;
-    background-position:3%;
-    background-image:url(/main/img/addd.gif);
-    background-repeat:no-repeat;
-}
\ No newline at end of file
diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css
index c028058830..ec2e0a9def 100644
--- a/main/css/dokeos_classic/default.css
+++ b/main/css/dokeos_classic/default.css
@@ -2070,15 +2070,3 @@ button.search {
 button.login {
     background-image:url(/main/img/button_login.gif);
 }
-/*including "add" image*/
-button.add{
-	 margin:0 10px -3px -3px !important;
-    padding:3px 1px 1px 23px;
-    /*text-decoration:none;
-    text-align:right;*/
-    width:auto;
-    height:100%;
-    background-position:3%;
-    background-image:url(/main/img/addd.gif);
-    background-repeat:no-repeat;
-}
\ No newline at end of file
diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css
index 6f473e7765..949b7f437e 100644
--- a/main/css/public_admin/default.css
+++ b/main/css/public_admin/default.css
@@ -2168,15 +2168,3 @@ button.search {
 button.login {
     background-image:url(/main/img/button_login.gif);
 }
-/*including "add" image*/
-button.add{
-	 margin:0 10px -3px -3px !important;
-    padding:3px 1px 1px 23px;
-    /*text-decoration:none;
-    text-align:right;*/
-    width:auto;
-    height:100%;
-    background-position:3%;
-    background-image:url(/main/img/addd.gif);
-    background-repeat:no-repeat;
-}
\ No newline at end of file
diff --git a/main/img/button_accept2.gif b/main/img/button_accept2.gif
index 1ee671e239..f89c6fe52c 100644
Binary files a/main/img/button_accept2.gif and b/main/img/button_accept2.gif differ
diff --git a/main/img/button_add.gif b/main/img/button_add.gif
index 6332fefea4..6a12f5c3aa 100644
Binary files a/main/img/button_add.gif and b/main/img/button_add.gif differ
diff --git a/main/img/button_delete.gif b/main/img/button_delete.gif
new file mode 100644
index 0000000000..e07331a7c9
Binary files /dev/null and b/main/img/button_delete.gif differ
diff --git a/main/img/button_login.gif b/main/img/button_login.gif
index 929083cb5b..7788ea9fe1 100644
Binary files a/main/img/button_login.gif and b/main/img/button_login.gif differ
diff --git a/main/notebook/index.php b/main/notebook/index.php
index cc9d1a1385..00e2a8cfb7 100755
--- a/main/notebook/index.php
+++ b/main/notebook/index.php
@@ -62,7 +62,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'addnote')
 	$form->addElement('header', '', get_lang('NoteAddNew'));
 	$form->addElement('text', 'note_title', get_lang('NoteTitle'));
 	$form->addElement('html_editor', 'note_comment', get_lang('NoteComment'));
-	$form->addElement('submit', 'SubmitNote', get_lang('Ok'));	
+	$form->addElement('style_submit_button', 'SubmitNote', get_lang('Save'), 'class="save"');	
 	
 	// setting the rules
 	$form->addRule('note_title', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');	
@@ -97,7 +97,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'editnote' && is_numeric($_GET[
 	$form->addElement('hidden', 'notebook_id');
 	$form->addElement('text', 'note_title', get_lang('NoteTitle'));
 	$form->addElement('html_editor', 'note_comment', get_lang('NoteComment'));
-	$form->addElement('submit', 'SubmitNote', get_lang('Ok'));	
+	$form->addElement('style_submit_button', 'SubmitNote', get_lang('Save'), 'class="save"');	
 	
 	// setting the defaults
 	$defaults = get_note_information(Security::remove_XSS($_GET['notebook_id']));
diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php
index 064fce83e5..c9263c8cf1 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 17666 2009-01-12 21:18:36Z cfasanando $
+* 	@version $Id: create_new_survey.php 18287 2009-02-06 16:23:12Z ndieschburg $
 *
 * 	@todo only the available platform languages should be used => need an api get_languages and and api_get_available_languages (or a parameter)
 */
@@ -261,7 +261,7 @@ if ((isset($_GET['action']) && $_GET['action'] == 'edit') && !empty($_GET['surve
  	
 }
 $form -> addElement('html','</div><br />');
-$form->addElement('submit', 'submit_survey', get_lang('Ok'));
+$form->addElement('style_submit_button', 'submit_survey', get_lang('Ok'), 'class="save"');
 
 // setting the rules
 if ($_GET['action'] == 'add')
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index c44be082b9..5ac9ce6766 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 18212 2009-02-03 22:05:55Z cfasanando $
+* 	@version $Id: survey.lib.php 18287 2009-02-06 16:23:12Z ndieschburg $
 *
 * 	@todo move this file to inc/lib
 * 	@todo use consistent naming for the functions (save vs store for instance)
@@ -1398,7 +1398,7 @@ class question
 	{
 		$this->html .= '	<tr>';
 		$this->html .= '		<td>&nbsp;</td>';
-		$this->html .= '		<td>  <input type="submit" name="save_question" value="'.get_lang('SaveQuestion').'" /></td>';
+		$this->html .= '		<td><button class="save"type="submit" name="save_question">'.get_lang('Save').'</button></td>';
 		$this->html .= '		<td>&nbsp;</td>';
 		$this->html .= '	</tr>';
 		$this->html .= '</table>';
@@ -1447,20 +1447,20 @@ class question
 		}
 
 		// adding an answer
-		if ($_POST['add_answer'])
+		if(isset($_POST['add_answer']))
 		{
 			$form_content['answers'][]='';
 		}
 
 		// removing an answer
-		if ($_POST['remove_answer'])
+		if(isset($_POST['remove_answer']))
 		{
 			$max_answer = count($form_content['answers']);
 			unset($form_content['answers'][$max_answer-1]);
 		}
 
 		// saving a question
-		if ($_POST['save_question'])
+		if (isset($_POST['save_question']))
 		{					
 			$message = survey_manager::save_question($form_content);
 									
@@ -1536,8 +1536,8 @@ class question
 		$return .= '	<tr>';
 		$return .= '		<td align="right">&nbsp;</td>';
 		$return .= '		<td colspan="2">';
-		$return .= '			<input type="submit" name="remove_answer" value="'.get_lang('RemoveAnswer').'" '.$remove_answer_attribute.' />';
-		$return .= '			<input type="submit" name="add_answer" value="'.get_lang('AddAnswer').'" />';
+		$return .= '			<button class="cancel" type="submit" name="remove_answer" "'.$remove_answer_attribute.'">'.get_lang('RemoveAnswer').' </button>';
+		$return .= '			<button class="add" type="submit" name="add_answer">'.get_lang('AddAnswer').'</button>';
 		$return .= '		</td>';
 		$return .= '	</tr>';
 		return $return;
@@ -2953,7 +2953,7 @@ class SurveyUtil {
 		{
 			echo '			<input type="submit" name="reset_question_filter" value="'.get_lang('ResetQuestionFilter').'" />';
 		}
-		echo '			<input type="submit" name="submit_question_filter" value="'.get_lang('SubmitQuestionFilter').'" />';
+		echo '			<input type="submit" name="submit_question_filter" value="'.get_lang('SubmitQuestionFilter').'"/';
 		echo '</th>';
 		
 		$display_extra_user_fields = false;
@@ -3714,7 +3714,7 @@ class SurveyUtil {
 			}
 		}
 		echo '</select><br /><br />';
-		echo '<input type="submit" name="Submit" value="Submit" />';
+		echo '<button class="save" type="submit" name="Submit" value="Submit">'.get_lang('Ok').'</button>';
 		echo '</form>';
 	
 		// getting all the information of the x axis
@@ -4279,7 +4279,7 @@ class SurveyUtil {
 				</tr>
 				<tr>
 					<td>&nbsp;<input type="hidden" name="cidReq" value="'.api_get_course_id().'"/></td>
-					<td><input type="submit" name="do_search" value="'.get_lang('Ok').'"/></td>
+					<td><button class="search" type="submit" name="do_search">'.get_lang('Search').'</button></td>
 				</tr>
 			</table>
 		</form>';
@@ -4330,7 +4330,7 @@ class SurveyUtil {
 	{
 		$parameters = array();
 		$parameters['cidReq']=api_get_course_id();
-		if ($_GET['do_search'])
+		if(isset($_GET['do_search']))
 		{
 			$message = get_lang('DisplaySearchResults').'<br />';
 			$message .= '<a href="'.api_get_self().'?'.api_get_cidreq().'">'.get_lang('DisplayAll').'</a>';
@@ -4435,7 +4435,7 @@ class SurveyUtil {
 	 */
 	function survey_search_restriction()
 	{
-		if ($_GET['do_search'])
+		if(isset($_GET['do_search']))
 		{
 			if ($_GET['keyword_title']<>'')
 			{
diff --git a/main/survey/survey_invite.php b/main/survey/survey_invite.php
index 5de5f4abd5..f2fbc85108 100644
--- a/main/survey/survey_invite.php
+++ b/main/survey/survey_invite.php
@@ -139,7 +139,7 @@ $form->addElement('checkbox', 'send_mail', '', get_lang('SendMail'));
 // allow resending to all selected users
 $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers'));
 // submit button
-$form->addElement('submit', 'submit', get_lang('Ok'));
+$form->addElement('style_submit_button', 'submit', get_lang('Send'), '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/user.php b/main/user/user.php
index c7722b1e30..84da65ad0e 100644
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -1,4 +1,4 @@
-<?php // $Id: user.php 18113 2009-02-01 11:25:38Z ivantcholakov $
+<?php // $Id: user.php 18287 2009-02-06 16:23:12Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -353,7 +353,7 @@ if ( api_is_allowed_to_edit()) {
 	$renderer = & $form->defaultRenderer();
 	$renderer->setElementTemplate('<span>{element}</span> ');
 	$form->add_textfield('keyword', '', false);
-	$form->addElement('submit', 'submit', get_lang('SearchButton'));
+	$form->addElement('style_submit_button', 'submit', get_lang('SearchButton'), 'class="search"');
 	$form->addElement('static','additionalactions',null,$actions);
 	$form->display();
 	echo '</div>';
diff --git a/main/user/userInfo.php b/main/user/userInfo.php
index 110cad34a6..58ad2e5048 100644
--- a/main/user/userInfo.php
+++ b/main/user/userInfo.php
@@ -1,4 +1,4 @@
-<?php // $Id: userInfo.php 17479 2008-12-29 20:24:11Z cfasanando $
+<?php // $Id: userInfo.php 18287 2009-02-06 16:23:12Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -415,7 +415,7 @@ elseif ($displayMode == "viewMainInfoEdit")
 
 		}
 
-		echo "<td><input type=\"submit\" name=\"submit\" value=\"Ok\" /></td>\n", "</tr>", "</table>", "</form>\n";
+		echo "<td><button class=\"save\" type=\"submit\" name=\"submit\">Ok</button></td>\n", "</tr>", "</table>", "</form>\n";
 
 		echo "<p>".Display :: encrypted_mailto_link($mainUserInfo['email'], $mainUserInfo['email'])."</p>";