Bug 873848 - Make the developer toolbar consistent with Toolbox design, r=jwalker, paul, jaws
authorGirish Sharma <scrapmachines@gmail.com>
Fri, 21 Jun 2013 19:24:35 +0300
changeset 147652 c8bec69452510bdf8a342966b649570818b2a5c0
parent 147516 cea75ce9a55902e805cb5c8bf7bd46f9870504a3
child 147653 6d5d454fc9b133c65f62ed02d11769fd60bf9290
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwalker, paul, jaws
bugs873848
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 873848 - Make the developer toolbar consistent with Toolbox design, r=jwalker, paul, jaws
browser/base/content/browser.css
browser/base/content/browser.xul
browser/devtools/framework/toolbox.xul
browser/themes/linux/browser.css
browser/themes/linux/devtools/close-dark.png
browser/themes/linux/devtools/commandline-icon.png
browser/themes/linux/devtools/commandline.css
browser/themes/linux/devtools/common.css
browser/themes/linux/devtools/computedview.css
browser/themes/linux/devtools/debugger.css
browser/themes/linux/devtools/goto-mdn.png
browser/themes/linux/devtools/toggle-tools.png
browser/themes/linux/devtools/toolbox.css
browser/themes/linux/devtools/tools-icons-small.png
browser/themes/linux/devtools/webconsole.css
browser/themes/linux/devtools/widgets.css
browser/themes/linux/jar.mn
browser/themes/osx/browser.css
browser/themes/osx/devtools/close-dark.png
browser/themes/osx/devtools/commandline-icon.png
browser/themes/osx/devtools/commandline.css
browser/themes/osx/devtools/common.css
browser/themes/osx/devtools/computedview.css
browser/themes/osx/devtools/debugger.css
browser/themes/osx/devtools/goto-mdn.png
browser/themes/osx/devtools/toggle-tools.png
browser/themes/osx/devtools/toolbarbutton-close.png
browser/themes/osx/devtools/toolbox.css
browser/themes/osx/devtools/tools-icons-small.png
browser/themes/osx/devtools/webconsole.css
browser/themes/osx/devtools/widgets.css
browser/themes/osx/jar.mn
browser/themes/shared/devtools/commandline.inc.css
browser/themes/windows/browser.css
browser/themes/windows/devtools/close-dark.png
browser/themes/windows/devtools/commandline-icon.png
browser/themes/windows/devtools/commandline.css
browser/themes/windows/devtools/common.css
browser/themes/windows/devtools/computedview.css
browser/themes/windows/devtools/debugger.css
browser/themes/windows/devtools/goto-mdn.png
browser/themes/windows/devtools/toggle-tools.png
browser/themes/windows/devtools/toolbarbutton-close.png
browser/themes/windows/devtools/toolbox.css
browser/themes/windows/devtools/tools-icons-small.png
browser/themes/windows/devtools/webconsole.css
browser/themes/windows/devtools/widgets.css
browser/themes/windows/jar.mn
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -593,18 +593,17 @@ statuspanel[inactive][previoustype=overL
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame,
 #gcli-output,
 #gcli-tooltip {
   overflow-x: hidden;
 }
 
 .gclitoolbar-input-node,
-.gclitoolbar-complete-node,
-.gclitoolbar-prompt {
+.gclitoolbar-complete-node {
   direction: ltr;
 }
 
 #developer-toolbar-toolbox-button[error-count] > .toolbarbutton-icon {
   display: none;
 }
 
 #developer-toolbar-toolbox-button[error-count]:before {
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1116,21 +1116,18 @@
              hidden="true">
 #ifdef XP_MACOSX
           <toolbarbutton id="developer-toolbar-closebutton"
                          class="devtools-closebutton"
                          oncommand="DeveloperToolbar.hide();"
                          tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
 #endif
           <stack class="gclitoolbar-stack-node" flex="1">
-            <hbox class="gclitoolbar-prompt">
-              <label class="gclitoolbar-prompt-label">&#187;</label>
-            </hbox>
+            <textbox class="gclitoolbar-input-node" rows="1"/>
             <hbox class="gclitoolbar-complete-node"/>
