Bug 720120 - Apply button ID only on calendar-event-dialog and remove unneeded CSS rules. r+a=Philipp
authorRichard Marti <richard.marti@gmail.com>
Thu, 26 Jan 2012 18:57:58 +0100
changeset 10132 bf09f397bca728ba74de203e13a9796dcfe33c41
parent 10131 d82c472d13aea0e199d6bc4b34cfadad10723a7e
child 10133 3bcc9a4ea559d1870a0cde55cf9e8d7b87e6d0d4
push idunknown
push userunknown
push dateunknown
bugs720120
Bug 720120 - Apply button ID only on calendar-event-dialog and remove unneeded CSS rules. r+a=Philipp
calendar/base/jar.mn
calendar/base/themes/gnomestripe/dialogs/calendar-event-dialog.css
calendar/base/themes/pinstripe/dialogs/calendar-event-dialog.css
calendar/base/themes/winstripe/dialogs/calendar-event-dialog.css
calendar/base/themes/winstripe/win-aero/calendar-event-dialog.css
calendar/base/themes/winstripe/win-aero/calendar.css
calendar/base/themes/winstripe/win-classic/calendar-event-dialog.css
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -161,24 +161,26 @@ calendar.jar:
 
 # Following files only add for OSX.
 #ifdef XP_MACOSX
     skin/calendar/sidebar-item.png                         (themes/@THEME@/images/sidebar-item.png)
 #endif
 
 # The following files are added for aero support on windows.
 #ifdef XP_WIN
-% style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar-windows/skin/calendar.css os=WINNT osversion>=6
+% style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar-windows/skin/calendar-event-dialog.css os=WINNT
 % style chrome://calendar/content/calendar-occurrence-prompt.xul chrome://calendar-windows/skin/calendar.css os=WINNT osversion>=6
 % skin calendar-windows classic/1.0 chrome/calendar/skin/calendar/win-classic/ os=WINNT osversion<6
 % skin calendar-windows classic/1.0 chrome/calendar/skin/calendar/win-aero/ os=WINNT osversion>=6
     skin/calendar/win-classic/calendar.css                 (themes/@THEME@/win-classic/calendar.css)
+    skin/calendar/win-classic/calendar-event-dialog.css    (themes/@THEME@/win-classic/calendar-event-dialog.css)
     skin/calendar/win-classic/lightning.css                (themes/@THEME@/win-classic/lightning.css)
     skin/calendar/win-classic/lightning-toolbar.css        (themes/@THEME@/win-classic/lightning-toolbar.css)
     skin/calendar/win-aero/calendar.css                    (themes/@THEME@/win-aero/calendar.css)
+    skin/calendar/win-aero/calendar-event-dialog.css       (themes/@THEME@/win-aero/calendar-event-dialog.css)
     skin/calendar/win-aero/lightning.css                   (themes/@THEME@/win-aero/lightning.css)
     skin/calendar/win-aero/lightning-toolbar.css           (themes/@THEME@/win-aero/lightning-toolbar.css)
     skin/calendar/calendar-event-dialog-toolbar-aero.png   (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar-aero.png)
     skin/calendar/calendar-occurrence-prompt-aero.png      (themes/@THEME@/images/calendar-occurrence-prompt-aero.png)
     skin/calendar/tasks-actions-aero.png                   (themes/@THEME@/images/tasks-actions-aero.png)
     skin/calendar/toolbar-aero.png                         (themes/@THEME@/images/toolbar-aero.png)
     skin/calendar/toolbar-large-aero.png                   (themes/@THEME@/images/toolbar-large-aero.png)
     skin/calendar/toolbar-small-aero.png                   (themes/@THEME@/images/toolbar-small-aero.png)
--- a/calendar/base/themes/gnomestripe/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/gnomestripe/dialogs/calendar-event-dialog.css
@@ -147,263 +147,163 @@ toolbar[iconsize="small"] .cal-event-too
 /*--------------------------------------------------------------------
  *   invite attendees button
  *-------------------------------------------------------------------*/
 
 #button-attendees {
     -moz-image-region: rect(0px 48px 24px 24px);
 }
 #button-attendees[disabled="true"],
-#button-attendees[disabled="true"]:hover,
-#button-attendees[disabled="true"]:hover:active {
+#button-attendees[disabled="true"]:hover {
     -moz-image-region: rect(48px 48px 72px 24px);
 }
 #button-attendees:hover {
     -moz-image-region: rect(24px 48px 48px 24px);
 }
-#button-attendees:hover:active {
-}
 
 toolbar[iconsize="small"] #button-attendees {
     -moz-image-region: rect(0px 32px 16px 16px);
 }
 toolbar[iconsize="small"] #button-attendees[disabled="true"],
-toolbar[iconsize="small"] #button-attendees[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-attendees[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-attendees[disabled="true"]:hover {
     -moz-image-region: rect(32px 32px 48px 16px);
 }
 toolbar[iconsize="small"] #button-attendees:hover {
     -moz-image-region: rect(16px 32px 32px 16px);
 }
