diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 17f76b43389..6efdc071f7d 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -197,6 +197,9 @@ function UpdatePageReport(event)
     gReportButton.setAttribute("blocked", "true");
     if (pref && pref.getBoolPref("privacy.popups.firstTime")) {
       displayPageReportFirstTime();
+
+      // Now set the pref.
+      pref.setBoolPref("privacy.popups.firstTime", "false");
     }
   }
   else
diff --git a/mozilla/browser/base/content/pageReportFirstTime.xul b/mozilla/browser/base/content/pageReportFirstTime.xul
index c7073195750..5189634b810 100644
--- a/mozilla/browser/base/content/pageReportFirstTime.xul
+++ b/mozilla/browser/base/content/pageReportFirstTime.xul
@@ -27,9 +27,7 @@
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 
 <!DOCTYPE dialog [
-  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-  %brandDTD;
-  <!ENTITY % pageReportTimeDTD SYSTEM "chrome://browser/locale/pageReportFirstTime.dtd" >
+  <!ENTITY % pageReportFirstTimeDTD SYSTEM "chrome://browser/locale/pageReportFirstTime.dtd" >
   %pageReportFirstTimeDTD;
 ]>            
  
@@ -37,7 +35,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&caption.label;"
         onload="onLoad()"
-        style="width: 20em;"
+        style="width: 40em;"
         buttons="accept"
         persist="screenX screenY"
         screenX="24" screenY="24">
@@ -46,13 +44,17 @@
     &startDescription.label;
   </description>
 
+  <separator class="thin"/>
+
   <hbox pack="center">
-    <statusbar style="width:5em">
-      <statusbarpanel id="page-report-button" blocked="true"/>
-      <statusbarpanel flex="1"><description>Document: Done</description>
+    <statusbar style="width:20em">
+      <statusbarpanel class="statusbarpanel-iconic" id="page-report-button" blocked="true"/>
+      <statusbarpanel flex="1" pack="left"><description>Document: Done</description></statusbarpanel>
     </statusbar>
   </hbox>
 
+  <separator class="thin"/>
+
   <description>
     &endDescription.label;
   </description>
diff --git a/mozilla/browser/base/locale/pageReport.dtd b/mozilla/browser/base/locale/pageReport.dtd
index ce0436db786..7759428012e 100644
--- a/mozilla/browser/base/locale/pageReport.dtd
+++ b/mozilla/browser/base/locale/pageReport.dtd
@@ -1,9 +1,9 @@
 <!ENTITY caption.label "Blocked Popups">
 
 <!ENTITY intro.label "The following sites were prevented from displaying 
-unrequested pop-up windows:">
+unrequested popup windows:">
 
 <!ENTITY done.label "Done">
 <!ENTITY unblock.label "Unblock Site">
 
-<!ENTITY unblockedPopupMsg.label " will now be able to open unrequested pop-up windows.">
\ No newline at end of file
+<!ENTITY unblockedPopupMsg.label " will now be able to open unrequested popup windows.">
\ No newline at end of file
diff --git a/mozilla/browser/base/locale/pageReportFirstTime.dtd b/mozilla/browser/base/locale/pageReportFirstTime.dtd
index 3580ad2a9d9..74d2ff7c47a 100644
--- a/mozilla/browser/base/locale/pageReportFirstTime.dtd
+++ b/mozilla/browser/base/locale/pageReportFirstTime.dtd
@@ -1,9 +1,6 @@
-<!ENTITY startDescription.label            "A Web site has attempted to open a pop-up window without your permission.
-Phoenix has automatically closed the popup window.  Whenever Phoenix blocks these pop-ups, you will see an icon 
-on the status bar.">
+<!ENTITY startDescription.label            "A Web site has attempted to open a popup window without your permission. Phoenix has automatically closed the popup window.  Whenever Phoenix blocks these popups, you will see an icon on the status bar.">
 
-<!ENTITY endDescription.label              "You can click on this icon to see which sites Phoenix blocked and to
-allow those sites to open pop-ups if they are required for the site to function correctly."
+<!ENTITY endDescription.label              "You can click on this icon to see which sites Phoenix blocked and to allow those sites to open popups if they are required for the site to function correctly.">
 
 <!ENTITY caption.label                     "About Popup Blocking">
 
diff --git a/mozilla/browser/components/prefwindow/locale/pref-popups.dtd b/mozilla/browser/components/prefwindow/locale/pref-popups.dtd
index d2dc2cce8d3..ab05941f8c6 100644
--- a/mozilla/browser/components/prefwindow/locale/pref-popups.dtd
+++ b/mozilla/browser/components/prefwindow/locale/pref-popups.dtd
@@ -1,16 +1,16 @@
-<!ENTITY title                          "Pop-ups">
+<!ENTITY title                          "Popups">
 
-<!ENTITY popupBlocking.label            "Pop-up Window Policy">
+<!ENTITY popupBlocking.label            "Popup Window Policy">
 
 <!ENTITY popupDetails                   "When websites attempt to open new windows without being asked">
 
-<!ENTITY popupReject.label              "Reject pop-up windows">
+<!ENTITY popupReject.label              "Reject popup windows">
 <!ENTITY popupReject.accesskey          "r">
 
 <!ENTITY popupView.label                "Manage Popup Permissions">
 <!ENTITY popupView.accesskey            "m">
 
-<!ENTITY div.blessedservers.label       "Always allow the sites below to open pop-up windows:">
+<!ENTITY div.blessedservers.label       "Always allow the sites below to open popup windows:">
 
 <!ENTITY removepermission.label         "Remove Site">
 <!ENTITY removeallpermissions.label     "Remove All Sites">