From 28cc1aee316a9ab1f99dd77799fbc364245ee2ec Mon Sep 17 00:00:00 2001
From: Girish Sharma <scrapmachines@gmail.com>
Date: Fri, 21 Jun 2013 19:24:35 +0300
Subject: [PATCH] Bug 873848 - Make the developer toolbar consistent with
 Toolbox design, r=jwalker, paul, jaws

---
 browser/base/content/browser.css              |   3 +-
 browser/base/content/browser.xul              |   5 +-
 browser/devtools/framework/toolbox.xul        |   2 +
 browser/themes/linux/browser.css              |  71 --------------
 browser/themes/linux/devtools/close-dark.png  | Bin 0 -> 607 bytes
 .../linux/devtools/commandline-icon.png       | Bin 0 -> 375 bytes
 browser/themes/linux/devtools/commandline.css |  14 +--
 browser/themes/linux/devtools/common.css      |  22 ++++-
 .../themes/linux/devtools/computedview.css    |   6 --
 browser/themes/linux/devtools/debugger.css    |   5 +-
 browser/themes/linux/devtools/goto-mdn.png    | Bin 661 -> 0 bytes
 .../themes/linux/devtools/toggle-tools.png    | Bin 0 -> 1787 bytes
 browser/themes/linux/devtools/toolbox.css     |  10 +-
 .../linux/devtools/tools-icons-small.png      | Bin 2976 -> 0 bytes
 browser/themes/linux/devtools/webconsole.css  |   2 +-
 browser/themes/linux/devtools/widgets.css     |   2 +-
 browser/themes/linux/jar.mn                   |   6 +-
 browser/themes/osx/browser.css                |  79 +---------------
 browser/themes/osx/devtools/close-dark.png    | Bin 0 -> 607 bytes
 .../themes/osx/devtools/commandline-icon.png  | Bin 0 -> 375 bytes
 browser/themes/osx/devtools/commandline.css   |  14 +--
 browser/themes/osx/devtools/common.css        |  12 ++-
 browser/themes/osx/devtools/computedview.css  |   6 --
 browser/themes/osx/devtools/debugger.css      |   5 +-
 browser/themes/osx/devtools/goto-mdn.png      | Bin 661 -> 0 bytes
 browser/themes/osx/devtools/toggle-tools.png  | Bin 0 -> 1787 bytes
 .../osx/devtools/toolbarbutton-close.png      | Bin 1031 -> 0 bytes
 browser/themes/osx/devtools/toolbox.css       |  10 +-
 .../themes/osx/devtools/tools-icons-small.png | Bin 2976 -> 0 bytes
 browser/themes/osx/devtools/webconsole.css    |   2 +-
 browser/themes/osx/devtools/widgets.css       |   3 +-
 browser/themes/osx/jar.mn                     |   7 +-
 .../shared/devtools/commandline.inc.css       |  87 +++++++++++++-----
 browser/themes/windows/browser.css            |  66 -------------
 .../themes/windows/devtools/close-dark.png    | Bin 0 -> 607 bytes
 .../windows/devtools/commandline-icon.png     | Bin 0 -> 375 bytes
 .../themes/windows/devtools/commandline.css   |  14 +--
 browser/themes/windows/devtools/common.css    |  13 +--
 .../themes/windows/devtools/computedview.css  |   6 --
 browser/themes/windows/devtools/debugger.css  |   5 +-
 browser/themes/windows/devtools/goto-mdn.png  | Bin 661 -> 0 bytes
 .../themes/windows/devtools/toggle-tools.png  | Bin 0 -> 1787 bytes
 .../windows/devtools/toolbarbutton-close.png  | Bin 898 -> 0 bytes
 browser/themes/windows/devtools/toolbox.css   |  10 +-
 .../windows/devtools/tools-icons-small.png    | Bin 2976 -> 0 bytes
 .../themes/windows/devtools/webconsole.css    |   2 +-
 browser/themes/windows/devtools/widgets.css   |   3 +-
 browser/themes/windows/jar.mn                 |  14 ++-
 48 files changed, 155 insertions(+), 351 deletions(-)
 create mode 100644 browser/themes/linux/devtools/close-dark.png
 create mode 100644 browser/themes/linux/devtools/commandline-icon.png
 delete mode 100644 browser/themes/linux/devtools/goto-mdn.png
 create mode 100644 browser/themes/linux/devtools/toggle-tools.png
 delete mode 100644 browser/themes/linux/devtools/tools-icons-small.png
 create mode 100644 browser/themes/osx/devtools/close-dark.png
 create mode 100644 browser/themes/osx/devtools/commandline-icon.png
 delete mode 100644 browser/themes/osx/devtools/goto-mdn.png
 create mode 100644 browser/themes/osx/devtools/toggle-tools.png
 delete mode 100644 browser/themes/osx/devtools/toolbarbutton-close.png
 delete mode 100644 browser/themes/osx/devtools/tools-icons-small.png
 create mode 100644 browser/themes/windows/devtools/close-dark.png
 create mode 100644 browser/themes/windows/devtools/commandline-icon.png
 delete mode 100644 browser/themes/windows/devtools/goto-mdn.png
 create mode 100644 browser/themes/windows/devtools/toggle-tools.png
 delete mode 100644 browser/themes/windows/devtools/toolbarbutton-close.png
 delete mode 100644 browser/themes/windows/devtools/tools-icons-small.png

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index b5d89fe7616..83d30ded9ef 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -598,8 +598,7 @@ html|*#gcli-output-frame,
 }
 
 .gclitoolbar-input-node,
-.gclitoolbar-complete-node,
-.gclitoolbar-prompt {
+.gclitoolbar-complete-node {
   direction: ltr;
 }
 
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 14b4242a8c1..e67b2838e74 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1121,11 +1121,8 @@
                          tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
 #endif
           <stack class="gclitoolbar-stack-node" flex="1">
-            <hbox class="gclitoolbar-prompt">
-              <label class="gclitoolbar-prompt-label">&#187;</label>
-            </hbox>
-            <hbox class="gclitoolbar-complete-node"/>
             <textbox class="gclitoolbar-input-node" rows="1"/>
+            <hbox class="gclitoolbar-complete-node"/>
           </stack>
           <toolbarbutton id="developer-toolbar-toolbox-button"
                          class="developer-toolbar-button"
diff --git a/browser/devtools/framework/toolbox.xul b/browser/devtools/framework/toolbox.xul
index 2002b1fad1c..e1cd2f7f8d9 100644
--- a/browser/devtools/framework/toolbox.xul
+++ b/browser/devtools/framework/toolbox.xul
@@ -30,6 +30,7 @@
 #ifdef XP_MACOSX
       <hbox id="toolbox-controls">
         <toolbarbutton id="toolbox-close"
+                       class="devtools-closebutton"
                        tooltiptext="&toolboxCloseButton.tooltip;"/>
         <hbox id="toolbox-dock-buttons"/>
       </hbox>
@@ -42,6 +43,7 @@
       <hbox id="toolbox-controls">
         <hbox id="toolbox-dock-buttons"/>
         <toolbarbutton id="toolbox-close"
+                       class="devtools-closebutton"
                        tooltiptext="&toolboxCloseButton.tooltip;"/>
       </hbox>
 #endif
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 9e469b40f03..6ef6748ba75 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2062,12 +2062,6 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   font-size: 120%;
 }
 
-/* Developer toolbar */
-
-#developer-toolbar {
-  border-top: 1px solid hsla(210, 8%, 5%, .65);
-}
-
 %include ../shared/devtools/responsivedesign.inc.css
 %include ../shared/devtools/highlighter.inc.css
 %include ../shared/devtools/commandline.inc.css
@@ -2076,81 +2070,16 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   padding: 0;
 }
 
-.gclitoolbar-input-node {
-  border-color: hsl(210,11%,10%);
-  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);
-}
-
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   color: hsl(210,11%,16%);
 }
 
-.gclitoolbar-prompt {
-  background-color: hsl(210,11%,16%);
-}
-
 /* Web Console */
 
 .web-console-frame {
   border-bottom: 1px solid #aaa;
 }
 
