diff --git a/main/admin/class_import.php b/main/admin/class_import.php
index 21f5a04439..9795c6a8cc 100755
--- a/main/admin/class_import.php
+++ b/main/admin/class_import.php
@@ -78,7 +78,7 @@ set_time_limit(0);
 
 $form = new FormValidator('import_classes');
 $form->addElement('file', 'import_file', get_lang('ImportCSVFileLocation'));
-$form->addElement('style_submit_button', 'submit', get_lang('Import'), 'class="save"');
+$form->addButtonImport(get_lang('Import'));
 
 if ($form->validate()) {
     $classes = Import::csv_to_array($_FILES['import_file']['tmp_name']);
diff --git a/main/admin/class_user_import.php b/main/admin/class_user_import.php
index 6f6571d5e7..b8d7c6bac8 100755
--- a/main/admin/class_user_import.php
+++ b/main/admin/class_user_import.php
@@ -153,7 +153,7 @@ $form = new FormValidator('class_user_import');
 $form->addElement('file', 'import_file', get_lang('ImportFileLocation'));
 $form->addElement('checkbox', 'subscribe', get_lang('Action'), get_lang('SubscribeUserIfNotAllreadySubscribed'));
 $form->addElement('checkbox', 'unsubscribe', '', get_lang('UnsubscribeUserIfSubscriptionIsNotInFile'));
-$form->addElement('style_submit_button', 'submit', get_lang('Import'), 'class="save"');
+$form->addButtonImport(get_lang('Import'));
 
 if ($form->validate()) {
     $users_classes = parse_csv_data($_FILES['import_file']['tmp_name']);
diff --git a/main/admin/configure_extensions.php b/main/admin/configure_extensions.php
index 9976366e32..5a34db467e 100755
--- a/main/admin/configure_extensions.php
+++ b/main/admin/configure_extensions.php
@@ -350,13 +350,13 @@ Display::display_header($nameTool);
 							{
 								$defaults[$row['subkey']] = $row['selected_value'];
 							}
-							$form -> addElement('style_submit_button', 'activeExtension', get_lang('ReconfigureExtension'),'class="save"');
+							$form->addButtonSave(get_lang('ReconfigureExtension'), 'activeExtension');
 						}
 						else {
 							$defaults['host'] = 'localhost';
 							$defaults['port'] = '2002';
 							$defaults['size'] = '720x540';
-							$form -> addElement('style_submit_button', 'activeExtension', get_lang('ActivateExtension'),'class="save"');
+							$form->addButtonSave(get_lang('ActivateExtension'), 'activeExtension');
 						}
 
 						$form -> setDefaults($defaults);
diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php
index b2ab15e679..fe28bd7230 100755
--- a/main/admin/configure_inscription.php
+++ b/main/admin/configure_inscription.php
@@ -304,7 +304,8 @@ if (get_setting('allow_terms_conditions') == 'true') {
     }
 }
 
-$form->addElement('style_submit_button', 'submit', get_lang('RegisterUser'), array('disabled' => 'disabled'));
+//$form->addElement('style_submit_button', 'submit', get_lang('RegisterUser'), array('disabled' => 'disabled'));
+$form->addButtonSave(get_lang('RegisterUser'));
 
 $defaults['status'] = STUDENT;
 
