From 43ddea6efd0411f45e853b79633b5fa6567e4d31 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 30 Oct 2015 13:59:30 -0500
Subject: [PATCH] Bug 1207976 - Remove /themes from DevTools URLs. r=ochameau

---
 addon-sdk/source/lib/dev/theme.js             |  4 +-
 browser/base/content/browser.xul              |  2 +-
 .../animation-inspector.xhtml                 |  4 +-
 .../client/canvasdebugger/canvasdebugger.xul  |  6 +-
 .../commandline/commandlineoutput.xhtml       |  2 +-
 .../commandline/commandlinetooltip.xhtml      |  2 +-
 devtools/client/debugger/debugger.xul         |  6 +-
 devtools/client/definitions.js                | 36 +++++-----
 devtools/client/eyedropper/eyedropper.xul     |  4 +-
 .../client/fontinspector/font-inspector.xhtml |  4 +-
 .../client/framework/connect/connect.xhtml    |  2 +-
 .../framework/test/browser_toolbox_sidebar.js |  2 +-
 .../test/browser_toolbox_sidebar_events.js    |  2 +-
 .../browser_toolbox_sidebar_existing_tabs.js  |  2 +-
 .../test/browser_toolbox_sidebar_tool.xul     |  4 +-
 devtools/client/framework/toolbox.xul         |  2 +-
 devtools/client/inspector/inspector.xul       |  6 +-
 devtools/client/jsonview/css/search-box.css   |  4 +-
 devtools/client/layoutview/view.xhtml         |  4 +-
 devtools/client/markupview/markup-view.xhtml  |  4 +-
 devtools/client/memory/memory.xhtml           |  6 +-
 devtools/client/netmonitor/netmonitor.xul     |  6 +-
 devtools/client/performance/performance.xul   |  6 +-
 .../chrome/content/projecteditor-loader.js    |  2 +-
 .../chrome/content/projecteditor.xul          |  8 +--
 .../lib/plugins/app-manager/plugin.js         |  2 +-
 .../test/browser_projecteditor_app_options.js | 16 ++---
 devtools/client/projecteditor/test/head.js    |  2 +-
 .../promisedebugger/promise-debugger.xhtml    |  4 +-
 .../responsivedesign-child.js                 |  2 +-
 devtools/client/scratchpad/scratchpad.xul     |  4 +-
 devtools/client/shadereditor/shadereditor.xul |  6 +-
 .../shared/test/browser_tableWidget_basic.js  |  6 +-
 ...rowser_tableWidget_keyboard_interaction.js |  6 +-
 .../browser_tableWidget_mouse_interaction.js  |  6 +-
 .../shared/test/browser_treeWidget_basic.js   |  4 +-
 ...browser_treeWidget_keyboard_interaction.js |  4 +-
 .../browser_treeWidget_mouse_interaction.js   |  4 +-
 .../client/shared/test/doc_options-view.xul   |  4 +-
 devtools/client/shared/theme-switching.js     |  2 +-
 devtools/client/shared/theme.js               |  2 +-
 devtools/client/shared/widgets/Tooltip.js     |  2 +-
 .../client/shared/widgets/VariablesView.xul   |  4 +-
 .../shared/widgets/cubic-bezier-frame.xhtml   |  2 +-
 .../client/shared/widgets/filter-frame.xhtml  |  2 +-
 .../client/shared/widgets/filter-widget.css   |  8 +--
 .../client/shared/widgets/graphs-frame.xhtml  |  4 +-
 .../shared/widgets/mdn-docs-frame.xhtml       |  2 +-
 .../shared/widgets/spectrum-frame.xhtml       |  2 +-
 devtools/client/shared/widgets/spectrum.css   |  6 +-
 .../sourceeditor/codemirror/mozilla.css       | 18 ++---
 devtools/client/sourceeditor/editor.js        |  2 +-
 devtools/client/storage/storage.xul           |  6 +-
 devtools/client/styleeditor/styleeditor.xul   |  8 +--
 .../client/styleinspector/computedview.xhtml  |  4 +-
 .../client/styleinspector/cssruleview.xhtml   |  4 +-
 devtools/client/themes/animationinspector.css |  6 +-
 devtools/client/themes/canvasdebugger.css     |  4 +-
 devtools/client/themes/commandline.inc.css    | 14 ++--
 devtools/client/themes/dark-theme.css         | 16 ++---
 devtools/client/themes/light-theme.css        | 16 ++---
 devtools/client/themes/memory.css             |  4 +-
 devtools/client/themes/netmonitor.css         |  8 +--
 devtools/client/themes/performance.css        |  8 +--
 .../client/themes/responsivedesign.inc.css    | 34 ++++-----
 devtools/client/themes/ruleview.css           | 14 ++--
 devtools/client/themes/shims/common.css       |  2 +-
 devtools/client/themes/storage.css            |  2 +-
 devtools/client/themes/toolbars.css           | 72 +++++++++----------
 devtools/client/themes/webaudioeditor.css     |  4 +-
 devtools/client/themes/webconsole.css         | 10 +--
 devtools/client/themes/widgets.css            | 26 +++----
 .../client/webaudioeditor/webaudioeditor.xul  |  6 +-
 devtools/client/webconsole/webconsole.xul     |  6 +-
 devtools/client/webide/content/logs.xhtml     |  2 +-
 devtools/client/webide/content/webide.xul     |  2 +-
 devtools/client/webide/modules/app-manager.js |  2 +-
 77 files changed, 268 insertions(+), 268 deletions(-)