-.web-console-frame[animated] {
-  transition: height 100ms;
-}
-
-/* Developer Toolbar */
-
-#developer-toolbar-toolbox-button {
-  min-width: 18px;
-}
-
-#developer-toolbar-toolbox-button > .toolbarbutton-text {
-  display: none;
-}
-
-#developer-toolbar-toolbox-button > .toolbarbutton-icon {
-  -moz-margin-end: 0;
-}
-
-.developer-toolbar-button {
-  -moz-appearance: none;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  border-radius: 3px;
-  color: inherit;
-  border: 1px solid transparent;
-  margin: 0 5px;
-  padding: 0 10px;
-  list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
-}
-
-.developer-toolbar-button[open=true],
-.developer-toolbar-button:active:hover,
-.developer-toolbar-button[checked=true] {
-  border-color: hsla(210,8%,5%,.6);
-  background: rgba(0,0,0,.6);
-  box-shadow: 0 1px 2px rgba(0,0,0,.5) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-.developer-toolbar-button:hover,
-.developer-toolbar-button[checked=true],
-.developer-toolbar-button[open=true] {
-  color: hsl(208,100%,60%) !important;
-  text-shadow: 0 0 6px hsl(208,100%,60%);
-}
-
-.developer-toolbar-button[checked=true] {
-  background: rgba(0,0,0,.4);
-}
-
-#developer-toolbar-toolbox-button {
-  -moz-image-region: rect(64px, 22px, 80px, 0);
-}
-
 /* Error counter */
 
 #developer-toolbar-toolbox-button[error-count]:before {