-toolbar[iconsize="small"] #button-attendees:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   spellcheck button
- *-------------------------------------------------------------------*/
-
-#button-spellcheck {
-    -moz-image-region: rect(0px 72px 24px 48px);
-}
-#button-spellcheck[disabled="true"],
-#button-spellcheck[disabled="true"]:hover,
-#button-spellcheck[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 72px 72px 48px);
-}
-#button-spellcheck:hover {
-    -moz-image-region: rect(24px 72px 48px 48px);
-}
-#button-spellcheck:hover:active {
-}
-
-toolbar[iconsize="small"] #button-spellcheck {
-    -moz-image-region: rect(0px 48px 16px 32px);
-}
-toolbar[iconsize="small"] #button-spellcheck[disabled="true"],
-toolbar[iconsize="small"] #button-spellcheck[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-spellcheck[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 48px 48px 32px);
-}
-toolbar[iconsize="small"] #button-spellcheck:hover {
-    -moz-image-region: rect(16px 48px 32px 32px);
-}
-toolbar[iconsize="small"] #button-spellcheck:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   documents button
  *-------------------------------------------------------------------*/
 
 #button-url {
     -moz-image-region: rect(0px 96px 24px 72px);
 }
 #button-url[disabled="true"],
-#button-url[disabled="true"]:hover,
-#button-url[disabled="true"]:hover:active {
+#button-url[disabled="true"]:hover {
     -moz-image-region: rect(48px 96px 72px 72px);
 }
 #button-url:hover {
     -moz-image-region: rect(24px 96px 48px 72px);
 }
-#button-url:hover:active {
-}
 
 toolbar[iconsize="small"] #button-url {
     -moz-image-region: rect(0px 64px 16px 48px);
 }
 toolbar[iconsize="small"] #button-url[disabled="true"],
-toolbar[iconsize="small"] #button-url[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-url[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-url[disabled="true"]:hover {
     -moz-image-region: rect(32px 64px 48px 48px);
 }
 toolbar[iconsize="small"] #button-url:hover {
     -moz-image-region: rect(16px 64px 32px 48px);
 }
-toolbar[iconsize="small"] #button-url:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   privacy button
  *-------------------------------------------------------------------*/
 
 #button-privacy {
     -moz-image-region: rect(0px 120px 24px 96px);
 }
 #button-privacy[disabled="true"],
-#button-privacy[disabled="true"]:hover,
-#button-privacy[disabled="true"]:hover:active {
+#button-privacy[disabled="true"]:hover {
     -moz-image-region: rect(48px 120px 72px 96px);
 }
 #button-privacy:hover {
     -moz-image-region: rect(24px 120px 48px 96px);
 }
-#button-privacy:hover:active {
-}
 
 toolbar[iconsize="small"] #button-privacy {
     -moz-image-region: rect(0px 80px 16px 64px);
 }
 toolbar[iconsize="small"] #button-privacy[disabled="true"],
-toolbar[iconsize="small"] #button-privacy[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-privacy[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-privacy[disabled="true"]:hover {
     -moz-image-region: rect(32px 80px 48px 64px);
 }
 toolbar[iconsize="small"] #button-privacy:hover {
     -moz-image-region: rect(16px 80px 32px 64px);
 }
-toolbar[iconsize="small"] #button-privacy:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   save button
  *-------------------------------------------------------------------*/
 
 #button-save {
     -moz-image-region: rect(0px 144px 24px 120px);
 }
 #button-save[disabled="true"],
-#button-save[disabled="true"]:hover,
-#button-save[disabled="true"]:hover:active {
+#button-save[disabled="true"]:hover {
     -moz-image-region: rect(48px 144px 72px 120px);
 }
 #button-save:hover {
     -moz-image-region: rect(24px 144px 48px 120px);
 }
-#button-save:hover:active {
-}
 
 toolbar[iconsize="small"] #button-save {
     -moz-image-region: rect(0px 96px 16px 80px);
 }
 toolbar[iconsize="small"] #button-save[disabled="true"],
-toolbar[iconsize="small"] #button-save[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-save[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-save[disabled="true"]:hover {
     -moz-image-region: rect(32px 96px 48px 80px);
 }
 toolbar[iconsize="small"] #button-save:hover {
     -moz-image-region: rect(16px 96px 32px 80px);
 }
-toolbar[iconsize="small"] #button-save:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   delete button
  *-------------------------------------------------------------------*/
 
 #button-delete {
     -moz-image-region: rect(0px 408px 24px 384px);
 }
 #button-delete[disabled="true"],
-#button-delete[disabled="true"]:hover,
-#button-delete[disabled="true"]:hover:active {
+#button-delete[disabled="true"]:hover {
     -moz-image-region: rect(48px 408px 72px 384px);
 }
 #button-delete:hover {
     -moz-image-region: rect(24px 408px 48px 384px);
 }
-#button-delete:hover:active {
-}
 
 toolbar[iconsize="small"] #button-delete {
     -moz-image-region: rect(0px 272px 16px 256px);
 }
 toolbar[iconsize="small"] #button-delete[disabled="true"],
-toolbar[iconsize="small"] #button-delete[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-delete[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-delete[disabled="true"]:hover {
     -moz-image-region: rect(32px 272px 48px 256px);
 }
 toolbar[iconsize="small"] #button-delete:hover {
     -moz-image-region: rect(16px 272px 32px 256px);
 }
-toolbar[iconsize="small"] #button-delete:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   print button
- *-------------------------------------------------------------------*/
-
-#button-print {
-    -moz-image-region: rect(0px 456px 24px 432px);
-}
-#button-print[disabled="true"],
-#button-print[disabled="true"]:hover,
-#button-print[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 456px 72px 432px);
-}
-#button-print:hover {
-    -moz-image-region: rect(24px 456px 48px 432px);
-}
-#button-print:hover:active {
-}
-
-toolbar[iconsize="small"] #button-print {
-    -moz-image-region: rect(0px 304px 16px 288px);
-}
-toolbar[iconsize="small"] #button-print[disabled="true"],
-toolbar[iconsize="small"] #button-print[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-print[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 304px 48px 288px);
-}
-toolbar[iconsize="small"] #button-print:hover {
-    -moz-image-region: rect(16px 304px 32px 288px);
-}
-toolbar[iconsize="small"] #button-print:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   help button
  *-------------------------------------------------------------------*/
 
 #button-question {
     -moz-image-region: rect(0px 576px 24px 552px);
 }
 #button-question[disabled="true"],