-            <textbox class="gclitoolbar-input-node" rows="1"/>
           </stack>
           <toolbarbutton id="developer-toolbar-toolbox-button"
                          class="developer-toolbar-button"
                          observes="devtoolsMenuBroadcaster_DevToolbox"
                          tooltiptext="&devToolbarToolsButton.tooltip;"/>
 #ifndef XP_MACOSX
           <toolbarbutton id="developer-toolbar-closebutton"
                          class="devtools-closebutton"
--- a/browser/devtools/framework/toolbox.xul
+++ b/browser/devtools/framework/toolbox.xul
@@ -25,28 +25,30 @@
          modifiers="shift, accel"/>
   </keyset>
 
   <notificationbox id="toolbox-notificationbox" flex="1">
     <toolbar class="devtools-tabbar">
 #ifdef XP_MACOSX
       <hbox id="toolbox-controls">
         <toolbarbutton id="toolbox-close"
+                       class="devtools-closebutton"
                        tooltiptext="&toolboxCloseButton.tooltip;"/>
         <hbox id="toolbox-dock-buttons"/>
       </hbox>
 #endif
       <hbox id="toolbox-tabs" flex="1">
       </hbox>
       <hbox id="toolbox-buttons" pack="end"/>
 #ifndef XP_MACOSX
       <vbox id="toolbox-controls-separator"/>
       <hbox id="toolbox-controls">
         <hbox id="toolbox-dock-buttons"/>
         <toolbarbutton id="toolbox-close"
+                       class="devtools-closebutton"
                        tooltiptext="&toolboxCloseButton.tooltip;"/>
       </hbox>
 #endif
     </toolbar>
     <deck id="toolbox-deck" flex="1">
     </deck>
   </notificationbox>
 </window>
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2057,105 +2057,34 @@ toolbar[mode="text"] toolbarbutton.chevr
   font-size: 300%;
 }
 
 .full-screen-approval-button,
 #full-screen-remember-decision {
   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
 
 .gcli-panel {
   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 {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..548374d0725b7aeccc7ee9b1f03a4c69a90af34b
GIT binary patch
literal 607
zc$@)W0-*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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e120a392606af02764ee50b2fbec64caeab4f8f3
GIT binary patch
literal 375
zc$@)u0f_#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
--- a/browser/themes/linux/devtools/commandline.css
+++ b/browser/themes/linux/devtools/commandline.css
@@ -5,19 +5,19 @@
 .gcli-body {
   margin: 0;
   font: message-box;
   color: hsl(210,30%,85%);
 }
 
 #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;
 }
 
 #gcli-output-root {
   padding: 5px 10px;
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
   border-bottom: 0;