@@ -357,7 +358,7 @@ switch ($action){
         $form->addElement('hidden', 'formSent', '1');
         $default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
         $form->addHtmlEditor($name, '', true, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
-        $form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
+        $form->addButtonSave(get_lang('Save'));
         $form->setDefaults($default);
         $form->display();
         break;
diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php
index b264c3e75c..96adc63cfe 100755
--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
@@ -163,7 +163,6 @@ $form->addGroup($group, '', array(get_lang("Stylesheets")), '');
 
 $form->addElement('label', get_lang('DocumentQuota'), format_file_size(DocumentManager::get_course_quota()));
 $form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-//$form->addElement('style_submit_button', null,'<i class="fa fa-floppy-o"></i> '. get_lang('SaveSettings'), 'class="btn btn-primary"');
 $form->addElement('html', '</div></div>');
 
 // COURSE ACCESS
@@ -199,8 +198,8 @@ $form->addText('course_registration_password', get_lang('CourseRegistrationPassw
 
 $form->addElement('checkbox', 'activate_legal', array(null, get_lang('ShowALegalNoticeWhenEnteringTheCourse')), get_lang('ActivateLegal'));
 $form->addElement('textarea', 'legal', get_lang('CourseLegalAgreement'), array('class'=>'span6', 'rows' => 8));
-$form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-//$form->addElement('style_submit_button', null, '<i class="fa fa-floppy-o"></i> '.get_lang('SaveSettings'), 'class="btn btn-primary"');
+$form->addButtonSave(get_lang('SaveSettings'), 'submit_save');
+
 $form->addElement('html', '</div></div>');
 
 // Documents
@@ -213,7 +212,7 @@ if (api_get_setting('documents_default_visibility_defined_in_course') == 'true')
     );
     $form->addGroup($group, '', array(get_lang("DocumentsDefaultVisibility")), '');
     $form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-    //$form->addElement('style_submit_button', null,'<i class="fa fa-floppy-o"></i> '.get_lang('SaveSettings'), 'class="btn btn-primary"');
+
 
     $form->addElement('html', '</div></div>');
 }
@@ -246,8 +245,7 @@ $group = array();
 $group[]=$form->createElement('radio', 'email_alert_manager_on_new_quiz', get_lang('QuizEmailAlert'), get_lang('QuizEmailAlertActivate'), 1);
 $group[]=$form->createElement('radio', 'email_alert_manager_on_new_quiz', null, get_lang('QuizEmailAlertDeactivate'), 0);
 $form->addGroup($group, '', array(get_lang("QuizEmailAlert")), '');
-$form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-//$form->addElement('style_submit_button', null, '<i class="fa fa-floppy-o"></i> '.get_lang('SaveSettings'), 'class="btn btn-primary"');
+$form->addButtonSave(get_lang('SaveSettings'), 'submit_save');
 
 $form->addElement('html', '</div></div>');
 
@@ -273,8 +271,7 @@ $group = array();
 $group[]=$form->createElement('radio', 'allow_user_view_user_list', get_lang('AllowUserViewUserList'), get_lang('AllowUserViewUserListActivate'), 1);
 $group[]=$form->createElement('radio', 'allow_user_view_user_list', null, get_lang('AllowUserViewUserListDeactivate'), 0);
 $form->addGroup($group, '', array(get_lang("AllowUserViewUserList")), '');
-$form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-//$form->addElement('style_submit_button', null, '<i class="fa fa-floppy-o"></i> '.get_lang('SaveSettings'), 'class="btn btn-primary"');
+$form->addButtonSave(get_lang('SaveSettings'), 'submit_save');
 $form->addElement('html', '</div></div>');
 
 // CHAT SETTINGS
@@ -284,8 +281,7 @@ $group = array();
 $group[]=$form->createElement('radio', 'allow_open_chat_window', get_lang('AllowOpenchatWindow'), get_lang('AllowOpenChatWindowActivate'), 1);
 $group[]=$form->createElement('radio', 'allow_open_chat_window', null, get_lang('AllowOpenChatWindowDeactivate'), 0);
 $form->addGroup($group, '', array(get_lang("AllowOpenchatWindow")), '');
-$form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-//$form->addElement('style_submit_button', null,'<i class="fa fa-floppy-o"></i> '. get_lang('SaveSettings'), 'class="btn btn-primary"');
+$form->addButtonSave(get_lang('SaveSettings'), 'submit_save');
 $form->addElement('html', '</div></div>');
 
 // LEARNING PATH
@@ -328,8 +324,7 @@ if (isset($_configuration['allow_lp_return_link']) && $_configuration['allow_lp_
 }
 
 if (is_settings_editable()) {
-    $form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-    //$form->addElement('style_submit_button', null, '<i class="fa fa-floppy-o"></i> '.get_lang('SaveSettings'), 'class="btn btn-primary"');
+    $form->addButtonSave(get_lang('SaveSettings'), 'submit_save');
 } else {
     // Is it allowed to edit the course settings?
     if (!is_settings_editable()) {
@@ -340,7 +335,13 @@ if (is_settings_editable()) {
 $form->addElement('html', '</div></div>');
 
 // THEMATIC ADVANCE SETTINGS
-$form->addElement('html', '<div><h3>'.Display::return_icon('course_progress.png', Security::remove_XSS(get_lang('ThematicAdvanceConfiguration')),'',ICON_SIZE_SMALL).' '.Security::remove_XSS(get_lang('ThematicAdvanceConfiguration')).'</h3><div>');
+$form->addElement(
+    'html',
+    '<div><h3>'.Display::return_icon(
+    'course_progress.png',
+    Security::remove_XSS(get_lang('ThematicAdvanceConfiguration')),'',ICON_SIZE_SMALL
+    ).' '.Security::remove_XSS(get_lang('ThematicAdvanceConfiguration')).'</h3><div>'
+);
 
 $group = array();
 $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse', get_lang('InfoAboutAdvanceInsideHomeCourse'), get_lang('DisplayAboutLastDoneAdvance'), 1);
@@ -348,8 +349,7 @@ $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse',
 $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse', null, get_lang('DisplayAboutNextAdvanceNotDoneAndLastDoneAdvance'), 3);
 $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse', null, get_lang('DoNotDisplayAnyAdvance'), 0);
 $form->addGroup($group, '', array(get_lang("InfoAboutAdvanceInsideHomeCourse")), '');
-$form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-//$form->addElement('style_submit_button', null,'<i class="fa fa-floppy-o"></i> '.get_lang('SaveSettings'), 'class="btn btn-primary"');
+$form->addButtonSave(get_lang('SaveSettings'), 'submit_save');
 $form->addElement('html', '</div></div>');
 
 // Document settings
@@ -361,8 +361,7 @@ $group = array(
 
 );
 $form->addGroup($group, '', array(get_lang("ShowSystemFolders")), '');
-$form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-//$form->addElement('style_submit_button', null,'<i class="fa fa-floppy-o"></i> '.get_lang('SaveSettings'), 'class="btn btn-primary"');
+$form->addButtonSave(get_lang('SaveSettings'), 'submit_save');
 $form->addElement('html', '</div></div>');
 
 // Certificate settings
@@ -372,8 +371,7 @@ if (api_get_setting('allow_public_certificates')=='true') {
     $group[]=$form->createElement('radio', 'allow_public_certificates', get_lang('AllowPublicCertificates'), get_lang('Yes'), 1);
     $group[]=$form->createElement('radio', 'allow_public_certificates', null, get_lang('No'), 0);
     $form->addGroup($group, '', array(get_lang("AllowPublicCertificates")), '');
-    $form->addButtonSave(get_lang('SaveSettings'),'submit_save');
-    //$form->addElement('style_submit_button', null,'<i class="fa fa-floppy-o"></i> '.get_lang('SaveSettings'), 'class="btn  btn-primary"');
+    $form->addButtonSave(get_lang('SaveSettings'), 'submit_save');
     $form->addElement('html', '</div></div>');
 }
 
diff --git a/main/course_info/legal.php b/main/course_info/legal.php
index 237b938c38..5426b04727 100755
--- a/main/course_info/legal.php
+++ b/main/course_info/legal.php
@@ -74,7 +74,7 @@ if ($pluginLegal && !empty($plugin)) {
 $form->addElement('hidden', 'course_code', $course_code);
 $form->addElement('hidden', 'session_id', $session_id);
 $form->addElement('checkbox', 'accept_legal', null, get_lang('AcceptLegal'));
-$form->addElement('style_submit_button', null, get_lang('Accept'), 'class="save"');
+$form->addButtonSave(get_lang('Accept'));
 
 $variable = 'accept_legal_'.$user_id.'_'.$course_info['real_id'].'_'.$session_id;
 
diff --git a/main/course_progress/thematic_plan.php b/main/course_progress/thematic_plan.php
index a6c1dcac62..195f200c93 100755
--- a/main/course_progress/thematic_plan.php
+++ b/main/course_progress/thematic_plan.php
@@ -99,8 +99,7 @@ if ($action == 'thematic_plan_list') {
 
 	$form->addText('title', get_lang('Title'), true, array('size'=>'50'));
 	$form->addHtmlEditor('description', get_lang('Description'), false, false, array('ToolbarStartExpanded'=>'false', 'ToolbarSet' => 'TrainingDescription', 'Width' => '80%', 'Height' => '150'));
-	//$form->addElement('html','<div class="clear" style="margin-top:50px;"></div>');
-	$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
+	$form->addButtonSave(get_lang('Save'));
 
 	if ($description_type < ADD_THEMATIC_PLAN) {
 		$default['title'] = $default_thematic_plan_title[$description_type];
diff --git a/main/coursecopy/copy_course.php b/main/coursecopy/copy_course.php
index ea619645dc..9ba34957b1 100755
--- a/main/coursecopy/copy_course.php
+++ b/main/coursecopy/copy_course.php
@@ -120,7 +120,7 @@ if (Security::check_token('post') && (
         $group[] = $form->createElement('radio', 'same_file_name_option', null, get_lang('SameFilenameOverwrite'), FILE_OVERWRITE);
         $form->addGroup($group, '', get_lang('SameFilename'));
         $form->add_progress_bar();
-        $form->addElement('style_submit_button', 'submit', get_lang('CopyCourse'), 'class="save"');
+        $form->addButtonSave(get_lang('CopyCourse'));
         $form->setDefaults(array('copy_option' =>'select_items','same_file_name_option' => FILE_OVERWRITE));
 
         // Add Security token
diff --git a/main/coursecopy/create_backup.php b/main/coursecopy/create_backup.php
index 71a8f9aac0..62c0a37daa 100755
--- a/main/coursecopy/create_backup.php
+++ b/main/coursecopy/create_backup.php
@@ -104,7 +104,7 @@ if (Security::check_token('post') && (
         $form->addElement('header', get_lang('SelectOptionForBackup'));
         $form->addElement('radio', 'backup_option', '', get_lang('CreateFullBackup'), 'full_backup');
         $form->addElement('radio', 'backup_option', '', get_lang('LetMeSelectItems'), 'select_items');
-        $form->addElement('style_submit_button', null, get_lang('CreateBackup'), 'class="save"');
+        $form->addButtonSave(get_lang('CreateBackup'));
         $form->add_progress_bar();
         // When progress bar appears we have to hide the title "Please select a backup-option".
         $form->updateAttributes(
diff --git a/main/coursecopy/import_backup.php b/main/coursecopy/import_backup.php
index 6356259fe0..83e4b2e7ca 100755
--- a/main/coursecopy/import_backup.php
+++ b/main/coursecopy/import_backup.php
@@ -260,13 +260,7 @@ if (Security::check_token('post') && (
     );
 
     $form->addElement('html', '<br />');
-    $form->addElement(
-        'style_submit_button',
-        null,
-        get_lang('ImportBackup'),
-        'class="save"'
-    );
-
+    $form->addButtonImport(get_lang('ImportBackup'));
     $values['backup_type'] = 'local';
     $values['import_option'] = 'full_backup';
     $values['same_file_name_option'] = FILE_OVERWRITE;
diff --git a/main/coursecopy/recycle_course.php b/main/coursecopy/recycle_course.php
index 8094f8c368..b5e193f431 100755
--- a/main/coursecopy/recycle_course.php
+++ b/main/coursecopy/recycle_course.php
@@ -99,7 +99,7 @@ if (Security::check_token('post') && (
         $form->addElement('header', get_lang('SelectOptionForBackup'));
         $form->addElement('radio', 'recycle_option', null, get_lang('FullRecycle'), 'full_backup');
         $form->addElement('radio', 'recycle_option', null, get_lang('LetMeSelectItems'), 'select_items');
-        $form->addElement('style_submit_button', 'submit', get_lang('RecycleCourse'), 'class="save"');
+        $form->addButtonSave(get_lang('RecycleCourse'));
         $form->setDefaults(array('recycle_option' => 'select_items'));
         // Add Security token
         $token = Security::get_token();
diff --git a/main/document/create_audio.php b/main/document/create_audio.php
index f656be7620..958022d6bf 100755
--- a/main/document/create_audio.php
+++ b/main/document/create_audio.php
@@ -216,7 +216,7 @@ $(document).ready(function(){
 		$form->addElement('select', 'lang', get_lang('Language'), $options);
 		$form->addElement('textarea', 'text', get_lang('InsertText2Audio'), array('id' => 'textarea_google', 'class' =>'span6' ));
 		//echo Display :: return_icon('info3.gif', get_lang('HelpGoogleAudio'), array('align' => 'absmiddle', 'hspace' => '3px'), false);
-		$form->addElement('style_submit_button', 'submit', get_lang('SaveMP3'), 'class="save"');
+		$form->addButtonSave(get_lang('SaveMP3'));
 		$defaults = array();
 		$defaults['lang'] = $selected_language;
 		$form->setDefaults($defaults);
@@ -248,8 +248,7 @@ $(document).ready(function(){
 		$form->addElement('select', 'speed', get_lang('Speed'), $speed_options, array());
 		$form->addElement('textarea', 'text', get_lang('InsertText2Audio'), array('id' => 'textarea_pediaphon', 'class' =>'span6'));
 		//echo Display :: return_icon('info3.gif', get_lang('HelpPediaphon'), array('align' => 'absmiddle', 'hspace' => '3px'), false);
-
-		$form->addElement('style_submit_button', 'submit', get_lang('SaveMP3'), 'class="save"');
+		$form->addButtonSave(get_lang('SaveMP3'));
 		$defaults = array();
 		$defaults['lang'] = $selected_language;
 		$form->setDefaults($defaults);
diff --git a/main/exercice/calculated_answer.class.php b/main/exercice/calculated_answer.class.php
index 9bda12a28d..408bee2d87 100644
--- a/main/exercice/calculated_answer.class.php
+++ b/main/exercice/calculated_answer.class.php
@@ -157,7 +157,8 @@ class CalculatedAnswer extends Question
 
         global $text, $class;
         // setting the save button here and not in the question class.php
-        $form->addElement('style_submit_button', 'submitQuestion', $text, 'class="'.$class.'"');
+        //$form->addElement('style_submit_button', 'submitQuestion', $text, 'class="'.$class.'"');
+        $form->addButtonSave($text, 'submitQuestion');
 
         if (!empty($this->id)) {
             $form -> setDefaults($defaults);
diff --git a/main/exercice/fill_blanks.class.php b/main/exercice/fill_blanks.class.php
index 50cf1c34c2..96ab00b7f4 100755
--- a/main/exercice/fill_blanks.class.php
+++ b/main/exercice/fill_blanks.class.php
@@ -124,7 +124,8 @@ class FillBlanks extends Question
 
 		global $text, $class;
 		// setting the save button here and not in the question class.php
-		$form->addElement('style_submit_button', 'submitQuestion', $text, 'class="'.$class.'"');
+		//$form->addElement('style_submit_button', 'submitQuestion', $text, 'class="'.$class.'"');
+        $form->addButtonSave($text, 'submitQuestion');
 
 		if (!empty($this->id)) {
 			$form -> setDefaults($defaults);
diff --git a/main/exercice/freeanswer.class.php b/main/exercice/freeanswer.class.php
index b6e4f0b557..7d6cdb7efe 100755
--- a/main/exercice/freeanswer.class.php
+++ b/main/exercice/freeanswer.class.php
@@ -32,7 +32,8 @@ class FreeAnswer extends Question
         $form->addElement('text', 'weighting', get_lang('Weighting'), array('class' => 'span1'));
         global $text, $class;
         // setting the save button here and not in the question class.php
-        $form->addElement('style_submit_button', 'submitQuestion', $text, 'class="' . $class . '"');
+        //$form->addElement('style_submit_button', 'submitQuestion', $text, 'class="' . $class . '"');
+        $form->addButtonSave($text, 'submitQuestion');
         if (!empty($this->id)) {
             $form->setDefaults(array('weighting' => float_format($this->weighting, 1)));
         } else {