diff --git a/apps/i2psnark/resources/themes/dark/snark.css b/apps/i2psnark/resources/themes/dark/snark.css
index f392273d97dd32e718cca600a4ee1d821e6a6bf0..f28dd8da7a5848fccdf922b57b19a36f17b46d24 100644
--- a/apps/i2psnark/resources/themes/dark/snark.css
+++ b/apps/i2psnark/resources/themes/dark/snark.css
@@ -227,22 +227,27 @@ _:-ms-lang(x), .snarknavbar {
 #search {
      display: inline-block;
      position: absolute;
-     top: 6px;
-     right: 3px;
+     top: 16px;
+     right: 9px;
 }
 
 #searchbox {
-     background: #f60 url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
+     background: #000 url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
      margin: 2px 4px 2px 24px !important;
      padding: 4px 32px 4px 32px !important;
-     color: black;
+     color: #bb7;
+}
+
+#searchbox:focus, #searchbox:active {
+     color: #ee9;
 }
 
 #searchcancel {
-     background: url(images/cancel.png);
-     margin: 2px 4px 2px -28px;
+     background: url(images/delete.png) 0px center no-repeat;
+     margin: 2px 4px 2px -20px;
      color: transparent;
      border: none;
+     width: 12px;
 }
 
 /* end topnav */
diff --git a/apps/i2psnark/resources/themes/light/snark.css b/apps/i2psnark/resources/themes/light/snark.css
index 18134c4146da76fd04e5fc80fedb6a03c62530d3..01d8ec5a81c9f4b463c61acb4b4402e99cb6b6c8 100644
--- a/apps/i2psnark/resources/themes/light/snark.css
+++ b/apps/i2psnark/resources/themes/light/snark.css
@@ -232,22 +232,27 @@ button::-moz-focus-inner, input::-moz-focus-inner {
 #search {
      display: inline-block;
      position: absolute;
-     top: 6px;
-     right: 3px;
+     top: 10px;
+     right: 6px;
 }
 
 #searchbox {
-     background: #f60 url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
+     background: #f8f8ff url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
      margin: 2px 4px 2px 24px !important;
      padding: 4px 32px 4px 32px !important;
-     color: black;
+     color: #47475f;
+}
+
+#searchbox:focus, #searchbox:active {
+     color: #19191f;
 }
 
 #searchcancel {
-     background: url(images/cancel.png);
+     background: url(images/delete.png) 0px center no-repeat;
      margin: 2px 4px 2px -28px;
      color: transparent;
      border: none;
+     width: 12px;
 }
 
 /* end top nav */
diff --git a/apps/i2psnark/resources/themes/ubergine/snark.css b/apps/i2psnark/resources/themes/ubergine/snark.css
index e3afeb55d5a32536b244b8c5efc3ab23519c019d..c6a1c0843f8cd5ae7ae32d18fe17fccbc3bd06eb 100644
--- a/apps/i2psnark/resources/themes/ubergine/snark.css
+++ b/apps/i2psnark/resources/themes/ubergine/snark.css
@@ -237,10 +237,15 @@ _:-ms-lang(x), .snarkNav:last-child[href="/i2psnark/"] {
 }
 
 #searchbox {
-     background: #f60 url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
+     background: #212 url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
      margin: 2px 4px 2px 24px !important;
      padding: 4px 32px 4px 32px !important;
-     color: black;
+     color: #f60;
+}
+
+#searchbox:focus, #searchbox:active {
+     background: #f60 url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
+     color: #fff;
 }
 
 #searchcancel {
diff --git a/apps/i2psnark/resources/themes/vanilla/snark.css b/apps/i2psnark/resources/themes/vanilla/snark.css
index 1a70c5cac736040ec67d3fe65d40838d0884f34c..efc1c4090fde860530e1a09fdfbea4cd69e171fd 100644
--- a/apps/i2psnark/resources/themes/vanilla/snark.css
+++ b/apps/i2psnark/resources/themes/vanilla/snark.css
@@ -275,20 +275,25 @@ _:-ms-lang(x), .snarkNav:link, .snarkNav:visited {
 #search {
      display: inline-block;
      position: absolute;
-     top: 6px;
+     top: 8px;
      right: 3px;
 }
 
 #searchbox {
-     background: #f60 url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
+     background: #efe6e0 url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
      margin: 2px 4px 2px 24px !important;
      padding: 4px 32px 4px 32px !important;
-     color: black;
+     color: #2f1500;
+}
+
+#searchbox:focus, #searchbox:active {
+     background: #fffcdf url(/themes/console/images/buttons/search.png) 7px center no-repeat !important;
+     color: #5f1227;
 }
 
 #searchcancel {
-     background: url(images/cancel.png);
-     margin: 2px 4px 2px -28px;
+     background: url(images/delete.png) 7px center no-repeat;
+     margin: 2px 4px 2px -30px;
      color: transparent;
      border: none;
 }