-#button-question[disabled="true"]:hover,
-#button-question[disabled="true"]:hover:active {
+#button-question[disabled="true"]:hover {
     -moz-image-region: rect(48px 576px 72px 552px);
 }
 #button-question:hover {
     -moz-image-region: rect(24px 576px 48px 552px);
 }
-#button-question:hover:active {
-}
 
 toolbar[iconsize="small"] #button-question {
     -moz-image-region: rect(0px 384px 16px 368px);
 }
 toolbar[iconsize="small"] #button-question[disabled="true"],
-toolbar[iconsize="small"] #button-question[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-question[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-question[disabled="true"]:hover {
     -moz-image-region: rect(32px 384px 48px 368px);
 }
 toolbar[iconsize="small"] #button-question:hover {
     -moz-image-region: rect(16px 384px 32px 368px);
 }
-toolbar[iconsize="small"] #button-question:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   Event dialog statusbar images
  *-------------------------------------------------------------------*/
 
 .cal-statusbar-1 {
     -moz-box-orient: vertical;
     min-width: 0px;
@@ -412,80 +312,56 @@ toolbar[iconsize="small"] #button-questi
 
 /*--------------------------------------------------------------------
  *   privacy "public" image
  *-------------------------------------------------------------------*/
 
 #button-privacy-public {
     -moz-image-region: rect(0px 28px 16px 0px);
 }
-#button-privacy-public:hover:active {
-}
-#button-privacy-public[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   privacy "private" image
  *-------------------------------------------------------------------*/
 
 #button-privacy-private {
     -moz-image-region: rect(0px 56px 16px 28px);
 }
-#button-privacy-private:hover:active {
-}
-#button-privacy-private[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   privacy "confidential" image
  *-------------------------------------------------------------------*/
 
 #button-privacy-confidential {
     -moz-image-region: rect(0px 84px 16px 56px);
 }
-#button-privacy-confidential:hover:active {
-}
-#button-privacy-confidential[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   importance "low" image
  *-------------------------------------------------------------------*/
 
 #button-importance-low {
     -moz-image-region: rect(0px 100px 16px 84px);
 }
-#button-importance-low:hover:active {
-}
-#button-importance-low[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   importance "medium" image
  *-------------------------------------------------------------------*/
 
 #button-importance-medium {
     -moz-image-region: rect(0px 116px 16px 100px);
 }
-#button-importance-medium:hover:active {
-}
-#button-importance-medium[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   importance "high" image
  *-------------------------------------------------------------------*/
 
 #button-importance-high {
     -moz-image-region: rect(0px 132px 16px 116px);
 }
-#button-importance-high:hover:active {
-}
-#button-importance-high[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   Recurrence dialog preview border
  *-------------------------------------------------------------------*/
 #preview-border {
     border: none;
     padding: 0px;
 }
--- a/calendar/base/themes/pinstripe/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/pinstripe/dialogs/calendar-event-dialog.css
@@ -128,263 +128,163 @@ toolbar[iconsize="small"] .cal-event-too
 /*--------------------------------------------------------------------
  *   invite attendees button
  *-------------------------------------------------------------------*/
 
 #button-attendees {
   -moz-image-region: rect(0px 64px 32px 32px);
 }
 #button-attendees[disabled="true"],
-#button-attendees[disabled="true"]:hover,
-#button-attendees[disabled="true"]:hover:active {
+#button-attendees[disabled="true"]:hover {
   -moz-image-region: rect(64px 64px 96px 32px);
 }
 #button-attendees:hover {
   -moz-image-region: rect(32px 64px 64px 32px);
 }
-#button-attendees:hover:active {
-}
 
 toolbar[iconsize="small"] #button-attendees {
   -moz-image-region: rect(0px 48px 24px 24px);
 }
 toolbar[iconsize="small"] #button-attendees[disabled="true"],
-toolbar[iconsize="small"] #button-attendees[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-attendees[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-attendees[disabled="true"]:hover {
   -moz-image-region: rect(48px 48px 72px 24px);
 }
 toolbar[iconsize="small"] #button-attendees:hover {
   -moz-image-region: rect(24px 48px 48px 24px);
 }
-toolbar[iconsize="small"] #button-attendees:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   spellcheck button
- *-------------------------------------------------------------------*/
-
-#button-spellcheck {
-  -moz-image-region: rect(0px 96px 32px 64px);
-}
-#button-spellcheck[disabled="true"],
-#button-spellcheck[disabled="true"]:hover,
-#button-spellcheck[disabled="true"]:hover:active {
-  -moz-image-region: rect(64px 96px 96px 64px);
-}
-#button-spellcheck:hover {
-  -moz-image-region: rect(32px 96px 64px 64px);
-}
-#button-spellcheck:hover:active {
-}
-
-toolbar[iconsize="small"] #button-spellcheck {
-  -moz-image-region: rect(0px 72px 24px 48px);
-}
-toolbar[iconsize="small"] #button-spellcheck[disabled="true"],
-toolbar[iconsize="small"] #button-spellcheck[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-spellcheck[disabled="true"]:hover:active {
-  -moz-image-region: rect(48px 72px 72px 48px);
-}
-toolbar[iconsize="small"] #button-spellcheck:hover {
-  -moz-image-region: rect(24px 72px 48px 48px);
-}
-toolbar[iconsize="small"] #button-spellcheck:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   documents button
  *-------------------------------------------------------------------*/
 
 #button-url {
   -moz-image-region: rect(0px 128px 32px 96px);
 }
 #button-url[disabled="true"],
