diff --git a/suite/browser/pageInfo.xul b/suite/browser/pageInfo.xul
index 34fc1cb26c1..e69de29bb2d 100644
--- a/suite/browser/pageInfo.xul
+++ b/suite/browser/pageInfo.xul
@@ -1,361 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-2004
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-   Simeon Morrison <smorrison@gte.com>
-   Chris McAfee <mcafee@netscape.com>
-   Daniel Brooks <db48x@yahoo.com>
-   Gervase Markham <gerv@gerv.net>
-   Florian QUEZE <f.qu@queze.net>
-
- Alternatively, the contents of this file may be used under the terms of
- either of the GNU General Public License Version 2 or later (the "GPL"),
- or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://navigator/skin/pageInfo.css" type="text/css"?>
-
-<!DOCTYPE window [
-  <!ENTITY % pageInfoDTD SYSTEM "chrome://navigator/locale/pageInfo.dtd">
-  %pageInfoDTD;
-]>
-
-<window id="main-window"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  windowtype="Browser:page-info"
-  onload="onLoadPageInfo()"
-  align="stretch"
-  screenX="10" screenY="10"
-  width="&pageInfoWindow.width;" height="&pageInfoWindow.height;"
-  persist="screenX screenY width height sizemode">
-
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/pageInfo.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-
-  <stringbundleset id="pageinfobundleset">
-    <stringbundle id="pageinfobundle" src="chrome://navigator/locale/pageInfo.properties"/>
-  </stringbundleset>
-
-  <commandset>
-    <command id="cmd_close"     oncommand="window.close();"/>
-    <command id="cmd_help"      oncommand="doHelpButton();"/>
-    <command id="cmd_copy"      oncommand="doCopy();"/>
-    <command id="cmd_selectall" oncommand="doSelectAll();"/>
-  </commandset>
-
-  <keyset>
-    <key key="&closeWindow.key;" modifiers="accel" command="cmd_close"/>
-    <key keycode="VK_ESCAPE"                       command="cmd_close"/>
-    <key key="."                 modifiers="meta"  command="cmd_close"/>
-    <key keycode="VK_F1"                           command="cmd_help"/>
-    <key key="&copy.key;"        modifiers="accel" command="cmd_copy"/>
-    <key key="&selectall.key;"   modifiers="accel" command="cmd_selectall"/>
-    <key key="&selectall.key;"   modifiers="alt"   command="cmd_selectall"/>
-  </keyset>
-
-  <menupopup id="picontext">
-    <menuitem label="&selectall.label;" command="cmd_selectall" accesskey="&selectall.accesskey;"/>
-    <menuitem label="&copy.label;"      command="cmd_copy"      accesskey="&copy.accesskey;"/>
-  </menupopup>
-
-  <tabbox id="tabbox" flex="1" class="spaced">
-    <tabs id="tabs">
-      <tab id="generalTab" label="&generalTab;" accesskey="&generalAccesskey;"/>
-      <tab id="formsTab"   label="&formsTab;"   accesskey="&formsAccesskey;"
-           oncommand="ensureSelection(formView)"/>
-      <tab id="linksTab"   label="&linksTab;"   accesskey="&linksAccesskey;"
-           oncommand="ensureSelection(linkView)"/>
-      <tab id="mediaTab"   label="&mediaTab;"   accesskey="&mediaAccesskey;"
-           oncommand="ensureSelection(imageView)"/>
-      <!-- Others added by overlay -->
-    </tabs>
-    <tabpanels id="tabpanels" flex="1">
-
-      <!-- General page information -->
-      <vbox>
-        <textbox class="header" readonly="true" id="titletext"/>
-        <grid>
-          <columns>
-            <column/>
-            <column style="width: .5em;"/>
-            <column flex="1"/>
-          </columns>
-          <rows>
-            <row>
-              <label control="urltext" value="&generalURL;"/>
-              <separator/>
-              <textbox readonly="true" id="urltext"/>
-            </row>
-            <row>
-              <separator class="thin"/>
-            </row>
-            <row>
-              <label control="typetext" value="&generalType;"/>
-              <separator/>
-              <textbox readonly="true" id="typetext"/>
-            </row>
-            <row>
-              <label control="modetext" value="&generalMode;"/>
-              <separator/>
-              <textbox readonly="true" id="modetext"/>
-            </row>
-            <row>
-              <label control="sourcetext" value="&generalSource;"/>
-              <separator/>
-              <textbox readonly="true" id="sourcetext"/>
-            </row>
-            <row>
-              <label control="encodingtext" value="&generalEncoding;"/>
-              <separator/>
-              <textbox readonly="true" id="encodingtext"/>
-            </row>
-            <row>
-              <label control="sizetext" value="&generalSize;"/>
-              <separator/>
-              <textbox readonly="true" id="sizetext"/>
-            </row>
-            <row>
-              <label control="refertext" value="&generalReferrer;"/>
-              <separator/>
-              <textbox readonly="true" id="refertext"/>
-            </row>
-            <row>
-              <separator class="thin"/>
-            </row>
-            <row>
-              <label control="modifiedtext" value="&generalModified;"/>
-              <separator/>
-              <textbox readonly="true" id="modifiedtext"/>
-            </row>
-            <row>
-              <label control="expirestext" value="&generalExpires;"/>
-              <separator/>
-              <textbox readonly="true" id="expirestext"/>
-            </row>
-          </rows>
-        </grid>
-        <separator class="thin"/>
-        <label id="metahead" control="metatree" class="header" value="&generalMeta;"/>
-        <tree id="metatree" flex="1" contextmenu="picontext">
-          <treecols>
-            <treecol persist="hidden width" flex="1" id="meta-name"    label="&generalMetaName;"/>
-            <splitter class="tree-splitter"/>
-            <treecol persist="hidden width" flex="4" id="meta-content" label="&generalMetaContent;"/>
-          </treecols>
-          <treechildren flex="1"/>
-        </tree>
-      </vbox>
-
-      <!-- Form information -->
-      <vbox>
-        <tree id="formtree" class="fixedsize" onselect="onFormSelect();" contextmenu="picontext">
-          <treecols>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" persist="hidden width" flex="1" 
-                         width="1" id="form-name"   label="&formName;"/>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" persist="hidden width" flex="3" 
-                         width="3" id="form-method" label="&formMethod;"/>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" persist="hidden width" flex="2" 
-                         width="2" id="form-action" label="&formAction;"/>
-          </treecols>
-          <treechildren flex="1"/>
-        </tree>
-        <splitter orient="vertical"/>
-        <vbox flex="1">
-          <textbox readonly="true" class="header" id="formname"/>
-          <grid>
-            <columns>
-              <column/>
-              <column style="width: .5em;"/>
-              <column flex="1"/>
-            </columns>
-            <rows>
-              <row>
-                <label control="formenctype" value="&formEncoding;"/>
-                <separator/>
-                <textbox readonly="true" id="formenctype"/>
-              </row>
-              <row>
-                <label control="formtarget" value="&formTarget;"/>
-                <separator/>
-                <textbox readonly="true" class="label" id="formtarget"/>
-              </row>
-            </rows>
-          </grid>
-          <label control="formpreview" class="header" value="&formFields;"/>
-          <tree id="formpreview" flex="1" contextmenu="picontext">
-            <treecols>
-              <treecol sortSeparators="true" persist="hidden width" flex="3" 
-                           width="3" id="field-label"  label="&formLabel;"/>
-              <splitter class="tree-splitter"/>
-              <treecol sortSeparators="true" persist="hidden width" flex="3" 
-                           width="3" id="field-field"  label="&formFName;"/>
-              <splitter class="tree-splitter"/>
-              <treecol sortSeparators="true" persist="hidden width" flex="1" 
-                           width="1" id="field-type"   label="&formType;"/>
-              <splitter class="tree-splitter"/>
-              <treecol sortSeparators="true" persist="hidden width" flex="3" 
-                           width="3" id="field-value"  label="&formCValue;"/>
-            </treecols>
-            <treechildren flex="1"/>
-          </tree>
-        </vbox>
-      </vbox>
-
-      <!-- Link info -->
-      <vbox>
-        <tree id="linktree" flex="1" ondraggesture="onBeginLinkDrag(event,'link-address','link-name')" contextmenu="picontext">
-          <treecols>
-            <treecol sortSeparators="true" persist="hidden width" flex="5" 
-                         width="5" id="link-name"     label="&linkName;"/>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" persist="hidden width" flex="7" 
-                         width="7" id="link-address"  label="&linkAddress;"/>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" persist="hidden width" flex="2" 
-                         width="2" id="link-type"     label="&linkType;"/>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" persist="hidden width" flex="2"
-                         width="2" id="link-target"   label="&linkTarget;" hidden="true"/>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" persist="hidden width" flex="1"
-                         width="1" id="link-acceskey" label="&linkAccessKey;" hidden="true"/>
-          </treecols>
-          <treechildren flex="1"/>
-        </tree>
-      </vbox>
-
-      <!-- Media information -->
-      <vbox>
-        <tree id="imagetree" class="fixedsize" onselect="onImageSelect();" ondraggesture="onBeginLinkDrag(event,'image-address','image-alt')" contextmenu="picontext">
-          <treecols>
-            <treecol sortSeparators="true" persist="hidden width" flex="10" 
-                         width="10" id="image-address" label="&mediaAddress;"/>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" persist="hidden width" flex="2" 
-                         width="2"  id="image-type"    label="&mediaType;"/>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" hidden="true" persist="hidden width" flex="4" 
-                         width="4"  id="image-alt"    label="&mediaAltHeader;"/>
-            <splitter class="tree-splitter"/>
-            <treecol sortSeparators="true" hidden="true" persist="hidden width" flex="1"
-                         width="1"  id="image-count"    label="&mediaCount;"/>
-          </treecols>
-          <treechildren flex="1"/>
-        </tree>
-        <splitter orient="vertical"/>
-        <vbox flex="1">
-          <grid>
-            <columns>
-              <column/>
-              <column style="width: .5em;"/>
-              <column flex="1"/>
-            </columns>
-            <rows>
-              <row>
-                <label control="imageurltext" value="&mediaURL;"/>
-                <separator/>
-                <textbox readonly="true" id="imageurltext"/>
-              </row>
-              <row>
-                <label control="imagetitletext" value="&mediaTitle;"/>
-                <separator/>
-                <textbox readonly="true" id="imagetitletext"/>
-              </row>
-              <row>
-                <label control="imagealttext" value="&mediaAlt;"/>
-                <separator/>
-                <textbox readonly="true" id="imagealttext"/>
-              </row>
-              <row>
-                <label control="imagelongdesctext" value="&mediaLongdesc;"/>
-                <separator/>
-                <textbox readonly="true" id="imagelongdesctext"/>
-              </row>
-              <row>
-                <label control="imagetypetext" value="&generalType;"/>
-                <separator/>
-                <textbox readonly="true" id="imagetypetext"/>
-              </row>
-              <row>
-                <label control="imagesourcetext" value="&generalSource;"/>
-                <separator/>
-                <textbox readonly="true" id="imagesourcetext"/>
-              </row>
-              <row>
-                <label control="imagesizetext" value="&generalSize;"/>
-                <separator/>
-                <textbox readonly="true" id="imagesizetext"/>
-              </row>
-              <row>
-                <label control="imageexpirestext" value="&generalExpires;"/>
-                <separator/>
-                <textbox readonly="true" id="imageexpirestext"/>
-              </row>
-              <row>
-                <label control="imageSize" value="&mediaDimensions;"/>
-                <separator/>
-                <textbox readonly="true" id="imageSize"/>
-              </row>
-              <row id="physRow" collapsed="true">
-                <label control="physSize" value="&mediaPhysDimensions;"/>
-                <separator/>
-                <textbox readonly="true" id="physSize"/>
-              </row>
-            </rows>
-          </grid>
-          <hbox align="end">
-            <label control="thepreviewimage" value="&mediaPreview;" class="header"/>
-            <spacer flex="1"/>
-            <button label="&mediaSaveAs;" accesskey="&mediaSaveAs.accesskey;"
-                    id="imagesaveasbutton" disabled="true"
-                    oncommand="saveMedia();"/>
-          </hbox>
-          <vbox class="inset iframe" flex="1" pack="center">
-            <hbox id="theimagecontainer" pack="center">
-              <image id="thepreviewimage"/>
-            </hbox>
-            <hbox id="brokenimagecontainer" pack="center" collapsed="true">
-              <image id="brokenimage" src="resource:///res/broken-image.gif"/>
-            </hbox>
-          </vbox>
-        </vbox>
-      </vbox>
-
-      <!-- Others added by overlay -->
-    </tabpanels>
-  </tabbox>
-</window>
diff --git a/suite/locales/en-US/chrome/browser/pageInfo.dtd b/suite/locales/en-US/chrome/browser/pageInfo.dtd
index ce6fc8a4796..c81196ac782 100644
--- a/suite/locales/en-US/chrome/browser/pageInfo.dtd
+++ b/suite/locales/en-US/chrome/browser/pageInfo.dtd
@@ -49,7 +49,7 @@
 <!ENTITY  closeWindow.key       "w">
 
 <!ENTITY  generalTab            "General">
