diff --git a/browser/themes/gnomestripe/browser/searchbar.css b/browser/themes/gnomestripe/browser/searchbar.css
index 8345650340df..c9817fc0b39a 100644
--- a/browser/themes/gnomestripe/browser/searchbar.css
+++ b/browser/themes/gnomestripe/browser/searchbar.css
@@ -131,14 +131,14 @@ toolbar[mode="text"] .searchbar-box {
   -moz-box-align: center;
 }
 
-toolbar:not([mode="text"]) .search-go-button {
+.search-go-button {
   list-style-image: url("chrome://browser/skin/Search-glass.png");
   border: 0px !important;
   padding: 0px;
   -moz-appearance: none;
 }
 
-toolbar:not([mode="text"]) .search-go-button[chromedir="rtl"] {
+.search-go-button[chromedir="rtl"] {
   list-style-image: url("chrome://browser/skin/Search-glass-rtl.png");
 }
 
@@ -149,6 +149,8 @@ toolbar:not([mode="text"]) .search-go-button[chromedir="rtl"] {
 
 toolbar[mode="text"] .search-go-button {
   -moz-margin-start: 5px;
+  padding: 3px;
+  -moz-appearance: toolbarbutton;
 }
 
 toolbar[mode="text"] .search-go-button-stack {