diff --git a/calendar/base/jar.mn b/calendar/base/jar.mn
index d8361c2a6b..3e069ad64c 100644
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -116,12 +116,14 @@ calendar.jar:
     ../skin/common/attendee-icons.png                 (themes/common/images/attendee-icons.png)
     ../skin/common/calendar-overlay.png               (themes/common/images/calendar-overlay.png)
     ../skin/common/calendar-status.png                (themes/common/images/calendar-status.png)
+    ../skin/common/checkbox-images.png                (themes/common/images/checkbox-images.png)
     ../skin/common/classification.png                 (themes/common/images/classification.png)
     ../skin/common/day-box-item-image.png             (themes/common/images/day-box-item-image.png)
     ../skin/common/event-grippy-bottom.png            (themes/common/images/event-grippy-bottom.png)
     ../skin/common/event-grippy-left.png              (themes/common/images/event-grippy-left.png)
     ../skin/common/event-grippy-right.png             (themes/common/images/event-grippy-right.png)
     ../skin/common/event-grippy-top.png               (themes/common/images/event-grippy-top.png)
+    ../skin/common/ok-cancel.png                      (themes/common/images/ok-cancel.png)
     ../skin/common/task-images.png                    (themes/common/images/task-images.png)
     ../skin/common/timezone_map.png                   (themes/common/images/timezone_map.png)
     ../skin/common/timezones.png                      (themes/common/images/timezones.png)
@@ -154,6 +156,9 @@ calendar.jar:
     ../skin/common/dialogs/calendar-alarm-dialog.css  (themes/common/dialogs/calendar-alarm-dialog.css)
     ../skin/common/dialogs/calendar-event-dialog.css  (themes/common/dialogs/calendar-event-dialog.css)
     ../skin/common/dialogs/calendar-invitations-dialog.css (themes/common/dialogs/calendar-invitations-dialog.css)
+    ../skin/common/calendar-event-dialog-attendees.png     (themes/common/dialogs/images/calendar-event-dialog-attendees.png)
+    ../skin/common/calendar-invitations-dialog-button-images.png (themes/common/dialogs/images/calendar-invitations-dialog-button-images.png)
+    ../skin/common/calendar-invitations-dialog-list-images.png   (themes/common/dialogs/images/calendar-invitations-dialog-list-images.png)
     ../skin/common/calendar-properties-dialog.css     (themes/common/dialogs/calendar-properties-dialog.css)
     ../skin/common/calendar-subscriptions-dialog.css  (themes/common/dialogs/calendar-subscriptions-dialog.css)
     ../skin/common/calendar-timezone-highlighter.css  (themes/common/dialogs/calendar-timezone-highlighter.css)
@@ -166,22 +171,15 @@ calendar.jar:
     ../skin/linux/calendar/calendar-alarm-dialog.css                      (themes/linux/dialogs/calendar-alarm-dialog.css)
     ../skin/linux/calendar/calendar-daypicker.css                         (themes/linux/calendar-daypicker.css)
     ../skin/linux/calendar/calendar-event-dialog.css                      (themes/linux/dialogs/calendar-event-dialog.css)
-    ../skin/linux/calendar/calendar-event-dialog-attendees.png            (themes/linux/dialogs/images/calendar-event-dialog-attendees.png)
     ../skin/linux/calendar/calendar-invitations-dialog.css                (themes/linux/dialogs/calendar-invitations-dialog.css)
-    ../skin/linux/calendar/calendar-invitations-dialog-button-images.png  (themes/linux/dialogs/images/calendar-invitations-dialog-button-images.png)
-    ../skin/linux/calendar/calendar-invitations-dialog-list-images.png    (themes/linux/dialogs/images/calendar-invitations-dialog-list-images.png)
     ../skin/linux/calendar/calendar-management.css                        (themes/linux/calendar-management.css)
     ../skin/linux/calendar/calendar-task-tree.css                         (themes/linux/calendar-task-tree.css)
     ../skin/linux/calendar/calendar-task-view.css                         (themes/linux/calendar-task-view.css)
     ../skin/linux/calendar/calendar-unifinder.css                         (themes/linux/calendar-unifinder.css)
     ../skin/linux/calendar/calendar-views.css                             (themes/linux/calendar-views.css)