@@ -27,19 +27,19 @@
   padding: 5px 0px;
 }
 
 #gcli-tooltip-connector {
   margin-top: -1px;
   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,
 .gcli-tt-error {
   padding: 0 10px;
 }
 
 .gcli-row-out {
@@ -78,18 +78,18 @@
 
 .gcli-out-shortcut,
 .gcli-help-synopsis {
   padding: 0 3px;
   margin: 0 4px;
   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,
 .gcli-help-synopsis:before {
   color: hsl(210,30%,85%);
   -moz-padding-end: 2px;
 }
 
--- a/browser/themes/linux/devtools/common.css
+++ b/browser/themes/linux/devtools/common.css
@@ -179,27 +179,43 @@
   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("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 {
   /* 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;
--- a/browser/themes/linux/devtools/computedview.css
+++ b/browser/themes/linux/devtools/computedview.css
@@ -77,22 +77,16 @@ body {
   }
 }
 
 .property-content {
   padding-left: 17px;
 }
 
 /* From skin */
-.helplink {
-  /* FIXME: remove this image 
-  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
-  */
-}
-
 .expander {
   visibility: hidden;
   margin-left: -12px!important;
 }
 
 .expander[open] {
   margin-left: -17px!important;
 }
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -78,23 +78,22 @@
 
 #expressions {
   min-height: 10px;
   max-height: 125px;
 }
 
 .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 {
   -moz-padding-start: 2px !important;
   font-family: Menlo, Monaco, monospace;
 }
 
 /* Searchbox and the search operations help panel */
deleted file mode 100644
index dbe064863d65ac3123a7a60070114dd465852de2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8a40d0d116d76c6ec4a77a459797f9f5e112df69
GIT binary patch
literal 1787
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
--- a/browser/themes/linux/devtools/toolbox.css
+++ b/browser/themes/linux/devtools/toolbox.css
@@ -21,31 +21,25 @@
 #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-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;
 }
 
 #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));
deleted file mode 100644
index 12e9c72acc819abb8dcc9985d94ea3b1b9bbda2a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/linux/devtools/webconsole.css
+++ b/browser/themes/linux/devtools/webconsole.css
@@ -218,17 +218,17 @@
 .jsterm-complete-node {
   border: none;
   padding: 0 0 0 16px;
   -moz-appearance: none;
 }
 
 .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,
           .jsterm-complete-node) > .textbox-input-box > .textbox-textarea {
   overflow-x: hidden;
 }
 
 .jsterm-complete-node > .textbox-input-box > .textbox-textarea {
--- a/browser/themes/linux/devtools/widgets.css
+++ b/browser/themes/linux/devtools/widgets.css
@@ -561,17 +561,17 @@
   -moz-padding-start: 4px;
   -moz-border-start: 1px dotted #000;
   color: #080;
 }
 
 /* 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;
 }
 
 .variables-view-delete:hover {
   opacity: 1;
 }
 
 *:hover > .title > .variables-view-delete:not(:hover),
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -119,23 +119,22 @@ browser.jar:
   skin/classic/browser/tabview/search.png             (tabview/search.png)
   skin/classic/browser/tabview/stack-expander.png     (tabview/stack-expander.png)
   skin/classic/browser/tabview/tabview.png            (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css            (tabview/tabview.css)
 * 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.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)
   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/commandline.css              (devtools/commandline.css)
   skin/classic/browser/devtools/markup-view.css      (devtools/markup-view.css)
@@ -190,31 +189,32 @@ browser.jar:
   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/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)
   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-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/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)
   skin/classic/browser/devtools/arrow-e.png               (devtools/arrow-e.png)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-16-throbber.png
   skin/classic/browser/sync-16.png
   skin/classic/browser/sync-24-throbber.png
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3550,108 +3550,35 @@ toolbarbutton.chevron > .toolbarbutton-m
   font-size: 300%;
 }
 
 .full-screen-approval-button,
 #full-screen-remember-decision {
   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 */
 
 #developer-toolbar-toolbox-button[error-count]:before {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..548374d0725b7aeccc7ee9b1f03a4c69a90af34b
GIT binary patch
literal 607
zc$@)W0-*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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e120a392606af02764ee50b2fbec64caeab4f8f3
GIT binary patch
literal 375
zc$@)u0f_#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
--- a/browser/themes/osx/devtools/commandline.css
+++ b/browser/themes/osx/devtools/commandline.css
@@ -5,20 +5,20 @@
 .gcli-body {
   margin: 0;
   font: message-box;
   color: hsl(210,30%,85%);
 }
 
 #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;
 }
 
 #gcli-output-root {
   padding: 5px 10px;
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
   border-bottom: 0;
@@ -28,19 +28,19 @@
   padding: 5px 0px;
 }
 
 #gcli-tooltip-connector {
   margin-top: -1px;
   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);
 }
 
 .gcli-tt-description,
 .gcli-tt-error {
   padding: 0 10px;
 }
 