-#button-url[disabled="true"]:hover,
-#button-url[disabled="true"]:hover:active {
+#button-url[disabled="true"]:hover {
   -moz-image-region: rect(64px 128px 96px 96px);
 }
 #button-url:hover {
   -moz-image-region: rect(32px 128px 64px 96px);
 }
-#button-url:hover:active {
-}
 
 toolbar[iconsize="small"] #button-url {
   -moz-image-region: rect(0px 96px 24px 72px);
 }
 toolbar[iconsize="small"] #button-url[disabled="true"],
-toolbar[iconsize="small"] #button-url[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-url[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-url[disabled="true"]:hover {
   -moz-image-region: rect(48px 96px 72px 72px);
 }
 toolbar[iconsize="small"] #button-url:hover {
   -moz-image-region: rect(24px 96px 48px 72px);
 }
-toolbar[iconsize="small"] #button-url:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   privacy button
  *-------------------------------------------------------------------*/
 
 #button-privacy {
   -moz-image-region: rect(0px 160px 32px 128px);
 }
 #button-privacy[disabled="true"],
-#button-privacy[disabled="true"]:hover,
-#button-privacy[disabled="true"]:hover:active {
+#button-privacy[disabled="true"]:hover {
   -moz-image-region: rect(64px 160px 96px 128px);
 }
 #button-privacy:hover {
   -moz-image-region: rect(32px 160px 64px 128px);
 }
-#button-privacy:hover:active {
-}
 
 toolbar[iconsize="small"] #button-privacy {
   -moz-image-region: rect(0px 120px 24px 96px);
 }
 toolbar[iconsize="small"] #button-privacy[disabled="true"],
-toolbar[iconsize="small"] #button-privacy[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-privacy[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-privacy[disabled="true"]:hover {
   -moz-image-region: rect(48px 120px 72px 96px);
 }
 toolbar[iconsize="small"] #button-privacy:hover {
   -moz-image-region: rect(24px 120px 48px 96px);
 }
-toolbar[iconsize="small"] #button-privacy:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   save button
  *-------------------------------------------------------------------*/
 
 #button-save {
   -moz-image-region: rect(0px 192px 32px 160px);
 }
 #button-save[disabled="true"],
-#button-save[disabled="true"]:hover,
-#button-save[disabled="true"]:hover:active {
+#button-save[disabled="true"]:hover {
   -moz-image-region: rect(64px 192px 96px 160px);
 }
 #button-save:hover {
   -moz-image-region: rect(32px 192px 64px 160px);
 }
-#button-save:hover:active {
-}
 
 toolbar[iconsize="small"] #button-save {
   -moz-image-region: rect(0px 144px 24px 120px);
 }
 toolbar[iconsize="small"] #button-save[disabled="true"],
-toolbar[iconsize="small"] #button-save[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-save[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-save[disabled="true"]:hover {
   -moz-image-region: rect(48px 144px 72px 120px);
 }
 toolbar[iconsize="small"] #button-save:hover {
   -moz-image-region: rect(24px 144px 48px 120px);
 }
-toolbar[iconsize="small"] #button-save:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   delete button
  *-------------------------------------------------------------------*/
 
 #button-delete {
     -moz-image-region: rect(0px 544px 32px 512px);
 }
 #button-delete[disabled="true"],
-#button-delete[disabled="true"]:hover,
-#button-delete[disabled="true"]:hover:active {
+#button-delete[disabled="true"]:hover {
     -moz-image-region: rect(64px 544px 96px 512px);
 }
 #button-delete:hover {
     -moz-image-region: rect(32px 544px 64px 512px);
 }
-#button-delete:hover:active {
-}
 
 toolbar[iconsize="small"] #button-delete {
     -moz-image-region: rect(0px 408px 24px 384px);
 }
 toolbar[iconsize="small"] #button-delete[disabled="true"],
-toolbar[iconsize="small"] #button-delete[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-delete[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-delete[disabled="true"]:hover {
     -moz-image-region: rect(48px 408px 72px 384px);
 }
 toolbar[iconsize="small"] #button-delete:hover {
     -moz-image-region: rect(24px 408px 48px 384px);
 }
-toolbar[iconsize="small"] #button-delete:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   print button
- *-------------------------------------------------------------------*/
-
-#button-print {
-  -moz-image-region: rect(0px 608px 32px 576px);
-}
-#button-print[disabled="true"],
-#button-print[disabled="true"]:hover,
-#button-print[disabled="true"]:hover:active {
-  -moz-image-region: rect(64px 608px 96px 576px);
-}
-#button-print:hover {
-  -moz-image-region: rect(32px 608px 64px 576px);
-}
-#button-print:hover:active {
-}
-
-toolbar[iconsize="small"] #button-print {
-  -moz-image-region: rect(0px 456px 24px 432px);
-}
-toolbar[iconsize="small"] #button-print[disabled="true"],
-toolbar[iconsize="small"] #button-print[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-print[disabled="true"]:hover:active {
-  -moz-image-region: rect(48px 456px 72px 432px);
-}
-toolbar[iconsize="small"] #button-print:hover {
-  -moz-image-region: rect(24px 456px 48px 432px);
-}
-toolbar[iconsize="small"] #button-print:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   help button
  *-------------------------------------------------------------------*/
 
 #button-question {
   -moz-image-region: rect(0px 768px 32px 736px);
 }
 #button-question[disabled="true"],
