Bug 1327513 - Remove Windows XP and Vista theme code from calendar. r=MakeMyDay
authorRichard Marti <richard.marti@gmail.com>
Sat, 31 Dec 2016 23:41:29 +0100
changeset 20984 bb704755f3e81797b2f6566de9956277a3ac5d39
parent 20983 cb98d5e84217f814745ab03688a9dc89aeb8ca95
child 20985 451f4e89b9f5f99a63a96ab742af78886b7c35a4
push id12729
push userrichard.marti@gmail.com
push dateMon, 09 Jan 2017 10:05:21 +0000
treeherdercomm-central@bb704755f3e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMakeMyDay
bugs1327513
Bug 1327513 - Remove Windows XP and Vista theme code from calendar. r=MakeMyDay
calendar/base/jar.mn
calendar/base/themes/common/calendar-occurrence-prompt.css
calendar/base/themes/common/dialogs/calendar-event-dialog.css
calendar/base/themes/windows/calendar-task-tree.css
calendar/base/themes/windows/calendar-task-view.css
calendar/base/themes/windows/calendar-unifinder.css
calendar/base/themes/windows/calendar-views.css
calendar/base/themes/windows/dialogs/calendar-event-dialog.css
calendar/base/themes/windows/today-pane.css
calendar/base/themes/windows/widgets/calendar-widgets.css
calendar/lightning/jar.mn
calendar/lightning/themes/common/lightning.css
calendar/lightning/themes/windows/lightning-toolbar.css
calendar/lightning/themes/windows/lightning.css
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -211,15 +211,9 @@ calendar.jar:
     ../skin/windows/calendar/calendar-invitations-dialog.css                (themes/windows/dialogs/calendar-invitations-dialog.css)
     ../skin/windows/calendar/calendar-management.css                        (themes/windows/calendar-management.css)
     ../skin/windows/calendar/calendar-task-tree.css                         (themes/windows/calendar-task-tree.css)
     ../skin/windows/calendar/calendar-task-view.css                         (themes/windows/calendar-task-view.css)
     ../skin/windows/calendar/calendar-unifinder.css                         (themes/windows/calendar-unifinder.css)
     ../skin/windows/calendar/calendar-views.css                             (themes/windows/calendar-views.css)
     ../skin/windows/calendar/today-pane.css                                 (themes/windows/today-pane.css)
     ../skin/windows/calendar/widgets/calendar-widgets.css                   (themes/windows/widgets/calendar-widgets.css)
-    ../skin/windows/calendar/calendar-event-dialog-toolbar.png              (themes/windows/dialogs/images/calendar-event-dialog-toolbar.png)
-    ../skin/windows/calendar/calendar-event-dialog-toolbar-small.png        (themes/windows/dialogs/images/calendar-event-dialog-toolbar-small.png)
-    ../skin/windows/calendar/calendar-occurrence-prompt.png                 (themes/windows/images/calendar-occurrence-prompt.png)
-    ../skin/windows/calendar/tasks-actions.png                              (themes/windows/images/tasks-actions.png)
-    ../skin/windows/calendar/toolbar-large.png                              (themes/windows/images/toolbar-large.png)
-    ../skin/windows/calendar/toolbar-small.png                              (themes/windows/images/toolbar-small.png)
     ../skin/windows/calendar/calendar-occurrence-prompt-aero.png            (themes/windows/images/calendar-occurrence-prompt-aero.png)
--- a/calendar/base/themes/common/calendar-occurrence-prompt.css
+++ b/calendar/base/themes/common/calendar-occurrence-prompt.css
@@ -23,17 +23,16 @@
   font-weight: bold;
 }
 
 #accept-buttons-box {
   padding: 0 18px;
   border-bottom: 2px groove ThreeDFace;
 }
 
-
 .occurrence-accept-buttons {
   list-style-image: url(chrome://calendar/skin/calendar-occurrence-prompt.png);
   margin: 10px 0px;
 }
 
 .occurrence-accept-buttons > .button-box > .button-text {
   margin: 0 3px !important;
 }
@@ -57,13 +56,15 @@
 #accept-buttons-box[action="delete"] > #accept-parent-button {
   -moz-image-region: rect(0 100px 20px 80px);
 }
 
 #accept-buttons-box[action="delete"] > #accept-allfollowing-button {
   -moz-image-region: rect(0 120px 20px 100px);
 }
 
