diff --git a/server_status.php b/server_status.php
index 8cb541edf9..65cab4b832 100644
--- a/server_status.php
+++ b/server_status.php
@@ -555,7 +555,7 @@ function printQueryStatistics() {
     ?>
             <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>">
                 <th class="name"><?php echo htmlspecialchars($name); ?></th>
-                <td class="value"><?php echo PMA_formatNumber($value, 5, 0); ?></td>
+                <td class="value"><?php echo PMA_formatNumber($value, 5, 0, true); ?></td>
                 <td class="value"><?php echo 
                     PMA_formatNumber($value * $hour_factor, 4, 1, true); ?></td>
                 <td class="value"><?php echo 
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 34d71fcf8f..27a017a986 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -953,6 +953,27 @@ div#tablestatistics table {
 
 /* serverstatus */
 
+img.sortableIcon {
+    width:16px;
+    height:16px;
+    float:right;
+    background-repeat:no-repeat;
+}
+
+table#serverstatusqueriesdetails th img.sortableIcon, table#serverstatusvariables th img.sortableIcon {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_sortable.png);
+}
+table#serverstatusqueriesdetails th.headerSortUp img.sortableIcon, table#serverstatusvariables th.headerSortUp img.sortableIcon {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png);
+}
+table#serverstatusqueriesdetails th.headerSortDown img.sortableIcon, table#serverstatusvariables th.headerSortDown img.sortableIcon {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_desc.png);
+}
+
+.statuslinks {
+    float: <?php echo $right; ?>;
+}
+
 /* Also used for the variables page */
 fieldset#tableFilter {
     margin-bottom:1em;
diff --git a/themes/original/img/cleardot.gif b/themes/original/img/cleardot.gif
new file mode 100644
index 0000000000..35d42e808f
Binary files /dev/null and b/themes/original/img/cleardot.gif differ
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 07bd55bf11..7092358b27 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -1166,9 +1166,6 @@ img.sortableIcon {
     background-repeat:no-repeat;
 }
 
-table#serverstatusqueriesdetails th img.sortableIcon, table#serverstatusvariables th img.sortableIcon {
-    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_sortable.png);
-}
 table#serverstatusqueriesdetails th.headerSortUp img.sortableIcon, table#serverstatusvariables th.headerSortUp img.sortableIcon {
     background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png);
 }