From 8515b2220f1c66a00a0e5633fae7ac9a8aaf7591 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Tue, 1 May 2012 19:06:30 +0200
Subject: [PATCH] Bug 747415 - Make our css more efficient. r=bwinton, philipp

---
 .../base/themes/common/calendar-views.css     |  12 +--
 calendar/lightning/themes/common/imip.css     |  16 ++-
 mail/components/im/messages/main.css          |  40 +++----
 mail/components/im/themes/imAccountWizard.css |  18 ++--
 mail/components/im/themes/imMenulist.css      |   4 +-
 .../gnomestripe/editor/EditorDialog.css       |   4 +-
 .../gnomestripe/mail/accountCreation.css      |  28 ++---
 mail/themes/gnomestripe/mail/mailWindow1.css  |  12 +--
 mail/themes/gnomestripe/mail/messageBody.css  |   6 +-
 .../newmailaccount/accountProvisioner.css     |   2 +-
 .../mail/preferences/applications.css         |   8 +-
 mail/themes/gnomestripe/mail/searchDialog.css |  10 +-
 mail/themes/gnomestripe/mail/smileys.css      | 102 +++++++++---------
 mail/themes/pinstripe/editor/EditorDialog.css |   4 +-
 .../themes/pinstripe/mail/accountCreation.css |  28 ++---
 mail/themes/pinstripe/mail/mailWindow1.css    |  14 +--
 mail/themes/pinstripe/mail/messageBody.css    |   4 +-
 .../newmailaccount/accountProvisioner.css     |   4 +-
 .../mail/preferences/applications.css         |  12 +--
 mail/themes/pinstripe/mail/searchDialog.css   |  12 +--
 mail/themes/pinstripe/mail/smileys.css        | 102 +++++++++---------
 mail/themes/qute/editor/EditorDialog.css      |   4 +-
 mail/themes/qute/mail/accountCreation.css     |  30 +++---
 .../mail/compose/messengercompose-aero.css    |   2 +-
 mail/themes/qute/mail/mailWindow1-aero.css    |   8 +-
 mail/themes/qute/mail/mailWindow1.css         |  16 +--
 mail/themes/qute/mail/messageBody.css         |   6 +-
 mail/themes/qute/mail/messenger.css           |   4 +-
 .../accountProvisioner-aero.css               |   4 +-
 .../newmailaccount/accountProvisioner.css     |   4 +-
 .../qute/mail/preferences/applications.css    |   8 +-
 .../mail/preferences/preferences-aero.css     |   2 +-
 .../qute/mail/preferences/preferences.css     |   2 +-
 mail/themes/qute/mail/quickFilterBar-aero.css |   2 +-
 mail/themes/qute/mail/searchDialog.css        |  14 +--
 mail/themes/qute/mail/smileys.css             | 102 +++++++++---------
 36 files changed, 315 insertions(+), 335 deletions(-)

diff --git a/calendar/base/themes/common/calendar-views.css b/calendar/base/themes/common/calendar-views.css
index 95d94d8336..7ee1776e9d 100644
--- a/calendar/base/themes/common/calendar-views.css
+++ b/calendar/base/themes/common/calendar-views.css
@@ -922,15 +922,15 @@ calendar-event-box[gripBars="both"]:not([readonly="true"]):hover .calendar-event
 }
 
 /* tooltips */
