1 files changed, 13 insertions, 50 deletions

diff --git a/arc-firefox-theme/chrome/browser/searchbar.css b/arc-firefox-theme/chrome/browser/searchbar.css
index 08fd9dd..b026cdb 100644
--- a/arc-firefox-theme/chrome/browser/searchbar.css
+++ b/arc-firefox-theme/chrome/browser/searchbar.css
@@ -15,47 +15,35 @@
   margin: 0;
 }
 
-.searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {
-  font-weight: bold;
-}
-
 /* Engine button */
 .searchbar-engine-image {
   height: 16px;
   width: 16px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  -moz-margin-start: -1px;
 }
 
-.searchbar-engine-button {
-  -moz-appearance: none;
-  min-width: 0;
-  margin: 0;
-  border: 0;
+/* Search go button */
+.search-go-container {
   -moz-box-align: center;
-  background-color: transparent;
 }
 
-.searchbar-engine-button > .button-box {
-  -moz-appearance: none;
-  padding: 2px 0;
-  -moz-padding-end: 2px;
-  border: 0;
+.search-go-button {
+  padding: 1px;
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  -moz-image-region: rect(0, 42px, 14px, 28px);
 }
 
-.searchbar-dropmarker-image {
-  -moz-appearance: toolbarbutton-dropdown !important;
-  width: 12px;
-  height: 12px;
+.search-go-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
-/* Search go button */
-.search-go-container {
-  -moz-box-align: center;
+.search-go-button:hover:active {
+  -moz-image-region: rect(28px, 42px, 42px, 28px);
 }
 
-.search-go-button {
-  padding: 1px;
-  list-style-image: url(moz-icon://stock/gtk-find?size=menu);
+.search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
 }
 
 menuitem[cmd="cmd_clearhistory"] {
@@ -93,23 +81,6 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
   -moz-image-region: rect(0, 60px, 20px, 40px);
 }
 
-searchbar[oneoffui] .search-go-button {
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  -moz-image-region: rect(0, 42px, 14px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:hover {
-  -moz-image-region: rect(14px, 42px, 28px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:hover:active {
-  -moz-image-region: rect(28px, 42px, 42px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
-}
-
 
 .search-panel-current-engine {
   border-top: none !important;
@@ -236,10 +207,6 @@ searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon
   list-style-image: url("chrome://browser/skin/search-engine-placeholder.png");
 }
 
-searchbar[oneoffui] .searchbar-engine-button {
-  display: none;
-}
-
 .search-panel-tree > .autocomplete-treebody::-moz-tree-cell {
   border-top: none !important;
 }
@@ -262,10 +229,6 @@ searchbar[oneoffui] .searchbar-engine-button {
   list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon-active");
 }
 
-searchbar[oneoffui] .searchbar-engine-image {
-  -moz-margin-start: -1px;
-}
-
 .search-setting-button {
   -moz-appearance: none;
   border: none;