Bug 1378108 - Part 2 - Remove Firebug theme;r=gl

MozReview-Commit-ID: 930pvUVLsiP --HG-- rename : devtools/client/themes/images/firebug/read-only.svg => devtools/client/themes/images/read-only.svg extra : rebase_source : e4b1609bff47753d01d4c21ceaca993ce8d93071
2018-04-04 12:32:54 -07:00 · 2018-04-04 12:32:54 -07:00 · a977789695
--- a/devtools/client/debugger/new/debugger.css
+++ b/devtools/client/debugger/new/debugger.css
@ -326,18 +326,6 @@ menuseparator {
  --reference-color: var(--theme-highlight-purple);
 }

-.theme-firebug {
-  --number-color: #000088;
-  --string-color: #ff0000;
-  --null-color: #787878;
-  --object-color: DarkGreen;
-  --caption-color: #444444;
-  --location-color: #555555;
-  --source-link-color: blue;
-  --node-color: rgb(0, 0, 136);
-  --reference-color: rgb(102, 102, 255);
-}
-
 /******************************************************************************/

 .objectLink:hover {
@ -1924,18 +1912,6 @@ html .toggle-button.end.vertical svg {
  --stack-function-color: var(--theme-highlight-red);
 }

-.theme-firebug {
-  --number-color: #000088;
-  --string-color: #FF0000;
-  --null-color: #787878;
-  --object-color: DarkGreen;
-  --caption-color: #444444;
-  --location-color: #555555;
-  --source-link-color: blue;
-  --node-color: rgb(0, 0, 136);
-  --reference-color: rgb(102, 102, 255);
-}
-
 /******************************************************************************/

 .inline {
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@ -501,18 +501,9 @@ Tools.lightTheme = {
  classList: ["theme-light"],
 };

-Tools.firebugTheme = {
-  id: "firebug",
-  label: l10n("options.firebugTheme.label2"),
-  ordinal: 3,
-  stylesheets: ["chrome://devtools/skin/firebug-theme.css"],
-  classList: ["theme-light", "theme-firebug"],
-};
-
 exports.defaultThemes = [
  Tools.darkTheme,
  Tools.lightTheme,
-  Tools.firebugTheme,
 ];

 // White-list buttons that can be toggled to prevent adding prefs for
--- a/devtools/client/dom/content/dom-view.css
+++ b/devtools/client/dom/content/dom-view.css
@ -42,7 +42,7 @@ body {

 /* Read only properties have a padlock icon */
 .treeTable tr:not(.writable) td.treeValueCell {
-  background: url("chrome://devtools/skin/images/firebug/read-only.svg") no-repeat;
+  background: url("chrome://devtools/skin/images/read-only.svg") no-repeat;
  background-position: 1px 5px;
  background-size: 10px 10px;
 }
--- a/devtools/client/framework/test/browser_toolbox_theme.js
+++ b/devtools/client/framework/test/browser_toolbox_theme.js
@ -24,7 +24,7 @@ add_task(function* testDevtoolsTheme() {
  is(document.getElementById("appcontent").getAttribute("devtoolstheme"), "dark",
    "The element has an attribute based on devtools theme.");

-  Services.prefs.setCharPref(PREF_DEVTOOLS_THEME, "firebug");
+  Services.prefs.setCharPref(PREF_DEVTOOLS_THEME, "unknown");
  is(document.getElementById("browser-bottombox").getAttribute("devtoolstheme"), "light",
    "The element has 'light' as a default for the devtoolstheme attribute.");
  is(document.getElementById("appcontent").getAttribute("devtoolstheme"), "light",
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@ -112,7 +112,6 @@ devtools.jar:
    skin/devtools-browser.css (themes/devtools-browser.css)
    skin/dark-theme.css (themes/dark-theme.css)
    skin/light-theme.css (themes/light-theme.css)
-    skin/firebug-theme.css (themes/firebug-theme.css)
    skin/toolbars.css (themes/toolbars.css)
    skin/toolbox.css (themes/toolbox.css)
    skin/tooltips.css (themes/tooltips.css)
@ -269,44 +268,7 @@ devtools.jar:
    skin/images/pane-collapse.svg (themes/images/pane-collapse.svg)
    skin/images/pane-expand.svg (themes/images/pane-expand.svg)
    skin/images/help.svg (themes/images/help.svg)
-
-    # Firebug Theme
-    skin/images/firebug/read-only.svg (themes/images/firebug/read-only.svg)
-    skin/images/firebug/twisty-closed-firebug.svg (themes/images/firebug/twisty-closed-firebug.svg)
-    skin/images/firebug/twisty-open-firebug.svg (themes/images/firebug/twisty-open-firebug.svg)
-    skin/images/firebug/arrow-down.svg (themes/images/firebug/arrow-down.svg)
-    skin/images/firebug/arrow-up.svg (themes/images/firebug/arrow-up.svg)
-    skin/images/firebug/close.svg (themes/images/firebug/close.svg)
-    skin/images/firebug/pause.svg (themes/images/firebug/pause.svg)
-    skin/images/firebug/play.svg (themes/images/firebug/play.svg)
-    skin/images/firebug/rewind.svg (themes/images/firebug/rewind.svg)
-    skin/images/firebug/disable.svg (themes/images/firebug/disable.svg)
-    skin/images/firebug/breakpoint.svg (themes/images/firebug/breakpoint.svg)
-    skin/images/firebug/tool-options.svg (themes/images/firebug/tool-options.svg)
-    skin/images/firebug/debugger-step-in.svg (themes/images/firebug/debugger-step-in.svg)
-    skin/images/firebug/debugger-step-out.svg (themes/images/firebug/debugger-step-out.svg)
-    skin/images/firebug/debugger-step-over.svg (themes/images/firebug/debugger-step-over.svg)
-    skin/images/firebug/pane-collapse.svg (themes/images/firebug/pane-collapse.svg)
-    skin/images/firebug/pane-expand.svg (themes/images/firebug/pane-expand.svg)
-    skin/images/firebug/dock-undock.svg (themes/images/firebug/dock-undock.svg)
-    skin/images/firebug/dock-side.svg (themes/images/firebug/dock-side.svg)
-    skin/images/firebug/dock-bottom.svg (themes/images/firebug/dock-bottom.svg)
-    skin/images/firebug/commandline-icon.svg (themes/images/firebug/commandline-icon.svg)
-    skin/images/firebug/debugger-blackbox.svg (themes/images/firebug/debugger-blackbox.svg)
-    skin/images/firebug/debugger-prettyprint.svg (themes/images/firebug/debugger-prettyprint.svg)
-    skin/images/firebug/debugger-toggleBreakpoints.svg (themes/images/firebug/debugger-toggleBreakpoints.svg)
-    skin/images/firebug/tool-debugger-paused.svg (themes/images/firebug/tool-debugger-paused.svg)
-    skin/images/firebug/command-pick.svg (themes/images/firebug/command-pick.svg)
-    skin/images/firebug/command-console.svg (themes/images/firebug/command-console.svg)
-    skin/images/firebug/command-eyedropper.svg (themes/images/firebug/command-eyedropper.svg)
-    skin/images/firebug/command-frames.svg (themes/images/firebug/command-frames.svg)
-    skin/images/firebug/command-paintflashing.svg (themes/images/firebug/command-paintflashing.svg)
-    skin/images/firebug/command-responsivemode.svg (themes/images/firebug/command-responsivemode.svg)
-    skin/images/firebug/command-scratchpad.svg (themes/images/firebug/command-scratchpad.svg)
-    skin/images/firebug/command-screenshot.svg (themes/images/firebug/command-screenshot.svg)
-    skin/images/firebug/command-measure.svg (themes/images/firebug/command-measure.svg)
-    skin/images/firebug/command-rulers.svg (themes/images/firebug/command-rulers.svg)
-    skin/images/firebug/command-noautohide.svg (themes/images/firebug/command-noautohide.svg)
+    skin/images/read-only.svg (themes/images/read-only.svg)

    # Debugger
    skin/images/debugger/arrow.svg (themes/images/debugger/arrow.svg)
--- a/devtools/client/jsonview/test/browser_jsonview_theme.js
+++ b/devtools/client/jsonview/test/browser_jsonview_theme.js
@ -20,9 +20,6 @@ add_task(async function() {
  SpecialPowers.setCharPref("devtools.theme", "dark");
  is(await getTheme(), "theme-dark", "Theme changed to dark");

-  SpecialPowers.setCharPref("devtools.theme", "firebug");
-  is(await getTheme(), "theme-firebug", "Theme changed to firebug");
-
  SpecialPowers.setCharPref("devtools.theme", "light");
  is(await getTheme(), "theme-light", "Theme changed to light");

--- a/devtools/client/locales/en-US/startup.properties
+++ b/devtools/client/locales/en-US/startup.properties
@ -22,10 +22,6 @@ options.darkTheme.label2=Dark
 # Used as a label for light theme
 options.lightTheme.label2=Light

-# LOCALIZATION NOTE (options.firebugTheme.label2)
-# Used as a label for Firebug theme
-options.firebugTheme.label2=Firebug
-
 # LOCALIZATION NOTE (performance.label):
 # This string is displayed in the title of the tab when the profiler is
 # displayed inside the developer tools window and in the Developer Tools Menu.
--- a/devtools/client/netmonitor/src/assets/styles/variables.css
+++ b/devtools/client/netmonitor/src/assets/styles/variables.css
@ -34,11 +34,6 @@
  --sort-descending-image: url(chrome://devtools/skin/images/sort-descending-arrow.svg);
 }

-:root.theme-firebug {
-  --sort-ascending-image: url(chrome://devtools/skin/images/firebug/arrow-up.svg);
-  --sort-descending-image: url(chrome://devtools/skin/images/firebug/arrow-down.svg);
-}
-
 :root {
  /* Icons */
  --play-icon-url: url("chrome://devtools/content/netmonitor/src/assets/icons/play.svg");
--- a/devtools/client/shared/components/reps/reps.css
+++ b/devtools/client/shared/components/reps/reps.css
@ -18,18 +18,6 @@
  --stack-function-color: var(--theme-highlight-red);
 }

-.theme-firebug {
-  --number-color: #000088;
-  --string-color: #FF0000;
-  --null-color: #787878;
-  --object-color: DarkGreen;
-  --caption-color: #444444;
-  --location-color: #555555;
-  --source-link-color: blue;
-  --node-color: rgb(0, 0, 136);
-  --reference-color: rgb(102, 102, 255);
-}
-
 /******************************************************************************/

 .inline {
--- a/devtools/client/shared/components/tree/TreeView.css
+++ b/devtools/client/shared/components/tree/TreeView.css
@ -9,7 +9,6 @@
 /* TreeView Colors */

 :root {
-  --tree-link-color: blue;
  --tree-header-background: #C8D2DC;
  --tree-header-sorted-background: #AAC3DC;
 }
@ -160,11 +159,11 @@
 }

 .treeTable .treeHeaderSorted > .treeHeaderCellBox {
-  background: url(chrome://devtools/skin/images/firebug/arrow-down.svg) no-repeat calc(100% - 4px);
+  background: url(chrome://devtools/skin/images/sort-descending-arrow.svg) no-repeat calc(100% - 4px);
 }

 .treeTable .treeHeaderSorted.sortedAscending > .treeHeaderCellBox {
-  background-image: url(chrome://devtools/skin/images/firebug/arrow-up.svg);
+  background-image: url(chrome://devtools/skin/images/sort-ascending-arrow.svg);
 }

 .treeTable .treeHeaderCell:hover:active {
--- a/devtools/client/shared/test/browser_theme.js
+++ b/devtools/client/shared/test/browser_theme.js
@ -23,8 +23,6 @@ function testGetTheme() {
  is(getTheme(), "light", "getTheme() correctly returns light theme");
  Services.prefs.setCharPref("devtools.theme", "dark");
  is(getTheme(), "dark", "getTheme() correctly returns dark theme");
-  Services.prefs.setCharPref("devtools.theme", "firebug");
-  is(getTheme(), "firebug", "getTheme() correctly returns firebug theme");
  Services.prefs.setCharPref("devtools.theme", "unknown");
  is(getTheme(), "unknown", "getTheme() correctly returns an unknown theme");
  Services.prefs.setCharPref("devtools.theme", originalTheme);
@ -48,9 +46,6 @@ function testSetTheme() {
  setTheme(originalTheme);
  is(Services.prefs.getCharPref("devtools.theme"), originalTheme,
     "setTheme() correctly sets the original theme.");
-  setTheme("firebug");
-  is(Services.prefs.getCharPref("devtools.theme"), "firebug",
-     "setTheme() correctly sets firebug theme.");
  setTheme("unknown");
  is(Services.prefs.getCharPref("devtools.theme"), "unknown",
     "setTheme() correctly sets an unknown theme.");
@ -62,23 +57,18 @@ function testSetTheme() {
 function testGetColor() {
  let BLUE_DARK = "#75BFFF";
  let BLUE_LIGHT = "#0074e8";
-  let BLUE_FIREBUG = "#3455db";
  let originalTheme = getTheme();

  setTheme("dark");
  is(getColor("highlight-blue"), BLUE_DARK, "correctly gets color for enabled theme.");
  setTheme("light");
  is(getColor("highlight-blue"), BLUE_LIGHT, "correctly gets color for enabled theme.");
-  setTheme("firebug");
-  is(getColor("highlight-blue"), BLUE_FIREBUG, "correctly gets color for enabled theme.");
  setTheme("metal");
  is(getColor("highlight-blue"), BLUE_LIGHT,
     "correctly uses light for default theme if enabled theme not found");

  is(getColor("highlight-blue", "dark"), BLUE_DARK,
     "if provided and found, uses the provided theme.");
-  is(getColor("highlight-blue", "firebug"), BLUE_FIREBUG,
-     "if provided and found, uses the provided theme.");
  is(getColor("highlight-blue", "metal"), BLUE_LIGHT,
     "if provided and not found, defaults to light theme.");
  is(getColor("somecomponents"), null, "if a type cannot be found, should return null.");
@ -100,6 +90,5 @@ function testColorExistence() {
  for (let type of vars) {
    ok(getColor(type, "light"), `${type} is a valid color in light theme`);
    ok(getColor(type, "dark"), `${type} is a valid color in dark theme`);
-    ok(getColor(type, "firebug"), `${type} is a valid color in firebug theme`);
  }
 }
--- a/devtools/client/shared/theme.js
+++ b/devtools/client/shared/theme.js
@ -16,7 +16,6 @@ const variableFileContents = require("theme-loader!devtools/client/themes/variab
 const THEME_SELECTOR_STRINGS = {
  light: ":root.theme-light {",
  dark: ":root.theme-dark {",
-  firebug: ":root.theme-firebug {",
  root: ":root {",
 };
 const THEME_PREF = "devtools.theme";
--- a/devtools/client/themes/animation.css
+++ b/devtools/client/themes/animation.css
@ -30,13 +30,6 @@
  --keyframe-marker-shadow-color: #818181;
 }

-:root.theme-firebug {
-  --command-pick-image: url(chrome://devtools/skin/images/firebug/command-pick.svg);
-  --pause-image: url(chrome://devtools/skin/images/firebug/pause.svg);
-  --resume-image: url(chrome://devtools/skin/images/firebug/play.svg);
-  --rewind-image: url(chrome://devtools/skin/images/firebug/rewind.svg);
-}
-
 /* Root element of animation inspector */
 #animation-container {
  display: flex;
--- a/devtools/client/themes/animationinspector.css
+++ b/devtools/client/themes/animationinspector.css
@ -33,15 +33,6 @@
  --close-button-image: url(chrome://devtools/skin/images/close.svg);
 }

-.theme-firebug {
-  --even-animation-timeline-background-color: rgba(128,128,128,0.03);
-  --command-pick-image: url(chrome://devtools/skin/images/firebug/command-pick.svg);
-  --pause-image: url(chrome://devtools/skin/images/firebug/pause.svg);
-  --rewind-image: url(chrome://devtools/skin/images/firebug/rewind.svg);
-  --play-image: url(chrome://devtools/skin/images/firebug/play.svg);
-  --close-button-image: url(chrome://devtools/skin/images/firebug/close.svg);
-}
-
 .theme-light {
  /* The color for animation type 'opacity' */
  --opacity-border-color: var(--theme-highlight-pink);
--- a/devtools/client/themes/common.css
+++ b/devtools/client/themes/common.css
@ -27,15 +27,10 @@
  --monospace-font-family: Consolas, monospace;
 }

-:root[platform="linux"],
-:root.theme-firebug {
+:root[platform="linux"] {
  --monospace-font-family: monospace;
 }

-:root.theme-firebug {
-  --proportional-font-family: Lucida Grande, Tahoma, sans-serif;
-}
-
 .devtools-monospace {
  font-family: var(--monospace-font-family);
 }
--- a/devtools/client/themes/firebug-theme.css
+++ b/devtools/client/themes/firebug-theme.css
@ -1,57 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@import url(resource://devtools/client/themes/variables.css);
-@import url(resource://devtools/client/themes/common.css);
-@import url(chrome://devtools/skin/light-theme.css);
-
-:root.theme-firebug {
-  font-size: 11px;
-  font-family: var(--proportional-font-family);
-}
-
-/* CodeMirror Color Syntax */
-
-.theme-firebug .cm-keyword {color: BlueViolet; font-weight: bold;}
-.theme-firebug .cm-atom {color: #219;}
-.theme-firebug .cm-number {color: #164;}
-.theme-firebug .cm-def {color: #00f;}
-.theme-firebug .cm-variable {color: black;}
-.theme-firebug .cm-variable-2 {color: black;}
-.theme-firebug .cm-variable-3 {color: black;}
-.theme-firebug .cm-property {color: black;}
-.theme-firebug .cm-operator {color: black;}
-.theme-firebug .cm-comment {color: Silver;}
-.theme-firebug .cm-string {color: Red;}
-.theme-firebug .cm-string-2 {color: Red;}
-.theme-firebug .cm-meta {color: rgb(120, 120, 120); font-style: italic;}
-.theme-firebug .cm-error {color: #f00;}
-.theme-firebug .cm-qualifier {color: #555;}
-.theme-firebug .cm-builtin {color: #30a;}
-.theme-firebug .cm-bracket {color: #997;}
-.theme-firebug .cm-tag {color: blue;}
-.theme-firebug .cm-attribute {color: rgb(0, 0, 136);}
-.theme-firebug .cm-header {color: blue;}
-.theme-firebug .cm-quote {color: #090;}
-.theme-firebug .cm-hr {color: #999;}
-.theme-firebug .cm-link {color: #00c;}
-
-.theme-firebug .theme-fg-color3,
-.theme-firebug .cm-s-mozilla .kind-Object .cm-variable{
-  color: var(--theme-content-color1);
-  font-style: normal;
-}
-
-.theme-firebug .console-string {
-  color: #FF183C;
-}
-
-/* Variables View */
-
-.theme-firebug .variables-view-variable > .title > .name,
-.theme-firebug .variables-view-variable > .title > .value {
-  color: var(--theme-body-color);
-}
-
--- a/devtools/client/themes/images/firebug/arrow-down.svg
+++ b/devtools/client/themes/images/firebug/arrow-down.svg
@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="7" height="7">
-  <path d="M1.774 4.486L.257 1.86-1.259-.768h6.067L3.29 1.859z" transform="matrix(.88859 0 0 1.0498 1.923 1.549)" stroke-linejoin="round" fill="#39424a" stroke="#39424a"/>
-</svg>
--- a/devtools/client/themes/images/firebug/arrow-up.svg
+++ b/devtools/client/themes/images/firebug/arrow-up.svg
@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="7" height="7">
-  <path d="M1.774 4.486L.257 1.86-1.259-.768h6.067L3.29 1.859z" transform="matrix(.88859 0 0 -1.0498 1.923 5.452)" stroke-linejoin="round" fill="#39424a" stroke="#39424a"/>
-</svg>
--- a/devtools/client/themes/images/firebug/breakpoint.svg
+++ b/devtools/client/themes/images/firebug/breakpoint.svg
@ -1,13 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#c80000"/>
-      <stop offset="1" stop-color="#780000"/>
-    </linearGradient>
-    <radialGradient cx="4.8" cy="4.665" r="5.59" fx="4.8" fy="4.665" id="b" xlink:href="#a" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <path d="M11.553 5.995a5.59 5.59 0 1 1-11.18 0 5.59 5.59 0 1 1 11.18 0z" transform="translate(-.4 -.435) scale(1.0734)" fill="url(#b)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/close.svg
+++ b/devtools/client/themes/images/firebug/close.svg
@ -1,25 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#f2451d"/>
-      <stop offset=".101" stop-color="#f01428" stop-opacity=".8"/>
-      <stop offset=".897" stop-color="#de8493"/>
-      <stop offset="1" stop-color="#efc3cc"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#520e0d"/>
-      <stop offset="1" stop-color="#c4181d"/>
-    </linearGradient>
-    <linearGradient x1="8.769" y1="1049.931" x2="8.769" y2="1038.668" id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 -1036.362)"/>
-    <linearGradient x1="7.231" y1="1051.323" x2="7.231" y2="1037.401" id="d" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 -1036.362)"/>
-    <filter x="-.24" y="-.24" width="1.48" height="1.48" color-interpolation-filters="sRGB" id="e">
-      <feGaussianBlur stdDeviation=".713"/>
-    </filter>
-  </defs>
-  <rect width="13" height="13" rx="2" ry="2" x="1.5" y="1.5" fill="url(#c)" stroke="url(#d)" stroke-linejoin="round"/>
-  <path d="M6.5 5.437L4.938 7l2 2-2 2L6.5 12.562l2-2 2 2L12.064 11l-2-2 2-2L10.5 5.437l-2 2-2-2z" opacity=".4" filter="url(#e)"/>
-  <path d="M6 4.438L4.437 6l2 2-2 2L6 11.563l2-2 2 2L11.563 10l-2-2 2-2L10 4.437l-2 2-2-2z" fill="#fff"/>
-</svg>
--- a/devtools/client/themes/images/firebug/command-console.svg
+++ b/devtools/client/themes/images/firebug/command-console.svg
@ -1,31 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#325de6"/>
-      <stop offset="1" stop-color="#8ba3f1"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#1a47d6"/>
-      <stop offset="1" stop-color="#6786ed"/>
-    </linearGradient>
-    <linearGradient x1="7.771" y1="13.61" x2="7.771" y2="2.16" id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.70047 0 0 .8 8.145 1037.962)"/>
-    <linearGradient x1="7.21" y1="14.919" x2="7.21" y2="1.081" id="f" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.70047 0 0 .8 8.145 1037.962)"/>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#282828"/>
-      <stop offset="1" stop-color="#505050"/>
-    </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0"/>
-      <stop offset="1" stop-color="#3c3c3c"/>
-    </linearGradient>
-    <linearGradient x1="7.771" y1="15.451" x2="7.771" y2="3.941" id="g" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.9204 0 0 .56 15.804 1039.472)"/>
-    <linearGradient x1="7.21" y1="16.411" x2="7.21" y2="3.037" id="h" xlink:href="#d" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-.9204 0 0 .56 15.804 1039.472)"/>
-  </defs>
-  <g stroke-linejoin="round">
-    <path d="M1.14 1039.162l4.56 5.167-4.56 5.233-.84-.8 3.166-4.433-3.166-4.367z" fill="url(#e)" stroke="url(#f)" stroke-width=".6" transform="translate(0 -1036.362)"/>
-    <path d="M5.688 1040.05v1.125h10.125v-1.125H5.687zm2.5 3.75v1.125h7.624v-1.125H8.189zm-2.5 3.75v1.125h10.125v-1.125H5.687z" style="marker:none" color="#000" fill="url(#g)" stroke="url(#h)" stroke-width=".4" overflow="visible" transform="translate(0 -1036.362)"/>
-  </g>
-</svg>
--- a/devtools/client/themes/images/firebug/command-eyedropper.svg
+++ b/devtools/client/themes/images/firebug/command-eyedropper.svg
@ -1,38 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" height="16" width="16">
-  <defs>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#e97f7f"/>
-      <stop offset="1" stop-color="#efa1a1"/>
-    </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#e2e9ea"/>
-      <stop offset="1" stop-color="#fff"/>
-    </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#65888b"/>
-      <stop offset="1" stop-color="#91adaf"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#746b54"/>
-      <stop offset="1" stop-color="#454033"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#8c7f64"/>
-      <stop offset="1" stop-color="#5d5543"/>
-    </linearGradient>
-    <radialGradient xlink:href="#a" id="h" cx="8.847" cy="1.845" fx="8.847" fy="1.845" r="1.587" gradientTransform="matrix(1.27453 .37742 -.46407 1.55272 -1.03 -4.65)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="matrix(1.11829 0 0 1.11313 -.505 -.258)" xlink:href="#b" id="i" x1="8.531" y1=".95" x2="9.908" y2="4.42" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="matrix(1.11794 0 0 1.11348 .554 .12)" xlink:href="#b" id="k" x1="-6.81" y1="-1.866" x2="-12.495" y2="-1.812" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="matrix(1.11794 0 0 1.11348 .554 .12)" xlink:href="#a" id="j" x1="-7.216" y1="-2.356" x2="-12.008" y2="-2.36" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="matrix(1.11829 0 0 1.11313 -.505 -.258)" xlink:href="#c" id="f" x1="7.153" y1="11.831" x2="6.271" y2="11.424" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="matrix(1.11829 0 0 1.11313 -.505 -.258)" xlink:href="#d" id="g" x1="8.328" y1="9.463" x2="6.703" y2="8.785" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="l" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.11829 0 0 1.11313 -.505 -.258)" x1="7.153" y1="11.831" x2="6.271" y2="11.424"/>
-  </defs>
-  <path d="M6.705 15.7c1.12-1.51 1.556-2.841 1.973-4.387.502-1.793.766-3.668 1.251-5.471l-1.73-.462c-.485 1.804-1.194 3.562-1.665 5.363-.406 1.532-.717 2.951-.495 4.78z" fill="url(#f)" stroke="url(#g)" stroke-width=".4" stroke-linejoin="round"/>
-  <path d="M10.647 4.88a1.677 2.784 15.142 0 0 .76-1.525 1.677 2.784 15.142 0 0-.896-3.12 1.677 2.784 15.142 0 0-2.344 2.256 1.677 2.784 15.142 0 0-.109 1.7l2.589.69z" fill="url(#h)" stroke="url(#i)" stroke-width=".4" stroke-linejoin="round"/>
-  <rect width="6.708" height="1.113" x="-13.565" y="-3.086" rx=".5" ry=".5" transform="rotate(-165.066) skewX(-.132)" fill="url(#j)" stroke="url(#k)" stroke-width=".4" stroke-linejoin="round"/>
-  <path d="M8.558 10.973l-2.003.496c-.315 1.252-.487 2.44-.332 3.901l.406.107c1.03-1.428 1.416-2.582 1.86-4.226.028-.107.05-.199.07-.278z" fill="url(#l)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/command-frames.svg
+++ b/devtools/client/themes/images/firebug/command-frames.svg
@ -1,25 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" height="16" width="16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#fff"/>
-      <stop offset="1" stop-color="#f0f0f0"/>
-    </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#e1e8ff"/>
-      <stop offset="1" stop-color="#b9c9ff"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#505050"/>
-      <stop offset="1" stop-color="#787878"/>
-    </linearGradient>
-    <linearGradient gradientTransform="translate(.078 -1.018) scale(1.07692)" gradientUnits="userSpaceOnUse" y2="2.767" x2="1.624" y1="14.154" x1="13.01" id="d" xlink:href="#a"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="12.503" x2="12.396" y1="3.285" x1="3.179" id="e" xlink:href="#b"/>
-    <linearGradient y2="12.503" x2="12.396" y1="3.285" x1="3.179" gradientUnits="userSpaceOnUse" id="f" xlink:href="#c"/>
-  </defs>
-  <rect ry="1" rx="1" y="1" x="1" height="14" width="14" fill="url(#d)"/>
-  <path d="M7 2h7v3H7zM2 2h4v12H2z" fill="url(#e)"/>
-  <path d="M7 6h7v8H7z" fill="url(#f)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/command-measure.svg
+++ b/devtools/client/themes/images/firebug/command-measure.svg
@ -1,26 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" height="16" width="16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#505424"/>
-      <stop offset="1" stop-color="#6c6f31"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#e8eace"/>
-      <stop offset="1" stop-color="#f5f6ea"/>
-    </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#484a2e"/>
-      <stop offset="1" stop-color="#61633d"/>
-    </linearGradient>
-    <linearGradient xlink:href="#a" id="d" x1="-.831" y1="11.595" x2="2.378" y2="1.336" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2174 0 0 1 -11.66 -4.6)"/>
-    <linearGradient xlink:href="#b" id="e" x1="1.536" y1="14.334" x2="5.493" y2="1.678" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2174 0 0 1 -11.66 -4.6)"/>
-    <linearGradient xlink:href="#c" id="f" x1="1.695" y1="14.28" x2="6.421" y2="1.672" gradientUnits="userSpaceOnUse" gradientTransform="rotate(-90 3.4 8)"/>
-  </defs>
-  <g transform="translate(4.6 .6)">
-    <rect transform="rotate(-90)" ry=".5" rx=".5" y="-3.4" x="-10.2" height="13.6" width="5.6" fill="url(#d)" stroke="url(#e)" stroke-width=".4" stroke-linejoin="round"/>
-    <path d="M-2.1 10.4v-3m11 3v-3m-2.75 3V8.9M3.4 10.4v-3m-2.75 3V8.9" fill="none" stroke="url(#f)"/>
-  </g>
-</svg>
--- a/devtools/client/themes/images/firebug/command-noautohide.svg
+++ b/devtools/client/themes/images/firebug/command-noautohide.svg
@ -1,43 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
-  <defs>
-    <linearGradient id="b">
-      <stop stop-color="#747254" offset="0"/>
-      <stop stop-color="#8b8965" offset="1"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop stop-color="#e1e1d7" offset="0"/>
-      <stop stop-color="#f2f2ee" offset="1"/>
-    </linearGradient>
-    <linearGradient xlink:href="#a" id="g" x1="13" y1="13" x2="2.9" y2="4.8" gradientUnits="userSpaceOnUse" gradientTransform="translate(-2.28 -2.28) scale(1.1724)"/>
-    <linearGradient xlink:href="#b" id="h" x1="15" y1="11.1" x2="4.8" y2="2.7" gradientUnits="userSpaceOnUse" gradientTransform="translate(-2.28 -2.28) scale(1.1724)"/>
-    <linearGradient x1="8.6" y1="4.3" x2="6.3" y2=".6" id="i" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.62854 0 0 .6863 5.97 6.076)"/>
-    <linearGradient id="c">
-      <stop stop-color="#c8c8c8" offset="0"/>
-      <stop stop-color="#dcdcdc" offset="1"/>
-    </linearGradient>
-    <linearGradient x1="7.2" y1="5.1" x2="5" y2="1.4" id="j" xlink:href="#d" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.62854 0 0 .6863 5.97 6.076)"/>
-    <linearGradient id="d">
-      <stop stop-color="#787878" offset="0"/>
-      <stop stop-color="#8c8c8c" offset="1"/>
-    </linearGradient>
-    <linearGradient x1="11.4" y1="1052.1" x2="4.6" y2="1040.7" id="k" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.6104 0 0 .57897 6.117 -593.406)"/>
-    <linearGradient x1="8.8" y1="1053.4" x2="1.9" y2="1041.9" id="l" xlink:href="#d" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.6104 0 0 .57897 6.117 -593.406)"/>
-    <linearGradient x1="8.5" y1="12.5" x2="6.6" y2="7.8" id="m" xlink:href="#e" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.7015 0 0 .70214 5.388 5.378)"/>
-    <linearGradient id="e">
-      <stop stop-color="#505050" offset="0"/>
-      <stop stop-color="#787878" offset="1"/>
-    </linearGradient>
-    <linearGradient x1="9.4" y1="12.1" x2="7.4" y2="7.4" id="n" xlink:href="#f" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.7015 0 0 .70214 5.388 5.378)"/>
-    <linearGradient id="f">
-      <stop stop-color="#787878" offset="0"/>
-      <stop stop-color="#b4b4b4" offset="1"/>
-    </linearGradient>
-  </defs>
-  <path d="M9.5.3L11 2l1 .7h.7c.7 0 1.2.5 1.2 1.2v8.7c0 .7-.6 1.2-1.3 1.2H1.5c-.7 0-1.2-.6-1.2-1.3V4c0-.8.5-1.3 1.2-1.3H7l.8-.8L9.4.2z" fill="url(#g)" stroke="url(#h)" stroke-width=".6" stroke-linejoin="round"/>
-  <path d="M11 6.3a3 3 0 0 0-3 3l.4-.2h1c0-.8.7-1.5 1.6-1.5 1 0 1.6.7 1.7 1.6h1l.2.2a3 3 0 0 0-3-3z" fill="url(#i)" stroke="url(#j)" stroke-width=".6" stroke-linejoin="round"/>
-  <rect width="9.4" height="6.6" rx=".8" ry=".8" x="6.3" y="9.1" fill="url(#k)" stroke="url(#l)" stroke-width=".6" stroke-linejoin="round"/>
-  <path d="M11 10.5a1.2 1.2 0 0 0-1.2 1.2c0 .5.4 1 1 1v1.6h.5v-1.5c.5 0 1-.6 1-1a1.2 1.2 0 0 0-1.3-1.3z" fill="url(#m)" stroke="url(#n)" stroke-width=".4" stroke-linejoin="round"/>
-</svg>
--- a/devtools/client/themes/images/firebug/command-paintflashing.svg
+++ b/devtools/client/themes/images/firebug/command-paintflashing.svg
@ -1,38 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" height="16" width="16">
-  <defs>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#8c8c8c"/>
-      <stop offset="1" stop-color="#b4b4b4"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#544024"/>
-      <stop offset="1" stop-color="#8b6b3d"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#a0a0a0"/>
-      <stop offset="1" stop-color="#a0a0a0" stop-opacity="0"/>
-    </linearGradient>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#a0a0a0"/>
-      <stop offset="1" stop-color="#c8c8c8"/>
-    </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#382b18"/>
-      <stop offset="1" stop-color="#6f5631"/>
-    </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="3.409" x2="6.735" y1="3.859" x1="9.123" id="f" xlink:href="#a"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="8.347" x2="2.4" y1="9.586" x1="13.352" id="j" xlink:href="#a"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="11.675" x2="7.974" y1="14.423" x1="7.974" id="l" xlink:href="#b" gradientTransform="translate(0 -.2)"/>
-    <linearGradient xlink:href="#c" id="g" x1="9.32" y1="7.243" x2="6.728" y2="6.716" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#c" id="k" x1="12.451" y1="11.469" x2="1.56" y2="10.342" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#d" id="i" x1="13.218" y1="13.627" x2="2.686" y2="13.627" gradientUnits="userSpaceOnUse"/>
-    <linearGradient xlink:href="#e" id="h" x1="12.607" y1="12.021" x2="3.321" y2="12.021" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <path d="M8 1c-.828 0-1.5 1.343-1.5 3v3.5c0 .554.446 1 1 1h1c.554 0 1-.446 1-1V4c0-1.657-.672-3-1.5-3z" fill="url(#f)" stroke="url(#g)" stroke-width=".4" stroke-linejoin="round"/>
-  <rect width="11" height="5" x="2.5" y="10" rx=".5" ry=".5" fill="url(#h)" stroke="url(#i)" stroke-width=".4" stroke-linejoin="round"/>
-  <rect width="12" height="2" x="2" y="8" rx=".5" ry=".5" fill="url(#j)" stroke="url(#k)" stroke-width=".4" stroke-linejoin="round"/>
-  <path d="M11.5 10.8h1v4h-1zm-2 0h1v4h-1zm-2 0h1v4h-1zm-2 0h1v4h-1zm-2 0h1v4h-1z" fill="url(#l)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/command-pick.svg
+++ b/devtools/client/themes/images/firebug/command-pick.svg
@ -1,20 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#6f9fdf"/>
-      <stop offset="1" stop-color="#b8d0f1"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#133cb8"/>
-      <stop offset="1" stop-color="#7faae8"/>
-    </linearGradient>
-    <linearGradient x1="11.304" y1="9.268" x2="7.065" y2="4.197" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse"/>
-    <linearGradient x1="6.587" y1="7.594" x2="2.992" y2=".487" id="c" xlink:href="#b" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <path d="M.5.813c-.273.04-.502.354-.5.687v5.625c0 .36.265.688.563.688h4.406v-1h-3.5a.52.52 0 0 1-.5-.5V2.218a.517.517 0 0 1 .437-.5h3.75c.227-.4.634-.711 1.094-.75.415-.031.84.134 1.125.437l.313.313h6.843c.262 0 .5.238.5.5v4.094a.52.52 0 0 1-.5.5h-1.969l.938 1h1.938c.297 0 .562-.328.562-.688V1.5c0-.36-.265-.688-.563-.688H.5z" fill="#fff"/>
-  <path d="M.5 0C.227.041-.002.355 0 .688v5.625C0 6.673.265 7 .563 7h4.406V6h-3.5a.52.52 0 0 1-.5-.5V1.406a.517.517 0 0 1 .437-.5h13.125c.262 0 .5.238.5.5V5.5a.52.52 0 0 1-.5.5h-2.75l.969 1h2.688c.297 0 .562-.328.562-.688V.688c0-.36-.265-.687-.563-.687H.5z" fill="url(#c)"/>
-  <path d="M6.375 2.375v9.906l2.094-.844 1.625 3.844 2.531-1.062-1.594-3.781 2.188-.876L9.813 5.97 6.374 2.375z" fill="url(#d)" stroke="#4673ce" stroke-linejoin="round"/>
-</svg>
--- a/devtools/client/themes/images/firebug/command-responsivemode.svg
+++ b/devtools/client/themes/images/firebug/command-responsivemode.svg
@ -1,39 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" height="16" width="16">
-  <defs>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#141414"/>
-      <stop offset="1" stop-color="#3c3c3c"/>
-    </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#cdf0ff"/>
-      <stop offset="1" stop-color="#f5fcff"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#787878"/>
-      <stop offset="1" stop-color="#505050"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#282828"/>
-      <stop offset="1" stop-color="#505050"/>
-    </linearGradient>
-    <linearGradient gradientTransform="matrix(1.04615 0 0 1.06667 -.415 .667)" gradientUnits="userSpaceOnUse" y2="1.576" x2="3.337" y1="8.108" x1="14.078" id="e" xlink:href="#a"/>
-    <linearGradient gradientTransform="matrix(2 0 0 2 -13 -4)" gradientUnits="userSpaceOnUse" y2="4.752" x2="13.239" y1="5.261" x1="13.748" id="h" xlink:href="#b"/>
-    <linearGradient gradientTransform="translate(0 1)" gradientUnits="userSpaceOnUse" y2="1.854" x2="3.829" y1="8.432" x1="12.299" id="g" xlink:href="#c"/>
-    <linearGradient gradientTransform="translate(-.5 -.5)" gradientUnits="userSpaceOnUse" y2="5.946" x2=".987" y1="15.102" x1="5.989" id="i" xlink:href="#a"/>
-    <linearGradient gradientTransform="matrix(1.10989 0 0 .79278 -.4 .958)" gradientUnits="userSpaceOnUse" y2="10.774" x2="4.865" y1="10.774" x1="1.261" id="k" xlink:href="#c"/>
-    <linearGradient gradientTransform="matrix(1.5 0 0 1.5 -17.25 6)" gradientUnits="userSpaceOnUse" y2="4.752" x2="13.239" y1="5.261" x1="13.748" id="l" xlink:href="#b"/>
-    <linearGradient gradientTransform="matrix(.683 0 0 .6166 .985 2.273)" gradientUnits="userSpaceOnUse" y2="5.597" x2="2.826" y1="6.539" x1="3.079" id="m" xlink:href="#b"/>
-    <linearGradient xlink:href="#d" id="f" x1="13.677" y1="12.328" x2=".512" y2="4.058" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.97143 0 0 .96 .257 .24)"/>
-    <linearGradient xlink:href="#d" id="j" x1="5.489" y1="14.602" x2=".487" y2="5.446" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <rect ry="1" rx="1" y="1.2" x="2.2" height="9.6" width="13.6" fill="url(#e)" stroke="url(#f)" stroke-width=".4" stroke-linejoin="round"/>
-  <rect ry=".5" rx=".5" y="2.5" x="3.5" height="7" width="9" fill="url(#g)"/>
-  <circle r="1" cy="6" cx="14" fill="url(#h)"/>
-  <rect ry="1" rx="1" y="5" height="10" width="6" fill="url(#i)" stroke="url(#j)" stroke-width=".4" stroke-linejoin="round"/>
-  <rect ry=".5" rx=".5" y="7" x="1" height="5" width="4" fill="url(#k)"/>
-  <circle r=".75" cy="13.5" cx="3" fill="url(#l)"/>
-  <rect ry=".5" rx=".5" y="5.75" x="2" height=".5" width="2" fill="url(#m)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/command-rulers.svg
+++ b/devtools/client/themes/images/firebug/command-rulers.svg
@ -1,20 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" height="16" width="16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#e2e6ea"/>
-      <stop offset="1" stop-color="#f9fafb"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#323b46"/>
-      <stop offset="1" stop-color="#546374"/>
-    </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" y2=".822" x2="4.016" y1="13.198" x1="8.663" id="d" xlink:href="#a"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="1.975" x2="2.064" y1="13.044" x1="6.113" id="c" xlink:href="#b"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="1.511" x2="3.948" y1="13.163" x1="7.795" id="e" xlink:href="#a"/>
-  </defs>
-  <path d="M1.7 1.2c-.278 0-.5.222-.5.5v12.6c0 .278.222.5.5.5h3.6c.278 0 .5-.222.5-.5V5.8h8.5c.278 0 .5-.222.5-.5V1.7c0-.278-.222-.5-.5-.5H1.7z" fill="url(#c)" stroke="url(#d)" stroke-width=".4" stroke-linejoin="round"/>
-  <path d="M1 4.5h1.5M1 7.5h3m-3 3h1.5m-1.5 3h3M4.5 1v1.5m3-1.5v3m3-3v1.5m3-1.5v3" fill="none" stroke="url(#e)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/command-scratchpad.svg
+++ b/devtools/client/themes/images/firebug/command-scratchpad.svg
@ -1,38 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" height="16" width="16">
-  <defs>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#434f5d"/>
-      <stop offset="1" stop-color="#65788b"/>
-    </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#787878"/>
-      <stop offset="1" stop-color="#8c8c8c"/>
-    </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#8c8c8c"/>
-      <stop offset="1" stop-color="#a0a0a0"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#b6b38a"/>
-      <stop offset="1" stop-color="#d3d2bd"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#ecebe0"/>
-      <stop offset="1" stop-color="#fbfbf9" stop-opacity="0"/>
-    </linearGradient>
-    <linearGradient gradientTransform="translate(-1.018 -.726)" gradientUnits="userSpaceOnUse" y2="4.549" x2="4.08" y1="14.382" x1="13.934" id="f" xlink:href="#a"/>
-    <linearGradient gradientTransform="translate(-1.018 -.726)" gradientUnits="userSpaceOnUse" y2="4.836" x2="1.893" y1="16.614" x1="13.78" id="g" xlink:href="#b"/>
-    <linearGradient y2="2.41" x2="4.751" y1="4.023" x1="5.458" gradientTransform="translate(-1.018 -1.026)" gradientUnits="userSpaceOnUse" id="h" xlink:href="#c"/>
-    <linearGradient y2=".94" x2="4.252" y1="3.313" x1="5.323" gradientTransform="translate(0 -.3)" gradientUnits="userSpaceOnUse" id="i" xlink:href="#d"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="9.29" x2="11.377" y1="9.29" x1="4.575" id="j" xlink:href="#e"/>
-  </defs>
-  <path style="marker:none" color="#000" overflow="visible" fill="url(#f)" stroke="url(#g)" stroke-linejoin="round" d="M2 2.75h12v12H2z"/>
-  <path style="marker:none" d="M4 .75c-.553 0-1 .672-1 1.5 0 .829.399 1.474 1 1.5.106.006.2-.08.2-.25 0-.168-.11-.25-.2-.25-.277 0-.5-.447-.5-1 0-.552.223-1 .5-1 .275 0 .5.448.5 1H5c0-.828-.448-1.5-1-1.5z" id="k" color="#000" overflow="visible" fill="url(#h)" stroke="url(#i)" stroke-width=".2" stroke-linejoin="round"/>
-  <path d="M4 11.45h7v1H4zm1-5.321h5v1H5zm1 2.66h6v1H6z" style="marker:none" color="#000" overflow="visible" fill="url(#j)"/>
-  <use height="100%" width="100%" transform="translate(2.667)" id="l" xlink:href="#k"/>
-  <use height="100%" width="100%" transform="translate(2.667)" id="m" xlink:href="#l"/>
-  <use height="100%" width="100%" transform="translate(2.667)" xlink:href="#m"/>
-</svg>
--- a/devtools/client/themes/images/firebug/command-screenshot.svg
+++ b/devtools/client/themes/images/firebug/command-screenshot.svg
@ -1,39 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
-  <defs>
-    <linearGradient id="e">
-      <stop offset="0" stop-color="#65808b"/>
-      <stop offset="1" stop-color="#7c939c"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#43555d"/>
-      <stop offset="1" stop-color="#566a72"/>
-    </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#54a0ec"/>
-      <stop offset="1" stop-color="#99c5f7"/>
-    </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#f6fafe"/>
-      <stop offset="1" stop-color="#99c5f7"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#324046"/>
-      <stop offset="1" stop-color="#45555b"/>
-    </linearGradient>
-    <linearGradient xlink:href="#a" id="h" x1="13.661" y1="12.474" x2="2.358" y2="5.025" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.97143 0 0 .96 .229 .612)"/>
-    <linearGradient xlink:href="#b" id="i" x1="16.505" y1="11.096" x2="2.974" y2="2.807" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.97143 0 0 .96 .229 .612)"/>
-    <linearGradient xlink:href="#b" id="k" x1="10.3" y1="11.02" x2="5.662" y2="6.382" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 .236)"/>
-    <linearGradient xlink:href="#a" id="j" x1="10.582" y1="9.815" x2="6.843" y2="6.172" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 .236)"/>
-    <radialGradient xlink:href="#c" id="l" cx="7.075" cy="7.944" fx="7.075" fy="7.944" r="2.5" gradientUnits="userSpaceOnUse" gradientTransform="rotate(45 9.338 9.078) scale(1.00392 1.2642)"/>
-    <linearGradient xlink:href="#d" id="m" x1="8.873" y1="11.096" x2="5.628" y2="7.85" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 .236)"/>
-    <linearGradient xlink:href="#a" id="g" x1="10.226" y1="3.728" x2="6.522" y2="2.07" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 .314)"/>
-    <linearGradient xlink:href="#e" id="f" x1="9.212" y1="4.437" x2="6.127" y2="3.047" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 .314)"/>
-  </defs>
-  <path d="M6.5 2.225c-.277 0-.641.14-.816.316L4.316 3.908c-.175.175-.093.317.184.317h7c.277 0 .359-.142.184-.317l-1.368-1.367c-.175-.175-.539-.316-.816-.316h-2z" fill="url(#f)" stroke="url(#g)" stroke-width=".4" stroke-linejoin="round"/>
-  <rect ry="1" rx="1" y="4.2" x="1.2" height="9.6" width="13.6" fill="url(#h)" stroke="url(#i)" stroke-width=".4" stroke-linejoin="round"/>
-  <circle r="3.5" cy="9" cx="8" fill="url(#j)" stroke="url(#k)" stroke-width=".4" stroke-linejoin="round"/>
-  <circle cx="8" cy="9" r="2.5" fill="url(#l)" stroke="url(#m)" stroke-width=".4" stroke-linejoin="round"/>
-</svg>
--- a/devtools/client/themes/images/firebug/commandline-icon.svg
+++ b/devtools/client/themes/images/firebug/commandline-icon.svg
@ -1,26 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="14">
-  <defs>
-    <style>
-      path {
-        opacity: 0.5;
-      }
-      path:target {
-        opacity: 1;
-      }
-    </style>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#234ccd"/>
-      <stop offset="1" stop-color="#5d7de3"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#1e3faa"/>
-      <stop offset="1" stop-color="#3a61de"/>
-    </linearGradient>
-    <linearGradient x1="2.002" y1="12.252" x2="-.099" y2="6.755" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(5.841 1034.646)"/>
-    <linearGradient x1="3.309" y1="11.177" x2="1.468" y2="6.456" id="c" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="translate(5.841 1034.646)"/>
-  </defs>
-  <path id="focus" d="M6.841 1040.052l-.437.406 2.469 3.688-2.47 3.687.438.407 3.438-4.094z" fill="url(#c)" stroke="url(#d)" stroke-width=".4" stroke-linecap="round" stroke-linejoin="round" transform="translate(-1.341 -1037.146)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/debugger-blackbox.svg
+++ b/devtools/client/themes/images/firebug/debugger-blackbox.svg
@ -1,30 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
-  <defs>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#323232"/>
-      <stop offset="1" stop-color="#646464"/>
-    </linearGradient>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#b4b4b4"/>
-      <stop offset="1" stop-color="#dcdcdc"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#3c3c3c"/>
-      <stop offset="1" stop-color="#646464"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#505050"/>
-      <stop offset="1" stop-color="#8c8c8c"/>
-    </linearGradient>
-    <linearGradient gradientTransform="matrix(.97143 0 0 1.08571 .229 -1125.879)" xlink:href="#a" id="e" x1="10.803" y1="1047.39" x2="4.726" y2="1041.559" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="matrix(.97143 0 0 1.08571 .229 -1125.879)" xlink:href="#b" id="f" x1="12.563" y1="1046.633" x2="5.974" y2="1040.229" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="translate(-1.333 -1210.423) scale(1.16667)" xlink:href="#c" id="g" x1="9.698" y1="1046.429" x2="5.893" y2="1042.623" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="translate(0 -1036.362)" xlink:href="#d" id="h" x1="9.023" y1="1045.897" x2="6.49" y2="1043.363" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <path d="M14.8 8c0 1.085-3.044 3.8-6.8 3.8S1.2 9.085 1.2 8 4.244 4.2 8 4.2s6.8 2.715 6.8 3.8z" style="marker:none" color="#000" overflow="visible" fill="url(#e)" stroke="url(#f)" stroke-width=".4" stroke-linejoin="round"/>
-  <circle r="3.5" cy="8" cx="8" style="marker:none" color="#000" overflow="visible" fill="url(#g)"/>
-  <circle r="2" cy="8" cx="8" style="marker:none" color="#000" overflow="visible" fill="url(#h)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/debugger-prettyprint.svg
+++ b/devtools/client/themes/images/firebug/debugger-prettyprint.svg
@ -1,18 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#285a8c"/>
-      <stop offset="1" stop-color="#508cc8"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#1c3b5c"/>
-      <stop offset="1" stop-color="#285078"/>
-    </linearGradient>
-    <linearGradient x1="17.286" y1="1046.293" x2="-18.065" y2="1003.191" id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1 0 0 1 28.42 0)"/>
-    <linearGradient x1="12.826" y1="1050.761" x2="-24.272" y2="1006.022" id="d" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1 0 0 1 28.42 0)"/>
-  </defs>
-  <path d="M21.734 1045.673v5.125h-1.816c-4.864 0-9.028-.723-10.688-2.168-1.64-1.445-2.46-4.326-2.46-8.643v-6.098c0-2.95-.528-4.99-1.583-6.123-1.054-1.133-2.968-1.7-5.742-1.7h-1.787v-4.189h1.787c2.793 0 4.707-.556 5.742-1.67 1.055-1.133 1.582-3.154 1.582-6.064v-6.127c0-4.317.82-7.188 2.461-8.613 1.66-1.446 5.824-2.168 10.688-2.168h1.816v5.093h-1.992c-2.754 0-4.55.43-5.39 1.29-.84.859-1.26 1.761-1.26 4.515v6.361c0 3.067-1.352 5.293-2.25 6.68-.88 1.387-1.49 2.324-3.64 2.813 2.169.527 2.79 1.484 3.669 2.87.879 1.387 2.22 3.604 2.22 6.65v6.363c0 2.754.42 3.654 1.26 4.514.84.859 2.96 1.289 5.391 1.289zm12.579 0v5.125h1.816c4.864 0 9.028-.723 10.688-2.168 1.64-1.445 2.46-4.326 2.46-8.643v-6.098c0-2.95.528-4.99 1.583-6.123 1.054-1.133 2.968-1.7 5.742-1.7h1.787v-4.189h-1.787c-2.793 0-4.707-.556-5.742-1.67-1.055-1.133-1.582-3.154-1.582-6.064v-6.127c0-4.317-.82-7.188-2.461-8.613-1.66-1.446-5.824-2.168-10.688-2.168h-1.816v5.093h1.992c2.754 0 4.55.43 5.39 1.29.84.859 1.26 1.761 1.26 4.515v6.361c0 3.067 1.352 5.293 2.25 6.68.88 1.387 1.49 2.324 3.64 2.813-2.169.527-2.79 1.484-3.669 2.87-.879 1.387-2.22 3.604-2.22 6.65v6.363c0 2.754-.42 3.654-1.26 4.514-.84.859-2.96 1.289-5.391 1.289z" style="-inkscape-font-specification:Fixedsys" font-size="60" fill="url(#c)" stroke="url(#d)" font-family="Fixedsys" transform="matrix(-.22157 0 0 .22103 14.138 -218.338)" font-weight="400" letter-spacing="0" word-spacing="0" stroke-width="1.807" stroke-linejoin="round"/>
-</svg>
--- a/devtools/client/themes/images/firebug/debugger-step-in.svg
+++ b/devtools/client/themes/images/firebug/debugger-step-in.svg
@ -1,26 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#dd8506"/>
-      <stop offset="1" stop-color="#f4a24b"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#e68507"/>
-      <stop offset="1" stop-color="#f4b65f"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#f3a952"/>
-      <stop offset="1" stop-color="#fadbba"/>
-    </linearGradient>
-    <linearGradient x1="9.06" y1="13.305" x2="9.06" y2="1.704" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse"/>
-    <linearGradient x1="3.865" y1="14.919" x2="3.865" y2="13.049" id="f" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.9974 0 0 1.0026 -1.01 -.02)"/>
-    <linearGradient x1="14.005" y1="14.902" x2="14.005" y2="13.07" id="g" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.9974 0 0 1.0026 -.959 -.02)"/>
-    <linearGradient x1="10.576" y1="11.641" x2=".835" y2="1.901" id="e" xlink:href="#c" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <path d="M.534 2.46h3.864C7.45 2.46 9.5 4.288 9.5 7.028v3.565h1.961L8.076 13.5l-3.382-2.914h1.899V7.74c0-1.554-.866-2.492-2.966-2.492H.534z" fill="url(#d)" stroke="url(#e)" stroke-linejoin="round"/>
-  <path fill="url(#f)" d="M1 13h4v2H1z"/>
-  <path fill="url(#g)" d="M11 13h4v2h-4z"/>
-</svg>
--- a/devtools/client/themes/images/firebug/debugger-step-out.svg
+++ b/devtools/client/themes/images/firebug/debugger-step-out.svg
@ -1,26 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#dd8506"/>
-      <stop offset="1" stop-color="#f4a24b"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#e68507"/>
-      <stop offset="1" stop-color="#f4b65f"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#f3a952"/>
-      <stop offset="1" stop-color="#fadbba"/>
-    </linearGradient>
-    <linearGradient x1="-.161" y1="7.678" x2="12.316" y2="7.678" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="rotate(-90 7.756 5.205)"/>
-    <linearGradient x1="14.005" y1="14.902" x2="14.005" y2="13.07" id="g" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.9974 0 0 1.0026 -.959 -.02)"/>
-    <linearGradient x1="3.865" y1="14.919" x2="3.865" y2="13.049" id="f" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.9974 0 0 1.0026 -1.01 -.02)"/>
-    <linearGradient x1="11.034" y1="9.145" x2="6.593" y2="4.703" id="e" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 -1.116)"/>
-  </defs>
-  <path d="M6.486 12.5V7.009c0-3.051 1.555-4.548 4.295-4.548h1.73V.5l2.907 3.385-2.914 3.382V5.368H11.7c-1.554 0-2.222.518-2.222 2.618V12.5z" fill="url(#d)" stroke="url(#e)" stroke-linejoin="round"/>
-  <path fill="url(#f)" d="M1 13h4v2H1z"/>
-  <path fill="url(#g)" d="M11 13h4v2h-4z"/>
-</svg>
--- a/devtools/client/themes/images/firebug/debugger-step-over.svg
+++ b/devtools/client/themes/images/firebug/debugger-step-over.svg
@ -1,24 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#dd8506"/>
-      <stop offset="1" stop-color="#f4a24b"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#e68507"/>
-      <stop offset="1" stop-color="#f4b65f"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#f3a952"/>
-      <stop offset="1" stop-color="#fadbba"/>
-    </linearGradient>
-    <linearGradient x1="9.06" y1="13.305" x2="9.06" y2="1.704" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(3)"/>
-    <linearGradient x1="3.865" y1="14.919" x2="3.865" y2="13.049" id="f" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="translate(3)"/>
-    <linearGradient x1="12.911" y1="12.657" x2="2.554" y2="2.3" id="e" xlink:href="#c" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <path d="M4.698 2.46h3.7c3.052 0 5.102 1.828 5.102 4.568v3.565h1.962L12.077 13.5l-3.383-2.914h1.9V7.74c0-1.793-.486-2.454-2.047-2.492-.791-.02-1.842 0-2.647 0-1.821 0-2.368.81-2.368 2.488V12.5H.522S.518 9.04.518 7.03c0-2.72 2.209-4.57 4.179-4.57z" fill="url(#d)" stroke="url(#e)" stroke-linejoin="round"/>
-  <path fill="url(#f)" d="M5.016 12.987h4.01v1.995h-4.01z"/>
-</svg>
--- a/devtools/client/themes/images/firebug/debugger-toggleBreakpoints.svg
+++ b/devtools/client/themes/images/firebug/debugger-toggleBreakpoints.svg
@ -1,13 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="16" width="16">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#c80000"/>
-      <stop offset="1" stop-color="#780000"/>
-    </linearGradient>
-    <radialGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="b" fy="4.665" fx="4.8" r="5.59" cy="4.665" cx="4.8"/>
-  </defs>
-  <path transform="translate(1.599 1.565) scale(1.07342)" d="M11.553 5.995a5.59 5.59 0 1 1-11.179 0 5.59 5.59 0 1 1 11.18 0z" fill="url(#b)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/disable.svg
+++ b/devtools/client/themes/images/firebug/disable.svg
@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-  <path d="M5.563 0A6 6 0 0 0 0 6a6 6 0 0 0 12 0 6 6 0 0 0-6.438-6zm.156 2a4 4 0 0 1 2.25.5L2.5 7.97A4 4 0 0 1 2 6a4 4 0 0 1 3.72-4zm3.685 1.906A4 4 0 0 1 10 6a4 4 0 0 1-6.094 3.406l5.5-5.5z" fill="red"/>
-</svg>
--- a/devtools/client/themes/images/firebug/dock-bottom.svg
+++ b/devtools/client/themes/images/firebug/dock-bottom.svg
@ -1,25 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#f2451d"/>
-      <stop offset=".101" stop-color="#f01428" stop-opacity=".8"/>
-      <stop offset=".897" stop-color="#de8493"/>
-      <stop offset="1" stop-color="#efc3cc"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#520e0d"/>
-      <stop offset="1" stop-color="#c4181d"/>
-    </linearGradient>
-    <linearGradient x1="7.231" y1="1051.323" x2="7.231" y2="1037.401" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 -1036.362)"/>
-    <linearGradient x1="8.769" y1="1049.931" x2="8.769" y2="1038.668" id="c" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 -1036.362)"/>
-    <filter height="1.48" y="-.24" width="1.48" x="-.24" id="e" color-interpolation-filters="sRGB">
-      <feGaussianBlur stdDeviation=".8"/>
-    </filter>
-  </defs>
-  <rect y="1.5" x="1.5" ry="2" rx="2" height="13" width="13" fill="url(#c)" stroke="url(#d)" stroke-linejoin="round"/>
-  <path style="marker:none" d="M4.5 5v8h8V5zm1 1h6v4h-6z" color="#000" overflow="visible" opacity=".4" filter="url(#e)"/>
-  <path style="marker:none" d="M4 4v8h8V4zm1 1h6v4H5z" color="#000" overflow="visible" fill="#fff"/>
-</svg>
--- a/devtools/client/themes/images/firebug/dock-side.svg
+++ b/devtools/client/themes/images/firebug/dock-side.svg
@ -1,25 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#f2451d"/>
-      <stop offset=".101" stop-color="#f01428" stop-opacity=".8"/>
-      <stop offset=".897" stop-color="#de8493"/>
-      <stop offset="1" stop-color="#efc3cc"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#520e0d"/>
-      <stop offset="1" stop-color="#c4181d"/>
-    </linearGradient>
-    <linearGradient x1="7.231" y1="1051.323" x2="7.231" y2="1037.401" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 -1036.362)"/>
-    <linearGradient x1="8.769" y1="1049.931" x2="8.769" y2="1038.668" id="c" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="translate(0 -1036.362)"/>
-    <filter height="1.48" y="-.24" width="1.48" x="-.24" id="e" color-interpolation-filters="sRGB">
-      <feGaussianBlur stdDeviation=".8"/>
-    </filter>
-  </defs>
-  <rect y="1.5" x="1.5" ry="2" rx="2" height="13" width="13" fill="url(#c)" stroke="url(#d)" stroke-linejoin="round"/>
-  <path style="marker:none" d="M4.5 5v8h8V5zm1 1h6v4h-6z" transform="rotate(-90 8.5 9)" color="#000" overflow="visible" opacity=".4" filter="url(#e)"/>
-  <path style="marker:none" d="M4 12h8V4H4zm1-1V5h4v6z" color="#000" overflow="visible" fill="#fff"/>
-</svg>
--- a/devtools/client/themes/images/firebug/dock-undock.svg
+++ b/devtools/client/themes/images/firebug/dock-undock.svg
@ -1,27 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#f2451d"/>
-      <stop offset=".101" stop-color="#f01428" stop-opacity=".8"/>
-      <stop offset=".897" stop-color="#de8493"/>
-      <stop offset="1" stop-color="#efc3cc"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#520e0d"/>
-      <stop offset="1" stop-color="#c4181d"/>
-    </linearGradient>
-    <linearGradient x1="7.231" y1="1051.323" x2="7.231" y2="1037.401" id="d" xlink:href="#a" gradientUnits="userSpaceOnUse"/>
-    <linearGradient x1="8.769" y1="1049.931" x2="8.769" y2="1038.668" id="c" xlink:href="#b" gradientUnits="userSpaceOnUse"/>
-    <filter x="-.24" y="-.24" width="1.48" height="1.48" color-interpolation-filters="sRGB" id="e">
-      <feGaussianBlur stdDeviation=".8"/>
-    </filter>
-  </defs>
-  <g transform="translate(0 -1036.362)">
-    <rect width="13" height="13" rx="2" ry="2" x="1.5" y="1037.862" fill="url(#c)" stroke="url(#d)" stroke-linejoin="round"/>
-    <path d="M6.5 1041.362v2h-2v6h6v-2h2v-6h-6zm1 1h4v4h-1v-3h-3v-1zm-2 2h4v4h-4v-4z" opacity=".4" filter="url(#e)"/>
-    <path d="M6 1040.362v2H4v6h6v-2h2v-6H6zm1 1h4v4h-1v-3H7v-1zm-2 2h4v4H5v-4z" fill="#fff"/>
-  </g>
-</svg>
--- a/devtools/client/themes/images/firebug/moz.build
+++ b/devtools/client/themes/images/firebug/moz.build
@ -1,11 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DevToolsModules(
-    'read-only.svg',
-    'spinner.png',
-    'twisty-closed-firebug.svg',
-    'twisty-open-firebug.svg',
-)
--- a/devtools/client/themes/images/firebug/pane-collapse.svg
+++ b/devtools/client/themes/images/firebug/pane-collapse.svg
@ -1,29 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#fff" stop-opacity=".196"/>
-      <stop offset="1" stop-color="#fff" stop-opacity=".784"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#353593"/>
-      <stop offset="1" stop-color="#7373cd"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#2a2a76"/>
-      <stop offset="1" stop-color="#5656c2"/>
-    </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#aabccf"/>
-      <stop offset="1" stop-color="#c5d2df"/>
-    </linearGradient>
-    <linearGradient x1="9.29" y1="6.369" x2="5.581" y2="3.673" id="g" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.53813 0 0 .74017 3.298 3.873)"/>
-    <linearGradient x1="7.02" y1="7.949" x2="2.721" y2="4.824" id="h" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.53813 0 0 .74017 3.298 3.873)"/>
-    <linearGradient x1="14.692" y1="1049.087" x2="5.246" y2="1039.64" id="e" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="translate(-1.167 -949.332) scale(.91667)"/>
-    <linearGradient x1="13.658" y1="1050.509" x2="3.64" y2="1040.492" id="f" xlink:href="#d" gradientUnits="userSpaceOnUse" gradientTransform="translate(-2 -1036.362)"/>
-  </defs>
-  <path fill="url(#e)" stroke="url(#f)" d="M2.5 2.5h11v11h-11z"/>
-  <path d="M9.7 8l-3.4 2.7V5.3z" fill="url(#g)" stroke="url(#h)" stroke-width=".6" stroke-linejoin="round"/>
-</svg>
--- a/devtools/client/themes/images/firebug/pane-expand.svg
+++ b/devtools/client/themes/images/firebug/pane-expand.svg
@ -1,29 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#353593"/>
-      <stop offset="1" stop-color="#7373cd"/>
-    </linearGradient>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#2a2a76"/>
-      <stop offset="1" stop-color="#5656c2"/>
-    </linearGradient>
-    <linearGradient x1="11.709" y1="6.295" x2="8.675" y2="4.089" id="g" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.53813 0 0 .74017 3.298 3.873)"/>
-    <linearGradient x1="11.445" y1="8.382" x2="7.061" y2="5.195" id="h" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.53813 0 0 .74017 3.298 3.873)"/>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#fff" stop-opacity=".196"/>
-      <stop offset="1" stop-color="#fff" stop-opacity=".784"/>
-    </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#aabccf"/>
-      <stop offset="1" stop-color="#c5d2df"/>
-    </linearGradient>
-    <linearGradient x1="14.692" y1="1049.087" x2="5.246" y2="1039.64" id="e" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="translate(-1.167 -949.332) scale(.91667)"/>
-    <linearGradient x1="13.658" y1="1050.509" x2="3.64" y2="1040.492" id="f" xlink:href="#d" gradientUnits="userSpaceOnUse" gradientTransform="translate(-2 -1036.362)"/>
-  </defs>
-  <path fill="url(#e)" stroke="url(#f)" d="M2.5 2.5h11v11h-11z"/>
-  <path d="M6.3 8l3.4 2.7V5.3z" fill="url(#g)" stroke="url(#h)" stroke-width=".6" stroke-linejoin="round"/>
-</svg>
--- a/devtools/client/themes/images/firebug/pause.svg
+++ b/devtools/client/themes/images/firebug/pause.svg
@ -1,31 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#dd8506"/>
-      <stop offset="1" stop-color="#f9c06e" stop-opacity=".988"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#f5a742"/>
-      <stop offset="1" stop-color="#f9cb8a"/>
-    </linearGradient>
-    <linearGradient x1="4.779" y1="1048.788" x2="3.117" y2="1039.853" id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.993 0 0 .998 .028 2.025)"/>
-    <linearGradient x1="5.527" y1="1049.91" x2="2.514" y2="1038.877" id="f" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.993 0 0 .998 .028 2.025)"/>
-    <linearGradient id="c">
-      <stop offset="0" stop-color="#f5a742"/>
-      <stop offset="1" stop-color="#f9cb8a"/>
-    </linearGradient>
-    <linearGradient id="d">
-      <stop offset="0" stop-color="#dd8506"/>
-      <stop offset="1" stop-color="#f9c06e" stop-opacity=".988"/>
-    </linearGradient>
-    <linearGradient x1="4.779" y1="1048.788" x2="3.117" y2="1039.853" id="g" xlink:href="#c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.993 0 0 .998 7.028 2.025)"/>
-    <linearGradient x1="5.527" y1="1049.91" x2="2.514" y2="1038.877" id="h" xlink:href="#d" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.993 0 0 .998 7.028 2.025)"/>
-  </defs>
-  <g stroke-linejoin="round">
-    <path fill="url(#e)" stroke="url(#f)" d="M2.5 1038.862h3v11h-3z" transform="translate(0 -1036.362)"/>
-    <path fill="url(#g)" stroke="url(#h)" d="M9.5 1038.862h3v11h-3z" transform="translate(0 -1036.362)"/>
-  </g>
-</svg>
--- a/devtools/client/themes/images/firebug/play.svg
+++ b/devtools/client/themes/images/firebug/play.svg
@ -1,18 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#2959b8"/>
-      <stop offset="1" stop-color="#83ace8"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#5c87d0"/>
-      <stop offset="1" stop-color="#abc7ed"/>
-    </linearGradient>
-    <linearGradient x1="1.472" y1="-4.098" x2="1.472" y2="6.772" id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.65609 0 0 -1.01925 4.494 9.401)"/>
-    <linearGradient x1="10.18" y1="8.767" x2="3.926" y2="2.99" id="d" xlink:href="#b" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <path d="M11.788 8L4.5 1.204v13.592z" fill="url(#c)" stroke="url(#d)" stroke-linejoin="round"/>
-</svg>
--- a/devtools/client/themes/images/firebug/rewind.svg
+++ b/devtools/client/themes/images/firebug/rewind.svg
@ -1,18 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#2959b8"/>
-      <stop offset="1" stop-color="#83ace8"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#5c87d0"/>
-      <stop offset="1" stop-color="#abc7ed"/>
-    </linearGradient>
-    <linearGradient x1="1.472" y1="-4.098" x2="1.472" y2="6.772" id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.65609 0 0 -1.01925 4.494 9.401)"/>
-    <linearGradient x1="10.18" y1="8.767" x2="3.926" y2="2.99" id="d" xlink:href="#b" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <path d="M11.788 8L4.5 1.204v13.592z" transform="matrix(-1 0 0 1 16 0)" fill="url(#c)" stroke="url(#d)" stroke-linejoin="round"/>
-</svg>
--- a/devtools/client/themes/images/firebug/tool-debugger-paused.svg
+++ b/devtools/client/themes/images/firebug/tool-debugger-paused.svg
@ -1,14 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11" height="12">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#b4aa00"/>
-      <stop offset=".659" stop-color="#f5e600"/>
-      <stop offset="1" stop-color="#f5e600"/>
-    </linearGradient>
-    <linearGradient x1="1.256" y1="6.226" x2=".157" y2=".942" id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1625 0 0 1.2744 1.663 1040.82)"/>
-  </defs>
-  <path d="M8.553 1046.88l-2.742 1.735c-4.951 3.273-5.215 3.09-5.215.035v-6.845c0-2.706.26-2.927 5.215.208l2.593 1.641c2.642 1.553 2.642 1.648.149 3.226z" fill="url(#b)" stroke-width="1.217" stroke-linejoin="round" transform="matrix(1 0 0 .95762 0 -995.06)" stroke="#888000"/>
-</svg>
--- a/devtools/client/themes/images/firebug/tool-options.svg
+++ b/devtools/client/themes/images/firebug/tool-options.svg
@ -1,18 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
-  <defs>
-    <linearGradient id="b">
-      <stop offset="0" stop-color="#464f5a"/>
-      <stop offset="1" stop-color="#7e8b9a"/>
-    </linearGradient>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#6a7786"/>
-      <stop offset="1" stop-color="#abb3bd"/>
-    </linearGradient>
-    <linearGradient xlink:href="#a" id="c" x1="13.108" y1="13.135" x2="2.763" y2="2.791" gradientUnits="userSpaceOnUse" gradientTransform="translate(.306 1036.661) scale(.9618)"/>
-    <linearGradient xlink:href="#b" id="d" x1="14.815" y1="11.602" x2="4.34" y2="1.127" gradientUnits="userSpaceOnUse" gradientTransform="translate(.306 1036.661) scale(.9618)"/>
-  </defs>
-  <path style="marker:none" d="M7.23 1036.661c-.426 0-.665.445-.768.962l-.25 1.25a5.77 5.77 0 0 0-.825.345l-1.063-.71c-.477-.205-.924-.437-1.225-.135l-1.088 1.087c-.301.302-.157.786.136 1.225l.706 1.062a5.77 5.77 0 0 0-.333.824l-1.258.252c-.482.193-.962.344-.962.77v1.538c0 .427.445.665.962.769l1.258.252a5.77 5.77 0 0 0 .34.815l-.713 1.073c-.205.477-.437.92-.136 1.223l1.088 1.089c.301.301.786.155 1.225-.137l1.069-.712a5.77 5.77 0 0 0 .815.33l.254 1.268c.192.482.342.962.768.962h1.54c.426 0 .665-.445.768-.962l.254-1.264a5.77 5.77 0 0 0 .81-.338l1.074.716c.477.204.924.438 1.225.137l1.088-1.09c.301-.301.157-.784-.136-1.222l-.71-1.067a5.77 5.77 0 0 0 .333-.821l1.262-.252c.482-.193.962-.342.962-.769v-1.538c0-.426-.445-.667-.962-.77l-1.253-.252a5.77 5.77 0 0 0-.342-.819l.71-1.067c.205-.477.437-.923.136-1.225l-1.088-1.087c-.301-.302-.786-.158-1.225.135l-1.057.706a5.77 5.77 0 0 0-.829-.336l-.252-1.255c-.192-.482-.342-.962-.768-.962H7.23zm.77 4.81a2.885 2.885 0 0 1 2.885 2.885A2.885 2.885 0 0 1 8 1047.24a2.885 2.885 0 0 1-2.885-2.885A2.885 2.885 0 0 1 8 1041.47z" color="#000" overflow="visible" fill="url(#c)" stroke="url(#d)" stroke-width=".6" stroke-linejoin="round" transform="translate(0 -1036.362)"/>
-</svg>
--- a/devtools/client/themes/images/firebug/twisty-closed-firebug.svg
+++ b/devtools/client/themes/images/firebug/twisty-closed-firebug.svg
@ -1,14 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11" height="11">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#c3baaa"/>
-      <stop offset="1" stop-color="#fff"/>
-    </linearGradient>
-    <linearGradient x1="6.053" y1="7.093" x2="2.888" y2="1.8" id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(.885 .885) scale(1.02564)"/>
-  </defs>
-  <rect width="8" height="8" rx="1" ry="1" x="1.5" y="1.5" fill="url(#b)" stroke="#7898b5" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M5 3v2H3v1h2v2h1V6h2V5H6V3H5z"/>
-</svg>
--- a/devtools/client/themes/images/firebug/twisty-open-firebug.svg
+++ b/devtools/client/themes/images/firebug/twisty-open-firebug.svg
@ -1,14 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11" height="11">
-  <defs>
-    <linearGradient id="a">
-      <stop offset="0" stop-color="#c3baaa"/>
-      <stop offset="1" stop-color="#fff"/>
-    </linearGradient>
-    <linearGradient x1="6.053" y1="7.093" x2="2.888" y2="1.8" id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="translate(.885 .885) scale(1.02564)"/>
-  </defs>
-  <rect width="8" height="8" rx="1" ry="1" x="1.5" y="1.5" fill="url(#b)" stroke="#7898b5" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M3 5h5v1H3z"/>
-</svg>
--- a/devtools/client/themes/images/firebug/read-only.svg
+++ b/devtools/client/themes/images/firebug/read-only.svg
--- a/devtools/client/themes/inspector.css
+++ b/devtools/client/themes/inspector.css
@ -7,10 +7,6 @@
  --eyedropper-image: url(images/command-eyedropper.svg);
 }

