diff --git a/navigation.php b/navigation.php
index d86cc88bf..dceea89f3 100644
--- a/navigation.php
+++ b/navigation.php
@@ -316,15 +316,13 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
     echo '</a></p>';
     if ($table_count) {
         ?>
-        <span id="NavFilter" style="display:none;">
+        <span id="NavFilter">
         <input type="text" name="fast_filter" id="fast_filter"
             title="<?php echo $strNavTableFilter; ?>"
             onkeyup="setTimeout(function(word){ return function(){ fast_filter(word);}}(this.value),1000);"
-            style="width:90%;padding:0 -20px 0 0; padding:2px;"
             onfocus="this.select();" />
-        <span
+        <span id="clear_fast_filter"
             onclick="clear_fast_filter();"
-            style="background:white;color:black;cursor:pointer;padding:0;margin:0;position:relative;right:3ex;"
             title="<?php echo $strReset; ?>">X</span>
         </span>
         <?php
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 72420e38a..0a59056fc 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1265,3 +1265,22 @@ table#serverconnection_src_local,
 table#serverconnection_trg_local  {
   float:left;
 }
+
+#NavFilter {
+    display: none;
+}
+
+#clear_fast_filter {
+    background: white;
+    color: black;
+    cursor: pointer;
+    padding: 0;
+    margin: 0;
+    position: relative;
+    right: 3ex;
+}
+
+#fast_filter {
+    width: 90%;
+    padding: 0.1em;
+}
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 2ffd38876..ab794f52c 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -232,3 +232,21 @@ div#left_tableList ul ul {
     padding: 1em;
 }
 
+#NavFilter {
+    display: none;
+}
+
+#clear_fast_filter {
+    background: white;
+    color: black;
+    cursor: pointer;
+    padding: 0;
+    margin: 0;
+    position: relative;
+    right: 3ex;
+}
+
+#fast_filter {
+    width: 90%;
+    padding: 0.1em;
+}