diff --git a/xul/content/mungers.js b/xul/content/mungers.js
--- a/xul/content/mungers.js
+++ b/xul/content/mungers.js
@@ -390,17 +390,17 @@ function insertQuote (matchText, contain
 {
     if (matchText == "``")
         containerTag.appendChild(document.createTextNode("\u201c"));
     else
         containerTag.appendChild(document.createTextNode("\u201d"));
     containerTag.appendChild(document.createElementNS(XHTML_NS, "html:wbr"));
 }
 
-function insertSmiley(emoticon, containerTag)
+function insertSmiley(emoticon, containerTag, eventData, mungerEntry)
 {
     var type = "error";
 
     if (emoticon.search(/\>[-^v]?\)/) != -1)
         type = "face-alien";
     else if (emoticon.search(/\>[=:;][-^v]?[(|]/) != -1)
         type = "face-angry";
     else if (emoticon.search(/[=:;][-^v]?[Ss\\\/]/) != -1)
@@ -441,17 +441,19 @@ function insertSmiley(emoticon, containe
         type = "face-tongue";
     else if (emoticon.search(/;[-^v]?[)\]]/) != -1)
         type = "face-wink";
 
     if (type == "error")
     {
         // We didn't actually match anything, so it'll be a too-generic match
         // from the munger RegExp.
-        containerTag.appendChild(document.createTextNode(emoticon));
+        mungerEntry.enabled = false;
+        client.munger.munge(emoticon, containerTag, eventData);
+        mungerEntry.enabled = true;
         return;
     }
 
     var span = document.createElementNS(XHTML_NS, "html:span");
 
     /* create a span to hold the emoticon text */
     span.setAttribute ("class", "chatzilla-emote-txt");
     span.setAttribute ("type", type);
diff --git a/xul/content/static.js b/xul/content/static.js
--- a/xul/content/static.js
+++ b/xul/content/static.js
@@ -2410,17 +2410,17 @@ function updateAppMotif(motifURL)
     try 
     {
         // No dynamic style node yet.
         if (!node)
         {
             node = document.createProcessingInstruction("xml-stylesheet", dataStr);
             document.insertBefore(node, document.firstChild);
         }
-        else
+        else if (node.data != dataStr)
         {
             node.data = dataStr;
             document.insertBefore(node, node.nextSibling);
         }
     }
     catch (ex)
     {
         dd(formatException(ex));
diff --git a/xul/skin/output-dark.css b/xul/skin/output-dark.css
--- a/xul/skin/output-dark.css
+++ b/xul/skin/output-dark.css
@@ -27,16 +27,17 @@ a.chatzilla-link:visited {
     background-color: black;
 }
 
 .header {
     color: lightslategrey;
     background-color: #333333;
 /*    opacity: 0.9;  causes memory leak? */
     -moz-border-radius: 7px;
+    border-radius: 7px;
 }
 
 .progress-fg {
     background-color: silver;
 }
 
 .value {
     color: silver;
diff --git a/xul/skin/output-light.css b/xul/skin/output-light.css
--- a/xul/skin/output-light.css
+++ b/xul/skin/output-light.css
@@ -25,16 +25,17 @@ a.chatzilla-link {
 }
 
 .header {
     color: darkslategrey;
     background-color: #EEEEEE;
 /*    opacity: 0.9;*/
     border: 1px #777499 solid;
     -moz-border-radius: 7px;
+    border-radius: 7px;
 }
 
 #splash {
     color: #DDDDDD;
 }
 
 #usr-descnodes,
 #ch-topicnodes {
@@ -129,36 +130,40 @@ a.chatzilla-link {
 }                                           /* the speaker changes.           */
 
 .msg[msg-type="JOIN"] .msg-data,
 .msg[msg-type="PART"] .msg-data {
     color: #0e9e0e;
     background-color: #c3f7c3; 
     font-weight: bold;
     -moz-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
     /*border: thin darkblue solid;*/
 }
 
 .msg[msg-type="QUIT"] .msg-data {
     background: #fff196;
     color: #ff8d02;
     font-weight: bold;
     -moz-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
 }
 
 .msg[msg-type="HELLO"] .msg-data {
     background: #1342a5;
     color: white;
     -moz-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
     font-weight: bold;
 }
 
 .msg[msg-type="ERROR"] .msg-data,
 .msg[msg-type="DISCONNECT"] .msg-data {
     -moz-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
     background: #a8221e;
     color: white;
 }
 
 .msg[msg-type="USAGE"] .msg-data {
     color: black;
 }
 
@@ -183,24 +188,26 @@ a.chatzilla-link {
     font-weight: bold;
 }
 
 .msg[msg-type="KICK"] .msg-data {
     color: #ff1a0a;
     background: #ffdbcc;
     font-weight: bold;
     -moz-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
 }
 
 /* important="true" means that the message has text from your /stalk list in
  * it, has your nickname in it, or was spoken by someone in your /stalk list.
  */
 .msg[important="true"] .msg-user {
     background: #d4d8d4;
     -moz-border-radius: 5px 0px 0px 5px;
+    border-radius: 5px 0px 0px 5px;
 }
 
 .msg[important="true"] .msg-data {
     background: #eaefeb;
 }
 
 
 /* :before and :after pseudoclasses form the decorations around nicknames.     */