-<!ENTITY  generalAccesskey      "G">
+<!ENTITY  generalTab.accesskey  "G">
 <!ENTITY  generalTitle          "Title:">
 <!ENTITY  generalURL            "Address:">
 <!ENTITY  generalMode           "Render Mode:">
@@ -66,7 +66,7 @@
 <!ENTITY  generalMetaContent    "Content">
 
 <!ENTITY  formsTab              "Forms">
-<!ENTITY  formsAccesskey        "F">
+<!ENTITY  formsTab.accesskey    "F">
 <!ENTITY  formAction            "Form Action">
 <!ENTITY  formMethod            "Method">
 <!ENTITY  formName              "Name">
@@ -80,7 +80,7 @@
 <!ENTITY  formCValue            "Current Value">
 
 <!ENTITY  linksTab              "Links">
-<!ENTITY  linksAccesskey        "L">
+<!ENTITY  linksTab.accesskey    "L">
 <!ENTITY  linkNo                "No.">
 <!ENTITY  linkName              "Name">
 <!ENTITY  linkAddress           "Address">
@@ -89,7 +89,7 @@
 <!ENTITY  linkAccessKey         "Access Key">
 
 <!ENTITY  mediaTab              "Media">
-<!ENTITY  mediaAccesskey        "M">
+<!ENTITY  mediaTab.accesskey    "M">
 <!ENTITY  mediaHeader           "Images on this page">
 <!ENTITY  mediaURL              "Address:">
 <!ENTITY  mediaBase             "Base Address:">
@@ -108,7 +108,7 @@
 <!ENTITY  mediaTitle            "Title:">
 <!ENTITY  mediaLongdesc         "Long Description:">
 <!ENTITY  mediaSaveAs           "Save As...">
-<!ENTITY  mediaSaveAs.accesskey "S">
+<!ENTITY  mediaSaveAs.accesskey "A">
 <!ENTITY  mediaPreview          "Media Preview:">
 
 <!ENTITY  framesTab             "Frames">