-    ../skin/linux/calendar/checkbox-images.png                            (themes/linux/images/checkbox-images.png)
-    ../skin/linux/calendar/ok-cancel.png                                  (themes/linux/images/ok-cancel.png)
     ../skin/linux/calendar/today-pane.css                                 (themes/linux/today-pane.css)
     ../skin/linux/calendar/widgets/calendar-widgets.css                   (themes/linux/widgets/calendar-widgets.css)
     ../skin/linux/calendar/calendar-occurrence-prompt.png                 (themes/linux/images/calendar-occurrence-prompt.png)
-    ../skin/linux/calendar/calendar-event-dialog.png                      (themes/linux/icons/calendar-event-dialog.png)
-    ../skin/linux/calendar/calendar-task-dialog.png                       (themes/linux/icons/calendar-task-dialog.png)
 
 # OS X theme files
     ../skin/osx/calendar/cal-icon32.png                                 (themes/osx/images/cal-icon32.png)
@@ -189,17 +187,13 @@ calendar.jar:
     ../skin/osx/calendar/calendar-alarm-dialog.css                      (themes/osx/dialogs/calendar-alarm-dialog.css)
     ../skin/osx/calendar/calendar-daypicker.css                         (themes/osx/calendar-daypicker.css)
     ../skin/osx/calendar/calendar-event-dialog.css                      (themes/osx/dialogs/calendar-event-dialog.css)
-    ../skin/osx/calendar/calendar-event-dialog-attendees.png            (themes/osx/dialogs/images/calendar-event-dialog-attendees.png)
     ../skin/osx/calendar/calendar-invitations-dialog.css                (themes/osx/dialogs/calendar-invitations-dialog.css)
-    ../skin/osx/calendar/calendar-invitations-dialog-button-images.png  (themes/osx/dialogs/images/calendar-invitations-dialog-button-images.png)
-    ../skin/osx/calendar/calendar-invitations-dialog-list-images.png    (themes/osx/dialogs/images/calendar-invitations-dialog-list-images.png)
     ../skin/osx/calendar/calendar-management.css                        (themes/osx/calendar-management.css)
     ../skin/osx/calendar/calendar-task-tree.css                         (themes/osx/calendar-task-tree.css)
     ../skin/osx/calendar/calendar-task-view.css                         (themes/osx/calendar-task-view.css)
     ../skin/osx/calendar/calendar-unifinder.css                         (themes/osx/calendar-unifinder.css)
     ../skin/osx/calendar/calendar-views.css                             (themes/osx/calendar-views.css)
     ../skin/osx/calendar/checkbox-images.png                            (themes/osx/images/checkbox-images.png)
-    ../skin/osx/calendar/ok-cancel.png                                  (themes/osx/images/ok-cancel.png)
     ../skin/osx/calendar/today-pane.css                                 (themes/osx/today-pane.css)
     ../skin/osx/calendar/widgets/calendar-widgets.css                   (themes/osx/widgets/calendar-widgets.css)
     ../skin/osx/calendar/calendar-occurrence-prompt.png                 (themes/osx/images/calendar-occurrence-prompt.png)
@@ -214,17 +208,12 @@ calendar.jar:
     ../skin/windows/calendar/calendar-alarm-dialog.css                      (themes/windows/dialogs/calendar-alarm-dialog.css)
     ../skin/windows/calendar/calendar-daypicker.css                         (themes/windows/calendar-daypicker.css)
     ../skin/windows/calendar/calendar-event-dialog.css                      (themes/windows/dialogs/calendar-event-dialog.css)
-    ../skin/windows/calendar/calendar-event-dialog-attendees.png            (themes/windows/dialogs/images/calendar-event-dialog-attendees.png)
     ../skin/windows/calendar/calendar-invitations-dialog.css                (themes/windows/dialogs/calendar-invitations-dialog.css)
-    ../skin/windows/calendar/calendar-invitations-dialog-button-images.png  (themes/windows/dialogs/images/calendar-invitations-dialog-button-images.png)
-    ../skin/windows/calendar/calendar-invitations-dialog-list-images.png    (themes/windows/dialogs/images/calendar-invitations-dialog-list-images.png)
     ../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/checkbox-images.png                            (themes/windows/images/checkbox-images.png)
