diff --git a/extensions/wallet/editor/WalletEditor.xul b/extensions/wallet/editor/WalletEditor.xul
index b675016dddca..9343f0879321 100644
--- a/extensions/wallet/editor/WalletEditor.xul
+++ b/extensions/wallet/editor/WalletEditor.xul
@@ -33,42 +33,39 @@
         title="&windowtitle.label;"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        align="vertical"
+        orient="vertical"
         onload="Startup()">
 
-  <html:script src="chrome://communicator/content/wallet/WalletEditor.js"/>
-  <html:script language="javascript" src="chrome://global/content/strres.js" />
-
+  <script src="chrome://communicator/content/wallet/WalletEditor.js"/>
+  <script language="javascript" src="chrome://global/content/strres.js" />
   <keyset id="keyset"/>
            
-    <box id="system" flex="100%" align="vertical">
+    <box id="system" flex="100%" orient="vertical">
       <spring style="height: 7px;"/>
       <text class="label" value="&div.walletdataonsystem.label;"/>
       <separator orient="horizontal" class="groove"/>
       <spring style="height: 10px;"/>
-      <box id="system1" flex="100%" align="horizontal">
+      <box id="system1" flex="100%" orient="horizontal">
         <spring style="width: 7px;"/>
-        <html>
+        <box orient="vertical">
           <text class="label" value="&treehead.schemaname.label;"/>
           <tree multiple="true" id="schematree" class="inset"
-             style="height: 250px;" align="vertical" onclick="ViewEntries();">
+             style="height: 250px;" orient="vertical" onclick="ViewEntries();">
             <treecolgroup>
               <treecol flex="1"/>
             </treecolgroup>
             <treechildren id="schemalist" flex="1"/>
           </tree>
-          <spring flex="5%"/>
-          <spring style="height: 7px;"/>
-          <box align="horizontal">
+          <box orient="horizontal">
             <button id="removeSchema" class="dialog push" disabled="true" value="&button.remove.label;" onclick="DeleteSchema();"/>
             <button id="addSchema" class="dialog push" disabled="false" value="&button.addschema.label;" onclick="AddSchema();"/>
           </box>
-        </html>
+        </box>
         <spring style="width: 7px;"/>
-        <html>
+        <box orient="vertical">
           <text class="label" id="entrytext" value2="&treehead.entries.label;"/>
           <tree multiple="true" id="entrytree" class="inset"
-            style="height: 113px;" align="vertical" onclick="ViewSynonyms();">
+            style="height: 113px;" orient="vertical" onclick="ViewSynonyms();">
             <treecolgroup>
               <treecol flex="1"/>
             </treecolgroup>
@@ -77,24 +74,22 @@
           <spring style="height: 7px;"/>
           <text class="label" id="synonymtext" value2="&treehead.synonyms.label;" value3="&treehead.synonymsoff.label;"/>
           <tree multiple="true" id="synonymtree" class="inset"
-            style="height: 113px;" align="vertical" onclick="SynonymSelected();">
+            style="height: 113px;" orient="vertical" onclick="SynonymSelected();">
             <treecolgroup>
               <treecol flex="1"/>
             </treecolgroup>
             <treechildren flex="1" id="synonymslist"/>
           </tree>
-        </html>
+        </box>
         <spring style="width: 7px;"/>
-        <html>
-          <box align="vertical">
-            <spring style="height: 15px;"/>
-            <button id="removeEntry" class="dialog push" disabled="true" value="&button.remove.label;" onclick="DeleteEntry();"/>
-            <button id="addEntry" class="dialog push" disabled="false" value="&button.addentry.label;" onclick="AddEntry();"/>
-            <spring style="height: 93px;"/>
-            <button id="removeSynonym" class="dialog push" disabled="true" value="&button.remove.label;" onclick="DeleteSynonym();"/>
-            <button id="addSynonym" class="dialog push" disabled="false" value="&button.addsynonym.label;" onclick="AddSynonym();"/>
-          </box>
-        </html>
+        <box orient="vertical">
+          <spring style="height: 15px;"/>
+          <button id="removeEntry" class="dialog push" disabled="true" value="&button.remove.label;" onclick="DeleteEntry();"/>
+          <button id="addEntry" class="dialog push" disabled="false" value="&button.addentry.label;" onclick="AddEntry();"/>
+          <spring style="height: 93px;"/>
+          <button id="removeSynonym" class="dialog push" disabled="true" value="&button.remove.label;" onclick="DeleteSynonym();"/>
+          <button id="addSynonym" class="dialog push" disabled="false" value="&button.addsynonym.label;" onclick="AddSynonym();"/>
+        </box>
         <spring style="width: 7px;"/>
       </box>
     </box>
@@ -102,7 +97,7 @@
 
   <!-- from dialogOverlay.xul -->
   <spring style="height: 5px;"/>
-  <box align="horizontal">
+  <box orient="horizontal">
     <spring flex="100%"/>
     <box id="okCancelButtons"/>
   </box>
