diff --git a/toolkit/themes/gnomestripe/global/webConsole.css b/toolkit/themes/gnomestripe/global/webConsole.css
index 8ded9ef5cdba..b32d7240d240 100644
--- a/toolkit/themes/gnomestripe/global/webConsole.css
+++ b/toolkit/themes/gnomestripe/global/webConsole.css
@@ -69,9 +69,12 @@
   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;
@@ -167,7 +170,7 @@
   -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);
 }
 
@@ -180,11 +183,11 @@
   -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);
 }
 
@@ -197,11 +200,11 @@
   -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);
 }
 
@@ -214,16 +217,16 @@
   -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);
 }
 
@@ -233,11 +236,11 @@
   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);
 }
 
diff --git a/toolkit/themes/pinstripe/global/webConsole.css b/toolkit/themes/pinstripe/global/webConsole.css
index e60477864d8f..2b7f4622b2d5 100644
--- a/toolkit/themes/pinstripe/global/webConsole.css
+++ b/toolkit/themes/pinstripe/global/webConsole.css
@@ -72,9 +72,12 @@
   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;
@@ -225,7 +228,7 @@
   -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);
 }
 
@@ -238,11 +241,11 @@
   -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);
 }
 
@@ -255,11 +258,11 @@
   -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);
 }
 
@@ -272,16 +275,16 @@
   -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);
 }
 
@@ -291,11 +294,11 @@
   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);
 }
 
diff --git a/toolkit/themes/winstripe/global/webConsole.css b/toolkit/themes/winstripe/global/webConsole.css
index 48d80ff4f6ce..05e975acf85c 100644
--- a/toolkit/themes/winstripe/global/webConsole.css
+++ b/toolkit/themes/winstripe/global/webConsole.css
@@ -68,9 +68,12 @@
   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;
@@ -165,7 +168,7 @@
   -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);
 }
 
@@ -178,11 +181,11 @@
   -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);
 }
 
@@ -195,11 +198,11 @@
   -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);
 }
 
@@ -212,16 +215,16 @@
   -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);
 }
 
@@ -231,11 +234,11 @@
   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);
 }