@@ -80,18 +80,18 @@
 
 .gcli-out-shortcut,
 .gcli-help-synopsis {
   padding: 0 3px;
   margin: 0 4px;
   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,
 .gcli-help-synopsis:before {
   color: hsl(210,30%,85%);
   -moz-padding-end: 2px;
 }
 
--- a/browser/themes/osx/devtools/common.css
+++ b/browser/themes/osx/devtools/common.css
@@ -183,33 +183,35 @@
   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/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 {
   display: none;
 }
 
 .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 */
 
 .devtools-horizontal-splitter {
   -moz-appearance: none;
   background-image: none;
   border-top: 1px solid black;
--- a/browser/themes/osx/devtools/computedview.css
+++ b/browser/themes/osx/devtools/computedview.css
@@ -95,22 +95,16 @@ body {
   }
 }
 
 .property-content {
   padding-left: 17px;
 }
 
 /* From skin */
-.helplink {
-  /* FIXME: remove this image 
-  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
-  */
-}
-
 .expander {
   visibility: hidden;
   margin-left: -12px!important;
 }
 
 .expander[open] {
   margin-left: -17px!important;
 }
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -80,23 +80,22 @@
 
 #expressions {
   min-height: 10px;
   max-height: 125px;
 }
 
 .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 {
   -moz-padding-start: 2px !important;
   font-family: Menlo, Monaco, monospace;
 }
 
 /* Searchbox and the search operations help panel */
deleted file mode 100644
index dbe064863d65ac3123a7a60070114dd465852de2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8a40d0d116d76c6ec4a77a459797f9f5e112df69
GIT binary patch
literal 1787
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
deleted file mode 100644
index 887daf052a6eda0b463bd75ca65dd998449cd330..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/devtools/toolbox.css
+++ b/browser/themes/osx/devtools/toolbox.css
@@ -20,31 +20,25 @@
 #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-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;
 }
 
 /* Command buttons */
 
 .command-button {
   padding: 0 8px;
   margin: 0;
deleted file mode 100644
index 12e9c72acc819abb8dcc9985d94ea3b1b9bbda2a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/devtools/webconsole.css
+++ b/browser/themes/osx/devtools/webconsole.css
@@ -222,17 +222,17 @@
 .jsterm-input-node,
 .jsterm-complete-node {
   border: none;
   padding: 0 0 0 16px;
   -moz-appearance: none;
 }
 
 .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,
           .jsterm-complete-node) > .textbox-input-box > .textbox-textarea {
   overflow-x: hidden;
 }
 
 .jsterm-complete-node > .textbox-input-box > .textbox-textarea {
--- a/browser/themes/osx/devtools/widgets.css
+++ b/browser/themes/osx/devtools/widgets.css
@@ -561,18 +561,17 @@
   -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/toolbarbutton-close.png");
-  -moz-image-region: rect(0,32px,16px,16px);
+  list-style-image: url("chrome://browser/skin/devtools/close-dark.png");
   opacity: 0;
 }
 
 .variables-view-delete:hover {
   opacity: 1;
 }
 
 *:hover > .title > .variables-view-delete:not(:hover),
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -207,34 +207,32 @@ browser.jar:
   skin/classic/browser/tabview/search.png                   (tabview/search.png)
   skin/classic/browser/tabview/stack-expander.png           (tabview/stack-expander.png)
   skin/classic/browser/tabview/tabview.png                  (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css                  (tabview/tabview.css)
 * 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.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)
   skin/classic/browser/devtools/checkbox-light.png          (devtools/checkbox-light.png)
   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/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)
   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)
@@ -279,29 +277,30 @@ browser.jar:
   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/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)
   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-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/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)
   skin/classic/browser/devtools/arrow-e.png                 (devtools/arrow-e.png)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-throbber.png
   skin/classic/browser/sync-16.png
   skin/classic/browser/sync-32.png
--- a/browser/themes/shared/devtools/commandline.inc.css
+++ b/browser/themes/shared/devtools/commandline.inc.css
@@ -1,76 +1,117 @@
 %if 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/. */
 %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;
   border-width: 0;
   background-color: transparent;
 }
 
 #gcli-output,
 #gcli-tooltip {
   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 {
+  -moz-appearance: none;
+  color: hsl(210,30%,85%);
   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);