diff --git a/browser/themes/linux/devtools/close-dark.png b/browser/themes/linux/devtools/close-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..548374d0725b7aeccc7ee9b1f03a4c69a90af34b
GIT binary patch
literal 607
zcmV-l0-*hgP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM
zkN^My<w-<ARCwB?(>+V;Pyoj9EL~H`6uO4K<mBWer`jSaf{NFvpQg~Yp|NQd#e%)i
zQn9v(76f0Q76*~y7szZOY69nTJa@Q7kci%w;lDh?Z+oOfG9~#lq5NZ#<j;gci|cE$
zs#OxnRQFGkRjopc>udf@D3U)DimYmt(bk4|Ds5w0`tfB?rEQG1HiWEdm3JVKOm**9
zmvO;4&cEq`bKI{kBauvXKLEGI0*0L9)V9&LEDUTLL(Vbe9E16GI^S-Kg*b3kSVZ5l
zFm3KZgaVKC296oSF=KeFHy}cRX>$*K%feM*F%DcV<k4dcZ9;J8xQK!X4?7+nc05Eu
zggeJYn-KIE!{tIg4vg{~UDHIzG||#^j2#zY5FrdAj2#y(T}Q_>(KSts@;nZlaT{$)
zaYQLvgkbErczJ%s%k%4RfDjx}iZ-P<<8~Yv*cJ{A0|&Z}iCae)gt)2Ja8s=z3_?uY
zIu3LlhlYWHZN-5Ti(#J-Ox!x&f)Ll$8oW#fUM7R<Y7K95WS<b6SS$|oC`B`ugPTsH
zs%dc3X*6@WPq!YWp8*CM*(|(oYGkwMQR5>Zt6F)Nkf=iq{4~gyb*O<|LLyn!%I^SM
t+FX%Ut^5~fDzl}{6@Mla>3{G1YXI-}02!<r@74eS002ovPDHLkV1iwh{9ph8

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/devtools/commandline-icon.png b/browser/themes/linux/devtools/commandline-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e120a392606af02764ee50b2fbec64caeab4f8f3
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz8A(JzRCwBA{Qv(y!$1Nih5-fx?f@2K
z&V}30(xA*kKzsv;(fMFtpelvcFs<olVey#?#B+ccoeu`rGL3PDz$_?j2gKr7_{4_j
zY#_G8!Y3*U=0RzHAm+lt#|J<@=7zG50kI?+Uy2w9`~l*nP<9Lu|3l*wN;lttSQg5D
z3N;Uz&qhol{0hWtq3jead_v#}D5*f%Ke6zM$_0!B_@w4ACQ`B?DBgmg>^WHYgn$eX
zpM$d5vGDOa02D{jQ1%jNRz>FjBVai{5I=^prGc0ejsFX0IRFjj1SoqW5Pyf}VHp1#
z0n3?z_yd$}4a6^@i4ewrhPNO>vg{C4a~c|-5P(^h2F-T=(fF7NZL~5PXa@iU7yuB?
VM>c5s8}I-C002ovPDHLkV1f<PmE`~c

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/devtools/commandline.css b/browser/themes/linux/devtools/commandline.css
index 863a74a4086..7eee7eb5c2c 100644
--- a/browser/themes/linux/devtools/commandline.css
+++ b/browser/themes/linux/devtools/commandline.css
@@ -10,9 +10,9 @@
 
 #gcli-output-root,
 #gcli-tooltip-root {
-  border: 1px solid hsl(210,11%,10%);
+  border: 1px solid hsl(206,37%,4%);
   box-shadow: 0 1px 0 hsla(209,29%,72%,.25) inset;
-  background-image: linear-gradient(hsla(209,11%,18%,0.9), hsl(210,11%,16%));
+  background-image: linear-gradient(hsla(209,18%,18%,0.9), hsl(209,23%,18%));
   border-radius: 3px;
 }
 
@@ -32,9 +32,9 @@
   margin-left: 8px;
   width: 20px;
   height: 10px;
-  border-left: 1px solid hsl(210,11%,10%);
-  border-right: 1px solid hsl(210,11%,10%);
-  background-color: hsl(210,11%,16%);
+  border-left: 1px solid hsl(206,37%,4%);
+  border-right: 1px solid hsl(206,37%,4%);
+  background-color: hsl(209,23%,18%);
 }
 
 .gcli-tt-description,
@@ -83,8 +83,8 @@
   font-weight: normal;
   font-size: 90%;
   border-radius: 3px;
-  background-color: hsl(210,11%,16%);
-  border: 1px solid hsl(210,11%,10%);
+  background-color: hsl(209,23%,18%);
+  border: 1px solid hsl(206,37%,4%);
 }
 
 .gcli-out-shortcut:before,
diff --git a/browser/themes/linux/devtools/common.css b/browser/themes/linux/devtools/common.css
index 8865f23cdb4..7ec3aef9bdb 100644
--- a/browser/themes/linux/devtools/common.css
+++ b/browser/themes/linux/devtools/common.css
@@ -184,9 +184,13 @@
 /* Close button */
 
 .devtools-closebutton {
-  list-style-image: url("moz-icon://stock/gtk-close?size=menu");
-  margin-top: 0;
-  margin-bottom: 0;
+  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 {
@@ -195,6 +199,18 @@
   margin: -4px;
 }
 
+.devtools-closebutton > .toolbarbutton-text {
+  display: none;
+}
+
+.devtools-closebutton:hover {
+  opacity: 0.8;
+}
+
+.devtools-closebutton:hover:active {
+  opacity: 1;
+}
+
 /* Splitters */
 
 .devtools-horizontal-splitter {
diff --git a/browser/themes/linux/devtools/computedview.css b/browser/themes/linux/devtools/computedview.css
index 236cb032366..8995658932d 100644
--- a/browser/themes/linux/devtools/computedview.css
+++ b/browser/themes/linux/devtools/computedview.css
@@ -82,12 +82,6 @@ body {
 }
 
 /* From skin */
-.helplink {
-  /* FIXME: remove this image 
-  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
-  */
-}
-
 .expander {
   visibility: hidden;
   margin-left: -12px!important;
diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css
index 60d32724ac8..2887d39132a 100644
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -83,13 +83,12 @@
 
 .dbg-expression {
   height: 20px;
-  -moz-padding-start: 8px;
 }
 
 .dbg-expression-arrow {
-  width: 10px;
+  width: 16px;
   height: auto;
-  background: url("chrome://browser/skin/devtools/commandline.png") 0px 4px no-repeat;
+  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
 }
 
 .dbg-expression-input {
diff --git a/browser/themes/linux/devtools/goto-mdn.png b/browser/themes/linux/devtools/goto-mdn.png
deleted file mode 100644
index dbe064863d65ac3123a7a60070114dd465852de2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 661
zcmV;G0&4w<P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipn-
z2m%$DyLk=(00I?BL_t(2&sCB?Zxc}v#DDkh-PyVG`C^*@2}yxvJ^(@nAt)nCl!gMO
zrA+~m(o!O%NEB%)k%&Zr_zXc%P*5X80V3cS;`rY=j_<v<6iH07(ljHDW@mRiZaj@R
zo#LVY_0?Lx*B_8&BLLz!A}uFeySn6YX1uAe^FI0b=0!^>pCAm;Ism{L!(?)VbC%l=
z9$%(<cL1OO-aWf_e`kBMRg5CyQVFd!)*3(v!hk4_DMk@H+nX)+b}Gk?jkWTJ*N=K}
zsf_O{e5JThEmMwX2m*~0VKf@^<M&^zwG4*??mT>%dSAYMm(h5F)*;GQ)E6&NEClSf
zI~<NDRLU{6*@WG8ht9zOV{+n|5S3+Pl=4xYhgOPWAwWdv4@Ts<q1(>@xN@-yfKrMq
z8>5Z2_(6am7-#vpw-10I094W#fZcWn5D>vShgQCih#(^1pm*W`P@PSvrV0Jwh;DC)
z6NeK4546?_>l~g^oO=`y&lK424*1pX9B(0l6CnsRx)enm^!hl!^VK=wpH3I+9L`w)
zoOL*BC?zSXvAmIra~Nx|#!i6~>Pz#~7w4y(a~2UtV|gQ0qz!X(<;jA{bFBG~d~(F$
z_=sUPnsO%3xwW#sK-w^8D)%}0^!9nnScB)C<n=r_$)$at=F0j!wPt@>x#JUFA2e6D
vlDS%yLZ~q|$CwFWsF|x(Xs&K0ry_uVAQ%nSnI7d%00000NkvXXu0mjf<!Km0

diff --git a/browser/themes/linux/devtools/toggle-tools.png b/browser/themes/linux/devtools/toggle-tools.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a40d0d116d76c6ec4a77a459797f9f5e112df69
GIT binary patch
literal 1787
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

literal 0
HcmV?d00001

diff --git a/browser/themes/linux/devtools/toolbox.css b/browser/themes/linux/devtools/toolbox.css
index f9b9aa39e9c..53aca2687a9 100644
--- a/browser/themes/linux/devtools/toolbox.css
+++ b/browser/themes/linux/devtools/toolbox.css
@@ -26,21 +26,15 @@
   list-style-image: url("chrome://browser/skin/devtools/undock.png");
 }
 
-#toolbox-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
-}
-
 #toolbox-dock-window,
 #toolbox-dock-bottom,
-#toolbox-dock-side,
-#toolbox-close {
+#toolbox-dock-side {
   opacity: 0.6;
 }
 
 #toolbox-dock-window:hover,
 #toolbox-dock-bottom:hover,
-#toolbox-dock-side:hover,
-#toolbox-close:hover {
+#toolbox-dock-side:hover {
   opacity: 1;
 }
 
diff --git a/browser/themes/linux/devtools/tools-icons-small.png b/browser/themes/linux/devtools/tools-icons-small.png
deleted file mode 100644
index 12e9c72acc819abb8dcc9985d94ea3b1b9bbda2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2976
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
Wc;m0cEV&i{0000<MNUMnLSTZjh`|{E

diff --git a/browser/themes/linux/devtools/webconsole.css b/browser/themes/linux/devtools/webconsole.css
index b6be5060716..23206976467 100644
--- a/browser/themes/linux/devtools/webconsole.css
+++ b/browser/themes/linux/devtools/webconsole.css
@@ -223,7 +223,7 @@
 
 .jsterm-input-node {
   width: 98%;
-  background: url("chrome://browser/skin/devtools/commandline.png") 4px 3px no-repeat;
+  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16) no-repeat;
 }
 
 :-moz-any(.jsterm-input-node,
diff --git a/browser/themes/linux/devtools/widgets.css b/browser/themes/linux/devtools/widgets.css
index 01b23fd7337..0e164e372ca 100644
--- a/browser/themes/linux/devtools/widgets.css
+++ b/browser/themes/linux/devtools/widgets.css
@@ -566,7 +566,7 @@
 /* Variables and properties editing */
 
 .variables-view-delete {
-  list-style-image: url("moz-icon://stock/gtk-close?size=menu");
+  list-style-image: url("chrome://browser/skin/devtools/close-dark.png");
   opacity: 0;
 }
 
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index aa30b8131a9..ad14cf7461e 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -124,13 +124,12 @@ browser.jar:
   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.png       (devtools/commandline.png)
+  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/goto-mdn.png          (devtools/goto-mdn.png)
   skin/classic/browser/devtools/ruleview.css          (devtools/ruleview.css)
   skin/classic/browser/devtools/webconsole.css                  (devtools/webconsole.css)
   skin/classic/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
@@ -195,7 +194,7 @@ browser.jar:
   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/tools-icons-small.png     (devtools/tools-icons-small.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/floating-scrollbars.css   (devtools/floating-scrollbars.css)
@@ -210,6 +209,7 @@ browser.jar:
   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/close-dark.png            (devtools/close-dark.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)
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 38743937cfb..a1e69e9a987 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3555,98 +3555,25 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   font-size: 120%;
 }
 
-/* Developer toolbar */
-
-#developer-toolbar {
-  border-top: 1px solid hsla(210, 8%, 5%, .65);
-  padding-top: 4px;
-  padding-bottom: 4px;
-}
-
-#developer-toolbar:-moz-locale-dir(ltr) {
-  padding-left: 2px;
-  padding-right: 16px; /* use -moz-padding-end when/if bug 631729 gets fixed */
-}
-
-#developer-toolbar:-moz-locale-dir(rtl) {
-  padding-left: 4px;
-  padding-right: 18px; /* use -moz-padding-end when/if bug 631729 gets fixed */
-}
-
 %include ../shared/devtools/responsivedesign.inc.css
 %include ../shared/devtools/highlighter.inc.css
 %include ../shared/devtools/commandline.inc.css
 
-.gclitoolbar-input-node,
-.gclitoolbar-complete-node,
-.gclitoolbar-prompt {
-  border-radius: @toolbarbuttonCornerRadius@;
-}
-
-.gclitoolbar-input-node {
-  border-color: hsl(210,11%,10%);
-  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);
-}
-
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   color: hsl(210,11%,16%);
 }
 
-.gclitoolbar-prompt {
-  background-color: hsl(210,11%,16%);
-}
-
 /* Web Console */
 
 .web-console-frame {
   border-bottom: 1px solid #aaa;
 }
 
-.web-console-frame[animated] {
-  transition: height 100ms;
-}
-
 /* Developer Toolbar */
 
-#developer-toolbar-toolbox-button {
-  min-width: 18px;
-}
-
-#developer-toolbar-toolbox-button > .toolbarbutton-text {
-  display: none;
-}
-
-.developer-toolbar-button {
-  -moz-appearance: none;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  border-radius: @toolbarbuttonCornerRadius@;
-  color: inherit;
-  border: 1px solid transparent;
-  margin: 0 5px;
-  padding: 0 10px;
-  list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
-}
-
-.developer-toolbar-button[open=true],
-.developer-toolbar-button:active:hover,
-.developer-toolbar-button[checked=true] {
-  border-color: hsla(210,8%,5%,.6);
-  background: rgba(0,0,0,.6);
-  box-shadow: 0 1px 2px rgba(0,0,0,.5) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-.developer-toolbar-button[checked=true] {
-  color: hsl(208,100%,60%) !important;
-  background: rgba(0,0,0,.4);
-  text-shadow: 0 0 6px hsl(208,100%,60%);
-}
-
-#developer-toolbar-toolbox-button {
-  -moz-image-region: rect(64px, 16px, 80px, 0);
+#developer-toolbar-closebutton {
+  margin-left: 8px;
+  margin-right: 8px;
 }
 
 /* Error counter */
diff --git a/browser/themes/osx/devtools/close-dark.png b/browser/themes/osx/devtools/close-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..548374d0725b7aeccc7ee9b1f03a4c69a90af34b
GIT binary patch
literal 607
zcmV-l0-*hgP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM
zkN^My<w-<ARCwB?(>+V;Pyoj9EL~H`6uO4K<mBWer`jSaf{NFvpQg~Yp|NQd#e%)i
zQn9v(76f0Q76*~y7szZOY69nTJa@Q7kci%w;lDh?Z+oOfG9~#lq5NZ#<j;gci|cE$
zs#OxnRQFGkRjopc>udf@D3U)DimYmt(bk4|Ds5w0`tfB?rEQG1HiWEdm3JVKOm**9
zmvO;4&cEq`bKI{kBauvXKLEGI0*0L9)V9&LEDUTLL(Vbe9E16GI^S-Kg*b3kSVZ5l
zFm3KZgaVKC296oSF=KeFHy}cRX>$*K%feM*F%DcV<k4dcZ9;J8xQK!X4?7+nc05Eu
zggeJYn-KIE!{tIg4vg{~UDHIzG||#^j2#zY5FrdAj2#y(T}Q_>(KSts@;nZlaT{$)
zaYQLvgkbErczJ%s%k%4RfDjx}iZ-P<<8~Yv*cJ{A0|&Z}iCae)gt)2Ja8s=z3_?uY
zIu3LlhlYWHZN-5Ti(#J-Ox!x&f)Ll$8oW#fUM7R<Y7K95WS<b6SS$|oC`B`ugPTsH
zs%dc3X*6@WPq!YWp8*CM*(|(oYGkwMQR5>Zt6F)Nkf=iq{4~gyb*O<|LLyn!%I^SM
t+FX%Ut^5~fDzl}{6@Mla>3{G1YXI-}02!<r@74eS002ovPDHLkV1iwh{9ph8

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/devtools/commandline-icon.png b/browser/themes/osx/devtools/commandline-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e120a392606af02764ee50b2fbec64caeab4f8f3
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz8A(JzRCwBA{Qv(y!$1Nih5-fx?f@2K
z&V}30(xA*kKzsv;(fMFtpelvcFs<olVey#?#B+ccoeu`rGL3PDz$_?j2gKr7_{4_j
zY#_G8!Y3*U=0RzHAm+lt#|J<@=7zG50kI?+Uy2w9`~l*nP<9Lu|3l*wN;lttSQg5D
z3N;Uz&qhol{0hWtq3jead_v#}D5*f%Ke6zM$_0!B_@w4ACQ`B?DBgmg>^WHYgn$eX
zpM$d5vGDOa02D{jQ1%jNRz>FjBVai{5I=^prGc0ejsFX0IRFjj1SoqW5Pyf}VHp1#
z0n3?z_yd$}4a6^@i4ewrhPNO>vg{C4a~c|-5P(^h2F-T=(fF7NZL~5PXa@iU7yuB?
VM>c5s8}I-C002ovPDHLkV1f<PmE`~c

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/devtools/commandline.css b/browser/themes/osx/devtools/commandline.css
index 2119ce09c97..a3e902492e3 100644
--- a/browser/themes/osx/devtools/commandline.css
+++ b/browser/themes/osx/devtools/commandline.css
@@ -10,10 +10,10 @@
 
 #gcli-output-root,
 #gcli-tooltip-root {
-  border: 1px solid hsl(210,11%,10%);
+  border: 1px solid hsl(206,37%,4%);
   box-shadow: 0 1px 0 hsla(209,29%,72%,.25) inset;
   background-image: url(background-noise-toolbar.png),
-                    linear-gradient(hsla(209,18%,18%,0.9), hsl(210,11%,16%));
+                    linear-gradient(hsla(209,18%,18%,0.9), hsl(209,23%,18%));
   border-radius: 3px;
 }
 
@@ -33,9 +33,9 @@
   margin-left: 8px;
   width: 20px;
   height: 10px;
-  border-left: 1px solid hsl(210,11%,10%);
-  border-right: 1px solid hsl(210,11%,10%);
-  background-color: hsl(210,11%,16%);
+  border-left: 1px solid hsl(206,37%,4%);
+  border-right: 1px solid hsl(206,37%,4%);
+  background-color: hsl(209,23%,18%);
   background-image: url(background-noise-toolbar.png);
 }
 
@@ -85,8 +85,8 @@
   font-weight: normal;
   font-size: 90%;
   border-radius: 3px;
-  background-color: hsl(210,11%,16%);
-  border: 1px solid hsl(210,11%,10%);
+  background-color: hsl(209,23%,18%);
+  border: 1px solid hsl(206,37%,4%);
 }
 
 .gcli-out-shortcut:before,
diff --git a/browser/themes/osx/devtools/common.css b/browser/themes/osx/devtools/common.css
index 8aa99db592a..197f21cf051 100644
--- a/browser/themes/osx/devtools/common.css
+++ b/browser/themes/osx/devtools/common.css
@@ -188,11 +188,13 @@
 /* Close button */
 
 .devtools-closebutton {
-  list-style-image: url("chrome://browser/skin/devtools/toolbarbutton-close.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  -moz-appearance: none;
+  border: none;
+  margin: 0 4px;
   min-width: 16px;
   width: 16px;
-  margin: 0 4px;
+  opacity: 0.6;
 }
 
 .devtools-closebutton > .toolbarbutton-text {
@@ -200,11 +202,11 @@
 }
 
 .devtools-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
+  opacity: 0.8;
 }
 
 .devtools-closebutton:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
+  opacity: 1;
 }
 
 /* Splitters */
diff --git a/browser/themes/osx/devtools/computedview.css b/browser/themes/osx/devtools/computedview.css
index dcc8fefd632..4f6c05b6752 100644
--- a/browser/themes/osx/devtools/computedview.css
+++ b/browser/themes/osx/devtools/computedview.css
@@ -100,12 +100,6 @@ body {
 }
 
 /* From skin */
-.helplink {
-  /* FIXME: remove this image 
-  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
-  */
-}
-
 .expander {
   visibility: hidden;
   margin-left: -12px!important;
diff --git a/browser/themes/osx/devtools/debugger.css b/browser/themes/osx/devtools/debugger.css
index e854291dae7..c0cac5a3c09 100644
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -85,13 +85,12 @@
 
 .dbg-expression {
   height: 20px;
-  -moz-padding-start: 8px;
 }
 
 .dbg-expression-arrow {
-  width: 10px;
+  width: 16px;
   height: auto;
-  background: url("chrome://browser/skin/devtools/commandline.png") 0px 4px no-repeat;
+  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
 }
 
 .dbg-expression-input {
diff --git a/browser/themes/osx/devtools/goto-mdn.png b/browser/themes/osx/devtools/goto-mdn.png
deleted file mode 100644
index dbe064863d65ac3123a7a60070114dd465852de2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 661
zcmV;G0&4w<P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipn-
z2m%$DyLk=(00I?BL_t(2&sCB?Zxc}v#DDkh-PyVG`C^*@2}yxvJ^(@nAt)nCl!gMO
zrA+~m(o!O%NEB%)k%&Zr_zXc%P*5X80V3cS;`rY=j_<v<6iH07(ljHDW@mRiZaj@R
zo#LVY_0?Lx*B_8&BLLz!A}uFeySn6YX1uAe^FI0b=0!^>pCAm;Ism{L!(?)VbC%l=
z9$%(<cL1OO-aWf_e`kBMRg5CyQVFd!)*3(v!hk4_DMk@H+nX)+b}Gk?jkWTJ*N=K}
zsf_O{e5JThEmMwX2m*~0VKf@^<M&^zwG4*??mT>%dSAYMm(h5F)*;GQ)E6&NEClSf
zI~<NDRLU{6*@WG8ht9zOV{+n|5S3+Pl=4xYhgOPWAwWdv4@Ts<q1(>@xN@-yfKrMq
z8>5Z2_(6am7-#vpw-10I094W#fZcWn5D>vShgQCih#(^1pm*W`P@PSvrV0Jwh;DC)
z6NeK4546?_>l~g^oO=`y&lK424*1pX9B(0l6CnsRx)enm^!hl!^VK=wpH3I+9L`w)
zoOL*BC?zSXvAmIra~Nx|#!i6~>Pz#~7w4y(a~2UtV|gQ0qz!X(<;jA{bFBG~d~(F$
z_=sUPnsO%3xwW#sK-w^8D)%}0^!9nnScB)C<n=r_$)$at=F0j!wPt@>x#JUFA2e6D
vlDS%yLZ~q|$CwFWsF|x(Xs&K0ry_uVAQ%nSnI7d%00000NkvXXu0mjf<!Km0

diff --git a/browser/themes/osx/devtools/toggle-tools.png b/browser/themes/osx/devtools/toggle-tools.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a40d0d116d76c6ec4a77a459797f9f5e112df69
GIT binary patch
literal 1787
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

literal 0
HcmV?d00001

diff --git a/browser/themes/osx/devtools/toolbarbutton-close.png b/browser/themes/osx/devtools/toolbarbutton-close.png
deleted file mode 100644
index 887daf052a6eda0b463bd75ca65dd998449cd330..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1031
zcmV+i1o-=jP)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#3000BdNkl<Zc-qyL
z`%6;+6vrzxC|2N<)IIeV(`|0ri^4K3dk{pC6+J16%F13^Nf9Jj8A_#<W<vDRirxho
zK3ZkYHudh_HIt>573nYalmCEyzi@?1xZPj;#UDO+IOlt|^L6KJcihm>(3oaaUPSC3
z7!Sh0B%lFPf}o*>TJ|XV$pjD%CaORUwWDevZ2rQ<nMQMbO>~UzJ#Yr$JvG#_N6|mQ
znw*lM(;Mrc=?eul)Uszp0}zpPFqN^424sL>1}5W$U!r~sRDcJd3Y5uQ2M<}JhFbP0
z`om*%1}|z|;IlR|s(V^=tRJyN7$eui8a33iCzydnyY?M^ot!fBqHIEAu{lci<mSId
zyflb`DX2XL7r_18L-`)7&B0Hi6qF<;S)B*-j<?YSHPo_4(LWKnZXjy4Q9TKXmbY4M
zWG@DnNJM1Rx9Lf?rU-3RFE!M%XG8-|Pv<5SJ6<)lx@dyKzo>6%Vb1CHZwq0d1{9Z;
zRn+$X8T7l_B++8Ew<cO_uI5jI$Xt0v^#f|C9l<~Vh-vAWH=Q2;vi(O2j>5!u4BeM=
zAisdQ1({hlsG&Bf0Td#H!0$)HCWePc?m7NOhA?msoKH!eb*HQMSL49nL9wMx^ftQ%
zFXOL${cmT@nRk~4s10JkYcR!mj-M*ZZgfd$dk-DU+nt+tjPa?WlGP@2yoZ{Q2Ds<N
zmnseQ&B8klPVfTFXG^cfv8H0+45+l(Q{H&Iou4qcmk9oV+mSl6jx}mR7!bf`ox$YW
zx#z&P2A4RG<QzP@S#LB+tWl$8K%-n6<vQ^uR16e?%hQvr!iUz5b__3&7Pq(EVzcv&
z%c%)rpaVPa!`l4ZynT0W{YPOo*}5Yq2S@yaHEKc{n47k6rE+bQ>$D&vD_g}t5svo>
zcb;n#`2M@;OV7^+d7UJ?W5!czLVW_$qIG_(O##>DWMT2Dyc4Ih8S^HhV`BZ(sNKL?
z<<2W_0&G+<P>e&p*Z+6WhvA)An?`H0qk%WUTxIp`T9q3R(-$qNYHIbRbLVjnlHOpJ
zcoWQJW-YIvM)d|zT+iVd6PjR-vC6m5d2pxn^0oV^GiE<We3K;GQ=c)%n##A37j(^;
zJHOm$ifc#QN%Tf@2Xm~c9I+}vf5`BL9PR?R1a5$<;GE1A=2)YK+W&vZ^ahh#{_jfi
z;65M_#&S-ghFbQFrh)JcTXw9$VAUK{rV3ON#>07PsAZ4xQDWJORqJFEUleo_WsVwZ
z*)!S?a~cp25>%i@Gs45%Bwz$)6^zs>ALhn1{{Yzl!O-c}?LPnj002ovPDHLkV1g8J
B@QeTe

diff --git a/browser/themes/osx/devtools/toolbox.css b/browser/themes/osx/devtools/toolbox.css
index 4a69e4bc4a2..1e41bbb196d 100644
--- a/browser/themes/osx/devtools/toolbox.css
+++ b/browser/themes/osx/devtools/toolbox.css
@@ -25,21 +25,15 @@
   list-style-image: url("chrome://browser/skin/devtools/undock.png");
 }
 