-@media not all and (-moz-os-version: windows-xp) {
+@media (-moz-os-version: windows-win7),
+       (-moz-os-version: windows-win8),
+       (-moz-os-version: windows-win10) {
   .occurrence-accept-buttons {
     list-style-image: url(chrome://calendar/skin/calendar-occurrence-prompt-aero.png);
   }
 }
--- a/calendar/base/themes/common/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-event-dialog.css
@@ -63,21 +63,19 @@ label.label {
 #item-calendar,
 #item-categories,
 #item-repeat,
 #item-alarm,
 .datepicker-text-class {
     min-width: 12em;
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  .cal-event-toolbarbutton .toolbarbutton-icon {
+.cal-event-toolbarbutton .toolbarbutton-icon {
     width: 18px;
     height: 18px;
-  }
 }
 
 .icon-holder[type="calendarEvent"],
 .tabmail-tab[type="calendarEvent"] {
     list-style-image: url(chrome://calendar-common/skin/calendar-event-tab.png);
     -moz-image-region: auto;
 }
 
--- a/calendar/base/themes/windows/calendar-task-tree.css
+++ b/calendar/base/themes/windows/calendar-task-tree.css
@@ -20,63 +20,60 @@
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, inprogress) {
     -moz-image-region: rect(0 13px 13px 0);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, repeating) {
     -moz-image-region: rect(0 39px 13px 26px);
 }
 
-/* Use on Vista and up default theme a dark text color when selected focus */
-@media not all and (-moz-os-version: windows-xp) {
-    @media (-moz-windows-default-theme) {
-        .calendar-task-tree > treechildren::-moz-tree-cell-text(selected, focus),
-        .calendar-task-tree > treechildren::-moz-tree-cell-text(duetoday, selected, focus),
-        .calendar-task-tree > treechildren::-moz-tree-cell-text(future, selected, focus),
-        .calendar-task-tree > treechildren::-moz-tree-cell-text(completed, selected, focus) {
-            color: -moz-FieldText;
-        }
+/* Use on Win7 and up default theme a dark text color when selected focus */
+@media (-moz-windows-default-theme) {
+    .calendar-task-tree > treechildren::-moz-tree-cell-text(selected, focus),
+    .calendar-task-tree > treechildren::-moz-tree-cell-text(duetoday, selected, focus),
+    .calendar-task-tree > treechildren::-moz-tree-cell-text(future, selected, focus),
+    .calendar-task-tree > treechildren::-moz-tree-cell-text(completed, selected, focus) {
+        color: -moz-FieldText;
+    }
+
+    .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
+        -moz-border-top-colors: green rgba(255, 255, 255, .4);
+        -moz-border-right-colors: green rgba(255, 255, 255, .4);
+        -moz-border-left-colors: green rgba(255, 255, 255, .4);
+        -moz-border-bottom-colors: green rgba(255, 255, 255, .6);
+    }
 
+    .calendar-task-tree > treechildren::-moz-tree-cell-text(inprogress, selected, focus) {
+        color: white;
+    }
+
+    .calendar-task-tree > treechildren::-moz-tree-row(overdue, selected, focus) {
+        -moz-border-top-colors: red rgba(255, 255, 255, .4);
+        -moz-border-right-colors: red rgba(255, 255, 255, .4);
+        -moz-border-left-colors: red rgba(255, 255, 255, .4);
+        -moz-border-bottom-colors: red rgba(255, 255, 255, .6);
+    }
+
+    .calendar-task-tree > treechildren::-moz-tree-cell-text(overdue, selected, focus) {
+        color: white;
+    }
+
+    @media (-moz-os-version: windows-win7) {
         .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
-            -moz-border-top-colors: green rgba(255, 255, 255, .4);
-            -moz-border-right-colors: green rgba(255, 255, 255, .4);
-            -moz-border-left-colors: green rgba(255, 255, 255, .4);
-            -moz-border-bottom-colors: green rgba(255, 255, 255, .6);
-        }
-
-        .calendar-task-tree > treechildren::-moz-tree-cell-text(inprogress, selected, focus) {
-            color: white;
+            background: linear-gradient(rgba(0, 128, 0, .28), rgba(0, 128, 0, .5));
         }
 
         .calendar-task-tree > treechildren::-moz-tree-row(overdue, selected, focus) {
-            -moz-border-top-colors: red rgba(255, 255, 255, .4);
-            -moz-border-right-colors: red rgba(255, 255, 255, .4);
-            -moz-border-left-colors: red rgba(255, 255, 255, .4);
-            -moz-border-bottom-colors: red rgba(255, 255, 255, .6);
+            background: linear-gradient(rgba(255, 0, 0, .28), rgba(255, 0, 0, .5));
         }
+    }
 
-        .calendar-task-tree > treechildren::-moz-tree-cell-text(overdue, selected, focus) {
-            color: white;
+    @media (-moz-os-version: windows-win8),
+           (-moz-os-version: windows-win10) {
+        .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
+            background: linear-gradient(rgba(0, 128, 0, .5), rgba(0, 128, 0, .5));
         }
 
-        @media (-moz-os-version: windows-vista),
-               (-moz-os-version: windows-win7) {
-            .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
-                background: linear-gradient(rgba(0, 128, 0, .28), rgba(0, 128, 0, .5));
-            }
-
-            .calendar-task-tree > treechildren::-moz-tree-row(overdue, selected, focus) {
-                background: linear-gradient(rgba(255, 0, 0, .28), rgba(255, 0, 0, .5));
-            }
-        }
-
-        @media (-moz-os-version: windows-win8),
-               (-moz-os-version: windows-win10) {
-            .calendar-task-tree > treechildren::-moz-tree-row(inprogress, selected, focus) {
-                background: linear-gradient(rgba(0, 128, 0, .5), rgba(0, 128, 0, .5));
-            }
-
-            .calendar-task-tree > treechildren::-moz-tree-row(overdue, selected, focus) {
-                background: linear-gradient(rgba(255, 0, 0, .5), rgba(255, 0, 0, .5));
-            }
+        .calendar-task-tree > treechildren::-moz-tree-row(overdue, selected, focus) {
+            background: linear-gradient(rgba(255, 0, 0, .5), rgba(255, 0, 0, .5));
         }
     }
 }
--- a/calendar/base/themes/windows/calendar-task-view.css
+++ b/calendar/base/themes/windows/calendar-task-view.css
@@ -50,157 +50,108 @@
     -moz-appearance: none;
 }
 
 #task-actions-toolbar {
     min-height: 0;
     padding: 0;
 }
 
-@media (-moz-os-version: windows-xp) {
-  #task-addition-box {
-    border-inline-start: 1px solid ThreeDShadow;
-  }
-
-  #calendar-task-tree {
-    border-inline-start: 1px solid ThreeDShadow;
-    border-bottom: 1px solid ThreeDHighlight;
-  }
+#task-actions-category {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category);
+}
 
-  #view-task-edit-field,
-  #task-text-filter-field {
-    margin-top: 4px;
-    margin-bottom: 3px;
-  }
-
-  #task-actions-category {
-      list-style-image: url(chrome://calendar/skin/tasks-actions.png);
-      -moz-image-region: rect(0 16px 16px 0);
-  }
+#task-actions-markcompleted {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete);
+}
 
-  #task-actions-markcompleted {
-      list-style-image: url(chrome://calendar/skin/tasks-actions.png);
-      -moz-image-region: rect(0 32px 16px 16px);
-  }
-
-  #task-actions-priority {
-      list-style-image: url(chrome://calendar/skin/tasks-actions.png);
-      -moz-image-region: rect(0 48px 16px 32px);
-  }
+#task-actions-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
+}
 
-  #calendar-delete-task-button {
-      list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-      -moz-image-region: rect(0 48px 16px 32px);
-  }
+#calendar-delete-task-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
+}
 
-  #calendar-add-task-button {
-      list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-      -moz-image-region: rect(0 256px 16px 240px);
-  }
+#task-actions-toolbar[brighttext] > #task-actions-category {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category-inverted);
+}
 
-  #calendar-add-task-button[disabled="true"] {
-      -moz-image-region: rect(32px 256px 48px 240px);
-  }
+#task-actions-toolbar[brighttext] > #task-actions-markcompleted {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete-inverted);
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  #task-actions-category {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category);
-  }
-
-  #task-actions-markcompleted {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete);
-  }
-
-  #task-actions-priority {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
-  }
-
-  #calendar-delete-task-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
-  }
+#task-actions-toolbar[brighttext] > #task-actions-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-inverted);
+}
 
-  #task-actions-toolbar[brighttext] > #task-actions-category {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category-inverted);
-  }
-
-  #task-actions-toolbar[brighttext] > #task-actions-markcompleted {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete-inverted);
-  }
+#task-actions-toolbar[brighttext] > #calendar-delete-task-button {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete-inverted);
+}
 
-  #task-actions-toolbar[brighttext] > #task-actions-priority {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-inverted);
-  }
-
-
-  #task-actions-toolbar[brighttext] > #calendar-delete-task-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete-inverted);
-  }
-
-  #calendar-add-task-button {
+#calendar-add-task-button {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask);
     -moz-image-region: rect(0 18px 18px 0);
-  }
+}
 
-  #calendar-add-task-button[disabled="true"] > .toolbarbutton-icon {
+#calendar-add-task-button[disabled="true"] > .toolbarbutton-icon {
     opacity: 0.4;
-  }
+}
 
-  #view-task-edit-field,
-  #task-text-filter-field {
+#view-task-edit-field,
+#task-text-filter-field {
     width: 15em;
-  }
+}
 
-  #calendar-task-box #calendar-task-view-splitter {
+#calendar-task-box #calendar-task-view-splitter {
     border: none;
     border-bottom: 1px solid #A9B7C9;
     min-height: 0;
     height: 5px;
     background-color: transparent;
     margin-top: -5px;
     position: relative;
     z-index: 10;
-  }
+}
 
-  #calendar-nav-control {
+#calendar-nav-control {
     border-top-width: 0;
-  }
+}
 
-  #calendar-task-details-container {
+#calendar-task-details-container {
     border-top-width: 0;
     padding-top: 0;
-  }
+}
 
-  @media (-moz-windows-default-theme) {
+@media (-moz-windows-default-theme) {
     #task-addition-box {
-      background-color: #f8f8f8;
-      height: 32px;
+        background-color: #f8f8f8;
+        height: 32px;
     }
-  }
 }
 
 @media (-moz-os-version: windows-vista),
        (-moz-os-version: windows-win7) {
-  #view-task-edit-field,
-  #task-text-filter-field {
-    margin-top: 4px;
-    margin-bottom: 4px;
-  }
+    #view-task-edit-field,
+    #task-text-filter-field {
+        margin-top: 4px;
+        margin-bottom: 4px;
+    }
 }
 
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
-  #task-actions-category {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category-flat);
-  }
+@media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
+       (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
+    #task-actions-category {
+        list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#category-flat);
+    }
 
-  #task-actions-markcompleted {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete-flat);
-  }
+    #task-actions-markcompleted {
+        list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete-flat);
+    }
 
