Added menu icons for Lightning and Lightbird

theme/chrome.manifest

@@ -54,12 +54,22 @@ style chrome://lightning/content/lightning-standalone.xul chrome://$CODE_NAME-ca
 style chrome://lightning/content/messenger-overlay-sidebar.xul chrome://$CODE_NAME-calendar/skin/lightning.css
 style chrome://lightning/content/messenger-overlay-accountCentral.xul chrome://$CODE_NAME-calendar/skin/accountCentral.css
 
+style chrome://calendar/content/calendar-calendars-list.xul chrome://$CODE_NAME-calendar/skin/calendar-menus.css
+style chrome://calendar/content/calendar-common-sets.xul chrome://$CODE_NAME-calendar/skin/calendar-menus.css
+style chrome://calendar/content/calendar-event-dialog.xul chrome://$CODE_NAME-calendar/skin/calendar-menus.css
+style chrome://calendar/content/calendar-task-view.xul chrome://$CODE_NAME-calendar/skin/calendar-menus.css
+style chrome://calendar/content/today-pane.xul chrome://$CODE_NAME-calendar/skin/calendar-menus.css
+style chrome://lightning/content/lightning-toolbar.xul chrome://$CODE_NAME-calendar/skin/lightning-menus.css
+
 # Lightbird
 style chrome://global/content/customizeToolbar.xul chrome://$CODE_NAME-calendar/skin/sunbird-toolbar.css
 style chrome://lightbird/content/sunbird/calendar.xul chrome://$CODE_NAME-calendar/skin/sunbird-toolbar.css
 style chrome://lightbird/content/tasksOverlay.xul chrome://$CODE_NAME-calendar/skin/lightbird.css
 style chrome://lightbird/content/sunbird/calendar.xul chrome://$CODE_NAME-calendar/skin/calendar-unifinder.css
 
+style chrome://lightbird/content/messengerOverlay.xul chrome://$CODE_NAME-calendar/skin/lightbird-menus.css
+style chrome://lightbird/content/sunbird/calendar.xul chrome://$CODE_NAME-calendar/skin/lightbird-menus.css
+
 #SeaFox
 skin seafoxcompatibility $INTERNAL_NAME extensions/seafox/
 

theme/extensions/calendar/calendar-menus.css