-    ../skin/windows/calendar/ok-cancel.png                                  (themes/windows/images/ok-cancel.png)
     ../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)
@@ -234,5 +223,3 @@ calendar.jar:
     ../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)
-    ../skin/windows/calendar/calendar-event-dialog.png                      (themes/windows/icons/calendar-event-dialog.png)
-    ../skin/windows/calendar/calendar-task-dialog.png                       (themes/windows/icons/calendar-task-dialog.png)
diff --git a/calendar/base/moz.build b/calendar/base/moz.build
index b7c797e710..3bb64b99db 100644
--- a/calendar/base/moz.build
+++ b/calendar/base/moz.build
@@ -21,7 +21,7 @@ else:
 
 # Window icons are not needed on mac
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
-    icon_path = 'themes/windows/icons/'
+    icon_path = 'themes/common/icons/'
     window_icons = [
         'calendar-alarm-dialog',
         'calendar-event-dialog',
diff --git a/calendar/base/themes/common/calendar-attendees.css b/calendar/base/themes/common/calendar-attendees.css
index bc2100a008..fc480f8d18 100644
--- a/calendar/base/themes/common/calendar-attendees.css
+++ b/calendar/base/themes/common/calendar-attendees.css
@@ -123,7 +123,7 @@
 
 .status-icon {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 48px 14px 36px);
 }
 
@@ -161,7 +161,7 @@
 
 .role-icon {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 159px 16px 138px);
 }
 
diff --git a/calendar/base/themes/common/calendar-management.css b/calendar/base/themes/common/calendar-management.css
index 0f242d5ea1..ccc82d6ef4 100644
--- a/calendar/base/themes/common/calendar-management.css
+++ b/calendar/base/themes/common/calendar-management.css
@@ -2,10 +2,6 @@
  * 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/. */
 
-calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
-}
-
 calendar-list-tree > tree > treechildren::-moz-tree-cell(color-treecol, color-default) {
     background-color: #a8c2e1;
 }
