diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php
index 7ad4142161..ecbcc50c25 100755
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@@ -346,9 +346,10 @@ function handle_stylesheets()
     }
 
     if ($is_style_changeable) {
-        $group[] = $form_change->createElement('button', 'save', get_lang('SaveSettings'), array('class' => 'btn btn-primary'));
-        $group[] = $form_change->createElement('button', 'preview', get_lang('Preview'), array('class' => 'btn'));
-        $group[] = $form_change->createElement('button', 'download', get_lang('Download'), array('class' => 'btn'));
+        //$group[] = $form_change->addButtonSave(get_lang('SaveSettings'),'submit');
+        $group[] = $form_change->createElement('button', 'save', get_lang('SaveSettings'));
+        $group[] = $form_change->createElement('button', 'preview', get_lang('Preview'));
+        $group[] = $form_change->createElement('button', 'download', get_lang('Download'));
         $form_change->addGroup($group);
 
         if ($show_upload_form) {
diff --git a/main/admin/settings.php b/main/admin/settings.php
index 1c964789eb..f0e20c30bd 100755
--- a/main/admin/settings.php
+++ b/main/admin/settings.php
@@ -77,7 +77,8 @@ $form_search = new FormValidator('search_settings', 'get', api_get_self() , null
 $form_search->addElement('text', 'search_field');
 $form_search->addElement('hidden', 'category', 'search_setting');
 // Button rules: arg1 = type, arg2 = name, arg3 = text, arg4 = icon (fa-[...]), arg5 = class, arg6 = array('style' => 'display: block;', 'size' => 32, ...)
-$form_search->addElement('button', 'submit_button', get_lang('Search'), 'search', 'btn btn-primary');
+//$form_search->addElement('button', 'submit_button', get_lang('Search'), 'search', 'btn btn-primary');
+$form_search->addButtonSearch(get_lang('Search'),'');
 $form_search->setDefaults(array('search_field' => (isset($_REQUEST['search_field'])?$_REQUEST['search_field']:null)));
 
 $form_search_html = $form_search->return_form();
diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index b3093b47dc..cae5f54958 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -138,11 +138,11 @@ EOT;
     {
         return '
             <div class="form-group {error_class}">
-                <label {label-for} class="col-sm-2 control-label" >
+                <label {label-for} class="col-md-2 control-label" >
                     <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
                     {label}
                 </label>
-                <div class="col-sm-10">
+                <div class="col-md-10">
                     {element}
 
                     <!-- BEGIN label_3 -->
@@ -266,7 +266,7 @@ EOT;
      */
     public function addButtonCreate($label, $name = 'submit')
     {
-        return $this->addButton($name, $label, 'plus', 'primary');
+        return $this->addButton($name, $label, 'plus-square', 'btn btn-success');
     }
 
     /**
@@ -305,7 +305,7 @@ EOT;
         if (empty($label))  {
             $label = get_lang('Search');
         }
-        return $this->addButton('submit', $label, 'search');
+        return $this->addButton('submit', $label, 'search','btn btn-primary');
     }
 
     /**