diff --git a/libraries/Scripts.class.php b/libraries/Scripts.class.php
index 957ffedf9c..2878207271 100644
--- a/libraries/Scripts.class.php
+++ b/libraries/Scripts.class.php
@@ -73,10 +73,14 @@ class PMA_Scripts
                 $scripts[] = "scripts[]=" . $value['filename'];
             }
         }
+        $separator = PMA_URL_getArgSeparator();
+        $url = 'js/get_scripts.js.php'
+            . PMA_URL_getCommon(array(), 'none')
+            . $separator . implode($separator, $scripts);
+
         $static_scripts = sprintf(
-            '<script type="text/javascript" '
-            . 'src="js/get_scripts.js.php%s&%s"></script>',
-            PMA_URL_getCommon(array(), 'none'), implode("&", $scripts)
+            '<script type="text/javascript" src="%s"></script>',
+            htmlspecialchars($url)
         );
         return $static_scripts . $dynamic_scripts;
     }
diff --git a/test/classes/PMA_Scripts_test.php b/test/classes/PMA_Scripts_test.php
index d59b8a83a1..b5295ac633 100644
--- a/test/classes/PMA_Scripts_test.php
+++ b/test/classes/PMA_Scripts_test.php
@@ -11,6 +11,7 @@
 
 require_once 'libraries/Scripts.class.php';
 require_once 'libraries/js_escape.lib.php';
+require_once 'libraries/url_generating.lib.php';
 
 /**
  * Tests for Script.class.php
@@ -78,7 +79,7 @@ class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '<script type="text/javascript" src="js/get_scripts.js.php?lang=en'
-            . '&token=token&scripts[]=common.js"></script>',
+            . '&amp;token=token&amp;scripts[]=common.js"></script>',
             $this->_callPrivateFunction(
                 '_includeFiles',
                 array(
@@ -107,7 +108,7 @@ class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
 
         $this->assertRegExp(
             '@<script type="text/javascript" src="js/get_scripts.js.php\\?lang=en'
-            . '&token=token&scripts\\[\\]=common.js"></script><script type="text/'
+            . '&amp;token=token&amp;scripts\\[\\]=common.js"></script><script type="text/'
             . 'javascript">// <!\\[CDATA\\[' . "\n"
             . 'AJAX.scriptHandler.add\\("common.js",1\\);' . "\n"
             . '\\$\\(function\\(\\) \\{AJAX.fireOnload\\("common.js"\\);\\}\\);'
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 90c4f7571c..d87ebbe396 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -924,7 +924,6 @@ ul#topmenu2 li {
 .menucontainer {
     <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'dcdcdc'); ?>
     border-top: 1px solid #aaa;
-    border-bottom: 1px solid #ccc;
 }
 
 /* default tab styles */
@@ -972,6 +971,11 @@ ul#topmenu ul.only {
 ul#topmenu > li {
     border-right: 1px solid #fff;
     border-left: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+}
+
+ul#topmenu > li:first-child {
+    border-left: 0;
 }
 
 /* default tab styles */
@@ -1020,6 +1024,7 @@ ul#topmenu2 a.tabactive {
 ul#topmenu > li.active {
     /* border-bottom: 0pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>; */
     border-right: 0;
+    border-bottom-color: #fff;
 }
 /* end topmenu */