diff --git a/calendar/base/themes/common/dialogs/calendar-alarm-dialog.css b/calendar/base/themes/common/dialogs/calendar-alarm-dialog.css
index 6f244258f8..244ccb8524 100644
--- a/calendar/base/themes/common/dialogs/calendar-alarm-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-alarm-dialog.css
@@ -94,7 +94,7 @@ calendar-alarm-widget[selected="true"] .alarm-calendar-image {
 }
 
 .snooze-popup-button {
-    list-style-image: url(chrome://calendar/skin/ok-cancel.png);
+    list-style-image: url(chrome://calendar-common/skin/ok-cancel.png);
     min-width: 0;
     -moz-appearance: toolbarbutton;
 }
diff --git a/calendar/base/themes/common/dialogs/calendar-event-dialog.css b/calendar/base/themes/common/dialogs/calendar-event-dialog.css
index 9aec1bb407..41405680ce 100644
--- a/calendar/base/themes/common/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-event-dialog.css
@@ -400,7 +400,7 @@ freebusy-day > box {
 
 .zoom-in-icon {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 97px 14px 84px);
 }
 .zoom-in-icon[disabled="true"] {
@@ -409,7 +409,7 @@ freebusy-day > box {
 
 .zoom-out-icon {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 110px 14px 97px);
 }
 .zoom-out-icon[disabled="true"] {
@@ -418,7 +418,7 @@ freebusy-day > box {
 
 .left-icon {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 124px 14px 110px);
 }
 .left-icon[disabled="true"] {
@@ -427,7 +427,7 @@ freebusy-day > box {
 
 .right-icon {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 138px 14px 124px);
 }
 .right-icon[disabled="true"] {
diff --git a/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css b/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
index 9f0d96789f..66dcd0f9eb 100644
--- a/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
@@ -38,17 +38,17 @@ calendar-invitations-richlistitem[selected="true"] {
 }
 
 .calendar-invitations-richlistitem-icon[status="NEEDS-ACTION"] {
-  list-style-image: url("chrome://calendar/skin/calendar-invitations-dialog-list-images.png");
+  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-list-images.png");
   -moz-image-region: rect(0px 32px 32px 0px);
 }
 
 .calendar-invitations-richlistitem-icon[status="ACCEPTED"] {
-  list-style-image: url("chrome://calendar/skin/calendar-invitations-dialog-list-images.png");
+  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-list-images.png");
   -moz-image-region: rect(0px 64px 32px 32px);
 }
 
 .calendar-invitations-richlistitem-icon[status="DECLINED"] {
-  list-style-image: url("chrome://calendar/skin/calendar-invitations-dialog-list-images.png");
+  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-list-images.png");
   -moz-image-region: rect(0px 96px 32px 64px);
 }
 
@@ -69,11 +69,11 @@ calendar-invitations-richlistitem[selected="true"] .calendar-invitations-richlis
 }
 
 .calendar-invitations-richlistitem-accept-button {
-  list-style-image: url("chrome://calendar/skin/calendar-invitations-dialog-button-images.png");
+  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-button-images.png");
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 .calendar-invitations-richlistitem-decline-button {
-  list-style-image: url("chrome://calendar/skin/calendar-invitations-dialog-button-images.png");
+  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-button-images.png");
   -moz-image-region: rect(0px 32px 16px 16px);
 }
diff --git a/calendar/base/themes/linux/dialogs/images/calendar-event-dialog-attendees.png b/calendar/base/themes/common/dialogs/images/calendar-event-dialog-attendees.png
similarity index 100%
rename from calendar/base/themes/linux/dialogs/images/calendar-event-dialog-attendees.png
rename to calendar/base/themes/common/dialogs/images/calendar-event-dialog-attendees.png
diff --git a/calendar/base/themes/linux/dialogs/images/calendar-invitations-dialog-button-images.png b/calendar/base/themes/common/dialogs/images/calendar-invitations-dialog-button-images.png
similarity index 100%
rename from calendar/base/themes/linux/dialogs/images/calendar-invitations-dialog-button-images.png
rename to calendar/base/themes/common/dialogs/images/calendar-invitations-dialog-button-images.png
diff --git a/calendar/base/themes/linux/dialogs/images/calendar-invitations-dialog-list-images.png b/calendar/base/themes/common/dialogs/images/calendar-invitations-dialog-list-images.png
similarity index 100%
rename from calendar/base/themes/linux/dialogs/images/calendar-invitations-dialog-list-images.png
rename to calendar/base/themes/common/dialogs/images/calendar-invitations-dialog-list-images.png
diff --git a/calendar/base/themes/windows/icons/calendar-alarm-dialog.ico b/calendar/base/themes/common/icons/calendar-alarm-dialog.ico
similarity index 100%
rename from calendar/base/themes/windows/icons/calendar-alarm-dialog.ico
rename to calendar/base/themes/common/icons/calendar-alarm-dialog.ico
diff --git a/calendar/base/themes/linux/icons/calendar-alarm-dialog.png b/calendar/base/themes/common/icons/calendar-alarm-dialog.png
similarity index 100%
rename from calendar/base/themes/linux/icons/calendar-alarm-dialog.png
rename to calendar/base/themes/common/icons/calendar-alarm-dialog.png
diff --git a/calendar/base/themes/windows/icons/calendar-event-dialog.ico b/calendar/base/themes/common/icons/calendar-event-dialog.ico
similarity index 100%
rename from calendar/base/themes/windows/icons/calendar-event-dialog.ico
rename to calendar/base/themes/common/icons/calendar-event-dialog.ico
diff --git a/calendar/base/themes/common/icons/calendar-event-dialog.png b/calendar/base/themes/common/icons/calendar-event-dialog.png
new file mode 100644
index 0000000000..b4a583116b
Binary files /dev/null and b/calendar/base/themes/common/icons/calendar-event-dialog.png differ
diff --git a/calendar/base/themes/common/icons/calendar-event-summary-dialog.ico b/calendar/base/themes/common/icons/calendar-event-summary-dialog.ico
new file mode 100644
index 0000000000..6fdee6522b
Binary files /dev/null and b/calendar/base/themes/common/icons/calendar-event-summary-dialog.ico differ
diff --git a/calendar/base/themes/linux/icons/calendar-event-summary-dialog.png b/calendar/base/themes/common/icons/calendar-event-summary-dialog.png
similarity index 100%
rename from calendar/base/themes/linux/icons/calendar-event-summary-dialog.png
rename to calendar/base/themes/common/icons/calendar-event-summary-dialog.png
diff --git a/calendar/base/themes/windows/icons/calendar-task-dialog.ico b/calendar/base/themes/common/icons/calendar-task-dialog.ico
similarity index 100%
rename from calendar/base/themes/windows/icons/calendar-task-dialog.ico
rename to calendar/base/themes/common/icons/calendar-task-dialog.ico
diff --git a/calendar/base/themes/common/icons/calendar-task-dialog.png b/calendar/base/themes/common/icons/calendar-task-dialog.png
new file mode 100644
index 0000000000..6ed67385c3
Binary files /dev/null and b/calendar/base/themes/common/icons/calendar-task-dialog.png differ
diff --git a/calendar/base/themes/common/icons/calendar-task-summary-dialog.ico b/calendar/base/themes/common/icons/calendar-task-summary-dialog.ico
new file mode 100644
index 0000000000..cf75dc928a
Binary files /dev/null and b/calendar/base/themes/common/icons/calendar-task-summary-dialog.ico differ
diff --git a/calendar/base/themes/linux/icons/calendar-task-summary-dialog.png b/calendar/base/themes/common/icons/calendar-task-summary-dialog.png
similarity index 100%
rename from calendar/base/themes/linux/icons/calendar-task-summary-dialog.png
rename to calendar/base/themes/common/icons/calendar-task-summary-dialog.png
diff --git a/calendar/base/themes/common/images/checkbox-images.png b/calendar/base/themes/common/images/checkbox-images.png
new file mode 100644
index 0000000000..dcbbae97b0
Binary files /dev/null and b/calendar/base/themes/common/images/checkbox-images.png differ
diff --git a/calendar/base/themes/linux/images/ok-cancel.png b/calendar/base/themes/common/images/ok-cancel.png
similarity index 100%
rename from calendar/base/themes/linux/images/ok-cancel.png
rename to calendar/base/themes/common/images/ok-cancel.png
diff --git a/calendar/base/themes/linux/calendar-management.css b/calendar/base/themes/linux/calendar-management.css
index f7ebf3ecee..8017f4c539 100644
--- a/calendar/base/themes/linux/calendar-management.css
+++ b/calendar/base/themes/linux/calendar-management.css
@@ -4,6 +4,10 @@
 
 @import url(chrome://calendar-common/skin/calendar-management.css);
 
+calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
+    list-style-image: url(chrome://calendar-common/skin/checkbox-images.png);
+}
+
 calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
     -moz-image-region: rect(0 13px 13px 0);
 }
diff --git a/calendar/base/themes/linux/calendar-task-tree.css b/calendar/base/themes/linux/calendar-task-tree.css
index def3eb1514..e946a82820 100644
--- a/calendar/base/themes/linux/calendar-task-tree.css
+++ b/calendar/base/themes/linux/calendar-task-tree.css
@@ -4,9 +4,13 @@
 
 @import url(chrome://calendar-common/skin/calendar-task-tree.css);
 
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed),
+.calendar-task-tree-col-completed {
+    list-style-image: url(chrome://calendar-common/skin/checkbox-images.png);
+}
+
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, completed),
 .calendar-task-tree-col-completed {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
     -moz-image-region: rect(0 26px 13px 13px);
 }
 
@@ -14,11 +18,9 @@
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, overdue),
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, future),
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, inprogress) {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
     -moz-image-region: rect(0 13px 13px 0);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, repeating) {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
     -moz-image-region: rect(0 39px 13px 26px);
 }
diff --git a/calendar/base/themes/linux/icons/calendar-event-dialog.png b/calendar/base/themes/linux/icons/calendar-event-dialog.png
deleted file mode 100644
index 7619817b19..0000000000
Binary files a/calendar/base/themes/linux/icons/calendar-event-dialog.png and /dev/null differ
diff --git a/calendar/base/themes/linux/icons/calendar-task-dialog.png b/calendar/base/themes/linux/icons/calendar-task-dialog.png
deleted file mode 100644
index 8593ad27f7..0000000000
Binary files a/calendar/base/themes/linux/icons/calendar-task-dialog.png and /dev/null differ
diff --git a/calendar/base/themes/linux/images/calendar-occurrence-prompt.png b/calendar/base/themes/linux/images/calendar-occurrence-prompt.png
index 09ece5a131..aa6042b5b3 100644
Binary files a/calendar/base/themes/linux/images/calendar-occurrence-prompt.png and b/calendar/base/themes/linux/images/calendar-occurrence-prompt.png differ
diff --git a/calendar/base/themes/linux/images/checkbox-images.png b/calendar/base/themes/linux/images/checkbox-images.png
deleted file mode 100644
index 630db33c12..0000000000
Binary files a/calendar/base/themes/linux/images/checkbox-images.png and /dev/null differ
diff --git a/calendar/base/themes/osx/calendar-management.css b/calendar/base/themes/osx/calendar-management.css
index d6b8c777e4..3fce631f06 100644
--- a/calendar/base/themes/osx/calendar-management.css
+++ b/calendar/base/themes/osx/calendar-management.css
@@ -4,6 +4,10 @@
 
 @import url(chrome://calendar-common/skin/calendar-management.css);
 
+calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
+    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
+}
+
 calendar-list-tree:-moz-system-metric(mac-graphite-theme)
 > tree > treechildren::-moz-tree-image(checkbox-treecol) {
     list-style-image: url(chrome://calendar/skin/checkbox-images-graphite.png);
diff --git a/calendar/base/themes/osx/dialogs/images/calendar-event-dialog-attendees.png b/calendar/base/themes/osx/dialogs/images/calendar-event-dialog-attendees.png
deleted file mode 100644
index ea52cbc19d..0000000000
Binary files a/calendar/base/themes/osx/dialogs/images/calendar-event-dialog-attendees.png and /dev/null differ
diff --git a/calendar/base/themes/osx/dialogs/images/calendar-invitations-dialog-button-images.png b/calendar/base/themes/osx/dialogs/images/calendar-invitations-dialog-button-images.png
deleted file mode 100644
index b641ed2765..0000000000
Binary files a/calendar/base/themes/osx/dialogs/images/calendar-invitations-dialog-button-images.png and /dev/null differ
diff --git a/calendar/base/themes/osx/dialogs/images/calendar-invitations-dialog-list-images.png b/calendar/base/themes/osx/dialogs/images/calendar-invitations-dialog-list-images.png
deleted file mode 100644
index db33ad817c..0000000000
Binary files a/calendar/base/themes/osx/dialogs/images/calendar-invitations-dialog-list-images.png and /dev/null differ
diff --git a/calendar/base/themes/osx/images/cal-icon24.png b/calendar/base/themes/osx/images/cal-icon24.png
index faf25441b0..a04cc193bf 100644
Binary files a/calendar/base/themes/osx/images/cal-icon24.png and b/calendar/base/themes/osx/images/cal-icon24.png differ
diff --git a/calendar/base/themes/osx/images/ok-cancel.png b/calendar/base/themes/osx/images/ok-cancel.png
deleted file mode 100644
index 18380954d4..0000000000
Binary files a/calendar/base/themes/osx/images/ok-cancel.png and /dev/null differ
diff --git a/calendar/base/themes/windows/calendar-management.css b/calendar/base/themes/windows/calendar-management.css
index f7ebf3ecee..8017f4c539 100644
--- a/calendar/base/themes/windows/calendar-management.css
+++ b/calendar/base/themes/windows/calendar-management.css
@@ -4,6 +4,10 @@
 
 @import url(chrome://calendar-common/skin/calendar-management.css);
 
+calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
+    list-style-image: url(chrome://calendar-common/skin/checkbox-images.png);
+}
+
 calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
     -moz-image-region: rect(0 13px 13px 0);
 }
diff --git a/calendar/base/themes/windows/calendar-task-tree.css b/calendar/base/themes/windows/calendar-task-tree.css
index 8bf69a557c..8bbf39b27d 100644
--- a/calendar/base/themes/windows/calendar-task-tree.css
+++ b/calendar/base/themes/windows/calendar-task-tree.css
@@ -4,9 +4,13 @@
 
 @import url(chrome://calendar-common/skin/calendar-task-tree.css);
 
+.calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed),
+.calendar-task-tree-col-completed {
+    list-style-image: url(chrome://calendar-common/skin/checkbox-images.png);
+}
+
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, completed),
 .calendar-task-tree-col-completed {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
     -moz-image-region: rect(0 26px 13px 13px);
 }
 
@@ -14,12 +18,10 @@
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, overdue),
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, future),
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, inprogress) {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
     -moz-image-region: rect(0 13px 13px 0);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, repeating) {
-    list-style-image: url(chrome://calendar/skin/checkbox-images.png);
     -moz-image-region: rect(0 39px 13px 26px);
 }
 
diff --git a/calendar/base/themes/windows/dialogs/images/calendar-event-dialog-attendees.png b/calendar/base/themes/windows/dialogs/images/calendar-event-dialog-attendees.png
deleted file mode 100644
index ea52cbc19d..0000000000
Binary files a/calendar/base/themes/windows/dialogs/images/calendar-event-dialog-attendees.png and /dev/null differ
diff --git a/calendar/base/themes/windows/dialogs/images/calendar-invitations-dialog-button-images.png b/calendar/base/themes/windows/dialogs/images/calendar-invitations-dialog-button-images.png
deleted file mode 100644
index b641ed2765..0000000000
Binary files a/calendar/base/themes/windows/dialogs/images/calendar-invitations-dialog-button-images.png and /dev/null differ
diff --git a/calendar/base/themes/windows/dialogs/images/calendar-invitations-dialog-list-images.png b/calendar/base/themes/windows/dialogs/images/calendar-invitations-dialog-list-images.png
deleted file mode 100644
index db33ad817c..0000000000
Binary files a/calendar/base/themes/windows/dialogs/images/calendar-invitations-dialog-list-images.png and /dev/null differ
diff --git a/calendar/base/themes/windows/icons/calendar-alarm-dialog.png b/calendar/base/themes/windows/icons/calendar-alarm-dialog.png
deleted file mode 100644
index daec5e331f..0000000000
Binary files a/calendar/base/themes/windows/icons/calendar-alarm-dialog.png and /dev/null differ
diff --git a/calendar/base/themes/windows/icons/calendar-event-dialog.png b/calendar/base/themes/windows/icons/calendar-event-dialog.png
deleted file mode 100644
index 7619817b19..0000000000
Binary files a/calendar/base/themes/windows/icons/calendar-event-dialog.png and /dev/null differ
diff --git a/calendar/base/themes/windows/icons/calendar-event-summary-dialog.ico b/calendar/base/themes/windows/icons/calendar-event-summary-dialog.ico
deleted file mode 100644
index eb89f54e3b..0000000000
Binary files a/calendar/base/themes/windows/icons/calendar-event-summary-dialog.ico and /dev/null differ
diff --git a/calendar/base/themes/windows/icons/calendar-event-summary-dialog.png b/calendar/base/themes/windows/icons/calendar-event-summary-dialog.png
deleted file mode 100644
index 7619817b19..0000000000
Binary files a/calendar/base/themes/windows/icons/calendar-event-summary-dialog.png and /dev/null differ
diff --git a/calendar/base/themes/windows/icons/calendar-task-dialog.png b/calendar/base/themes/windows/icons/calendar-task-dialog.png
deleted file mode 100644
index 8593ad27f7..0000000000
Binary files a/calendar/base/themes/windows/icons/calendar-task-dialog.png and /dev/null differ
diff --git a/calendar/base/themes/windows/icons/calendar-task-summary-dialog.ico b/calendar/base/themes/windows/icons/calendar-task-summary-dialog.ico
deleted file mode 100644
index 809d02a38f..0000000000
Binary files a/calendar/base/themes/windows/icons/calendar-task-summary-dialog.ico and /dev/null differ
diff --git a/calendar/base/themes/windows/icons/calendar-task-summary-dialog.png b/calendar/base/themes/windows/icons/calendar-task-summary-dialog.png
deleted file mode 100644
index 8593ad27f7..0000000000
Binary files a/calendar/base/themes/windows/icons/calendar-task-summary-dialog.png and /dev/null differ
diff --git a/calendar/base/themes/windows/images/checkbox-images.png b/calendar/base/themes/windows/images/checkbox-images.png
deleted file mode 100644
index 630db33c12..0000000000
Binary files a/calendar/base/themes/windows/images/checkbox-images.png and /dev/null differ
diff --git a/calendar/base/themes/windows/images/ok-cancel.png b/calendar/base/themes/windows/images/ok-cancel.png
deleted file mode 100644
index 18380954d4..0000000000
Binary files a/calendar/base/themes/windows/images/ok-cancel.png and /dev/null differ
diff --git a/calendar/lightning/jar.mn b/calendar/lightning/jar.mn
index d213dd6ca9..435ef58c4b 100644
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -5,7 +5,7 @@
 
 lightning.jar:
 % override chrome://messagebody/skin/imip.css chrome://lightning/skin/imip.css
-% override chrome://messagebody/skin/calendar-event-dialog-attendees.png chrome://calendar/skin/calendar-event-dialog-attendees.png
+% override chrome://messagebody/skin/calendar-event-dialog-attendees.png chrome://calendar-common/skin/calendar-event-dialog-attendees.png
 % overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-migration.xul
 % overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-item-panel.xul
 % overlay chrome://messenger/content/msgAccountCentral.xul chrome://lightning/content/messenger-overlay-accountCentral.xul
@@ -79,7 +79,6 @@ lightning.jar:
 # Linux theme files
     ../skin/linux/lightning/accountCentral.css                (themes/linux/accountCentral.css)
     ../skin/linux/lightning/imip.css                          (themes/linux/imip.css)
-    ../skin/linux/lightning/imip.png                          (themes/linux/imip.png)
     ../skin/linux/lightning/lightning.css                     (themes/linux/lightning.css)
     ../skin/linux/lightning/lightning-toolbar.css             (themes/linux/lightning-toolbar.css)
     ../skin/linux/lightning/lightning-widgets.css             (themes/linux/lightning-widgets.css)
@@ -87,7 +86,6 @@ lightning.jar:
 # OS X theme files
     ../skin/osx/lightning/accountCentral.css                  (themes/osx/accountCentral.css)
     ../skin/osx/lightning/imip.css                            (themes/osx/imip.css)
-    ../skin/osx/lightning/imip.png                            (themes/osx/imip.png)
     ../skin/osx/lightning/collapse.png                        (themes/osx/collapse.png)
     ../skin/osx/lightning/collapse@2x.png                     (themes/osx/collapse@2x.png)
     ../skin/osx/lightning/expand.png                          (themes/osx/expand.png)
diff --git a/calendar/lightning/themes/linux/imip.png b/calendar/lightning/themes/linux/imip.png
deleted file mode 100644
index 0690f87375..0000000000
Binary files a/calendar/lightning/themes/linux/imip.png and /dev/null differ
diff --git a/calendar/lightning/themes/osx/imip.png b/calendar/lightning/themes/osx/imip.png
deleted file mode 100644
index 67935f15a7..0000000000
Binary files a/calendar/lightning/themes/osx/imip.png and /dev/null differ
diff --git a/mail/installer/allowed-dupes.mn b/mail/installer/allowed-dupes.mn
index aa185b37b6..430ee1c8c1 100644
--- a/mail/installer/allowed-dupes.mn
+++ b/mail/installer/allowed-dupes.mn
@@ -26,44 +26,12 @@ extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/cal
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-daypicker.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-alarm-dialog.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-alarm-dialog.css
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/checkbox-images.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/checkbox-images.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-invitations-dialog-button-images.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/osx/calendar/calendar-invitations-dialog-button-images.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-invitations-dialog-button-images.png
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-management.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-management.css
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-event-dialog.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/osx/calendar/cal-icon24.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/osx/calendar/cal-icon32.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-task-dialog.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-task-dialog.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/imip.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/lightning/imip.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-invitations-dialog-list-images.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/osx/calendar/calendar-invitations-dialog-list-images.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-invitations-dialog-list-images.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-occurrence-prompt.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-occurrence-prompt.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/ok-cancel.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/osx/calendar/ok-cancel.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/ok-cancel.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-dialog.ico
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-summary-dialog.ico
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-dialog.ico
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-summary-dialog.ico
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-event-dialog-attendees.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/osx/calendar/calendar-event-dialog-attendees.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog-attendees.png
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFilter.js
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calFilter.js
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calUtils.js
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calUtils.js
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-dialog.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-summary-dialog.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-dialog.png
-extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-summary-dialog.png
 
 # Variants of paths in mozilla/browser/installer/allowed-dupes.mn:
 # bug 658850