diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 02abd01b6e5..07d5c8aa331 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -246,13 +246,16 @@
       
       <hbox id="window-controls" hidden="true" fullscreencontrol="true">
         <toolbarbutton id="minimize-button" class="toolbarbutton-1"
+                       tooltiptext="&minimizeButton.tooltip;"
                        oncommand="window.minimize();"/>
 
         <toolbarbutton id="restore-button" class="toolbarbutton-1"
+                       tooltiptext="&restoreButton.tooltip;"
                        oncommand="BrowserFullScreen();"/>
 
         <toolbarbutton id="close-button" class="toolbarbutton-1"
-                       oncommand="window.close();"/>
+                       tooltiptext="&closeWindow.label;"
+                       oncommand="BrowserTryToCloseWindow();"/>
       </hbox>
     </toolbar>
   
diff --git a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
index 1aa5348c9ce..d88ed8287a6 100644
--- a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -79,6 +79,9 @@
 <!ENTITY closeOtherTabs.label "Close Other Tabs">
 <!ENTITY closeWindow.label "Close Window">
 
+<!ENTITY minimizeButton.tooltip       "Minimize">
+<!ENTITY restoreButton.tooltip        "Restore">
+
 <!-- I'd like all this to move to an overlay or something -->
 <!ENTITY bidiMenu.label "Bidi Options">
 <!ENTITY directionBidiMenu.label "Default Direction">
@@ -153,13 +156,6 @@
 <!ENTITY technicalSupportCmd.label "Technical Support">
 <!ENTITY releaseNotesCmd.label "Release Notes">
 
-<!-- LOCALIZATION NOTE BEGIN : DO not localize the entities below; test case --> 
-<!ENTITY languages.label "Languages">
-<!ENTITY en-US.label "English (en-US)">
-<!ENTITY da-DK-file.label "Danish (da-DK; file)">
-<!ENTITY da-DK-http.label "Danish (da-DK; http)">
-<!-- LOCALIZATION NOTE END   : DO not localize the entities above; test case --> 
-
 <!ENTITY menuBar.tooltip                  "Menu Bar">
 <!ENTITY personalToolbar.tooltip          "Personal Toolbar">
 <!ENTITY navigationToolbar.tooltip        "Navigation Toolbar">