-.theme-firebug {
-  --eyedropper-image: url(images/firebug/command-eyedropper.svg);
-}
-
 * {
  box-sizing: border-box;
 }
--- a/devtools/client/themes/performance.css
+++ b/devtools/client/themes/performance.css
@ -20,14 +20,6 @@
  --row-hover-background-color: rgba(76,158,217,0.2);
 }

-.theme-firebug {
-  --cell-border-color: rgba(0,0,0,0.15);
-  --cell-border-color-light: rgba(0,0,0,0.1);
-  --focus-cell-border-color: rgba(0,0,0,0.3);
-  --row-alt-background-color: rgba(76,158,217,0.1);
-  --row-hover-background-color: rgba(76,158,217,0.2);
-}
-
 /*
 * DE-XUL: Set a sidebar width because inline XUL components will cause the flex
 * to overflow if dynamically sized.
--- a/devtools/client/themes/rules.css
+++ b/devtools/client/themes/rules.css
@ -19,14 +19,6 @@
  --rule-shape-toggle-color: var(--grey-10);
 }

-:root.theme-firebug {
-  --rule-highlight-background-color: var(--theme-highlight-yellow);
-  --rule-property-name: darkgreen;
-  --rule-property-value: darkblue;
-  --rule-overridden-item-border-color: var(--theme-content-color2);
-  --rule-header-background-color: var(--theme-header-background);
-}
-
 /* Rule View Tabpanel */

 #sidebar-panel-ruleview {