+  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 {
   background-color: hsl(210,30%,85%);
   color: hsl(210,24%,16%);
   text-shadow: none;
 }
 
 .gclitoolbar-complete-node {
   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,
 .gcli-in-todo,
 .gcli-in-closebrace,
 .gcli-in-param,
 .gcli-in-valid {
   margin: 0;
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2788,92 +2788,26 @@ toolbarbutton.bookmark-item[dragover="tr
   font-size: 300%;
 }
 
 .full-screen-approval-button,
 #full-screen-remember-decision {
   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 {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..548374d0725b7aeccc7ee9b1f03a4c69a90af34b
GIT binary patch
literal 607
zc$@)W0-*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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e120a392606af02764ee50b2fbec64caeab4f8f3
GIT binary patch
literal 375
zc$@)u0f_#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
--- a/browser/themes/windows/devtools/commandline.css
+++ b/browser/themes/windows/devtools/commandline.css
@@ -5,19 +5,19 @@
 .gcli-body {
   margin: 0;
   font: message-box;
   color: hsl(210,30%,85%);
 }
 
 #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;
 }
 
 #gcli-output-root {
   padding: 5px 10px;
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
   border-bottom: 0;
@@ -27,19 +27,19 @@
   padding: 5px 0px;
 }
 
 #gcli-tooltip-connector {
   margin-top: -1px;
   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,
 .gcli-tt-error {
   padding: 0 10px;
 }
 
 .gcli-row-out {
@@ -78,18 +78,18 @@
 
 .gcli-out-shortcut,
 .gcli-help-synopsis {
   padding: 0 3px;
   margin: 0 4px;
   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,
 .gcli-help-synopsis:before {
   color: hsl(210,30%,85%);
   -moz-padding-end: 2px;
 }
 
--- a/browser/themes/windows/devtools/common.css
+++ b/browser/themes/windows/devtools/common.css
@@ -190,34 +190,35 @@
   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/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 {
   display: none;
 }
 
 .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 */
 
 .devtools-horizontal-splitter {
   -moz-appearance: none;
   border-width: 1px 0 0 0;
   -moz-border-top-colors: black;
--- a/browser/themes/windows/devtools/computedview.css
+++ b/browser/themes/windows/devtools/computedview.css
@@ -95,22 +95,16 @@ body {
   }
 }
 
 .property-content {
   padding-left: 17px;
 }
 
 /* From skin */
-.helplink {
-  /* FIXME: remove this image 
-  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
-  */
-}
-
 .expander {
   visibility: hidden;
   margin-left: -12px!important;
 }
 
 .expander[open] {
   margin-left: -17px!important;
 }
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -78,23 +78,22 @@
 
 #expressions {
   min-height: 10px;
   max-height: 125px;
 }
 
 .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 {
   -moz-padding-start: 2px !important;
   font-family: Menlo, Monaco, monospace;
 }
 
 /* Searchbox and the search operations help panel */
deleted file mode 100644
index dbe064863d65ac3123a7a60070114dd465852de2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8a40d0d116d76c6ec4a77a459797f9f5e112df69
GIT binary patch
literal 1787
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
deleted file mode 100644
index 4a58465b9b7ea3b3c7c14b36214524fb9b0e38b7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/devtools/toolbox.css
+++ b/browser/themes/windows/devtools/toolbox.css
@@ -22,31 +22,25 @@
 #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-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;
 }
 
 #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));
deleted file mode 100644
index 12e9c72acc819abb8dcc9985d94ea3b1b9bbda2a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/devtools/webconsole.css
+++ b/browser/themes/windows/devtools/webconsole.css
@@ -216,17 +216,17 @@
 .jsterm-input-node,
 .jsterm-complete-node {
   border: none;
   padding: 0 0 0 16px;
   -moz-appearance: none;
 }
 
 .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,
           .jsterm-complete-node) > .textbox-input-box > .textbox-textarea {
   overflow-x: hidden;
 }
 
 .jsterm-complete-node > .textbox-input-box > .textbox-textarea {
--- a/browser/themes/windows/devtools/widgets.css
+++ b/browser/themes/windows/devtools/widgets.css
@@ -564,18 +564,17 @@
   -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/toolbarbutton-close.png");
-  -moz-image-region: rect(0,32px,16px,16px);
+  list-style-image: url("chrome://browser/skin/devtools/close-dark.png");
   opacity: 0;
 }
 
 .variables-view-delete:hover {
   opacity: 1;
 }
 
 *:hover > .title > .variables-view-delete:not(:hover),
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -145,34 +145,32 @@ browser.jar:
         skin/classic/browser/tabview/stack-expander.png             (tabview/stack-expander.png)
         skin/classic/browser/tabview/tabview.png                    (tabview/tabview.png)
         skin/classic/browser/tabview/tabview-inverted.png           (tabview/tabview-inverted.png)
         skin/classic/browser/tabview/tabview.css                    (tabview/tabview.css)
 *       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.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)
         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/checkbox-dark.png             (devtools/checkbox-dark.png)
         skin/classic/browser/devtools/checkbox-light.png            (devtools/checkbox-light.png)
         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/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)
         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)
