diff --git a/xpfe/components/sidebar/resources/flash.css b/xpfe/components/sidebar/resources/flash.css
index b3bb770a5d92..895db2c957be 100644
--- a/xpfe/components/sidebar/resources/flash.css
+++ b/xpfe/components/sidebar/resources/flash.css
@@ -8,14 +8,15 @@ window {
   background-color: white;
 }
 
-treeitem[type="http://www.mozilla.org/RDF#TinderboxFlash"] > treerow > treecell > titledbutton {
+treeitem[type="http://www.mozilla.org/RDF#TinderboxFlash"] > treerow > treecell > .tree-icon {
   list-style-image: url("chrome://sidebar/skin/flames.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#MsgNewMessages"] > treerow > treecell > titledbutton {
+treeitem[type="http://home.netscape.com/NC-rdf#MsgNewMessages"] > treerow > treecell > .tree-icon {
   list-style-image: url("chrome://messenger/skin/folderHasMail.gif");
 }
 
-treeitem[type="http://www.mozilla.org/rdf#XPInstallNotification"] > treerow > treecell > titledbutton {
+treeitem[type="http://www.mozilla.org/rdf#XPInstallNotification"] > treerow > treecell > .tree-icon {
   list-style-image: url("resource:/res/xpinstall/notification.gif");
 }
+
diff --git a/xpfe/components/sidebar/resources/flash.js b/xpfe/components/sidebar/resources/flash.js
index 103e29d6c283..0e1a8ad84b95 100644
--- a/xpfe/components/sidebar/resources/flash.js
+++ b/xpfe/components/sidebar/resources/flash.js
@@ -117,7 +117,7 @@ function flashInit()
 function flashReload(url, pollInterval)
 {
     // Reload the specified datasource and reschedule.
-    dump('Reload(' + url + ', ' + pollInterval + ')\n');
+    dump('flashReload(' + url + ', ' + pollInterval + ')\n');
 
     var datasource = RDF.GetDataSource(url);
     datasource = datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
@@ -131,7 +131,7 @@ function flashReload(url, pollInterval)
 
 function flashSchedule(url, pollInterval)
 {
-    setTimeout('Reload("' + url + '", ' + pollInterval + ')', pollInterval * 1000);
+    setTimeout('flashReload("' + url + '", ' + pollInterval + ')', pollInterval * 1000);
 }
 
 function flashOpenURL(node)
diff --git a/xpfe/components/sidebar/resources/flash.xul b/xpfe/components/sidebar/resources/flash.xul
index f8501c4c925e..0e169ee10e7d 100644
--- a/xpfe/components/sidebar/resources/flash.xul
+++ b/xpfe/components/sidebar/resources/flash.xul
@@ -33,9 +33,9 @@
   <tree id="flash-tree"
         ref="NC:FlashRoot"
         style="width: 100%; height: 100%"
-        datasources="datasources="rdf:null"
+        datasources="rdf:null"
         rdf:containment="http://home.netscape.com/NC-rdf#child" 
-        onclick="OpenURL(event.target.parentNode.parentNode);">
+        onclick="flashOpenURL(event.target.parentNode.parentNode);">
 
 	<template>
       <treechildren>