-#button-question[disabled="true"]:hover,
-#button-question[disabled="true"]:hover:active {
+#button-question[disabled="true"]:hover {
   -moz-image-region: rect(64px 768px 96px 736px);
 }
 #button-question:hover {
   -moz-image-region: rect(32px 768px 64px 736px);
 }
-#button-question:hover:active {
-}
 
 toolbar[iconsize="small"] #button-question {
   -moz-image-region: rect(0px 576px 24px 552px);
 }
 toolbar[iconsize="small"] #button-question[disabled="true"],
-toolbar[iconsize="small"] #button-question[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-question[disabled="true"]:hover:active {
+toolbar[iconsize="small"] #button-question[disabled="true"]:hover {
   -moz-image-region: rect(48px 576px 72px 552px);
 }
 toolbar[iconsize="small"] #button-question:hover {
   -moz-image-region: rect(24px 576px 48px 552px);
 }
-toolbar[iconsize="small"] #button-question:hover:active {
-}
 
 /*--------------------------------------------------------------------
  *   Event dialog statusbar images
  *-------------------------------------------------------------------*/
 
 .cal-statusbar-1 {
     -moz-box-orient: vertical;
     min-width: 0px;
@@ -393,82 +293,56 @@ toolbar[iconsize="small"] #button-questi
 
 /*--------------------------------------------------------------------
  *   privacy "public" image
  *-------------------------------------------------------------------*/
 
 #button-privacy-public {
   -moz-image-region: rect(0px 28px 16px 0px);
 }
-#button-privacy-public:hover:active {
-  -moz-image-region: rect(0px 28px 16px 0px);
-}
-#button-privacy-public[disabled="true"] {
-  -moz-image-region: rect(0px 28px 16px 0px);
-}
 
 /*--------------------------------------------------------------------
  *   privacy "private" image
  *-------------------------------------------------------------------*/
 
 #button-privacy-private {
   -moz-image-region: rect(0px 56px 16px 28px);
 }
-#button-privacy-private:hover:active {
-}
-#button-privacy-private[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   privacy "confidential" image
  *-------------------------------------------------------------------*/
 
 #button-privacy-confidential {
   -moz-image-region: rect(0px 84px 16px 56px);
 }
-#button-privacy-confidential:hover:active {
-}
-#button-privacy-confidential[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   importance "low" image
  *-------------------------------------------------------------------*/
 
 #button-importance-low {
   -moz-image-region: rect(0px 100px 16px 84px);
 }
-#button-importance-low:hover:active {
-}
-#button-importance-low[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   importance "medium" image
  *-------------------------------------------------------------------*/
 
 #button-importance-medium {
   -moz-image-region: rect(0px 116px 16px 100px);
 }
-#button-importance-medium:hover:active {
-}
-#button-importance-medium[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   importance "high" image
  *-------------------------------------------------------------------*/
 
 #button-importance-high {
   -moz-image-region: rect(0px 132px 16px 116px);
 }
-#button-importance-high:hover:active {
-}
-#button-importance-high[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   Recurrence dialog preview border
  *-------------------------------------------------------------------*/
 #preview-border {
     border: none;
     padding: 0px;
 }
