Base import of Tycho code (warning: huge commit)

105 files changed, 215 insertions, 3405 deletions

diff --git a/browser/themes/linux/Makefile.in b/browser/themes/linux/Makefile.in
index 353289fb2..3b81bbf31 100644
--- a/browser/themes/linux/Makefile.in
+++ b/browser/themes/linux/Makefile.in
@@ -2,15 +2,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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 ICON_FILES := icon.png
 ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 INSTALL_TARGETS += ICON
 
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 8fd26344a..79437b819 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1203,6 +1203,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
 .popup-notification-icon[popupid="addon-progress"],
 .popup-notification-icon[popupid="addon-install-cancelled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
+.popup-notification-icon[popupid="addon-install-origin-blocked"],
 .popup-notification-icon[popupid="addon-install-failed"],
 .popup-notification-icon[popupid="addon-install-complete"] {
   list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
@@ -2119,7 +2120,6 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 
 %ifdef MOZ_DEVTOOLS
 %include ../shared/devtools/responsivedesign.inc.css
-%include ../shared/devtools/highlighter.inc.css
 %include ../shared/devtools/commandline.inc.css
 %endif
 %include ../shared/plugin-doorhanger.inc.css
diff --git a/browser/themes/linux/communicator/moz.build b/browser/themes/linux/communicator/moz.build
index 895d11993..c97072bba 100644
--- a/browser/themes/linux/communicator/moz.build
+++ b/browser/themes/linux/communicator/moz.build
@@ -4,3 +4,4 @@
 # 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/.
 
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/browser/themes/linux/devtools/alerticon-warning.png b/browser/themes/linux/devtools/alerticon-warning.png
deleted file mode 100644
index 5c5d0aec5..000000000
--- a/browser/themes/linux/devtools/alerticon-warning.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/arrow-e.png b/browser/themes/linux/devtools/arrow-e.png
deleted file mode 100644
index 09691bc5e..000000000
--- a/browser/themes/linux/devtools/arrow-e.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/background-noise-toolbar.png b/browser/themes/linux/devtools/background-noise-toolbar.png
deleted file mode 100644
index d09ba9daf..000000000
--- a/browser/themes/linux/devtools/background-noise-toolbar.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs-scrollbutton.png b/browser/themes/linux/devtools/breadcrumbs-scrollbutton.png
deleted file mode 100644
index 722438060..000000000
--- a/browser/themes/linux/devtools/breadcrumbs-scrollbutton.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end-pressed.png
deleted file mode 100644
index 1b0fcf986..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-end-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected-pressed.png
deleted file mode 100644
index c7c2f39ab..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected.png
deleted file mode 100644
index c7c2f39ab..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end.png
deleted file mode 100644
index 2a65f402a..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-end.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle-pressed.png
deleted file mode 100644
index 1d2611dda..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected-pressed.png
deleted file mode 100644
index d2b7f8dae..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected.png
deleted file mode 100644
index 2311685f8..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle.png
deleted file mode 100644
index a99e9fabe..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-middle.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start-pressed.png
deleted file mode 100644
index 30c2c2946..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-start-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected-pressed.png
deleted file mode 100644
index a5bc6124e..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected.png
deleted file mode 100644
index a08fb902d..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start.png
deleted file mode 100644
index b8a43b58c..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/ltr-start.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end-pressed.png
deleted file mode 100644
index 4c57d76f1..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-end-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected-pressed.png
deleted file mode 100644
index cd2f0a5e8..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected.png
deleted file mode 100644
index cd2f0a5e8..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end.png
deleted file mode 100644
index ea9bc3255..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-end.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle-pressed.png
deleted file mode 100644
index d6a8a4385..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected-pressed.png
deleted file mode 100644
index 61bbcb134..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected.png
deleted file mode 100644
index 066c34528..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle.png
deleted file mode 100644
index cb87d62b2..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-middle.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start-pressed.png
deleted file mode 100644
index 155f6380b..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-start-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected-pressed.png
deleted file mode 100644
index dab115328..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected-pressed.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected.png
deleted file mode 100644
index a520e8088..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start.png
deleted file mode 100644
index 86912e066..000000000
--- a/browser/themes/linux/devtools/breadcrumbs/rtl-start.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/canvasdebugger.css b/browser/themes/linux/devtools/canvasdebugger.css
new file mode 100644
index 000000000..504c3fb9b
--- /dev/null
+++ b/browser/themes/linux/devtools/canvasdebugger.css
@@ -0,0 +1,5 @@
+/* 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/. */
+
+%include ../../shared/devtools/canvasdebugger.inc.css
diff --git a/browser/themes/linux/devtools/checkbox-dark.png b/browser/themes/linux/devtools/checkbox-dark.png
deleted file mode 100644
index e937b600b..000000000
--- a/browser/themes/linux/devtools/checkbox-dark.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/checkbox-light.png b/browser/themes/linux/devtools/checkbox-light.png
deleted file mode 100644
index 00d6d450c..000000000
--- a/browser/themes/linux/devtools/checkbox-light.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/close.png b/browser/themes/linux/devtools/close.png
deleted file mode 100644
index b53941253..000000000
--- a/browser/themes/linux/devtools/close.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/command-paintflashing.png b/browser/themes/linux/devtools/command-paintflashing.png
deleted file mode 100644
index b785131a2..000000000
--- a/browser/themes/linux/devtools/command-paintflashing.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/command-responsivemode.png b/browser/themes/linux/devtools/command-responsivemode.png
deleted file mode 100644
index cbfa59904..000000000
--- a/browser/themes/linux/devtools/command-responsivemode.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/command-scratchpad.png b/browser/themes/linux/devtools/command-scratchpad.png
deleted file mode 100644
index 5131ca5cb..000000000
--- a/browser/themes/linux/devtools/command-scratchpad.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/command-tilt.png b/browser/themes/linux/devtools/command-tilt.png
deleted file mode 100644
index f816bba59..000000000
--- a/browser/themes/linux/devtools/command-tilt.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/commandline-icon.png b/browser/themes/linux/devtools/commandline-icon.png
deleted file mode 100644
index e120a3926..000000000
--- a/browser/themes/linux/devtools/commandline-icon.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/commandline.css b/browser/themes/linux/devtools/commandline.css
index 7eee7eb5c..06d7512ae 100644
--- a/browser/themes/linux/devtools/commandline.css
+++ b/browser/themes/linux/devtools/commandline.css
@@ -120,12 +120,13 @@
   color: hsl(210,30%,75%);
 }
 
-.gcli-menu-option:hover {
+.gcli-menu-name:hover,
+.gcli-menu-desc:hover {
   background-color: hsla(0,0%,0%,.3);
 }
 
 .gcli-menu-highlight,
-.gcli-menu-highlight.gcli-menu-option:hover {
+.gcli-menu-highlight:hover {
   background-color: hsla(0,100%,100%,.1);
 }
 
@@ -135,7 +136,7 @@
 
 .gcli-menu-more {
   font-size: 80%;
-  text-align: right;
+  text-align: end;
   -moz-padding-end: 8px;
 }
 
diff --git a/browser/themes/linux/devtools/commandline.png b/browser/themes/linux/devtools/commandline.png
deleted file mode 100644
index 6726f2820..000000000
--- a/browser/themes/linux/devtools/commandline.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/common.css b/browser/themes/linux/devtools/common.css
deleted file mode 100644
index 86771c1a8..000000000
--- a/browser/themes/linux/devtools/common.css
+++ /dev/null
@@ -1,356 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Font for code */
-
-:root {
-  font: message-box;
-}
-
-.devtools-monospace {
-  font-family: monospace;
-  font-size: 85%;
-}
-
-/* Toolbar and Toolbar items */
-
-.devtools-toolbar {
-  -moz-appearance: none;
-  padding: 4px 3px;
-  color: hsl(210,30%,85%);
-  background-image: url(background-noise-toolbar.png), linear-gradient(#3e4750, #3e4750);
-  border-bottom: 1px solid #060a0d;
-  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset, -1px 0 0 hsla(204,45%,98%,.05) inset, 0 -1px 0 hsla(204,45%,98%,.05) inset;
-}
-
-.devtools-menulist,
-.devtools-toolbarbutton {
-  -moz-appearance: none;
-  -moz-box-align: center;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  border: 1px solid hsla(210,8%,5%,.45);
-  border-radius: 3px;
-  background: linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
-  margin: 0 3px;
-  color: inherit;
-}
-
-.devtools-toolbarbutton > .toolbarbutton-menubutton-button {
-  -moz-box-orient: horizontal;
-}
-
-.devtools-menulist:-moz-focusring,
-.devtools-toolbarbutton:-moz-focusring {
-  outline: 1px dotted hsla(210,30%,85%,0.7);
-  outline-offset: -4px;
-}
-
-.devtools-toolbarbutton:not([label]) {
-  min-width: 32px;
-}
-
-.devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
-  display: none;
-}
-
-.devtools-toolbarbutton:not([checked=true]):hover:active {
-  border-color: hsla(210,8%,5%,.6);
-  background: linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
-  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-.devtools-menulist[open=true],
-.devtools-toolbarbutton[open=true],
-.devtools-toolbarbutton[checked=true] {
-  border-color: hsla(210,8%,5%,.6) !important;
-  background: linear-gradient(hsla(220,6%,10%,.6), hsla(210,11%,18%,.45) 75%, hsla(210,11%,30%,.4));
-  box-shadow: 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-.devtools-toolbarbutton[checked=true] {
-  color: hsl(208,100%,60%) !important;
-}
-
-.devtools-toolbarbutton[checked=true]:hover {
-  background-color: transparent !important;
-}
-
-.devtools-toolbarbutton[checked=true]:hover:active {
-  background-color: hsla(210,8%,5%,.2) !important;
-}
-
-.devtools-option-toolbarbutton {
-  -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/devtools/option-icon.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-  background: none;
-  border: none;
-}
-
-.devtools-option-toolbarbutton[open=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-.devtools-menulist > .menulist-label-box {
-  text-align: center;
-}
-
-.devtools-menulist > .menulist-dropmarker {
-  -moz-appearance: none;
-  display: -moz-box;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
-  -moz-box-align: center;
-  min-width: 16px;
-}
-
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
-  -moz-appearance: none;
-  color: inherit;
-  border-width: 0;
-  -moz-border-end: 1px solid hsla(210,8%,5%,.45);
-  box-shadow: -1px 0 0 hsla(210,16%,76%,.15) inset, 1px 0 0 hsla(210,16%,76%,.15);
-}
-
-.devtools-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
-  box-shadow: 1px 0 0 hsla(210,16%,76%,.15) inset, -1px 0 0 hsla(210,16%,76%,.15);
-}
-
-.devtools-toolbarbutton[type=menu-button] {
-  padding: 0 1px;
-  -moz-box-align: stretch;
-}
-
-.devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-  -moz-appearance: none !important;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
-  -moz-box-align: center;
-  padding: 0 3px;
-}
-
-/* Text input */
-
-.devtools-textinput,
-.devtools-searchinput {
-  -moz-appearance: none;
-  margin: 0 3px;
-  min-height: 22px;
-  border: 1px solid hsla(210,8%,5%,.6);
-  border-radius: 2px;
-  background-color: transparent;
-  background-image: linear-gradient(hsla(210,16%,76%,.15), hsla(210,16%,76%,.35));
-  padding: 3px;
-  box-shadow: 0 1px 1px hsla(210,8%,5%,.3) inset,
-              0 0 0 1px hsla(210,16%,76%,.1) inset,
-              0 1px 0 hsla(210,16%,76%,.15);
-  color: inherit;
-}
-
-.devtools-searchinput {
-  padding-top: 0;
-  padding-bottom: 0;
-  -moz-padding-start: 18px;
-  -moz-padding-end: 12px;
-  background-image: url(magnifying-glass.png), linear-gradient(hsla(210,16%,76%,.15), hsla(210,16%,76%,.35));
-  background-position: 4px center, top left, top left;
-  background-repeat: no-repeat;
-  font-size: inherit;
-}
-
-.devtools-searchinput:-moz-locale-dir(rtl) {
-  background-position: calc(100% - 4px) center, top left, top left;
-}
-
-.devtools-searchinput > .textbox-input-box > .textbox-search-icons {
-  display: none;
-}
-
-.devtools-searchinput > .textbox-input-box > .textbox-input::-moz-placeholder {
-  color: hsl(208,10%,66%);
-  opacity: 1.0;
-}
-
-.devtools-no-search-result {
-  box-shadow: inset 0 0 0 1px hsla(0,68%,6%,.35);
-  border-color: hsl(10,70%,40%) hsl(10,75%,37%) hsl(10,80%,35%) !important;
-  background-image: url(magnifying-glass.png), linear-gradient(hsla(1,16%,76%,.45), hsla(1,16%,76%,.75));
-}
-
-/* Close button */
-
-.devtools-closebutton {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
-  -moz-appearance: none;
-  border: none;
-  margin: 0 4px;
-  min-width: 16px;
-  width: 16px;
-  opacity: 0.6;
-}
-
-.devtools-closebutton > .toolbarbutton-icon {
-  /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must
-     use evil CSS to give the impression of smaller content */
-  margin: -4px;
-}
-
-.devtools-closebutton > .toolbarbutton-text {
-  display: none;
-}
-
-.devtools-closebutton:hover {
-  opacity: 0.8;
-}
-
-.devtools-closebutton:hover:active {
-  opacity: 1;
-}
-
-/* Splitters */
-
-.devtools-horizontal-splitter {
-  -moz-appearance: none;
-  border-top: 1px solid black;
-  border-bottom-width: 0;
-  min-height: 3px;
-  height: 3px;
-  margin-bottom: -3px;
-  position: relative;
-}
-
-.devtools-side-splitter {
-  -moz-appearance: none;
-  border: 0;
-  -moz-border-start: 1px solid black;
-  min-width: 0;
-  width: 3px;
-  background-color: transparent;
-  -moz-margin-end: -3px;
-  position: relative;
-  cursor: e-resize;
-}
-
-/* In-tools sidebar */
-
-.devtools-toolbox-side-iframe {
-  min-width: 465px;
-}
-
-.devtools-sidebar-tabs {
-  -moz-appearance: none;
-  margin: 0;
-}
-
-.devtools-sidebar-tabs > tabpanels {
-  -moz-appearance: none;
-  padding: 0;
-  border: 0;
-}
-
-.devtools-sidebar-tabs > tabs {
-  -moz-appearance: none;
-  position: static;
-  color: hsl(210,30%,85%);
-  margin-bottom: 0;
-  padding: 0;
-  background-image: url(background-noise-toolbar.png), linear-gradient(#3e4750, #3e4750);
-  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset, -1px 0 0 hsla(204,45%,98%,.05) inset, 0 -1px 0 hsla(204,45%,98%,.05) inset;
-  border-width: 0 0 1px 0;
-  border-color: hsla(210,8%,5%,.6);
-  border-style: solid;
-  overflow: hidden;
-}
-
-.devtools-sidebar-tabs > tabs > .tabs-right,
-.devtools-sidebar-tabs > tabs > .tabs-left {
-  display: none;
-}
-
-.devtools-sidebar-tabs > tabs > tab {
-  -moz-appearance: none;
-  /* We want to match the height of a toolbar with a toolbarbutton
-   * First, we need to replicated the padding of toolbar (4px),
-   * then, the padding of the button itself from toolbarbutton.css (3px),
-   * Also, we need to take the border of the buttons into accout (1px).
-   * Padding-bottom is one pixel shorter because we need to include the
-   * black border.
-   */
-  padding: 8px 3px 7px;
-  -moz-padding-start: 6px;
-  margin: 0;
-  min-width: 78px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  text-align: center;
-  color: inherit;
-  -moz-box-flex: 1;
-  border-width: 0;
-  background: transparent;
-  border-radius: 0;
-  position: static;
-  -moz-margin-start: -1px;
-}
-
-.devtools-sidebar-tabs > tabs > tab:first-of-type {
-  -moz-margin-start: -3px;
-}
-
-.devtools-sidebar-tabs > tabs > tab {
-  background-size: 100% 100%, 1px 100%, 1px 100%, 1px 100%;
-  background-repeat: no-repeat;
-  background-position: 2px, 0, 1px, 2px;
-}
-
-.devtools-sidebar-tabs:-moz-locale-dir(rtl) > tabs > tab {
-  background-position: calc(100% - 3px), 100%, calc(100% - 1px), calc(100% - 2px);
-}
-
-%filter substitution
-%define smallSeparator linear-gradient(hsla(204,45%,98%,0), hsla(204,45%,98%,.1), hsla(204,45%,98%,0)), linear-gradient(hsla(206,37%,4%,0), hsla(206,37%,4%,.6), hsla(206,37%,4%,0)), linear-gradient(hsla(204,45%,98%,0), hsla(204,45%,98%,.1), hsla(204,45%,98%,0))
-%define solidSeparator linear-gradient(transparent, transparent), linear-gradient(hsla(206,37%,4%,.6), hsla(206,37%,4%,.7)), linear-gradient(hsla(204,45%,98%,.1), hsla(204,45%,98%,.1))
-
-.devtools-sidebar-tabs > tabs > tab {
-  background-image: linear-gradient(transparent, transparent), @smallSeparator@;
-}
-
-.devtools-sidebar-tabs > tabs > tab:hover {
-  background-image: linear-gradient(hsla(206,37%,4%,.2), hsla(206,37%,4%,.2)), @smallSeparator@;
-}
-
-.devtools-sidebar-tabs > tabs > tab:hover:active {
-  background-image: linear-gradient(hsla(206,37%,4%,.4), hsla(206,37%,4%,.4)), @smallSeparator@;
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true] + tab {
-  background-image: linear-gradient(transparent, transparent), @solidSeparator@;
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true] + tab:hover {
-  background-image: linear-gradient(hsla(206,37%,4%,.2), hsla(206,37%,4%,.2)), @solidSeparator@;
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true] + tab:hover:active {
-  background-image: linear-gradient(hsla(206,37%,4%,.4), hsla(206,37%,4%,.4)), @solidSeparator@;
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true] {
-  color: #f5f7fa;
-  background-image: linear-gradient(#2f607b, #294d68), @solidSeparator@;
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.1) inset, 0 -2px 0 hsla(206,37%,4%,.05) inset, 0 -1px 1px hsla(206,37%,4%,.1) inset;
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true]:hover {
-  background-image: linear-gradient(#274f64, #224056), @solidSeparator@;
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, 0 -2px 0 hsla(206,37%,4%,.05) inset, 0 -1px 1px hsla(206,37%,4%,.1) inset;
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true]:hover:active {
-  background-image: linear-gradient(#1f3e4f, #1b3243), @solidSeparator@;
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, 0 -2px 0 hsla(206,37%,4%,.05) inset, 0 -1px 1px hsla(206,37%,4%,.1) inset;
-}
-
-%include ../../shared/devtools/common.inc.css
diff --git a/browser/themes/linux/devtools/computedview.css b/browser/themes/linux/devtools/computedview.css
deleted file mode 100644
index 299c606ec..000000000
--- a/browser/themes/linux/devtools/computedview.css
+++ /dev/null
@@ -1,151 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-* {
-  box-sizing: border-box;
-}
-
-:root {
-  height: 100%;
-}
-
-body {
-  margin: 0;
-  display : flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-#propertyContainer {
-  -moz-user-select: text;
-  overflow: auto;
-  min-height: 0;
-  flex: 1;
-}
-
-.property-view-hidden,
-.property-content-hidden {
-  display: none;
-}
-
-.property-view {
-  clear: both;
-  padding: 2px 0 2px 17px;
-}
-
-.property-view > * {
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.property-name {
-  width: 50%;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.property-value {
-  width: 50%;
-  max-width: 100%;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  background-image: url(arrow-e.png);
-  background-repeat: no-repeat;
-  background-size: 5px 8px;
-  background-position: 2px center;
-  padding-left: 10px;
-}
-
-.other-property-value {
-  background-image: url(arrow-e.png);
-  background-repeat: no-repeat;
-  background-size: 5px 8px;
-  background-position: left center;
-  padding-left: 8px;
-}
-
-@media (min-width: 400px) {
-  .property-name {
-    width: 200px;
-  }
-  .property-value {
-    width: auto;
-  }
-}
-
-.property-content {
-  padding-left: 17px;
-}
-
-/* From skin */
-.expander {
-  visibility: hidden;
-  margin-left: -12px!important;
-}
-
-.expander[open] {
-  margin-left: -17px!important;
-}
-
-.expandable {
-  visibility: visible;
-}
-
-.match {
-  visibility: hidden;
-}
-
-.matchedselectors > p {
-  clear: both;
-  margin: 0 2px 0 0;
-  padding: 2px;
-  overflow-x: hidden;
-  border-style: dotted;
-  border-color: rgba(128,128,128,0.4);
-  border-width: 1px 1px 0 1px;
-}
-
-.matchedselectors > p:last-of-type {
-  border-bottom-width: 1px;
-}
-
-/* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */
-.rule-text {
-  direction: ltr;
-}
-
-.matched {
-  text-decoration: line-through;
-}
-
-.parentmatch {
-  opacity: 0.5;
-}
-
-#noResults {
-  font-size: 110%;
-  margin: 5px;
-  text-align: center;
-}
-
-.onlyuserstyles {
-  cursor: pointer;
-}
-
-.legendKey {
-  margin: 0 5px;
-}
-
-.devtools-toolbar {
-  width: 100%;
-}
-
-.link {
-  padding: 0 3px;
-  cursor: pointer;
-  float: right;
-}
diff --git a/browser/themes/linux/devtools/dark-theme.css b/browser/themes/linux/devtools/dark-theme.css
deleted file mode 100644
index 97189572d..000000000
--- a/browser/themes/linux/devtools/dark-theme.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* According to:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
- */
-.theme-body {
-  background: #131c26;
-  color: #8fa1b2
-}
-
-.theme-twisty {
-  cursor: pointer;
-  margin-right: 5px;
-}
-
-.theme-twisty:-moz-focusring {
-  outline-style: none;
-}
-
-.theme-twisty:not([open]) {
-  width: 0;
-  height: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid rgba(255,255,255,0.5);
-  margin-left: 5px;
-}
-
-.theme-twisty[open] {
-  width: 10px;
-  height: 10px;
-  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(255,255,255,0.5) 68%);
-}
-
-.theme-checkbox {
-  display: inline-block;
-  border: 0;
-  width: 14px;
-  height: 14px;
-  padding: 0;
-  outline: none;
-  background: url("chrome://browser/skin/devtools/checkbox-dark.png") no-repeat;
-}
-
-.theme-checkbox[checked] {
-  background: url("chrome://browser/skin/devtools/checkbox-dark.png") 14px 0;
-}
-
-.theme-selected {
-  background: #26384E;
-}
-
-.theme-bg-darker {
-  background-color: rgba(0,0,0,0.1);
-}
-
-.theme-link { /* blue */
-  color: #3689b2;
-}
-
-.theme-comment { /* grey */
-  color: #5c6773;
-}
-
-.theme-gutter {
-  background-color: #0f171f;
-  color: #667380;
-  border-color: #303b47;
-}
-
-.theme-separator { /* grey */
-  border-color: #303b47;
-}
-
-.theme-fg-color1 { /* green */
-  color: #5c9966;
-}
-
-.theme-fg-color2 { /* blue */
-  color: #3689b2;
-}
-
-.theme-fg-color3 { /* pink/lavender */
-  color: #a673bf;
-}
-
-.theme-fg-color4 { /* purple/violet */
-  color: #6270b2;
-}
-
-.theme-fg-color5 { /* Yellow */
-  color: #a18650;
-}
-
-.theme-fg-color6 { /* Orange */
-  color: #b26b47;
-}
-
-.theme-fg-color7 { /* Red */
-  color: #bf5656;
-}
diff --git a/browser/themes/linux/devtools/debugger-collapse.png b/browser/themes/linux/devtools/debugger-collapse.png
deleted file mode 100644
index cde5299b7..000000000
--- a/browser/themes/linux/devtools/debugger-collapse.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/debugger-expand.png b/browser/themes/linux/devtools/debugger-expand.png
deleted file mode 100644
index ee8012ff3..000000000
--- a/browser/themes/linux/devtools/debugger-expand.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/debugger-pause.png b/browser/themes/linux/devtools/debugger-pause.png
deleted file mode 100644
index 7f908bf8b..000000000
--- a/browser/themes/linux/devtools/debugger-pause.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/debugger-play.png b/browser/themes/linux/devtools/debugger-play.png
deleted file mode 100644
index 91719826a..000000000
--- a/browser/themes/linux/devtools/debugger-play.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/debugger-step-in.png b/browser/themes/linux/devtools/debugger-step-in.png
deleted file mode 100644
index c80ee72a2..000000000
--- a/browser/themes/linux/devtools/debugger-step-in.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/debugger-step-out.png b/browser/themes/linux/devtools/debugger-step-out.png
deleted file mode 100644
index 1a7145a98..000000000
--- a/browser/themes/linux/devtools/debugger-step-out.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/debugger-step-over.png b/browser/themes/linux/devtools/debugger-step-over.png
deleted file mode 100644
index 7c9b82ad4..000000000
--- a/browser/themes/linux/devtools/debugger-step-over.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css
index 2887d3913..7b0bd5fc4 100644
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -1,316 +1,5 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#body {
-  background: #fff;
-}
-
-/* Sources and breakpoints pane */
-
-#sources-pane {
-  min-width: 50px;
-}
-
-#sources-pane + .devtools-side-splitter {
-  -moz-border-start-color: transparent;
-}
-
-/* ListWidget items */
-
-.list-widget-item {
-  padding: 2px;
-}
-
-.list-widget-item:not(.selected):not(.empty):hover {
-  background: linear-gradient(rgba(255,255,255,0.9), rgba(255,255,255,0.85)), Highlight;
-}
-
-.list-widget-item.selected.light {
-  background: linear-gradient(rgba(255,255,255,0.85), rgba(255,255,255,0.8)), Highlight;
-  color: #000;
-}
-
-.list-widget-item.selected {
-  background: Highlight;
-  color: HighlightText;
-}
-
-.list-widget-item.empty {
-  color: GrayText;
-  padding: 2px;
-}
-
-/* Stack frames view */
-
-.dbg-stackframe-details {
-  -moz-padding-start: 4px;
-}
-
-.dbg-stackframe-menuitem[checked] {
-  margin-top: 3px;
-  margin-bottom: 3px;
-  outline: 1px solid #eee;
-  font-weight: 600;
-}
-
-.dbg-stackframe-menuitem-details {
-  -moz-padding-start: 16px;
-}
-
-/* Sources and breakpoints view */
-
-.dbg-breakpoint {
-  font-family: monospace;
-}
-
-.dbg-breakpoint-line {
-  font-weight: 600;
-}
-
-.dbg-breakpoint-text {
-  -moz-margin-start: 10px !important;
-  font-style: italic;
-}
-
-/* Watch expressions view */
-
-#expressions {
-  min-height: 10px;
-  max-height: 125px;
-}
-
-.dbg-expression {
-  height: 20px;
-}
-
-.dbg-expression-arrow {
-  width: 16px;
-  height: auto;
-  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
-}
-
-.dbg-expression-input {
-  -moz-padding-start: 2px !important;
-  font-family: Menlo, Monaco, monospace;
-}
-
-/* Searchbox and the search operations help panel */
-
-.devtools-searchinput {
-  min-width: 220px;
-  -moz-margin-start: 1px;
-}
-
-#searchbox-panel-description {
-  margin-top: 0;
-  margin-bottom: 8px;
-  -moz-margin-start: 2px;
-}
-
-.searchbox-panel-operator-button {
-  min-width: 26px;
-  margin-top: 0;
-  margin-bottom: 0;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 6px;
-  text-align: center;
-  font-family: Menlo, Monaco, monospace;
-}
-
-.searchbox-panel-operator-label {
-  padding-bottom: 2px;
-}
-
-/* Searchbox results panel */
-
-.results-panel {
-  padding: 4px;
-  opacity: 0.9;
-}
-
-.results-panel-item {
-  background: #f4f4f4;
-  border: 1px solid #ddd;
-  border-top-color: #fff;
-  padding: 5px;
-  cursor: pointer;
-}
-
-.results-panel-item:first-of-type {
-  border-top-color: #ddd;
-  border-radius: 4px 4px 0 0;
-}
-
-.results-panel-item:last-of-type {
-  border-radius: 0 0 4px 4px;
-}
-
-.results-panel-item:only-of-type {
-  border-radius: 4px;
-}
-
-.results-panel-item:not(.selected):not(:hover) {
-  text-shadow: 0 1px #fff;
-}
-
-.results-panel-item-pre {
-  -moz-margin-end: 5px !important;
-  color: #444;
-  cursor: inherit;
-}
-
-.results-panel-item-name {
-  color: #111;
-  font-weight: 600;
-  cursor: inherit;
-}
-
-.results-panel-item-details {
-  color: #7f7f7f;
-  cursor: inherit;
-}
-
-/* Sources search view */
-
-#globalsearch {
-  min-height: 10px;
-  box-shadow: inset 0 -4px 8px #eee;
-  background: url(background-noise-toolbar.png);
-}
-
-#globalsearch > vbox:not(:empty) {
-  min-height: 10px;
-  max-height: 125px;
-}
-
-#globalsearch + .devtools-horizontal-splitter {
-  -moz-border-top-colors: #bfbfbf;
-}
-
-.dbg-source-results {
-  padding: 0;
-  background: none !important;
-}
-
-.dbg-results-header {
-  -moz-padding-start: 6px;
-}
-
-.dbg-results-header-location {
-  font-weight: 600;
-}
-
-.dbg-results-header-match-count {
-  -moz-padding-start: 6px;
-  color: GrayText;
-}
-
-.dbg-results-line-number {
-  background: #e2e2e2;
-  min-width: 40px;
-  -moz-border-end: 1px solid #b4c4d3;
-  -moz-padding-end: 4px;
-  padding-top: 2px;
-  text-align: end;
-  font-family: monospace;
-  color: #8c8c8c;
-}
-
-.dbg-results-line-contents {
-  -moz-padding-start: 4px;
-  padding-top: 1px;
-  padding-bottom: 1px;
-  font-family: monospace;
-}
-
-.dbg-results-line-contents-string {
-  padding: 1px;
-}
-
-.dbg-results-line-contents-string[match=true] {
-  background: rgba(255,255,0,0.5);
-  padding: 0;
-  border: 1px solid #aaa;
-  border-radius: 4px;
-  cursor: pointer;
-}
-
-.dbg-results-line-contents-string[match=true][focusing] {
-  transition: transform 0.3s ease-in-out;
-}
-
-.dbg-results-line-contents-string[match=true][focused] {
-  transition-duration: 0.1s;
-  transform: scale(1.75, 1.75);
-}
-
-/* Toolbar Controls */
-
-#resumption-panel-desc {
-  width: 200px;
-}
-
-#resumption-order-panel {
-  -moz-margin-start: -8px;
-}
-
-#resume {
-  list-style-image: url("chrome://browser/skin/devtools/debugger-play.png");
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#resume[checked] {
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
-
-#step-over {
-  list-style-image: url("chrome://browser/skin/devtools/debugger-step-over.png");
-}
-
-#step-in {
-  list-style-image: url("chrome://browser/skin/devtools/debugger-step-in.png");
-}
-
-#step-out {
-  list-style-image: url("chrome://browser/skin/devtools/debugger-step-out.png");
-}
-
-#debugger-controls > toolbarbutton {
-  margin: 0;
-  box-shadow: none;
-  border-radius: 0;
-  border-width: 0;
-  -moz-border-end-width: 1px;
-  outline-offset: -3px;
-}
-
-#debugger-controls > toolbarbutton:last-of-type {
-  -moz-border-end-width: 0;
-}
-
-#debugger-controls {
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset,
-              0 0 0 1px hsla(210,16%,76%,.15) inset,
-              0 1px 0 hsla(210,16%,76%,.15);
-  border: 1px solid hsla(210,8%,5%,.45);
-  border-radius: 3px;
-  margin: 0 3px;
-}
-
-#instruments-pane-toggle {
-  background: none;
-  box-shadow: none;
-  border: none;
-  list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png");
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#instruments-pane-toggle[pane-collapsed] {
-  list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
-}
-
-#instruments-pane-toggle:active {
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
+%include ../../shared/devtools/debugger.inc.css
diff --git a/browser/themes/linux/devtools/dock-bottom.png b/browser/themes/linux/devtools/dock-bottom.png
deleted file mode 100644
index 8fa9c932b..000000000
--- a/browser/themes/linux/devtools/dock-bottom.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/dock-side.png b/browser/themes/linux/devtools/dock-side.png
deleted file mode 100644
index 1c1235513..000000000
--- a/browser/themes/linux/devtools/dock-side.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/dropmarker.png b/browser/themes/linux/devtools/dropmarker.png
deleted file mode 100644
index 7e91860fb..000000000
--- a/browser/themes/linux/devtools/dropmarker.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/font-inspector.css b/browser/themes/linux/devtools/font-inspector.css
deleted file mode 100644
index dff3abb30..000000000
--- a/browser/themes/linux/devtools/font-inspector.css
+++ /dev/null
@@ -1,80 +0,0 @@
-* {
-  box-sizing: border-box;
-}
-
-body {
-  margin: 0;
-  padding-bottom: 20px;
-}
-
-#all-fonts {
-  padding: 0 5px;
-  margin: 0;
-}
-
-#showall {
-  border-radius: 0;
-  border: 1px solid black;
-  margin: 3px;
-  cursor: pointer;
-  position: fixed;
-  bottom: 0;
-  right: 0;
-}
-
-.font {
-  padding: 10px 5px;
-  font-size: 0;
-}
-
-.theme-dark .font {
-  border-bottom: 1px solid #444;
-}
-
-.theme-light .font {
-  border-bottom: 1px solid #DDD;
-}
-
-.font:last-of-type {
-  border-bottom: 0;
-}
-
-.theme-light .font:nth-child(even) {
-  background: #F4F4F4;
-}
-
-.font-preview {
-  height: 60px;
-  width: 100%;
-  border: 0;
-  display: block;
-}
-
-.font-info {
-  font-size: 1rem;
-  display: block;
-}
-
-.font-name {
-  display: inline;
-}
-
-.font-css-code {
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 5px;
-}
-
-.theme-light .font-css-code,
-.theme-light .font-url {
-  border: 1px solid #CCC;
-  background: white;
-}
-
-.theme-dark .font-css-code,
-.theme-dark .font-url {
-  border: 1px solid #333;
-  background: black;
-  color: white;
-}
diff --git a/browser/themes/linux/devtools/inspect-button.png b/browser/themes/linux/devtools/inspect-button.png
deleted file mode 100644
index ebfd9586d..000000000
--- a/browser/themes/linux/devtools/inspect-button.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/inspector.css b/browser/themes/linux/devtools/inspector.css
deleted file mode 100644
index caad427ad..000000000
--- a/browser/themes/linux/devtools/inspector.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#inspector-inspect-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#inspector-inspect-toolbutton[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#inspector-searchbox {
-  transition-property: max-width, -moz-padding-end, -moz-padding-start;
-  transition-duration: 250ms;
-  transition-timing-function: ease;
-}
-
-#inspector-searchbox:not([focused]):not([filled]) > .textbox-input-box {
-  overflow: hidden;
-}
-
-#inspector-searchbox:not([focused]):not([filled]) {
-  max-width: 20px !important;
-  -moz-padding-end: 5px;
-  -moz-padding-start: 22px;
-  background-position: 8px center, top left, top left;
-}
-
-#inspector-searchbox[focused],
-#inspector-searchbox[filled] {
-  max-width: 200px !important;
-}
diff --git a/browser/themes/linux/devtools/itemArrow-ltr.png b/browser/themes/linux/devtools/itemArrow-ltr.png
deleted file mode 100644
index 6cc3e984b..000000000
--- a/browser/themes/linux/devtools/itemArrow-ltr.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/itemArrow-rtl.png b/browser/themes/linux/devtools/itemArrow-rtl.png
deleted file mode 100644
index 0f8f4b1b0..000000000
--- a/browser/themes/linux/devtools/itemArrow-rtl.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/itemToggle.png b/browser/themes/linux/devtools/itemToggle.png
deleted file mode 100644
index cf70394e6..000000000
--- a/browser/themes/linux/devtools/itemToggle.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/layout-background-grid.png b/browser/themes/linux/devtools/layout-background-grid.png
deleted file mode 100644
index 87b0b855d..000000000
--- a/browser/themes/linux/devtools/layout-background-grid.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/layoutview.css b/browser/themes/linux/devtools/layoutview.css
deleted file mode 100644
index 14e10dfd3..000000000
--- a/browser/themes/linux/devtools/layoutview.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.theme-dark .theme-body {
-  background-image: url(layout-background-grid.png);
-}
-
-.theme-light .theme-body {
-  background-image: url(layout-background-grid.png), radial-gradient(circle at 50% 70%, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
-}
-
-.theme-body {
-  color: hsl(210,100%,85%);
-  box-sizing: border-box;
-}
-
-#main {
-  border-color: hsla(210,100%,85%,0.7);
-  border-style: dotted;
-}
-
-#main > .border {
-  color: hsl(210,53%,45%);
-}
-
-.border > span {
-  background-color: hsl(210,100%,85%);
-  border-radius: 2px;
-  padding: 0 4px;
-}
-
-#content {
-  border-color: hsla(210,100%,85%,0.7);
-  border-style: dotted 
-}
-
-#padding {
-  border-color: hsla(210,100%,85%,0.2);
-  border-style: solid;
-}
-
-#borders {
-  border-style: solid;
-  border-color: hsl(210,100%,85%);
-}
diff --git a/browser/themes/linux/devtools/light-theme.css b/browser/themes/linux/devtools/light-theme.css
deleted file mode 100644
index a867df614..000000000
--- a/browser/themes/linux/devtools/light-theme.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* According to:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
- */
-.theme-body {
-  background: white;
-  color: black;
-}
-
-.theme-twisty {
-  cursor: pointer;
-  margin-right: 5px;
-}
-
-.theme-twisty:-moz-focusring {
-  outline-style: none;
-}
-
-.theme-twisty:not([open]) {
-  width: 0;
-  height: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid rgba(0,0,0,0.5);
-  margin-left: 5px;
-}
-
-.theme-twisty[open] {
-  width: 10px;
-  height: 10px;
-  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(0,0,0,0.5) 68%);
-}
-
-.theme-checkbox {
-  display: inline-block;
-  border: 0;
-  width: 14px;
-  height: 14px;
-  padding: 0;
-  outline: none;
-  background: url("chrome://browser/skin/devtools/checkbox-light.png") no-repeat;
-}
-
-.theme-checkbox[checked] {
-  background: url("chrome://browser/skin/devtools/checkbox-light.png") 14px 0;
-}
-
-.theme-selected {
-  background-color: hsl(0,0%,90%);
-}
-
-.theme-bg-darker {
-  background: #F9F9F9;
-}
-
-.theme-link { /* blue */
-  color: hsl(208,56%,40%);
-}
-
-.theme-comment { /* grey */
-  color: hsl(90,2%,46%);
-}
-
-.theme-gutter {
-  background-color: hsl(0,0%,90%);
-  color: #667380;
-  border-color: hsl(0,0%,65%);
-}
-
-.theme-separator { /* grey */
-  border-color: #cddae5;
-}
-
-.theme-fg-color1 { /* green */
-  color: hsl(72,100%,27%);
-}
-
-.theme-fg-color2 { /* blue */
-  color: hsl(208,56%,40%);
-}
-
-.theme-fg-color3 { /* dark blue */
-  color: hsl(208,81%,21%)
-}
-
-.theme-fg-color4 { /* Orange */
-  color: hsl(24,85%,39%);
-}
-
-.theme-fg-color5 { /* Yellow */
-  color: #a18650;
-}
-
-.theme-fg-color6 { /* Orange */
-  color: hsl(24,85%,39%);
-}
-
-.theme-fg-color7 { /* Red */
-  color: #bf5656;
-}
diff --git a/browser/themes/linux/devtools/magnifying-glass.png b/browser/themes/linux/devtools/magnifying-glass.png
deleted file mode 100644
index 673c32810..000000000
--- a/browser/themes/linux/devtools/magnifying-glass.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/markup-view.css b/browser/themes/linux/devtools/markup-view.css
deleted file mode 100644
index 4651a4314..000000000
--- a/browser/themes/linux/devtools/markup-view.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-* {
-  padding: 0;
-  margin: 0;
-}
-
-.newattr {
-  cursor: pointer;
-}
-
-.selected {
-  background-color: hsl(0,0%,90%);
-}
-
-/* Give some padding to focusable elements to match the editor input
- * that will replace them. */
-span[tabindex] {
-  display: inline-block;
-  padding: 1px 0;
-}
-
-li.container {
-  position: relative;
-  padding: 2px 0 0 2px;
-}
-
-.codebox {
-  padding-left: 14px;
-}
-
-.expander {
-  position: absolute;
-}
-
-.more-nodes {
-  padding-left: 16px;
-}
-
-.styleinspector-propertyeditor {
-  border: 1px solid #CCC;
-}
diff --git a/browser/themes/linux/devtools/netmonitor.css b/browser/themes/linux/devtools/netmonitor.css
index a93106ca3..c3febee3e 100644
--- a/browser/themes/linux/devtools/netmonitor.css
+++ b/browser/themes/linux/devtools/netmonitor.css
@@ -1,532 +1,32 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#body {
-  background: url(background-noise-toolbar.png), hsl(208,11%,27%);
-}
-
-/* Network requests table */
-
-#requests-menu-empty-notice {
-  background: url(background-noise-toolbar.png), hsl(208,11%,27%);
-  padding: 12px;
-  font-size: 110%;
-  color: #fff;
-}
-
-#requests-menu-toolbar {
-  height: 32px;
-  padding: 0;
-}
+%include ../../shared/devtools/netmonitor.inc.css
 