-  #task-actions-priority {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-flat);
-  }
+    #task-actions-priority {
+        list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-flat);
+    }
 
-  #calendar-add-task-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask-flat);
-  }
+    #calendar-add-task-button {
+        list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask-flat);
+    }
 }
--- a/calendar/base/themes/windows/calendar-unifinder.css
+++ b/calendar/base/themes/windows/calendar-unifinder.css
@@ -14,29 +14,20 @@
 
 .unifinder-closebutton {
   -moz-appearance: none;
   border: none;
   padding: 2px;
   background: transparent;
 }
 
-@media (-moz-os-version: windows-xp) {
+@media (-moz-windows-default-theme) {
   #unifinder-searchBox {
-    background-color: transparent;
-    height: 30px;
-  }
-}
-
-@media not all and (-moz-os-version: windows-xp) {
-  @media (-moz-windows-default-theme) {
-    #unifinder-searchBox {
-      background-color: #f8f8f8;
-      height: 33px;
-    }
+    background-color: #f8f8f8;
+    height: 33px;
   }
 }
 
 @media (-moz-os-version: windows-win8),
        (-moz-os-version: windows-win10) {
   #unifinder-searchBox {
     height: 35px;
   }
--- a/calendar/base/themes/windows/calendar-views.css
+++ b/calendar/base/themes/windows/calendar-views.css
@@ -56,20 +56,18 @@ tab[calview]:hover {
     margin-inline-start: 2px;
     margin-inline-end: 2px;
 }
 
 .today-navigation-button {
     padding-top: 0px !important; /* a workaround to center the label vertically on Windows */
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  #calendar-view-box #calendar-view-splitter {
+#calendar-view-box #calendar-view-splitter {
     border: none;
     border-bottom: 1px solid #A9B7C9;
     min-height: 0;
     height: 5px;
     background-color: transparent;
     margin-top: -5px;
     position: relative;
     z-index: 10;
-  }
 }
--- a/calendar/base/themes/windows/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/windows/dialogs/calendar-event-dialog.css
@@ -9,268 +9,104 @@
 #keepduration-button {
     min-width: 21px;
 }
 
 #timezone-endtime {
     margin-inline-start: 16px;
 }
 
-@media (-moz-os-version: windows-xp) {
-  .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"] {
-    -moz-image-region: rect(48px 48px 72px 24px);
-  }
+#button-save {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save);
+}
 
-  toolbar[iconsize="small"] #button-attendees {
-    -moz-image-region: rect(0px 32px 16px 16px);
-  }
-  toolbar[iconsize="small"] #button-attendees[disabled="true"] {
-    -moz-image-region: rect(32px 32px 48px 16px);
-  }
-
-  #button-url {
-    -moz-image-region: rect(0px 96px 24px 72px);
-  }
-  #button-url[disabled="true"] {
-    -moz-image-region: rect(48px 96px 72px 72px);
-  }
-
-  toolbar[iconsize="small"] #button-url {
-    -moz-image-region: rect(0px 64px 16px 48px);
-  }
-  toolbar[iconsize="small"] #button-url[disabled="true"] {
-    -moz-image-region: rect(32px 64px 48px 48px);
-  }
+#button-saveandclose {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close);
+}
 
-  #button-privacy {
-    -moz-image-region: rect(0px 120px 24px 96px);
-  }
-  #button-privacy[disabled="true"] {
-    -moz-image-region: rect(48px 120px 72px 96px);
-  }
-
-  toolbar[iconsize="small"] #button-privacy {
-    -moz-image-region: rect(0px 80px 16px 64px);
-  }
-  toolbar[iconsize="small"] #button-privacy[disabled="true"] {
-    -moz-image-region: rect(32px 80px 48px 64px);
-  }
-
-  #button-save {
-    -moz-image-region: rect(0px 144px 24px 120px);
-  }
-  #button-save[disabled="true"] {
-    -moz-image-region: rect(48px 144px 72px 120px);
-  }
+#button-attendees {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address);
+}
 
-  toolbar[iconsize="small"] #button-save {
-    -moz-image-region: rect(0px 96px 16px 80px);
-  }
-  toolbar[iconsize="small"] #button-save[disabled="true"] {
-    -moz-image-region: rect(32px 96px 48px 80px);
-  }
+#button-privacy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security);
+}
 
-  #button-saveandclose {
-    -moz-image-region: rect(0px 144px 24px 120px);
-  }
-  #button-saveandclose[disabled="true"] {
-    -moz-image-region: rect(48px 144px 72px 120px);
-  }
-
-  toolbar[iconsize="small"] #button-saveandclose {
-    -moz-image-region: rect(0px 96px 16px 80px);
-  }
-  toolbar[iconsize="small"] #button-saveandclose[disabled="true"] {
-    -moz-image-region: rect(32px 96px 48px 80px);
-  }
+#button-url {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach);
+}
 
-  #button-delete.cal-event-toolbarbutton {
-    list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar.png");
-    -moz-image-region: rect(0px 408px 24px 384px);
-  }
-  #button-delete.cal-event-toolbarbutton[disabled="true"],
-  #button-delete.cal-event-toolbarbutton[disabled="true"]:hover {
-    -moz-image-region: rect(48px 408px 72px 384px);
-  }
-  #button-delete.cal-event-toolbarbutton:hover,
-  #button-delete.cal-event-toolbarbutton:hover:active {
-    -moz-image-region: rect(24px 408px 48px 384px);
-  }
+#button-delete.cal-event-toolbarbutton {
+    /* !important to override the SM #button-delete states */
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete) !important;
+    -moz-image-region: auto !important;
+}
 
-  toolbar[iconsize="small"] #button-delete.cal-event-toolbarbutton {
-    list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar-small.png");
-    -moz-image-region: rect(0px 272px 16px 256px);
-  }
-  toolbar[iconsize="small"] #button-delete.cal-event-toolbarbutton[disabled="true"],
-  toolbar[iconsize="small"] #button-delete.cal-event-toolbarbutton[disabled="true"]:hover {
-    -moz-image-region: rect(32px 272px 48px 256px);
-  }
-  toolbar[iconsize="small"] #button-delete.cal-event-toolbarbutton:hover,
-  toolbar[iconsize="small"] #button-delete.cal-event-toolbarbutton:hover:active {
-    -moz-image-region: rect(16px 272px 32px 256px);
-  }
-
-  #button-priority {
-    -moz-image-region: rect(0px 600px 24px 576px);
-  }
-  #button-priority[disabled="true"] {
-    -moz-image-region: rect(48px 600px 72px 576px);
-  }
-
-  toolbar[iconsize="small"] #button-priority {
-    -moz-image-region: rect(0px 400px 16px 384px);
-  }
-  toolbar[iconsize="small"] #button-priority[disabled="true"] {
-    -moz-image-region: rect(32px 400px 48px 384px);
-  }
+#button-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
+}
 
-  #button-status {
-    -moz-image-region: rect(0px 624px 24px 600px);
-  }
-  #button-status[disabled="true"] {
-    -moz-image-region: rect(48px 624px 72px 600px);
-  }
-
-  toolbar[iconsize="small"] #button-status {
-    -moz-image-region: rect(0px 416px 16px 400px);
-  }
-  toolbar[iconsize="small"] #button-status[disabled="true"] {
-    -moz-image-region: rect(32px 416px 48px 400px);
-  }
-
-  #button-freebusy {
-    -moz-image-region: rect(0px 648px 24px 624px);
-  }
-  #button-freebusy[disabled="true"] {
-    -moz-image-region: rect(48px 648px 72px 624px);
-  }
+#button-status {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#status);
+}
 