diff --git a/addon-sdk/source/lib/dev/theme.js b/addon-sdk/source/lib/dev/theme.js
index ed4e5d6f92ff..05930a502c35 100644
--- a/addon-sdk/source/lib/dev/theme.js
+++ b/addon-sdk/source/lib/dev/theme.js
@@ -123,12 +123,12 @@ onDisable.define(Theme, (theme, {window, newTheme}) => {
 
 const LightTheme = Theme({
   name: "theme-light",
-  styles: "chrome://devtools/skin/themes/light-theme.css",
+  styles: "chrome://devtools/skin/light-theme.css",
 });
 
 const DarkTheme = Theme({
   name: "theme-dark",
-  styles: "chrome://devtools/skin/themes/dark-theme.css",
+  styles: "chrome://devtools/skin/dark-theme.css",
 });
 
 exports.LightTheme = LightTheme;
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 419e4617ed84..e9945509d4bf 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -8,7 +8,7 @@
 
 <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
diff --git a/devtools/client/animationinspector/animation-inspector.xhtml b/devtools/client/animationinspector/animation-inspector.xhtml
index 5228b056ec0c..582275af8ee8 100644
--- a/devtools/client/animationinspector/animation-inspector.xhtml
+++ b/devtools/client/animationinspector/animation-inspector.xhtml
@@ -10,8 +10,8 @@
   <head>
     <title>&title;</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/animationinspector.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/animationinspector.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   </head>
   <body class="theme-sidebar devtools-monospace" role="application" empty="true">
diff --git a/devtools/client/canvasdebugger/canvasdebugger.xul b/devtools/client/canvasdebugger/canvasdebugger.xul
index 9806496739b0..8410d8c1ae82 100644
--- a/devtools/client/canvasdebugger/canvasdebugger.xul
+++ b/devtools/client/canvasdebugger/canvasdebugger.xul
@@ -4,9 +4,9 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/canvasdebugger.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/canvasdebugger.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % canvasDebuggerDTD SYSTEM "chrome://browser/locale/devtools/canvasdebugger.dtd">
   %canvasDebuggerDTD;
diff --git a/devtools/client/commandline/commandlineoutput.xhtml b/devtools/client/commandline/commandlineoutput.xhtml
index 0f92c5a9cd08..5d79911c7059 100644
--- a/devtools/client/commandline/commandlineoutput.xhtml
+++ b/devtools/client/commandline/commandlineoutput.xhtml
@@ -10,7 +10,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet" href="chrome://global/skin/global.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/commandline/commandline.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/themes/commandline.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/commandline.css" type="text/css"/>
 </head>
 <body class="gcli-body">
 <div id="gcli-output-root"></div>
diff --git a/devtools/client/commandline/commandlinetooltip.xhtml b/devtools/client/commandline/commandlinetooltip.xhtml
index d3c0f65c2b52..591c874b6463 100644
--- a/devtools/client/commandline/commandlinetooltip.xhtml
+++ b/devtools/client/commandline/commandlinetooltip.xhtml
@@ -10,7 +10,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet" href="chrome://global/skin/global.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/commandline/commandline.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/themes/commandline.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/commandline.css" type="text/css"/>
 </head>
 <body class="gcli-body">
 <div id="gcli-tooltip-root"></div>
diff --git a/devtools/client/debugger/debugger.xul b/devtools/client/debugger/debugger.xul
index 1e57fe5d3df0..0c7b2881c9f3 100644
--- a/devtools/client/debugger/debugger.xul
+++ b/devtools/client/debugger/debugger.xul
@@ -5,9 +5,9 @@
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="debugger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/debugger.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/debugger.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % debuggerDTD SYSTEM "chrome://browser/locale/devtools/debugger.dtd">
   %debuggerDTD;
diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
index 3b33a1716183..2e708d70ae83 100644
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -62,7 +62,7 @@ Tools.options = {
   id: "options",
   ordinal: 0,
   url: "chrome://devtools/content/framework/toolbox-options.xul",
-  icon: "chrome://devtools/skin/themes/images/tool-options.svg",
+  icon: "chrome://devtools/skin/images/tool-options.svg",
   invertIconForLightTheme: true,
   bgTheme: "theme-body",
   label: l10n("options.label", toolboxStrings),
@@ -86,7 +86,7 @@ Tools.inspector = {
   key: l10n("inspector.commandkey", inspectorStrings),
   ordinal: 1,
   modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
-  icon: "chrome://devtools/skin/themes/images/tool-inspector.svg",
+  icon: "chrome://devtools/skin/images/tool-inspector.svg",
   invertIconForLightTheme: true,
   url: "chrome://devtools/content/inspector/inspector.xul",
   label: l10n("inspector.label", inspectorStrings),
@@ -122,7 +122,7 @@ Tools.webConsole = {
   accesskey: l10n("webConsoleCmd.accesskey", webConsoleStrings),
   modifiers: Services.appinfo.OS == "Darwin" ? "accel,alt" : "accel,shift",
   ordinal: 2,
-  icon: "chrome://devtools/skin/themes/images/tool-webconsole.svg",
+  icon: "chrome://devtools/skin/images/tool-webconsole.svg",
   invertIconForLightTheme: true,
   url: "chrome://devtools/content/webconsole/webconsole.xul",
   label: l10n("ToolboxTabWebconsole.label", webConsoleStrings),
@@ -158,9 +158,9 @@ Tools.jsdebugger = {
   accesskey: l10n("debuggerMenu.accesskey", debuggerStrings),
   modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
   ordinal: 3,
-  icon: "chrome://devtools/skin/themes/images/tool-debugger.svg",
+  icon: "chrome://devtools/skin/images/tool-debugger.svg",
   invertIconForLightTheme: true,
-  highlightedicon: "chrome://devtools/skin/themes/images/tool-debugger-paused.svg",
+  highlightedicon: "chrome://devtools/skin/images/tool-debugger-paused.svg",
   url: "chrome://devtools/content/debugger/debugger.xul",
   label: l10n("ToolboxDebugger.label", debuggerStrings),
   panelLabel: l10n("ToolboxDebugger.panelLabel", debuggerStrings),
@@ -186,7 +186,7 @@ Tools.styleEditor = {
   ordinal: 4,
   accesskey: l10n("open.accesskey", styleEditorStrings),
   modifiers: "shift",
-  icon: "chrome://devtools/skin/themes/images/tool-styleeditor.svg",
+  icon: "chrome://devtools/skin/images/tool-styleeditor.svg",
   invertIconForLightTheme: true,
   url: "chrome://devtools/content/styleeditor/styleeditor.xul",
   label: l10n("ToolboxStyleEditor.label", styleEditorStrings),
@@ -211,7 +211,7 @@ Tools.shaderEditor = {
   id: "shadereditor",
   ordinal: 5,
   visibilityswitch: "devtools.shadereditor.enabled",
-  icon: "chrome://devtools/skin/themes/images/tool-shadereditor.svg",
+  icon: "chrome://devtools/skin/images/tool-shadereditor.svg",
   invertIconForLightTheme: true,
   url: "chrome://devtools/content/shadereditor/shadereditor.xul",
   label: l10n("ToolboxShaderEditor.label", shaderEditorStrings),
@@ -231,7 +231,7 @@ Tools.canvasDebugger = {
   id: "canvasdebugger",
   ordinal: 6,
   visibilityswitch: "devtools.canvasdebugger.enabled",
-  icon: "chrome://devtools/skin/themes/images/tool-canvas.svg",
+  icon: "chrome://devtools/skin/images/tool-canvas.svg",
   invertIconForLightTheme: true,
   url: "chrome://devtools/content/canvasdebugger/canvasdebugger.xul",
   label: l10n("ToolboxCanvasDebugger.label", canvasDebuggerStrings),
@@ -252,9 +252,9 @@ Tools.canvasDebugger = {
 Tools.performance = {
   id: "performance",
   ordinal: 7,
-  icon: "chrome://devtools/skin/themes/images/tool-profiler.svg",
+  icon: "chrome://devtools/skin/images/tool-profiler.svg",
   invertIconForLightTheme: true,
-  highlightedicon: "chrome://devtools/skin/themes/images/tool-profiler-active.svg",
+  highlightedicon: "chrome://devtools/skin/images/tool-profiler-active.svg",
   url: "chrome://devtools/content/performance/performance.xul",
   visibilityswitch: "devtools.performance.enabled",
   label: l10n("performance.label", performanceStrings),
@@ -280,9 +280,9 @@ Tools.performance = {
 Tools.memory = {
   id: "memory",
   ordinal: 8,
-  icon: "chrome://devtools/skin/themes/images/tool-memory.svg",
+  icon: "chrome://devtools/skin/images/tool-memory.svg",
   invertIconForLightTheme: true,
-  highlightedicon: "chrome://devtools/skin/themes/images/tool-memory-active.svg",
+  highlightedicon: "chrome://devtools/skin/images/tool-memory-active.svg",
   url: "chrome://devtools/content/memory/memory.xhtml",
   visibilityswitch: "devtools.memory.enabled",
   label: l10n("memory.label", memoryStrings),
@@ -305,7 +305,7 @@ Tools.netMonitor = {
   ordinal: 9,
   modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
   visibilityswitch: "devtools.netmonitor.enabled",
-  icon: "chrome://devtools/skin/themes/images/tool-network.svg",
+  icon: "chrome://devtools/skin/images/tool-network.svg",
   invertIconForLightTheme: true,
   url: "chrome://devtools/content/netmonitor/netmonitor.xul",
   label: l10n("netmonitor.label", netMonitorStrings),
@@ -332,7 +332,7 @@ Tools.storage = {
   accesskey: l10n("storage.accesskey", storageStrings),
   modifiers: "shift",
   visibilityswitch: "devtools.storage.enabled",
-  icon: "chrome://devtools/skin/themes/images/tool-storage.svg",
+  icon: "chrome://devtools/skin/images/tool-storage.svg",
   invertIconForLightTheme: true,
   url: "chrome://devtools/content/storage/storage.xul",
   label: l10n("storage.label", storageStrings),
@@ -359,7 +359,7 @@ Tools.webAudioEditor = {
   id: "webaudioeditor",
   ordinal: 11,
   visibilityswitch: "devtools.webaudioeditor.enabled",
-  icon: "chrome://devtools/skin/themes/images/tool-webaudio.svg",
+  icon: "chrome://devtools/skin/images/tool-webaudio.svg",
   invertIconForLightTheme: true,
   url: "chrome://devtools/content/webaudioeditor/webaudioeditor.xul",
   label: l10n("ToolboxWebAudioEditor1.label", webAudioEditorStrings),
@@ -379,7 +379,7 @@ Tools.scratchpad = {
   id: "scratchpad",
   ordinal: 12,
   visibilityswitch: "devtools.scratchpad.enabled",
-  icon: "chrome://devtools/skin/themes/images/tool-scratchpad.svg",
+  icon: "chrome://devtools/skin/images/tool-scratchpad.svg",
   invertIconForLightTheme: true,
   url: "chrome://devtools/content/scratchpad/scratchpad.xul",
   label: l10n("scratchpad.label", scratchpadStrings),
@@ -419,7 +419,7 @@ Tools.darkTheme = {
   id: "dark",
   label: l10n("options.darkTheme.label", toolboxStrings),
   ordinal: 1,
-  stylesheets: ["chrome://devtools/skin/themes/dark-theme.css"],
+  stylesheets: ["chrome://devtools/skin/dark-theme.css"],
   classList: ["theme-dark"],
 };
 
@@ -427,7 +427,7 @@ Tools.lightTheme = {
   id: "light",
   label: l10n("options.lightTheme.label", toolboxStrings),
   ordinal: 2,
-  stylesheets: ["chrome://devtools/skin/themes/light-theme.css"],
+  stylesheets: ["chrome://devtools/skin/light-theme.css"],
   classList: ["theme-light"],
 };
 
diff --git a/devtools/client/eyedropper/eyedropper.xul b/devtools/client/eyedropper/eyedropper.xul
index 2b6676f2c3f4..b7c70e3b91e3 100644
--- a/devtools/client/eyedropper/eyedropper.xul
+++ b/devtools/client/eyedropper/eyedropper.xul
@@ -6,8 +6,8 @@
 
 <!DOCTYPE window []>
 
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/eyedropper.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css"?>
+<?xml-stylesheet href="chrome://devtools/skin/eyedropper.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <commandset id="eyedropper-commandset">
diff --git a/devtools/client/fontinspector/font-inspector.xhtml b/devtools/client/fontinspector/font-inspector.xhtml
index 86d65ee80620..2dc1298c454b 100644
--- a/devtools/client/fontinspector/font-inspector.xhtml
+++ b/devtools/client/fontinspector/font-inspector.xhtml
@@ -12,8 +12,8 @@
     <title>&title;</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" href="font-inspector.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/font-inspector.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/font-inspector.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   </head>
   <body class="theme-sidebar devtools-monospace" role="application">
diff --git a/devtools/client/framework/connect/connect.xhtml b/devtools/client/framework/connect/connect.xhtml
index 596c30f45600..06b2a567184e 100644
--- a/devtools/client/framework/connect/connect.xhtml
+++ b/devtools/client/framework/connect/connect.xhtml
@@ -12,7 +12,7 @@
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <title>&title;</title>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/dark-theme.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/dark-theme.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/content/framework/connect/connect.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="connect.js"></script>
   </head>
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar.js b/devtools/client/framework/test/browser_toolbox_sidebar.js
index 36b139df71a2..e52a6ef5c0ab 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar.js
@@ -6,7 +6,7 @@ function test() {
   let {ToolSidebar} = require("devtools/client/framework/sidebar");
 
   const toolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                  "<?xml-stylesheet href='chrome://devtools/skin/themes/common.css' type='text/css'?>" +
+                  "<?xml-stylesheet href='chrome://devtools/skin/common.css' type='text/css'?>" +
                   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
                   "<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>" +
                   "<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>" +
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_events.js b/devtools/client/framework/test/browser_toolbox_sidebar_events.js
index bc1d2c0bda49..fedcc1e35e78 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_events.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_events.js
@@ -6,7 +6,7 @@ function test() {
   const { ToolSidebar } = require("devtools/client/framework/sidebar");
 
   const toolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                  "<?xml-stylesheet href='chrome://devtools/skin/themes/common.css' type='text/css'?>" +
+                  "<?xml-stylesheet href='chrome://devtools/skin/common.css' type='text/css'?>" +
                   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
                   "<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>" +
                   "<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>" +
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
index 9d00bfb1c61d..e9b3bff9637b 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
@@ -7,7 +7,7 @@
 const {ToolSidebar} = require("devtools/client/framework/sidebar");
 
 const testToolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                "<?xml-stylesheet href='chrome://devtools/skin/themes/common.css' type='text/css'?>" +
+                "<?xml-stylesheet href='chrome://devtools/skin/common.css' type='text/css'?>" +
                 "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
                 "<hbox flex='1'><description flex='1'>test tool</description>" +
                 "<splitter class='devtools-side-splitter'/>" +
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul b/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
index 59cbe3506d71..7dfb4ea5497e 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
@@ -4,8 +4,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   <box flex="1" class="devtools-responsive-container theme-body">
diff --git a/devtools/client/framework/toolbox.xul b/devtools/client/framework/toolbox.xul
index d84e54d18627..41f5e36966cf 100644
--- a/devtools/client/framework/toolbox.xul
+++ b/devtools/client/framework/toolbox.xul
@@ -3,7 +3,7 @@
    - 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/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
diff --git a/devtools/client/inspector/inspector.xul b/devtools/client/inspector/inspector.xul
index a38fc2cb0c66..5c904b6aa6e1 100644
--- a/devtools/client/inspector/inspector.xul
+++ b/devtools/client/inspector/inspector.xul
@@ -5,9 +5,9 @@
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/inspector/inspector.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/inspector.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/inspector.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/devtools/inspector.dtd" >
    %inspectorDTD;
diff --git a/devtools/client/jsonview/css/search-box.css b/devtools/client/jsonview/css/search-box.css
index 9ef6df99c503..6ed27edde6f1 100644
--- a/devtools/client/jsonview/css/search-box.css
+++ b/devtools/client/jsonview/css/search-box.css
@@ -26,7 +26,7 @@
 .theme-dark .searchBox,
 .theme-light .searchBox {
   border: 1px solid rgb(170, 170, 170);
-  background-image: url("chrome://devtools/skin/themes/images/magnifying-glass-light.png");
+  background-image: url("chrome://devtools/skin/images/magnifying-glass-light.png");
   background-position: 8px center;
   border-radius: 2px;
   padding-left: 25px;
@@ -42,5 +42,5 @@
   background-color: rgba(24, 29, 32, 1);
   color: rgba(184, 200, 217, 1);
   border-color: var(--theme-splitter-color);
-  background-image: url("chrome://devtools/skin/themes/images/magnifying-glass.png");
+  background-image: url("chrome://devtools/skin/images/magnifying-glass.png");
 }
diff --git a/devtools/client/layoutview/view.xhtml b/devtools/client/layoutview/view.xhtml
index 64a3ac8971a2..5f14913fdae9 100644
--- a/devtools/client/layoutview/view.xhtml
+++ b/devtools/client/layoutview/view.xhtml
@@ -17,8 +17,8 @@
 
     <script type="application/javascript;version=1.8" src="view.js"></script>
 
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/layoutview.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/layoutview.css" type="text/css"/>
 
   </head>
   <body class="theme-sidebar devtools-monospace">
diff --git a/devtools/client/markupview/markup-view.xhtml b/devtools/client/markupview/markup-view.xhtml
index e49aa6ab7072..3b8f5a812d7c 100644
--- a/devtools/client/markupview/markup-view.xhtml
+++ b/devtools/client/markupview/markup-view.xhtml
@@ -8,8 +8,8 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet" href="chrome://devtools/content/markupview/markup-view.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/themes/markup-view.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/markup-view.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
 
   <script type="application/javascript;version=1.8"
           src="chrome://devtools/content/shared/theme-switching.js"/>
diff --git a/devtools/client/memory/memory.xhtml b/devtools/client/memory/memory.xhtml
index c79e9ae44cae..41e9b73fa66e 100644
--- a/devtools/client/memory/memory.xhtml
+++ b/devtools/client/memory/memory.xhtml
@@ -11,9 +11,9 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/widgets.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/memory.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/widgets.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/memory.css" type="text/css"/>
 
     <script type="application/javascript;version=1.8"
             src="chrome://devtools/content/shared/theme-switching.js"/>
diff --git a/devtools/client/netmonitor/netmonitor.xul b/devtools/client/netmonitor/netmonitor.xul
index 46506048e189..83d255fd3a4a 100644
--- a/devtools/client/netmonitor/netmonitor.xul
+++ b/devtools/client/netmonitor/netmonitor.xul
@@ -5,9 +5,9 @@
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/netmonitor/netmonitor.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/netmonitor.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/netmonitor.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % netmonitorDTD SYSTEM "chrome://browser/locale/devtools/netmonitor.dtd">
   %netmonitorDTD;
diff --git a/devtools/client/performance/performance.xul b/devtools/client/performance/performance.xul
index badc03d3311c..8e9066afe717 100644
--- a/devtools/client/performance/performance.xul
+++ b/devtools/client/performance/performance.xul
@@ -4,9 +4,9 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/performance.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/performance.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % performanceDTD SYSTEM "chrome://browser/locale/devtools/performance.dtd">
   %performanceDTD;
diff --git a/devtools/client/projecteditor/chrome/content/projecteditor-loader.js b/devtools/client/projecteditor/chrome/content/projecteditor-loader.js
index f3febbc0b08f..b5eca9e73c76 100644
--- a/devtools/client/projecteditor/chrome/content/projecteditor-loader.js
+++ b/devtools/client/projecteditor/chrome/content/projecteditor-loader.js
@@ -8,7 +8,7 @@ const ProjectEditor = require("devtools/client/projecteditor/lib/projecteditor")
 const SAMPLE_PATH = buildTempDirectoryStructure();
 const SAMPLE_NAME = "DevTools Content Application Name";
 const SAMPLE_PROJECT_URL = "data:text/html;charset=utf-8,<body><h1>Project Overview</h1></body>";
-const SAMPLE_ICON = "chrome://devtools/skin/themes/images/tool-debugger.svg";
+const SAMPLE_ICON = "chrome://devtools/skin/images/tool-debugger.svg";
 
 /**
  * Create a workspace for working on projecteditor, available at
diff --git a/devtools/client/projecteditor/chrome/content/projecteditor.xul b/devtools/client/projecteditor/chrome/content/projecteditor.xul
index 509d479413b4..250a0e60c411 100644
--- a/devtools/client/projecteditor/chrome/content/projecteditor.xul
+++ b/devtools/client/projecteditor/chrome/content/projecteditor.xul
@@ -2,12 +2,12 @@
 <!-- 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/. -->
-<?xml-stylesheet href="chrome://devtools/skin/themes/light-theme.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/projecteditor/projecteditor.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/light-theme.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/projecteditor/projecteditor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/debugger/debugger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/markupview/markup-view.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/markup-view.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/markup-view.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
diff --git a/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js b/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js
index 628415b66c11..62ebc2327d13 100644
--- a/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js
+++ b/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js
@@ -5,7 +5,7 @@ const { emit } = require("sdk/event/core");
 const promise = require("promise");
 var { registerPlugin, Plugin } = require("devtools/client/projecteditor/lib/plugins/core");
 const { AppProjectEditor } = require("./app-project-editor");
-const OPTION_URL = "chrome://devtools/skin/themes/images/tool-options.svg";
+const OPTION_URL = "chrome://devtools/skin/images/tool-options.svg";
 const {Services} = Cu.import("resource://gre/modules/Services.jsm");
 const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties");
 
diff --git a/devtools/client/projecteditor/test/browser_projecteditor_app_options.js b/devtools/client/projecteditor/test/browser_projecteditor_app_options.js
index 4e926d1a7c3e..b19bbb15b133 100644
--- a/devtools/client/projecteditor/test/browser_projecteditor_app_options.js
+++ b/devtools/client/projecteditor/test/browser_projecteditor_app_options.js
@@ -20,7 +20,7 @@ add_task(function*() {
   info ("About to set project to: " + TEMP_PATH);
   yield projecteditor.setProjectToAppPath(TEMP_PATH, {
     name: "Test",
-    iconUrl: "chrome://devtools/skin/themes/images/tool-options.svg",
+    iconUrl: "chrome://devtools/skin/images/tool-options.svg",
     projectOverviewURL: SAMPLE_WEBAPP_URL
   });
 
@@ -37,12 +37,12 @@ add_task(function*() {
   let statusElement = header.querySelector(".project-status");
   is (statusElement.getAttribute("status"), "unknown", "The status starts out as unknown.");
   is (nameLabel.textContent, "Test", "The name label has been set correctly");
-  is (image.getAttribute("src"), "chrome://devtools/skin/themes/images/tool-options.svg", "The icon has been set correctly");
+  is (image.getAttribute("src"), "chrome://devtools/skin/images/tool-options.svg", "The icon has been set correctly");
 
   info ("About to set project with new options.");
   yield projecteditor.setProjectToAppPath(TEMP_PATH, {
     name: "Test2",
-    iconUrl: "chrome://devtools/skin/themes/images/tool-inspector.svg",
+    iconUrl: "chrome://devtools/skin/images/tool-inspector.svg",
     projectOverviewURL: SAMPLE_WEBAPP_URL,
     validationStatus: "error"
   });
@@ -50,12 +50,12 @@ add_task(function*() {
   info ("Getting ahold of and validating the project header DOM");
   is (statusElement.getAttribute("status"), "error", "The status has been set correctly.");
   is (nameLabel.textContent, "Test2", "The name label has been set correctly");
-  is (image.getAttribute("src"), "chrome://devtools/skin/themes/images/tool-inspector.svg", "The icon has been set correctly");
+  is (image.getAttribute("src"), "chrome://devtools/skin/images/tool-inspector.svg", "The icon has been set correctly");
 
   info ("About to set project with new options.");
   yield projecteditor.setProjectToAppPath(TEMP_PATH, {
     name: "Test3",
-    iconUrl: "chrome://devtools/skin/themes/images/tool-webconsole.svg",
+    iconUrl: "chrome://devtools/skin/images/tool-webconsole.svg",
     projectOverviewURL: SAMPLE_WEBAPP_URL,
     validationStatus: "warning"
   });
@@ -63,12 +63,12 @@ add_task(function*() {
   info ("Getting ahold of and validating the project header DOM");
   is (statusElement.getAttribute("status"), "warning", "The status has been set correctly.");
   is (nameLabel.textContent, "Test3", "The name label has been set correctly");
-  is (image.getAttribute("src"), "chrome://devtools/skin/themes/images/tool-webconsole.svg", "The icon has been set correctly");
+  is (image.getAttribute("src"), "chrome://devtools/skin/images/tool-webconsole.svg", "The icon has been set correctly");
 
   info ("About to set project with new options.");
   yield projecteditor.setProjectToAppPath(TEMP_PATH, {
     name: "Test4",
-    iconUrl: "chrome://devtools/skin/themes/images/tool-debugger.svg",
+    iconUrl: "chrome://devtools/skin/images/tool-debugger.svg",
     projectOverviewURL: SAMPLE_WEBAPP_URL,
     validationStatus: "valid"
   });
@@ -76,7 +76,7 @@ add_task(function*() {
   info ("Getting ahold of and validating the project header DOM");
   is (statusElement.getAttribute("status"), "valid", "The status has been set correctly.");
   is (nameLabel.textContent, "Test4", "The name label has been set correctly");
-  is (image.getAttribute("src"), "chrome://devtools/skin/themes/images/tool-debugger.svg", "The icon has been set correctly");
+  is (image.getAttribute("src"), "chrome://devtools/skin/images/tool-debugger.svg", "The icon has been set correctly");
 
   info ("Test finished, cleaning up");
   projecteditor.project.off("resource-added", failIfResourceAdded);
diff --git a/devtools/client/projecteditor/test/head.js b/devtools/client/projecteditor/test/head.js
index 3763ec08c0b2..f4bed6b022d7 100644
--- a/devtools/client/projecteditor/test/head.js
+++ b/devtools/client/projecteditor/test/head.js
@@ -97,7 +97,7 @@ function addProjectEditorTabForTempDirectory(opts = {}) {
   }
   let customOpts = {
     name: "Test",
-    iconUrl: "chrome://devtools/skin/themes/images/tool-options.svg",
+    iconUrl: "chrome://devtools/skin/images/tool-options.svg",
     projectOverviewURL: SAMPLE_WEBAPP_URL
   };
 
diff --git a/devtools/client/promisedebugger/promise-debugger.xhtml b/devtools/client/promisedebugger/promise-debugger.xhtml
index 01c48555ba18..3fd6e7811bbd 100644
--- a/devtools/client/promisedebugger/promise-debugger.xhtml
+++ b/devtools/client/promisedebugger/promise-debugger.xhtml
@@ -12,8 +12,8 @@
   <head>
     <title>&title;</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/promisedebugger.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/promisedebugger.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   </head>
   <body class="devtools-monospace" role="application">
diff --git a/devtools/client/responsivedesign/responsivedesign-child.js b/devtools/client/responsivedesign/responsivedesign-child.js
index 7e8ca97ea4e4..cf1ebf0e3244 100644
--- a/devtools/client/responsivedesign/responsivedesign-child.js
+++ b/devtools/client/responsivedesign/responsivedesign-child.js
@@ -4,7 +4,7 @@
 
 var Ci = Components.interfaces;
 const gDeviceSizeWasPageSize = docShell.deviceSizeIsPageSize;
-const gFloatingScrollbarsStylesheet = Services.io.newURI("chrome://devtools/skin/themes/floating-scrollbars.css", null, null);
+const gFloatingScrollbarsStylesheet = Services.io.newURI("chrome://devtools/skin/floating-scrollbars.css", null, null);
 var gRequiresFloatingScrollbars;
 
 var active = false;
diff --git a/devtools/client/scratchpad/scratchpad.xul b/devtools/client/scratchpad/scratchpad.xul
index 70c15c35c7d3..6fb675a9898b 100644
--- a/devtools/client/scratchpad/scratchpad.xul
+++ b/devtools/client/scratchpad/scratchpad.xul
@@ -14,8 +14,8 @@
 ]>
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/scratchpad.css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css"?>
+<?xml-stylesheet href="chrome://devtools/skin/scratchpad.css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
 <window id="main-window"
diff --git a/devtools/client/shadereditor/shadereditor.xul b/devtools/client/shadereditor/shadereditor.xul
index 3d9b7c6d1c83..85b8d91827de 100644
--- a/devtools/client/shadereditor/shadereditor.xul
+++ b/devtools/client/shadereditor/shadereditor.xul
@@ -3,9 +3,9 @@
    - 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/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/shadereditor.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/shadereditor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % debuggerDTD SYSTEM "chrome://browser/locale/devtools/shadereditor.dtd">
diff --git a/devtools/client/shared/test/browser_tableWidget_basic.js b/devtools/client/shared/test/browser_tableWidget_basic.js
index c2ec613c291f..32f484183477 100644
--- a/devtools/client/shared/test/browser_tableWidget_basic.js
+++ b/devtools/client/shared/test/browser_tableWidget_basic.js
@@ -6,9 +6,9 @@
 
 const TEST_URI = "data:text/xml;charset=UTF-8,<?xml version='1.0'?>" +
   "<?xml-stylesheet href='chrome://global/skin/global.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/themes/common.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/themes/light-theme.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/themes/widgets.css'?>" +
+  "<?xml-stylesheet href='chrome://devtools/skin/common.css'?>" +
+  "<?xml-stylesheet href='chrome://devtools/skin/light-theme.css'?>" +
+  "<?xml-stylesheet href='chrome://devtools/skin/widgets.css'?>" +
   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'" +
   " title='Table Widget' width='600' height='500'>" +
   "<box flex='1' class='theme-light'/></window>";
diff --git a/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js b/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
index 25374314f990..5ad63561355b 100644
--- a/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
+++ b/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
@@ -6,9 +6,9 @@
 
 const TEST_URI = "data:text/xml;charset=UTF-8,<?xml version='1.0'?>" +
   "<?xml-stylesheet href='chrome://global/skin/global.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/themes/common.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/themes/light-theme.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/themes/widgets.css'?>" +
+  "<?xml-stylesheet href='chrome://devtools/skin/common.css'?>" +
+  "<?xml-stylesheet href='chrome://devtools/skin/light-theme.css'?>" +
+  "<?xml-stylesheet href='chrome://devtools/skin/widgets.css'?>" +
   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'" +
   " title='Table Widget' width='600' height='500'>" +
   "<box flex='1' class='theme-light'/></window>";
diff --git a/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js b/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
index 877e76bc3ff2..fdc0a52927ab 100644
--- a/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
+++ b/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
@@ -6,9 +6,9 @@
 
 const TEST_URI = "data:text/xml;charset=UTF-8,<?xml version='1.0'?>" +
   "<?xml-stylesheet href='chrome://global/skin/global.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/themes/common.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/themes/light-theme.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/themes/widgets.css'?>" +
+  "<?xml-stylesheet href='chrome://devtools/skin/common.css'?>" +
+  "<?xml-stylesheet href='chrome://devtools/skin/light-theme.css'?>" +
+  "<?xml-stylesheet href='chrome://devtools/skin/widgets.css'?>" +
   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'" +
   " title='Table Widget' width='600' height='500'>" +
   "<box flex='1' class='theme-light'/></window>";
diff --git a/devtools/client/shared/test/browser_treeWidget_basic.js b/devtools/client/shared/test/browser_treeWidget_basic.js
index 26a80e2f57ef..cf58e4926fdf 100644
--- a/devtools/client/shared/test/browser_treeWidget_basic.js
+++ b/devtools/client/shared/test/browser_treeWidget_basic.js
@@ -5,8 +5,8 @@
 // Tests that the tree widget api works fine
 
 const TEST_URI = "data:text/html;charset=utf-8,<head><link rel='stylesheet' " +
-  "type='text/css' href='chrome://devtools/skin/themes/common.css'><link " +
-  "rel='stylesheet' type='text/css' href='chrome://devtools/skin/themes/widg" +
+  "type='text/css' href='chrome://devtools/skin/common.css'><link " +
+  "rel='stylesheet' type='text/css' href='chrome://devtools/skin/widg" +
   "ets.css'></head><body><div></div><span></span></body>";
 const {TreeWidget} = require("devtools/client/shared/widgets/TreeWidget");
 
diff --git a/devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js b/devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js
index a162f8c09fff..be92a3586fd7 100644
--- a/devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js
+++ b/devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js
@@ -5,8 +5,8 @@
 // Tests that keyboard interaction works fine with the tree widget
 
 const TEST_URI = "data:text/html;charset=utf-8,<head><link rel='stylesheet' " +
-  "type='text/css' href='chrome://devtools/skin/themes/common.css'><link " +
-  "rel='stylesheet' type='text/css' href='chrome://devtools/skin/themes/widg" +
+  "type='text/css' href='chrome://devtools/skin/common.css'><link " +
+  "rel='stylesheet' type='text/css' href='chrome://devtools/skin/widg" +
   "ets.css'></head><body><div></div><span></span></body>";
 const {TreeWidget} = require("devtools/client/shared/widgets/TreeWidget");
 const Promise = require("promise");
diff --git a/devtools/client/shared/test/browser_treeWidget_mouse_interaction.js b/devtools/client/shared/test/browser_treeWidget_mouse_interaction.js
index c9fa9d17dfa5..04e41c698ce5 100644
--- a/devtools/client/shared/test/browser_treeWidget_mouse_interaction.js
+++ b/devtools/client/shared/test/browser_treeWidget_mouse_interaction.js
@@ -5,8 +5,8 @@
 // Tests that mouse interaction works fine with tree widget
 
 const TEST_URI = "data:text/html;charset=utf-8,<head><link rel='stylesheet' " +
-  "type='text/css' href='chrome://devtools/skin/themes/common.css'><link " +
-  "rel='stylesheet' type='text/css' href='chrome://devtools/skin/themes/widg" +
+  "type='text/css' href='chrome://devtools/skin/common.css'><link " +
+  "rel='stylesheet' type='text/css' href='chrome://devtools/skin/widg" +
   "ets.css'></head><body><div></div><span></span></body>";
 const {TreeWidget} = require("devtools/client/shared/widgets/TreeWidget");
 const Promise = require("promise");
diff --git a/devtools/client/shared/test/doc_options-view.xul b/devtools/client/shared/test/doc_options-view.xul
index 533cbc5004f9..956ec727f447 100644
--- a/devtools/client/shared/test/doc_options-view.xul
+++ b/devtools/client/shared/test/doc_options-view.xul
@@ -3,8 +3,8 @@
    - 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/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <!DOCTYPE window []>
 
diff --git a/devtools/client/shared/theme-switching.js b/devtools/client/shared/theme-switching.js
index e285545cc449..00ae124577c9 100644
--- a/devtools/client/shared/theme-switching.js
+++ b/devtools/client/shared/theme-switching.js
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 (function() {
-  const DEVTOOLS_SKIN_URL = "chrome://devtools/skin/themes/";
+  const DEVTOOLS_SKIN_URL = "chrome://devtools/skin/";
   let documentElement = document.documentElement;
 
   function forceStyle() {
diff --git a/devtools/client/shared/theme.js b/devtools/client/shared/theme.js
index b065d6d361b6..bcf5e8452927 100644
--- a/devtools/client/shared/theme.js
+++ b/devtools/client/shared/theme.js
@@ -14,7 +14,7 @@ const { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
 loader.lazyRequireGetter(this, "Services");
 loader.lazyImporter(this, "gDevTools", "resource://devtools/client/framework/gDevTools.jsm");
 
-const VARIABLES_URI = "chrome://devtools/skin/themes/variables.css";
+const VARIABLES_URI = "chrome://devtools/skin/variables.css";
 const THEME_SELECTOR_STRINGS = {
   light: ":root.theme-light {",
   dark: ":root.theme-dark {"
diff --git a/devtools/client/shared/widgets/Tooltip.js b/devtools/client/shared/widgets/Tooltip.js
index bb23023f6721..83a82598eab1 100644
--- a/devtools/client/shared/widgets/Tooltip.js
+++ b/devtools/client/shared/widgets/Tooltip.js
@@ -1280,7 +1280,7 @@ EventTooltip.prototype = {
       if (!listener.hide.debugger) {
         let debuggerIcon = doc.createElement("image");
         debuggerIcon.className = "event-tooltip-debugger-icon";
-        debuggerIcon.setAttribute("src", "chrome://devtools/skin/themes/images/tool-debugger.svg");
+        debuggerIcon.setAttribute("src", "chrome://devtools/skin/images/tool-debugger.svg");
         let openInDebugger =
             l10n.strings.GetStringFromName("eventsTooltip.openInDebugger");
         debuggerIcon.setAttribute("tooltiptext", openInDebugger);
diff --git a/devtools/client/shared/widgets/VariablesView.xul b/devtools/client/shared/widgets/VariablesView.xul
index c1b8d8ca5f07..147b25cca176 100644
--- a/devtools/client/shared/widgets/VariablesView.xul
+++ b/devtools/client/shared/widgets/VariablesView.xul
@@ -4,8 +4,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % viewDTD SYSTEM "chrome://browser/locale/devtools/VariablesView.dtd">
   %viewDTD;
diff --git a/devtools/client/shared/widgets/cubic-bezier-frame.xhtml b/devtools/client/shared/widgets/cubic-bezier-frame.xhtml
index 756637378074..eb9caf716974 100644
--- a/devtools/client/shared/widgets/cubic-bezier-frame.xhtml
+++ b/devtools/client/shared/widgets/cubic-bezier-frame.xhtml
@@ -7,7 +7,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/shared/widgets/cubic-bezier.css" type="text/css"/>
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   <style>
diff --git a/devtools/client/shared/widgets/filter-frame.xhtml b/devtools/client/shared/widgets/filter-frame.xhtml
index 76f804249b57..d8003b0cdb5c 100644
--- a/devtools/client/shared/widgets/filter-frame.xhtml
+++ b/devtools/client/shared/widgets/filter-frame.xhtml
@@ -10,7 +10,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" href="chrome://devtools/content/shared/widgets/filter-widget.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"></script>
   </head>
   <body>
diff --git a/devtools/client/shared/widgets/filter-widget.css b/devtools/client/shared/widgets/filter-widget.css
index 7cc02507627b..7ff553d8c151 100644
--- a/devtools/client/shared/widgets/filter-widget.css
+++ b/devtools/client/shared/widgets/filter-widget.css
@@ -195,7 +195,7 @@ html, body {
 .remove-button {
   width: 16px;
   height: 16px;
-  background: url(chrome://devtools/skin/themes/images/close@2x.png);
+  background: url(chrome://devtools/skin/images/close@2x.png);
   background-size: cover;
   font-size: 0;
   border: none;
@@ -231,14 +231,14 @@ html, body {
 }
 
 .add {
-  background: url(chrome://devtools/skin/themes/images/add.svg);
+  background: url(chrome://devtools/skin/images/add.svg);
 }
 
 #toggle-presets {
-  background: url(chrome://devtools/skin/themes/images/pseudo-class.svg#pseudo-class);
+  background: url(chrome://devtools/skin/images/pseudo-class.svg#pseudo-class);
 }
 
 .show-presets #toggle-presets {
-  background: url(chrome://devtools/skin/themes/images/pseudo-class.svg#pseudo-class-checked);
+  background: url(chrome://devtools/skin/images/pseudo-class.svg#pseudo-class-checked);
   filter: none;
 }
diff --git a/devtools/client/shared/widgets/graphs-frame.xhtml b/devtools/client/shared/widgets/graphs-frame.xhtml
index b8d6f752ba0b..6e951982fb09 100644
--- a/devtools/client/shared/widgets/graphs-frame.xhtml
+++ b/devtools/client/shared/widgets/graphs-frame.xhtml
@@ -7,8 +7,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/themes/widgets.css" ype="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/widgets.css" ype="text/css"/>
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   <style>
     body {
diff --git a/devtools/client/shared/widgets/mdn-docs-frame.xhtml b/devtools/client/shared/widgets/mdn-docs-frame.xhtml
index 16d01b44880e..c6784a2817dc 100644
--- a/devtools/client/shared/widgets/mdn-docs-frame.xhtml
+++ b/devtools/client/shared/widgets/mdn-docs-frame.xhtml
@@ -7,7 +7,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/shared/widgets/mdn-docs.css" type="text/css"/>
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
 </head>
diff --git a/devtools/client/shared/widgets/spectrum-frame.xhtml b/devtools/client/shared/widgets/spectrum-frame.xhtml
index c815f0bc3060..c6a4787713f5 100644
--- a/devtools/client/shared/widgets/spectrum-frame.xhtml
+++ b/devtools/client/shared/widgets/spectrum-frame.xhtml
@@ -7,7 +7,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/shared/widgets/spectrum.css" ype="text/css"/>
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   <style>
diff --git a/devtools/client/shared/widgets/spectrum.css b/devtools/client/shared/widgets/spectrum.css
index 711f4a5c0685..eec6213ed8e4 100644
--- a/devtools/client/shared/widgets/spectrum.css
+++ b/devtools/client/shared/widgets/spectrum.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #eyedropper-button {
-  background-image: url("chrome://devtools/skin/themes/images/command-eyedropper.png");
+  background-image: url("chrome://devtools/skin/images/command-eyedropper.png");
   width: 16px;
   height: 16px;
   background-size: 64px 16px;
@@ -15,7 +15,7 @@
 }
 
 .theme-light #eyedropper-button {
-  filter: url(chrome://devtools/skin/themes/images/filters.svg#invert);
+  filter: url(chrome://devtools/skin/images/filters.svg#invert);
   border: 1px solid #AAA;
 }
 
@@ -35,7 +35,7 @@
 
 @media (min-resolution: 1.1dppx) {
   #eyedropper-button {
-    background-image: url("chrome://devtools/skin/themes/images/command-eyedropper@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-eyedropper@2x.png");
   }
 }
 
diff --git a/devtools/client/sourceeditor/codemirror/mozilla.css b/devtools/client/sourceeditor/codemirror/mozilla.css
index 1d4d29094f37..8e050f6124dc 100644
--- a/devtools/client/sourceeditor/codemirror/mozilla.css
+++ b/devtools/client/sourceeditor/codemirror/mozilla.css
@@ -33,18 +33,18 @@
 }
 
 .error {
-  background-image: url("chrome://devtools/skin/themes/images/editor-error.png");
+  background-image: url("chrome://devtools/skin/images/editor-error.png");
   opacity: 0.75;
 }
 
 .breakpoint {
-  background-image: url("chrome://devtools/skin/themes/images/editor-breakpoint.png");
+  background-image: url("chrome://devtools/skin/images/editor-breakpoint.png");
   position: relative;
 }
 
 @media (min-resolution: 1.1dppx) {
   .breakpoint {
-    background-image: url("chrome://devtools/skin/themes/images/editor-breakpoint@2x.png");
+    background-image: url("chrome://devtools/skin/images/editor-breakpoint@2x.png");
   }
 }
 
@@ -53,26 +53,26 @@
 }
 
 .debugLocation {
-  background-image: url("chrome://devtools/skin/themes/images/editor-debug-location.png");
+  background-image: url("chrome://devtools/skin/images/editor-debug-location.png");
 }
 
 @media (min-resolution: 1.1dppx) {
   .debugLocation {
-    background-image: url("chrome://devtools/skin/themes/images/editor-debug-location@2x.png");
+    background-image: url("chrome://devtools/skin/images/editor-debug-location@2x.png");
   }
 }
 
 .breakpoint.debugLocation {
   background-image:
-    url("chrome://devtools/skin/themes/images/editor-debug-location.png"),
-    url("chrome://devtools/skin/themes/images/editor-breakpoint.png");
+    url("chrome://devtools/skin/images/editor-debug-location.png"),
+    url("chrome://devtools/skin/images/editor-breakpoint.png");
 }
 
 @media (min-resolution: 1.1dppx) {
   .breakpoint.debugLocation {
     background-image:
-      url("chrome://devtools/skin/themes/images/editor-debug-location@2x.png"),
-      url("chrome://devtools/skin/themes/images/editor-breakpoint@2x.png");
+      url("chrome://devtools/skin/images/editor-debug-location@2x.png"),
+      url("chrome://devtools/skin/images/editor-breakpoint@2x.png");
   }
 }
 
diff --git a/devtools/client/sourceeditor/editor.js b/devtools/client/sourceeditor/editor.js
index 4e80517a0905..512cf9f8e644 100644
--- a/devtools/client/sourceeditor/editor.js
+++ b/devtools/client/sourceeditor/editor.js
@@ -46,7 +46,7 @@ const { OS } = Services.appinfo;
 // order to initialize a CodeMirror instance.
 
 const CM_STYLES   = [
-  "chrome://devtools/skin/themes/common.css",
+  "chrome://devtools/skin/common.css",
   "chrome://devtools/content/sourceeditor/codemirror/codemirror.css",
   "chrome://devtools/content/sourceeditor/codemirror/dialog/dialog.css",
   "chrome://devtools/content/sourceeditor/codemirror/mozilla.css"
diff --git a/devtools/client/storage/storage.xul b/devtools/client/storage/storage.xul
index 87abee6633ae..07de8eeff718 100644
--- a/devtools/client/storage/storage.xul
+++ b/devtools/client/storage/storage.xul
@@ -4,9 +4,9 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/storage.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/storage.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
diff --git a/devtools/client/styleeditor/styleeditor.xul b/devtools/client/styleeditor/styleeditor.xul
index 43d9a06f72d6..7fe0040cd7d8 100644
--- a/devtools/client/styleeditor/styleeditor.xul
+++ b/devtools/client/styleeditor/styleeditor.xul
@@ -16,11 +16,11 @@
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/splitview.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/splitview.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/splitview.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/styleeditor/styleeditor.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/styleeditor.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/styleeditor.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
 <xul:window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/devtools/client/styleinspector/computedview.xhtml b/devtools/client/styleinspector/computedview.xhtml
index 58d9ada25a5c..24a33653345f 100644
--- a/devtools/client/styleinspector/computedview.xhtml
+++ b/devtools/client/styleinspector/computedview.xhtml
@@ -28,8 +28,8 @@
     <title>&computedViewTitle;</title>
 
     <link rel="stylesheet" href="chrome://global/skin/global.css"  type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css"  type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/computedview.css"  type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/common.css"  type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/computedview.css"  type="text/css"/>
 
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
 
diff --git a/devtools/client/styleinspector/cssruleview.xhtml b/devtools/client/styleinspector/cssruleview.xhtml
index 8a2e45cbdffa..2b325398dab6 100644
--- a/devtools/client/styleinspector/cssruleview.xhtml
+++ b/devtools/client/styleinspector/cssruleview.xhtml
@@ -14,9 +14,9 @@
   <head>
     <title>&ruleViewTitle;</title>
     <link rel="stylesheet" href="chrome://global/skin/global.css"  type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css"  type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/common.css"  type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/content/styleinspector/ruleview.css"  type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/ruleview.css"  type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/ruleview.css"  type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
     <script type="application/javascript;version=1.8">
       window.setPanel = function(panel, iframe) {
diff --git a/devtools/client/themes/animationinspector.css b/devtools/client/themes/animationinspector.css
index b9ecb50b92f1..c6f41d9ae8da 100644
--- a/devtools/client/themes/animationinspector.css
+++ b/devtools/client/themes/animationinspector.css
@@ -122,7 +122,7 @@ body {
 }
 
 #element-picker::before {
-  background-image: url("chrome://devtools/skin/themes/images/command-pick.png");
+  background-image: url("chrome://devtools/skin/images/command-pick.png");
 }
 
 .pause-button::before {
@@ -144,7 +144,7 @@ body {
 
 @media (min-resolution: 1.1dppx) {
   #element-picker::before {
-    background-image: url("chrome://devtools/skin/themes/images/command-pick@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-pick@2x.png");
     background-size: 64px;
   }
 
@@ -397,7 +397,7 @@ body {
 }
 
 .animation-target .node-highlighter {
-  background: url("chrome://devtools/skin/themes/images/vview-open-inspector.png") no-repeat 0 0;
+  background: url("chrome://devtools/skin/images/vview-open-inspector.png") no-repeat 0 0;
   padding-left: 16px;
   margin-right: 5px;
   cursor: pointer;
diff --git a/devtools/client/themes/canvasdebugger.css b/devtools/client/themes/canvasdebugger.css
index 23b47807adbe..6ac07d7c0354 100644
--- a/devtools/client/themes/canvasdebugger.css
+++ b/devtools/client/themes/canvasdebugger.css
@@ -39,11 +39,11 @@
 }
 
 #record-snapshot {
-  list-style-image: url("chrome://devtools/skin/themes/images/profiler-stopwatch.svg");
+  list-style-image: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
 }
 
 #record-snapshot[checked] {
-  list-style-image: url("chrome://devtools/skin/themes/images/profiler-stopwatch-checked.svg");
+  list-style-image: url("chrome://devtools/skin/images/profiler-stopwatch-checked.svg");
 }
 
 /* Snapshots items */
diff --git a/devtools/client/themes/commandline.inc.css b/devtools/client/themes/commandline.inc.css
index f6b609b6e71d..4b0623e3ed47 100644
--- a/devtools/client/themes/commandline.inc.css
+++ b/devtools/client/themes/commandline.inc.css
@@ -52,7 +52,7 @@
 
 :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image,
 :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before  {
-  filter: url("chrome://devtools/skin/themes/images/filters.svg#invert");
+  filter: url("chrome://devtools/skin/images/filters.svg#invert");
 }
 
 .developer-toolbar-button > .toolbarbutton-icon,
@@ -62,7 +62,7 @@
 }
 
 #developer-toolbar-toolbox-button {
-  list-style-image: url("chrome://devtools/skin/themes/images/toggle-tools.png");
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
@@ -84,7 +84,7 @@
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-toolbox-button {
-    list-style-image: url("chrome://devtools/skin/themes/images/toggle-tools@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px);
   }
 
@@ -102,7 +102,7 @@
 }
 
 #developer-toolbar-closebutton {
-  list-style-image: url("chrome://devtools/skin/themes/images/close.png");
+  list-style-image: url("chrome://devtools/skin/images/close.png");
   -moz-appearance: none;
   border: none;
   margin: 0 4px;
@@ -113,7 +113,7 @@
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-closebutton {
-    list-style-image: url("chrome://devtools/skin/themes/images/close@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png");
   }
 }
 
@@ -190,7 +190,7 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://devtools/skin/themes/images/commandline-icon.png");
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
   background-position: 0 center;
   background-size: 32px 16px;
 }
@@ -201,7 +201,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 1.1dppx) {
   .gclitoolbar-input-node::before {
-    background-image: url("chrome://devtools/skin/themes/images/commandline-icon@2x.png");
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png");
   }
 }
 
diff --git a/devtools/client/themes/dark-theme.css b/devtools/client/themes/dark-theme.css
index ee2ad51578df..3bc7134fd85a 100644
--- a/devtools/client/themes/dark-theme.css
+++ b/devtools/client/themes/dark-theme.css
@@ -267,7 +267,7 @@ div.CodeMirror span.eval-text {
   width: 14px;
   height: 14px;
   background-repeat: no-repeat;
-  background-image: url("chrome://devtools/skin/themes/images/controls.png");
+  background-image: url("chrome://devtools/skin/images/controls.png");
   background-size: 56px 28px;
 }
 
@@ -302,7 +302,7 @@ div.CodeMirror span.eval-text {
 
 @media (min-resolution: 1.1dppx) {
   .theme-twisty, .theme-checkbox {
-    background-image: url("chrome://devtools/skin/themes/images/controls@2x.png");
+    background-image: url("chrome://devtools/skin/images/controls@2x.png");
   }
 }
 
@@ -319,34 +319,34 @@ div.CodeMirror span.eval-text {
 /* Overring panel arrow images to fit with our light and dark themes */
 
 .theme-tooltip-panel .panel-arrow[side="top"] {
-  list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-vertical-dark.png");
+  list-style-image: url("chrome://devtools/skin/tooltip/arrow-vertical-dark.png");
   margin-bottom: -4px;
 }
 
 .theme-tooltip-panel .panel-arrow[side="bottom"] {
-  list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-vertical-dark.png");
+  list-style-image: url("chrome://devtools/skin/tooltip/arrow-vertical-dark.png");
   margin-top: -4px;
 }
 
 .theme-tooltip-panel .panel-arrow[side="left"] {
-  list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-horizontal-dark.png");
+  list-style-image: url("chrome://devtools/skin/tooltip/arrow-horizontal-dark.png");
   margin-right: -4px;
 }
 
 .theme-tooltip-panel .panel-arrow[side="right"] {
-  list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-horizontal-dark.png");
+  list-style-image: url("chrome://devtools/skin/tooltip/arrow-horizontal-dark.png");
   margin-left: -4px;
 }
 
 @media (min-resolution: 1.1dppx) {
   .theme-tooltip-panel .panel-arrow[side="top"],
   .theme-tooltip-panel .panel-arrow[side="bottom"] {
-    list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-vertical-dark@2x.png");
+    list-style-image: url("chrome://devtools/skin/tooltip/arrow-vertical-dark@2x.png");
   }
 
   .theme-tooltip-panel .panel-arrow[side="left"],
   .theme-tooltip-panel .panel-arrow[side="right"] {
-    list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-horizontal-dark@2x.png");
+    list-style-image: url("chrome://devtools/skin/tooltip/arrow-horizontal-dark@2x.png");
   }
 }
 
diff --git a/devtools/client/themes/light-theme.css b/devtools/client/themes/light-theme.css
index 7cbe51bfdd35..44ea4db027a8 100644
--- a/devtools/client/themes/light-theme.css
+++ b/devtools/client/themes/light-theme.css
@@ -267,7 +267,7 @@ div.CodeMirror span.eval-text {
   width: 14px;
   height: 14px;
   background-repeat: no-repeat;
-  background-image: url("chrome://devtools/skin/themes/images/controls.png");
+  background-image: url("chrome://devtools/skin/images/controls.png");
   background-size: 56px 28px;
 }
 
@@ -311,7 +311,7 @@ div.CodeMirror span.eval-text {
 
 @media (min-resolution: 1.1dppx) {
   .theme-twisty, .theme-checkbox {
-    background-image: url("chrome://devtools/skin/themes/images/controls@2x.png");
+    background-image: url("chrome://devtools/skin/images/controls@2x.png");
   }
 }
 
@@ -328,34 +328,34 @@ div.CodeMirror span.eval-text {
 /* Overring panel arrow images to fit with our light and dark themes */
 
 .theme-tooltip-panel .panel-arrow[side="top"] {
-  list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-vertical-light.png");
+  list-style-image: url("chrome://devtools/skin/tooltip/arrow-vertical-light.png");
   margin-bottom: -4px;
 }
 
 .theme-tooltip-panel .panel-arrow[side="bottom"] {
-  list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-vertical-light.png");
+  list-style-image: url("chrome://devtools/skin/tooltip/arrow-vertical-light.png");
   margin-top: -4px;
 }
 
 .theme-tooltip-panel .panel-arrow[side="left"] {
-  list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-horizontal-light.png");
+  list-style-image: url("chrome://devtools/skin/tooltip/arrow-horizontal-light.png");
   margin-right: -4px;
 }
 
 .theme-tooltip-panel .panel-arrow[side="right"] {
-  list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-horizontal-light.png");
+  list-style-image: url("chrome://devtools/skin/tooltip/arrow-horizontal-light.png");
   margin-left: -4px;
 }
 
 @media (min-resolution: 1.1dppx) {
   .theme-tooltip-panel .panel-arrow[side="top"],
   .theme-tooltip-panel .panel-arrow[side="bottom"] {
-    list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-vertical-light@2x.png");
+    list-style-image: url("chrome://devtools/skin/tooltip/arrow-vertical-light@2x.png");
   }
 
   .theme-tooltip-panel .panel-arrow[side="left"],
   .theme-tooltip-panel .panel-arrow[side="right"] {
-    list-style-image: url("chrome://devtools/skin/themes/tooltip/arrow-horizontal-light@2x.png");
+    list-style-image: url("chrome://devtools/skin/tooltip/arrow-horizontal-light@2x.png");
   }
 }
 
diff --git a/devtools/client/themes/memory.css b/devtools/client/themes/memory.css
index 27fb351675e4..6d3896c745d7 100644
--- a/devtools/client/themes/memory.css
+++ b/devtools/client/themes/memory.css
@@ -372,7 +372,7 @@ html, body, #app, #memory-tool {
   width: 12px;
   height: 12px;
   max-height: 12px;
-  background-image: url(chrome://devtools/skin/themes/images/webconsole.svg);
+  background-image: url(chrome://devtools/skin/images/webconsole.svg);
   background-size: 72px 60px;
   background-position: -24px -24px;
   background-repeat: no-repeat;
@@ -382,7 +382,7 @@ html, body, #app, #memory-tool {
 }
 
 .theme-light .error::before {
-  background-image: url(chrome://devtools/skin/themes/images/webconsole.svg#light-icons);
+  background-image: url(chrome://devtools/skin/images/webconsole.svg#light-icons);
 }
 
 /**
diff --git a/devtools/client/themes/netmonitor.css b/devtools/client/themes/netmonitor.css
index ed656a75f3af..57555e578323 100644
--- a/devtools/client/themes/netmonitor.css
+++ b/devtools/client/themes/netmonitor.css
@@ -402,7 +402,7 @@ box.requests-menu-status[code^="5"] {
   background: none;
   box-shadow: none;
   border-color: transparent;
-  list-style-image: url("chrome://devtools/skin/themes/images/debugger-collapse.png");
+  list-style-image: url("chrome://devtools/skin/images/debugger-collapse.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -412,7 +412,7 @@ box.requests-menu-status[code^="5"] {
 }
 
 #details-pane-toggle[pane-collapsed] {
-  list-style-image: url("chrome://devtools/skin/themes/images/debugger-expand.png");
+  list-style-image: url("chrome://devtools/skin/images/debugger-expand.png");
 }
 
 #details-pane-toggle:active {
@@ -421,12 +421,12 @@ box.requests-menu-status[code^="5"] {
 
 @media (min-resolution: 1.1dppx) {
   #details-pane-toggle {
-    list-style-image: url("chrome://devtools/skin/themes/images/debugger-collapse@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/debugger-collapse@2x.png");
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
   #details-pane-toggle[pane-collapsed] {
-    list-style-image: url("chrome://devtools/skin/themes/images/debugger-expand@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/debugger-expand@2x.png");
   }
 
   #details-pane-toggle:active {
diff --git a/devtools/client/themes/performance.css b/devtools/client/themes/performance.css
index 432b3f914468..76970b824d5d 100644
--- a/devtools/client/themes/performance.css
+++ b/devtools/client/themes/performance.css
@@ -716,7 +716,7 @@ menuitem.marker-color-graphs-grey:before,
 
 .opt-icon::before {
   content: "";
-  background-image: url(chrome://devtools/skin/themes/images/webconsole.svg);
+  background-image: url(chrome://devtools/skin/images/webconsole.svg);
   background-repeat: no-repeat;
   background-size: 72px 60px;
   /* show grey "i" bubble by default */
@@ -738,7 +738,7 @@ description.opt-icon::before {
   margin: 1px 4px 0px 0px;
 }
 .theme-light .opt-icon::before {
-  background-image: url(chrome://devtools/skin/themes/images/webconsole.svg#light-icons);
+  background-image: url(chrome://devtools/skin/images/webconsole.svg#light-icons);
 }
 .opt-icon[severity=warning]::before {
   background-position: -24px -24px;
@@ -771,7 +771,7 @@ ul.frames-list li.selected {
  */
 menuitem.experimental-option::before {
   content: "";
-  background-image: url(chrome://devtools/skin/themes/images/webconsole.svg);
+  background-image: url(chrome://devtools/skin/images/webconsole.svg);
   background-repeat: no-repeat;
   background-size: 72px 60px;
   width: 12px;
@@ -783,7 +783,7 @@ menuitem.experimental-option::before {
   max-height: 12px;
 }
 .theme-light menuitem.experimental-option::before {
-  background-image: url(chrome://devtools/skin/themes/images/webconsole.svg#light-icons);
+  background-image: url(chrome://devtools/skin/images/webconsole.svg#light-icons);
 }
 
 #performance-options-menupopup:not(.experimental-enabled) .experimental-option,
diff --git a/devtools/client/themes/responsivedesign.inc.css b/devtools/client/themes/responsivedesign.inc.css
index b0a7d3b5bd8d..be90b9d55c39 100644
--- a/devtools/client/themes/responsivedesign.inc.css
+++ b/devtools/client/themes/responsivedesign.inc.css
@@ -111,7 +111,7 @@
   -moz-appearance: none;
   display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://devtools/skin/themes/images/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px;
@@ -137,7 +137,7 @@
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none !important;
-  list-style-image: url("chrome://devtools/skin/themes/images/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;
 }
@@ -148,25 +148,25 @@
 }
 
 .devtools-responsiveui-close {
-  list-style-image: url("chrome://devtools/skin/themes/images/close.png");
+  list-style-image: url("chrome://devtools/skin/images/close.png");
 }
 
 .devtools-responsiveui-rotate {
-  list-style-image: url("chrome://devtools/skin/themes/images/responsivemode/responsiveui-rotate.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate.png");
 }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-close {
-    list-style-image: url("chrome://devtools/skin/themes/images/close@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png");
   }
 
   .devtools-responsiveui-rotate {
-    list-style-image: url("chrome://devtools/skin/themes/images/responsivemode/responsiveui-rotate@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate@2x.png");
   }
 }
 
 .devtools-responsiveui-touch {
-  list-style-image: url("chrome://devtools/skin/themes/images/responsivemode/responsiveui-touch.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -176,7 +176,7 @@
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-touch {
-    list-style-image: url("chrome://devtools/skin/themes/images/responsivemode/responsiveui-touch@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch@2x.png");
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
@@ -186,12 +186,12 @@
 }
 
 .devtools-responsiveui-screenshot {
-  list-style-image: url("chrome://devtools/skin/themes/images/responsivemode/responsiveui-screenshot.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot.png");
 }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-screenshot {
-    list-style-image: url("chrome://devtools/skin/themes/images/responsivemode/responsiveui-screenshot@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot@2x.png");
   }
 }
 
@@ -201,7 +201,7 @@
   cursor: ew-resize;
   transform: translate(12px, -12px);
   background-size: cover;
-  background-image: url("chrome://devtools/skin/themes/images/responsivemode/responsive-vertical-resizer.png");
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer.png");
 }
 
 .devtools-responsiveui-resizebarH {
@@ -210,7 +210,7 @@
   cursor: ns-resize;
   transform: translate(-12px, 12px);
   background-size: cover;
-  background-image: url("chrome://devtools/skin/themes/images/responsivemode/responsive-horizontal-resizer.png");
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer.png");
 }
 
 .devtools-responsiveui-resizehandle {
@@ -219,7 +219,7 @@
   cursor: se-resize;
   transform: translate(12px, 12px);
   background-size: cover;
-  background-image: url("chrome://devtools/skin/themes/images/responsivemode/responsive-se-resizer.png");
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer.png");
 }
 
 /* FxOS custom mode with additional buttons and phone look'n feel */
@@ -267,7 +267,7 @@
   -moz-user-focus: ignore;
   width: 40px;
   height: 30px;
-  list-style-image: url("chrome://devtools/skin/themes/images/responsivemode/responsiveui-home.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-home.png");
 }
 
 .devtools-responsiveui-sleep-button {
@@ -326,14 +326,14 @@
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-resizebarV {
-    background-image: url("chrome://devtools/skin/themes/images/responsivemode/responsive-vertical-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer@2x.png");
   }
 
   .devtools-responsiveui-resizebarH {
-    background-image: url("chrome://devtools/skin/themes/images/responsivemode/responsive-horizontal-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer@2x.png");
   }
 
   .devtools-responsiveui-resizehandle {
-    background-image: url("chrome://devtools/skin/themes/images/responsivemode/responsive-se-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer@2x.png");
   }
 }
diff --git a/devtools/client/themes/ruleview.css b/devtools/client/themes/ruleview.css
index 45238efc7e52..a65d7b8d3698 100644
--- a/devtools/client/themes/ruleview.css
+++ b/devtools/client/themes/ruleview.css
@@ -198,18 +198,18 @@
 }
 
 .ruleview-bezierswatch {
-  background: url("chrome://devtools/skin/themes/images/cubic-bezier-swatch.png");
+  background: url("chrome://devtools/skin/images/cubic-bezier-swatch.png");
   background-size: 1em;
 }
 
 .ruleview-filterswatch {
-  background: url("chrome://devtools/skin/themes/images/filter-swatch.svg");
+  background: url("chrome://devtools/skin/images/filter-swatch.svg");
   background-size: 1em;
 }
 
 @media (min-resolution: 1.1dppx) {
   .ruleview-bezierswatch {
-    background: url("chrome://devtools/skin/themes/images/cubic-bezier-swatch@2x.png");
+    background: url("chrome://devtools/skin/images/cubic-bezier-swatch@2x.png");
     background-size: 1em;
   }
 }
@@ -277,7 +277,7 @@
 }
 
 .ruleview-selectorhighlighter {
-  background: url("chrome://devtools/skin/themes/images/vview-open-inspector.png") no-repeat 0 0;
+  background: url("chrome://devtools/skin/images/vview-open-inspector.png") no-repeat 0 0;
   padding-left: 16px;
   margin-left: 5px;
   cursor: pointer;
@@ -293,16 +293,16 @@
 }
 
 #ruleview-add-rule-button::before {
-  background-image: url("chrome://devtools/skin/themes/images/add.svg");
+  background-image: url("chrome://devtools/skin/images/add.svg");
   background-size: cover;
 }
 
 #pseudo-class-panel-toggle::before {
-  background-image: url("chrome://devtools/skin/themes/images/pseudo-class.svg#pseudo-class");
+  background-image: url("chrome://devtools/skin/images/pseudo-class.svg#pseudo-class");
   background-size: cover;
 }
 #pseudo-class-panel-toggle[checked]::before {
-  background-image: url("chrome://devtools/skin/themes/images/pseudo-class.svg#pseudo-class-checked");
+  background-image: url("chrome://devtools/skin/images/pseudo-class.svg#pseudo-class-checked");
   filter: none !important;
 }
 
diff --git a/devtools/client/themes/shims/common.css b/devtools/client/themes/shims/common.css
index ebbcac92bcdf..fb6a8fe1cabf 100644
--- a/devtools/client/themes/shims/common.css
+++ b/devtools/client/themes/shims/common.css
@@ -7,4 +7,4 @@
   * specific path.
   */
 
-@import url("chrome://devtools/skin/themes/common.css");
+@import url("chrome://devtools/skin/common.css");
diff --git a/devtools/client/themes/storage.css b/devtools/client/themes/storage.css
index c4f397c6ff17..118b32204279 100644
--- a/devtools/client/themes/storage.css
+++ b/devtools/client/themes/storage.css
@@ -15,7 +15,7 @@
 }
 
 #storage-tree .tree-widget-item[type="store"]:after {
-  background-image: url(chrome://devtools/skin/themes/images/filetypes/store.svg);
+  background-image: url(chrome://devtools/skin/images/filetypes/store.svg);
   background-size: 18px 18px;
   background-position: -1px 0;
 }
diff --git a/devtools/client/themes/toolbars.css b/devtools/client/themes/toolbars.css
index 8e31d8fd7abd..334a1ac658fa 100644
--- a/devtools/client/themes/toolbars.css
+++ b/devtools/client/themes/toolbars.css
@@ -139,7 +139,7 @@
 .devtools-menulist > .menulist-dropmarker {
   -moz-appearance: none;
   display: -moz-box;
-  list-style-image: url("chrome://devtools/skin/themes/images/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   min-width: 16px;
 }
@@ -147,7 +147,7 @@
 .devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none !important;
-  list-style-image: url("chrome://devtools/skin/themes/images/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;
 }
@@ -227,7 +227,7 @@
 
 .devtools-option-toolbarbutton {
   -moz-appearance: none;
-  list-style-image: url("chrome://devtools/skin/themes/images/tool-options.svg");
+  list-style-image: url("chrome://devtools/skin/images/tool-options.svg");
   background: none;
   opacity: .8;
   border: none;
@@ -434,15 +434,15 @@
 }
 
 .theme-dark .devtools-searchinput-clear {
-  background-image: url("chrome://devtools/skin/themes/images/search-clear-dark.svg");
+  background-image: url("chrome://devtools/skin/images/search-clear-dark.svg");
 }
 
 .theme-light .devtools-searchinput-clear {
-  background-image: url("chrome://devtools/skin/themes/images/search-clear-light.svg");
+  background-image: url("chrome://devtools/skin/images/search-clear-light.svg");
 }
 
 .devtools-style-searchbox-no-match + .devtools-searchinput-clear {
-  background-image: url("chrome://devtools/skin/themes/images/search-clear-failed.svg") !important;
+  background-image: url("chrome://devtools/skin/images/search-clear-failed.svg") !important;
 }
 
 .devtools-searchinput-clear:hover {
@@ -450,12 +450,12 @@
 }
 
 .theme-dark .devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
-  list-style-image: url("chrome://devtools/skin/themes/images/search-clear-dark.svg");
+  list-style-image: url("chrome://devtools/skin/images/search-clear-dark.svg");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .theme-light .devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
-  list-style-image: url("chrome://devtools/skin/themes/images/search-clear-light.svg");
+  list-style-image: url("chrome://devtools/skin/images/search-clear-light.svg");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
@@ -493,7 +493,7 @@
   height: 16px;
   -moz-appearance: none;
   background-size: 16px 16px;
-  background-image: url("chrome://devtools/skin/themes/images/close@2x.png");
+  background-image: url("chrome://devtools/skin/images/close@2x.png");
   background-position: center center;
   background-repeat: no-repeat;
 }
@@ -634,15 +634,15 @@
 }
 
 #toolbox-dock-bottom > image {
-  background-image: url("chrome://devtools/skin/themes/images/dock-bottom@2x.png");
+  background-image: url("chrome://devtools/skin/images/dock-bottom@2x.png");
 }
 
 #toolbox-dock-side  > image {
-  background-image: url("chrome://devtools/skin/themes/images/dock-side@2x.png");
+  background-image: url("chrome://devtools/skin/images/dock-side@2x.png");
 }
 
 #toolbox-dock-window > image {
-  background-image: url("chrome://devtools/skin/themes/images/undock@2x.png");
+  background-image: url("chrome://devtools/skin/images/undock@2x.png");
 }
 
 #toolbox-dock-bottom-minimize {
@@ -652,11 +652,11 @@
 }
 
 #toolbox-dock-bottom-minimize > image {
-  background-image: url("chrome://devtools/skin/themes/images/dock-bottom-minimize@2x.png");
+  background-image: url("chrome://devtools/skin/images/dock-bottom-minimize@2x.png");
 }
 
 #toolbox-dock-bottom-minimize.minimized > image {
-  background-image: url("chrome://devtools/skin/themes/images/dock-bottom-maximize@2x.png");
+  background-image: url("chrome://devtools/skin/images/dock-bottom-maximize@2x.png");
 }
 
 #toolbox-dock-window,
@@ -731,93 +731,93 @@
 }
 
 #command-button-paintflashing > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-paintflashing.png");
+  background-image: url("chrome://devtools/skin/images/command-paintflashing.png");
 }
 
 #command-button-screenshot > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-screenshot.png");
+  background-image: url("chrome://devtools/skin/images/command-screenshot.png");
 }
 
 #command-button-responsive > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-responsivemode.png");
+  background-image: url("chrome://devtools/skin/images/command-responsivemode.png");
 }
 
 #command-button-tilt > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-tilt.png");
+  background-image: url("chrome://devtools/skin/images/command-tilt.png");
 }
 
 #command-button-scratchpad > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-scratchpad.png");
+  background-image: url("chrome://devtools/skin/images/command-scratchpad.png");
   background-size: 48px 16px;
 }
 
 #command-button-pick > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-pick.png");
+  background-image: url("chrome://devtools/skin/images/command-pick.png");
 }
 
 #command-button-frames > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-frames.png");
+  background-image: url("chrome://devtools/skin/images/command-frames.png");
 }
 
 #command-button-splitconsole > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-console.png");
+  background-image: url("chrome://devtools/skin/images/command-console.png");
 }
 
 #command-button-eyedropper > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-eyedropper.png");
+  background-image: url("chrome://devtools/skin/images/command-eyedropper.png");
 }
 
 #command-button-rulers > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-rulers.png");
+  background-image: url("chrome://devtools/skin/images/command-rulers.png");
 }
 
 #command-button-measure > image {
-  background-image: url("chrome://devtools/skin/themes/images/command-measure.png");
+  background-image: url("chrome://devtools/skin/images/command-measure.png");
 }
 
 @media (min-resolution: 1.1dppx) {
   #command-button-paintflashing > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-paintflashing@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-paintflashing@2x.png");
   }
 
   #command-button-screenshot > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-screenshot@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-screenshot@2x.png");
   }
 
   #command-button-responsive > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-responsivemode@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-responsivemode@2x.png");
   }
 
   #command-button-tilt > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-tilt@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-tilt@2x.png");
   }
 
   #command-button-scratchpad > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-scratchpad@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-scratchpad@2x.png");
   }
 
   #command-button-pick > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-pick@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-pick@2x.png");
   }
 
   #command-button-frames > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-frames@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-frames@2x.png");
   }
 
   #command-button-splitconsole > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-console@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-console@2x.png");
   }
 
   #command-button-eyedropper > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-eyedropper@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-eyedropper@2x.png");
   }
 
   #command-button-rulers > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-rulers@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-rulers@2x.png");
   }
 
   #command-button-measure > image {