--- a/devtools/client/themes/toolbars.css
+++ b/devtools/client/themes/toolbars.css
@ -30,12 +30,6 @@
  --separator-border-image: linear-gradient(transparent 4px, rgba(100%,100%,100%,.2) 4px, rgba(100%,100%,100%,.2) calc(100% - 4px), transparent calc(100% - 4px));
 }

-.theme-firebug {
-  --magnifying-glass-image: url(chrome://devtools/skin/images/search.svg);
-  --tool-options-image: url(chrome://devtools/skin/images/firebug/tool-options.svg);
-}
-
-
 /* Toolbars */
 .devtools-toolbar,
 .devtools-sidebar-tabs tabs {
--- a/devtools/client/themes/toolbox.css
+++ b/devtools/client/themes/toolbox.css
@ -22,24 +22,6 @@
  --command-measure-image: url(images/command-measure.svg);
 }

-.theme-firebug {
-  --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);
-  --dock-undock-image: url(chrome://devtools/skin/images/firebug/dock-undock.svg);
-
-  --command-paintflashing-image: url(images/firebug/command-paintflashing.svg);
-  --command-screenshot-image: url(images/firebug/command-screenshot.svg);
-  --command-responsive-image: url(images/firebug/command-responsivemode.svg);
-  --command-scratchpad-image: url(images/firebug/command-scratchpad.svg);
-  --command-pick-image: url(images/firebug/command-pick.svg);
-  --command-frames-image: url(images/firebug/command-frames.svg);
-  --command-splitconsole-image: url(images/firebug/command-console.svg);
-  --command-noautohide-image: url(images/firebug/command-noautohide.svg);
-  --command-rulers-image: url(images/firebug/command-rulers.svg);
-  --command-measure-image: url(images/firebug/command-measure.svg);
-}
-
 /* Toolbox tabbar */

 .devtools-tabbar {
--- a/devtools/client/themes/variables.css
+++ b/devtools/client/themes/variables.css
@ -186,85 +186,6 @@
  --theme-messageCloseButtonFilter: invert(1);
 }

-:root.theme-firebug {
-  --theme-body-background: #fff;
-  --theme-sidebar-background: #fcfcfc;
-  --theme-contrast-background: #e6b064;
-
-  --theme-tab-toolbar-background: rgb(240, 240, 240) linear-gradient(rgba(255, 255, 255, 0.8), transparent);
-  --theme-toolbar-background: rgb(240, 240, 240) linear-gradient(rgba(255, 255, 255, 0.8), transparent);
-  --theme-toolbar-tab-selected-background: rgb(253, 253, 253);
-  --theme-selection-background: #3399ff;
-  --theme-selection-background-hover: rgba(128,128,128,0.2);
-  --theme-selection-color: white;
-  --theme-splitter-color: #bfbfbf;
-  --theme-comment: darkgreen;
-
-  --theme-body-color: #252525;
-  --theme-body-color-alt: #585959;
-  --theme-content-color1: #292e33;
-  --theme-content-color2: #8fa1b2;
-  --theme-content-color3: #667380;
-
-  --theme-highlight-green: #2cbb0f;
-  --theme-highlight-blue: #3455db;
-  --theme-highlight-bluegrey: #0072ab;
-  --theme-highlight-purple: #000080;
-  --theme-highlight-lightorange: #d97e00;
-  --theme-highlight-orange: #f13c00;
-  --theme-highlight-red: #f00;
-  --theme-highlight-pink: #b82ee5;
-  --theme-highlight-gray: #dde1e4;
-
-  /* Colors used in Graphs, like performance tools. Similar colors to Chrome's timeline. */
-  --theme-graphs-green: #85d175;
-  --theme-graphs-blue: #83b7f6;
-  --theme-graphs-bluegrey: #0072ab;
-  --theme-graphs-purple: #b693eb;
-  --theme-graphs-yellow: #efc052;
-  --theme-graphs-orange: #d97e00;
-  --theme-graphs-red: #e57180;
-  --theme-graphs-grey: #cccccc;
-  --theme-graphs-full-red: #f00;
-  --theme-graphs-full-blue: #00f;
-
-  /* Images */
-  --theme-pane-collapse-image: url(chrome://devtools/skin/images/firebug/pane-collapse.svg);
-  --theme-pane-expand-image: url(chrome://devtools/skin/images/firebug/pane-expand.svg);
-
-  /* Icon filters */
-  --theme-icon-checked-filter: url(chrome://devtools/skin/images/filters.svg#icon-checked-light);
-
-  /* Font size */
-  --theme-toolbar-font-size: 12px;
-
-  /* Header */
-  --theme-header-background: #F0F0F0 linear-gradient(to top,
-                                                     rgba(0, 0, 0, 0.1),
-                                                     transparent) repeat-x;
-
-  /* Command line */
-  --theme-command-line-image: url(chrome://devtools/skin/images/firebug/commandline-icon.svg);
-  --theme-command-line-image-focus: url(chrome://devtools/skin/images/firebug/commandline-icon.svg#focus);
-
-  /* Toolbar buttons */
-  --toolbarbutton-background: transparent linear-gradient(rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.2)) no-repeat;
-  --toolbarbutton-hover-background: transparent;
-  --toolbarbutton-hover-border-color: var(--theme-splitter-color);
-  --toolbarbutton-checked-background: linear-gradient(rgba(0, 0, 0, 0.1), transparent);
-  --toolbarbutton-checked-color: var(--theme-body-color);
-  --toolbarbutton-checked-border-color: var(--toolbarbutton-hover-border-color);
-
-  --theme-codemirror-gutter-background: #ebeced;
-}
-
-:root.theme-firebug[platform="win"] {
-  --theme-tab-toolbar-background: #d8eaf9 linear-gradient(rgba(253, 253, 253, 0.2), rgba(253, 253, 253, 0));
-  --theme-toolbar-background: #d8eaf9 linear-gradient(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.2));
-  --theme-toolbar-tab-selected-background: rgb(247, 251, 254);
-  --theme-splitter-color: #aabccf;
-}
-
 :root {
  --theme-focus-border-color-textbox: #0675d3;
  --theme-textbox-box-shadow: rgba(97,181,255,.75);
--- a/devtools/client/themes/widgets.css
+++ b/devtools/client/themes/widgets.css
@ -23,15 +23,6 @@
  --delete-icon-2x: url(chrome://devtools/skin/images/vview-delete@2x.png);
 }

-.theme-firebug {
-  --table-splitter-color: rgba(0,0,0,0.15);
-  --table-zebra-background: rgba(0,0,0,0.05);
-  --sidemenu-selected-arrow: url(images/item-arrow-ltr.svg);
-  --sidemenu-selected-arrow-rtl: url(images/item-arrow-rtl.svg);
-  --delete-icon: url(chrome://devtools/skin/images/firebug/close.svg);
-  --delete-icon-2x: url(chrome://devtools/skin/images/firebug/close.svg);
-}
-
 /* Generic pane helpers */

 .generic-toggled-pane {
--- a/devtools/docs/contributing/css.md
+++ b/devtools/docs/contributing/css.md
@ -56,7 +56,7 @@ Naming standards for class names:

 ## Light and Dark theme support

-DevTools supports 3 different themes: the dark theme, the light theme and the firebug theme. In order to support them, there are 3 class names available (`theme-dark`, `theme-light` and `theme-firebug`).
+DevTools supports 2 different themes: the dark theme and the light theme. In order to support them, there are 2 class names available (`theme-dark` and `theme-light`).

 * Use [pre-defined CSS variables](https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors) instead of hardcoding colors when possible.
 * If you need to support themes and the pre-defined variables don't fit, define a variable with your custom colors at the beginning of the CSS file. This avoids selector duplication in the code.
@ -70,9 +70,6 @@ Example:
 .theme-dark {
  --some-variable-name: <color-for-dark-theme>;
 }
-.theme-firebug {
-  --some-variable-name: <color-for-dark-theme>;
-}
 #myElement {
  background-color: var(--some-variable-name);
 }