-.requests-menu-header:first-child {
-  -moz-padding-start: 4px;
-}
-
-.requests-menu-subitem {
+#headers-summary-resend {
   padding: 4px;
 }
 
-.requests-menu-header:not(:last-child):-moz-locale-dir(ltr),
-.requests-menu-subitem:not(:last-child):-moz-locale-dir(ltr) {
-  -moz-border-end: 1px solid hsla(210,8%,5%,.25);
-  box-shadow: 1px 0 0 hsla(210,16%,76%,.1);
-}
-
-.requests-menu-header:not(:last-child):-moz-locale-dir(rtl),
-.requests-menu-subitem:not(:last-child):-moz-locale-dir(rtl) {
-  -moz-border-end: 1px solid hsla(210,8%,5%,.25);
-  box-shadow: -1px 0 0 hsla(210,16%,76%,.1);
-}
-
-.requests-menu-header-button {
-  -moz-appearance: none;
-  background: none;
-  min-width: 20px;
-  min-height: 31px; /* Remaining 1px comes from border of the toolbar. */
-  margin: 0;
-  border: none;
-  padding: 0;
-  color: inherit;
-  font-weight: inherit !important;
-  transition: background-color 0.1s ease-in-out;
-}
-
-.requests-menu-header-button:hover {
-  background: rgba(0,0,0,0.10);
-}
-
-.requests-menu-header-button:hover:active {
-  background: rgba(0,0,0,0.25);
-}
-
-.requests-menu-header-button:not(:active)[sorted] {
-  background: rgba(0,0,0,0.15);
-}
-
-.requests-menu-header-button:not(:active)[sorted=ascending] {
-  background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3));
-  background-size: 100% 1px;
-  background-repeat: no-repeat;
-}
-
-.requests-menu-header-button:not(:active)[sorted=descending] {
-  background-image: radial-gradient(farthest-side at center bottom, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3));
-  background-size: 100% 1px;
-  background-repeat: no-repeat;
-  background-position: bottom;
+#toggle-raw-headers {
+  padding: 4px;
 }
 
