diff -Naur content/browser/browser.xul content.close/browser/browser.xul
--- content/browser/browser.xul	2008-08-28 18:09:24.000000000 -0600
+++ content.close/browser/browser.xul	2008-10-26 22:24:21.000000000 -0600
@@ -188,15 +188,12 @@
     <key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
     <key id="printKb" key="&printCmd.commandkey;" command="cmd_print"  modifiers="accel"/>
-    <key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
-    <key id="key_closeWindow" key="&closeCmd.key;" command="cmd_closeWindow" modifiers="accel,shift"/>
+    <key id="key_close" keycode="VK_ESCAPE" command="cmd_close"/>
+    <key id="key_closeWindow" keycode="VK_ESCAPE" command="cmd_closeWindow"/>
     <key id="key_undo"
          key="&undoCmd.key;"
          modifiers="accel"/>
     <key id="key_redo" key="&undoCmd.key;" modifiers="accel,shift"/>
-    <key id="key_cut"
-         key="&cutCmd.key;"
-         modifiers="accel"/>
     <key id="key_copy"
          key="&copyCmd.key;"
          modifiers="accel"/>
@@ -230,7 +227,7 @@
     <key id="addBookmarkAsKb" key="&bookmarkThisPageCmd.commandkey;" command="Browser:AddBookmarkAs" modifiers="accel"/>
     <key id="viewBookmarksSidebarKb" key="&bookmarksSidebarCmd.commandkey;" command="viewBookmarksSidebar" modifiers="accel"/>
 
-    <key id="key_stop" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
+    <key id="key_stop" keycode="VK_F9" oncommand="BrowserStop();"/>
     
 
     <key id="key_gotoHistory"
@@ -468,10 +465,6 @@
                 accesskey="&undoCmd.accesskey;"
                 command="cmd_undo"/>
       <menuseparator id="context-sep-undo"/>
-      <menuitem id="context-cut"
-                label="&cutCmd.label;"
-                accesskey="&cutCmd.accesskey;"
-                command="cmd_cut"/>
       <menuitem id="context-copy"
                 label="&copyCmd.label;"
                 accesskey="&copyCmd.accesskey;"
@@ -723,10 +716,6 @@
                           accesskey="&redoCmd.accesskey;"
                           command="cmd_redo"/>
                 <menuseparator/>
-                <menuitem label="&cutCmd.label;"
-                          key="key_cut"
-                          accesskey="&cutCmd.accesskey;"
-                          command="cmd_cut"/>
                 <menuitem label="&copyCmd.label;"
                           key="key_copy"
                           accesskey="&copyCmd.accesskey;"
@@ -1243,11 +1232,6 @@
                        ondragdrop="nsDragAndDrop.drop(event, newWindowButtonObserver);"
                        ondragexit="nsDragAndDrop.dragExit(event, newWindowButtonObserver);"/>
 
-        <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                       label="&cutCmd.label;"
-                       command="cmd_cut"
-                       tooltiptext="&cutButton.tooltip;"/>
-
         <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        label="&copyCmd.label;"
                        command="cmd_copy"
@@ -1276,7 +1260,7 @@
                        tooltiptext="&fullScreenRestore.tooltip;"
                        oncommand="BrowserFullScreen();"/>
 
-        <toolbarbutton id="close-button" class="toolbarbutton-1"
+        <toolbarbutton id="close-button" keycode="VK_ESCAPE" class="toolbarbutton-1"
                        tooltiptext="&fullScreenClose.tooltip;"
                        oncommand="BrowserTryToCloseWindow();"/>
       </hbox>
@@ -1340,6 +1324,9 @@
           <menuseparator observes="blockedPopupsSeparator"/>
         </menupopup>
       </statusbarpanel>
+     <toolbarbutton id="close-button" keycode="VK_ESCAPE" class="toolbarbutton-1"
+                        tooltiptext="&fullScreenClose.tooltip;"
+                        oncommand="BrowserTryToCloseWindow();"/>
     </statusbar>
   </vbox>
 </window>
diff -Naur content/browser/pageinfo/pageInfo.xul content.close/browser/pageinfo/pageInfo.xul
--- content/browser/pageinfo/pageInfo.xul	2008-03-28 04:42:32.000000000 -0600
+++ content.close/browser/pageinfo/pageInfo.xul	2008-10-27 02:37:20.000000000 -0600
@@ -2,10 +2,13 @@
 
 <?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
 
 <!DOCTYPE window [
   <!ENTITY % pageInfoDTD SYSTEM "chrome://browser/locale/pageInfo.dtd">
   %pageInfoDTD;
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+%browserDTD;
 ]>
 
 
@@ -147,6 +150,11 @@
           <treechildren flex="1"/>
         </tree>        
       </groupbox>
+  <hbox align="right">
+     <toolbarbutton id="close-button" keycode="VK_ESCAPE" class="toolbarbutton-1"
+                        tooltiptext="&fullScreenClose.tooltip;"
+                        oncommand="close();"/>
+  </hbox>
       <groupbox id="securityBox">
         <caption id="securityBoxCaption" label="&securityHeader;"/>
         <description id="general-security-identity" class="header"/>
diff -Naur content/browser/places/places.xul content.close/browser/places/places.xul
--- content/browser/places/places.xul	2008-05-01 17:02:02.000000000 -0600
+++ content.close/browser/places/places.xul	2008-10-27 02:02:40.000000000 -0600
@@ -5,6 +5,7 @@
 <?xml-stylesheet href="chrome://browser/content/places/organizer.css"?>
 
 <?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
 <?xml-stylesheet href="chrome://browser/skin/places/organizer.css"?>
 
@@ -81,7 +82,7 @@
 
   <keyset id="placesOrganizerKeyset">
     <!-- Instantiation Keys -->
-    <key id="placesKey_close" key="&cmd.close.key;" modifiers="accel" 
+    <key id="placesKey_close" keycode="VK_ESCAPE" 
          oncommand="close();"/>
          
     <!-- Command Keys -->
@@ -426,4 +427,9 @@
       </deck>
     </vbox>
   </hbox>
+  <hbox align="right">
+     <toolbarbutton id="close-button" keycode="VK_ESCAPE" class="toolbarbutton-1"
+                        tooltiptext="&fullScreenClose.tooltip;"
+                        oncommand="close();"/>
+  </hbox>
 </window>
diff -Naur content/browser/preferences/applicationManager.xul content.close/browser/preferences/applicationManager.xul
--- content/browser/preferences/applicationManager.xul	2008-08-25 16:34:22.000000000 -0600
+++ content.close/browser/preferences/applicationManager.xul	2008-10-26 23:27:10.000000000 -0600
@@ -29,6 +29,7 @@
 
   <keyset id="appManagerKeyset">
     <key id="delete" keycode="VK_DELETE" command="cmd_remove"/>
+    <key id="close" keycode="VK_ESCAPE" command="cmd_close"/>
   </keyset>
 
   <stringbundleset id="appManagerBundleset">