@@ -217,31 +215,32 @@ browser.jar:
         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/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)
         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-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/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)
         skin/classic/browser/devtools/arrow-e.png                   (devtools/arrow-e.png)
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/browser/sync-throbber.png
         skin/classic/browser/sync-16.png
         skin/classic/browser/sync-32.png
@@ -397,34 +396,32 @@ browser.jar:
         skin/classic/aero/browser/tabview/stack-expander.png         (tabview/stack-expander.png)
         skin/classic/aero/browser/tabview/tabview.png                (tabview/tabview.png)
         skin/classic/aero/browser/tabview/tabview-inverted.png       (tabview/tabview-inverted.png)
         skin/classic/aero/browser/tabview/tabview.css                (tabview/tabview.css)
 *       skin/classic/aero/browser/devtools/common.css                (devtools/common.css)
         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)
         skin/classic/aero/browser/devtools/command-tilt.png          (devtools/command-tilt.png)
         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)
         skin/classic/aero/browser/devtools/orion.css                 (devtools/orion.css)
         skin/classic/aero/browser/devtools/orion-container.css       (devtools/orion-container.css)
         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)
         skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton.png                 (devtools/breadcrumbs-scrollbutton.png)
         skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-pressed.png              (devtools/breadcrumbs/ltr-end-pressed.png)
         skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png     (devtools/breadcrumbs/ltr-end-selected-pressed.png)
         skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-selected.png             (devtools/breadcrumbs/ltr-end-selected.png)
         skin/classic/aero/browser/devtools/breadcrumbs/ltr-end.png                      (devtools/breadcrumbs/ltr-end.png)
@@ -469,31 +466,32 @@ browser.jar:
         skin/classic/aero/browser/devtools/debugger-pause.png        (devtools/debugger-pause.png)
         skin/classic/aero/browser/devtools/debugger-play.png         (devtools/debugger-play.png)
         skin/classic/aero/browser/devtools/debugger-step-in.png      (devtools/debugger-step-in.png)
         skin/classic/aero/browser/devtools/debugger-step-out.png     (devtools/debugger-step-out.png)
         skin/classic/aero/browser/devtools/debugger-step-over.png    (devtools/debugger-step-over.png)
         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)
         skin/classic/aero/browser/devtools/floating-scrollbars-light.css (devtools/floating-scrollbars-light.css)
         skin/classic/aero/browser/devtools/inspector.css             (devtools/inspector.css)
         skin/classic/aero/browser/devtools/toolbox.css               (devtools/toolbox.css)
         skin/classic/aero/browser/devtools/tool-options.png          (devtools/tool-options.png)
         skin/classic/aero/browser/devtools/tool-webconsole.png       (devtools/tool-webconsole.png)
         skin/classic/aero/browser/devtools/tool-debugger.png         (devtools/tool-debugger.png)
         skin/classic/aero/browser/devtools/tool-inspector.png        (devtools/tool-inspector.png)
         skin/classic/aero/browser/devtools/tool-styleeditor.png      (devtools/tool-styleeditor.png)
         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)
         skin/classic/aero/browser/devtools/arrow-e.png               (devtools/arrow-e.png)
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/aero/browser/sync-throbber.png
         skin/classic/aero/browser/sync-16.png
         skin/classic/aero/browser/sync-32.png