diff --git a/browser/devtools/framework/toolbox-options.xul b/browser/devtools/framework/toolbox-options.xul
index 0cbfed8bcfa..53f0ae2d4bc 100644
--- a/browser/devtools/framework/toolbox-options.xul
+++ b/browser/devtools/framework/toolbox-options.xul
@@ -31,10 +31,10 @@
         <label value="&options.selectDevToolsTheme.label;"/>
         <radiogroup id="devtools-theme-box"
                     class="options-groupbox"
+                    data-pref="devtools.theme"
                     orient="horizontal">
-          <radio checked="true" value="light" label="Metal"/>
-          <radio checked="false" disabled="true" value="light" label="&options.lightTheme.label;"/>
-          <radio checked="false" disabled="true" value="dark" label="&options.darkTheme.label;"/>
+          <radio value="light" label="&options.lightTheme.label;"/>
+          <radio value="dark" label="&options.darkTheme.label;"/>
         </radiogroup>
         <label value="&options.commonPrefs.label;"/>
         <vbox id="commonprefs-options" class="options-groupbox">
diff --git a/browser/devtools/shared/theme-switching.js b/browser/devtools/shared/theme-switching.js
index f379e0cf51d..1d93734a9a6 100644
--- a/browser/devtools/shared/theme-switching.js
+++ b/browser/devtools/shared/theme-switching.js
@@ -79,7 +79,7 @@
   const StylesheetUtils = devtools.require("sdk/stylesheet/utils");
 
   let theme = Services.prefs.getCharPref("devtools.theme");
-  switchTheme("light");
+  switchTheme(theme);
 
   gDevTools.on("pref-changed", handlePrefChange);
   window.addEventListener("unload", function() {
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 0f6dbb770d0..91abe3af033 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -176,7 +176,6 @@ browser.jar:
 * skin/classic/browser/devtools/common.css            (../shared/devtools/common.css)
 * skin/classic/browser/devtools/dark-theme.css        (../shared/devtools/dark-theme.css)
 * skin/classic/browser/devtools/light-theme.css       (../shared/devtools/light-theme.css)
-  skin/classic/browser/devtools/metal.jpg             (../shared/devtools/images/metal.jpg)
   skin/classic/browser/devtools/filters.svg          (../shared/devtools/filters.svg)
   skin/classic/browser/devtools/controls.png          (../shared/devtools/images/controls.png)
   skin/classic/browser/devtools/controls@2x.png       (../shared/devtools/images/controls@2x.png)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 42df22102ae..304551141ae 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -297,7 +297,6 @@ browser.jar:
 * skin/classic/browser/devtools/common.css                  (../shared/devtools/common.css)
 * skin/classic/browser/devtools/dark-theme.css              (../shared/devtools/dark-theme.css)
 * skin/classic/browser/devtools/light-theme.css             (../shared/devtools/light-theme.css)
-  skin/classic/browser/devtools/metal.jpg                   (../shared/devtools/images/metal.jpg)
   skin/classic/browser/devtools/filters.svg                 (../shared/devtools/filters.svg)
   skin/classic/browser/devtools/controls.png                (../shared/devtools/images/controls.png)
   skin/classic/browser/devtools/controls@2x.png             (../shared/devtools/images/controls@2x.png)
diff --git a/browser/themes/shared/devtools/images/metal.jpg b/browser/themes/shared/devtools/images/metal.jpg
deleted file mode 100644
index 9123ddc839a..00000000000
Binary files a/browser/themes/shared/devtools/images/metal.jpg and /dev/null differ
diff --git a/browser/themes/shared/devtools/light-theme.css b/browser/themes/shared/devtools/light-theme.css
index 0c7073f9096..3791d6ffe30 100644
--- a/browser/themes/shared/devtools/light-theme.css
+++ b/browser/themes/shared/devtools/light-theme.css
@@ -135,7 +135,6 @@
   color: #585959;
   background-color: #f0f1f2;
   border-color: #aaa;
-  background-image: url("chrome://browser/skin/devtools/metal.jpg");
 }
 
 .ruleview-colorswatch,
diff --git a/browser/themes/shared/devtools/toolbars.inc.css b/browser/themes/shared/devtools/toolbars.inc.css
index a14162affbd..be2e56b1918 100644
--- a/browser/themes/shared/devtools/toolbars.inc.css
+++ b/browser/themes/shared/devtools/toolbars.inc.css
@@ -15,7 +15,6 @@
   padding: 4px 3px;
   border-bottom-width: 1px;
   border-bottom-style: solid;
-  font: 3mm "comic sans ms", Purisa, message-box !important;
 }
 
 .devtools-menulist,
@@ -616,13 +615,11 @@
   border: 0px solid;
   border-bottom-width: 1px;
   padding: 0;
-  font: 3mm "comic sans ms", Purisa, message-box !important;
 }
 
 .theme-light .devtools-tabbar {
   box-shadow: 0 -2px 0 rgba(170,170,170,.1) inset;
   background: #ebeced;
-  background-image: url("chrome://browser/skin/devtools/metal.jpg");
   border-bottom-color: #aaa;
 }
 
diff --git a/browser/themes/shared/devtools/widgets.inc.css b/browser/themes/shared/devtools/widgets.inc.css
index 2b0c3b59c7e..59a0b6f14c9 100644
--- a/browser/themes/shared/devtools/widgets.inc.css
+++ b/browser/themes/shared/devtools/widgets.inc.css
@@ -161,7 +161,7 @@
 
 .theme-light #breadcrumb-separator-after,
 .theme-light #breadcrumb-separator-before:after {
-  background: url("chrome://browser/skin/devtools/metal.jpg"); /* Toolbars */
+  background: #f0f1f2; /* Toolbars */
 }
 
 /* This chevron arrow cannot be replicated easily in CSS, so we are using
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 3767e835946..a92a5477216 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -209,7 +209,6 @@ browser.jar:
 *       skin/classic/browser/devtools/common.css                    (../shared/devtools/common.css)
 *       skin/classic/browser/devtools/dark-theme.css                (../shared/devtools/dark-theme.css)
 *       skin/classic/browser/devtools/light-theme.css               (../shared/devtools/light-theme.css)
-        skin/classic/browser/devtools/metal.jpg                     (../shared/devtools/images/metal.jpg)
         skin/classic/browser/devtools/filters.svg                   (../shared/devtools/filters.svg)
         skin/classic/browser/devtools/controls.png                  (../shared/devtools/images/controls.png)
         skin/classic/browser/devtools/controls@2x.png               (../shared/devtools/images/controls@2x.png)
@@ -558,7 +557,6 @@ browser.jar:
 *       skin/classic/aero/browser/devtools/common.css                (../shared/devtools/common.css)
 *       skin/classic/aero/browser/devtools/dark-theme.css            (../shared/devtools/dark-theme.css)
 *       skin/classic/aero/browser/devtools/light-theme.css           (../shared/devtools/light-theme.css)
-        skin/classic/aero/browser/devtools/metal.jpg                 (../shared/devtools/images/metal.jpg)
         skin/classic/aero/browser/devtools/filters.svg               (../shared/devtools/filters.svg)
         skin/classic/aero/browser/devtools/controls.png              (../shared/devtools/images/controls.png)
         skin/classic/aero/browser/devtools/controls@2x.png           (../shared/devtools/images/controls@2x.png)