diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 746ba46c5d..c488e82c75 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -114,7 +114,7 @@ messages_show_html();
 
 <a href="#" id="show_hidden_messages" style="display:none"><?php echo __('Show hidden messages (#MSG_COUNT)') ?></a>
 
-<h3><?php echo __('Servers') ?></h3>
+<fieldset class="simple"><legend><?php echo __('Servers') ?></legend>
 <?php
 //
 // Display server list
@@ -171,8 +171,9 @@ display_form_top(
 <?php
 display_form_bottom();
 ?>
+</fieldset>
 
-<h3><?php echo __('Configuration file') ?></h3>
+<fieldset class="simple"><legend><?php echo __('Configuration file') ?></legend>
 <?php
 //
 // Display config file settings and load/save form
@@ -180,7 +181,9 @@ display_form_bottom();
 $form_display = new FormDisplay();
 
 display_form_top('config.php');
-display_fieldset_top('', '', null, array('class' => 'simple'));
+?>
+<table width="100%" cellspacing="0">
+<?php
 
 // Display language list
 $opts = array(
@@ -258,10 +261,11 @@ if (!$config_exists || !$config_writable) {
         ?>" class="red" />
     </td>
 </tr>
+</table>
 <?php
-display_fieldset_bottom_simple();
 display_form_bottom();
 ?>
+</fieldset>
 <div id="footer">
     <a href="http://phpmyadmin.net"><?php echo __('phpMyAdmin homepage') ?></a>
     <a href="http://sourceforge.net/donate/index.php?group_id=23067"><?php
diff --git a/setup/index.php b/setup/index.php
index 1b202ba842..995abdf25c 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -18,7 +18,7 @@ if ($page === '') {
     $page = 'index';
 }
 if (!file_exists("./setup/frames/$page.inc.php")) {
-    // it will happen only when enterung URL by hand, we don't care for these cases
+    // it will happen only when entering URL by hand, we don't care for these cases
     die(__('Wrong GET file attribute value'));
 }
 
diff --git a/setup/styles.css b/setup/styles.css
index 6002b3cce2..e7e955c275 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -111,7 +111,7 @@ h1 {
 .success h4,
 .notice h4,
 div.error h4 {
-    border-bottom: 2px solid;
+    border-bottom: 1px solid;
     font-weight: bold;
     margin: 0 0 .2em 0;
 }
@@ -123,7 +123,7 @@ div.footnotes {
     margin: .5em 0 1.3em 0;
     border: 1px solid;
     background-repeat: no-repeat;
-    background-position: 10px 50%;
+    background-position: 10px 10px;
     padding: 10px 10px 10px 25px;
 
     -moz-border-radius: 5px;
@@ -152,7 +152,7 @@ div.success {
     border-color: #a2d246;
     background-image: url(../themes/pmahomme/img/s_success.png);
     background-repeat: no-repeat;
-    background-position: 5px 50%;
+    background-position: 5px 10px;
 }
 .success h4 {
     border-color: #00FF00;
@@ -170,7 +170,7 @@ div.footnotes {
     border-color: #3a6c7e;
     background-image: url(../themes/pmahomme/img/s_notice.png);
     background-repeat: no-repeat;
-    background-position: 5px 50%;
+    background-position: 5px 10px;
 }
 
 .notice h4 {
@@ -188,7 +188,7 @@ div.error {
     border-color: #333;
     background-image: url(../themes/pmahomme/img/s_error.png);
     background-repeat: no-repeat;
-    background-position: 5px 50%;
+    background-position: 5px 10px;
 }
 
 div.error h4 {
@@ -361,6 +361,11 @@ fieldset th {
     vertical-align: top;
 }
 
+fieldset.simple th {
+    width: auto;
+    min-width: 0;
+}
+
 fieldset .doc {
     margin-left: 1em;
 }
@@ -531,16 +536,6 @@ select {
     background: white;
 }
 
-/* simple form, without header and legend */
-
-fieldset.simple {
-    border-top-color: #DEE1FF;
-}
-
-fieldset.simple legend {
-    display: none;
-}
-
 fieldset.simple th, fieldset.simple td {
     border-top: none;
     border-bottom: 1px #555 dotted;
@@ -596,7 +591,7 @@ table.datatable {
 
 table.datatable th {
     padding: 0 1em 0 0.5em;
-    border-bottom: 2px #66F solid;
+    border-bottom: 1px #999 solid;
     text-align: left;
 }