-vbox.tooltipBox {
+.tooltipBox {
     max-width: 40em;
 }
 
-column.tooltipValueColumn {
+.tooltipValueColumn {
     max-width: 35em; /* tooltipBox max-width minus space for label */
 }
 
-label.tooltipHeaderLabel {
+.tooltipHeaderLabel {
     font-weight: bold;
     text-align: right;
     margin-top: 0;
@@ -939,17 +939,17 @@ label.tooltipHeaderLabel {
     -moz-margin-end: 1em; /* 1em space before value */
 }
 
-description.tooltipHeaderDescription {
+.tooltipHeaderDescription {
     font-weight: normal;
     text-align: left;
     margin: 0pt;
 }
 
-separator.tooltipBodySeparator {
+.tooltipBodySeparator {
     height: 1ex; /* 1ex space above body text, below last header. */
 }
 
-description.tooltipBody {
+.tooltipBody {
     font-weight: normal;
     white-space: pre-wrap;
     margin: 0pt;
diff --git a/calendar/lightning/themes/common/imip.css b/calendar/lightning/themes/common/imip.css
index 1b1a6676ab..e000b50faf 100644
--- a/calendar/lightning/themes/common/imip.css
+++ b/calendar/lightning/themes/common/imip.css
@@ -15,24 +15,22 @@ td {
        width: 2em;
        text-align: left;
 }
-td.header {
+.header {
+       color: HighlightText;
+       font-size: 1em;
+       font-weight: bold;
        background-color: Highlight;
 }
-td.description {
+.description {
        width: 9em;
        text-align: right;
        -moz-border-end: 1px solid rgba(255, 255, 255, 0.2);
        background-color: rgba(0, 0, 0, 0.2);
 }
-td.content {
+.content {
        width: 29em;
        background-color: -moz-default-background-color;
 }
-td.content p {
+.content p {
        white-space: pre-wrap;
 }
-p.header {
-       color: HighlightText;
-       font-size: 1em;
-       font-weight: bold;
-}
diff --git a/mail/components/im/messages/main.css b/mail/components/im/messages/main.css
index b2d2280409..94d1f52057 100644
--- a/mail/components/im/messages/main.css
+++ b/mail/components/im/messages/main.css
@@ -48,12 +48,12 @@ p {
   padding: 0;
 }
 
-div.bubble {
+.bubble {
   margin: 2px 20px;
   padding: 0;
 }
 
-div.bubble:not(.context):not(.event) {
+.bubble:not(.context):not(.event) {
   -moz-animation-duration: 0.5s;
   -moz-animation-name: fadein;
   -moz-animation-iteration-count: 1;
@@ -69,24 +69,24 @@ div.bubble:not(.context):not(.event) {
   }
 }
 
-div.bubble>div.indicator {
+.indicator {
   padding: 10px;
   -moz-margin-start: 60px;
 }
 
-div.bubble p.pseudo {
+.pseudo {
   font-size: smaller;
   font-weight: bold;
 }
 
-div.bubble p.pseudo>span>span.time {
+.time {
   display: block;
   float: right;
   color: #aeafac;
   font-weight: normal;
 }
 
-div.bubble hr {
+.bubble hr {
   margin: 2px 0 0;
   height: 2px;
   border-style: none;
@@ -94,7 +94,7 @@ div.bubble hr {
   border-bottom: 1px solid #dbddd7;
 }
 
-p.interval, #lastMessage {
+.interval, #lastMessage {
   text-align: center;
   color: hsl(0, 0%, 60%);
 }
@@ -107,19 +107,19 @@ p.interval, #lastMessage {
   line-height: 20px;
 }
 
-p.nick {
+.nick {
   font-weight: bold;
 }
 
-p.action {
+.action {
   font-style: italic;
 }
 
-p.action:before {
+.action:before {
   content: "*** ";
 }
 
-p.event {
+.event {
   color: hsl(0, 0%, 60%);
   margin: 3px 15px;
 }
@@ -135,7 +135,7 @@ p *:-moz-any-link img {
 }
 
 /* used by javascript */
-p.button {
+.button {
   cursor: pointer;
   min-height: 20px;
   -moz-margin-start: -10px;
@@ -143,26 +143,26 @@ p.button {
   -moz-padding-start: 24px;
 }
 
-p.hide {
+.hide {
   background: url('Bitmaps/plus.png') no-repeat left top;
 }
 
-p.hide:hover {
+.hide:hover {
   background: url('Bitmaps/plus-hover.png') no-repeat left top;
 }
 
-p.hide:after {
+.hide:after {
   content: "...";
   color: hsl(0, 0%, 60%);
 }
 
-p.show {
+.show {
   background: url('Bitmaps/minus.png') no-repeat left top;
   margin-bottom: -20px;
   width: 0;
 }
 
-p.show:hover {
+.show:hover {
   background: url('Bitmaps/minus-hover.png') no-repeat left top;
 }
 
@@ -175,7 +175,7 @@ p.show:hover {
   border-radius: 5px;
 }
 
-.bubble.event,
+.event,
 .indicator {
   border: 1px solid hsl(0, 0%, 85%);
   border-radius: 5px;
@@ -187,11 +187,11 @@ p.show:hover {
 }
 
 @media (max-height: 500px) {
-  div.bubble {
+  .bubble {
     margin-top: 3px !important;
   }
 
-  div.bubble > div.indicator {
+  .indicator {
     padding: 5px 10px;
     -moz-margin-start: 0;
   }
diff --git a/mail/components/im/themes/imAccountWizard.css b/mail/components/im/themes/imAccountWizard.css
index 1d8eb69ed1..a740decc04 100644
--- a/mail/components/im/themes/imAccountWizard.css
+++ b/mail/components/im/themes/imAccountWizard.css
@@ -44,31 +44,31 @@
   overflow: auto;
 }
 
-groupbox.collapsable {
+.collapsable {
   -moz-user-focus: normal;
 }
 
 %ifdef XP_WIN
-groupbox.collapsable .caption-text {
+.caption-text {
   border: 1px solid transparent;
 }
 
-groupbox.collapsable:focus .caption-text {
+.collapsable:focus .caption-text {
   border: 1px dotted ThreeDDarkShadow;
 }
 %endif
 
-groupbox.collapsable[closed="true"] {
+.collapsable[closed="true"] {
   border: none;
   -moz-appearance: none;
 }
 
-groupbox[closed="true"] > .groupbox-body {
+.collapsable[closed="true"] > .groupbox-body {
   display: none;
 }
 
 %ifdef XP_MACOSX
-groupbox.collapsable caption .caption-icon {
+.caption-icon {
   width: 11px;
   height: 11px;
   background-repeat: no-repeat;
@@ -77,11 +77,11 @@ groupbox.collapsable caption .caption-icon {
   background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
 }
 
-groupbox.collapsable[closed="true"] caption .caption-icon {
+.collapsable[closed="true"] .caption-icon {
   background-image: url("chrome://global/skin/arrow/arrow-rit.gif");
 }
 %else
-groupbox.collapsable caption .caption-icon {
+.caption-icon {
   width: 9px;
   height: 9px;
   background-repeat: no-repeat;
@@ -92,7 +92,7 @@ groupbox.collapsable caption .caption-icon {
 }
 
 
-groupbox.collapsable[closed="true"] caption .caption-icon {
+.collapsable[closed="true"] .caption-icon {
   background-image: url("chrome://global/skin/tree/twisty-clsd.png");
 }
 %endif
diff --git a/mail/components/im/themes/imMenulist.css b/mail/components/im/themes/imMenulist.css
index fd994aceb1..81108e7f6f 100644
--- a/mail/components/im/themes/imMenulist.css
+++ b/mail/components/im/themes/imMenulist.css
@@ -37,10 +37,10 @@
 
 
 /* Fix the icons in the menulist by undoing things from menu.css */
-menulist > menupopup > menuitem.menuitem-iconic > .menu-iconic-left {
+menulist > menupopup > .menuitem-iconic > .menu-iconic-left {
   display: -moz-box !important;
 }
 
-menulist > menupopup > menuitem.menuitem-iconic > .menu-iconic-text {
+menulist > menupopup > .menuitem-iconic > .menu-iconic-text {
   margin-left: 2px !important;
 }
diff --git a/mail/themes/gnomestripe/editor/EditorDialog.css b/mail/themes/gnomestripe/editor/EditorDialog.css
index 17fb15c27d..2d2dc0c502 100644
--- a/mail/themes/gnomestripe/editor/EditorDialog.css
+++ b/mail/themes/gnomestripe/editor/EditorDialog.css
@@ -159,7 +159,7 @@ tree.list {
   min-height:     50px;
 }
 
-#alignTypeSelect,label#alignLabel {
+#alignTypeSelect {
   -moz-margin-start: 5px;
 }
 
@@ -313,7 +313,7 @@ tree.list {
 }
 
 /* styles for an attribute tree-table */
-tree.AttributesTree {
+.AttributesTree {
   min-width : 200px;
   min-height: 200px;
 }
diff --git a/mail/themes/gnomestripe/mail/accountCreation.css b/mail/themes/gnomestripe/mail/accountCreation.css
index 335b5a2d51..d672500cbe 100644
--- a/mail/themes/gnomestripe/mail/accountCreation.css
+++ b/mail/themes/gnomestripe/mail/accountCreation.css
@@ -38,44 +38,44 @@ window {
   -moz-appearance: none;
 }
 
-image.warningicon {
+.warningicon {
   width: 16px;
   height: 16px;
   background: url("chrome://global/skin/icons/warning-16.png") no-repeat;
 }
 
-image.insecureLarry {
+.insecureLarry {
   height: 64px;
   width: 64px;
   padding: 0;
   background: url("chrome://global/skin/icons/sslWarning.png") no-repeat;
 }
 
-image.secureLarry {
+.secureLarry {
   height: 64px;
   width: 64px;
   padding: 0;
   background: url("chrome://messenger/skin/icons/identity.png") no-repeat;
 }
 
-vbox.mastervbox {
+.mastervbox {
   padding: 14px;
   background: -moz-dialog;
 }
 
-vbox.icon[state='strong'] {
+.icon[state='strong'] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
-vbox.icon[state='failed'] {
+.icon[state='failed'] {
   background-image: url("chrome://messenger/skin/icons/failed.png");
 }
 
-vbox.icon[state='probing'] {
+.icon[state='probing'] {
   background-image: url("chrome://messenger/skin/icons/probing.png");
 }
 
-vbox.icon[state='weak'] {
+.icon[state='weak'] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
@@ -167,13 +167,7 @@ textbox.username {
   margin-top: 4px !important;
 }
 
-textbox.host {
-  width: 12em;
-  margin-bottom: 4px !important;
-  margin-top: 4px !important;
-}
-
-menulist.host {
+.host {
   width: 12em;
   margin-bottom: 4px !important;
   margin-top: 4px !important;
@@ -190,11 +184,11 @@ menulist.host {
   background-image: url("chrome://messenger/skin/section_expanded.png");
 }
 
-label.autoconfigLabel {
+.autoconfigLabel {
   text-align: right;
 }
 
-label.textbox-label {
+.textbox-label {
   text-align: right;
 }
 
diff --git a/mail/themes/gnomestripe/mail/mailWindow1.css b/mail/themes/gnomestripe/mail/mailWindow1.css
index fcb8d05c66..d6186d7a40 100644
--- a/mail/themes/gnomestripe/mail/mailWindow1.css
+++ b/mail/themes/gnomestripe/mail/mailWindow1.css
@@ -136,7 +136,7 @@ treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
 
 /* ..... thread column ..... */
 
-treecol.threadColumnHeader {
+.threadColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/thread-col.svg");
 }
 
@@ -158,7 +158,7 @@ treechildren::-moz-tree-image(news, threadCol, ignoreSubthread) {
 
 /* ..... read column ..... */
 
-treecol.readColumnHeader {
+.readColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/readcol.svg");
   -moz-padding-end: 3px;
 }
@@ -178,7 +178,7 @@ treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
 
 /* ..... attachment column ..... */
 
-treecol.attachmentColumnHeader {
+.attachmentColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/attachment-col.svg");
   -moz-padding-end: 3px;
 }
@@ -191,7 +191,7 @@ treechildren::-moz-tree-image(attachmentCol, attach) {
 
 /* ..... flag column ..... */
 
-treecol.flagColumnHeader {
+.flagColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/flag-col.svg");
   -moz-padding-end: 3px;
 }
@@ -213,7 +213,7 @@ treechildren::-moz-tree-image(flaggedCol, flagged) {
 
 /* ..... junkStatus column ..... */
 
-treecol.junkStatusHeader {
+.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/junk-col.svg");
   -moz-padding-end: 3px;
 }
@@ -456,6 +456,6 @@ treechildren::-moz-tree-cell-text(subjectCol) {
 
 /* ..... tabs ..... */
 
-tabpanels#tabpanelcontainer {
+#tabpanelcontainer {
   -moz-appearance: none;
 }
diff --git a/mail/themes/gnomestripe/mail/messageBody.css b/mail/themes/gnomestripe/mail/messageBody.css
index ccfa859a9a..2c5ea68eec 100644
--- a/mail/themes/gnomestripe/mail/messageBody.css
+++ b/mail/themes/gnomestripe/mail/messageBody.css
@@ -59,7 +59,7 @@ mailattachcount {
   background-color: #DEDEDE;
 }
 
-div.headerdisplayname {
+.headerdisplayname {
   display: inline;
   font-weight: bold;
   white-space: pre;
@@ -102,11 +102,11 @@ a {
   display: none;
 }
 
-span.moz-txt-underscore {
+.moz-txt-underscore {
   text-decoration: underline;
 }
 
-span.moz-txt-formfeed {
+.moz-txt-formfeed {
   display: block;
   height: 100%;
 }
diff --git a/mail/themes/gnomestripe/mail/newmailaccount/accountProvisioner.css b/mail/themes/gnomestripe/mail/newmailaccount/accountProvisioner.css
index eb3bc9b840..e6b9b8bac3 100644
--- a/mail/themes/gnomestripe/mail/newmailaccount/accountProvisioner.css
+++ b/mail/themes/gnomestripe/mail/newmailaccount/accountProvisioner.css
@@ -253,7 +253,7 @@ input[type="submit"].search {
   font-weight: bold;
 }
 
-.hbox.row.th.displayNone {
+#resultsHeader.displayNone {
   display: none;
 }
 
diff --git a/mail/themes/gnomestripe/mail/preferences/applications.css b/mail/themes/gnomestripe/mail/preferences/applications.css
index 69592a2622..21ec3be613 100644
--- a/mail/themes/gnomestripe/mail/preferences/applications.css
+++ b/mail/themes/gnomestripe/mail/preferences/applications.css
@@ -104,13 +104,13 @@ menuitem[appHandlerIcon="plugin"] {
 /**
  * Used by the outgoing attachment manager
  */
-richlistitem.cloudfileAccount[state="connecting"],
-richlistitem.cloudfileAccount[state="waiting-to-connect"] {
+.cloudfileAccount[state="connecting"],
+.cloudfileAccount[state="waiting-to-connect"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
 }
 
-richlistitem.cloudfileAccount[state="auth-error"],
-richlistitem.cloudfileAccount[state="no-connection"] {
+.cloudfileAccount[state="auth-error"],
+.cloudfileAccount[state="no-connection"] {
   list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu")!important;
 }
 
diff --git a/mail/themes/gnomestripe/mail/searchDialog.css b/mail/themes/gnomestripe/mail/searchDialog.css
index 1e5959b530..10a5387495 100644
--- a/mail/themes/gnomestripe/mail/searchDialog.css
+++ b/mail/themes/gnomestripe/mail/searchDialog.css
@@ -116,7 +116,7 @@ treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
 
 /* ..... thread column ..... */
 
-treecol.threadColumnHeader {
+.threadColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/thread-col.svg");
 }
 
@@ -126,7 +126,7 @@ treechildren::-moz-tree-image(threadCol, container) {
 
 /* ..... read column ..... */
 
-treecol.readColumnHeader {
+.readColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/readcol.svg");
   -moz-padding-end: 3px;
 }
@@ -142,7 +142,7 @@ treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
 
 /* ..... attachment column ..... */
 
-treecol.attachmentColumnHeader {
+.attachmentColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/attachment-col.svg");
   -moz-padding-end: 3px;
 }
@@ -154,7 +154,7 @@ treechildren::-moz-tree-image(attachmentCol, attach) {
 
 /* ..... flag column ..... */
 
-treecol.flagColumnHeader {
+.flagColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/flag-col.svg");
   -moz-padding-end: 3px;
 }
@@ -173,7 +173,7 @@ treechildren::-moz-tree-image(flaggedCol, flagged) {
 
 /* ..... junkStatus column ..... */
 
-treecol.junkStatusHeader {
+.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/junk-col.svg");
   -moz-padding-end: 3px; 
 }
diff --git a/mail/themes/gnomestripe/mail/smileys.css b/mail/themes/gnomestripe/mail/smileys.css
index 39b37cd1d0..e35dfddd68 100644
--- a/mail/themes/gnomestripe/mail/smileys.css
+++ b/mail/themes/gnomestripe/mail/smileys.css
@@ -44,126 +44,124 @@
 
 @namespace url("http://www.w3.org/1999/xhtml");
 
-/* ::::: we also represent smilies inside of spans ::::: */
+/* ::::: we represent smilies instead of text in spans ::::: */
 
-span.moz-smiley-s1,
-span.moz-smiley-s2,
-span.moz-smiley-s3,
-span.moz-smiley-s4,
-span.moz-smiley-s5,
-span.moz-smiley-s6,
-span.moz-smiley-s7,
-span.moz-smiley-s8,
-span.moz-smiley-s9,
-span.moz-smiley-s10,
-span.moz-smiley-s11,
-span.moz-smiley-s12,
-span.moz-smiley-s13,
-span.moz-smiley-s14,
-span.moz-smiley-s15,
-span.moz-smiley-s16
-{
+.moz-smiley-s1,
+.moz-smiley-s2,
+.moz-smiley-s3,
+.moz-smiley-s4,
+.moz-smiley-s5,
+.moz-smiley-s6,
+.moz-smiley-s7,
+.moz-smiley-s8,
+.moz-smiley-s9,
+.moz-smiley-s10,
+.moz-smiley-s11,
+.moz-smiley-s12,
+.moz-smiley-s13,
+.moz-smiley-s14,
+.moz-smiley-s15,
+.moz-smiley-s16 {
   display: inline-block;
   vertical-align: middle;
   -moz-user-select: all;
 }
 
-span.moz-smiley-s1 > span,
-span.moz-smiley-s2 > span,
-span.moz-smiley-s3 > span,
-span.moz-smiley-s4 > span,
-span.moz-smiley-s5 > span,
-span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span,
-span.moz-smiley-s8 > span,
-span.moz-smiley-s9 > span,
-span.moz-smiley-s10 > span,
-span.moz-smiley-s11 > span,
-span.moz-smiley-s12 > span,
-span.moz-smiley-s13 > span,
-span.moz-smiley-s14 > span,
-span.moz-smiley-s15 > span,
-span.moz-smiley-s16 > span
-{
-    display: none;
+.moz-smiley-s1 > span,
+.moz-smiley-s2 > span,
+.moz-smiley-s3 > span,
+.moz-smiley-s4 > span,
+.moz-smiley-s5 > span,
+.moz-smiley-s6 > span,
+.moz-smiley-s7 > span,
+.moz-smiley-s8 > span,
+.moz-smiley-s9 > span,
+.moz-smiley-s10 > span,
+.moz-smiley-s11 > span,
+.moz-smiley-s12 > span,
+.moz-smiley-s13 > span,
+.moz-smiley-s14 > span,
+.moz-smiley-s15 > span,
+.moz-smiley-s16 > span {
+  display: none;
 }
 
 /* smile */
-span.moz-smiley-s1:before {
+.moz-smiley-s1:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
 }
 
 /* frown */
-span.moz-smiley-s2:before {
+.moz-smiley-s2:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
 }
 
 /* wink */
-span.moz-smiley-s3:before {
+.moz-smiley-s3:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
 }
 
 /* tongue */
-span.moz-smiley-s4:before {
+.moz-smiley-s4:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-tongue-out.png");
 }
 
 /* laughing */
-span.moz-smiley-s5:before {
+.moz-smiley-s5:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
 }
 
 /* embarassed */
-span.moz-smiley-s6:before {
+.moz-smiley-s6:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-embarassed.png");
 }
 
 /* undecided */
-span.moz-smiley-s7:before {
+.moz-smiley-s7:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
 }
 
 /* surprise */
-span.moz-smiley-s8:before {
+.moz-smiley-s8:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-surprised.png");
 }
 
 /* kiss */
-span.moz-smiley-s9:before {
+.moz-smiley-s9:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
 }
 
 /* yell */
-span.moz-smiley-s10:before {
+.moz-smiley-s10:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
 }
 
 /* cool */
-span.moz-smiley-s11:before {
+.moz-smiley-s11:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
 }
 
 /* money */
-span.moz-smiley-s12:before {
+.moz-smiley-s12:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-money-mouth.png");
 }
 
 /* foot */
-span.moz-smiley-s13:before {
+.moz-smiley-s13:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-foot-in-mouth.png");
 }
 
 /* innocent */
-span.moz-smiley-s14:before {
+.moz-smiley-s14:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
 }
 
 /* cry */
-span.moz-smiley-s15:before {
+.moz-smiley-s15:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
 }
 
 /* sealed */
-span.moz-smiley-s16:before {
+.moz-smiley-s16:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
 }
diff --git a/mail/themes/pinstripe/editor/EditorDialog.css b/mail/themes/pinstripe/editor/EditorDialog.css
index 17fb15c27d..2d2dc0c502 100644
--- a/mail/themes/pinstripe/editor/EditorDialog.css
+++ b/mail/themes/pinstripe/editor/EditorDialog.css
@@ -159,7 +159,7 @@ tree.list {
   min-height:     50px;
 }
 
-#alignTypeSelect,label#alignLabel {
+#alignTypeSelect {
   -moz-margin-start: 5px;
 }
 
@@ -313,7 +313,7 @@ tree.list {
 }
 
 /* styles for an attribute tree-table */
-tree.AttributesTree {
+.AttributesTree {
   min-width : 200px;
   min-height: 200px;
 }
diff --git a/mail/themes/pinstripe/mail/accountCreation.css b/mail/themes/pinstripe/mail/accountCreation.css
index 1f6bb90e1d..5ba9ea92d1 100644
--- a/mail/themes/pinstripe/mail/accountCreation.css
+++ b/mail/themes/pinstripe/mail/accountCreation.css
@@ -28,44 +28,44 @@ window {
   -moz-appearance: none;
 }
 
-image.warningicon {
+.warningicon {
   width: 16px;
   height: 16px;
   background: url("chrome://global/skin/icons/warning-16.png") no-repeat;
 }
 
-image.insecureLarry {
+.insecureLarry {
   height: 64px;
   width: 64px;
   padding: 0;
   background: url("chrome://global/skin/icons/sslWarning.png") no-repeat;
 }
 
-image.secureLarry {
+.secureLarry {
   height: 64px;
   width: 64px;
   padding: 0;
   background: url("chrome://messenger/skin/icons/identity.png") no-repeat;
 }
 
-vbox.mastervbox {
+.mastervbox {
   padding: 14px;
   background: #F4F4F4;
 }
 
-vbox.icon[state='strong'] {
+.icon[state='strong'] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
-vbox.icon[state='failed'] {
+.icon[state='failed'] {
   background-image: url("chrome://messenger/skin/icons/failed.png");
 }
 
-vbox.icon[state='probing'] {
+.icon[state='probing'] {
   background-image: url("chrome://messenger/skin/icons/probing.png");
 }
 
-vbox.icon[state='weak'] {
+.icon[state='weak'] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
@@ -153,13 +153,7 @@ textbox.username {
   margin-top: 4px !important;
 }
 
-textbox.host {
-  width: 14em;
-  margin-bottom: 4px !important;
-  margin-top: 4px !important;
-}
-
-menulist.host {
+.host {
   width: 14em;
   margin-bottom: 4px !important;
   margin-top: 4px !important;
@@ -180,11 +174,11 @@ menulist.host {
   background-image: url("chrome://messenger/skin/section_expanded.png");
 }
 
-label.autoconfigLabel {
+.autoconfigLabel {
   text-align: right;
 }
 
-label.textbox-label {
+.textbox-label {
   text-align: right;
 }
 
diff --git a/mail/themes/pinstripe/mail/mailWindow1.css b/mail/themes/pinstripe/mail/mailWindow1.css
index 43ff0b6b80..b96a3df59f 100644
--- a/mail/themes/pinstripe/mail/mailWindow1.css
+++ b/mail/themes/pinstripe/mail/mailWindow1.css
@@ -170,15 +170,15 @@ treecol[hideheader="true"] {
 
 /* ..... thread column ..... */
 
-treecol.threadColumnHeader {
+.threadColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/unthreadcol.png");
 }
 
-treecol.threadColumnHeader[sortDirection="ascending"]  {
+.threadColumnHeader[sortDirection="ascending"]  {
   list-style-image: url("chrome://messenger/skin/icons/threadcol.png");
 }
 
-treecol.threadColumnHeader[sortDirection="descending"] {
+.threadColumnHeader[sortDirection="descending"] {
   list-style-image: url("chrome://messenger/skin/icons/threadcol.png");
 }
 
@@ -200,7 +200,7 @@ treechildren::-moz-tree-image(threadCol, container, hasUnread, selected) {
 
 /* ..... read column ..... */
 
-treecol.readColumnHeader {
+.readColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/readcol.png");
 }
 
@@ -246,7 +246,7 @@ treechildren::-moz-tree-image(subjectCol, replied, forwarded, selected) {
 
 /* ..... attachment column ..... */
 
-treecol.attachmentColumnHeader {
+.attachmentColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/attachment-col.png");
 
   -moz-padding-end: 5px;
@@ -262,7 +262,7 @@ treechildren::-moz-tree-image(attachmentCol, attach, focus, selected) {
 
 /* ..... flag column ..... */
 
-treecol.flagColumnHeader {
+.flagColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/flagcol.png");
 }
 
@@ -280,7 +280,7 @@ treechildren::-moz-tree-image(flaggedCol, flagged) {
 
 /* ..... junkStatus column ..... */
 
-treecol.junkStatusHeader {
+.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/junk-column-header.png");
   -moz-padding-end: 3px;
   -moz-padding-start: 2px;
diff --git a/mail/themes/pinstripe/mail/messageBody.css b/mail/themes/pinstripe/mail/messageBody.css
index 4833c8693d..58a5e97a2e 100644
--- a/mail/themes/pinstripe/mail/messageBody.css
+++ b/mail/themes/pinstripe/mail/messageBody.css
@@ -57,7 +57,7 @@ mailattachcount {
   background-color: #DEDEDE;
 }
 
-div.headerdisplayname {
+.headerdisplayname {
   display: inline;
   font-weight: bold;
   white-space: pre;
@@ -103,7 +103,7 @@ div.headerdisplayname {
   display: none;
 }
 
-span.moz-txt-underscore {
+.moz-txt-underscore {
   text-decoration: underline;
 }
 
diff --git a/mail/themes/pinstripe/mail/newmailaccount/accountProvisioner.css b/mail/themes/pinstripe/mail/newmailaccount/accountProvisioner.css
index f74082e533..e6b9b8bac3 100644
--- a/mail/themes/pinstripe/mail/newmailaccount/accountProvisioner.css
+++ b/mail/themes/pinstripe/mail/newmailaccount/accountProvisioner.css
@@ -253,7 +253,9 @@ input[type="submit"].search {
   font-weight: bold;
 }
 
-.hbox.row.th.displayNone { display: none; }
+#resultsHeader.displayNone {
+  display: none;
+}
 
 #results {
   width: 100%;
diff --git a/mail/themes/pinstripe/mail/preferences/applications.css b/mail/themes/pinstripe/mail/preferences/applications.css
index 5973b4d783..4535b36063 100644
--- a/mail/themes/pinstripe/mail/preferences/applications.css
+++ b/mail/themes/pinstripe/mail/preferences/applications.css
@@ -95,24 +95,24 @@ richlistbox:focus .shortDetails.selected {
 }
 
 
-richlistitem.cloudfileAccount {
+.cloudfileAccount {
   padding: 4px;
 }
 
-richlistitem.cloudfileAccount description{
+.cloudfileAccount description{
   padding-left: 3px;
 }
 
 /**
  * Used by the outgoing attachment manager
  */
-richlistitem.cloudfileAccount[state="connecting"],
-richlistitem.cloudfileAccount[state="waiting-to-connect"] {
+.cloudfileAccount[state="connecting"],
+.cloudfileAccount[state="waiting-to-connect"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
 }
 
-richlistitem.cloudfileAccount[state="auth-error"],
-richlistitem.cloudfileAccount[state="no-connection"] {
+.cloudfileAccount[state="auth-error"],
+.cloudfileAccount[state="no-connection"] {
   list-style-image: url("chrome://global/skin/icons/error-16.png") !important;
 }
 
diff --git a/mail/themes/pinstripe/mail/searchDialog.css b/mail/themes/pinstripe/mail/searchDialog.css
index 192ddca744..aeca5ccd8c 100644
--- a/mail/themes/pinstripe/mail/searchDialog.css
+++ b/mail/themes/pinstripe/mail/searchDialog.css
@@ -160,15 +160,15 @@ treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
 
 /* ..... thread column ..... */
 
-treecol.threadColumnHeader {
+.threadColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/unthreadcol.png");
 }
 
-treecol.threadColumnHeader[sortDirection="ascending"]  {
+.threadColumnHeader[sortDirection="ascending"]  {
   list-style-image: url("chrome://messenger/skin/icons/threadcol.png");
 }
 
-treecol.threadColumnHeader[sortDirection="descending"] {
+.threadColumnHeader[sortDirection="descending"] {
   list-style-image: url("chrome://messenger/skin/icons/threadcol.png");
 }
 
@@ -190,7 +190,7 @@ treechildren::-moz-tree-image(threadCol, container, hasUnread, open) {
 
 /* ..... read column ..... */
 
-treecol.readColumnHeader {
+.readColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/readcol.png");
 }
 
@@ -204,7 +204,7 @@ treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
 
 /* ..... flag column ..... */
 
-treecol.flagColumnHeader {
+.flagColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/flagcol.png");
 }
 
@@ -218,7 +218,7 @@ treechildren::-moz-tree-image(flaggedCol, flagged) {
 
 /* ..... junkStatus column ..... */
 
-treecol.junkStatusHeader {
+.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
   padding-top: 0px;
   padding-bottom: 0px;
diff --git a/mail/themes/pinstripe/mail/smileys.css b/mail/themes/pinstripe/mail/smileys.css
index 39b37cd1d0..e35dfddd68 100644
--- a/mail/themes/pinstripe/mail/smileys.css
+++ b/mail/themes/pinstripe/mail/smileys.css
@@ -44,126 +44,124 @@
 
 @namespace url("http://www.w3.org/1999/xhtml");
 
-/* ::::: we also represent smilies inside of spans ::::: */
+/* ::::: we represent smilies instead of text in spans ::::: */
 
-span.moz-smiley-s1,
-span.moz-smiley-s2,
-span.moz-smiley-s3,
-span.moz-smiley-s4,
-span.moz-smiley-s5,
-span.moz-smiley-s6,
-span.moz-smiley-s7,
-span.moz-smiley-s8,
-span.moz-smiley-s9,
-span.moz-smiley-s10,
-span.moz-smiley-s11,
-span.moz-smiley-s12,
-span.moz-smiley-s13,
-span.moz-smiley-s14,
-span.moz-smiley-s15,
-span.moz-smiley-s16
-{
+.moz-smiley-s1,
+.moz-smiley-s2,
+.moz-smiley-s3,
+.moz-smiley-s4,
+.moz-smiley-s5,
+.moz-smiley-s6,
+.moz-smiley-s7,
+.moz-smiley-s8,
+.moz-smiley-s9,
+.moz-smiley-s10,
+.moz-smiley-s11,
+.moz-smiley-s12,
+.moz-smiley-s13,
+.moz-smiley-s14,
+.moz-smiley-s15,
+.moz-smiley-s16 {
   display: inline-block;
   vertical-align: middle;
   -moz-user-select: all;
 }
 
-span.moz-smiley-s1 > span,
-span.moz-smiley-s2 > span,
-span.moz-smiley-s3 > span,
-span.moz-smiley-s4 > span,
-span.moz-smiley-s5 > span,
-span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span,
-span.moz-smiley-s8 > span,
-span.moz-smiley-s9 > span,
-span.moz-smiley-s10 > span,
-span.moz-smiley-s11 > span,
-span.moz-smiley-s12 > span,
-span.moz-smiley-s13 > span,
-span.moz-smiley-s14 > span,
-span.moz-smiley-s15 > span,
-span.moz-smiley-s16 > span
-{
-    display: none;
+.moz-smiley-s1 > span,
+.moz-smiley-s2 > span,
+.moz-smiley-s3 > span,
+.moz-smiley-s4 > span,
+.moz-smiley-s5 > span,
+.moz-smiley-s6 > span,
+.moz-smiley-s7 > span,
+.moz-smiley-s8 > span,
+.moz-smiley-s9 > span,
+.moz-smiley-s10 > span,
+.moz-smiley-s11 > span,
+.moz-smiley-s12 > span,
+.moz-smiley-s13 > span,
+.moz-smiley-s14 > span,
+.moz-smiley-s15 > span,
+.moz-smiley-s16 > span {
+  display: none;
 }
 
 /* smile */
-span.moz-smiley-s1:before {
+.moz-smiley-s1:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
 }
 
 /* frown */
-span.moz-smiley-s2:before {
+.moz-smiley-s2:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
 }
 
 /* wink */
-span.moz-smiley-s3:before {
+.moz-smiley-s3:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
 }
 
 /* tongue */
-span.moz-smiley-s4:before {
+.moz-smiley-s4:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-tongue-out.png");
 }
 
 /* laughing */
-span.moz-smiley-s5:before {
+.moz-smiley-s5:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
 }
 
 /* embarassed */
-span.moz-smiley-s6:before {
+.moz-smiley-s6:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-embarassed.png");
 }
 
 /* undecided */
-span.moz-smiley-s7:before {
+.moz-smiley-s7:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
 }
 
 /* surprise */
-span.moz-smiley-s8:before {
+.moz-smiley-s8:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-surprised.png");
 }
 
 /* kiss */
-span.moz-smiley-s9:before {
+.moz-smiley-s9:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
 }
 
 /* yell */
-span.moz-smiley-s10:before {
+.moz-smiley-s10:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
 }
 
 /* cool */
-span.moz-smiley-s11:before {
+.moz-smiley-s11:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
 }
 
 /* money */
-span.moz-smiley-s12:before {
+.moz-smiley-s12:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-money-mouth.png");
 }
 
 /* foot */
-span.moz-smiley-s13:before {
+.moz-smiley-s13:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-foot-in-mouth.png");
 }
 
 /* innocent */
-span.moz-smiley-s14:before {
+.moz-smiley-s14:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
 }
 
 /* cry */
-span.moz-smiley-s15:before {
+.moz-smiley-s15:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
 }
 
 /* sealed */
-span.moz-smiley-s16:before {
+.moz-smiley-s16:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
 }
diff --git a/mail/themes/qute/editor/EditorDialog.css b/mail/themes/qute/editor/EditorDialog.css
index 55ed0e621a..c670975d95 100644
--- a/mail/themes/qute/editor/EditorDialog.css
+++ b/mail/themes/qute/editor/EditorDialog.css
@@ -159,7 +159,7 @@ tree.list {
   min-height:     50px;
 }
 
-#alignTypeSelect,label#alignLabel {
+#alignTypeSelect {
   -moz-margin-start: 5px;
 }
 
@@ -313,7 +313,7 @@ tree.list {
 }
 
 /* styles for an attribute tree-table */
-tree.AttributesTree {
+.AttributesTree {
   min-width : 200px;
   min-height: 200px;
 }
diff --git a/mail/themes/qute/mail/accountCreation.css b/mail/themes/qute/mail/accountCreation.css
index ae1d5ef278..6a49781184 100644
--- a/mail/themes/qute/mail/accountCreation.css
+++ b/mail/themes/qute/mail/accountCreation.css
@@ -55,44 +55,44 @@ window {
   padding: 14px;
 }
 
-image.warningicon {
+.warningicon {
   width: 16px;
   height: 16px;
   background: url("chrome://global/skin/icons/warning-16.png") no-repeat;
 }
 
-image.insecureLarry {
+.insecureLarry {
   height: 64px;
   width: 64px;
   padding: 0;
   background: url("chrome://global/skin/icons/sslWarning.png") no-repeat;
 }
 
-image.secureLarry {
+.secureLarry {
   height: 64px;
   width: 64px;
   padding: 0;
   background: url("chrome://messenger/skin/icons/identity.png") no-repeat;
 }
 
-vbox.mastervbox {
+.mastervbox {
   padding: 14px;
   background: -moz-dialog;
 }
 
-vbox.icon[state='strong'] {
+.icon[state='strong'] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
-vbox.icon[state='failed'] {
+.icon[state='failed'] {
   background-image: url("chrome://messenger/skin/icons/failed.png");
 }
 
-vbox.icon[state='probing'] {
+.icon[state='probing'] {
   background-image: url("chrome://messenger/skin/icons/probing.png");
 }
 
-vbox.icon[state='weak'] {
+.icon[state='weak'] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
@@ -138,7 +138,7 @@ vbox.icon[state='weak'] {
   -moz-padding-end: 2em;
 }
 
-checkbox.acknowledge_checkbox {
+.acknowledge_checkbox {
   padding-top: .5em;
 }
 
@@ -181,13 +181,7 @@ textbox.username {
   margin-top: 4px !important;
 }
 
-textbox.host {
-  width: 12em;
-  margin-bottom: 4px !important;
-  margin-top: 4px !important;
-}
-
-menulist.host {
+.host {
   width: 12em;
   margin-bottom: 4px !important;
   margin-top: 4px !important;
@@ -204,11 +198,11 @@ menulist.host {
   background-image: url("chrome://messenger/skin/section_expanded.png");
 }
 
-label.autoconfigLabel {
+.autoconfigLabel {
   text-align: right;
 }
 
-label.textbox-label {
+.textbox-label {
   text-align: right;
 }
 
diff --git a/mail/themes/qute/mail/compose/messengercompose-aero.css b/mail/themes/qute/mail/compose/messengercompose-aero.css
index f8a58ca2f4..10d286f2db 100644
--- a/mail/themes/qute/mail/compose/messengercompose-aero.css
+++ b/mail/themes/qute/mail/compose/messengercompose-aero.css
@@ -445,7 +445,7 @@ toolbox[labelalign="end"] > toolbar[mode="full"] deck .toolbarbutton-text {
 }
 
 @media (-moz-windows-default-theme) {
-  treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
+  .autocomplete-treebody::-moz-tree-cell-text(selected) {
     color: -moz-DialogText !important;
   }
 }
diff --git a/mail/themes/qute/mail/mailWindow1-aero.css b/mail/themes/qute/mail/mailWindow1-aero.css
index 1058adac34..dfbb299594 100644
--- a/mail/themes/qute/mail/mailWindow1-aero.css
+++ b/mail/themes/qute/mail/mailWindow1-aero.css
@@ -18,7 +18,7 @@
   }
 }
 
-treecol.threadColumnHeader {
+.threadColumnHeader {
   -moz-padding-end: 2px;
 }
 
@@ -116,12 +116,12 @@ treechildren::-moz-tree-image(news, threadCol, watch) {
   color: InfoText;
 }
 
-treecol.treecol-image image {
+.treecol-image image {
   -moz-padding-start: 1px;
   -moz-padding-end: 2px;
 }
 
-treecol.junkStatusHeader {
+.junkStatusHeader {
   -moz-padding-end: 2px;
 }
 
@@ -266,7 +266,7 @@ menulist > .menulist-label-box {
 }
 
 @media (-moz-windows-compositor) {
-  #messengerWindow[sizemode=normal] tabpanels#tabpanelcontainer {
+  #messengerWindow[sizemode=normal] #tabpanelcontainer {
     border: 1px solid rgba(10%, 10%, 10%, .4);
     border-top: none;
     background-clip: padding-box;
diff --git a/mail/themes/qute/mail/mailWindow1.css b/mail/themes/qute/mail/mailWindow1.css
index 88af811ce8..f7b7cf7241 100644
--- a/mail/themes/qute/mail/mailWindow1.css
+++ b/mail/themes/qute/mail/mailWindow1.css
@@ -119,12 +119,12 @@ treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
 
 /* ::::: message column icons ::::: */
 
-treecol.treecol-image image {
+.treecol-image image {
   -moz-padding-end: 5px;
   padding-bottom: 3px;
 }
 
-:-moz-system-metric(windows-classic) treecol.treecol-image image {
+:-moz-system-metric(windows-classic) .treecol-image image {
   -moz-padding-end: 1px;
   padding-bottom: 2px;
 }
@@ -137,7 +137,7 @@ treecol.treecol-image image {
 
 /* ..... thread column ..... */
 
-treecol.threadColumnHeader {
+.threadColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/thread-col.svg");
 }
 
@@ -159,7 +159,7 @@ treechildren::-moz-tree-image(news, threadCol, ignoreSubthread) {
 
 /* ..... read column ..... */
 
-treecol.readColumnHeader {
+.readColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/readcol.svg");
 }
 
@@ -177,7 +177,7 @@ treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
 
 /* ..... attachment column ..... */
 
-treecol.attachmentColumnHeader {
+.attachmentColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/attachment-col.svg");
 }
 
@@ -187,7 +187,7 @@ treechildren::-moz-tree-image(attachmentCol, attach) {
 
 /* ..... flag column ..... */
 
-treecol.flagColumnHeader {
+.flagColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/flag-col.svg");
 }
 
@@ -206,7 +206,7 @@ treechildren::-moz-tree-image(flaggedCol, flagged) {
 
 /* ..... junkStatus column ..... */
 
-treecol.junkStatusHeader {
+.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/junk-col.svg");
   -moz-padding-end: 3px;
 }
@@ -414,6 +414,6 @@ treechildren::-moz-tree-cell-text(subjectCol) {
 
 /* ..... tabs ..... */
 
-tabpanels#tabpanelcontainer {
+#tabpanelcontainer {
   -moz-appearance: none;
 }
diff --git a/mail/themes/qute/mail/messageBody.css b/mail/themes/qute/mail/messageBody.css
index ec13fa9d19..5eddefd096 100644
--- a/mail/themes/qute/mail/messageBody.css
+++ b/mail/themes/qute/mail/messageBody.css
@@ -59,7 +59,7 @@ mailattachcount {
   background-color: #DEDEDE;
 }
 
-div.headerdisplayname {
+.headerdisplayname {
   display: inline;
   font-weight: bold;
   white-space: pre;
@@ -98,11 +98,11 @@ div.headerdisplayname {
   display: none;
 }
 
-span.moz-txt-underscore {
+.moz-txt-underscore {
   text-decoration: underline;
 }
 
-span.moz-txt-formfeed {
+.moz-txt-formfeed {
   display: block;
   height: 100%;
 }
diff --git a/mail/themes/qute/mail/messenger.css b/mail/themes/qute/mail/messenger.css
index e0b16465eb..32028691f6 100644
--- a/mail/themes/qute/mail/messenger.css
+++ b/mail/themes/qute/mail/messenger.css
@@ -20,8 +20,8 @@ toolbar[printpreview="true"] {
   -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar");
 }
 
-menu.menu-iconic > .menu-iconic-left,
-menuitem.menuitem-iconic > .menu-iconic-left {
+.menu-iconic > .menu-iconic-left,
+.menuitem-iconic > .menu-iconic-left {
   display: -moz-box;
 }
 
diff --git a/mail/themes/qute/mail/newmailaccount/accountProvisioner-aero.css b/mail/themes/qute/mail/newmailaccount/accountProvisioner-aero.css
index f74082e533..e6b9b8bac3 100644
--- a/mail/themes/qute/mail/newmailaccount/accountProvisioner-aero.css
+++ b/mail/themes/qute/mail/newmailaccount/accountProvisioner-aero.css
@@ -253,7 +253,9 @@ input[type="submit"].search {
   font-weight: bold;
 }
 
-.hbox.row.th.displayNone { display: none; }
+#resultsHeader.displayNone {
+  display: none;
+}
 
 #results {
   width: 100%;
diff --git a/mail/themes/qute/mail/newmailaccount/accountProvisioner.css b/mail/themes/qute/mail/newmailaccount/accountProvisioner.css
index f74082e533..e6b9b8bac3 100644
--- a/mail/themes/qute/mail/newmailaccount/accountProvisioner.css
+++ b/mail/themes/qute/mail/newmailaccount/accountProvisioner.css
@@ -253,7 +253,9 @@ input[type="submit"].search {
   font-weight: bold;
 }
 
-.hbox.row.th.displayNone { display: none; }
+#resultsHeader.displayNone {
+  display: none;
+}
 
 #results {
   width: 100%;
diff --git a/mail/themes/qute/mail/preferences/applications.css b/mail/themes/qute/mail/preferences/applications.css
index e032196037..452c8c07f0 100644
--- a/mail/themes/qute/mail/preferences/applications.css
+++ b/mail/themes/qute/mail/preferences/applications.css
@@ -103,13 +103,13 @@ richlistbox:focus .shortDetails.selected {
  * Used by the outgoing attachment manager
  */
 
-richlistitem.cloudfileAccount[state="connecting"],
-richlistitem.cloudfileAccount[state="waiting-to-connect"] {
+.cloudfileAccount[state="connecting"],
+.cloudfileAccount[state="waiting-to-connect"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
 }
 
-richlistitem.cloudfileAccount[state="auth-error"],
-richlistitem.cloudfileAccount[state="no-connection"] {
+.cloudfileAccount[state="auth-error"],
+.cloudfileAccount[state="no-connection"] {
   list-style-image: url("chrome://global/skin/icons/error-16.png") !important;
 }
 
diff --git a/mail/themes/qute/mail/preferences/preferences-aero.css b/mail/themes/qute/mail/preferences/preferences-aero.css
index f7f38c8bda..e4510f6788 100644
--- a/mail/themes/qute/mail/preferences/preferences-aero.css
+++ b/mail/themes/qute/mail/preferences/preferences-aero.css
@@ -40,7 +40,7 @@
 
 %include preferences.css
 
-radiogroup.paneSelector {
+.paneSelector {
   background-color: -moz-field;
   background-image: none;
   color: -moz-fieldtext;
diff --git a/mail/themes/qute/mail/preferences/preferences.css b/mail/themes/qute/mail/preferences/preferences.css
index c29cb6b197..816be605b3 100644
--- a/mail/themes/qute/mail/preferences/preferences.css
+++ b/mail/themes/qute/mail/preferences/preferences.css
@@ -40,7 +40,7 @@
 
 /* Global Styles */
 
-radiogroup.paneSelector {
+.paneSelector {
   background-color: rgb(90, 116, 164);
   color: white;
   background-image: url("chrome://messenger/skin/preferences/background.png");
diff --git a/mail/themes/qute/mail/quickFilterBar-aero.css b/mail/themes/qute/mail/quickFilterBar-aero.css
index ed54ecb01a..f88fbd34d9 100644
--- a/mail/themes/qute/mail/quickFilterBar-aero.css
+++ b/mail/themes/qute/mail/quickFilterBar-aero.css
@@ -211,7 +211,7 @@
   -moz-margin-end: 0;
 }
 
-#quick-filter-bar-collapsible-buttons toolbarbutton label.toolbarbutton-text {
+#quick-filter-bar-collapsible-buttons toolbarbutton .toolbarbutton-text {
   -moz-margin-start: 3px !important;
 }
 
diff --git a/mail/themes/qute/mail/searchDialog.css b/mail/themes/qute/mail/searchDialog.css
index cbf072ed10..f5a8e6dfcf 100644
--- a/mail/themes/qute/mail/searchDialog.css
+++ b/mail/themes/qute/mail/searchDialog.css
@@ -116,16 +116,16 @@ treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
 
 /* ..... thread column ..... */
 
-treecol.threadColumnHeader {
+.threadColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/thread-col.svg");
   -moz-padding-end: 3px; 
 }
 
-treecol.threadColumnHeader[sortDirection="ascending"]  {
+.threadColumnHeader[sortDirection="ascending"]  {
   list-style-image: url("chrome://messenger/skin/icons/thread-col-sorta.png");
 }
 
-treecol.threadColumnHeader[sortDirection="descending"] {
+.threadColumnHeader[sortDirection="descending"] {
   list-style-image: url("chrome://messenger/skin/icons/thread-col-sortd.png");
 }
 
@@ -135,7 +135,7 @@ treechildren::-moz-tree-image(threadCol, container) {
 
 /* ..... read column ..... */
 
-treecol.readColumnHeader {
+.readColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/readcol.svg");
   -moz-padding-end: 5px;
   padding-bottom: 5px;
@@ -151,7 +151,7 @@ treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
 
 /* ..... attachment column ..... */
 
-treecol.attachmentColumnHeader {
+.attachmentColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/attachment-col.svg");
   -moz-padding-end: 5px; 
 }
@@ -162,7 +162,7 @@ treechildren::-moz-tree-image(attachmentCol, attach) {
 
 /* ..... flag column ..... */
 
-treecol.flagColumnHeader {
+.flagColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/flag-col.svg");
   -moz-padding-end: 5px; 
 }
@@ -178,7 +178,7 @@ treechildren::-moz-tree-image(flaggedCol, flagged) {
 
 /* ..... junkStatus column ..... */
 
-treecol.junkStatusHeader {
+.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/junk-col.svg");
   -moz-padding-end: 5px; 
 }
diff --git a/mail/themes/qute/mail/smileys.css b/mail/themes/qute/mail/smileys.css
index 39b37cd1d0..e35dfddd68 100644
--- a/mail/themes/qute/mail/smileys.css
+++ b/mail/themes/qute/mail/smileys.css
@@ -44,126 +44,124 @@
 
 @namespace url("http://www.w3.org/1999/xhtml");
 
-/* ::::: we also represent smilies inside of spans ::::: */
+/* ::::: we represent smilies instead of text in spans ::::: */
 
-span.moz-smiley-s1,
-span.moz-smiley-s2,
-span.moz-smiley-s3,
-span.moz-smiley-s4,
-span.moz-smiley-s5,
-span.moz-smiley-s6,
-span.moz-smiley-s7,
-span.moz-smiley-s8,
-span.moz-smiley-s9,
-span.moz-smiley-s10,
-span.moz-smiley-s11,
-span.moz-smiley-s12,
-span.moz-smiley-s13,
-span.moz-smiley-s14,
-span.moz-smiley-s15,
-span.moz-smiley-s16
-{
+.moz-smiley-s1,
+.moz-smiley-s2,
+.moz-smiley-s3,
+.moz-smiley-s4,
+.moz-smiley-s5,
+.moz-smiley-s6,
+.moz-smiley-s7,
+.moz-smiley-s8,
+.moz-smiley-s9,
+.moz-smiley-s10,
+.moz-smiley-s11,
+.moz-smiley-s12,
+.moz-smiley-s13,
+.moz-smiley-s14,
+.moz-smiley-s15,
+.moz-smiley-s16 {
   display: inline-block;
   vertical-align: middle;
   -moz-user-select: all;
 }
 
-span.moz-smiley-s1 > span,
-span.moz-smiley-s2 > span,
-span.moz-smiley-s3 > span,
-span.moz-smiley-s4 > span,
-span.moz-smiley-s5 > span,
-span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span,
-span.moz-smiley-s8 > span,
-span.moz-smiley-s9 > span,
-span.moz-smiley-s10 > span,
-span.moz-smiley-s11 > span,
-span.moz-smiley-s12 > span,
-span.moz-smiley-s13 > span,
-span.moz-smiley-s14 > span,
-span.moz-smiley-s15 > span,
-span.moz-smiley-s16 > span
-{
-    display: none;
+.moz-smiley-s1 > span,
+.moz-smiley-s2 > span,
+.moz-smiley-s3 > span,
+.moz-smiley-s4 > span,
+.moz-smiley-s5 > span,
+.moz-smiley-s6 > span,
+.moz-smiley-s7 > span,
+.moz-smiley-s8 > span,
+.moz-smiley-s9 > span,
+.moz-smiley-s10 > span,
+.moz-smiley-s11 > span,
+.moz-smiley-s12 > span,
+.moz-smiley-s13 > span,
+.moz-smiley-s14 > span,
+.moz-smiley-s15 > span,
+.moz-smiley-s16 > span {
+  display: none;
 }
 
 /* smile */
-span.moz-smiley-s1:before {
+.moz-smiley-s1:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
 }
 
 /* frown */
-span.moz-smiley-s2:before {
+.moz-smiley-s2:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
 }
 
 /* wink */
-span.moz-smiley-s3:before {
+.moz-smiley-s3:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
 }
 
 /* tongue */
-span.moz-smiley-s4:before {
+.moz-smiley-s4:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-tongue-out.png");
 }
 
 /* laughing */
-span.moz-smiley-s5:before {
+.moz-smiley-s5:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
 }
 
 /* embarassed */
-span.moz-smiley-s6:before {
+.moz-smiley-s6:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-embarassed.png");
 }
 
 /* undecided */
-span.moz-smiley-s7:before {
+.moz-smiley-s7:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
 }
 
 /* surprise */
-span.moz-smiley-s8:before {
+.moz-smiley-s8:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-surprised.png");
 }
 
 /* kiss */
-span.moz-smiley-s9:before {
+.moz-smiley-s9:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
 }
 
 /* yell */
-span.moz-smiley-s10:before {
+.moz-smiley-s10:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
 }
 
 /* cool */
-span.moz-smiley-s11:before {
+.moz-smiley-s11:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
 }
 
 /* money */
-span.moz-smiley-s12:before {
+.moz-smiley-s12:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-money-mouth.png");
 }
 
 /* foot */
-span.moz-smiley-s13:before {
+.moz-smiley-s13:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-foot-in-mouth.png");
 }
 
 /* innocent */
-span.moz-smiley-s14:before {
+.moz-smiley-s14:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
 }
 
 /* cry */
-span.moz-smiley-s15:before {
+.moz-smiley-s15:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
 }
 
 /* sealed */
-span.moz-smiley-s16:before {
+.moz-smiley-s16:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
 }