diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 4502fe669..6a85c0874 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -500,6 +500,7 @@ h1 div {
     font-family: <?php echo $right_font_family; ?>;
     font-size: <?php echo $font_size; ?>;
     font-weight: normal;
+    white-space: nowrap;
 }
 
 h1 div a {
diff --git a/header.inc.php b/header.inc.php
index 023b2eebe..354aa062a 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -161,19 +161,19 @@ if (empty($GLOBALS['is_header_sent'])) {
                                                                    : ':' . $cfg['Server']['port']
                                                                   )
                        );
-        echo '<div class="server">' . sprintf($GLOBALS['strServer'],'') . "\n"
+        echo '<div class="server">' . sprintf($GLOBALS['strServer'],'') . " :\n"
             . '<a href="' . $GLOBALS['cfg']['DefaultTabServer'] . '?' . PMA_generate_common_url() . '">' 
             . htmlspecialchars($server_info) . '</a>' . "\n"
             . '</div>' . "\n\n";
 
         if (!empty($GLOBALS['db'])) {
-            echo '<div class="database">' . $GLOBALS['strDatabase'] . "\n"
+            echo '<div class="database">' . $GLOBALS['strDatabase'] . " :\n"
                 . '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($GLOBALS['db']) . '">'
                 . htmlspecialchars($GLOBALS['db']) . '</a>' . "\n"
                 . '</div>' . "\n\n";
                
             if (!empty($GLOBALS['table'])) {
-                echo '<div class="table">' . $GLOBALS['strTable'] . "\n"
+                echo '<div class="table">' . $GLOBALS['strTable'] . " :\n"
                     . '<a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']) . '">' 
                     . htmlspecialchars($GLOBALS['table']) . '</a>' . "\n"
                     . '</div>' . "\n\n";