-/* Network requests table: specific column dimensions */
-
 .requests-menu-status-and-method {
-  width: 7em;
-}
-
-.requests-menu-status {
-  width: 10px;
-  height: 10px;
-}
-
-.requests-menu-method {
-  text-align: center;
-  font-weight: 600;
-}
-
-.requests-menu-file {
-  width: 20vw;
-  min-width: 4em;
+  width: 9em;
 }
 
-.requests-menu-domain {
+.requests-menu-security-and-domain {
   width: 16vw;
-  min-width: 10em;
-}
-
-.requests-menu-type {
-  text-align: center;
-  width: 4em;
 }
 
 .requests-menu-size {
-  text-align: center;
   width: 6em;
 }
 
-/* Network requests table: status codes */
-
-box.requests-menu-status {
-  background: #fff;
-  -moz-margin-start: 5px;
-  -moz-margin-end: 5px;
-  border-radius: 20px;
-  box-shadow:
-    0 0 0 1px rgba(255,255,255,0.4) inset,
-    0 -6px 4px 0 rgba(32,32,32,1.0) inset,
-    0 0 8px 0 rgba(32,0,0,0.4);
-  transition: box-shadow 0.5s ease-in-out;
-}
-
-box.requests-menu-status[code^="1"] {
-  box-shadow:
-    0 0 2px 1px rgba(255,255,255,0.8) inset,
-    0 -6px 4px 0 rgba(0,0,64,1.0) inset,
-    0 0 8px 0 rgba(0,0,128,1.0);
-}
-
-box.requests-menu-status[code^="2"] {
-  box-shadow:
-    0 0 2px 1px rgba(255,255,255,0.8) inset,
-    0 -6px 4px 0 rgba(0,64,0,1.0) inset,
-    0 0 8px 0 rgba(0,128,0,1.0);
-}
-
-box.requests-menu-status[code^="3"] {
-  box-shadow:
-    0 0 2px 1px rgba(255,255,255,0.8) inset,
-    0 -6px 4px 0 rgba(64,32,0,1.0) inset,
-    0 0 8px 0 rgba(128,128,0,1.0);
-}
-
-box.requests-menu-status[code^="4"] {
-  box-shadow:
-    0 0 2px 1px rgba(255,255,255,0.8) inset,
-    0 -6px 4px 0 rgba(64,0,0,1.0) inset,
-    0 0 8px 0 rgba(128,0,0,1.0);
-}
-
-box.requests-menu-status[code^="5"] {
-  box-shadow:
-    0 0 2px 1px rgba(255,255,255,0.8) inset,
-    0 -6px 4px 0 rgba(64,0,64,1.0) inset,
-    0 0 8px 0 rgba(128,0,128,1.0);
-}
-
-/* Network requests table: waterfall header */
-
-#requests-menu-waterfall-label {
-  -moz-padding-start: 8px;
-  -moz-padding-end: 8px;
-}
-
-.requests-menu-timings-division {
-  width: 100px;
-  padding-top: 2px;
-  -moz-padding-start: 4px;
-  -moz-border-start: 1px dotted #999;
-  font-size: 75%;
-  pointer-events: none;
-}
-
-.requests-menu-timings-division:not(:first-child) {
-  -moz-margin-start: -100px !important; /* Don't affect layout. */
-}
-
-.requests-menu-timings-division:-moz-locale-dir(ltr) {
-  transform-origin: left center;
-}
-
-.requests-menu-timings-division:-moz-locale-dir(rtl) {
-  transform-origin: right center;
-}
-
-/* Network requests table: waterfall items */
-
-.requests-menu-subitem.requests-menu-waterfall {
-  -moz-padding-start: 4px;
-  -moz-padding-end: 4px;
-  background-repeat: repeat-y; /* Background created on a <canvas> in js. */
-  margin-top: -1px; /* Compensate borders. */
-  margin-bottom: -1px;
-}
-
-.requests-menu-subitem.requests-menu-waterfall:-moz-locale-dir(rtl) {
-  background-position: right center;
-}
-
-.requests-menu-timings:-moz-locale-dir(ltr) {
-  transform-origin: left center;
-}
-
-.requests-menu-timings:-moz-locale-dir(rtl) {
-  transform-origin: right center;
-}
-
-.requests-menu-timings-total:-moz-locale-dir(ltr) {
-  transform-origin: left center;
-}
-
-.requests-menu-timings-total:-moz-locale-dir(rtl) {
-  transform-origin: right center;
-}
-
-.requests-menu-timings-total {
-  -moz-padding-start: 8px;
-  font-size: 85%;
-  font-weight: 600;
-}
-
-.requests-menu-timings-cap {
-  width: 4px;
-  height: 10px;
-  border: 1px solid #fff;
-}
-
-.requests-menu-timings-cap.start {
-  -moz-border-end: none;
-}
-
-.requests-menu-timings-cap.end {
-  -moz-border-start: none;
-}
-
-.requests-menu-timings-cap.start:-moz-locale-dir(ltr) {
-  border-radius: 4px 0 0 4px;
-  transform-origin: right center;
-}
-
-.requests-menu-timings-cap.start:-moz-locale-dir(rtl) {
-  border-radius: 0 4px 4px 0;
-  transform-origin: left center;
-}
-
-.requests-menu-timings-cap.end:-moz-locale-dir(ltr) {
-  border-radius: 0 4px 4px 0;
-  transform-origin: left center;
-}
-
-.requests-menu-timings-cap.end:-moz-locale-dir(rtl) {
-  border-radius: 4px 0 0 4px;
-  transform-origin: right center;
-}
-
-.requests-menu-timings-box {
-  height: 10px;
-  border-top: 1px solid #fff;
-  border-bottom: 1px solid #fff;
-}
-
-.requests-menu-timings-box.blocked,
-.requests-menu-timings-cap.blocked {
-  background-color: rgba(255,32,32,0.8);
-  box-shadow: 0 0 8px 0 rgba(128,32,32,0.8),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
-}
-
-.requests-menu-timings-box.dns,
-.requests-menu-timings-cap.dns {
-  background-color: rgba(255,128,255,0.6);
-  box-shadow: 0 0 8px 0 rgba(128,128,255,1.0),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
-}
-
-.requests-menu-timings-box.connect,
-.requests-menu-timings-cap.connect {
-  background-color: rgba(255,128,16,0.4);
-  box-shadow: 0 0 8px 0 rgba(128,128,16,0.8),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
-}
-
-.requests-menu-timings-box.send,
-.requests-menu-timings-cap.send {
-  background-color: rgba(255,255,128,0.4);
-  box-shadow: 0 0 8px 0 rgba(128,255,128,0.8),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
-}
-
-.requests-menu-timings-box.wait,
-.requests-menu-timings-cap.wait {
-  background-color: rgba(255,255,255,0.2);
-  box-shadow: 0 0 8px 0 rgba(128,255,255,0.4),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
-}
-
-.requests-menu-timings-box.receive,
-.requests-menu-timings-cap.receive {
-  background-color: rgba(255,255,255,1.0);
-  box-shadow: 0 0 8px 0 rgba(128,255,255,1.0),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
-}
-
-/* SideMenuWidget */
-
-.side-menu-widget-item[odd] {
-  background: rgba(255,255,255,0.05);
-}
-
-.side-menu-widget-item-contents {
-  padding: 0;
-}
-
-/* Network request details */
-
-#details-pane {
-  background: hsl(208,11%,27%);
-  max-width: 500px;
-}
-
-#details-pane-toggle {
-  background: none;
-  box-shadow: none;
-  border-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png");
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#details-pane-toggle[pane-collapsed] {
-  list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
-}
-
-#details-pane-toggle:active {
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
-
-/* Network request details tabpanels */
-
-.tabpanel-content {
-  background: url(background-noise-toolbar.png), #3e4750;
-  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset;
-  color: #fff;
-}
-
-.tabpanel-summary-container {
-  padding: 1px;
-}
-
-.tabpanel-summary-label {
-  -moz-padding-start: 4px;
-  -moz-padding-end: 3px;
-  font-weight: 600;
-  text-shadow: 0 1px 0 #000;
-  color: hsl(210,30%,85%);
-}
-
-.tabpanel-summary-value {
-  -moz-padding-start: 3px;
-  font-family: Menlo, Monaco, monospace;
-}
-
-.variable-or-property:not(:focus) > .title > .token-string {
-  color: #10c !important;
-}
-
-/* Headers tabpanel */
-
-#headers-summary-status,
-#headers-summary-version {
-  padding-bottom: 2px;
-}
-
-#headers-summary-size {
-  padding-top: 2px;
-}
-
-/* Response tabpanel */
-
-#response-content-info-header {
-  background:
-    url(background-noise-toolbar.png),
-    linear-gradient(hsl(0,61%,40%), hsl(0,61%,31%)) repeat-x top left;
-  box-shadow:
-    inset 0 1px 0 hsla(210,40%,83%,.15),
-    inset 0 -1px 0 hsla(210,40%,83%,.05);
-  margin: 0;
-  padding: 5px 8px;
-}
-
-#response-content-image-box {
-  padding-top: 10px;
-  padding-bottom: 10px;
-}
-
-#response-content-image {
-  background: #fff;
-  border: 1px dashed GrayText;
-  margin-bottom: 10px;
-}
-
-/* Timings tabpanel */
-
-#timings-tabpanel .tabpanel-summary-label {
-  width: 10em;
-}
-
-#timings-tabpanel .requests-menu-timings-box {
-  transition: transform 0.2s ease-out;
-  min-width: 1px;
-}
-
-#timings-tabpanel .requests-menu-timings-total {
-  transition: transform 0.2s ease-out;
-}
-
-/* Footer */
-
-#requests-menu-footer {
-  box-shadow: inset 0 1px 16px hsla(210,8%,5%,.3);
-}
-
-.requests-menu-footer-button,
-.requests-menu-footer-label {
-  min-width: 1em;
-  margin: 0;
-  border: none;
-  padding: 2px 1.5vw;
-  color: #fff;
-}
-
-.requests-menu-footer-spacer {
-  min-width: 2px;
-}
-
-.requests-menu-footer-spacer,
-.requests-menu-footer-button {
-  -moz-border-end: 1px solid hsla(210,8%,5%,.25);
-  box-shadow: 1px 0 0 hsla(210,16%,76%,.1);
-}
-
-.requests-menu-footer-button {
-  -moz-appearance: none;
-  background: rgba(0,0,0,0.025);
-}
-
-.requests-menu-footer-button:hover {
-  background: rgba(0,0,0,0.20);
-}
-
-.requests-menu-footer-button:hover:active {
-  background: rgba(0,0,0,0.35);
-}
-
-.requests-menu-footer-button:not(:active)[checked] {
-  background-color: rgba(0,0,0,0.25);
-  background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3));
-  background-size: 100% 1px;
-  background-repeat: no-repeat;
-}
-
-.requests-menu-footer-label {
-  font-weight: 600;
-}
-
 /* Responsive sidebar */
 @media (max-width: 700px) {
-  #requests-menu-toolbar {
-    height: 26px;
-  }
-
   .requests-menu-header-button {
-    min-height: 25px; /* Remaining 1px comes from border of the toolbar. */
     font-size: 85%;
   }