@@ -0,0 +1,352 @@
+/* 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://icons/skin/icon-theme-default.css");
+
+menuitem:not([type]) {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
+}
+
+#list-calendars-context-new {
+  list-style-image: var(--icon-x-office-calendar-16);
+}
+
+#list-calendars-context-new[disabled="true"] {
+  list-style-image: var(--icon-x-office-calendar-16-dis);
+}
+
+#list-calendars-context-find {
+  list-style-image: var(--icon-edit-find-16);
+}
+
+#list-calendars-context-find[disabled="true"] {
+  list-style-image: var(--icon-edit-find-16-dis);
+}
+
+#list-calendars-context-delete,
+#calendar-item-context-menu-delete-menuitem,
+#task-context-menu-delete,
+#agenda-menupopup > menuitem[observes="agenda_delete_event_command"],
+#item-delete-menuitem,
+#attachment-popup-delete {
+  list-style-image: var(--icon-edit-delete-16);
+}
+
+#list-calendars-context-delete[disabled="true"],
+#calendar-item-context-menu-delete-menuitem[disabled="true"],
+#task-context-menu-delete[disabled="true"],
+#agenda-menupopup > menuitem[observes="agenda_delete_event_command"][disabled="true"],
+#item-delete-menuitem[disabled="true"],
+#attachment-popup-delete[disabled="true"] {
+  list-style-image: var(--icon-edit-delete-16-dis);
+}
+
+#list-calendars-context-export {
+  list-style-image: var(--icon-stock_calendar-export-16);
+}
+
+#list-calendars-context-export[disabled="true"] {
+  list-style-image: var(--icon-stock_calendar-export-16-dis);
+}
+
+#list-calendars-context-publish {
+  list-style-image: var(--icon-stock_calendar-publish-16);
+}
+
+#list-calendars-context-publish[disabled="true"] {
+  list-style-image: var(--icon-stock_calendar-publish-16-dis);
+}
+
+#list-calendars-context-reload {
+  list-style-image: var(--icon-view-refresh-16);
+}
+
+#list-calendars-context-reload[disabled="true"] {
+  list-style-image: var(--icon-view-refresh-16-dis);
+}
+
+#list-calendars-context-edit,
+#calendar-item-context-menu-modify-menuitem,
+#task-context-menu-modify,
+#task-context-menu-modify-todaypane,
+#agenda-menupopup > menuitem[observes="agenda_edit_event_command"] {
+  list-style-image: var(--icon-gtk-edit-16);
+}
+
+#list-calendars-context-edit[disabled="true"],
+#calendar-item-context-menu-modify-menuitem[disabled="true"],
+#task-context-menu-modify[disabled="true"],
+#task-context-menu-modify-todaypane[disabled="true"],
+#agenda-menupopup > menuitem[observes="agenda_edit_event_command"][disabled="true"] {
+  list-style-image: var(--icon-gtk-edit-16-dis);
+}
+
+#calendar-item-context-menu-newevent-menutitem,
+#calendar-item-context-menu-convert-event-menuitem,
+#calendar-view-context-menu-newevent,
+#calendar-context-converttoevent,
+#item-new-event-menuitem {
+  list-style-image: var(--icon-appointment-new-16);
+}
+
+#calendar-item-context-menu-newevent-menutitem[disabled="true"],
+#calendar-item-context-menu-convert-event-menuitem[disabled="true"],
+#calendar-view-context-menu-newevent[disabled="true"],
+#calendar-context-converttoevent[disabled="true"],
+#item-new-event-menuitem[disabled="true"] {
+  list-style-image: var(--icon-appointment-new-16-dis);
+}
+
+#calendar-item-context-menu-newtodo-menuitem,
+#calendar-item-context-menu-convert-task-menuitem,
+#calendar-view-context-menu-newtodo,
+#task-context-menu-new,
+#task-context-menu-new-todaypane,
+#agenda-context-menu-convert-task-menuitem,
+#item-new-task-menuitem {
+  list-style-image: var(--icon-stock_task-16);
+}
+
+#calendar-item-context-menu-newtodo-menuitem[disabled="true"],
+#calendar-item-context-menu-convert-task-menuitem[disabled="true"],
+#calendar-view-context-menu-newtodo[disabled="true"],
+#task-context-menu-new[disabled="true"],
+#task-context-menu-new-todaypane[disabled="true"],
+#agenda-context-menu-convert-task-menuitem[disabled="true"],
+#item-new-task-menuitem[disabled="true"] {
+  list-style-image: var(--icon-stock_task-16-dis);
+}
+
+#calendar-item-context-menu-cut-menuitem,
+#calendar-view-context-menu-cut-menuitem,
+#task-context-menu-cut-menuitem {
+  list-style-image: var(--icon-edit-cut-16);
+}
+
+#calendar-item-context-menu-cut-menuitem[disabled="true"],
+#calendar-view-context-menu-cut-menuitem[disabled="true"],
+#task-context-menu-cut-menuitem[disabled="true"] {
+  list-style-image: var(--icon-edit-cut-16-dis);
+}
+
+#calendar-item-context-menu-copy-menuitem,
+#calendar-view-context-menu-copy-menuitem,
+#task-context-menu-copy-menuitem,
+#taskview-link-context-menu-copy,
+#attachment-popup-copy {
+  list-style-image: var(--icon-edit-copy-16);
+}
+
+#calendar-item-context-menu-copy-menuitem[disabled="true"],
+#calendar-view-context-menu-copy-menuitem[disabled="true"],
+#task-context-menu-copy-menuitem[disabled="true"],
+#taskview-link-context-menu-copy[disabled="true"],
+#attachment-popup-copy[disabled="true"] {
+  list-style-image: var(--icon-edit-copy-16-dis);
+}
+
+#calendar-item-context-menu-paste-menuitem,
+#calendar-view-context-menu-paste-menuitem,
+#task-context-menu-paste-menuitem {
+  list-style-image: var(--icon-edit-paste-16);
+}
+
+#calendar-item-context-menu-paste-menuitem[disabled="true"],
+#calendar-view-context-menu-paste-menuitem[disabled="true"],
+#task-context-menu-paste-menuitem[disabled="true"] {
+  list-style-image: var(--icon-edit-paste-16-dis);
+}
+
+#calendar-item-context-menu-convert-menu,
+#task-context-menu-convert,
+#agenda-context-menu-convert-menu {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
+  list-style-image: var(--icon-gtk-convert-16);
+}
+
+#calendar-item-context-menu-convert-menu[disabled="true"],
+#task-context-menu-convert[disabled="true"],
+#agenda-context-menu-convert-menu[disabled="true"] {
+  list-style-image: var(--icon-gtk-convert-16-dis);
+}
+
+#calendar-view-context-menu-convert-message-menuitem,
+#calendar-context-converttomessage,
+#agenda-context-menu-convert-message-menuitem,
+#item-new-message-menuitem,
+#attendee-popup-sendemail-menuitem {
+  list-style-image: var(--icon-mail-message-new-16);
+}
+
+#calendar-view-context-menu-convert-message-menuitem[disabled="true"],
+#calendar-context-converttomessage[disabled="true"],
+#agenda-context-menu-convert-message-menuitem[disabled="true"],
+#item-new-message-menuitem[disabled="true"],
+#attendee-popup-sendemail-menuitem[disabled="true"] {
+  list-style-image: var(--icon-mail-message-new-16-dis);
+}
+
+#calendar-view-context-menu-previous {
+  list-style-image: var(--icon-stock_previous-16);
+}
+
+#calendar-view-context-menu-previous[disabled="true"] {
+  list-style-image: var(--icon-stock_previous-16-dis);
+}
+
+#calendar-view-context-menu-next {
+  list-style-image: var(--icon-stock_next-16);
+}
+
+#calendar-view-context-menu-next[disabled="true"] {
+  list-style-image: var(--icon-stock_next-16-dis);
+}
+
+#calendar-context-calendar-menu {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
+  list-style-image: var(--icon-x-office-calendar-16);
+}
+
+#calendar-context-calendar-menu[disabled="true"] {
+  list-style-image: var(--icon-x-office-calendar-16-dis);
+}
+
+#CustomizeTaskActionsToolbar,
+#CustomizeDialogToolbar,
+#view-toolbars-customize-menuitem {
+  list-style-image: var(--icon-document-properties-16);
+}
+
+#CustomizeTaskActionsToolbar[disabled="true"],
+#CustomizeDialogToolbar[disabled="true"],
+#view-toolbars-customize-menuitem[disabled="true"] {
+  list-style-image: var(--icon-document-properties-16-dis);
+}
+
+#item-new-menu {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
+  list-style-image: var(--icon-document-new-16);
+}
+
+#item-new-menu[disabled="true"] {
+  list-style-image: var(--icon-document-new-16-dis);
+}
+
+#item-new-address-menuitem {
+  list-style-image: var(--icon-contact-new-16);
+}
+
+#item-new-address-menuitem[disabled="true"] {
+  list-style-image: var(--icon-contact-new-16-dis);
+}
+
+#item-save-menuitem {
+  list-style-image: var(--icon-document-save-16);
+}
+
+#item-save-menuitem[disabled="true"] {
+  list-style-image: var(--icon-document-save-16-dis);
+}
+
+#item-pagesetup-menuitem {
+  list-style-image: var(--icon-document-page-setup-16);
+}
+
+#item-pagesetup-menuitem[disabled="true"] {
+  list-style-image: var(--icon-document-page-setup-16-dis);
+}
+
+#item-print-menuitem {
+  list-style-image: var(--icon-document-print-16);
+}
+
+#item-print-menuitem[disabled="true"] {
+  list-style-image: var(--icon-document-print-16-dis);
+}
+
+#item-close-menuitem {
+  list-style-image: var(--icon-window-close-16);
+}
+
+#item-close-menuitem[disabled="true"] {
+  list-style-image: var(--icon-window-close-16-dis);
+}
+
+#edit-undo-menuitem {
+  list-style-image: var(--icon-edit-undo-16);
+}
+
+#edit-undo-menuitem[disabled="true"] {
+  list-style-image: var(--icon-edit-undo-16-dis);
+}
+
+#edit-redo-menuitem {
+  list-style-image: var(--icon-edit-redo-16);
+}
+
+#edit-redo-menuitem[disabled="true"] {
+  list-style-image: var(--icon-edit-redo-16-dis);
+}
+
+#edit-cut-menuitem {
+  list-style-image: var(--icon-edit-cut-16);
+}
+
+#edit-cut-menuitem[disabled="true"] {
+  list-style-image: var(--icon-edit-cut-16-dis);
+}
+
+#edit-copy-menuitem {
+  list-style-image: var(--icon-edit-copy-16);
+}
+
+#edit-copy-menuitem[disabled="true"] {
+  list-style-image: var(--icon-edit-copy-16-dis);
+}
+
+#edit-paste-menuitem {
+  list-style-image: var(--icon-edit-paste-16);
+}
+
+#edit-paste-menuitem[disabled="true"] {
+  list-style-image: var(--icon-edit-paste-16-dis);
+}
+
+#edit-selectall-menuitem {
+  list-style-image: var(--icon-edit-select-all-16);
+}
+
+#edit-selectall-menuitem[disabled="true"] {
+  list-style-image: var(--icon-edit-select-all-16-dis);
+}
+
+#options-attachments-menu {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
+  list-style-image: var(--icon-mail-attachment-16);
+}
+
+#options-attachments-menu[disabled="true"] {
+  list-style-image: var(--icon-mail-attachment-16-dis);
+}
+
+#options-attachments-url-menuitem,
+#button-attach-url,
+#attachment-popup-attachPage {
+  list-style-image: var(--icon-text-html-16);
+}
+
+#options-attachments-url-menuitem[disabled="true"],
+#button-attach-url[disabled="true"],
+#attachment-popup-attachPage[disabled="true"] {
+  list-style-image: var(--icon-text-html-16-dis);
+}
+
+#attachment-popup-open {
+  list-style-image: var(--icon-internet-web-browser-16);
+}
+
+#attachment-popup-open[disabled="true"] {
+  list-style-image: var(--icon-internet-web-browser-16);
+}
+

theme/extensions/calendar/lightbird-menus.css

@@ -0,0 +1,227 @@
+/* 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://icons/skin/icon-theme-default.css");
+
+menuitem:not([type]) {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
+}
+
+#mailContext-calendar-convert-menu {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
+  list-style-image: var(--icon-gtk-convert-16);
+}
+
+#mailContext-calendar-convert-menu[disabled="true"] {
+  list-style-image: var(--icon-gtk-convert-16-dis);
+}
+
+#mailContext-calendar-convert-event-menuitem {
+  list-style-image: var(--icon-appointment-new-16);
+}
+
+#mailContext-calendar-convert-event-menuitem[disabled="true"] {
+  list-style-image: var(--icon-appointment-new-16-dis);
+}
+
+#mailContext-calendar-convert-task-menuitem {
+  list-style-image: var(--icon-stock_task-16);
+}
+
+#mailContext-calendar-convert-task-menuitem[disabled="true"] {
+  list-style-image: var(--icon-stock_task-16-dis);
+}
+
+#calendar-new-event-menu {
+  list-style-image: var(--icon-appointment-new-16);
+}
+
+#calendar-new-event-menu[disabled="true"] {
+  list-style-image: var(--icon-appointment-new-16-dis);
+}
+
+#calendar-new-todo-menu {
+  list-style-image: var(--icon-stock_task-16);
+}
+
+#calendar-new-todo-menu[disabled="true"] {
+  list-style-image: var(--icon-stock_task-16-dis);
+}
+
+#calendar-new-calendar-menu {
+  list-style-image: var(--icon-x-office-calendar-16);
+}
+
+#calendar-new-calendar-menu[disabled="true"] {
+  list-style-image: var(--icon-x-office-calendar-16-dis);
+}
+
+#calendar-open-calendar-menu {
+  list-style-image: var(--icon-document-open-16);
+}
+
+#calendar-open-calendar-menu[disabled="true"] {
+  list-style-image: var(--icon-document-open-16-dis);
+}
+
+#calendar-addserver-menu {
+  list-style-image: var(--icon-stock_calendar-subscribe-16);
+}
+
+#calendar-addserver-menu[disabled="true"] {
+  list-style-image: var(--icon-stock_calendar-subscribe-16-dis);
+}
+
+#calendar-import-menu {
+  list-style-image: var(--icon-stock_calendar-import-16);
+}
+
+#calendar-import-menu[disabled="true"] {
+  list-style-image: var(--icon-stock_calendar-import-16-dis);
+}
+
+#calendar-export-calendar-menu {
+  list-style-image: var(--icon-stock_calendar-export-16);
+}
+
+#calendar-export-calendar-menu[disabled="true"] {
+  list-style-image: var(--icon-stock_calendar-export-16-dis);
+}
+
+#calendar-publish-calendar-menu {
+  list-style-image: var(--icon-stock_calendar-publish-16);
+}
+
+#calendar-publish-calendar-menu[disabled="true"] {
+  list-style-image: var(--icon-stock_calendar-publish-16-dis);
+}
+
+#calendar-synccalendars-menu {
+  list-style-image: var(--icon-view-refresh-16);
+}
+
+#calendar-synccalendars-menu[disabled="true"] {
+  list-style-image: var(--icon-view-refresh-16-dis);
+}
+
+#calendar-page-setup-menu {
+  list-style-image: var(--icon-document-page-setup-16);
+}
+
+#calendar-page-setup-menu[disabled="true"] {
+  list-style-image: var(--icon-document-page-setup-16-dis);
+}
+
+#calendar-print-menu {
+  list-style-image: var(--icon-document-print-16);
+}
+
+#calendar-print-menu[disabled="true"] {
+  list-style-image: var(--icon-document-print-16-dis);
+}
+
+#calendar-undo-menu {
+  list-style-image: var(--icon-edit-undo-16);
+}
+
+#calendar-undo-menu[disabled="true"] {
+  list-style-image: var(--icon-edit-undo-16-dis);
+}
+
+#calendar-redo-menu {
+  list-style-image: var(--icon-edit-redo-16);
+}
+
+#calendar-redo-menu[disabled="true"] {
+  list-style-image: var(--icon-edit-redo-16-dis);
+}
+
+#calendar-cut-menu {
+  list-style-image: var(--icon-edit-cut-16);
+}
+
+#calendar-cut-menu[disabled="true"] {
+  list-style-image: var(--icon-edit-cut-16-dis);
+}
+
+#calendar-copy-menu {
+  list-style-image: var(--icon-edit-copy-16);
+}
+
+#calendar-copy-menu[disabled="true"] {
+  list-style-image: var(--icon-edit-copy-16-dis);
+}
+
+#calendar-paste-menu {
+  list-style-image: var(--icon-edit-paste-16);
+}
+
+#calendar-paste-menu[disabled="true"] {
+  list-style-image: var(--icon-edit-paste-16-dis);
+}
+
+#unifinder-modify-menu {
+  list-style-image: var(--icon-gtk-edit-16);
+}
+
+#unifinder-modify-menu[disabled="true"] {
+  list-style-image: var(--icon-gtk-edit-16-dis);
+}
+
+#unifinder-remove-event-menu {
+  list-style-image: var(--icon-edit-delete-16);
+}
+
+#unifinder-remove-event-menu[disabled="true"] {
+  list-style-image: var(--icon-edit-delete-16-dis);
+}
+
+#calendar-selectall-menu {
+  list-style-image: var(--icon-edit-select-all-16);
+}
+
+#calendar-selectall-menu[disabled="true"] {
+  list-style-image: var(--icon-edit-select-all-16-dis);
+}
+
+#menu_preferences {
+  list-style-image: var(--icon-preferences-desktop-16);
+}
+
+#menu_preferences[disabled] {
+  list-style-image: var(--icon-preferences-desktop-16-dis);
+}
+
+#calendar-go-menu-today {
+  list-style-image: var(--icon-go-today-16);
+}
+
+#calendar-go-menu-today[disabled="true"] {
+  list-style-image: var(--icon-go-today-16-dis);
+}
+
+#calendar-go-menu-date {
+  list-style-image: var(--icon-go-jump-16);
+}
+
+#calendar-go-menu-date[disabled="true"] {
+  list-style-image: var(--icon-go-jump-16-dis);
+}
+
+#calendar-go-menu-previous {
+  list-style-image: var(--icon-stock_previous-16);
+}
+
+#calendar-go-menu-previous[disabled="true"] {
+  list-style-image: var(--icon-stock_previous-16-dis);
+}
+
+#calendar-go-menu-next {
+  list-style-image: var(--icon-stock_next-16);
+}
+
+#calendar-go-menu-next[disabled="true"] {
+  list-style-image: var(--icon-stock_next-16-dis);
+}
+

theme/extensions/calendar/lightning-menus.css

@@ -0,0 +1,164 @@
+/* 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://icons/skin/icon-theme-default.css");
+
+menuitem:not([type]) {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
+}
+
+#CustomizeCalendarToolbar,
+#CustomizeTaskToolbar {
+  list-style-image: var(--icon-document-properties-16);
+}
+
+#CustomizeCalendarToolbar[disabled="true"],
+#CustomizeTaskToolbar[disabled="true"] {
+  list-style-image: var(--icon-document-properties-16-dis);
+}
+
+#newMsgButton-calendar-menuitem,
+#ltnNewEvent,
+#ltnNewEvent2 {
+  list-style-image: var(--icon-appointment-new-16);
+}
+
+#newMsgButton-calendar-menuitem[disabled="true"],
+#ltnNewEvent[disabled="true"],
+#ltnNewEvent2[disabled="true"] {
+  list-style-image: var(--icon-appointment-new-16-dis);
+}
+
+#newMsgButton-task-menuitem,
+#ltnNewTask,
+#ltnNewTask2 {
+  list-style-image: var(--icon-stock_task-16);
+}
+
+#newMsgButton-task-menuitem[disabled="true"],
+#ltnNewTask[disabled="true"],
+#ltnNewTask2[disabled="true"] {
+  list-style-image: var(--icon-stock_task-16-dis);
+}
+
+#menu_Open {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
+  list-style-image: var(--icon-document-open-16);
+}
+
+#menu_Open[disabled="true"] {
+  list-style-image: var(--icon-document-open-16-dis);
+}
+
+#ltnOpenMessageFileMenuitem {
+  list-style-image: var(--icon-stock_mail-16);
+}
+
+#ltnOpenMessageFileMenuitem[disabled="true"] {
+  list-style-image: var(--icon-stock_mail-16-dis);
+}
+
+#ltnOpenCalendarFileMenuitem,
+#ltnNewCalendar,
+#ltnCalendarProperties,
+#ltnCalendarMenu {
+  list-style-image: var(--icon-x-office-calendar-16);
+}
+
+#ltnOpenCalendarFileMenuitem[disabled="true"],
+#ltnNewCalendar[disabled="true"],
+#ltnCalendarProperties[disabled="true"],
+#ltnCalendarMenu[disabled="true"] {
+  list-style-image: var(--icon-x-office-calendar-16-dis);
+}
+
+#ltnTasksMenu {
+  list-style-image: var(--icon-evolution-tasks-16);
+}
+
+#ltnTasksMenu[disabled="true"] {
+  list-style-image: var(--icon-evolution-tasks-16-dis);
+}
+
+#ltnGoToToday {
+  list-style-image: var(--icon-go-today-16);
+}
+
+#ltnGoToToday[disabled="true"] {
+  list-style-image: var(--icon-go-today-16-dis);
+}
+
+#calendar-go-menu-previous {
+  list-style-image: var(--icon-stock_previous-16);
+}
+
+#calendar-go-menu-previous[disabled="true"] {
+  list-style-image: var(--icon-stock_previous-16-dis);
+}
+
+#calendar-go-menu-next {
+  list-style-image: var(--icon-stock_next-16);
+}
+
+#calendar-go-menu-next[disabled="true"] {
+  list-style-image: var(--icon-stock_next-16-dis);
+}
+
+#calendar-export-menu {
+  list-style-image: var(--icon-stock_calendar-export-16);
+}
+
+#calendar-export-menu[disabled="true"] {
+  list-style-image: var(--icon-stock_calendar-export-16-dis);
+}
+
+#calendar-import-menu {
+  list-style-image: var(--icon-stock_calendar-import-16);
+}
+
+#calendar-import-menu[disabled="true"] {
+  list-style-image: var(--icon-stock_calendar-import-16-dis);
+}
+
+#ltnPublishCalendar {
+  list-style-image: var(--icon-stock_calendar-publish-16);
+}
+
+#ltnPublishCalendar[disabled="true"] {
+  list-style-image: var(--icon-stock_calendar-publish-16-dis);
+}
+
+#ltnDeleteSelectedCalendar {
+  list-style-image: var(--icon-edit-delete-16);
+}
+
+#ltnDeleteSelectedCalendar[disabled="true"] {
+  list-style-image: var(--icon-edit-delete-16-dis);
+}
+
+#mailContext-calendar-convert-menu {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
+  list-style-image: var(--icon-gtk-convert-16);
+}
+
+#mailContext-calendar-convert-menu[disabled="true"] {
+  list-style-image: var(--icon-gtk-convert-16-dis);
+}
+
+#mailContext-calendar-convert-event-menuitem {
+  list-style-image: var(--icon-appointment-new-16);
+}
+
+#mailContext-calendar-convert-event-menuitem[disabled="true"] {
+  list-style-image: var(--icon-appointment-new-16-dis);
+}
+
+#mailContext-calendar-convert-task-menuitem {
+  list-style-image: var(--icon-stock_task-16);
+}
+
+#mailContext-calendar-convert-task-menuitem[disabled="true"] {
+  list-style-image: var(--icon-stock_task-16-dis);
+}
+

theme/extensions/calendar/lightning.css

@@ -44,7 +44,6 @@ radio[pane=paneLightning] {
 
 /* ::: new tab buttons ::: */
 #calendar-tab-button,