-  toolbar[iconsize="small"] #button-freebusy {
-    -moz-image-region: rect(0px 432px 16px 416px);
-  }
-  toolbar[iconsize="small"] #button-freebusy[disabled="true"] {
-    -moz-image-region: rect(32px 432px 48px 416px);
-  }
+#button-freebusy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#freebusy);
+}
 
-  #button-timezones {
-    -moz-image-region: rect(0px 672px 24px 648px);
-  }
-  #button-timezones[disabled="true"] {
-    -moz-image-region: rect(48px 672px 72px 648px);
-  }
-
-  toolbar[iconsize="small"] #button-timezones {
-    -moz-image-region: rect(0px 448px 16px 432px);
-  }
-  toolbar[iconsize="small"] #button-timezones[disabled="true"] {
-    -moz-image-region: rect(32px 448px 48px 432px);
-  }
+#button-timezones {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones);
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  #button-save {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save);
-  }
-
-  #button-saveandclose {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close);
-  }
-
-  #button-attendees {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address);
-  }
-
-  #button-privacy {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security);
-  }
-
-  #button-url {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach);
-  }
+toolbar[brighttext] #button-save {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-inverted);
+}
 
-  #button-delete.cal-event-toolbarbutton {
-      /* !important to override the SM #button-delete states */
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete) !important;
-    -moz-image-region: auto !important;
-  }
-
-  #button-priority {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
-  }
-
-  #button-status {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#status);
-  }
-
-  #button-freebusy {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#freebusy);
-  }
-
-  #button-timezones {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones);
-  }
+toolbar[brighttext] #button-saveandclose {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close-inverted);
+}
 
-  toolbar[brighttext] #button-save {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-inverted);
-  }
-
-  toolbar[brighttext] #button-saveandclose {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close-inverted);
-  }
-
-  toolbar[brighttext] #button-attendees {
+toolbar[brighttext] #button-attendees {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address-inverted);
-  }
-
-  toolbar[brighttext] #button-privacy {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security-inverted);
-  }
-
-  toolbar[brighttext] #button-url {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach-inverted);
-  }
+}
 
-  toolbar[brighttext] #button-delete.cal-event-toolbarbutton {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete-inverted) !important;
-  }
-
-  toolbar[brighttext] #button-priority {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-inverted);
-  }
-
-  toolbar[brighttext] #button-status {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#status-inverted);
-  }
+toolbar[brighttext] #button-privacy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security-inverted);
+}
 
-  toolbar[brighttext] #button-freebusy {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#freebusy-inverted);
-  }
-
-  toolbar[brighttext] #button-timezones {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones-inverted);
-  }
-
-  #calendar-event-dialog > #event-toolbox > #event-toolbar {
-    padding-bottom: 2px;
-  }
+toolbar[brighttext] #button-url {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#attach-inverted);
 }
 
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+toolbar[brighttext] #button-delete.cal-event-toolbarbutton {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete-inverted) !important;
+}
+
+toolbar[brighttext] #button-priority {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority-inverted);
+}
+
+toolbar[brighttext] #button-status {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#status-inverted);
+}
+
+toolbar[brighttext] #button-freebusy {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#freebusy-inverted);
+}
+
+toolbar[brighttext] #button-timezones {
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones-inverted);
+}
+
+#calendar-event-dialog > #event-toolbox > #event-toolbar {
+    padding-bottom: 2px;
+}
+
+@media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
+       (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   #button-save {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-flat);
   }
 
   #button-saveandclose {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close-flat);
   }
 
--- a/calendar/base/themes/windows/today-pane.css
+++ b/calendar/base/themes/windows/today-pane.css
@@ -1,17 +1,15 @@
 /* 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/. */
 
 @import url(chrome://calendar-common/skin/today-pane.css);
 
-@media (-moz-os-version: windows-xp),
-       (-moz-os-version: windows-vista),
-       (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
   #today-pane-panel:-moz-lwtheme {
     box-shadow: 0 1px 0 rgba(253, 253, 253, 0.45) inset;
   }
 }
 
 #today-pane-panel:-moz-lwtheme > sidebarheader {
   background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0) 19px);
 }
@@ -74,75 +72,55 @@
 .today-closebutton:not([selected]):not(:hover):-moz-lwtheme-brighttext {
   list-style-image: url("chrome://global/skin/icons/close-inverted.png");
 }
 
 .today-closebutton > .toolbarbutton-icon {
   margin-inline-end: 0px; /* override toolkit's default value */
 }
 
-@media (-moz-os-version: windows-xp) {
-  #today-pane-panel {
-    border-left: 1px solid ThreeDShadow;
-  }
+#today-none-box {
+  border-top: 1px solid ThreeDShadow;
+}
 
-  .today-pane-cycler {
-    padding-inline-end: 0;
-  }
+.today-pane-cycler {
+  padding-inline-start: 5px;
+  padding-inline-end: 5px;
+}
 
-  #todaypane-new-event-button {
-    list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-    -moz-image-region: rect(0px 16px 16px 0px);
-  }
-  #todaypane-new-event-button[disabled="true"] {
-    -moz-image-region: rect(32px 16px 48px 0px);
-  }
+#todaypane-new-event-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  #today-none-box {
-    border-top: 1px solid ThreeDShadow;
-  }
+#todaypane-new-event-button[disabled="true"] > .toolbarbutton-icon {
+  opacity: 0.4;
+}
 
-  .today-pane-cycler {
-    padding-inline-start: 5px;
-    padding-inline-end: 5px;
+#todaypane-new-event-button > .toolbarbutton-icon {
+  width: 18px;
+  height: 18px;
+  margin: -1px;
+}
+
+@media (-moz-windows-default-theme) {
+  #today-pane-panel > sidebarheader {
+    -moz-appearance: none;
+    background-color: #f8f8f8;
+    border-bottom: none;
   }
 
-  #todaypane-new-event-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
-  }
-
-  #todaypane-new-event-button[disabled="true"] > .toolbarbutton-icon {
-    opacity: 0.4;
-  }
-
-  #todaypane-new-event-button > .toolbarbutton-icon {
-    width: 18px;
-    height: 18px;
-    margin: -1px;
+  #today-pane-panel:-moz-lwtheme > sidebarheader {
+    background-color: rgba(255, 255, 255, 0.3);
+    background-image: linear-gradient(rgba(255, 255, 255, 0.5),
+                      rgba(255, 255, 255, 0) 28px);
+    border-top: 1px solid rgba(253, 253, 253, 0.45);
   }
 
-  @media (-moz-windows-default-theme) {
-    #today-pane-panel > sidebarheader {
-      -moz-appearance: none;
-      background-color: #f8f8f8;
-      border-bottom: none;
-    }
-
-    #today-pane-panel:-moz-lwtheme > sidebarheader {
-      background-color: rgba(255, 255, 255, 0.3);
-      background-image: linear-gradient(rgba(255, 255, 255, 0.5),
-                        rgba(255, 255, 255, 0) 28px);
-      border-top: 1px solid rgba(253, 253, 253, 0.45);
-    }
-
-    sidebarheader > spacer {
-      min-height: 25px;
-    }
+  sidebarheader > spacer {
+    min-height: 25px;
   }
 }
 
 @media all and (-moz-windows-compositor) {
   @media not all and (-moz-os-version: windows-win10) {
     #messengerWindow[sizemode=normal] #today-pane-panel {
       border-inline-end: 1px solid rgba(10%, 10%, 10%, .4);
       border-bottom: 1px solid rgba(10%, 10%, 10%, .4);
@@ -167,14 +145,14 @@
     -moz-image-region: rect(0 40px 20px 20px);
   }
 
   .today-closebutton:hover:active {
     -moz-image-region: rect(0 60px 20px 40px);
   }
 }
 
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+@media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
+       (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   #todaypane-new-event-button {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent-flat);
   }
 }