--- a/calendar/base/themes/winstripe/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/winstripe/dialogs/calendar-event-dialog.css
@@ -105,368 +105,72 @@ label.label {
     margin-bottom: 0.6em;
 }
 
 #timezone-endtime {
     -moz-margin-start: 16px;
 }
 
 /*--------------------------------------------------------------------
- *   Event dialog toolbar buttons
- *-------------------------------------------------------------------*/
-
-.cal-event-toolbarbutton {
-    list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar.png");
-}
-
-/*--------------------------------------------------------------------
- *   Event dialog toolbar buttons - small
- *-------------------------------------------------------------------*/
-
-toolbar[iconsize="small"] .cal-event-toolbarbutton {
-    list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar-small.png");
-}
-
-/*--------------------------------------------------------------------
- *   invite attendees button
- *-------------------------------------------------------------------*/
-
-#button-attendees {
-    -moz-image-region: rect(0px 48px 24px 24px);
-}
-#button-attendees[disabled="true"],
-#button-attendees[disabled="true"]:hover,
-#button-attendees[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 48px 72px 24px);
-}
-#button-attendees:hover {
-    -moz-image-region: rect(24px 48px 48px 24px);
-}
-#button-attendees:hover:active {
-}
-
-toolbar[iconsize="small"] #button-attendees {
-    -moz-image-region: rect(0px 32px 16px 16px);
-}
-toolbar[iconsize="small"] #button-attendees[disabled="true"],
-toolbar[iconsize="small"] #button-attendees[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-attendees[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 32px 48px 16px);
-}
-toolbar[iconsize="small"] #button-attendees:hover {
-    -moz-image-region: rect(16px 32px 32px 16px);
-}
-toolbar[iconsize="small"] #button-attendees:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   spellcheck button
- *-------------------------------------------------------------------*/
-
-#button-spellcheck {
-    -moz-image-region: rect(0px 72px 24px 48px);
-}
-#button-spellcheck[disabled="true"],
-#button-spellcheck[disabled="true"]:hover,
-#button-spellcheck[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 72px 72px 48px);
-}
-#button-spellcheck:hover {
-    -moz-image-region: rect(24px 72px 48px 48px);
-}
-#button-spellcheck:hover:active {
-}
-
-toolbar[iconsize="small"] #button-spellcheck {
-    -moz-image-region: rect(0px 48px 16px 32px);
-}
-toolbar[iconsize="small"] #button-spellcheck[disabled="true"],
-toolbar[iconsize="small"] #button-spellcheck[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-spellcheck[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 48px 48px 32px);
-}
-toolbar[iconsize="small"] #button-spellcheck:hover {
-    -moz-image-region: rect(16px 48px 32px 32px);
-}
-toolbar[iconsize="small"] #button-spellcheck:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   documents button
- *-------------------------------------------------------------------*/
-
-#button-url {
-    -moz-image-region: rect(0px 96px 24px 72px);
-}
-#button-url[disabled="true"],
-#button-url[disabled="true"]:hover,
-#button-url[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 96px 72px 72px);
-}
-#button-url:hover {
-    -moz-image-region: rect(24px 96px 48px 72px);
-}
-#button-url:hover:active {
-}
-
-toolbar[iconsize="small"] #button-url {
-    -moz-image-region: rect(0px 64px 16px 48px);
-}
-toolbar[iconsize="small"] #button-url[disabled="true"],
-toolbar[iconsize="small"] #button-url[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-url[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 64px 48px 48px);
-}
-toolbar[iconsize="small"] #button-url:hover {
-    -moz-image-region: rect(16px 64px 32px 48px);
-}
-toolbar[iconsize="small"] #button-url:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   privacy button
- *-------------------------------------------------------------------*/
-
-#button-privacy {
-    -moz-image-region: rect(0px 120px 24px 96px);
-}
-#button-privacy[disabled="true"],
-#button-privacy[disabled="true"]:hover,
-#button-privacy[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 120px 72px 96px);
-}
-#button-privacy:hover {
-    -moz-image-region: rect(24px 120px 48px 96px);
-}
-#button-privacy:hover:active {
-}
-
-toolbar[iconsize="small"] #button-privacy {
-    -moz-image-region: rect(0px 80px 16px 64px);
-}
-toolbar[iconsize="small"] #button-privacy[disabled="true"],
-toolbar[iconsize="small"] #button-privacy[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-privacy[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 80px 48px 64px);
-}
-toolbar[iconsize="small"] #button-privacy:hover {
-    -moz-image-region: rect(16px 80px 32px 64px);
-}
-toolbar[iconsize="small"] #button-privacy:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   save button
- *-------------------------------------------------------------------*/
-
-#button-save {
-    -moz-image-region: rect(0px 144px 24px 120px);
-}
-#button-save[disabled="true"],
-#button-save[disabled="true"]:hover,
-#button-save[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 144px 72px 120px);
-}
-#button-save:hover {
-    -moz-image-region: rect(24px 144px 48px 120px);
-}
-#button-save:hover:active {
-}
-
-toolbar[iconsize="small"] #button-save {
-    -moz-image-region: rect(0px 96px 16px 80px);
-}
-toolbar[iconsize="small"] #button-save[disabled="true"],
-toolbar[iconsize="small"] #button-save[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-save[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 96px 48px 80px);
-}
-toolbar[iconsize="small"] #button-save:hover {
-    -moz-image-region: rect(16px 96px 32px 80px);
-}
-toolbar[iconsize="small"] #button-save:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   delete button
- *-------------------------------------------------------------------*/
-
-#button-delete {
-    -moz-image-region: rect(0px 408px 24px 384px);
-}
-#button-delete[disabled="true"],
-#button-delete[disabled="true"]:hover,
-#button-delete[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 408px 72px 384px);
-}
-#button-delete:hover {
-    -moz-image-region: rect(24px 408px 48px 384px);
-}
-#button-delete:hover:active {
-}
-
-toolbar[iconsize="small"] #button-delete {
-    -moz-image-region: rect(0px 272px 16px 256px);
-}
-toolbar[iconsize="small"] #button-delete[disabled="true"],
-toolbar[iconsize="small"] #button-delete[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-delete[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 272px 48px 256px);
-}
-toolbar[iconsize="small"] #button-delete:hover {
-    -moz-image-region: rect(16px 272px 32px 256px);
-}
-toolbar[iconsize="small"] #button-delete:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   print button
- *-------------------------------------------------------------------*/
-
-#button-print {
-    -moz-image-region: rect(0px 456px 24px 432px);
-}
-#button-print[disabled="true"],
-#button-print[disabled="true"]:hover,
-#button-print[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 456px 72px 432px);
-}
-#button-print:hover {
-    -moz-image-region: rect(24px 456px 48px 432px);
-}
-#button-print:hover:active {
-}
-
-toolbar[iconsize="small"] #button-print {
-    -moz-image-region: rect(0px 304px 16px 288px);
-}
-toolbar[iconsize="small"] #button-print[disabled="true"],
-toolbar[iconsize="small"] #button-print[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-print[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 304px 48px 288px);
-}
-toolbar[iconsize="small"] #button-print:hover {
-    -moz-image-region: rect(16px 304px 32px 288px);
-}
-toolbar[iconsize="small"] #button-print:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   help button
- *-------------------------------------------------------------------*/
-
-#button-question {
-    -moz-image-region: rect(0px 576px 24px 552px);
-}
-#button-question[disabled="true"],
-#button-question[disabled="true"]:hover,
-#button-question[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 576px 72px 552px);
-}
-#button-question:hover {
-    -moz-image-region: rect(24px 576px 48px 552px);
-}
-#button-question:hover:active {
-}
-
-toolbar[iconsize="small"] #button-question {
-    -moz-image-region: rect(0px 384px 16px 368px);
-}
-toolbar[iconsize="small"] #button-question[disabled="true"],
-toolbar[iconsize="small"] #button-question[disabled="true"]:hover,
-toolbar[iconsize="small"] #button-question[disabled="true"]:hover:active {
-    -moz-image-region: rect(32px 384px 48px 368px);
-}
-toolbar[iconsize="small"] #button-question:hover {
-    -moz-image-region: rect(16px 384px 32px 368px);
-}
-toolbar[iconsize="small"] #button-question:hover:active {
-}
-
-/*--------------------------------------------------------------------
  *   Event dialog statusbar images
  *-------------------------------------------------------------------*/
 
 .cal-statusbar-1 {
     -moz-box-orient: vertical;
     min-width: 0px;
     list-style-image: url("chrome://calendar/skin/calendar-event-dialog.png");
 }
 
 /*--------------------------------------------------------------------
  *   privacy "public" image
  *-------------------------------------------------------------------*/
 
 #button-privacy-public {
     -moz-image-region: rect(0px 28px 16px 0px);
 }
