diff --git a/xpfe/browser/samples/dexanimdialog.xul b/xpfe/browser/samples/dexanimdialog.xul
index 5b4d8529c75..f5e6e22c908 100644
--- a/xpfe/browser/samples/dexanimdialog.xul
+++ b/xpfe/browser/samples/dexanimdialog.xul
@@ -29,6 +29,11 @@
 
     // OK button handler
     function DoOK() {
+      var toolkitCore = GetToolkitCore();
+      if (toolkitCore)
+        toolkitCore.CloseWindow(window);
+      return;
+
       // get checkbox
       // (using a document method available on HTML and XUL
       // documents, but not on XML documents)
@@ -65,6 +70,16 @@
       return element;
     }
 
+    function GetToolkitCore() {
+      var toolkitCore = XPAppCoresManager.Find("ToolkitCore");
+      if (!toolkitCore) {
+        toolkitCore = new ToolkitCore();
+        if (toolkitCore)
+          toolkitCore.Init("ToolkitCore");
+      }
+      return toolkitCore;
+    }
+
     function animateButtonImage() {
       var button = document.getElementById("animation");
       if (button) {
@@ -84,29 +99,29 @@
     }
   </html:script>
 
-  <table xmlns="http://www.w3.org/TR/REC-html40">
-    <tr>
-      <td>Give me your money</td>
-    </tr>
-    <tr>
-      <td>
+  <html:table>
+    <html:tr>
+      <html:td>Give me your money</html:td>
+    </html:tr>
+    <html:tr>
+      <html:td>
         <!-- note the html namespace on the id attribute, which
              seems at this time to be required by getAttribute() -->
-        <input type="checkbox" html:id="remind"/>Remind me
-      </td>
-    </tr>
-    <tr>
-      <td><img src="sampleimages/bongo.gif"/></td>
-      <td><img id="animation" src="sampleimages/right.gif"/></td>
-    </tr>
-    <tr>
-      <td><button onclick="startAnimation()">Start Animation</button></td>
-      <td><button onclick="stopAnimation()">Stop Animation</button></td>
-    </tr>
-    <tr>
-      <td><button onclick="DoOK()">OK</button></td>
-      <td><button>Cancel</button></td>
-    </tr>
-  </table>
+        <html:input type="checkbox" html:id="remind"/>Remind me
+      </html:td>
+    </html:tr>
+    <html:tr>
+      <html:td><html:img src="sampleimages/bongo.gif"/></html:td>
+      <html:td><html:img id="animation" src="sampleimages/right.gif"/></html:td>
+    </html:tr>
+    <html:tr>
+      <html:td><html:button onclick="startAnimation()">Start Animation</html:button></html:td>
+      <html:td><html:button onclick="stopAnimation()">Stop Animation</html:button></html:td>
+    </html:tr>
+    <html:tr>
+      <html:td><button onclick="DoOK()">OK</html:button></html:td>
+      <html:td><button>Cancel</html:button></html:td>
+    </html:tr>
+  </html:table>
 
 </xul:window>
diff --git a/xpfe/browser/samples/dexanimmaster.xul b/xpfe/browser/samples/dexanimmaster.xul
index 9d148e3818f..2598db16339 100644
--- a/xpfe/browser/samples/dexanimmaster.xul
+++ b/xpfe/browser/samples/dexanimmaster.xul
@@ -61,16 +61,16 @@
 
   <toolbox> 
     <toolbar>
+      <!-- insert the next line should the bug where buttons don't show up
+           without an image specified ever return -->
+      <!-- src="resource:/res/toolbar/TB_Back.gif" align="bottom" -->
       <titledbutton
-         src="resource:/res/toolbar/TB_Back.gif" align="bottom"
          value="Make Dialog" onclick="MakeDialog()"
          style="background-color:rgb(192,192,192);"/>
       <titledbutton
-         src="resource:/res/toolbar/TB_Back.gif" align="bottom"
          value="Start Animation" onclick="startAnimation()"
          style="background-color:rgb(192,192,192);"/>
       <titledbutton
-         src="resource:/res/toolbar/TB_Back.gif" align="bottom"
          value="Stop Animation" onclick = "stopAnimation()"
          style="background-color:rgb(192,192,192);"/>
     </toolbar>
diff --git a/xpfe/browser/samples/dexsimpledialog.xul b/xpfe/browser/samples/dexsimpledialog.xul
index 4f843da17e5..dd49d3947b9 100644
--- a/xpfe/browser/samples/dexsimpledialog.xul
+++ b/xpfe/browser/samples/dexsimpledialog.xul
@@ -19,7 +19,12 @@
 
     // OK button handler
     function DoOK() {
-      // get checkbox
+      var toolkitCore = GetToolkitCore();
+      if (toolkitCore)
+        toolkitCore.CloseWindow(window);
+      return;
+
+      // alternatively: get checkbox and tell some appcore about it
       // (using a document method available on HTML and XUL
       // documents, but not on XML documents)
       var checkbox = document.getElementById("remind");
@@ -54,24 +59,34 @@
         }
       return element;
     }
+
+    function GetToolkitCore() {
+      var toolkitCore = XPAppCoresManager.Find("ToolkitCore");
+      if (!toolkitCore) {
+        toolkitCore = new ToolkitCore();
+        if (toolkitCore)
+          toolkitCore.Init("ToolkitCore");
+      }
+      return toolkitCore;
+    }
   </html:script>
 
-  <table xmlns="http://www.w3.org/TR/REC-html40">
-    <tr>
-      <td>Give me your money</td>
-    </tr>
-    <tr>
-      <td>
+  <html:table>
+    <html:tr>
+      <html:td>Give me your money</html:td>
+    </html:tr>
+    <html:tr>
+      <html:td>
         <!-- note the html namespace on the id attribute, which
              seems at this time to be required by getAttribute() -->
-        <input type="checkbox" html:id="remind"/>Remind me
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <button onclick="DoOK()">OK</button>
-      </td>
-    </tr>
-  </table>
+        <html:input type="checkbox" html:id="remind"/>Remind me
+      </html:td>
+    </html:tr>
+    <html:tr>
+      <html:td>
+        <html:button onclick="DoOK()">OK</html:button>
+      </html:td>
+    </html:tr>
+  </html:table>
 
 </xul:window>
diff --git a/xpfe/browser/samples/dexsimplemaster.xul b/xpfe/browser/samples/dexsimplemaster.xul
index cb830d4d0a3..131d1db1ac8 100644
--- a/xpfe/browser/samples/dexsimplemaster.xul
+++ b/xpfe/browser/samples/dexsimplemaster.xul
@@ -33,14 +33,13 @@
 
   <xul:toolbox> 
     <xul:toolbar>
-      <!-- buttons temporarily have (inappropriate) images because of
-           a bug in titledbutton -->
+      <!-- insert the next line should the bug where buttons don't show up
+           without an image specified ever return -->
+      <!-- src="resource:/res/toolbar/TB_Stop.gif" align="bottom" -->
       <xul:titledbutton
-         src="resource:/res/toolbar/TB_Back.gif" align="bottom"
          value="Make Dialog" onclick="MakeDialog()"
          style="background-color:rgb(192,192,192);"/>
       <xul:titledbutton
-         src="resource:/res/toolbar/TB_Back.gif" align="bottom"
          value="Modal Dialog" onclick="ModalDialog()"
          style="background-color:rgb(192,192,192);"/>
     </xul:toolbar>