-#toolbox-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
-}
-
 #toolbox-dock-window,
 #toolbox-dock-bottom,
-#toolbox-dock-side,
-#toolbox-close {
+#toolbox-dock-side {
   opacity: 0.6;
 }
 
 #toolbox-dock-window:hover,
 #toolbox-dock-bottom:hover,
-#toolbox-dock-side:hover,
-#toolbox-close:hover {
+#toolbox-dock-side:hover {
   opacity: 1;
 }
 
diff --git a/browser/themes/osx/devtools/tools-icons-small.png b/browser/themes/osx/devtools/tools-icons-small.png
deleted file mode 100644
index 12e9c72acc819abb8dcc9985d94ea3b1b9bbda2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2976
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
Wc;m0cEV&i{0000<MNUMnLSTZjh`|{E

diff --git a/browser/themes/osx/devtools/webconsole.css b/browser/themes/osx/devtools/webconsole.css
index 8ccc0495be0..1b34ab2c2c1 100644
--- a/browser/themes/osx/devtools/webconsole.css
+++ b/browser/themes/osx/devtools/webconsole.css
@@ -227,7 +227,7 @@
 }
 
 .jsterm-input-node {
-  background: url("chrome://browser/skin/devtools/commandline.png") 4px 2px no-repeat;
+  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16) no-repeat;
 }
 
 :-moz-any(.jsterm-input-node,
diff --git a/browser/themes/osx/devtools/widgets.css b/browser/themes/osx/devtools/widgets.css
index 7ad51cb5a65..bb0f6d8b184 100644
--- a/browser/themes/osx/devtools/widgets.css
+++ b/browser/themes/osx/devtools/widgets.css
@@ -566,8 +566,7 @@
 /* Variables and properties editing */
 
 .variables-view-delete {
-  list-style-image: url("chrome://browser/skin/devtools/toolbarbutton-close.png");
-  -moz-image-region: rect(0,32px,16px,16px);
+  list-style-image: url("chrome://browser/skin/devtools/close-dark.png");
   opacity: 0;
 }
 
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 2ee9b07dacd..f3618eb1064 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -212,13 +212,12 @@ browser.jar:
   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.png             (devtools/commandline.png)
+  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/goto-mdn.png                (devtools/goto-mdn.png)
   skin/classic/browser/devtools/ruleview.css                (devtools/ruleview.css)
   skin/classic/browser/devtools/commandline.css             (devtools/commandline.css)
   skin/classic/browser/devtools/checkbox-dark.png           (devtools/checkbox-dark.png)
@@ -229,7 +228,6 @@ browser.jar:
   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/toolbarbutton-close.png     (devtools/toolbarbutton-close.png)
 * 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)
@@ -284,7 +282,7 @@ browser.jar:
   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/tools-icons-small.png       (devtools/tools-icons-small.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/inspector.css               (devtools/inspector.css)
@@ -297,6 +295,7 @@ browser.jar:
   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/close-dark.png              (devtools/close-dark.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)
diff --git a/browser/themes/shared/devtools/commandline.inc.css b/browser/themes/shared/devtools/commandline.inc.css
index 5bd0cd39c7a..a5aa8df8aba 100644
--- a/browser/themes/shared/devtools/commandline.inc.css
+++ b/browser/themes/shared/devtools/commandline.inc.css
@@ -4,6 +4,48 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 %endif
 
+/* Developer toolbar */
+
+#developer-toolbar {
+  padding: 0;
+  min-height: 32px;
+  background-image: url(devtools/background-noise-toolbar.png), linear-gradient(#303840, #2d3640);
+  border-top: 1px solid #060a0d;
+  box-shadow: 0 1px 0 hsla(204,45%,98%,.05) inset, 0 -1px 0 hsla(206,37%,4%,.1) inset;
+}
+
+.developer-toolbar-button {
+  -moz-appearance: none;
+  border: none;
+  background: transparent;
+  margin: 0;
+  padding: 0 10px;
+  width: 32px;
+}
+
+.developer-toolbar-button > image {
+  margin: auto 10px;
+}
+
+#developer-toolbar-toolbox-button {
+  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#developer-toolbar-toolbox-button:hover {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#developer-toolbar-toolbox-button:hover:active {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#developer-toolbar-toolbox-button[checked=true] {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+/* GCLI */
+
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -16,32 +58,39 @@ html|*#gcli-output-frame {
   border-width: 0;
   background-color: transparent;
   -moz-appearance: none;
-  margin-bottom: -2px;
 }
 
 .gclitoolbar-input-node,
-.gclitoolbar-complete-node,
-.gclitoolbar-prompt {
+.gclitoolbar-complete-node {
   margin: 0;
-  -moz-margin-end: 5px;
   -moz-box-align: center;
   padding-top: 0;
   padding-bottom: 0;
-  padding-right: 4px;
-  border: 1px solid transparent;
-  border-radius: 3px;
+  padding-right: 8px;
   text-shadow: none;
+  box-shadow: none;
+  border-width: 0;
+  background-color: transparent;
 }
 
 .gclitoolbar-input-node {
-  padding-left: 20px;
-  background-color: transparent;
   -moz-appearance: none;
-  border-color: hsl(210,24%,10%);
   color: hsl(210,30%,85%);
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  box-shadow: inset 0 1px 0 hsla(211,68%,6%,.05),
-              0 0 0 1px hsla(210,40%,83%,.1);
+  padding-left: 20px;
+  background-color: #242b33;
+  background-repeat: no-repeat;
+  background-position: 4px center;
+  box-shadow: 0 1px 1px hsla(206,37%,4%,.2) inset,
+              1px 0 0 hsla(206,37%,4%,.2) inset,
+              -1px 0 0 hsla(206,37%,4%,.2) inset;
+  line-height: 32px;
+  outline-style: none;
+  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 16, 16, 0);
+}
+
+.gclitoolbar-input-node[focused="true"] {
+  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
+  background-color: #232e38;
 }
 
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
@@ -54,18 +103,10 @@ html|*#gcli-output-frame {
   padding-left: 21px;
   background-color: transparent;
   color: transparent;
+  z-index: 100;
+  pointer-events: none;
 }
 
-.gclitoolbar-prompt {
-  padding-left: 4px;
-  padding-bottom: 2px;
-  font-size: 150%;
-  font-weight: bold;
-  color: hsl(210,30%,85%);
-  background-color: hsl(210,24%,16%);
-}
-
-.gclitoolbar-prompt-label,
 .gcli-in-incomplete,
 .gcli-in-error,
 .gcli-in-ontab,
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 76f71e26903..2a12568e5e5 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2793,82 +2793,16 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   font-size: 120%;
 }
 
-/* Developer toolbar */
-
-#developer-toolbar {
-  border-top: 1px solid hsla(211,68%,6%,.65) !important;
-}
-
 %include ../shared/devtools/responsivedesign.inc.css
 %include ../shared/devtools/highlighter.inc.css
 %include ../shared/devtools/commandline.inc.css
 
-.gclitoolbar-input-node {
-  border-color: hsl(210,24%,10%);
-  box-shadow: inset 0 1px 0 hsla(211,68%,6%,.05),
-              0 0 0 1px hsla(210,40%,83%,.1);
-}
-
 /* Web Console */
 
 .web-console-frame {
   border-bottom: 1px solid #aaa;
 }
 
-.web-console-frame[animated] {
-  transition: height 100ms;
-}
-
-/* Developer Toolbar */
-
-#developer-toolbar-toolbox-button {
-  min-width: 18px;
-}
-
-#developer-toolbar-toolbox-button > .toolbarbutton-text {
-  display: none;
-}
-
-#developer-toolbar-toolbox-button > .toolbarbutton-icon {
-  -moz-margin-end: 0;
-}
-
-.developer-toolbar-button {
-  -moz-appearance: none;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  border-radius: 3px;
-  color: inherit;
-  border: 1px solid transparent;
-  margin: 0 5px;
-  padding: 0 10px;
-  list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
-}
-
-.developer-toolbar-button[open=true],
-.developer-toolbar-button:active:hover,
-.developer-toolbar-button[checked=true] {
-  border-color: hsla(210,8%,5%,.6);
-  background: rgba(0,0,0,.6);
-  box-shadow: 0 1px 2px rgba(0,0,0,.5) inset, 0 1px 0 hsla(210,16%,76%,.1);
-}
-
-.developer-toolbar-button:hover,
-.developer-toolbar-button[checked=true],
-.developer-toolbar-button[open=true] {
-  color: hsl(208,100%,60%) !important;
-  text-shadow: 0 0 6px hsl(208,100%,60%);
-}
-
-.developer-toolbar-button[checked=true] {
-  background: rgba(0,0,0,.4);
-}
-
-#developer-toolbar-toolbox-button {
-  -moz-image-region: rect(64px, 16px, 80px, 0);
-}
-
 /* Error counter */
 
 #developer-toolbar-toolbox-button[error-count]:before {
diff --git a/browser/themes/windows/devtools/close-dark.png b/browser/themes/windows/devtools/close-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..548374d0725b7aeccc7ee9b1f03a4c69a90af34b
GIT binary patch
literal 607
zcmV-l0-*hgP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM
zkN^My<w-<ARCwB?(>+V;Pyoj9EL~H`6uO4K<mBWer`jSaf{NFvpQg~Yp|NQd#e%)i
zQn9v(76f0Q76*~y7szZOY69nTJa@Q7kci%w;lDh?Z+oOfG9~#lq5NZ#<j;gci|cE$
zs#OxnRQFGkRjopc>udf@D3U)DimYmt(bk4|Ds5w0`tfB?rEQG1HiWEdm3JVKOm**9
zmvO;4&cEq`bKI{kBauvXKLEGI0*0L9)V9&LEDUTLL(Vbe9E16GI^S-Kg*b3kSVZ5l
zFm3KZgaVKC296oSF=KeFHy}cRX>$*K%feM*F%DcV<k4dcZ9;J8xQK!X4?7+nc05Eu
zggeJYn-KIE!{tIg4vg{~UDHIzG||#^j2#zY5FrdAj2#y(T}Q_>(KSts@;nZlaT{$)
zaYQLvgkbErczJ%s%k%4RfDjx}iZ-P<<8~Yv*cJ{A0|&Z}iCae)gt)2Ja8s=z3_?uY
zIu3LlhlYWHZN-5Ti(#J-Ox!x&f)Ll$8oW#fUM7R<Y7K95WS<b6SS$|oC`B`ugPTsH
zs%dc3X*6@WPq!YWp8*CM*(|(oYGkwMQR5>Zt6F)Nkf=iq{4~gyb*O<|LLyn!%I^SM
t+FX%Ut^5~fDzl}{6@Mla>3{G1YXI-}02!<r@74eS002ovPDHLkV1iwh{9ph8

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/devtools/commandline-icon.png b/browser/themes/windows/devtools/commandline-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e120a392606af02764ee50b2fbec64caeab4f8f3
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz8A(JzRCwBA{Qv(y!$1Nih5-fx?f@2K
z&V}30(xA*kKzsv;(fMFtpelvcFs<olVey#?#B+ccoeu`rGL3PDz$_?j2gKr7_{4_j
zY#_G8!Y3*U=0RzHAm+lt#|J<@=7zG50kI?+Uy2w9`~l*nP<9Lu|3l*wN;lttSQg5D
z3N;Uz&qhol{0hWtq3jead_v#}D5*f%Ke6zM$_0!B_@w4ACQ`B?DBgmg>^WHYgn$eX
zpM$d5vGDOa02D{jQ1%jNRz>FjBVai{5I=^prGc0ejsFX0IRFjj1SoqW5Pyf}VHp1#
z0n3?z_yd$}4a6^@i4ewrhPNO>vg{C4a~c|-5P(^h2F-T=(fF7NZL~5PXa@iU7yuB?
VM>c5s8}I-C002ovPDHLkV1f<PmE`~c

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/devtools/commandline.css b/browser/themes/windows/devtools/commandline.css
index e2851f5df42..7eee7eb5c2c 100644
--- a/browser/themes/windows/devtools/commandline.css
+++ b/browser/themes/windows/devtools/commandline.css
@@ -10,9 +10,9 @@
 
 #gcli-output-root,
 #gcli-tooltip-root {
-  border: 1px solid hsl(210,24%,10%);
+  border: 1px solid hsl(206,37%,4%);
   box-shadow: 0 1px 0 hsla(209,29%,72%,.25) inset;
-  background-image: linear-gradient(hsla(209,18%,18%,0.9), hsl(210,24%,16%));
+  background-image: linear-gradient(hsla(209,18%,18%,0.9), hsl(209,23%,18%));
   border-radius: 3px;
 }
 
@@ -32,9 +32,9 @@
   margin-left: 8px;
   width: 20px;
   height: 10px;
-  border-left: 1px solid hsl(210,24%,10%);
-  border-right: 1px solid hsl(210,24%,10%);
-  background-color: hsl(210,24%,16%);
+  border-left: 1px solid hsl(206,37%,4%);
+  border-right: 1px solid hsl(206,37%,4%);
+  background-color: hsl(209,23%,18%);
 }
 
 .gcli-tt-description,
@@ -83,8 +83,8 @@
   font-weight: normal;
   font-size: 90%;
   border-radius: 3px;
-  background-color: hsl(210,24%,16%);
-  border: 1px solid hsl(210,24%,10%);
+  background-color: hsl(209,23%,18%);
+  border: 1px solid hsl(206,37%,4%);
 }
 
 .gcli-out-shortcut:before,
diff --git a/browser/themes/windows/devtools/common.css b/browser/themes/windows/devtools/common.css
index 0bc24fd4c27..cf5744d653c 100644
--- a/browser/themes/windows/devtools/common.css
+++ b/browser/themes/windows/devtools/common.css
@@ -195,12 +195,13 @@
 /* Close button */
 
 .devtools-closebutton {
-  list-style-image: url("chrome://browser/skin/devtools/toolbarbutton-close.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  -moz-appearance: none;
+  border: none;
+  margin: 0 4px;
   min-width: 16px;
   width: 16px;
-  -moz-appearance: none;
-  border-style: none;
+  opacity: 0.6;
 }
 
 .devtools-closebutton > .toolbarbutton-text {
@@ -208,11 +209,11 @@
 }
 
 .devtools-closebutton:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
+  opacity: 0.8;
 }
 
 .devtools-closebutton:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
+  opacity: 1;
 }
 
 /* Splitters */
diff --git a/browser/themes/windows/devtools/computedview.css b/browser/themes/windows/devtools/computedview.css
index dcc8fefd632..4f6c05b6752 100644
--- a/browser/themes/windows/devtools/computedview.css
+++ b/browser/themes/windows/devtools/computedview.css
@@ -100,12 +100,6 @@ body {
 }
 
 /* From skin */
-.helplink {
-  /* FIXME: remove this image 
-  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
-  */
-}
-
 .expander {
   visibility: hidden;
   margin-left: -12px!important;
diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css
index 8db7aaa84e1..9eeaf2ebad6 100644
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -83,13 +83,12 @@
 
 .dbg-expression {
   height: 20px;
-  -moz-padding-start: 8px;
 }
 
 .dbg-expression-arrow {
-  width: 10px;
+  width: 16px;
   height: auto;
-  background: url("chrome://browser/skin/devtools/commandline.png") 0px 4px no-repeat;
+  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
 }
 
 .dbg-expression-input {
diff --git a/browser/themes/windows/devtools/goto-mdn.png b/browser/themes/windows/devtools/goto-mdn.png
deleted file mode 100644
index dbe064863d65ac3123a7a60070114dd465852de2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 661
zcmV;G0&4w<P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipn-
z2m%$DyLk=(00I?BL_t(2&sCB?Zxc}v#DDkh-PyVG`C^*@2}yxvJ^(@nAt)nCl!gMO
zrA+~m(o!O%NEB%)k%&Zr_zXc%P*5X80V3cS;`rY=j_<v<6iH07(ljHDW@mRiZaj@R
zo#LVY_0?Lx*B_8&BLLz!A}uFeySn6YX1uAe^FI0b=0!^>pCAm;Ism{L!(?)VbC%l=
z9$%(<cL1OO-aWf_e`kBMRg5CyQVFd!)*3(v!hk4_DMk@H+nX)+b}Gk?jkWTJ*N=K}
zsf_O{e5JThEmMwX2m*~0VKf@^<M&^zwG4*??mT>%dSAYMm(h5F)*;GQ)E6&NEClSf
zI~<NDRLU{6*@WG8ht9zOV{+n|5S3+Pl=4xYhgOPWAwWdv4@Ts<q1(>@xN@-yfKrMq
z8>5Z2_(6am7-#vpw-10I094W#fZcWn5D>vShgQCih#(^1pm*W`P@PSvrV0Jwh;DC)
z6NeK4546?_>l~g^oO=`y&lK424*1pX9B(0l6CnsRx)enm^!hl!^VK=wpH3I+9L`w)
zoOL*BC?zSXvAmIra~Nx|#!i6~>Pz#~7w4y(a~2UtV|gQ0qz!X(<;jA{bFBG~d~(F$
z_=sUPnsO%3xwW#sK-w^8D)%}0^!9nnScB)C<n=r_$)$at=F0j!wPt@>x#JUFA2e6D
vlDS%yLZ~q|$CwFWsF|x(Xs&K0ry_uVAQ%nSnI7d%00000NkvXXu0mjf<!Km0

diff --git a/browser/themes/windows/devtools/toggle-tools.png b/browser/themes/windows/devtools/toggle-tools.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a40d0d116d76c6ec4a77a459797f9f5e112df69
GIT binary patch
literal 1787
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

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/devtools/toolbarbutton-close.png b/browser/themes/windows/devtools/toolbarbutton-close.png
deleted file mode 100644
index 4a58465b9b7ea3b3c7c14b36214524fb9b0e38b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 898
zcmV-|1AY97P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30009?Nkl<Zc-qaD
z-%C?*7{<E^ys6=GX#TF*%%jfDG@>G?$RO%(D9DVE2wO>|IdyGXXbKuAMWsXumi@rW
zizxG=3lSo^$*@vs{TpxZ=io>?+i~PBx_CVA-uLse=lObewsj)1Carg5ulx8l>ikEo
z`ThB`CSjy(=l*>gv)qjuW-uASvcvAuAyldwlHG@8CuIRJG;-)bbn4h)nLJiwD;QXI
zVgb^ed4Z!F9MR(rht#I0ORduxSIl5w*-2RdPGw^6Zh7SQ%fnR!1Itb<0CjyvhP3AA
zOXt?Da^3BYD`qgT?4&fn^PSZ)tmf|fd~&a%LWcCpYeY?t8LySK1h|l$Enzj-?eR$0
zwr%G1W^plE(Sw0a7-0I->}l1E>J%SPL`{!bq5xynRi??w&KnY4h|1e=hurac5j8z#
zCZnt+Kw$G`xu)h`UyI03Wyjk>a-*mSQPX2)GO!5)=%A`8+|&1d`tt{jBWilg5(OCD
zQ7O08Y`<a1%hr%Aep{3``i6*_9y1taEdd(TRNIy<5>kUtnu9Vww;(Tq?TDHlGn0X}
z3$P-@a`Vg*1sJLH%V2rA45)fbN@QFOFQ{=uO^+FjvX%hnva%#tSSS%a@m4kYcqs&;
zrpF8h);0hd93E|&n3{QqsOi}Sc;NR*e_5IIsd^2=H2r<{2co9O%w&|c1UQ?SDa{21
z((ZPfW=ES_WbVs%L`{#G$-vqMSbp0eYI=47hI|#$Q(7wBdeW~#VLkZ;c@}I()byB{
z46NlTq^2(G6XvQK9cyVbPkyAS1yR#uW-|450sg+{(ee<90^F_eN|#}nM(5S=Q#Bs(
zcn~!`W+tPoCBPXq)u`sif`80k($hw<5X@j;?fwIms=C-ckErP}OBCR?-Wr|Tw@XML
zcR{zCE3f1Bl(ht?bGamtn=6fZd2(K_7xj8Y?{`E^j~NVXioXX4P%0hz%#N%g7-cO1
zPB@)XuOH5aoE*%?6*CxEc2fCMB5>U>76;VWty05QFtF^z0;K17E*^2DFCJH8C-qyl
z*5!&TW-zeqq%44U*TFp)O7_PXEIY9P{yjB&F_i2+EIaJ}4?m}M|5uu7lPWt&!KShM
Y8%Lp~>GYClRsaA107*qoM6N<$g8i4Sr2qf`

diff --git a/browser/themes/windows/devtools/toolbox.css b/browser/themes/windows/devtools/toolbox.css
index 9cced9ea819..67ee64eb85e 100644
--- a/browser/themes/windows/devtools/toolbox.css
+++ b/browser/themes/windows/devtools/toolbox.css
@@ -27,21 +27,15 @@
   list-style-image: url("chrome://browser/skin/devtools/undock.png");
 }
 
-#toolbox-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
-}
-
 #toolbox-dock-window,
 #toolbox-dock-bottom,
-#toolbox-dock-side,
-#toolbox-close {
+#toolbox-dock-side {
   opacity: 0.6;
 }
 
 #toolbox-dock-window:hover,
 #toolbox-dock-bottom:hover,
-#toolbox-dock-side:hover,
-#toolbox-close:hover {
+#toolbox-dock-side:hover {
   opacity: 1;
 }
 
diff --git a/browser/themes/windows/devtools/tools-icons-small.png b/browser/themes/windows/devtools/tools-icons-small.png
deleted file mode 100644
index 12e9c72acc819abb8dcc9985d94ea3b1b9bbda2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2976
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
Wc;m0cEV&i{0000<MNUMnLSTZjh`|{E

diff --git a/browser/themes/windows/devtools/webconsole.css b/browser/themes/windows/devtools/webconsole.css
index eab2751d231..6f9d9fe7f7e 100644
--- a/browser/themes/windows/devtools/webconsole.css
+++ b/browser/themes/windows/devtools/webconsole.css
@@ -221,7 +221,7 @@
 }
 
 .jsterm-input-node {
-  background: url("chrome://browser/skin/devtools/commandline.png") 4px 3px no-repeat;
+  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16) no-repeat;
 }
 
 :-moz-any(.jsterm-input-node,
diff --git a/browser/themes/windows/devtools/widgets.css b/browser/themes/windows/devtools/widgets.css
index e48f4626672..d67e137e6b1 100644
--- a/browser/themes/windows/devtools/widgets.css
+++ b/browser/themes/windows/devtools/widgets.css
@@ -569,8 +569,7 @@
 /* Variables and properties editing */
 
 .variables-view-delete {
-  list-style-image: url("chrome://browser/skin/devtools/toolbarbutton-close.png");
-  -moz-image-region: rect(0,32px,16px,16px);
+  list-style-image: url("chrome://browser/skin/devtools/close-dark.png");
   opacity: 0;
 }
 
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 58d8c878d41..0d134b7b8e7 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -150,9 +150,8 @@ browser.jar:
         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.png               (devtools/commandline.png)
+        skin/classic/browser/devtools/commandline-icon.png          (devtools/commandline-icon.png)
         skin/classic/browser/devtools/alerticon-warning.png         (devtools/alerticon-warning.png)
-        skin/classic/browser/devtools/goto-mdn.png                  (devtools/goto-mdn.png)
         skin/classic/browser/devtools/ruleview.css                  (devtools/ruleview.css)
         skin/classic/browser/devtools/commandline.css               (devtools/commandline.css)
         skin/classic/browser/devtools/command-paintflashing.png     (devtools/command-paintflashing.png)
@@ -167,7 +166,6 @@ browser.jar:
         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/toolbarbutton-close.png       (devtools/toolbarbutton-close.png)
         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)
@@ -222,7 +220,7 @@ browser.jar:
         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/tools-icons-small.png         (devtools/tools-icons-small.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/floating-scrollbars.css       (devtools/floating-scrollbars.css)
@@ -237,6 +235,7 @@ browser.jar:
         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/close-dark.png                (devtools/close-dark.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)
@@ -402,7 +401,7 @@ browser.jar:
         skin/classic/aero/browser/devtools/dark-theme.css            (devtools/dark-theme.css)
         skin/classic/aero/browser/devtools/light-theme.css           (devtools/light-theme.css)
         skin/classic/aero/browser/devtools/widgets.css               (devtools/widgets.css)
-        skin/classic/aero/browser/devtools/commandline.png           (devtools/commandline.png)
+        skin/classic/aero/browser/devtools/commandline-icon.png      (devtools/commandline-icon.png)
         skin/classic/aero/browser/devtools/command-paintflashing.png  (devtools/command-paintflashing.png)
         skin/classic/aero/browser/devtools/command-responsivemode.png (devtools/command-responsivemode.png)
         skin/classic/aero/browser/devtools/command-scratchpad.png    (devtools/command-scratchpad.png)
@@ -410,7 +409,6 @@ browser.jar:
         skin/classic/aero/browser/devtools/checkbox-dark.png         (devtools/checkbox-dark.png)
         skin/classic/aero/browser/devtools/checkbox-light.png        (devtools/checkbox-light.png)
         skin/classic/aero/browser/devtools/alerticon-warning.png     (devtools/alerticon-warning.png)
-        skin/classic/aero/browser/devtools/goto-mdn.png              (devtools/goto-mdn.png)
         skin/classic/aero/browser/devtools/ruleview.css              (devtools/ruleview.css)
         skin/classic/aero/browser/devtools/commandline.css           (devtools/commandline.css)
         skin/classic/aero/browser/devtools/markup-view.css           (devtools/markup-view.css)
@@ -419,7 +417,6 @@ browser.jar:
         skin/classic/aero/browser/devtools/orion-task.png            (devtools/orion-task.png)
         skin/classic/aero/browser/devtools/orion-breakpoint.png      (devtools/orion-breakpoint.png)
         skin/classic/aero/browser/devtools/orion-debug-location.png  (devtools/orion-debug-location.png)
-        skin/classic/aero/browser/devtools/toolbarbutton-close.png   (devtools/toolbarbutton-close.png)
         skin/classic/aero/browser/devtools/webconsole.css                  (devtools/webconsole.css)
         skin/classic/aero/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
         skin/classic/aero/browser/devtools/webconsole.png                  (devtools/webconsole.png)
@@ -474,7 +471,7 @@ browser.jar:
         skin/classic/aero/browser/devtools/responsive-se-resizer.png (devtools/responsive-se-resizer.png)
         skin/classic/aero/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
         skin/classic/aero/browser/devtools/responsive-background.png (devtools/responsive-background.png)
-        skin/classic/aero/browser/devtools/tools-icons-small.png     (devtools/tools-icons-small.png)
+        skin/classic/aero/browser/devtools/toggle-tools.png          (devtools/toggle-tools.png)
         skin/classic/aero/browser/devtools/dock-bottom.png           (devtools/dock-bottom.png)
         skin/classic/aero/browser/devtools/dock-side.png             (devtools/dock-side.png)
         skin/classic/aero/browser/devtools/floating-scrollbars.css   (devtools/floating-scrollbars.css)
@@ -489,6 +486,7 @@ browser.jar:
         skin/classic/aero/browser/devtools/tool-profiler.png         (devtools/tool-profiler.png)
         skin/classic/aero/browser/devtools/tool-network.png          (devtools/tool-network.png)
         skin/classic/aero/browser/devtools/close.png                 (devtools/close.png)
+        skin/classic/aero/browser/devtools/close-dark.png            (devtools/close-dark.png)
         skin/classic/aero/browser/devtools/undock.png                (devtools/undock.png)
         skin/classic/aero/browser/devtools/font-inspector.css        (devtools/font-inspector.css)
         skin/classic/aero/browser/devtools/computedview.css          (devtools/computedview.css)