--- a/toolkit/themes/gnomestripe/global/webConsole.css
+++ b/toolkit/themes/gnomestripe/global/webConsole.css
@@ -64,19 +64,22 @@
 /* General output styles */
 
 .webconsole-timestamp {
   color: GrayText;
   margin-top: 0;
   margin-bottom: 0;
 }
 
-.webconsole-msg-icon {
+.hud-msg-node {
   list-style-image: url(chrome://global/skin/icons/webconsole.png);
   -moz-image-region: rect(0, 1px, 0, 0);
+}
+
+.webconsole-msg-icon {
   margin: 3px 4px;
   width: 8px;
   height: 8px;
 }
 
 .hud-clickable {
   cursor: pointer;
   text-decoration: underline;
@@ -162,87 +165,87 @@
 .webconsole-filter-button[category="net"] {
   -moz-image-region: rect(0, 8px, 8px, 0);
 }
 
 .webconsole-msg-network > .webconsole-msg-icon-container {
   -moz-border-start: solid #000 6px;
 }
 
-.webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-network.webconsole-msg-error {
   -moz-image-region: rect(0, 16px, 8px, 8px);
 }
 
 /* CSS styles */
 .webconsole-filter-button[category="css"] {
   -moz-image-region: rect(8px, 8px, 16px, 0);
 }
 
 .webconsole-msg-cssparser > .webconsole-msg-icon-container {
   -moz-border-start: solid #00b6f0 6px;
 }
 
-.webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-error {
   -moz-image-region: rect(8px, 16px, 16px, 8px);
 }
 
-.webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-warn {
   -moz-image-region: rect(8px, 24px, 16px, 16px);
 }
 
 /* JS styles */
 .webconsole-filter-button[category="js"] {
   -moz-image-region: rect(16px, 8px, 24px, 0);
 }
 
 .webconsole-msg-exception > .webconsole-msg-icon-container {
   -moz-border-start: solid #fb9500 6px;
 }
 
-.webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-error {
   -moz-image-region: rect(16px, 16px, 24px, 8px);
 }
 
-.webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-warn {
   -moz-image-region: rect(16px, 24px, 24px, 16px);
 }
 
 /* Web Developer styles */
 .webconsole-filter-button[category="webdev"] {
   -moz-image-region: rect(24px, 8px, 32px, 0);
 }
 
 .webconsole-msg-console > .webconsole-msg-icon-container {
   -moz-border-start: solid #cbcbcb 6px;
 }
 
-.webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon,
-.webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-error,
+.webconsole-msg-output.webconsole-msg-error {
   -moz-image-region: rect(24px, 16px, 32px, 8px);
 }
 
-.webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-warn {
   -moz-image-region: rect(24px, 24px, 32px, 16px);
 }
 
-.webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-info {
   -moz-image-region: rect(24px, 32px, 32px, 24px);
 }
 
 /* Input and output styles */
 .webconsole-msg-input > .webconsole-msg-icon-container,
 .webconsole-msg-output > .webconsole-msg-icon-container {
   border-left: solid #808080 6px;
 }
 
-.webconsole-msg-input > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-input {
   -moz-image-region: rect(24px, 40px, 32px, 32px);
 }
 
-.webconsole-msg-output > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-output {
   -moz-image-region: rect(24px, 48px, 32px, 40px);
 }
 
 .webconsole-close-button {
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
 }
 
 /* JSTerm Styles */

--- a/toolkit/themes/pinstripe/global/webConsole.css
+++ b/toolkit/themes/pinstripe/global/webConsole.css
@@ -67,19 +67,22 @@
 /* General output styles */
 
 .webconsole-timestamp {
   color: GrayText;
   margin-top: 0;
   margin-bottom: 0;
 }
 
-.webconsole-msg-icon {
+.hud-msg-node {
   list-style-image: url(chrome://global/skin/icons/webconsole.png);
   -moz-image-region: rect(0, 1px, 0, 0);
+}
+
+.webconsole-msg-icon {
   margin: 3px 4px;
   width: 8px;
   height: 8px;
 }
 
 .hud-clickable {
   cursor: pointer;
   text-decoration: underline;
@@ -220,87 +223,87 @@
 .webconsole-filter-button[category="net"] {
   -moz-image-region: rect(0, 8px, 8px, 0);
 }
 
 .webconsole-msg-network > .webconsole-msg-icon-container {
   -moz-border-start: solid #000 6px;
 }
 
-.webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-network.webconsole-msg-error {
   -moz-image-region: rect(0, 16px, 8px, 8px);
 }
 
 /* CSS styles */
 .webconsole-filter-button[category="css"] {
   -moz-image-region: rect(8px, 8px, 16px, 0);
 }
 
 .webconsole-msg-cssparser > .webconsole-msg-icon-container {
   -moz-border-start: solid #00b6f0 6px;
 }
 
-.webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-error {
   -moz-image-region: rect(8px, 16px, 16px, 8px);
 }
 
-.webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-warn {
   -moz-image-region: rect(8px, 24px, 16px, 16px);
 }
 
 /* JS styles */
 .webconsole-filter-button[category="js"] {
   -moz-image-region: rect(16px, 8px, 24px, 0);
 }
 
 .webconsole-msg-exception > .webconsole-msg-icon-container {
   -moz-border-start: solid #fb9500 6px;
 }
 
-.webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-error {
   -moz-image-region: rect(16px, 16px, 24px, 8px);
 }
 
-.webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-warn {
   -moz-image-region: rect(16px, 24px, 24px, 16px);
 }
 
 /* Web Developer styles */
 .webconsole-filter-button[category="webdev"] {
   -moz-image-region: rect(24px, 8px, 32px, 0);
 }
 
 .webconsole-msg-console > .webconsole-msg-icon-container {
   -moz-border-start: solid #cbcbcb 6px;
 }
 
-.webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon,
-.webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-error,
+.webconsole-msg-output.webconsole-msg-error {
   -moz-image-region: rect(24px, 16px, 32px, 8px);
 }
 
-.webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-warn {
   -moz-image-region: rect(24px, 24px, 32px, 16px);
 }
 
-.webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-info {
   -moz-image-region: rect(24px, 32px, 32px, 24px);
 }
 
 /* Input and output styles */
 .webconsole-msg-input > .webconsole-msg-icon-container,
 .webconsole-msg-output > .webconsole-msg-icon-container {
   border-left: solid #808080 6px;
 }
 
-.webconsole-msg-input.webconsole-msg-log > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-input {
   -moz-image-region: rect(24px, 40px, 32px, 32px);
 }
 
-.webconsole-msg-output.webconsole-msg-log > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-output {
   -moz-image-region: rect(24px, 48px, 32px, 40px);
 }
 
 .webconsole-close-button {
   list-style-image: url("chrome://global/skin/icons/close.png");
   margin-top: 0;
   margin-bottom: 0;
   -moz-margin-start: 3px;

--- a/toolkit/themes/winstripe/global/webConsole.css
+++ b/toolkit/themes/winstripe/global/webConsole.css
@@ -63,19 +63,22 @@
 /* General output styles */
 
 .webconsole-timestamp {
   color: GrayText;
   margin-top: 0;
   margin-bottom: 0;
 }
 
-.webconsole-msg-icon {
+.hud-msg-node {
   list-style-image: url(chrome://global/skin/icons/webconsole.png);
   -moz-image-region: rect(0, 1px, 0, 0);
+}
+
+.webconsole-msg-icon {
   margin: 3px 4px;
   width: 8px;
   height: 8px;
 }
 
 .hud-clickable {
   cursor: pointer;
   text-decoration: underline;
@@ -160,87 +163,87 @@
 .webconsole-filter-button[category="net"] {
   -moz-image-region: rect(0, 8px, 8px, 0);
 }
 
 .webconsole-msg-network > .webconsole-msg-icon-container {
   -moz-border-start: solid #000 6px;
 }
 
-.webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-network.webconsole-msg-error {
   -moz-image-region: rect(0, 16px, 8px, 8px);
 }
 
 /* CSS styles */
 .webconsole-filter-button[category="css"] {
   -moz-image-region: rect(8px, 8px, 16px, 0);
 }
 
 .webconsole-msg-cssparser > .webconsole-msg-icon-container {
   -moz-border-start: solid #00b6f0 6px;
 }
 
-.webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-error {
   -moz-image-region: rect(8px, 16px, 16px, 8px);
 }
 
-.webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-warn {
   -moz-image-region: rect(8px, 24px, 16px, 16px);
 }
 
 /* JS styles */
 .webconsole-filter-button[category="js"] {
   -moz-image-region: rect(16px, 8px, 24px, 0);
 }
 
 .webconsole-msg-exception > .webconsole-msg-icon-container {
   -moz-border-start: solid #fb9500 6px;
 }
 
-.webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-error {
   -moz-image-region: rect(16px, 16px, 24px, 8px);
 }
 
-.webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-warn {
   -moz-image-region: rect(16px, 24px, 24px, 16px);
 }
 
 /* Web Developer styles */
 .webconsole-filter-button[category="webdev"] {
   -moz-image-region: rect(24px, 8px, 32px, 0);
 }
 
 .webconsole-msg-console > .webconsole-msg-icon-container {
   -moz-border-start: solid #cbcbcb 6px;
 }
 
-.webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon,
-.webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-error,
+.webconsole-msg-output.webconsole-msg-error {
   -moz-image-region: rect(24px, 16px, 32px, 8px);
 }
 
-.webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-warn {
   -moz-image-region: rect(24px, 24px, 32px, 16px);
 }
 
-.webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-info {
   -moz-image-region: rect(24px, 32px, 32px, 24px);
 }
 
 /* Input and output styles */
 .webconsole-msg-input > .webconsole-msg-icon-container,
 .webconsole-msg-output > .webconsole-msg-icon-container {
   border-left: solid #808080 6px;
 }
 
-.webconsole-msg-input > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-input {
   -moz-image-region: rect(24px, 40px, 32px, 32px);
 }
 
-.webconsole-msg-output > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-output {
   -moz-image-region: rect(24px, 48px, 32px, 40px);
 }
 
 .webconsole-close-button {
   border: none;
   padding: 3px;
   list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-image-region: rect(0, 16px, 16px, 0);