-#button-privacy-public:hover:active {
-}
-#button-privacy-public[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   privacy "private" image
  *-------------------------------------------------------------------*/
 
 #button-privacy-private {
     -moz-image-region: rect(0px 56px 16px 28px);
 }
-#button-privacy-private:hover:active {
-}
-#button-privacy-private[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   privacy "confidential" image
  *-------------------------------------------------------------------*/
 
 #button-privacy-confidential {
     -moz-image-region: rect(0px 84px 16px 56px);
 }
-#button-privacy-confidential:hover:active {
-}
-#button-privacy-confidential[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   importance "low" image
  *-------------------------------------------------------------------*/
 
 #button-importance-low {
     -moz-image-region: rect(0px 100px 16px 84px);
 }
-#button-importance-low:hover:active {
-}
-#button-importance-low[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   importance "medium" image
  *-------------------------------------------------------------------*/
 
 #button-importance-medium {
     -moz-image-region: rect(0px 116px 16px 100px);
 }
-#button-importance-medium:hover:active {
-}
-#button-importance-medium[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   importance "high" image
  *-------------------------------------------------------------------*/
 
 #button-importance-high {
     -moz-image-region: rect(0px 132px 16px 116px);
 }
-#button-importance-high:hover:active {
-}
-#button-importance-high[disabled="true"] {
-}
 
 /*--------------------------------------------------------------------
  *   Recurrence dialog preview border
  *-------------------------------------------------------------------*/
 #preview-border {
     border: none;
     padding: 0px;
 }
new file mode 100644
--- /dev/null
+++ b/calendar/base/themes/winstripe/win-aero/calendar-event-dialog.css
@@ -0,0 +1,55 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#event-toolbox {
+  -moz-appearance: none;
+  border-top: none;
+  background-color: -moz-Dialog;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, .5),
+                    rgba(255, 255, 255, .0) 10%, rgba(0, 0, 0, .03) 50%,
+                    rgba(0, 0, 0, .1) 90%, rgba(0, 0, 0, .2));
+}
+
+@media (-moz-windows-default-theme) {
+  #event-toolbox {
+    background-color: rgb(227, 237, 246);
+  }
+}
+
+#event-menubar,
+#event-toolbar {
+  -moz-appearance: none;
+  border-style: none;
+  background-color: transparent
+}
+
+#event-toolbar[iconsize="small"] .toolbarbutton-1 .toolbarbutton-icon {
+  margin: 0;
+  width: 18px;
+  height: 18px;
+}
+
+.cal-event-toolbarbutton {
+  list-style-image: url(chrome://calendar/skin/calendar-event-dialog-toolbar-aero.png);
+}
+
+#button-save {
+  -moz-image-region: rect(0 108px 18px 90px);
+}
+
+#button-attendees {
+  -moz-image-region: rect(0 36px 18px 18px);
+}
+
+#button-privacy {
+  -moz-image-region: rect(0 90px 18px 72px);
+}
+
+#button-url {
+  -moz-image-region: rect(0 72px 18px 54px);
+}
+
+#button-delete {
+  -moz-image-region: rect(0 306px 18px 288px);
+}
--- a/calendar/base/themes/winstripe/win-aero/calendar.css
+++ b/calendar/base/themes/winstripe/win-aero/calendar.css
@@ -208,64 +208,11 @@
     background-clip: padding-box;
   }
 
   #today-pane-panel .folderview-cycler {
     margin-top: -1px;
   }
 }
 
