diff --git a/admin/tool/xmldb/actions/edit_field/edit_field.class.php b/admin/tool/xmldb/actions/edit_field/edit_field.class.php
index 99d0ce54d1f..d48fe8ea5eb 100644
--- a/admin/tool/xmldb/actions/edit_field/edit_field.class.php
+++ b/admin/tool/xmldb/actions/edit_field/edit_field.class.php
@@ -125,7 +125,9 @@ class edit_field extends XMLDBAction {
             $o.= '      <tr valign="top"><td><label for="name" accesskey="n">Name:</label></td><td colspan="2"><input name="name" type="text" size="'.xmldb_field::NAME_MAX_LENGTH.'" maxlength="'.xmldb_field::NAME_MAX_LENGTH.'" id="name" value="' . s($field->getName()) . '" /></td></tr>';
         }
         // XMLDB field comment
-        $o.= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td colspan="2"><textarea name="comment" rows="3" cols="80" id="comment">' . s($field->getComment()) . '</textarea></td></tr>';
+        $o .= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td colspan="2">
+                     <textarea name="comment" rows="3" cols="80" id="comment" class="form-control">' .
+                     s($field->getComment()) . '</textarea></td></tr>';
         // xmldb_field Type
         $typeoptions = array (XMLDB_TYPE_INTEGER => $field->getXMLDBTypeName(XMLDB_TYPE_INTEGER),
                               XMLDB_TYPE_NUMBER  => $field->getXMLDBTypeName(XMLDB_TYPE_NUMBER),
@@ -167,7 +169,8 @@ class edit_field extends XMLDBAction {
         $o.= '      <tr valign="top"><td><label for="default" accesskey="d">Default:</label></td>';
         $o.= '        <td colspan="2"><input type="text" name="default" size="30" maxlength="80" id="default" value="' . s($field->getDefault()) . '" /></td></tr>';
         // Change button
-        $o.= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' .$this->str['change'] . '" /></td></tr>';
+        $o .= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' . $this->str['change'] .
+                     '" class="btn btn-secondary" /></td></tr>';
         $o.= '    </table>';
         $o.= '</div></form>';
         // Calculate the buttons
diff --git a/admin/tool/xmldb/actions/edit_index/edit_index.class.php b/admin/tool/xmldb/actions/edit_index/edit_index.class.php
index a72b1c5eb31..ed8d894346b 100644
--- a/admin/tool/xmldb/actions/edit_index/edit_index.class.php
+++ b/admin/tool/xmldb/actions/edit_index/edit_index.class.php
@@ -115,7 +115,9 @@ class edit_index extends XMLDBAction {
         }
         $o.= '      <tr valign="top"><td><label for="name" accesskey="n">Name:</label></td><td colspan="2"><input name="name" type="text" size="'.xmldb_field::NAME_MAX_LENGTH.'" id="name"' . $disabled . ' value="' . s($index->getName()) . '" /></td></tr>';
         // XMLDB key comment
-        $o.= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td colspan="2"><textarea name="comment" rows="3" cols="80" id="comment">' . s($index->getComment()) . '</textarea></td></tr>';
+        $o .= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td colspan="2">
+                     <textarea name="comment" rows="3" cols="80" id="comment" class="form-control">' .
+                     s($index->getComment()) . '</textarea></td></tr>';
         // xmldb_index Type
         $typeoptions = array (0 => 'not unique',
                               1 => 'unique');
@@ -129,7 +131,8 @@ class edit_index extends XMLDBAction {
         $o.= '      <tr valign="top"><td><label for="hints" accesskey="h">Hints:</label></td>';
         $o.= '        <td colspan="2"><input name="hints" type="text" size="40" maxlength="80" id="hints" value="' . s(implode(', ', $index->getHints())) . '" /></td></tr>';
         // Change button
-        $o.= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' .$this->str['change'] . '" /></td></tr>';
+        $o .= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' .
+                     $this->str['change'] . '" class="btn btn-secondary"/></td></tr>';
         $o.= '    </table>';
         $o.= '</div></form>';
         // Calculate the buttons
diff --git a/admin/tool/xmldb/actions/edit_key/edit_key.class.php b/admin/tool/xmldb/actions/edit_key/edit_key.class.php
index 6e32acf19b3..9e78589b994 100644
--- a/admin/tool/xmldb/actions/edit_key/edit_key.class.php
+++ b/admin/tool/xmldb/actions/edit_key/edit_key.class.php
@@ -115,7 +115,9 @@ class edit_key extends XMLDBAction {
         }
         $o.= '      <tr valign="top"><td><label for="name" accesskey="n">Name:</label></td><td colspan="2"><input name="name" type="text" size="'.xmldb_field::NAME_MAX_LENGTH.'" id="name"' . $disabled . ' value="' . s($key->getName()) . '" /></td></tr>';
         // XMLDB key comment
-        $o.= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td colspan="2"><textarea name="comment" rows="3" cols="80" id="comment">' . s($key->getComment()) . '</textarea></td></tr>';
+        $o .= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td colspan="2">
+                     <textarea name="comment" rows="3" cols="80" id="comment" class="form-control">' .
+                     s($key->getComment()) . '</textarea></td></tr>';
         // xmldb_key Type
         $typeoptions = array (XMLDB_KEY_PRIMARY => $key->getXMLDBKeyName(XMLDB_KEY_PRIMARY),
                               XMLDB_KEY_UNIQUE  => $key->getXMLDBKeyName(XMLDB_KEY_UNIQUE),
@@ -139,7 +141,8 @@ class edit_key extends XMLDBAction {
         $o.= '      <tr valign="top"><td><label for="reffields" accesskey="t">Reffields:</label></td>';
         $o.= '        <td colspan="2"><input name="reffields" type="text" size="40" maxlength="80" id="reffields" value="' . s(implode(', ', $key->getRefFields())) . '" /></td></tr>';
         // Change button
-        $o.= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' .$this->str['change'] . '" /></td></tr>';
+        $o .= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' .
+                     $this->str['change'] . '" class="btn btn-secondary"/></td></tr>';
         $o.= '    </table>';
         $o.= '</div></form>';
         // Calculate the buttons
diff --git a/admin/tool/xmldb/actions/edit_table/edit_table.class.php b/admin/tool/xmldb/actions/edit_table/edit_table.class.php
index 32f6fea00e0..3cfdb66f9b9 100644
--- a/admin/tool/xmldb/actions/edit_table/edit_table.class.php
+++ b/admin/tool/xmldb/actions/edit_table/edit_table.class.php
@@ -131,8 +131,11 @@ class edit_table extends XMLDBAction {
         } else {
             $o.= '      <tr valign="top"><td><label for="name" accesskey="p">Name:</label></td><td><input name="name" type="text" size="'.xmldb_table::NAME_MAX_LENGTH.'" maxlength="'.xmldb_table::NAME_MAX_LENGTH.'" id="name" value="' . s($table->getName()) . '" /></td></tr>';
         }
-        $o.= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td><textarea name="comment" rows="3" cols="80" id="comment">' . s($table->getComment()) . '</textarea></td></tr>';
-        $o.= '      <tr valign="top"><td>&nbsp;</td><td><input type="submit" value="' .$this->str['change'] . '" /></td></tr>';
+        $o .= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td>
+                     <textarea name="comment" rows="3" cols="80" id="comment" class="form-control">' .
+                     s($table->getComment()) . '</textarea></td></tr>';
+        $o .= '      <tr valign="top"><td>&nbsp;</td><td><input type="submit" value="' . $this->str['change'] .
+                     '" class="btn btn-secondary"/></td></tr>';
         $o.= '    </table>';
         $o.= '</div></form>';
         // Calculate the pending changes / save message
diff --git a/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php b/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php
index f053c08c040..e9320675581 100644
--- a/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php
+++ b/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php
@@ -118,8 +118,11 @@ class edit_xml_file extends XMLDBAction {
                 $o .= '    <table id="formelements">';
                 $o.= '      <tr valign="top"><td>Path:</td><td>' . s($structure->getPath()) . '</td></tr>';
                 $o.= '      <tr valign="top"><td>Version:</td><td>' . s($structure->getVersion()) . '</td></tr>';
-                $o.= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td><textarea name="comment" rows="3" cols="80" id="comment">' . $structure->getComment() . '</textarea></td></tr>';
-                $o.= '      <tr><td>&nbsp;</td><td><input type="submit" value="' .$this->str['change'] . '" /></td></tr>';
+                $o .= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td>
+                             <textarea name="comment" rows="3" cols="80" id="comment" class="form-control">' .
+                             $structure->getComment() . '</textarea></td></tr>';
+                $o .= '      <tr><td>&nbsp;</td><td><input type="submit" value="' . $this->str['change'] .
+                             '"class="btn btn-secondary" /></td></tr>';
                 $o.= '    </table>';
                 $o.= '</div></form>';
                 // Calculate the pending changes / save message
diff --git a/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php b/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php
index 2d40ea1d0ed..a3633840ba7 100644
--- a/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php
+++ b/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php
@@ -114,7 +114,7 @@ class view_reserved_words extends XMLDBAction {
         // The textarea showing all the reserved words
         $o.= '    <table id="formelements" class="boxaligncenter" cellpadding="5">';
         $o.= '      <tr><td align="center">' . $this->str['listreservedwords'].'</td></tr>';
-        $o.= '      <tr><td><textarea cols="80" rows="32">';
+        $o .= '      <tr><td><textarea cols="80" rows="32" class="form-control">';
         $o.= s(implode(', ', array_keys($reserved_words)));
         $o.= '</textarea></td></tr>';
         $o.= '    </table>';
diff --git a/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php b/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php
index 99d4524c1bf..91618c35bfb 100644
--- a/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php
+++ b/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php
@@ -119,7 +119,7 @@ class view_structure_php extends XMLDBAction {
         $o.= '    </table>';
         $o.= '</div></form>';
         $o.= '    <table id="phpcode" class="boxaligncenter" cellpadding="5">';
-        $o.= '      <tr><td><textarea cols="80" rows="32">';
+        $o .= '      <tr><td><textarea cols="80" rows="32" class="form-control">';
         // Based on current params, call the needed function
         switch ($commandparam) {
             case 'create_table':
diff --git a/admin/tool/xmldb/actions/view_structure_sql/view_structure_sql.class.php b/admin/tool/xmldb/actions/view_structure_sql/view_structure_sql.class.php
index 377b915e8c1..bb81347d64e 100644
--- a/admin/tool/xmldb/actions/view_structure_sql/view_structure_sql.class.php
+++ b/admin/tool/xmldb/actions/view_structure_sql/view_structure_sql.class.php
@@ -86,7 +86,7 @@ class view_structure_sql extends XMLDBAction {
         $o = $b;
 
         $o.= '    <table id="formelements" class="boxaligncenter" cellpadding="5">';
-        $o.= '      <tr><td><textarea cols="80" rows="32">';
+        $o .= '      <tr><td><textarea cols="80" rows="32" class="form-control">';
         // Get an array of statements
         if ($starr = $DB->get_manager()->generator->getCreateStructureSQL($structure)) {
             $starr = $dbman->generator->getEndedStatements($starr);
diff --git a/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php b/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php
index d337572a8dc..c316432396d 100644
--- a/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php
+++ b/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php
@@ -169,7 +169,7 @@ class view_table_php extends XMLDBAction {
         $o.= '</div></form>';
 
         $o.= '    <table id="phpcode" class="boxaligncenter" cellpadding="5">';
-        $o.= '      <tr><td><textarea cols="80" rows="32">';
+        $o .= '      <tr><td><textarea cols="80" rows="32" class="form-control">';
         // Check we have selected some field/key/index from the popup
         if ($fieldkeyindexparam == 'fieldshead' || $fieldkeyindexparam == 'keyshead' || $fieldkeyindexparam == 'indexeshead') {
             $o.= s($this->str['selectonefieldkeyindex']);
diff --git a/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php b/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php
index a3f25660e36..8a9e04a303b 100644
--- a/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php
+++ b/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php
@@ -93,7 +93,7 @@ class view_table_sql extends XMLDBAction {
         $o = $b;
 
         $o.= '    <table id="formelements" class="boxaligncenter" cellpadding="5">';
-        $o.= '      <tr><td><textarea cols="80" rows="32">';
+        $o .= '      <tr><td><textarea cols="80" rows="32" class="form-control">';
 
         // Get an array of statements
         if ($starr = $DB->get_manager()->generator->getCreateTableSQL($table)) {