-#newMsgButton-calendar-menuitem,
 .icon-holder[type="calendar"],
 .tabmail-tab[type="calendar"] {
   list-style-image: var(--icon-x-office-calendar-16);
@@ -52,7 +51,6 @@ radio[pane=paneLightning] {
 }
 
 #task-tab-button,
-#newMsgButton-task-menuitem,
 .icon-holder[type="tasks"],
 .tabmail-tab[type="tasks"] {
   list-style-image: var(--icon-evolution-tasks-16);
@@ -106,3 +104,11 @@ radio[pane=paneLightning] {
 #calMinimonthBox {
     margin-top: 3px !important;
 }
+
+#newMsgButton-calendar-menuitem > .menu-iconic-left > .menu-iconic-icon,
+#newMsgButton-task-menuitem > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px !important;
+  height: 16px !important;
+  margin: 0px !important;
+}
+

theme/icons/layer-freedesktop

@@ -98,8 +98,10 @@ network-server
 preferences-desktop
 process-stop
 stock_folder folder
-stock_next go-down
-stock_previous go-up
+stock_next go-next
+stock_next-msg go-down
+stock_previous go-previous
+stock_previous-msg go-up
 text-html
 text-x-generic
 text-x-generic-template

theme/icons/layer-gtk

@@ -71,8 +71,10 @@ network-idle			gtk-network
 preferences-desktop		gtk-preferences
 process-stop			gtk-stop
 stock_foler             gtk-directory
-stock_next              gtk-go-down
-stock_previous          gtk-go-up
+stock_next              gtk-go-forward
+stock_next-msg          gtk-go-down
+stock_previous          gtk-go-back
+stock_previous-msg      gtk-go-up
 text-x-generic			gtk-file
 tools-check-spelling	gtk-spell-check
 view-fullscreen			gtk-fullscreen

theme/messenger/mailWindowOverlay-menus.css

@@ -206,7 +206,7 @@ menuitem:not([type]) {
 
 #mailContext-mark[disabled="true"],
 #markMenu[disabled="true"] {
-  list-style-image: var(--icon-mail-mark-read-16);
+  list-style-image: var(--icon-mail-mark-read-16-dis);
 }
 
 #mailContext-markThreadAsRead,
@@ -438,20 +438,20 @@ menu[ref*="mailnewsrecentfolders"][disabled="true"] {
 
 #goNextMenu {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
-  list-style-image: var(--icon-stock_next-16);
+  list-style-image: var(--icon-stock_next-msg-16);
 }
 
 #goNextMenu[disabled="true"] {
-  list-style-image: var(--icon-stock_next-16-dis);
+  list-style-image: var(--icon-stock_next-msg-16-dis);
 }
 
 #goPreviousMenu {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