--- a/calendar/base/themes/windows/widgets/calendar-widgets.css
+++ b/calendar/base/themes/windows/widgets/calendar-widgets.css
@@ -12,40 +12,38 @@ treenode-checkbox > .checkbox-check {
   height: 9px;
   background-image: url(chrome://global/skin/tree/twisty.svg#clsd);
 }
 
 treenode-checkbox[checked="true"] > .checkbox-check {
   background-image: url(chrome://global/skin/tree/twisty.svg#open);
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  treenode-checkbox:hover > .checkbox-check {
-    background-image: url(chrome://global/skin/tree/twisty.svg#clsd-hover);
-  }
+treenode-checkbox:hover > .checkbox-check {
+  background-image: url(chrome://global/skin/tree/twisty.svg#clsd-hover);
+}
 
-  treenode-checkbox[checked="true"]:hover > .checkbox-check {
-    background-image: url(chrome://global/skin/tree/twisty.svg#open-hover);
-  }
+treenode-checkbox[checked="true"]:hover > .checkbox-check {
+  background-image: url(chrome://global/skin/tree/twisty.svg#open-hover);
+}
 
-  treenode-checkbox:-moz-locale-dir(rtl) > .checkbox-check {
-    background-image: url(chrome://global/skin/tree/twisty.svg#clsd-rtl);
-  }
-
-  treenode-checkbox[checked="true"]:-moz-locale-dir(rtl) > .checkbox-check {
-    background-image: url(chrome://global/skin/tree/twisty.svg#open-rtl);
-  }
+treenode-checkbox:-moz-locale-dir(rtl) > .checkbox-check {
+  background-image: url(chrome://global/skin/tree/twisty.svg#clsd-rtl);
+}
 
-  treenode-checkbox:-moz-locale-dir(rtl):hover > .checkbox-check {
-    background-image: url(chrome://global/skin/tree/twisty.svg#clsd-hover-rtl);
-  }
+treenode-checkbox[checked="true"]:-moz-locale-dir(rtl) > .checkbox-check {
+  background-image: url(chrome://global/skin/tree/twisty.svg#open-rtl);
+}
 
-  treenode-checkbox[checked="true"]:-moz-locale-dir(rtl):hover > .checkbox-check {
-    background-image: url(chrome://global/skin/tree/twisty.svg#open-hover-rtl);
-  }
+treenode-checkbox:-moz-locale-dir(rtl):hover > .checkbox-check {
+  background-image: url(chrome://global/skin/tree/twisty.svg#clsd-hover-rtl);
+}
+
+treenode-checkbox[checked="true"]:-moz-locale-dir(rtl):hover > .checkbox-check {
+  background-image: url(chrome://global/skin/tree/twisty.svg#open-hover-rtl);
 }
 
 #task-tree-filtergroup {
   padding-inline-start: 12px;
 }
 
 calendar-list-tree .tree-scrollable-columns {
   padding-inline-start: 18px;
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -92,23 +92,20 @@ lightning.jar:
     ../skin/osx/lightning/expand@2x.png                       (themes/osx/expand@2x.png)
     ../skin/osx/lightning/lightning.css                       (themes/osx/lightning.css)
     ../skin/osx/lightning/lightning-toolbar.css               (themes/osx/lightning-toolbar.css)
     ../skin/osx/lightning/lightning-widgets.css               (themes/osx/lightning-widgets.css)
 
 # Windows theme files
     ../skin/windows/lightning/accountCentral.css              (themes/windows/accountCentral.css)
     ../skin/windows/lightning/imip.css                        (themes/windows/imip.css)
-    ../skin/windows/lightning/imip.png                        (themes/windows/imip.png)
     ../skin/windows/lightning/lightning.css                   (themes/windows/lightning.css)
     ../skin/windows/lightning/lightning-toolbar.css           (themes/windows/lightning-toolbar.css)
     ../skin/windows/lightning/lightning-widgets.css           (themes/windows/lightning-widgets.css)
-    ../skin/windows/lightning/imip-aero.png                   (themes/windows/images/imip-aero.png)
     ../skin/windows/lightning/mode-switch-icons-aero.png      (themes/windows/images/mode-switch-icons-aero.png)
-    ../skin/windows/lightning/mode-switch-icons-inverted.png  (themes/windows/images/mode-switch-icons-inverted.png)
 
 
 calendar.jar:
     content/calendar/calendarCreation.xul                  (/calendar/resources/content/calendarCreation.xul)
     content/calendar/calendarCreation.js                   (/calendar/resources/content/calendarCreation.js)
     content/calendar/datetimepickers/datetimepickers.css   (/calendar/resources/content/datetimepickers/datetimepickers.css)
     content/calendar/datetimepickers/datetimepickers.xml   (/calendar/resources/content/datetimepickers/datetimepickers.xml)
     content/calendar/mouseoverPreviews.js                  (/calendar/resources/content/mouseoverPreviews.js)
--- a/calendar/lightning/themes/common/lightning.css
+++ b/calendar/lightning/themes/common/lightning.css
@@ -22,18 +22,16 @@
 #calendar-status-todaypane-button[hideLabel] > .toolbarbutton-icon-end {
   display: none;
 }
 
 .imipMoreButton > .toolbarbutton-icon {
   display: none;
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  #task-tab-button .toolbarbutton-icon,
-  #calendar-tab-button .toolbarbutton-icon,
-  .calbar-toolbarbutton-1 .toolbarbutton-icon,
-  toolbarpaletteitem > .msgHeaderView-button .toolbarbutton-icon,
-  #task-actions-toolbar > .msgHeaderView-button .toolbarbutton-icon {
-    width: 18px;
-    height: 18px;
-  }
+#task-tab-button .toolbarbutton-icon,
+#calendar-tab-button .toolbarbutton-icon,
+.calbar-toolbarbutton-1 .toolbarbutton-icon,
+toolbarpaletteitem > .msgHeaderView-button .toolbarbutton-icon,
+#task-actions-toolbar > .msgHeaderView-button .toolbarbutton-icon {
+  width: 18px;
+  height: 18px;
 }
--- a/calendar/lightning/themes/windows/lightning-toolbar.css
+++ b/calendar/lightning/themes/windows/lightning-toolbar.css
@@ -8,363 +8,118 @@
 }
 
 @media (-moz-windows-glass) {
   #calendar-toolbox:not(:-moz-lwtheme) {
     border-bottom-color: #AABCCF;
   }
 }
 
-@media (-moz-os-version: windows-xp) {
-  #lightning-button-calendar {
-      list-style-image: url(chrome://lightning-common/skin/mode-switch-icons.png);
-      -moz-image-region: rect(0px 24px 24px 0px);
-  }
-
-  #lightning-button-calendar[disabled] {
-      -moz-image-region: rect(48px 24px 72px 0px);
-  }
-  toolbar[iconsize="small"] #lightning-button-calendar {
-      -moz-image-region: rect(0px 64px 16px 48px);
-  }
-
-  toolbar[iconsize="small"] #lightning-button-calendar[disabled] {
-      -moz-image-region: rect(32px 64px 48px 48px);
-  }
-
-  /* Lightning "Tasks" Toolbarbutton */
-  #lightning-button-tasks {
-      list-style-image: url(chrome://lightning-common/skin/mode-switch-icons.png);
-      -moz-image-region: rect(0px 48px 24px 24px);
-  }
-
-  #lightning-button-tasks[disabled] {
-      -moz-image-region: rect(48px 48px 72px 24px);
-  }
+#lightning-button-calendar {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
+}
 
-  toolbar[iconsize="small"] #lightning-button-tasks {
-      -moz-image-region: rect(0px 80px 16px 64px);
-  }
-  toolbar[iconsize="small"] #lightning-button-tasks[disabled] {
-      -moz-image-region: rect(32px 80px 48px 64px);
-  }
-
-  /* Toolbar buttons */
-
-  .calbar-toolbarbutton-1 {
-    list-style-image: url(chrome://calendar/skin/toolbar-large.png);
-  }
-
-  toolbar[iconsize="small"] .calbar-toolbarbutton-1 {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-  }
-
-  #calendar-synchronize-button,
-  #task-synchronize-button {
-    -moz-image-region: rect(0px 648px 24px 624px);
-  }
-
-  #calendar-synchronize-button[disabled],
-  #task-synchronize-button[disabled] {
-    -moz-image-region: rect(48px 648px 72px 624px);
-  }
-
-  toolbar[iconsize="small"] #calendar-synchronize-button,
-  toolbar[iconsize="small"] #task-synchronize-button {
-    -moz-image-region: rect(0px 432px 16px 416px);
-  }
+#lightning-button-tasks {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
+}
 
-  toolbar[iconsize="small"] #calendar-synchronize-button[disabled],
-  toolbar[iconsize="small"] #task-synchronize-button[disabled] {
-    -moz-image-region: rect(32px 432px 48px 416px);
-  }
-
-  #calendar-newevent-button,
-  #task-newevent-button {
-    -moz-image-region: rect(0px 24px 24px 0px);
-  }
-
-  #calendar-newevent-button[disabled],
-  #task-newevent-button[disabled] {
-    -moz-image-region: rect(48px 24px 72px 0px);
-  }
-
-  toolbar[iconsize="small"] #calendar-newevent-button,
-  toolbar[iconsize="small"] #task-newevent-button {
-    -moz-image-region: rect(0px 16px 16px 0px);
-  }
-
-  toolbar[iconsize="small"] #calendar-newevent-button[disabled],
-  toolbar[iconsize="small"] #task-newevent-button[disabled] {
-    -moz-image-region: rect(32px 16px 48px 0px);
-  }
-
-  #calendar-newtask-button,
-  #task-newtask-button {
-    -moz-image-region: rect(0px 384px 24px 360px);
-  }
+#calendar-synchronize-button,
+#task-synchronize-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize);
+}
 