-
-  .requests-menu-footer-button,
-  .requests-menu-footer-label {
-    padding: 2px 2vw;
-  }
-
-  #details-pane {
-    max-width: none;
-    margin: 0 !important;
-    /* To prevent all the margin hacks to hide the sidebar. */
-  }
-
-  .requests-menu-status-and-method {
-    width: 16vw;
-  }
-
-  .requests-menu-file,
-  .requests-menu-domain {
-    width: 30vw;
-  }
-
-  .requests-menu-type {
-    width: 8vw;
-  }
-
-  .requests-menu-size {
-    width: 16vw;
-    border-width: 0 !important;
-    box-shadow: none !important;
-    /* The "Timeline" header is not visible anymore, and thus the
-       right border and box-shadow of "Size" column should be hidden. */
-  }
-}
-
-@media (min-width: 701px) {
-  #network-table[type-overflows] .requests-menu-domain {
-    border-width: 0 !important;
-    box-shadow: none !important;
-    /* The "Type" header is not visible anymore, and thus the
-       right border and box-shadow of "Domain" column should be hidden. */
-  }
-
-  #network-table[domain-overflows] .requests-menu-file {
-    border-width: 0 !important;
-    box-shadow: none !important;
-    /* The "Domain" header is not visible anymore, and thus the
-       right border and box-shadow of "File" column should be hidden. */
-  }
 }
diff --git a/browser/themes/linux/devtools/option-icon.png b/browser/themes/linux/devtools/option-icon.png
deleted file mode 100644
index 9fd78175d..000000000
--- a/browser/themes/linux/devtools/option-icon.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/orion-breakpoint.png b/browser/themes/linux/devtools/orion-breakpoint.png
deleted file mode 100644
index ddd344eee..000000000
--- a/browser/themes/linux/devtools/orion-breakpoint.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/orion-container.css b/browser/themes/linux/devtools/orion-container.css
deleted file mode 100644
index cf3568a94..000000000
--- a/browser/themes/linux/devtools/orion-container.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.viewTooltip {
-  display: none; /* TODO: add tooltips support, see bug 721752 */
-  font-family: monospace;
-  font-size: 13px;
-  background-color: InfoBackground;
-  color: InfoText;
-  padding: 2px;
-  border-radius: 4px;
-  border: 1px solid black;
-  z-index: 100;
-  position: fixed;
-  overflow: hidden;
-  white-space: pre;
-}
-
-.viewTooltip em {
-  font-style: normal;
-  font-weight: bold;
-}
-
-.annotationHTML {
-  cursor: pointer;
-  width: 16px;
-  height: 16px;
-  display: inline-block;
-  vertical-align: middle;
-  background-position: center;
-  background-repeat: no-repeat;
-}
-.annotationHTML.task {
-  background-image: url("chrome://browser/skin/devtools/orion-task.png");
-}
-.annotationHTML.breakpoint {
-  background-image: url("chrome://browser/skin/devtools/orion-breakpoint.png");
-}
diff --git a/browser/themes/linux/devtools/orion-debug-location.png b/browser/themes/linux/devtools/orion-debug-location.png
deleted file mode 100644
index a00649b77..000000000
--- a/browser/themes/linux/devtools/orion-debug-location.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/orion-task.png b/browser/themes/linux/devtools/orion-task.png
deleted file mode 100644
index 42dbc00b6..000000000
--- a/browser/themes/linux/devtools/orion-task.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/orion.css b/browser/themes/linux/devtools/orion.css
deleted file mode 100644
index f51ecceeb..000000000
--- a/browser/themes/linux/devtools/orion.css
+++ /dev/null
@@ -1,199 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.viewContainer {
-  background: hsl(0,0%,89%); /* This will be seen as the continuation of the ruler */
-  font-family: monospace;
-  font-size: inherit; /* inherit browser's default monospace font size */
-}
-
-.view {
-  color: black; /* Default text color */
-  background: white; /* Background of the editor */
-  padding-left: 4px;
-}
-
-.readonly > .view {
-  background: #fdfefd; /* super light green */
-}
-
-.ruler {
-  background: hsl(0,0%,89%);
-  color: hsl(0,0%,55%);
-}
-.ruler.annotations {
-  width: 16px;
-  padding-left: 4px;
-}
-.ruler.lines {
-  border-right: 1px solid #b4c4d3;
-  min-width: 1.4em;
-  padding-left: 4px;
-  padding-right: 4px;
-  text-align: end;
-}
-
-.ruler.linesWithAnnotations {
-  min-width: 0;
-  padding-left: 0;
-}
-
-.ruler.overview {
-  border-left: 1px solid #b4c4d3;
-  width: 14px;
-  text-align: start;
-}
-
-/* Styles for the annotation ruler (first line) */
-.annotationHTML {
-  cursor: pointer;
-  width: 16px;
-  height: 16px;
-  display: inline-block;
-  vertical-align: middle;
-  background-position: center;
-  background-repeat: no-repeat;
-}
-.annotation.task .annotationHTML {
-  background-image: url("chrome://browser/skin/devtools/orion-task.png");
-}
-.annotation.breakpoint .annotationHTML {
-  background-image: url("chrome://browser/skin/devtools/orion-breakpoint.png");
-}
-.annotation.debugLocation .annotationHTML {
-  background-image: url("chrome://browser/skin/devtools/orion-debug-location.png");
-}
-.annotation.breakpoint.debugLocation .annotationHTML,
-.annotation.task.debugLocation .annotationHTML {
-  background-position: center, center;
-  background-repeat: no-repeat, no-repeat;
-  background-size: 75%, 100%;
-}
-.annotation.breakpoint.debugLocation .annotationHTML {
-  background-image: url("chrome://browser/skin/devtools/orion-debug-location.png"),
-                    url("chrome://browser/skin/devtools/orion-breakpoint.png");
-}
-
-.annotation.task.debugLocation .annotationHTML {
-  background-image: url("chrome://browser/skin/devtools/orion-debug-location.png"),
-                    url("chrome://browser/skin/devtools/orion-task.png");
-}
-
-/* Styles for the overview ruler  */
-.annotationOverview {
-  cursor: pointer;
-  border-radius: 2px;
-  left: 2px;
-  width: 8px;
-}
-.annotationOverview.task {
-  background-color: lightgreen;
-  border: 1px solid green;
-}
-.annotationOverview.breakpoint {
-  background-color: lightblue;
-  border: 1px solid blue;
-}
-.annotationOverview.debugLocation {
-  background-color: white;
-  border: 1px solid green;
-}
-.annotationOverview.currentBracket {
-  background-color: lightgray;
-  border: 1px solid red;
-}
-.annotationOverview.matchingBracket {
-  background-color: lightgray;
-  border: 1px solid red;
-}
-
-/* Styles for text range */
-.annotationRange {
-  background-repeat: repeat-x;
-  background-position: left bottom;
-}
-.annotationRange.task {
-  outline: 1px dashed rgba(0, 255, 0, 0.5);
-}
-.annotationRange.matchingBracket {
-  outline: 1px solid grey;
-}
-
-.token_singleline_comment,
-.token_multiline_comment,
-.token_doc_comment  {
-  color: hsl(90,2%,50%); /* grey */
-}
-
-.token_doc_html_markup {
-  color: #dd0058; /* purple */
-}
-
-.token_doc_tag {
-  color: #dd0058; /* purple */
-}
-
-.token_task_tag { /* "TODO" */
-  color: black;
-  background: yellow;
-}
-
-.token_string {
-  color: hsl(72,100%,27%); /* green */
-  font-style: italic;
-}
-
-.token_keyword {
-  color: hsl(276,44%,45%); /* purple */
-}
-
-.token_space {
-  /* images/white_space.png */
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAIAAABv85FHAAAABnRSTlMA/wAAAACkwsAdAAAAIUlEQVR4nGP4z8CAC+GUIEXuABhgkTuABEiRw2cmae4EAH05X7xDolNRAAAAAElFTkSuQmCC");
-  background-repeat: no-repeat;
-  background-position: center center;
-}
-
-.token_tab {
-  /* images/white_tab.png */
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAJCAIAAACJ2loDAAAABnRSTlMA/wD/AP83WBt9AAAAMklEQVR4nGP4TwRgoK6i52c3bz5w6zMSA6tJn28d2Lx589nnCAYu63AaSLxJRLoJPwAAeNk0aG4opfMAAAAASUVORK5CYII=");
-  background-repeat: no-repeat;
-  background-position: left center;
-}
-
-.line_caret,
-.annotationLine.currentLine { /* Current line */
-  background: hsl(208, 93%, 94%);
-}
-
-.readonly .line_caret,
-.readonly .annotationLine.currentLine {
-  background: hsl(208, 80%, 90%);
-}
-
-/* Styling for html syntax highlighting */
-.entity-name-tag {
-  color: hsl(208,48%,40%); /* blue */
-}
-
-.entity-other-attribute-name {
-  color: hsl(208,48%,40%); /* blue */
-}
-
-.punctuation-definition-comment {
-  color: hsl(90,2%,50%); /* grey */
-}
-
-.comment {
-  color: hsl(90,2%,50%); /* grey */
-}
-
-.string-quoted {
-  color: hsl(24,85%,39%); /* orange */
-}
-
-.invalid {
-  color: red;
-  font-weight: bold;
-}
diff --git a/browser/themes/linux/devtools/performance.css b/browser/themes/linux/devtools/performance.css
new file mode 100644
index 000000000..9fbdab02d
--- /dev/null
+++ b/browser/themes/linux/devtools/performance.css
@@ -0,0 +1,5 @@
+/* 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/. */
+
+%include ../../shared/devtools/performance.inc.css
diff --git a/browser/themes/linux/devtools/profiler.css b/browser/themes/linux/devtools/profiler.css
index 152678396..efaa394ef 100644
--- a/browser/themes/linux/devtools/profiler.css
+++ b/browser/themes/linux/devtools/profiler.css
@@ -2,4 +2,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/. */
 