-  list-style-image: var(--icon-stock_previous-16);
+  list-style-image: var(--icon-stock_previous-msg-16);
 }
 
 #goPreviousMenu[disabled="true"] {
-  list-style-image: var(--icon-stock_previous-16-dis);
+  list-style-image: var(--icon-stock_previous-msg-16-dis);
 }
 
 #nextMsgMenuItem,

theme/messenger/primaryToolbar.css

@@ -93,11 +93,11 @@
 }
 
 #button-next {
-  list-style-image: var(--icon-stock_next-24);
+  list-style-image: var(--icon-stock_next-msg-24);
 }
 
 #button-next[disabled] {
-  list-style-image: var(--icon-stock_next-24-dis);
+  list-style-image: var(--icon-stock_next-msg-24-dis);
 } 
 
 #button-delete {
@@ -280,11 +280,11 @@ toolbar[iconsize="small"] > #button-goforward:-moz-locale-dir(rtl)[disabled="tru
 
 toolbar[iconsize="small"] > #button-next,
 toolbar[iconsize="small"] > toolbarpaletteitem > #button-next {
-  list-style-image: var(--icon-stock_next-16);
+  list-style-image: var(--icon-stock_next-msg-16);
 }
 
 toolbar[iconsize="small"] > #button-next[disabled] {
-  list-style-image: var(--icon-stock_next-16-dis);
+  list-style-image: var(--icon-stock_next-msg-16-dis);
 }
 
 toolbar[iconsize="small"] > #button-delete,