-  #calendar-newtask-button[disabled],
-  #task-newtask-button[disabled] {
-    -moz-image-region: rect(48px 384px 72px 360px);
-  }
-
-  toolbar[iconsize="small"] #calendar-newtask-button,
-  toolbar[iconsize="small"] #task-newtask-button {
-    -moz-image-region: rect(0px 256px 16px 240px);
-  }
-
-  toolbar[iconsize="small"] #calendar-newtask-button[disabled],
-  toolbar[iconsize="small"] #task-newtask-button[disabled] {
-    -moz-image-region: rect(32px 256px 48px 240px);
-  }
-
-  #calendar-edit-button,
-  #task-edit-button {
-    -moz-image-region: rect(0px 48px 24px 24px);
-  }
-
-  #calendar-edit-button[disabled],
-  #task-edit-button[disabled] {
-    -moz-image-region: rect(48px 48px 72px 24px);
-  }
-
-  toolbar[iconsize="small"] #calendar-edit-button,
-  toolbar[iconsize="small"] #task-edit-button {
-    -moz-image-region: rect(0px 32px 16px 16px);
-  }
+#extractEventButton,
+#task-newevent-button,
+#hdrExtractEventButton,
+#calendar-newevent-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
+}
 
-  toolbar[iconsize="small"] #calendar-edit-button[disabled],
-  toolbar[iconsize="small"] #task-edit-button[disabled] {
-    -moz-image-region: rect(32px 32px 48px 16px);
-  }
-
-  #calendar-delete-button,
-  #task-delete-button {
-    -moz-image-region: rect(0px 72px 24px 48px);
-  }
-
-  #calendar-delete-button[disabled],
-  #task-delete-button[disabled] {
-    -moz-image-region: rect(48px 72px 72px 48px);
-  }
-
-  toolbar[iconsize="small"] #calendar-delete-button,
-  toolbar[iconsize="small"] #task-delete-button {
-    -moz-image-region: rect(0px 48px 16px 32px);
-  }
-
-  toolbar[iconsize="small"] #calendar-delete-button[disabled],
-  toolbar[iconsize="small"] #task-delete-button[disabled] {
-    -moz-image-region: rect(32px 48px 48px 32px);
-  }
-
-  #calendar-goto-today-button {
-    -moz-image-region: rect(0px 408px 24px 384px);
-  }
+#extractTaskButton,
+#task-newtask-button,
+#hdrExtractTaskButton,
+#calendar-newtask-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask);
+}
 
-  #calendar-goto-today-button[disabled] {
-    -moz-image-region: rect(48px 408px 72px 384px);
-  }
-
-  toolbar[iconsize="small"] #calendar-goto-today-button {
-    -moz-image-region: rect(0px 272px 16px 256px);
-  }
-
-  toolbar[iconsize="small"] #calendar-goto-today-button[disabled] {
-    -moz-image-region: rect(32px 272px 48px 256px);
-  }
-
-  #calendar-print-button,
-  #task-print-button {
-    -moz-image-region: rect(0px 360px 24px 336px);
-  }
-
-  #calendar-print-button[disabled],
-  #task-print-button[disabled] {
-    -moz-image-region: rect(48px 360px 72px 336px);
-  }
-
-  toolbar[iconsize="small"] #calendar-print-button,
-  toolbar[iconsize="small"] #task-print-button {
-    -moz-image-region: rect(0px 240px 16px 224px);
-  }
-
-  toolbar[iconsize="small"] #calendar-print-button[disabled],
-  toolbar[iconsize="small"] #task-print-button[disabled] {
-    -moz-image-region: rect(32px 240px 48px 224px);
-  }
+#calendar-edit-button,
+#task-edit-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#edit);
+}
 
-  #calendar-unifinder-button {
-    -moz-image-region: rect(0px 528px 24px 504px);
-  }
-
-  #calendar-unifinder-button[disabled] {
-    -moz-image-region: rect(48px 528px 72px 504px);
-  }
-
-  toolbar[iconsize="small"] #calendar-unifinder-button {
-    -moz-image-region: rect(0px 352px 16px 336px);
-  }
-
-  toolbar[iconsize="small"] #calendar-unifinder-button[disabled] {
-    -moz-image-region: rect(32px 352px 48px 336px);
-  }
-
-  #hdrExtractEventButton {
-    list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-    -moz-image-region: rect(0px, 16px, 16px, 0px);
-  }
-
-  #hdrExtractTaskButton {
-    list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-    -moz-image-region: rect(0px, 256px, 16px, 240px);
-  }
-
-  #extractEventButton {
-    list-style-image: url("chrome://calendar/skin/toolbar-large.png");
-    -moz-image-region: rect(0px, 24px, 24px, 0px);
-  }
+#calendar-delete-button,
+#task-delete-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
+}
 
-  #extractTaskButton {
-    list-style-image: url("chrome://calendar/skin/toolbar-large.png");
-    -moz-image-region: rect(0px, 384px, 24px, 360px);
-  }
-
-  #extractEventButton[disabled] {
-    -moz-image-region: rect(48px, 24px, 72px, 0px);
-  }
-
-  #extractTaskButton[disabled] {
-    -moz-image-region: rect(48px, 384px, 72px, 360px);
-  }
+#calendar-goto-today-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#today);
+}
 
-  toolbar[iconsize="small"] #extractEventButton {
-    list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-    -moz-image-region: rect(0px, 16px, 16px, 0px);
-  }
+#calendar-print-button,
+#task-print-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#print);
+}
 
