diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index c29cc9dce..de7c71493 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -27,6 +27,16 @@ require_once './libraries/List.class.php';
  */
 /*public*/ class PMA_List_Database extends PMA_List
 {
+    /**
+     * @var array   list of trivial database names
+     */
+    protected $_trivial_db_names = array(
+        'information_schema',
+        'mysql',
+        'performance_schema',
+        'sys',
+    );
+
     /**
      * @var mixed   database link resource|object to be used
      */
@@ -387,6 +397,9 @@ require_once './libraries/List.class.php';
                 if (! empty($db['comment'])) {
                     $return .= ' title="' . htmlspecialchars($db['comment']) . '"';
                 }
+                if (in_array($db['name'], $this->_trivial_db_names)) {
+                    $return .= ' class="trivial"';
+                }
                 $return .= ' href="index.php?' . PMA_generate_common_url($db['name'])
                     . '" target="_parent">';
                 if ($cut) {
diff --git a/navigation.php b/navigation.php
index 5177d01bd..ce1855247 100644
--- a/navigation.php
+++ b/navigation.php
@@ -187,37 +187,12 @@ if (! $GLOBALS['server']) {
     echo '<p>' . __('No databases') . '</p>';
     PMA_exitNavigationFrame();
 } elseif ($GLOBALS['cfg']['LeftFrameLight'] && count($GLOBALS['pma']->databases) > 1) {
-    $list = $cfg['DisplayDatabasesList'];
-    if ($list === 'auto') {
-        if (empty($GLOBALS['db'])) {
-            $list = true;
-        } else {
-            $list = false;
-        }
-    }
-    if (!$list) {
-        // more than one database available and LeftFrameLight is true
-        // display db selectbox
-        //
-        // Light mode -> beginning of the select combo for databases
-        // Note: When javascript is active, the frameset will be changed from
-        // within navigation.php. With no JS (<noscript>) the whole frameset will
-        // be rebuilt with the new target frame.
     ?>
 
     <div id="databaseList">
     <form method="post" action="index.php" target="_parent" id="left">
     <?php
-        echo PMA_generate_common_hidden_inputs() . "\n";
-        echo $GLOBALS['pma']->databases->getHtmlSelectGrouped(true, $_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']) . "\n";
-        echo '<noscript>' . "\n"
-            .'<input type="submit" name="Go" value="' . __('Go') . '" />' . "\n"
-            .'</noscript>' . "\n"
-            .'</form>' . "\n"
-            . '</div>' . "\n";
-    } else {
-        echo $GLOBALS['pma']->databases->getHtmlListGrouped(true, $_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']) . "\n";
-    }
+    echo $GLOBALS['pma']->databases->getHtmlListGrouped(true, $_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']) . "\n";
     $_url_params = array('pos' => $pos);
     PMA_listNavigator(count($GLOBALS['pma']->databases), $pos, $_url_params, 'navigation.php', 'frame_navigation', $GLOBALS['cfg']['MaxDbList']);
 }
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 46a94225c..e7a081669 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -90,17 +90,23 @@ div#pmalogo {
     padding:.3em;
 }
 div#pmalogo,
-div#leftframelinks,
-div#databaseList {
+div#leftframelinks {
     text-align:         center;
     margin-bottom:      0.5em;
     padding-bottom:     0.5em;
 }
 
-ul#databaseList {
+div#databaseList {
     margin-bottom:      0.5em;
     padding-bottom:     0.5em;
-    padding-<?php echo $left; ?>:     1.5em;
+}
+
+ul#databaseList {
+    text-align:         left;
+    margin-bottom:      0.5em;
+    padding-bottom:     0.5em;
+    padding-<?php echo $left; ?>:     0.5em;
+    list-style:         none;
     font-style: italic;
 }
 
@@ -109,6 +115,11 @@ ul#databaseList a {
     font-style: normal;
 }
 
+ul#databaseList a.trivial {
+    color: gray;
+    font-style: italic;
+}
+
 div#navidbpageselector a,
 ul#databaseList a {
     background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
@@ -161,6 +172,10 @@ div#leftframelinks a:hover img {
     font-size:          80%;
 }
 
+div#left_tableList p {
+    text-align:         center;
+}
+
 div#left_tableList ul {
     list-style-type:    none;
     list-style-position: outside;