diff -Naur content/global/console.xul content.close/global/console.xul
--- content/global/console.xul	2008-04-23 08:09:00.000000000 -0600
+++ content.close/global/console.xul	2008-10-27 02:10:59.000000000 -0600
@@ -4,11 +4,15 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/skin/console/console.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/content/console.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
+
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
 <!DOCTYPE window [
   <!ENTITY % console SYSTEM "chrome://global/locale/console.dtd"> %console;
   <!ENTITY % global SYSTEM "chrome://global/locale/global.dtd"> %global;
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+%browserDTD;
 ]>
 
 <window id="JSConsoleWindow"
@@ -85,5 +89,9 @@
   <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
-
+  <hbox align="right">
+     <toolbarbutton id="close-button" keycode="VK_ESCAPE" class="toolbarbutton-1"
+                        tooltiptext="&fullScreenClose.tooltip;"
+                        oncommand="close();"/>
+  </hbox>
 </window>
diff -Naur content/global/viewSource.xul content.close/global/viewSource.xul
--- content/global/viewSource.xul	2008-04-23 04:04:08.000000000 -0600
+++ content.close/global/viewSource.xul	2008-10-27 02:57:21.000000000 -0600
@@ -3,6 +3,8 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?>
 <?xml-stylesheet href="chrome://mozapps/skin/viewsource/viewsource.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
+
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 
@@ -11,6 +13,8 @@
 %brandDTD;
 <!ENTITY % sourceDTD SYSTEM "chrome://global/locale/viewSource.dtd" >
 %sourceDTD;
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+%browserDTD;
 ]>
 
 <window id="viewSource"
@@ -59,7 +63,7 @@
   <keyset id="viewSourceKeys">
     <key id="key_savePage" key="&savePageCmd.commandkey;" modifiers="accel" command="cmd_savePage"/>
     <key id="key_print" key="&printCmd.commandkey;" modifiers="accel" command="cmd_print"/>
-    <key id="key_close" key="&closeCmd.commandkey;" modifiers="accel" command="cmd_close"/>
+    <key id="key_close" keycode="VK_ESCAPE" command="cmd_close"/>
     <key id="key_goToLine"     key="&goToLineCmd.commandkey;"  command="cmd_goToLine"  modifiers="accel"/>
 
     <key id="key_textZoomEnlarge" key="&textEnlarge.commandkey;" command="cmd_textZoomEnlarge" modifiers="accel"/>
@@ -170,5 +174,9 @@
   <statusbar id="status-bar" class="chromeclass-status">
     <statusbarpanel id="statusbar-line-col" label="" flex="1"/>
   </statusbar>
-
+  <hbox align="right">
+     <toolbarbutton id="close-button" keycode="VK_ESCAPE" class="toolbarbutton-1"
+                        tooltiptext="&fullScreenClose.tooltip;"
+                        oncommand="close();"/>
+  </hbox>
 </window>
diff -Naur content/mozapps/downloads/downloads.xul content.close/mozapps/downloads/downloads.xul
--- content/mozapps/downloads/downloads.xul	2008-04-22 23:57:06.000000000 -0600
+++ content.close/mozapps/downloads/downloads.xul	2008-10-27 01:10:38.000000000 -0600
@@ -5,12 +5,15 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://mozapps/content/downloads/downloads.css"?>
 <?xml-stylesheet href="chrome://mozapps/skin/downloads/downloads.css"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
 
 <!DOCTYPE window [
 <!ENTITY % downloadManagerDTD SYSTEM "chrome://mozapps/locale/downloads/downloads.dtd">
 %downloadManagerDTD;
 <!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
 %editMenuOverlayDTD;
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+%browserDTD;
 ]>
 
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -130,6 +133,9 @@
     <spacer flex="1"/>
     <textbox type="timed" timeout="500" id="searchbox"
              oncommand="buildDownloadList();" emptytext="&searchBox.label;"/>
+     <toolbarbutton id="close-button" keycode="VK_ESCAPE" class="toolbarbutton-1"
+                        tooltiptext="&fullScreenClose.tooltip;"
+                        oncommand="closeWindow(true);"/>
   </hbox>
 
 </window>
diff -Naur content/mozapps/extensions/extensions.xul content.close/mozapps/extensions/extensions.xul
--- content/mozapps/extensions/extensions.xul	2008-02-26 23:12:54.000000000 -0700
+++ content.close/mozapps/extensions/extensions.xul	2008-10-27 02:32:38.000000000 -0600
@@ -4,12 +4,15 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://mozapps/content/extensions/extensions.css"?>
 <?xml-stylesheet href="chrome://mozapps/skin/extensions/extensions.css"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
 %extensionsDTD;
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+%browserDTD;
 ]>
 
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -226,6 +229,11 @@
               tooltiptext="&cmd.skip.tooltip;"
               command="cmd_close"/>
     </hbox>
+  <hbox align="right">
+     <toolbarbutton id="close-button" keycode="VK_ESCAPE" class="toolbarbutton-1"
+                        tooltiptext="&fullScreenClose.tooltip;"
+                        oncommand="close();"/>
+  </hbox>
     <hbox id="resizerBox" style="min-width:1px;">
       <spacer flex="1"/>
       <resizer dir="bottomright"/>