-  toolbar[iconsize="small"] #extractTaskButton {
-    list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-    -moz-image-region: rect(0px, 256px, 16px, 240px);
-  }
-
-  toolbar[iconsize="small"] #extractEventButton[disabled] {
-    -moz-image-region: rect(32px, 16px, 48px, 0px);
-  }
-
-  toolbar[iconsize="small"] #extractTaskButton[disabled] {
-    -moz-image-region: rect(32px, 256px, 48px, 240px);
-  }
+#calendar-unifinder-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find);
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  #lightning-button-calendar {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
-  }
-
-  #lightning-button-tasks {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
-  }
-
-  #calendar-synchronize-button,
-  #task-synchronize-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize);
-  }
-
-  #extractEventButton,
-  #task-newevent-button,
-  #hdrExtractEventButton,
-  #calendar-newevent-button {
-      list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
-  }
+toolbar[brighttext] #lightning-button-calendar {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-inverted);
+}
 
-  #extractTaskButton,
-  #task-newtask-button,
-  #hdrExtractTaskButton,
-  #calendar-newtask-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask);
-  }
-
-  #calendar-edit-button,
-  #task-edit-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#edit);
-  }
-
-  #calendar-delete-button,
-  #task-delete-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
-  }
-
-  #calendar-goto-today-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#today);
-  }
-
-  #calendar-print-button,
-  #task-print-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#print);
-  }
+toolbar[brighttext] #lightning-button-tasks {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-inverted);
+}
 
-  #calendar-unifinder-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find);
-  }
-
-  toolbar[brighttext] #lightning-button-calendar {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-inverted);
-  }
-
-  toolbar[brighttext] #lightning-button-tasks {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-inverted);
-  }
-
-  toolbar[brighttext] #calendar-synchronize-button,
-  toolbar[brighttext] #task-synchronize-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize-inverted);
-  }
-
-  toolbar[brighttext] #extractEventButton,
-  toolbar[brighttext] #task-newevent-button,
-  toolbar[brighttext] #hdrExtractEventButton,
-  toolbar[brighttext] #calendar-newevent-button {
-      list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent-inverted);
-  }
+toolbar[brighttext] #calendar-synchronize-button,
+toolbar[brighttext] #task-synchronize-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize-inverted);
+}
 
-  toolbar[brighttext] #extractTaskButton,
-  toolbar[brighttext] #task-newtask-button,
-  toolbar[brighttext] #hdrExtractTaskButton,
-  toolbar[brighttext] #calendar-newtask-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask-inverted);
-  }
-
-  toolbar[brighttext] #calendar-edit-button,
-  toolbar[brighttext] #task-edit-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#edit-inverted);
-  }
-
-  toolbar[brighttext] #calendar-delete-button,
-  toolbar[brighttext] #task-delete-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete-inverted);
-  }
-
-  toolbar[brighttext] #calendar-goto-today-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#today-inverted);
-  }
-
-  toolbar[brighttext] #calendar-print-button,
-  toolbar[brighttext] #task-print-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#print-inverted);
-  }
-
-  toolbar[brighttext] #calendar-unifinder-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find-inverted);
-  }
+toolbar[brighttext] #extractEventButton,
+toolbar[brighttext] #task-newevent-button,
+toolbar[brighttext] #hdrExtractEventButton,
+toolbar[brighttext] #calendar-newevent-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent-inverted);
 }
 
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+toolbar[brighttext] #extractTaskButton,
+toolbar[brighttext] #task-newtask-button,
+toolbar[brighttext] #hdrExtractTaskButton,
+toolbar[brighttext] #calendar-newtask-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask-inverted);
+}
+
+toolbar[brighttext] #calendar-edit-button,
+toolbar[brighttext] #task-edit-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#edit-inverted);
+}
+
+toolbar[brighttext] #calendar-delete-button,
+toolbar[brighttext] #task-delete-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete-inverted);
+}
+
+toolbar[brighttext] #calendar-goto-today-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#today-inverted);
+}
+
+toolbar[brighttext] #calendar-print-button,
+toolbar[brighttext] #task-print-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#print-inverted);
+}
+
+toolbar[brighttext] #calendar-unifinder-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find-inverted);
+}
+
+@media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
+       (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   #lightning-button-calendar {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-flat);
   }
 
   #lightning-button-tasks {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-flat);
   }
 
--- a/calendar/lightning/themes/windows/lightning.css
+++ b/calendar/lightning/themes/windows/lightning.css
@@ -66,282 +66,168 @@ radio[pane=paneLightning] {
 }
 
 /* shift the today pane button label up by one pixel to center it */
 #calendar-status-todaypane-button > .toolbarbutton-text {
   margin: 0 0 1px !important;
 }
 
 #calMinimonthBox {
-    margin-top: 3px;
+  margin-top: 3px;
+}
+
+#calendar-tab-button,
+#newMsgButton-calendar-menuitem {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
+  -moz-image-region: auto;
+}
+
+#task-tab-button,
+#newMsgButton-task-menuitem {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
+  -moz-image-region: auto;
 }
 
-@media (-moz-os-version: windows-xp) {
-  #calsidebar_splitter {
-      border-right: none;
-  }
-
-  #today-splitter {
-      border-right: none;
-  }
-
-  #today-splitter:-moz-lwtheme {
-      background-image: linear-gradient(rgba(255, 255, 255, 0.5),
-                        rgba(255, 255, 255, 0) 19px, rgba(255, 255, 255, 0) 25px,
-                        ThreeDDarkShadow 25px, -moz-Dialog 26px);
-  }
-
-  #newMsgButton-mail-menuitem {
-    list-style-image: url(chrome://messenger/skin/icons/mail-toolbar-small.png);
-    -moz-image-region: rect(0 32px 16px 16px);
-  }
-
-  #newMsgButton-calendar-menuitem {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0 16px 16px 0);
-  }
-
-  #newMsgButton-task-menuitem {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0 256px 16px 240px);
-  }
-
-  #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0 336px 16px 320px);
-  }
-
-  /* ::: new tab buttons ::: */
-  #calendar-tab-button {
-    list-style-image: url(chrome://lightning-common/skin/mode-switch-icons.png);
-    -moz-image-region: rect(0 64px 16px 48px);
-  }
-
-  #calendar-tab-button[disabled] {
-    -moz-image-region: rect(32px 64px 48px 48px);
-  }
-
-  #task-tab-button {
-    list-style-image: url(chrome://lightning-common/skin/mode-switch-icons.png);
-    -moz-image-region: rect(0 80px 16px 64px);
-  }
-
-  #task-tab-button[disabled] {
-    -moz-image-region: rect(32px 80px 48px 64px);
-  }
+#newMsgButton-mail-menuitem {
+  list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.svg#newmsg);
+}
 
