diff --git a/mozilla/extensions/irc/xul/content/static.js b/mozilla/extensions/irc/xul/content/static.js
index ca0045d128f..e780ca3f343 100644
--- a/mozilla/extensions/irc/xul/content/static.js
+++ b/mozilla/extensions/irc/xul/content/static.js
@@ -26,9 +26,10 @@
 
 var client = new Object();
 
-//client.IMAGEDIR = "chrome://chatzilla/skin/images/";
-client.IMAGEDIR = "resource:///chrome/chatzilla/skin/default/images/";
-client.CSSDIR = "resource:///chrome/chatzilla/skin/default/";
+client.IMAGEDIR = "chrome://chatzilla/skin/images/";
+client.CSSDIR = "chrome://chatzilla/skin/";
+//client.IMAGEDIR = "resource:///chrome/chatzilla/skin/default/images/";
+//client.CSSDIR = "resource:///chrome/chatzilla/skin/default/";
 
 client.COMMAND_CHAR = "/";
 client.STEP_TIMEOUT = 500;
@@ -219,7 +220,7 @@ function insertSmiley (emoticon, containerTag)
     if (src)
     {
         var img = document.createElement ("html:img");
-        img.setAttribute ("src", src);
+        img.setAttribute ("src", client.IMAGEDIR + src);
         containerTag.appendChild (img);
     }
     
diff --git a/mozilla/extensions/irc/xul/skin/chatzilla.css b/mozilla/extensions/irc/xul/skin/chatzilla.css
index 297b98cd982..1e28ef3ff01 100644
--- a/mozilla/extensions/irc/xul/skin/chatzilla.css
+++ b/mozilla/extensions/irc/xul/skin/chatzilla.css
@@ -152,10 +152,8 @@ toolbar {
 
 .quick-list {
 
-/*
-	border: thin silver inset;
+/*	border: thin silver inset;*/
 	background: #dddddd;
-*/
 	overflow: auto;