diff --git a/js/main_custom_color.js b/js/main_custom_color.js
index eacc5b793..557fb3fed 100644
--- a/js/main_custom_color.js
+++ b/js/main_custom_color.js
@@ -6,7 +6,7 @@
 $(document).ready(function() {
     $('#li_custom_color').show();
     // Choosing another id does not work! 
-    $('#colorSelector').ColorPicker({
+    $("input[type='submit'][name='custom_color_choose']").ColorPicker({
         color: '#0000ff',
         onShow: function (colpkr) {
             $(colpkr).fadeIn(500);
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index e6804fc02..f71f7cde0 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -35,13 +35,13 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
         if (! $ommit_fieldset) {
             echo '<fieldset>';
         }
-        echo '<label for="select_server">' . __('Server') . ':</label> ';
+        echo '<label for="select_server">' . __('Current Server') . ':</label> ';
 
         echo '<select name="server" id="select_server"'
             . ' onchange="if (this.value != \'\') this.form.submit();">';
         echo '<option value="">(' . __('Servers') . ') ...</option>' . "\n";
     } elseif ($list) {
-        echo __('Server') . ':<br />';
+        echo __('Current Server') . ':<br />';
         echo '<ul id="list_server">';
     }
 
@@ -55,7 +55,6 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
         } else {
             $selected = 0;
         }
-
         if (!empty($server['verbose'])) {
             $label = $server['verbose'];
         } else {
@@ -78,7 +77,7 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
 
         if ($list) {
             echo '<li>';
-            if ($selected && !$ommit_fieldset) {
+            if ($selected) {
                 echo '<strong>' . htmlspecialchars($label) . '</strong>';
             } else {
 
diff --git a/main.php b/main.php
index ba6faa151..52cb6f339 100644
--- a/main.php
+++ b/main.php
@@ -54,17 +54,16 @@ if ($server > 0) {
 
     // should we add the port info here?
     $short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
-                    ? $GLOBALS['cfg']['Server']['verbose']
-                    : $GLOBALS['cfg']['Server']['host']);
+                ? $GLOBALS['cfg']['Server']['verbose']
+                : $GLOBALS['cfg']['Server']['host']);
 }
 
 echo '<div id="maincontainer">' . "\n";
 echo '<div id="main_pane_left">';
-
 if ($server > 0
  || (! $cfg['LeftDisplayServers'] && count($cfg['Servers']) > 1)) {
     echo '<div class="group">';
-    echo '<h2>' . __('Actions') . '</h2>';
+    echo '<h2>' . __('General Settings') . '</h2>';
     echo '<ul>';
 
     /**
@@ -90,52 +89,27 @@ if ($server > 0
                 PMA_printListItem(__('Change password'), 'li_change_password',
                     './user_password.php?' . $common_url_query);
             }
-
-            $http_logout = ($cfg['Server']['auth_type'] == 'http')
-                         ? '<a href="./Documentation.html#login_bug" target="documentation">'
-                            . ($cfg['ReplaceHelpImg'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_info.png" width="11" height="11" alt="Info" />' : '(*)') . '</a>'
-                         : '';
-            PMA_printListItem('<strong>' . __('Log out') . '</strong> ' . $http_logout,
-                'li_log_out',
-                './index.php?' . $common_url_query . '&amp;old_usr=' . urlencode($PHP_AUTH_USER), null, '_parent');
         } // end if
-    } // end of if ($server > 0)
+        echo '    <li id="li_select_mysql_collation">';
+        echo '        <form method="post" action="index.php" target="_parent">' . "\n"
+       . PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection')
+       . '            <label for="select_collation_connection">' . "\n"
+       . '                ' . __('MySQL connection collation') . "\n"
+       // put the doc link in the form so that it appears on the same line
+       . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . ': ' .  "\n"
+       . '            </label>' . "\n"
 
+       . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true)
+       . '            <noscript><input type="submit" value="' . __('Go') . '" /></noscript>' . "\n"
+       . '        </form>' . "\n"
+       . '    </li>' . "\n";
+    } // end of if ($server > 0)
     echo '</ul>';
     echo '</div>';
 }
 
-
-if ($server > 0) {
-    echo '<div class="group">';
-    echo '<h2>MySQL ' . $short_server_info . '</h2>';
-    echo '<ul>' . "\n";
-
-    if ($cfg['ShowCreateDb']) {
-        echo '<li id="li_create_database">';
-        require './libraries/display_create_database.lib.php';
-        echo '</li>' . "\n";
-    }
-
-    echo '    <li id="li_select_mysql_collation">';
-    echo '        <form method="post" action="index.php" target="_parent">' . "\n"
-       . PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection')
-       . '            <label for="select_collation_connection">' . "\n"
-       . '                ' . __('MySQL connection collation') . ': ' . "\n"
-       . '            </label>' . "\n"
-       . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true)
-       . '            <noscript><input type="submit" value="' . __('Go') . '" /></noscript>' . "\n"
-       // put the doc link in the form so that it appears on the same line
-       . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . "\n"
-       . '        </form>' . "\n"
-       . '    </li>' . "\n";
-
-    echo '  </ul>';
-    echo ' </div>';
-}
-
 echo '<div class="group">';
-echo '<h2>' . __('Interface') . '</h2>';
+echo '<h2>' . __('Appearance Settings') . '</h2>';
 echo '  <ul>';
 
 // Displays language selection combo
@@ -155,14 +129,13 @@ if ($GLOBALS['cfg']['ThemeManager']) {
 
     // see js/main_custom_color.js
     echo '<li id="li_custom_color" class="hide">';
-    echo PMA_escapeJsString(__('Custom color')) . ': ';
+    echo PMA_escapeJsString(__('Background color')) . ': ';
+    echo '<input type="submit" name="custom_color_choose" value="' . __('Choose...') . '"';
     echo '<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">';
     echo PMA_generate_common_hidden_inputs();
     echo '<input type="hidden" id="custom_color" name="custom_color" value="" />';
     echo '<input type="submit" name="custom_color_reset" value="' . __('Reset') . '" />';
     echo '</form>';
-    echo '<div id="colorSelector">';
-    echo '</div>';
     echo '</li>';
 }
 echo '<li id="li_select_fontsize">';
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index e95d49d68..a27556094 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1020,7 +1020,7 @@ div#queryboxcontainer div#bookmarkoptions {
 }
 
 #maincontainer ul {
-    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_<?php echo $GLOBALS['text_dir']; ?>.png);
+    list-style-type: disc;
     vertical-align: middle;
 }
 
@@ -1040,8 +1040,7 @@ li#li_select_lang {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
 }
 
-li#li_select_mysql_collation,
-li#li_select_mysql_charset {
+li#li_select_mysql_collation {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
 }
 
@@ -1049,11 +1048,6 @@ li#li_select_theme{
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
 }
 
-li#li_server_info,
-li#li_server_version{
-    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
-}
-
 li#li_user_info{
     /* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
 }
@@ -1102,19 +1096,10 @@ li#li_log_out {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
 }
 
-li#li_pma_docs,
-li#li_pma_wiki {
-    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
-}
-
 li#li_phpinfo {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>php_sym.png);
 }
 
-li#li_pma_homepage {
-    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_home.png);
-}
-
 li#li_mysql_privilegs{
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
 }
@@ -1245,7 +1230,7 @@ code.sql {
 }
 
 .group h2 {
-    background-color:   <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+    background:   <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
     padding:            0.1em 0.3em;
     margin-top:         0;
 }
@@ -1256,9 +1241,11 @@ code.sql {
 }
 
 #li_select_server {
-    padding-bottom:     0.3em;
-    border-bottom:      0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-    margin-bottom:      0.3em;
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
+}
+
+#list_server {
+    list-style-image: none;
 }
 
 /**
diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php
index e7282e1c5..617ee9606 100644
--- a/themes/darkblue_orange/layout.inc.php
+++ b/themes/darkblue_orange/layout.inc.php
@@ -76,7 +76,7 @@ $GLOBALS['cfg']['FontFamilyFixed']      = 'monospace';
 // border
 $GLOBALS['cfg']['Border']               = 0;
 // table header and footer color
-$GLOBALS['cfg']['ThBackground']         = '#ff9900 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top';
+$GLOBALS['cfg']['ThBackground']         = '#ff9900 url("' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png") repeat-x top';
 // table header and footer background
 $GLOBALS['cfg']['ThColor']              = '#000000';
 // table data row background
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index fad64cef6..a3e6fa3c8 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -969,12 +969,12 @@ div#queryboxcontainer div#bookmarkoptions {
 }
 
 #maincontainer ul {
-    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_<?php echo $GLOBALS['text_dir']; ?>.png);
+    list-style-type: disc;
     vertical-align: middle;
 }
 
 #maincontainer li {
-    margin-bottom:  0.3em;
+    margin:  0.2em 0em;
 }
 /* END main page */
 
@@ -989,8 +989,7 @@ li#li_select_lang {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
 }
 
-li#li_select_mysql_collation,
-li#li_select_mysql_charset {
+li#li_select_mysql_collation {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
 }
 
@@ -998,11 +997,6 @@ li#li_select_theme{
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
 }
 
-li#li_server_info,
-li#li_server_version{
-    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
-}
-
 li#li_user_info{
     /* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
 }
@@ -1051,19 +1045,10 @@ li#li_log_out {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
 }
 
-li#li_pma_docs,
-li#li_pma_wiki {
-    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
-}
-
 li#li_phpinfo {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>php_sym.png);
 }
 
-li#li_pma_homepage {
-    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_home.png);
-}
-
 li#li_mysql_privilegs{
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
 }
@@ -1197,7 +1182,7 @@ code.sql {
 }
 
 .group h2 {
-    background-color:   <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+    background:   <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
     padding:            0.1em 0.3em;
     margin-top:         0;
 }
@@ -1208,9 +1193,11 @@ code.sql {
 }
 
 #li_select_server {
-    padding-bottom:     0.3em;
-    border-bottom:      0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-    margin-bottom:      0.3em;
+    list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
+}
+
+#list_server {
+    list-style-image: none;
 }
 
 /**