-    background-image: url("chrome://devtools/skin/themes/images/command-measure@2x.png");
+    background-image: url("chrome://devtools/skin/images/command-measure@2x.png");
   }
 }
 
diff --git a/devtools/client/themes/webaudioeditor.css b/devtools/client/themes/webaudioeditor.css
index dfb178660a0a..a3aebfade85f 100644
--- a/devtools/client/themes/webaudioeditor.css
+++ b/devtools/client/themes/webaudioeditor.css
@@ -79,10 +79,10 @@ g.edgeLabel tspan {
  */
 
 .theme-light .nodes g.bypassed rect {
-  fill: url(chrome://devtools/skin/themes/images/filters.svg#bypass-light);
+  fill: url(chrome://devtools/skin/images/filters.svg#bypass-light);
 }
 .theme-dark .nodes g.bypassed rect {
-  fill: url(chrome://devtools/skin/themes/images/filters.svg#bypass-dark);
+  fill: url(chrome://devtools/skin/images/filters.svg#bypass-dark);
 }
 .nodes g.bypassed.selected rect {
   stroke: var(--theme-selection-background);
diff --git a/devtools/client/themes/webconsole.css b/devtools/client/themes/webconsole.css
index 3d15055464c3..c691d09b5b0a 100644
--- a/devtools/client/themes/webconsole.css
+++ b/devtools/client/themes/webconsole.css
@@ -44,7 +44,7 @@ a {
 
 .message > .icon::before {
   content: "";
-  background-image: url(chrome://devtools/skin/themes/images/webconsole.svg);
+  background-image: url(chrome://devtools/skin/images/webconsole.svg);
   background-position: 12px 12px;
   background-repeat: no-repeat;
   background-size: 72px 60px;
@@ -54,7 +54,7 @@ a {
 }
 
 .theme-light .message > .icon::before {
-  background-image: url(chrome://devtools/skin/themes/images/webconsole.svg#light-icons);
+  background-image: url(chrome://devtools/skin/images/webconsole.svg#light-icons);
 }
 
 .message > .message-body-wrapper {
@@ -383,7 +383,7 @@ a {
   /* Always allow scrolling on input - it auto expands in js by setting height,
      but don't want it to get bigger than the window. 24px = toolbar height. */
   max-height: calc(90vh - 24px);
-  background-image: -moz-image-rect(url("chrome://devtools/skin/themes/images/commandline-icon.png"), 0, 32, 16, 16);
+  background-image: -moz-image-rect(url("chrome://devtools/skin/images/commandline-icon.png"), 0, 32, 16, 16);
   background-repeat: no-repeat;
   background-size: 16px 16px;
   color: var(--theme-content-color1);
@@ -391,7 +391,7 @@ a {
 
 @media (min-resolution: 1.1dppx) {
   .jsterm-input-node {
-    background-image: -moz-image-rect(url('chrome://devtools/skin/themes/images/commandline-icon@2x.png'), 0, 64, 32, 32);
+    background-image: -moz-image-rect(url('chrome://devtools/skin/images/commandline-icon@2x.png'), 0, 64, 32, 32);
   }
 }
 
@@ -519,7 +519,7 @@ a {
 
 /* Open DOMNode in inspector button */
 .open-inspector {
-  background: url("chrome://devtools/skin/themes/images/vview-open-inspector.png") no-repeat 0 0;
+  background: url("chrome://devtools/skin/images/vview-open-inspector.png") no-repeat 0 0;
   padding-left: 16px;
   margin-left: 5px;
   cursor: pointer;
diff --git a/devtools/client/themes/widgets.css b/devtools/client/themes/widgets.css
index 0e0c7a90d33f..a6c4fd4fe515 100644
--- a/devtools/client/themes/widgets.css
+++ b/devtools/client/themes/widgets.css
@@ -641,7 +641,7 @@
 }
 
 .variable-or-property-non-writable-icon {
-  background: url("chrome://devtools/skin/themes/images/vview-lock.png") no-repeat;
+  background: url("chrome://devtools/skin/images/vview-lock.png") no-repeat;
   background-size: cover;
   width: 16px;
   height: 16px;
@@ -649,7 +649,7 @@
 
 @media (min-resolution: 1.1dppx) {
   .variable-or-property-non-writable-icon {
-    background-image: url("chrome://devtools/skin/themes/images/vview-lock@2x.png");
+    background-image: url("chrome://devtools/skin/images/vview-lock@2x.png");
   }
 }
 
@@ -741,7 +741,7 @@
 /* Variables and properties editing */
 
 .variables-view-delete {
-  background: url("chrome://devtools/skin/themes/images/vview-delete.png");
+  background: url("chrome://devtools/skin/images/vview-delete.png");
   background-size: cover;
   width: 16px;
   height: 16px;
@@ -749,7 +749,7 @@
 
 @media (min-resolution: 1.1dppx) {
   .variables-view-delete {
-    background-image: url("chrome://devtools/skin/themes/images/vview-delete@2x.png");
+    background-image: url("chrome://devtools/skin/images/vview-delete@2x.png");
   }
 }
 
@@ -766,7 +766,7 @@
 }
 
 .variables-view-edit {
-  background: url("chrome://devtools/skin/themes/images/vview-edit.png");
+  background: url("chrome://devtools/skin/images/vview-edit.png");
   background-size: cover;
   width: 16px;
   height: 16px;
@@ -775,7 +775,7 @@
 
 @media (min-resolution: 1.1dppx) {
   .variables-view-edit {
-    background-image: url("chrome://devtools/skin/themes/images/vview-edit@2x.png");
+    background-image: url("chrome://devtools/skin/images/vview-edit@2x.png");
   }
 }
 
@@ -792,7 +792,7 @@
 }
 
 .variables-view-open-inspector {
-  background: url("chrome://devtools/skin/themes/images/vview-open-inspector.png");
+  background: url("chrome://devtools/skin/images/vview-open-inspector.png");
   background-size: cover;
   width: 16px;
   height: 16px;
@@ -801,7 +801,7 @@
 
 @media (min-resolution: 1.1dppx) {
   .variables-view-open-inspector {
-    background-image: url("chrome://devtools/skin/themes/images/vview-open-inspector@2x.png");
+    background-image: url("chrome://devtools/skin/images/vview-open-inspector@2x.png");
   }
 }
 
@@ -1374,7 +1374,7 @@
   float: left;
   margin: 3px 2px -3px;
   background-repeat: no-repeat;
-  background-image: url("chrome://devtools/skin/themes/images/controls.png");
+  background-image: url("chrome://devtools/skin/images/controls.png");
   background-size: 56px 28px;
   cursor: pointer;
   background-position: -28px -14px;
@@ -1432,7 +1432,7 @@
 
 @media (min-resolution: 1.1dppx) {
   .tree-widget-item:before {
-    background-image: url("chrome://devtools/skin/themes/images/controls@2x.png");
+    background-image: url("chrome://devtools/skin/images/controls@2x.png");
   }
 }
 
@@ -1502,18 +1502,18 @@
 }
 
 .tree-widget-item[type="dir"]::after {
-  background-image: url(chrome://devtools/skin/themes/images/filetypes/dir-close.svg);
+  background-image: url(chrome://devtools/skin/images/filetypes/dir-close.svg);
   background-position: 2px 0;
   background-size: auto 16px;
   width: 20px;
 }
 
 .tree-widget-item[type="dir"][expanded]:not([empty])::after {
-  background-image: url(chrome://devtools/skin/themes/images/filetypes/dir-open.svg);
+  background-image: url(chrome://devtools/skin/images/filetypes/dir-open.svg);
 }
 
 .tree-widget-item[type="url"]::after {
-  background-image: url(chrome://devtools/skin/themes/images/filetypes/globe.svg);
+  background-image: url(chrome://devtools/skin/images/filetypes/globe.svg);
   background-size: auto 18px;
   width: 18px;
 }
diff --git a/devtools/client/webaudioeditor/webaudioeditor.xul b/devtools/client/webaudioeditor/webaudioeditor.xul
index 4b6ecdcd1a6a..e9670c989f2a 100644
--- a/devtools/client/webaudioeditor/webaudioeditor.xul
+++ b/devtools/client/webaudioeditor/webaudioeditor.xul
@@ -4,9 +4,9 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/webaudioeditor.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/webaudioeditor.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % debuggerDTD SYSTEM "chrome://browser/locale/devtools/webaudioeditor.dtd">
   %debuggerDTD;
diff --git a/devtools/client/webconsole/webconsole.xul b/devtools/client/webconsole/webconsole.xul
index b657d2ada72a..332a50d09ade 100644
--- a/devtools/client/webconsole/webconsole.xul
+++ b/devtools/client/webconsole/webconsole.xul
@@ -7,11 +7,11 @@
 %webConsoleDTD;
 ]>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css"
+<?xml-stylesheet href="chrome://devtools/skin/common.css"
                  type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/widgets.css"
+<?xml-stylesheet href="chrome://devtools/skin/widgets.css"
                  type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/webconsole.css"
+<?xml-stylesheet href="chrome://devtools/skin/webconsole.css"
                  type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/devtools/client/webide/content/logs.xhtml b/devtools/client/webide/content/logs.xhtml
index 692a9b125894..0d4436a383b6 100644
--- a/devtools/client/webide/content/logs.xhtml
+++ b/devtools/client/webide/content/logs.xhtml
@@ -13,7 +13,7 @@
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/logs.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"></script>
     <script type="application/javascript;version=1.8" src="logs.js"></script>
diff --git a/devtools/client/webide/content/webide.xul b/devtools/client/webide/content/webide.xul
index 86c358793782..17c464cb40b4 100644
--- a/devtools/client/webide/content/webide.xul
+++ b/devtools/client/webide/content/webide.xul
@@ -12,7 +12,7 @@
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://devtools/skin/themes/common.css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css"?>
 <?xml-stylesheet href="chrome://webide/skin/webide.css"?>
 
 <window id="webide" onclose="return UI.canCloseProject();"
diff --git a/devtools/client/webide/modules/app-manager.js b/devtools/client/webide/modules/app-manager.js
index 264b3b334865..7e3beab9556b 100644
--- a/devtools/client/webide/modules/app-manager.js
+++ b/devtools/client/webide/modules/app-manager.js
@@ -29,7 +29,7 @@ const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/
 
 var AppManager = exports.AppManager = {
 
-  DEFAULT_PROJECT_ICON: "chrome://devtools/skin/themes/webide/default-app-icon.png",
+  DEFAULT_PROJECT_ICON: "chrome://devtools/skin/webide/default-app-icon.png",
   DEFAULT_PROJECT_NAME: "--",
 
   _initialized: false,