-%include ../../shared/devtools/profiler.inc.css
\ No newline at end of file
+%include ../../shared/devtools/profiler.inc.css
+
+#profile-content tab label {
+  margin-bottom: 4px;
+}
diff --git a/browser/themes/linux/devtools/responsive-background.png b/browser/themes/linux/devtools/responsive-background.png
deleted file mode 100644
index 271dd5ebc..000000000
--- a/browser/themes/linux/devtools/responsive-background.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/responsive-se-resizer.png b/browser/themes/linux/devtools/responsive-se-resizer.png
deleted file mode 100644
index bdc03ee24..000000000
--- a/browser/themes/linux/devtools/responsive-se-resizer.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/responsive-vertical-resizer.png b/browser/themes/linux/devtools/responsive-vertical-resizer.png
deleted file mode 100644
index 1bb622dd3..000000000
--- a/browser/themes/linux/devtools/responsive-vertical-resizer.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/ruleview.css b/browser/themes/linux/devtools/ruleview.css
deleted file mode 100644
index b0ddd80e6..000000000
--- a/browser/themes/linux/devtools/ruleview.css
+++ /dev/null
@@ -1,131 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.ruleview {
-  height: 100%;
-}
-
-.ruleview-rule-source {
-  -moz-padding-start: 5px;
-  cursor: pointer;
-  text-align: right;
-  float: right;
-  -moz-user-select: none;
-}
-
-.ruleview-rule-inheritance {
-  border-top-width: 1px;
-  border-bottom-width: 1px;
-  border-top-style: solid;
-  border-bottom-style: solid;
-  padding: 1px 4px;
-  margin-top: 4px;
-  -moz-user-select: none;
-}
-
-.ruleview-rule-source:hover {
-  text-decoration: underline;
-}
-
-.ruleview-rule,
-#noResults {
-  padding: 2px 4px;
-}
-
-#noResults {
-  font: message-box;
-  color: GrayText;
-}
-
-.ruleview-rule + .ruleview-rule {
-  border-top-width: 1px;
-  border-top-style: dotted;
-}
-
-.ruleview-warning {
-  background: url("chrome://browser/skin/devtools/alerticon-warning.png");
-  -moz-margin-start: 5px;
-  vertical-align: middle;
-  width: 13px;
-  height: 12px;
-}
-
-.ruleview-ruleopen {
-  -moz-padding-end: 5px;
-}
-
-.ruleview-ruleclose {
-  cursor: text;
-  padding-right: 20px;
-}
-
-.ruleview-propertylist {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.ruleview-rule:not(:hover) .ruleview-enableproperty {
-  visibility: hidden;
-}
-
-.ruleview-expander {
-  display: inline-block;
-}
-
-.ruleview-newproperty {
-  /* (enable checkbox width: 12px) + (expander width: 15px) */
-  -moz-margin-start: 27px;
-}
-
-.ruleview-namecontainer,
-.ruleview-propertycontainer,
-.ruleview-propertyname,
-.ruleview-propertyvalue {
-  text-decoration: inherit;
-}
-
-.ruleview-computedlist {
-  list-style: none;
-  padding: 0;
-}
-
-.ruleview-computed {
-  -moz-margin-start: 35px;
-}
-
-.ruleview-overridden {
-  text-decoration: line-through;
-}
-
-.styleinspector-propertyeditor {
-  border: 1px solid #CCC;
-  padding: 0;
-}
-
-.ruleview-property {
-  border-left: 2px solid transparent;
-}
-
-.ruleview-property  > * {
-  vertical-align: middle;
-}
-
-.ruleview-property[dirty] {
-  border-left-color: #68E268;
-}
-
-.ruleview-namecontainer > .ruleview-propertyname,
-.ruleview-propertycontainer > .ruleview-propertyvalue {
-  border-bottom: 1px dashed transparent;
-}
-
-.ruleview-namecontainer:hover > .ruleview-propertyname,
-.ruleview-propertycontainer:hover > .ruleview-propertyvalue {
-  border-bottom-color: hsl(0,0%,50%);
-}
-
-.ruleview-selector-separator, .ruleview-selector-unmatched {
-  color: #888;
-}
diff --git a/browser/themes/linux/devtools/scratchpad.css b/browser/themes/linux/devtools/scratchpad.css
index 86b4b167b..a6207e37d 100644
--- a/browser/themes/linux/devtools/scratchpad.css
+++ b/browser/themes/linux/devtools/scratchpad.css
@@ -1,5 +1,5 @@
-/* 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/. */

-

+/* 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/. */
+
 %include ../../shared/devtools/scratchpad.inc.css
\ No newline at end of file
diff --git a/browser/themes/linux/devtools/shadereditor.css b/browser/themes/linux/devtools/shadereditor.css
new file mode 100644
index 000000000..34817e245
--- /dev/null
+++ b/browser/themes/linux/devtools/shadereditor.css
@@ -0,0 +1,5 @@
+/* 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/. */
+
+%include ../../shared/devtools/shadereditor.inc.css
diff --git a/browser/themes/linux/devtools/splitview.css b/browser/themes/linux/devtools/splitview.css
deleted file mode 100644
index a24d099ee..000000000
--- a/browser/themes/linux/devtools/splitview.css
+++ /dev/null
@@ -1,114 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.splitview-nav-container {
-  background-color: hsl(208,11%,27%);
-  color: white;
-}
-
-.loading .splitview-nav-container {
-  background-image: url(chrome://global/skin/icons/loading_16.png);
-  background-repeat: no-repeat;
-  background-position: center center;
-}
-
-.splitview-nav {
-  -moz-appearance: none;
-  margin: 0;
-  box-shadow: inset -1px 0 0 #222426;
-}
-
-.splitview-nav > li {
-  color: white;
-  background-clip: padding-box;
-  border-bottom: 1px solid hsla(210,16%,76%,.1);
-  box-shadow: inset 0 -1px 0 hsla(210,8%,5%,.25);
-  -moz-padding-end: 8px;
-  -moz-box-align: center;
-}
-
-.splitview-nav {
-  list-style-image: none;
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.splitview-nav > li {
-  outline: 0;
-  vertical-align: bottom;
-}
-
-.placeholder {
-  -moz-box-flex: 1;
-  text-align: center;
-}
-
-.splitview-nav > li.splitview-active {
-  background-image: url(itemArrow-ltr.png),
-                    linear-gradient(to right, black, black),
-                    linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%));
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center right, top right, top left;
-  background-size: auto, 1px 100%, auto;
-  border-bottom: 1px solid hsla(210,8%,5%,.25);
-  box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15),
-              inset 0 -1px 0 hsla(210,40%,83%,.05);
-}
-
-.splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-rtl.png),
-                    linear-gradient(to right, black, black),
-                    linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%));
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center left, top left, top right;
-}
-
-/* Toolbars */
-
-.devtools-toolbar {
-  height: 26px;
-  background-origin: border-box;
-  background-clip: border-box;
-  border-bottom: 1px solid hsla(210,8%,5%,.65);
-  padding: 3px;
-}
-
-.splitview-main > toolbar:-moz-locale-dir(ltr) {
-  border-right: 1px solid hsla(210,8%,5%,.5);
-}
-
-.splitview-main > toolbar:-moz-locale-dir(rtl) {
-  border-left: 1px solid hsla(210,8%,5%,.5);
-}
-
-.devtools-toolbarbutton {
-  font-size: 11px;
-  padding: 0 8px;
-  width: auto;
-  min-width: 48px;
-  min-height: 0;
-}
-
-
-/* Resizers */
-
-.splitview-landscape-splitter {
-  -moz-border-start-color: transparent;
-}
-
-.splitview-portrait-resizer {
-  -moz-appearance: none;
-  background: linear-gradient(black 1px, rgba(255,255,255,0.2) 1px),
-              linear-gradient(hsl(210,11%,36%), hsl(210,11%,18%));
-  height: 12px;
-  background-size: 10px 2px, 100% 12px;
-  background-clip: content-box, border-box;
-  background-repeat: repeat-y, no-repeat;
-  background-position: center center;
-  padding: 2px 0;
-  border-top: 1px solid hsla(210,8%,5%,.5);
-  border-bottom: 1px solid hsla(210,8%,5%,.5);
-}
diff --git a/browser/themes/linux/devtools/styleeditor.css b/browser/themes/linux/devtools/styleeditor.css
deleted file mode 100644
index 4df8ea8e6..000000000
--- a/browser/themes/linux/devtools/styleeditor.css
+++ /dev/null
@@ -1,131 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#style-editor-chrome {
-  background-color: hsl(208,11%,27%);
-}
-
-.stylesheet-title,
-.stylesheet-name {
-  text-decoration: none;
-  color: hsl(207,17%,88%);
-}
-
-.stylesheet-name {
-  font-size: 13px;
-}
-
-.stylesheet-rule-count,
-.stylesheet-saveButton {
-  color: hsl(211,12%,60%);
-}
-
-.stylesheet-saveButton {
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.splitview-active .stylesheet-title,
-.splitview-active .stylesheet-name {
-  color: hsl(0,0%,100%);
-}
-
-.splitview-active .stylesheet-rule-count,
-.splitview-active .stylesheet-saveButton {
-  color: hsl(200,66%,70%);
-}
-
-.splitview-nav:focus {
-  outline: 0; /* focus ring is on the stylesheet name */
-}
-
-.splitview-nav > li.unsaved > hgroup .stylesheet-name {
-  font-style: italic;
-}
-
-.splitview-nav:-moz-locale-dir(ltr) > li.unsaved > hgroup .stylesheet-name:before,
-.splitview-nav:-moz-locale-dir(rtl) > li.unsaved > hgroup .stylesheet-name:after {
-  font-style: italic;
-}
-
-.splitview-nav.empty > p {
-  padding: 0 10px;
-}
-
-.stylesheet-enabled {
-  padding: 8px 0;
-  margin: 0 8px;
-  background-image: url(itemToggle.png);
-  background-repeat: no-repeat;
-  background-clip: content-box;
-  background-position: 0 8px;
-  width: 24px;
-  height: 40px;
-}
-
-.disabled > .stylesheet-enabled {
-  background-position: -24px 8px;
-}
-
-.splitview-nav > li > .stylesheet-enabled:focus,
-.splitview-nav > li:hover > .stylesheet-enabled {
-  outline: 0;
-}
-
-.stylesheet-error-message {
-  color: red;
-}
-
-.stylesheet-more > h3 {
-  font-size: 11px;
-  -moz-margin-end: 2px;
-}
-
-.devtools-searchinput {
-  max-width: 25ex;
-  font-size: 11px;
-}
-
-.placeholder {
-  color: white;
-}
-
-.placeholder a {
-  text-decoration: underline;
-}
-
-h1,
-h2,
-h3 {
-  font-size: inherit;
-  font-weight: normal;
-  margin: 0;
-  padding: 0;
-}
-
-/* portrait mode */
-@media (max-width: 550px) {
-  .splitview-nav {
-    box-shadow: none;
-  }
-
-  .splitview-nav > li.splitview-active {
-    background-size: 0 0, 0 0, auto;
-  }
-
-  .stylesheet-enabled {
-    padding: 0;
-    background-position: 0 0;
-    height: 24px;
-  }
-
-  .disabled > .stylesheet-enabled {
-    background-position: -24px 0;
-  }
-
-  .splitview-nav > li > hgroup.stylesheet-info {
-    -moz-box-align: baseline;
-  }
-}
diff --git a/browser/themes/linux/devtools/timeline.css b/browser/themes/linux/devtools/timeline.css
new file mode 100644
index 000000000..d22fe6d7a
--- /dev/null
+++ b/browser/themes/linux/devtools/timeline.css
@@ -0,0 +1,5 @@
+/* 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/. */
+
+%include ../../shared/devtools/timeline.inc.css
diff --git a/browser/themes/linux/devtools/toggle-tools.png b/browser/themes/linux/devtools/toggle-tools.png
deleted file mode 100644
index 8a40d0d11..000000000
--- a/browser/themes/linux/devtools/toggle-tools.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/tool-debugger-paused.png b/browser/themes/linux/devtools/tool-debugger-paused.png
deleted file mode 100644
index 4c968f542..000000000
--- a/browser/themes/linux/devtools/tool-debugger-paused.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/tool-debugger.png b/browser/themes/linux/devtools/tool-debugger.png
deleted file mode 100644
index af4dbc0e0..000000000
--- a/browser/themes/linux/devtools/tool-debugger.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/tool-inspector.png b/browser/themes/linux/devtools/tool-inspector.png
deleted file mode 100644
index 8c1e7f308..000000000
--- a/browser/themes/linux/devtools/tool-inspector.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/tool-network.png b/browser/themes/linux/devtools/tool-network.png
deleted file mode 100644
index 01f23203f..000000000
--- a/browser/themes/linux/devtools/tool-network.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/tool-options.png b/browser/themes/linux/devtools/tool-options.png
deleted file mode 100644
index 7079a1752..000000000
--- a/browser/themes/linux/devtools/tool-options.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/tool-profiler.png b/browser/themes/linux/devtools/tool-profiler.png
deleted file mode 100644
index 8f30f12a9..000000000
--- a/browser/themes/linux/devtools/tool-profiler.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/tool-styleeditor.png b/browser/themes/linux/devtools/tool-styleeditor.png
deleted file mode 100644
index 83765d9f6..000000000
--- a/browser/themes/linux/devtools/tool-styleeditor.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/tool-webconsole.png b/browser/themes/linux/devtools/tool-webconsole.png
deleted file mode 100644
index 86633249a..000000000
--- a/browser/themes/linux/devtools/tool-webconsole.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/toolbox.css b/browser/themes/linux/devtools/toolbox.css
deleted file mode 100644
index 535998ff9..000000000
--- a/browser/themes/linux/devtools/toolbox.css
+++ /dev/null
@@ -1,287 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#toolbox-controls {
-  margin: 0 4px;
-}
-
-#toolbox-controls > toolbarbutton,
-#toolbox-dock-buttons > toolbarbutton {
-  -moz-appearance: none;
-  margin: 0 4px;
-  min-width: 16px;
-  width: 16px;
-}
-
-#toolbox-dock-bottom {
-  list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
-}
-
-#toolbox-dock-side {
-  list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
-}
-
-#toolbox-dock-window {
-  list-style-image: url("chrome://browser/skin/devtools/undock.png");
-}
-
-#toolbox-dock-window,
-#toolbox-dock-bottom,
-#toolbox-dock-side {
-  opacity: 0.6;
-}
-
-#toolbox-dock-window:hover,
-#toolbox-dock-bottom:hover,
-#toolbox-dock-side:hover {
-  opacity: 1;
-}
-
-#toolbox-controls-separator {
-  width: 3px;
-  background-image: linear-gradient(hsla(204,45%,98%,0), hsla(204,45%,98%,.1), hsla(204,45%,98%,0)),
-                    linear-gradient(hsla(206,37%,4%,0), hsla(206,37%,4%,.6), hsla(206,37%,4%,0)),
-                    linear-gradient(hsla(204,45%,98%,0), hsla(204,45%,98%,.1), hsla(204,45%,98%,0));
-  background-size: 1px 100%;
-  background-repeat: no-repeat;
-  background-position: 0, 1px, 2px;
-  -moz-margin-start: 8px;
-}
-
-/* Command buttons */
-
-.command-button {
-  -moz-appearance: none;
-  padding: 0 8px;
-  margin: 0;
-  width: 16px;
-}
-
-.command-button:hover {
-  background-color: hsla(206,37%,4%,.2);
-}
-.command-button:hover:active, .command-button[checked=true]:not(:hover) {
-  background-color: hsla(206,37%,4%,.4);
-}
-
-#command-button-paintflashing {
-  list-style-image: url("chrome://browser/skin/devtools/command-paintflashing.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-#command-button-paintflashing:hover {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-#command-button-paintflashing:hover:active {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-#command-button-paintflashing[checked=true] {
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-#command-button-responsive {
-  list-style-image: url("chrome://browser/skin/devtools/command-responsivemode.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-#command-button-responsive:hover {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-#command-button-responsive:hover:active {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-#command-button-responsive[checked=true] {
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-#command-button-tilt {
-  list-style-image: url("chrome://browser/skin/devtools/command-tilt.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-#command-button-tilt:hover {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-#command-button-tilt:hover:active {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-
-#command-button-tilt[checked=true] {
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-#command-button-scratchpad {
-  list-style-image: url("chrome://browser/skin/devtools/command-scratchpad.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-#command-button-scratchpad:hover {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-#command-button-scratchpad:hover:active {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-
-/* Tabs */
-
-.devtools-tabbar {
-  -moz-appearance: none;
-  background-image: url("background-noise-toolbar.png"),
-                    linear-gradient(#303840, #2d3640);
-  border-color: #060a0d;
-  border-style: solid;
-  border-width: 1px 0;
-  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset,
-              0 -1px 0 hsla(206,37%,4%,.1) inset;
-  min-height: 32px;
-  padding: 0;
-}
-
-#toolbox-tabs {
-  margin: 0;
-}
-
-.devtools-tab {
-  -moz-appearance: none;
-  min-width: 32px;
-  min-height: 32px;
-  max-width: 127px;
-  color: #b6babf;
-  margin: 0;
-  padding: 0;
-  background-image: linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
-                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1));
-  background-size: 1px 100%;
-  background-repeat: no-repeat;
-  background-position: left, right;
-  border-right: 1px solid hsla(206,37%,4%,.45);
-  -moz-box-align: center;
-}
-
-.devtools-tab > image {
-  border: none;
-  -moz-margin-end: 0;
-  -moz-margin-start: 4px;
-  opacity: 0.6;
-  max-height: 16px;
-}
-
-#toolbox-tab-options > image {
-  margin: 0 8px;
-}
-
-.devtools-tab > label {
-  white-space: nowrap;
-}
-
-.devtools-tab:hover > image {
-  opacity: 0.8;
-}
-
-.devtools-tab:active > image,
-.devtools-tab[selected=true] > label {
-  opacity: 1;
-}
-
-.devtools-tab:hover {
-  background-image: linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
-                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
-                    linear-gradient(hsla(206,37%,4%,.1), hsla(206,37%,4%,.2));
-  background-size: 1px 100%,
-                   1px 100%,
-                   100%;
-  background-repeat: no-repeat,
-                     no-repeat,
-                     repeat-x;
-  background-position: left, right;
-  color: #ced3d9;
-}
-.devtools-tab:hover:active {
-  background-color: hsla(206,37%,4%,.2);
-  color: #f5f7fa;
-}
-
-.devtools-tab[selected=true] {
-  color: #f5f7fa;
-  background-image: radial-gradient(farthest-corner at center top, #9fdfff, hsla(200,100%,70%,.3)),
-                    radial-gradient(farthest-side at center top, hsla(200,100%,70%,.4), hsla(200,100%,70%,0)),
-                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
-                    linear-gradient(hsla(204,45%,98%,.02), hsla(204,45%,98%,.04)),
-                    linear-gradient(hsla(206,37%,4%,.2), hsla(206,37%,4%,.3));
-  background-size: 100% 1px,
-                   100% 5px,
-                   1px 100%,
-                   1px 100%,
-                   100%;
-  background-repeat: no-repeat,
-                     no-repeat,
-                     no-repeat,
-                     no-repeat,
-                     repeat-x;
-  background-position: top right, top left, left, right;
-  box-shadow: 1px -1px 0 hsla(206,37%,4%,.2) inset;
-}
-
-.devtools-tab:not([selected=true]).highlighted {
-  color: #f5f7fa;
-  background-image: radial-gradient(farthest-corner at center top, #c0ff40, hsla(80,100%,63%,.5) 70%, hsla(80,100%,63%,.3) 97%),
-                    radial-gradient(farthest-side at center top, hsla(80,100%,35%,.5), hsla(80,100%,35%,0)),
-                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
-                    linear-gradient(hsla(204,45%,98%,.05), hsla(204,45%,98%,.1)),
-                    linear-gradient(hsla(99,100%,14%,.2), hsla(99,100%,14%,.2));
-  background-size: 100% 1px,
-                   100% 5px,
-                   1px 100%,
-                   1px 100%,
-                   100%;
-  background-repeat: no-repeat,
-                     no-repeat,
-                     no-repeat,
-                     no-repeat,
-                     repeat-x;
-  background-position: top right, top left, left, right;
-}
-
-.devtools-tab:not(.highlighted) > .highlighted-icon,
-.devtools-tab[selected=true] > .highlighted-icon,
-.devtools-tab:not([selected=true]).highlighted > .default-icon {
-  visibility: collapse;
-}
-
-#options-panel {
-  background-image: url("chrome://browser/skin/newtab/noise.png");
-}
-
-.options-vertical-pane {
-  margin: 15px;
-  width: calc(50% - 30px);
-  min-width: 400px;
-  -moz-padding-start: 5px;
-}
-
-.options-vertical-pane > label {
-  padding: 5px 0;
-  font-size: 1.4rem;
-}
-
-.options-groupbox {
-  -moz-margin-start: 15px;
-  padding: 4px;
-}
-
-.options-groupbox > * {
-  padding: 2px;
-}
-
-.options-citation-label {
-  font-size: 1rem !important;
-  /* !important is required otherwise font-size will still be 1.4rem */
-  font-style: italic;
-  padding: 4px 0 0; /* To align it with the checkbox */
-  color: #444;
-}
-
-.options-citation-label + label {
-  padding: 3px 0 0 !important; /* To align it with the checkbox */
-  font-style: italic;
-}
diff --git a/browser/themes/linux/devtools/undock.png b/browser/themes/linux/devtools/undock.png
deleted file mode 100644
index 4e62b2cee..000000000
--- a/browser/themes/linux/devtools/undock.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/vview-delete.png b/browser/themes/linux/devtools/vview-delete.png
deleted file mode 100644
index 0945af275..000000000
--- a/browser/themes/linux/devtools/vview-delete.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/vview-edit.png b/browser/themes/linux/devtools/vview-edit.png
deleted file mode 100644
index af42a28df..000000000
--- a/browser/themes/linux/devtools/vview-edit.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/webaudioeditor.css b/browser/themes/linux/devtools/webaudioeditor.css
new file mode 100644
index 000000000..079602f4d
--- /dev/null
+++ b/browser/themes/linux/devtools/webaudioeditor.css
@@ -0,0 +1,5 @@
+/* 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/. */
+
+%include ../../shared/devtools/webaudioeditor.inc.css
diff --git a/browser/themes/linux/devtools/webconsole.css b/browser/themes/linux/devtools/webconsole.css
index 87a3e1770..f7557db41 100644
--- a/browser/themes/linux/devtools/webconsole.css
+++ b/browser/themes/linux/devtools/webconsole.css
@@ -4,20 +4,6 @@
 
 %include ../../shared/devtools/webconsole.inc.css
 
-.webconsole-timestamp,
-.webconsole-msg-body {
-  font-family: "DejaVu Sans Mono", monospace;
-}
-
-.jsterm-input-node,
-.jsterm-complete-node {
-  font: 0.9em "DejaVu Sans Mono", monospace;
-}
-
-.hud-output-node {
-  font-size: 0.9em;
-}
-
 .jsterm-input-node {
   width: 98%;
 }
diff --git a/browser/themes/linux/devtools/webconsole.png b/browser/themes/linux/devtools/webconsole.png
deleted file mode 100644
index 8aee79015..000000000
--- a/browser/themes/linux/devtools/webconsole.png
+++ /dev/null
diff --git a/browser/themes/linux/devtools/webconsole_networkpanel.css b/browser/themes/linux/devtools/webconsole_networkpanel.css
index 10d3e49a4..3803fe3ef 100644
--- a/browser/themes/linux/devtools/webconsole_networkpanel.css
+++ b/browser/themes/linux/devtools/webconsole_networkpanel.css
@@ -50,7 +50,7 @@ h1 .info {
   font-weight: bold;
   color: #000;
   white-space: nowrap;
-  text-align: right;
+  text-align: end;
   vertical-align: top;
   width: 10%;
 }
diff --git a/browser/themes/linux/devtools/widgets.css b/browser/themes/linux/devtools/widgets.css
index 06f79b5ac..39c357dfe 100644
--- a/browser/themes/linux/devtools/widgets.css
+++ b/browser/themes/linux/devtools/widgets.css
@@ -1,652 +1,11 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* Generic pane helpers */
+%include ../../shared/devtools/widgets.inc.css
 
-.generic-toggled-side-pane {
-  min-width: 50px;
-  -moz-margin-start: 0px !important;
-  /* Unfortunately, transitions don't work properly with locale-aware properties,
-     so both the left and right margins are set via js, while the start margin
-     is always overridden here. */
-}
-
-.generic-toggled-side-pane[animated] {
-  transition: margin 0.25s ease-in-out;
-}
-
-/* BreacrumbsWidget */
-
-.breadcrumbs-widget-container {
-  -moz-margin-end: 3px;
-  /* A fake 1px-shadow is included in the border-images of the
-     breadcrumbs-widget-items, to match toolbar-buttons style.
-     This negative margin compensates the extra row of pixels created
-     by the shadow.*/
-  margin-bottom: -1px;
-}
-
-/* Preloading hack, LTR */
-
-.breadcrumbs-widget-container:-moz-locale-dir(ltr)::after {
-  content: '';
-  display: block;
-  background-image:
-    url(breadcrumbs/ltr-start.png),
-    url(breadcrumbs/ltr-start-selected.png),
-    url(breadcrumbs/ltr-start-pressed.png),
-    url(breadcrumbs/ltr-start-selected-pressed.png),
-    url(breadcrumbs/ltr-middle.png),
-    url(breadcrumbs/ltr-middle-selected.png),
-    url(breadcrumbs/ltr-middle-pressed.png),
-    url(breadcrumbs/ltr-middle-selected-pressed.png),
-    url(breadcrumbs/ltr-end.png),
-    url(breadcrumbs/ltr-end-selected.png),
-    url(breadcrumbs/ltr-end-pressed.png),
-    url(breadcrumbs/ltr-end-selected-pressed.png);
-}
-
-/* Preloading hack, RTL */
-
-.breadcrumbs-widget-container:-moz-locale-dir(rtl)::after {
-  content: '';
-  display: block;
-  background-image:
-    url(breadcrumbs/rtl-start.png),
-    url(breadcrumbs/rtl-start-selected.png),
-    url(breadcrumbs/rtl-start-pressed.png),
-    url(breadcrumbs/rtl-start-selected-pressed.png),
-    url(breadcrumbs/rtl-middle.png),
-    url(breadcrumbs/rtl-middle-selected.png),
-    url(breadcrumbs/rtl-middle-pressed.png),
-    url(breadcrumbs/rtl-middle-selected-pressed.png),
-    url(breadcrumbs/rtl-end.png),
-    url(breadcrumbs/rtl-end-selected.png),
-    url(breadcrumbs/rtl-end-pressed.png),
-    url(breadcrumbs/rtl-end-selected-pressed.png);
-}
-
-.scrollbutton-up,
-.scrollbutton-down {
-  -moz-appearance: none;
-  background: linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset,
-              0 0 0 1px hsla(210,16%,76%,.15) inset,
-              0 1px 0 hsla(210,16%,76%,.15);
-  border: 1px solid hsla(210,8%,5%,.45);
-  margin: 0 0 1px;
-}
-
-.scrollbutton-up:not([disabled]):active:hover,
-.scrollbutton-down:not([disabled]):active:hover {
-  background: linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
-  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset,
-              0 1px 3px hsla(210,8%,5%,.25) inset,
-              0 1px 0 hsla(210,16%,76%,.15);
-  border-color: hsla(210,8%,5%,.6);
-}
-
-.scrollbutton-up > .toolbarbutton-icon,
-.scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
-  list-style-image: url("breadcrumbs-scrollbutton.png");
-  -moz-image-region: rect(0px,7px,16px,0px);
-  margin: 0 5px;
-}
-
-.scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-.scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
-  -moz-image-region: rect(0px,14px,16px,7px);
-}
-
-.scrollbutton-up[disabled] > .toolbarbutton-icon,
-.scrollbutton-down[disabled] > .toolbarbutton-icon {
-  opacity: 0.5;
-}
-
-.scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-.scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.breadcrumbs-widget-item {
-  background-color: transparent;
-  -moz-appearance: none;
-  overflow: hidden;
-  min-width: 85px;
-  max-width: 250px;
-  min-height: 25px;
-  border-style: solid;
-  border-width: 1px 13px 2px 13px;
-  margin: 0 -11px 0 0;
-  padding: 0 9px;
-  outline: none;
-  color: hsl(210,30%,85%);
-}
-
-.breadcrumbs-widget-item:-moz-focusring > label {
-  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-tag {
-  color: hsl(208,100%,60%);
-}
-
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-id {
-  color: hsl(205,100%,70%);
-}
-
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-pseudo-classes {
-  color: hsl(20,100%,70%);
-}
-
-.breadcrumbs-widget-item-id,
-.breadcrumbs-widget-item-classes {
-  color: #8d99a6;
-}
-
-.breadcrumbs-widget-item-pseudo-classes {
-  color: hsl(20,100%,85%);
-}
-
-/* Breadcrumbs LTR */
-
-.breadcrumbs-widget-item:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:not([checked]):hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item[checked]:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item[checked]:hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type:not([checked]):hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type[checked]:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type[checked]:hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type:not([checked]):hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type[checked]:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type[checked]:hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:first-of-type:-moz-locale-dir(ltr) {
-  border-left-width: 0;
-}
-
-.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:last-of-type:-moz-locale-dir(ltr) {
-  border-right-width: 0;
-}
-
-/* Breadcrumbs RTL */
-
-.breadcrumbs-widget-item:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item[checked]:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item[checked]:hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type[checked]:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type[checked]:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:first-of-type:-moz-locale-dir(rtl) {
-  border-right-width: 0;
-}
-
-.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:last-of-type:-moz-locale-dir(rtl) {
-  border-left-width: 0;
-}
-
-/* SideMenuWidget */
-
-.side-menu-widget-container {
-  background: url(background-noise-toolbar.png), hsl(208,11%,27%);
-  color: #fff;
-}
-
-.side-menu-widget-container[with-arrow=true]:-moz-locale-dir(ltr),
-.side-menu-widget-group[with-arrow=true]:-moz-locale-dir(ltr),
-.side-menu-widget-item[with-arrow=true]:-moz-locale-dir(ltr) {
-  box-shadow: inset -1px 0 0 #222426;
-}
-
-.side-menu-widget-container[with-arrow=true]:-moz-locale-dir(rtl),
-.side-menu-widget-group[with-arrow=true]:-moz-locale-dir(rtl),
-.side-menu-widget-item[with-arrow=true]:-moz-locale-dir(rtl) {
-  box-shadow: inset 1px 0 0 #222426;
-}
-
-.side-menu-widget-group-title {
-  background-image: linear-gradient(#1f3e4f, #1b3243);
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
-              0 -2px 0 hsla(206,37%,4%,.05) inset,
-              0 -1px 1px hsla(206,37%,4%,.1) inset;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  padding: 4px;
-  color: #f5f7fa;
-  transition-property: color, text-shadow;
-  transition-duration: 0.3s;
-}
-
-.side-menu-widget-group:hover > .side-menu-widget-group-title {
-  text-shadow: 0 0 1px #cfcfcf;
-  color: #fff;
-}
-
-.side-menu-widget-item {
-  border-top: 1px solid hsla(210,16%,76%,.1);
-  border-bottom: 1px solid hsla(210,8%,5%,.25);
-  cursor: pointer;
-}
-
-.side-menu-widget-item:last-of-type {
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.1);
-}
-
-.side-menu-widget-item.selected {
-  background: linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%)) repeat-x top left !important;
-  box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15),
-              inset 0 -1px 0 hsla(210,40%,83%,.05);
-}
-
-.side-menu-widget-item.selected > .side-menu-widget-item-arrow {
-  background-size: auto, 1px 100%;
-  background-repeat: no-repeat;
-}
-
-.side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) {
-  background-image: url(itemArrow-ltr.png), linear-gradient(to right, black, black);
-  background-position: center right, top right;
-}
-
-.side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-rtl.png), linear-gradient(to right, black, black);
-  background-position: center left, top left;
-}
-
-.side-menu-widget-item-arrow {
-  -moz-margin-start: -8px;
-  width: 8px;
-}
-
-.side-menu-widget-item-contents {
-  padding: 4px;
-}
-
-.side-menu-widget-item label {
-  cursor: inherit;
-}
-
-.side-menu-widget-item-other {
-  background: url(background-noise-toolbar.png), hsla(208,11%,27%, 0.65);
-  margin: 0 -4px;
-  -moz-padding-start: 5px;
-}
-
-.side-menu-widget-item-other.selected {
-  background: url(background-noise-toolbar.png), hsla(208,11%,27%, 0.15);
-  box-shadow: inset 0 1px 0 hsla(210,40%,83%,.07),
-              inset 0 -1px 0 hsla(210,40%,83%,.07);
-}
-
-.side-menu-widget-item.selected .side-menu-widget-item-other:first-of-type {
-  border-top: 1px dotted #333;
-  margin-top: 3px;
-}
-
-.side-menu-widget-item-other:first-of-type {
-  margin-top: 4px;
-}
-
-.side-menu-widget-item-other:last-of-type {
-  margin-bottom: -4px;
-}
-
-.side-menu-widget-item-other > label {
-  color: #f5f7fa;
-  text-shadow: 0 1px 1px #111;
-}
-
-.side-menu-widget-empty-notice-container {
-  background: url(background-noise-toolbar.png), hsl(208,11%,27%);
-  padding: 12px;
-  color: #fff;
-  font-weight: 600;
-}
-
-/* VariablesView */
-
-.variables-view-container {
-  background: #fff;
-}
-
-.variables-view-empty-notice {
-  color: GrayText;
-  padding: 2px;
-}
-
-.variables-view-scope > .title {
-  color: #fff;
-}
-
-.variables-view-scope:focus > .title {
-  background: Highlight;
-  color: HighlightText;
-}
-
-.variables-view-scope > .variables-view-element-details:not(:empty) {
-  margin-top: 1px;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 1px;
-}
-
-.variables-view-scope > .variables-view-element-details.enum:not(:empty) {
-  border-bottom: 1px solid #ddd;
-}
-
-/* Generic traits applied to both variables and properties */
-
-.variable-or-property {
-  transition: background 1s ease-in-out;
-  color: #000;
-}
-
-.variable-or-property[changed] {
-  background: rgba(255,255,0,0.65);
-  transition-duration: 0.4s;
-}
-
-.variable-or-property > .title > .value {
-  -moz-padding-start: 6px;
-  -moz-padding-end: 4px;
-}
-
-.variable-or-property:focus > .title {
-  background: Highlight;
-  color: HighlightText;
-  border-radius: 4px;
-}
-
-.variable-or-property[editable] > .title > .value {
-  cursor: text;
-}
-
-.variable-or-property:not([non-header]) > .variables-view-element-details {
-  -moz-margin-start: 10px;
-}
-
-/* Custom variables and properties traits */
-
-.variables-view-variable {
-  -moz-margin-start: 1px;
-  -moz-margin-end: 1px;
-  border-bottom: 1px solid #eee;
-}
-
-.variables-view-variable > .title > .name {
-  font-weight: 600;
-}
-
-.variables-view-variable:not(:focus) > .title > .name {
-  color: #048;
-}
-
-.variables-view-property:not(:focus) > .title > .name {
-  color: #881090;
-}
-
-/* Token value colors */
-
-.variable-or-property:not(:focus) > .title > .token-undefined {
-  color: #bbb;
-}
-
-.variable-or-property:not(:focus) > .title > .token-null {
-  color: #999;
-}
-
-.variable-or-property:not(:focus) > .title > .token-boolean {
-  color: #10c;
-}
-
-.variable-or-property:not(:focus) > .title > .token-number {
-  color: #c00;
-}
-
-.variable-or-property:not(:focus) > .title > .token-string {
-  color: #282;
-}
-
-.variable-or-property:not(:focus) > .title > .token-other {
-  color: #333;
-}
-
-/* Custom configurable/enumerable/writable or frozen/sealed/extensible
- * variables and properties */
-
-.variable-or-property[non-enumerable]:not([self]):not([exception]):not([return]) > .title > .name {
-  opacity: 0.5;
-}
-
-.variable-or-property[non-configurable] > .title > .name {
-  border-bottom: 1px dashed #99f;
-}
-
-.variable-or-property[non-writable] > .title > .name {
-  border-bottom: 1px dashed #f99;
-}
-
-.variable-or-property-non-writable-icon {
-  background: url("chrome://browser/skin/identity-icons-https.png") no-repeat;
-  width: 16px;
-  height: 16px;
-  opacity: 0.5;
-}
-
-@media (min-resolution: 2dppx) {
-  .variable-or-property-non-writable-icon {
-    background-image: url("chrome://browser/skin/identity-icons-https@2x.png");
-    background-size: 32px;
-  }
-}
-
-.variable-or-property-frozen-label,
-.variable-or-property-sealed-label,
-.variable-or-property-non-extensible-label {
-  -moz-padding-end: 4px;
-}
-
-.variable-or-property:not(:focus) > .title > .variable-or-property-frozen-label,
-.variable-or-property:not(:focus) > .title > .variable-or-property-sealed-label,
-.variable-or-property:not(:focus) > .title > .variable-or-property-non-extensible-label {
-  color: #666;
-}
-
-/* Special variables and properties */
-
-.variable-or-property[safe-getter] > .title > .name {
-  border-bottom: 1px dashed #8b0;
-}
-
-.variable-or-property[exception]:not(:focus) > .title > .name {
-  color: #a00;
-  text-shadow: 0 0 8px #fcc;
-}
-
-.variable-or-property[return]:not(:focus) > .title > .name {
-  color: #0a0;
-  text-shadow: 0 0 8px #cfc;
-}
-
-/* Variables and properties tooltips */
-
-.variable-or-property > tooltip > label {
-  margin: 0 2px 0 2px;
-}
-
-.variable-or-property[non-enumerable] > tooltip > label[value=enumerable],
-.variable-or-property[non-configurable] > tooltip > label[value=configurable],
-.variable-or-property[non-writable] > tooltip > label[value=writable],
-.variable-or-property[non-extensible] > tooltip > label[value=extensible] {
-  color: #800;
-  text-decoration: line-through;
-}
-
-.variable-or-property[safe-getter] > tooltip > label[value=WebIDL] {
-  -moz-padding-start: 4px;
-  -moz-border-start: 1px dotted #000;
-  color: #080;
-}
-
-/* Variables and properties editing */
-
-.variables-view-delete {
-  list-style-image: url("chrome://browser/skin/devtools/vview-delete.png");
-  -moz-image-region: rect(0,16px,16px,0);
-}
-
-.variables-view-delete:hover {
-  -moz-image-region: rect(0,32px,16px,16px);
-}
-
-.variables-view-delete:active {
-  -moz-image-region: rect(0,48px,16px,32px);
-}
-
-*:not(:hover) .variables-view-delete {
-  display: none;
-}
-
-.variables-view-delete > .toolbarbutton-text {
-  display: none;
-}
-
-.variables-view-edit {
-  background: url("chrome://browser/skin/devtools/vview-edit.png") center no-repeat;
-  width: 20px;
-  height: 16px;
-  cursor: pointer;
-}
-
-.variables-view-throbber {
-  background: url("chrome://global/skin/icons/loading_16.png") center no-repeat;
-  width: 16px;
-  height: 16px;
-}
-
-.element-value-input {
-  -moz-margin-start: 4px !important;
-  -moz-margin-end: 2px !important;
-}
-
-.element-name-input {
-  -moz-margin-start: -2px !important;
-  -moz-margin-end: 2px !important;
-  color: #048;
-  font-weight: 600;
-}
-
-.element-value-input,
-.element-name-input {
-  border: 1px solid #999 !important;
-  box-shadow: 1px 2px 4px #aaa;
-}
-
-/* Variables and properties searching */
-
-.variables-view-searchinput {
-  min-height: 24px;
-}
-
-.variable-or-property[non-match] {
-  border: none;
+.side-menu-widget-group-checkbox .checkbox-spacer-box,
+.side-menu-widget-item-checkbox .checkbox-spacer-box {
   margin: 0;
-}
-
-/* Expand/collapse arrow */
-
-.arrow {
-  -moz-appearance: treetwisty;
-  height: 20px;
-  margin-top: 1px;
-  -moz-margin-start: 10px;
-  -moz-margin-end: 5px;
-}
-
-.arrow[open] {
-  -moz-appearance: treetwistyopen;
-}
-
-.arrow[invisible] {
-  visibility: hidden;
+  border: none;
 }
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index b4e385633..e390435d9 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -109,102 +109,175 @@ browser.jar:
   skin/classic/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
 #ifdef MOZ_DEVTOOLS
-* skin/classic/browser/devtools/common.css            (devtools/common.css)
-  skin/classic/browser/devtools/dark-theme.css        (devtools/dark-theme.css)
-  skin/classic/browser/devtools/light-theme.css       (devtools/light-theme.css)
-  skin/classic/browser/devtools/widgets.css           (devtools/widgets.css)
-  skin/classic/browser/devtools/commandline-icon.png  (devtools/commandline-icon.png)
-  skin/classic/browser/devtools/command-paintflashing.png  (devtools/command-paintflashing.png)
-  skin/classic/browser/devtools/command-responsivemode.png (devtools/command-responsivemode.png)
-  skin/classic/browser/devtools/command-scratchpad.png (devtools/command-scratchpad.png)
-  skin/classic/browser/devtools/command-tilt.png      (devtools/command-tilt.png)
-  skin/classic/browser/devtools/alerticon-warning.png (devtools/alerticon-warning.png)
-  skin/classic/browser/devtools/ruleview.css          (devtools/ruleview.css)
+* skin/classic/browser/devtools/common.css            (../shared/devtools/common.css)
+* skin/classic/browser/devtools/dark-theme.css        (../shared/devtools/dark-theme.css)
+* skin/classic/browser/devtools/light-theme.css       (../shared/devtools/light-theme.css)
+  skin/classic/browser/devtools/filters.svg           (../shared/devtools/filters.svg)
+  skin/classic/browser/devtools/controls.png          (../shared/devtools/images/controls.png)
+  skin/classic/browser/devtools/controls@2x.png       (../shared/devtools/images/controls@2x.png)
+  skin/classic/browser/devtools/performance-icons.svg  (../shared/devtools/images/performance-icons.svg)
+  skin/classic/browser/devtools/newtab.png             (../shared/devtools/images/newtab.png)
+  skin/classic/browser/devtools/newtab@2x.png          (../shared/devtools/images/newtab@2x.png)
+  skin/classic/browser/devtools/newtab-inverted.png    (../shared/devtools/images/newtab-inverted.png)
+  skin/classic/browser/devtools/newtab-inverted@2x.png (../shared/devtools/images/newtab-inverted@2x.png)
+* skin/classic/browser/devtools/widgets.css           (devtools/widgets.css)
+  skin/classic/browser/devtools/power.svg                     (../shared/devtools/images/power.svg)
+  skin/classic/browser/devtools/filetype-dir-close.svg        (../shared/devtools/images/filetypes/dir-close.svg)
+  skin/classic/browser/devtools/filetype-dir-open.svg         (../shared/devtools/images/filetypes/dir-open.svg)
+  skin/classic/browser/devtools/filetype-globe.svg            (../shared/devtools/images/filetypes/globe.svg)
+  skin/classic/browser/devtools/filetype-store.svg            (../shared/devtools/images/filetypes/store.svg)
+  skin/classic/browser/devtools/commandline-icon.png          (../shared/devtools/images/commandline-icon.png)
+  skin/classic/browser/devtools/commandline-icon@2x.png       (../shared/devtools/images/commandline-icon@2x.png)
+  skin/classic/browser/devtools/command-paintflashing.png     (../shared/devtools/images/command-paintflashing.png)
+  skin/classic/browser/devtools/command-paintflashing@2x.png  (../shared/devtools/images/command-paintflashing@2x.png)
+  skin/classic/browser/devtools/command-screenshot.png        (../shared/devtools/images/command-screenshot.png)
+  skin/classic/browser/devtools/command-screenshot@2x.png     (../shared/devtools/images/command-screenshot@2x.png)
+  skin/classic/browser/devtools/command-responsivemode.png    (../shared/devtools/images/command-responsivemode.png)
+  skin/classic/browser/devtools/command-responsivemode@2x.png (../shared/devtools/images/command-responsivemode@2x.png)
+  skin/classic/browser/devtools/command-scratchpad.png        (../shared/devtools/images/command-scratchpad.png)
+  skin/classic/browser/devtools/command-scratchpad@2x.png     (../shared/devtools/images/command-scratchpad@2x.png)
+  skin/classic/browser/devtools/command-tilt.png              (../shared/devtools/images/command-tilt.png)
+  skin/classic/browser/devtools/command-tilt@2x.png           (../shared/devtools/images/command-tilt@2x.png)
+  skin/classic/browser/devtools/command-pick.png              (../shared/devtools/images/command-pick.png)
+  skin/classic/browser/devtools/command-pick@2x.png           (../shared/devtools/images/command-pick@2x.png)
+  skin/classic/browser/devtools/command-frames.png            (../shared/devtools/images/command-frames.png)
+  skin/classic/browser/devtools/command-frames@2x.png         (../shared/devtools/images/command-frames@2x.png)
+  skin/classic/browser/devtools/command-console.png           (../shared/devtools/images/command-console.png)
+  skin/classic/browser/devtools/command-console@2x.png        (../shared/devtools/images/command-console@2x.png)
+  skin/classic/browser/devtools/command-eyedropper.png        (../shared/devtools/images/command-eyedropper.png)
+  skin/classic/browser/devtools/command-eyedropper@2x.png     (../shared/devtools/images/command-eyedropper@2x.png)
+  skin/classic/browser/devtools/alerticon-warning.png (../shared/devtools/images/alerticon-warning.png)
+  skin/classic/browser/devtools/alerticon-warning@2x.png      (../shared/devtools/images/alerticon-warning@2x.png)
+* skin/classic/browser/devtools/ruleview.css          (../shared/devtools/ruleview.css)
 * skin/classic/browser/devtools/webconsole.css                  (devtools/webconsole.css)
   skin/classic/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
-  skin/classic/browser/devtools/webconsole.png                  (devtools/webconsole.png)
-  skin/classic/browser/devtools/checkbox-dark.png     (devtools/checkbox-dark.png)
-  skin/classic/browser/devtools/checkbox-light.png    (devtools/checkbox-light.png)
+  skin/classic/browser/devtools/webconsole.png                  (../shared/devtools/images/webconsole.png)
+  skin/classic/browser/devtools/webconsole@2x.png               (../shared/devtools/images/webconsole@2x.png)
   skin/classic/browser/devtools/commandline.css              (devtools/commandline.css)
-  skin/classic/browser/devtools/markup-view.css      (devtools/markup-view.css)
-  skin/classic/browser/devtools/orion.css             (devtools/orion.css)
-  skin/classic/browser/devtools/orion-container.css   (devtools/orion-container.css)
-  skin/classic/browser/devtools/orion-task.png        (devtools/orion-task.png)
-  skin/classic/browser/devtools/orion-breakpoint.png  (devtools/orion-breakpoint.png)
-  skin/classic/browser/devtools/orion-debug-location.png (devtools/orion-debug-location.png)
-  skin/classic/browser/devtools/breadcrumbs-scrollbutton.png                 (devtools/breadcrumbs-scrollbutton.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png              (devtools/breadcrumbs/ltr-end-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png     (devtools/breadcrumbs/ltr-end-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end-selected.png             (devtools/breadcrumbs/ltr-end-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end.png                      (devtools/breadcrumbs/ltr-end.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle-pressed.png           (devtools/breadcrumbs/ltr-middle-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png  (devtools/breadcrumbs/ltr-middle-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected.png          (devtools/breadcrumbs/ltr-middle-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle.png                   (devtools/breadcrumbs/ltr-middle.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start-pressed.png            (devtools/breadcrumbs/ltr-start-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png   (devtools/breadcrumbs/ltr-start-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start.png                    (devtools/breadcrumbs/ltr-start.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start-selected.png           (devtools/breadcrumbs/ltr-start-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end-pressed.png              (devtools/breadcrumbs/rtl-end-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png     (devtools/breadcrumbs/rtl-end-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end-selected.png             (devtools/breadcrumbs/rtl-end-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end.png                      (devtools/breadcrumbs/rtl-end.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle-pressed.png           (devtools/breadcrumbs/rtl-middle-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png  (devtools/breadcrumbs/rtl-middle-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected.png          (devtools/breadcrumbs/rtl-middle-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle.png                   (devtools/breadcrumbs/rtl-middle.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start-pressed.png            (devtools/breadcrumbs/rtl-start-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png   (devtools/breadcrumbs/rtl-start-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start.png                    (devtools/breadcrumbs/rtl-start.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start-selected.png           (devtools/breadcrumbs/rtl-start-selected.png)
-  skin/classic/browser/devtools/splitview.css         (devtools/splitview.css)
-  skin/classic/browser/devtools/styleeditor.css       (devtools/styleeditor.css)
-  skin/classic/browser/devtools/debugger.css          (devtools/debugger.css)
+  skin/classic/browser/devtools/markup-view.css       (../shared/devtools/markup-view.css)
+  skin/classic/browser/devtools/editor-error.png       (../shared/devtools/images/editor-error.png)
+  skin/classic/browser/devtools/editor-breakpoint.png  (../shared/devtools/images/editor-breakpoint.png)
+  skin/classic/browser/devtools/editor-debug-location.png (../shared/devtools/images/editor-debug-location.png)
+  skin/classic/browser/devtools/editor-debug-location@2x.png (../shared/devtools/images/editor-debug-location@2x.png)
+  skin/classic/browser/devtools/breadcrumbs-divider@2x.png      (../shared/devtools/images/breadcrumbs-divider@2x.png)
+  skin/classic/browser/devtools/breadcrumbs-scrollbutton.png    (../shared/devtools/images/breadcrumbs-scrollbutton.png)
+  skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
+  skin/classic/browser/devtools/animationinspector.css          (../shared/devtools/animationinspector.css)
+* skin/classic/browser/devtools/canvasdebugger.css    (devtools/canvasdebugger.css)
+* skin/classic/browser/devtools/debugger.css          (devtools/debugger.css)
+  skin/classic/browser/devtools/eyedropper.css        (../shared/devtools/eyedropper.css)
+* skin/classic/browser/devtools/netmonitor.css        (devtools/netmonitor.css)
 * skin/classic/browser/devtools/profiler.css          (devtools/profiler.css)
-  skin/classic/browser/devtools/netmonitor.css        (devtools/netmonitor.css)
+* skin/classic/browser/devtools/performance.css       (devtools/performance.css)
+* skin/classic/browser/devtools/timeline.css          (devtools/timeline.css)
+  skin/classic/browser/devtools/timeline-filter.svg   (../shared/devtools/images/timeline-filter.svg)
 * skin/classic/browser/devtools/scratchpad.css        (devtools/scratchpad.css)
-  skin/classic/browser/devtools/magnifying-glass.png  (devtools/magnifying-glass.png)
-  skin/classic/browser/devtools/option-icon.png       (devtools/option-icon.png)
-  skin/classic/browser/devtools/itemToggle.png        (devtools/itemToggle.png)
-  skin/classic/browser/devtools/itemArrow-rtl.png     (devtools/itemArrow-rtl.png)
-  skin/classic/browser/devtools/itemArrow-ltr.png     (devtools/itemArrow-ltr.png)
-  skin/classic/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
-  skin/classic/browser/devtools/inspect-button.png    (devtools/inspect-button.png)
-  skin/classic/browser/devtools/dropmarker.png        (devtools/dropmarker.png)
-  skin/classic/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)
-  skin/classic/browser/devtools/layoutview.css        (devtools/layoutview.css)
-  skin/classic/browser/devtools/debugger-collapse.png  (devtools/debugger-collapse.png)
-  skin/classic/browser/devtools/debugger-expand.png    (devtools/debugger-expand.png)
-  skin/classic/browser/devtools/debugger-pause.png     (devtools/debugger-pause.png)
-  skin/classic/browser/devtools/debugger-play.png      (devtools/debugger-play.png)
-  skin/classic/browser/devtools/debugger-step-in.png   (devtools/debugger-step-in.png)
-  skin/classic/browser/devtools/debugger-step-out.png  (devtools/debugger-step-out.png)
-  skin/classic/browser/devtools/debugger-step-over.png (devtools/debugger-step-over.png)
-  skin/classic/browser/devtools/responsive-se-resizer.png (devtools/responsive-se-resizer.png)
-  skin/classic/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
-  skin/classic/browser/devtools/responsive-background.png (devtools/responsive-background.png)
-  skin/classic/browser/devtools/toggle-tools.png          (devtools/toggle-tools.png)
-  skin/classic/browser/devtools/dock-bottom.png           (devtools/dock-bottom.png)
-  skin/classic/browser/devtools/dock-side.png             (devtools/dock-side.png)
+* skin/classic/browser/devtools/shadereditor.css      (devtools/shadereditor.css)
+* skin/classic/browser/devtools/splitview.css         (../shared/devtools/splitview.css)
+  skin/classic/browser/devtools/styleeditor.css       (../shared/devtools/styleeditor.css)
+  skin/classic/browser/devtools/storage.css           (../shared/devtools/storage.css)
+* skin/classic/browser/devtools/webaudioeditor.css    (devtools/webaudioeditor.css)
+  skin/classic/browser/devtools/magnifying-glass.png        (../shared/devtools/images/magnifying-glass.png)
+  skin/classic/browser/devtools/magnifying-glass@2x.png     (../shared/devtools/images/magnifying-glass@2x.png)
+  skin/classic/browser/devtools/magnifying-glass-light.png  (../shared/devtools/images/magnifying-glass-light.png)
+  skin/classic/browser/devtools/magnifying-glass-light@2x.png (../shared/devtools/images/magnifying-glass-light@2x.png)
+  skin/classic/browser/devtools/itemToggle.png         (../shared/devtools/images/itemToggle.png)
+  skin/classic/browser/devtools/itemToggle@2x.png      (../shared/devtools/images/itemToggle@2x.png)
+  skin/classic/browser/devtools/itemArrow-dark-rtl.svg (../shared/devtools/images/itemArrow-dark-rtl.svg)
+  skin/classic/browser/devtools/itemArrow-dark-ltr.svg (../shared/devtools/images/itemArrow-dark-ltr.svg)
+  skin/classic/browser/devtools/itemArrow-rtl.svg      (../shared/devtools/images/itemArrow-rtl.svg)
+  skin/classic/browser/devtools/itemArrow-ltr.svg      (../shared/devtools/images/itemArrow-ltr.svg)
+  skin/classic/browser/devtools/noise.png             (../shared/devtools/images/noise.png)
+  skin/classic/browser/devtools/dropmarker.svg        (../shared/devtools/images/dropmarker.svg)
+  skin/classic/browser/devtools/layoutview.css         (../shared/devtools/layoutview.css)
+  skin/classic/browser/devtools/debugger-collapse.png  (../shared/devtools/images/debugger-collapse.png)
+  skin/classic/browser/devtools/debugger-collapse@2x.png  (../shared/devtools/images/debugger-collapse@2x.png)
+  skin/classic/browser/devtools/debugger-expand.png    (../shared/devtools/images/debugger-expand.png)
+  skin/classic/browser/devtools/debugger-expand@2x.png    (../shared/devtools/images/debugger-expand@2x.png)
+  skin/classic/browser/devtools/debugger-pause.png     (../shared/devtools/images/debugger-pause.png)
+  skin/classic/browser/devtools/debugger-pause@2x.png     (../shared/devtools/images/debugger-pause@2x.png)
+  skin/classic/browser/devtools/debugger-play.png      (../shared/devtools/images/debugger-play.png)
+  skin/classic/browser/devtools/debugger-play@2x.png      (../shared/devtools/images/debugger-play@2x.png)
+  skin/classic/browser/devtools/debugger-step-in.png   (../shared/devtools/images/debugger-step-in.png)
+  skin/classic/browser/devtools/debugger-step-in@2x.png   (../shared/devtools/images/debugger-step-in@2x.png)
+  skin/classic/browser/devtools/debugger-step-out.png  (../shared/devtools/images/debugger-step-out.png)
+  skin/classic/browser/devtools/debugger-step-out@2x.png  (../shared/devtools/images/debugger-step-out@2x.png)
+  skin/classic/browser/devtools/debugger-step-over.png (../shared/devtools/images/debugger-step-over.png)
+  skin/classic/browser/devtools/debugger-step-over@2x.png (../shared/devtools/images/debugger-step-over@2x.png)
+  skin/classic/browser/devtools/debugger-blackbox.png  (../shared/devtools/images/debugger-blackbox.png)
+  skin/classic/browser/devtools/debugger-blackbox@2x.png  (../shared/devtools/images/debugger-blackbox@2x.png)
+  skin/classic/browser/devtools/debugger-prettyprint.png  (../shared/devtools/images/debugger-prettyprint.png)
+  skin/classic/browser/devtools/debugger-prettyprint@2x.png (../shared/devtools/images/debugger-prettyprint@2x.png)
+  skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
+  skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
+  skin/classic/browser/devtools/tracer-icon.png        (../shared/devtools/images/tracer-icon.png)
+  skin/classic/browser/devtools/tracer-icon@2x.png     (../shared/devtools/images/tracer-icon@2x.png)
+  skin/classic/browser/devtools/responsive-se-resizer.png          (../shared/devtools/images/responsivemode/responsive-se-resizer.png)
+  skin/classic/browser/devtools/responsive-se-resizer@2x.png       (../shared/devtools/images/responsivemode/responsive-se-resizer@2x.png)
+  skin/classic/browser/devtools/responsive-vertical-resizer.png    (../shared/devtools/images/responsivemode/responsive-vertical-resizer.png)
+  skin/classic/browser/devtools/responsive-vertical-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer@2x.png)
+  skin/classic/browser/devtools/responsive-horizontal-resizer.png  (../shared/devtools/images/responsivemode/responsive-horizontal-resizer.png)
+  skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png  (../shared/devtools/images/responsivemode/responsive-horizontal-resizer@2x.png)
+  skin/classic/browser/devtools/responsiveui-rotate.png          (../shared/devtools/images/responsivemode/responsiveui-rotate.png)
+  skin/classic/browser/devtools/responsiveui-rotate@2x.png       (../shared/devtools/images/responsivemode/responsiveui-rotate@2x.png)
+  skin/classic/browser/devtools/responsiveui-touch.png           (../shared/devtools/images/responsivemode/responsiveui-touch.png)
+  skin/classic/browser/devtools/responsiveui-touch@2x.png        (../shared/devtools/images/responsivemode/responsiveui-touch@2x.png)
+  skin/classic/browser/devtools/responsiveui-screenshot.png      (../shared/devtools/images/responsivemode/responsiveui-screenshot.png)
+  skin/classic/browser/devtools/responsiveui-screenshot@2x.png   (../shared/devtools/images/responsivemode/responsiveui-screenshot@2x.png)
+  skin/classic/browser/devtools/toggle-tools.png          (../shared/devtools/images/toggle-tools.png)
+  skin/classic/browser/devtools/toggle-tools@2x.png       (../shared/devtools/images/toggle-tools@2x.png)
+  skin/classic/browser/devtools/dock-bottom@2x.png        (../shared/devtools/images/dock-bottom@2x.png)
+  skin/classic/browser/devtools/dock-side@2x.png          (../shared/devtools/images/dock-side@2x.png)
   skin/classic/browser/devtools/floating-scrollbars.css   (devtools/floating-scrollbars.css)
   skin/classic/browser/devtools/floating-scrollbars-light.css (devtools/floating-scrollbars-light.css)
-  skin/classic/browser/devtools/inspector.css             (devtools/inspector.css)
-  skin/classic/browser/devtools/toolbox.css               (devtools/toolbox.css)
-  skin/classic/browser/devtools/tool-options.png          (devtools/tool-options.png)
-  skin/classic/browser/devtools/tool-webconsole.png       (devtools/tool-webconsole.png)
-  skin/classic/browser/devtools/tool-debugger.png         (devtools/tool-debugger.png)
-  skin/classic/browser/devtools/tool-debugger-paused.png  (devtools/tool-debugger-paused.png)
-  skin/classic/browser/devtools/tool-inspector.png        (devtools/tool-inspector.png)
-  skin/classic/browser/devtools/tool-styleeditor.png      (devtools/tool-styleeditor.png)
-  skin/classic/browser/devtools/tool-profiler.png         (devtools/tool-profiler.png)
-  skin/classic/browser/devtools/tool-network.png          (devtools/tool-network.png)
-  skin/classic/browser/devtools/close.png                 (devtools/close.png)
-  skin/classic/browser/devtools/vview-delete.png          (devtools/vview-delete.png)
-  skin/classic/browser/devtools/vview-edit.png            (devtools/vview-edit.png)
-  skin/classic/browser/devtools/undock.png                (devtools/undock.png)
-  skin/classic/browser/devtools/font-inspector.css        (devtools/font-inspector.css)
-  skin/classic/browser/devtools/computedview.css          (devtools/computedview.css)
-  skin/classic/browser/devtools/arrow-e.png               (devtools/arrow-e.png)
+* skin/classic/browser/devtools/inspector.css               (../shared/devtools/inspector.css)
+  skin/classic/browser/devtools/profiler-stopwatch.svg      (../shared/devtools/images/profiler-stopwatch.svg)
+  skin/classic/browser/devtools/profiler-stopwatch-checked.svg      (../shared/devtools/images/profiler-stopwatch-checked.svg)
+  skin/classic/browser/devtools/tool-options.svg            (../shared/devtools/images/tool-options.svg)
+  skin/classic/browser/devtools/tool-webconsole.svg         (../shared/devtools/images/tool-webconsole.svg)
+  skin/classic/browser/devtools/tool-debugger.svg           (../shared/devtools/images/tool-debugger.svg)
+  skin/classic/browser/devtools/tool-debugger-paused.svg    (../shared/devtools/images/tool-debugger-paused.svg)
+  skin/classic/browser/devtools/tool-inspector.svg          (../shared/devtools/images/tool-inspector.svg)
+  skin/classic/browser/devtools/tool-inspector.svg          (../shared/devtools/images/tool-inspector.svg)
+  skin/classic/browser/devtools/tool-styleeditor.svg        (../shared/devtools/images/tool-styleeditor.svg)
+  skin/classic/browser/devtools/tool-storage.svg            (../shared/devtools/images/tool-storage.svg)
+  skin/classic/browser/devtools/tool-profiler.svg           (../shared/devtools/images/tool-profiler.svg)
+  skin/classic/browser/devtools/tool-network.svg            (../shared/devtools/images/tool-network.svg)
+  skin/classic/browser/devtools/tool-scratchpad.svg         (../shared/devtools/images/tool-scratchpad.svg)
+  skin/classic/browser/devtools/tool-webaudio.svg           (../shared/devtools/images/tool-webaudio.svg)
+  skin/classic/browser/devtools/close.png                   (../shared/devtools/images/close.png)
+  skin/classic/browser/devtools/close@2x.png                (../shared/devtools/images/close@2x.png)
+  skin/classic/browser/devtools/vview-delete.png            (../shared/devtools/images/vview-delete.png)
+  skin/classic/browser/devtools/vview-delete@2x.png         (../shared/devtools/images/vview-delete@2x.png)
+  skin/classic/browser/devtools/vview-edit.png              (../shared/devtools/images/vview-edit.png)
+  skin/classic/browser/devtools/vview-edit@2x.png           (../shared/devtools/images/vview-edit@2x.png)
+  skin/classic/browser/devtools/vview-lock.png              (../shared/devtools/images/vview-lock.png)
+  skin/classic/browser/devtools/vview-lock@2x.png           (../shared/devtools/images/vview-lock@2x.png)
+  skin/classic/browser/devtools/vview-open-inspector.png    (../shared/devtools/images/vview-open-inspector.png)
+  skin/classic/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png)
+  skin/classic/browser/devtools/cubic-bezier-swatch.png     (../shared/devtools/images/cubic-bezier-swatch.png)
+  skin/classic/browser/devtools/cubic-bezier-swatch@2x.png  (../shared/devtools/images/cubic-bezier-swatch@2x.png)
+  skin/classic/browser/devtools/undock@2x.png               (../shared/devtools/images/undock@2x.png)
+  skin/classic/browser/devtools/font-inspector.css          (../shared/devtools/font-inspector.css)
+  skin/classic/browser/devtools/computedview.css            (../shared/devtools/computedview.css)
+  skin/classic/browser/devtools/arrow-e.png                 (../shared/devtools/images/arrow-e.png)
+  skin/classic/browser/devtools/arrow-e@2x.png              (../shared/devtools/images/arrow-e@2x.png)
+  skin/classic/browser/devtools/responsiveui-home.png       (../shared/devtools/responsiveui-home.png)
+  skin/classic/browser/devtools/projecteditor/projecteditor.css         (../shared/devtools/projecteditor/projecteditor.css)
+  skin/classic/browser/devtools/app-manager/connection-footer.css     (../shared/devtools/app-manager/connection-footer.css)
+  skin/classic/browser/devtools/app-manager/index.css                 (../shared/devtools/app-manager/index.css)
+  skin/classic/browser/devtools/app-manager/device.css                (../shared/devtools/app-manager/device.css)
+  skin/classic/browser/devtools/app-manager/projects.css              (../shared/devtools/app-manager/projects.css)
+  skin/classic/browser/devtools/app-manager/help.css                  (../shared/devtools/app-manager/help.css)
+  skin/classic/browser/devtools/app-manager/warning.svg               (../shared/devtools/app-manager/images/warning.svg)
+  skin/classic/browser/devtools/app-manager/error.svg                 (../shared/devtools/app-manager/images/error.svg)
+  skin/classic/browser/devtools/app-manager/plus.svg                  (../shared/devtools/app-manager/images/plus.svg)
+  skin/classic/browser/devtools/app-manager/remove.svg                (../shared/devtools/app-manager/images/remove.svg)
+  skin/classic/browser/devtools/app-manager/add.svg                   (../shared/devtools/app-manager/images/add.svg)
+  skin/classic/browser/devtools/app-manager/index-icons.svg           (../shared/devtools/app-manager/images/index-icons.svg)
+  skin/classic/browser/devtools/app-manager/rocket.svg                (../shared/devtools/app-manager/images/rocket.svg)
+  skin/classic/browser/devtools/app-manager/noise.png                 (../shared/devtools/app-manager/images/noise.png)
+  skin/classic/browser/devtools/app-manager/default-app-icon.png      (../shared/devtools/app-manager/images/default-app-icon.png)
 #endif
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-16-throbber.png
diff --git a/browser/themes/linux/moz.build b/browser/themes/linux/moz.build
index 4c7366cd5..6a7af20ad 100644
--- a/browser/themes/linux/moz.build
+++ b/browser/themes/linux/moz.build
@@ -6,3 +6,4 @@
 
 DIRS += ['communicator']
 
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file