-findbar[flash="true"] > .findbar-container > .find-field-container > .findbar-textbox {
- background-color: #FFCF00;
+.findbar-find-previous > .toolbarbutton-text,
+.findbar-find-next > .toolbarbutton-text {
+}
+
+.findbar-find-previous[disabled="true"] > .toolbarbutton-icon,
+.findbar-find-next[disabled="true"] > .toolbarbutton-icon {
+}
+
+.findbar-highlight,
+.findbar-case-sensitive {
+ -moz-margin-start: 5px;
+}
+
+.findbar-highlight > .toolbarbutton-icon,
+.findbar-case-sensitive > .toolbarbutton-icon {
+ display: none;