-#event-toolbox {
-  -moz-appearance: none;
-  border-top: none;
-  background-color: -moz-Dialog;
-  background-image: -moz-linear-gradient(rgba(255, 255, 255, .5),
-                    rgba(255, 255, 255, .0) 10%, rgba(0, 0, 0, .03) 50%,
-                    rgba(0, 0, 0, .1) 90%, rgba(0, 0, 0, .2));
-}
-
-@media all and (-moz-windows-default-theme) {
-  #event-toolbox {
-    background-color: rgb(227, 237, 246);
-  }
-}
-
-#event-menubar,
-#event-toolbar {
-  -moz-appearance: none;
-  border-style: none;
-  background-color: transparent
-}
-
-#event-toolbar[iconsize="small"] .toolbarbutton-1 .toolbarbutton-icon {
-  margin: 0;
-  width: 18px;
-  height: 18px;
-}
-
-.cal-event-toolbarbutton,
-toolbar[iconsize="small"] .cal-event-toolbarbutton {
-  list-style-image: url(chrome://calendar/skin/calendar-event-dialog-toolbar-aero.png) !important;
-}
-
-#button-save {
-  -moz-image-region: rect(0 108px 18px 90px) !important;
-}
-
-#button-attendees {
-  -moz-image-region: rect(0 36px 18px 18px) !important;
-}
-
-#button-privacy {
-  -moz-image-region: rect(0 90px 18px 72px) !important;
-}
-
-#button-url {
-  -moz-image-region: rect(0 72px 18px 54px) !important;
-}
-
-#button-delete.cal-event-toolbarbutton {
-  -moz-image-region: rect(0 306px 18px 288px) !important;
-}
-
 .occurrence-accept-buttons {
   list-style-image: url(chrome://calendar/skin/calendar-occurrence-prompt-aero.png);
 }
new file mode 100644
--- /dev/null
+++ b/calendar/base/themes/winstripe/win-classic/calendar-event-dialog.css
@@ -0,0 +1,121 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+.cal-event-toolbarbutton {
+  list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar.png");
+}
+
+toolbar[iconsize="small"] .cal-event-toolbarbutton {
+  list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar-small.png");
+}
+
+#button-attendees {
+  -moz-image-region: rect(0px 48px 24px 24px);
+}
+#button-attendees[disabled="true"],
+#button-attendees[disabled="true"]:hover {
+  -moz-image-region: rect(48px 48px 72px 24px);
+}
+#button-attendees:hover {
+  -moz-image-region: rect(24px 48px 48px 24px);
+}
+
+toolbar[iconsize="small"] #button-attendees {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+toolbar[iconsize="small"] #button-attendees[disabled="true"],
+toolbar[iconsize="small"] #button-attendees[disabled="true"]:hover {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+toolbar[iconsize="small"] #button-attendees:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#button-url {
+  -moz-image-region: rect(0px 96px 24px 72px);
+}
+#button-url[disabled="true"],
+#button-url[disabled="true"]:hover {
+  -moz-image-region: rect(48px 96px 72px 72px);
+}
+#button-url:hover {
+  -moz-image-region: rect(24px 96px 48px 72px);
+}
+
+toolbar[iconsize="small"] #button-url {
+  -moz-image-region: rect(0px 64px 16px 48px);
+}
+toolbar[iconsize="small"] #button-url[disabled="true"],
+toolbar[iconsize="small"] #button-url[disabled="true"]:hover {
+  -moz-image-region: rect(32px 64px 48px 48px);
+}
+toolbar[iconsize="small"] #button-url:hover {
+  -moz-image-region: rect(16px 64px 32px 48px);
+}
+
+#button-privacy {
+  -moz-image-region: rect(0px 120px 24px 96px);
+}
+#button-privacy[disabled="true"],
+#button-privacy[disabled="true"]:hover {
+  -moz-image-region: rect(48px 120px 72px 96px);
+}
+#button-privacy:hover {
+  -moz-image-region: rect(24px 120px 48px 96px);
+}
+
+toolbar[iconsize="small"] #button-privacy {
+  -moz-image-region: rect(0px 80px 16px 64px);
+}
+toolbar[iconsize="small"] #button-privacy[disabled="true"],
+toolbar[iconsize="small"] #button-privacy[disabled="true"]:hover {
+  -moz-image-region: rect(32px 80px 48px 64px);
+}
+toolbar[iconsize="small"] #button-privacy:hover {
+  -moz-image-region: rect(16px 80px 32px 64px);
+}
+
+#button-save {
+  -moz-image-region: rect(0px 144px 24px 120px);
+}
+#button-save[disabled="true"],
+#button-save[disabled="true"]:hover {
+  -moz-image-region: rect(48px 144px 72px 120px);
+}
+#button-save:hover {
+  -moz-image-region: rect(24px 144px 48px 120px);
+}
+
+toolbar[iconsize="small"] #button-save {
+  -moz-image-region: rect(0px 96px 16px 80px);
+}
+toolbar[iconsize="small"] #button-save[disabled="true"],
+toolbar[iconsize="small"] #button-save[disabled="true"]:hover {
+  -moz-image-region: rect(32px 96px 48px 80px);
+}
+toolbar[iconsize="small"] #button-save:hover {
+  -moz-image-region: rect(16px 96px 32px 80px);
+}
+
+#button-delete {
+  -moz-image-region: rect(0px 408px 24px 384px);
+}
+#button-delete[disabled="true"],
+#button-delete[disabled="true"]:hover {
+  -moz-image-region: rect(48px 408px 72px 384px);
+}
+#button-delete:hover {
+  -moz-image-region: rect(24px 408px 48px 384px);
+}
+
+toolbar[iconsize="small"] #button-delete {
+  -moz-image-region: rect(0px 272px 16px 256px);
+}
+toolbar[iconsize="small"] #button-delete[disabled="true"],
+toolbar[iconsize="small"] #button-delete[disabled="true"]:hover {
+  -moz-image-region: rect(32px 272px 48px 256px);
+}
+toolbar[iconsize="small"] #button-delete:hover {
+  -moz-image-region: rect(16px 272px 32px 256px);
+}