-  /* ::: tab icons ::: */
-  .icon-holder[type="calendar"],
-  .tabmail-tab[type="calendar"] {
-    list-style-image: url(chrome://lightning-common/skin/mode-switch-icons.png);
-    -moz-image-region: rect(0 64px 16px 48px);
-  }
-
-  .icon-holder[type="tasks"],
-  .tabmail-tab[type="tasks"] {
-    list-style-image: url(chrome://lightning-common/skin/mode-switch-icons.png);
-    -moz-image-region: rect(0 80px 16px 64px);
-  }
-
-  /* ::: imip button icons ::: */
-  .imipAcceptButton,
-  .imipAcceptRecurrencesButton {
-    list-style-image: url(chrome://lightning/skin/imip.png);
-    -moz-image-region: rect(0 16px 16px 0);
-  }
-
-  .imipDeclineButton,
-  .imipDeclineRecurrencesButton {
-    list-style-image: url(chrome://lightning/skin/imip.png);
-    -moz-image-region: rect(0 32px 16px 16px);
-  }
-
-  .imipTentativeButton,
-  .imipTentativeRecurrencesButton {
-    list-style-image: url(chrome://lightning/skin/imip.png);
-    -moz-image-region: rect(0 48px 16px 32px);
-  }
-
-  .imipAddButton {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0 16px 16px 0);
-  }
-
-  .imipUpdateButton {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0 432px 16px 416px);
-  }
-
-  .imipDetailsButton {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0 352px 16px 336px);
-  }
-
-  .imipDeleteButton {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0 48px 16px 32px);
-  }
-
-  .imipReconfirmButton {
-    list-style-image: url(chrome://calendar/skin/tasks-actions.png);
-    -moz-image-region: rect(0 48px 16px 32px);
-  }
+#tabs-toolbar[brighttext] #calendar-tab-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-inverted);
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  #calendar-tab-button,
-  #newMsgButton-calendar-menuitem {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
-    -moz-image-region: auto;
-  }
-
-  #task-tab-button,
-  #newMsgButton-task-menuitem {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
-    -moz-image-region: auto;
-  }
+#tabs-toolbar[brighttext] #task-tab-button {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-inverted);
+}
 
-  #newMsgButton-mail-menuitem {
-    list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.svg#newmsg);
-  }
-
-  #tabs-toolbar[brighttext] #calendar-tab-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-inverted);
-  }
-
-  #tabs-toolbar[brighttext] #task-tab-button {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab-inverted);
-  }
-
-  #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane);
-    -moz-image-region: rect(0 18px 18px 0);
-  }
+#calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane);
+  -moz-image-region: rect(0 18px 18px 0);
+}
 
 #calendar-status-todaypane-button:-moz-lwtheme-brighttext > stack >
   .toolbarbutton-icon-begin {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#pane-inverted);
-  }
-  /* compensate the 18px icon height */
-  #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
-    margin-top: -1px;
-    margin-bottom: -1px;
-  }
-
-  .icon-holder[type="calendar"],
-  .tabmail-tab[type="calendar"] {
-    list-style-image: url(chrome://lightning/skin/mode-switch-icons-aero.png);
-    -moz-image-region: rect(16px 16px 32px 0);
-  }
-
-  .icon-holder[type="tasks"],
-  .tabmail-tab[type="tasks"] {
-    list-style-image: url(chrome://lightning/skin/mode-switch-icons-aero.png);
-    -moz-image-region: rect(16px 32px 32px 16px);
-  }
-
-  /* ::: imip button icons ::: */
-  .imipAcceptButton,
-  .imipAcceptRecurrencesButton {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete);
-  }
+}
+/* compensate the 18px icon height */
+#calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
 
-  .imipDeclineCounterButton,
-  .imipDeclineButton,
-  .imipDeclineRecurrencesButton {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#decline);
-  }
-
-  .imipTentativeButton,
-  .imipTentativeRecurrencesButton {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#tentative);
-  }
-
-  .imipAddButton {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
-  }
+.icon-holder[type="calendar"],
+.tabmail-tab[type="calendar"] {
+  list-style-image: url(chrome://lightning/skin/mode-switch-icons-aero.png);
+  -moz-image-region: rect(16px 16px 32px 0);
+}
 
-  .imipRescheduleButton,
-  .imipUpdateButton {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize);
-  }
+.icon-holder[type="tasks"],
+.tabmail-tab[type="tasks"] {
+  list-style-image: url(chrome://lightning/skin/mode-switch-icons-aero.png);
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
 
-  .imipDetailsButton {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find);
-  }
-
-  .imipDeleteButton {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
-  }
-
-  .imipReconfirmButton {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
-  }
+/* ::: imip button icons ::: */
+.imipAcceptButton,
+.imipAcceptRecurrencesButton {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#complete);
+}
 
-  #newMsgButton-mail-menuitem > .menu-iconic-left > .menu-iconic-icon,
-  #newMsgButton-calendar-menuitem > .menu-iconic-left > .menu-iconic-icon,
-  #newMsgButton-task-menuitem > .menu-iconic-left > .menu-iconic-icon {
-    width: 18px;
-    height: 18px;
-    margin: -1px;
-  }
+.imipDeclineCounterButton,
+.imipDeclineButton,
+.imipDeclineRecurrencesButton {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#decline);
+}
 
-  #calsidebar_splitter,
-  #today-splitter {
-    border: none;
-    min-width: 0;
-    width: 5px;
-    background-color: transparent;
-    margin-top: 0;
-    position: relative;
-    z-index: 10;
-    transition: border-width .3s ease-in;
-  }
+.imipTentativeButton,
+.imipTentativeRecurrencesButton {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#tentative);
+}
 
-  #calsidebar_splitter {
-    border-inline-start: 1px solid #a9b7c9;
-    margin-inline-end: -5px;
-  }
-
-  #calsidebar_splitter[state="collapsed"] {
-    border-inline-start: 1px solid transparent;
-  }
+.imipAddButton {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newevent);
+}
 
-  #calsidebar_splitter[state="collapsed"]:hover {
-    border-inline-start: 4px solid highlight;
-  }
-
-  #today-splitter {
-    border-inline-end: 1px solid #a9b7c9;
-    margin-inline-start: -5px;
-    position: relative;
-  }
-
-  #today-splitter.calendar-sidebar-splitter:-moz-lwtheme {
-    background-image: none;
-  }
+.imipRescheduleButton,
+.imipUpdateButton {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#synchronize);
+}
 
-  #today-splitter > grippy {
-    display: none;
-  }
+.imipDetailsButton {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#find);
+}
 
-  #today-pane-splitter {
-    border: none;
-    border-bottom: 3px double #a9b7c9;
-    min-height: 0;
-    height: 5px;
-    background-color: transparent;
-    margin-top: -3px;
-    position: relative;
-    z-index: 10;
-  }
+.imipDeleteButton {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#delete);
+}
+
+.imipReconfirmButton {
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#priority);
 }
 
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+#newMsgButton-mail-menuitem > .menu-iconic-left > .menu-iconic-icon,
+#newMsgButton-calendar-menuitem > .menu-iconic-left > .menu-iconic-icon,
+#newMsgButton-task-menuitem > .menu-iconic-left > .menu-iconic-icon {
+  width: 18px;
+  height: 18px;
+  margin: -1px;
+}
+
+#calsidebar_splitter,
+#today-splitter {
+  border: none;
+  min-width: 0;
+  width: 5px;
+  background-color: transparent;
+  margin-top: 0;
+  position: relative;
+  z-index: 10;
+  transition: border-width .3s ease-in;
+}
+
+#calsidebar_splitter {
+  border-inline-start: 1px solid #a9b7c9;
+  margin-inline-end: -5px;
+}
+
+#calsidebar_splitter[state="collapsed"] {
+  border-inline-start: 1px solid transparent;
+}
+
+#calsidebar_splitter[state="collapsed"]:hover {
+  border-inline-start: 4px solid highlight;
+}
+
+#today-splitter {
+  border-inline-end: 1px solid #a9b7c9;
+  margin-inline-start: -5px;
+  position: relative;
+}
+
+#today-splitter.calendar-sidebar-splitter:-moz-lwtheme {
+  background-image: none;
+}
+
+#today-splitter > grippy {
+  display: none;
+}
+
+#today-pane-splitter {
+  border: none;
+  border-bottom: 3px double #a9b7c9;
+  min-height: 0;
+  height: 5px;
+  background-color: transparent;
+  margin-top: -3px;
+  position: relative;
+  z-index: 10;
+}
+
+@media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
+       (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   #calendar-tab-button,
   #newMsgButton-calendar-menuitem {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab-flat);
     -moz-image-region: auto;
   }
 
   #task-tab-button,
   #newMsgButton-task-menuitem {