Bug 1286872 - followup: move back --tool-options-image to toolbars.css to avoid disappearing icons. r=me

MozReview-Commit-ID: 8PKDa7BO5v4

devtools/client/themes/toolbars.css

@@ -13,6 +13,7 @@
   --searcbox-no-match-border-color: #e52e2e;
   --magnifying-glass-image: url(images/search.svg);
   --filter-image: url(images/filter.svg);
+  --tool-options-image: url(images/tool-options.svg);
   --icon-filter: invert(1);
   --toolbar-button-border-color: rgba(170, 170, 170, .5);
 }
@@ -26,12 +27,14 @@
   --searcbox-no-match-border-color: #cc3d3d;
   --magnifying-glass-image: url(images/search.svg);
   --filter-image: url(images/filter.svg);
+  --tool-options-image: url(images/tool-options.svg);
   --icon-filter: none;
   --toolbar-button-border-color: rgba(0, 0, 0, .4);
 }
 
 .theme-firebug {
   --magnifying-glass-image: url(images/search.svg);
+  --tool-options-image: url(images/firebug/tool-options.svg);
   --icon-filter: invert(1);
   --toolbar-button-border-color: rgba(170, 170, 170, .5);
 }

devtools/client/themes/toolbox.css

@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 :root {
-  --tool-options-image: url(images/tool-options.svg);
   --close-button-image: url(chrome://devtools/skin/images/close.svg);
   --dock-bottom-image: url(chrome://devtools/skin/images/dock-bottom.svg);
   --dock-side-image: url(chrome://devtools/skin/images/dock-side.svg);
@@ -24,7 +23,6 @@
 }
 
 .theme-firebug {
-  --tool-options-image: url(images/firebug/tool-options.svg);
   --close-button-image: url(chrome://devtools/skin/images/firebug/close.svg);
   --dock-bottom-image: url(chrome://devtools/skin/images/firebug/dock-bottom.svg);
   --dock-side-image: url(chrome://devtools/skin/images/firebug/dock-side.svg);