--- a/calendar/lightning/content/lightning-toolbar.xul
+++ b/calendar/lightning/content/lightning-toolbar.xul
@@ -78,17 +78,17 @@
       <menupopup id="extractEventLocaleList"
                  oncommand="calendarExtract.extractWithLocale(event, true);"
                  onpopupshowing="calendarExtract.onShowLocaleMenu(event.target);"/>
     </toolbarbutton>
     <toolbarbutton id="extractTaskButton"
                    class="toolbarbutton-1"
                    type="menu-button"
                    label="&calendar.extract.task.button;"
-                   tooltiptext="&calendar.extract.event.button.tooltip;"
+                   tooltiptext="&calendar.extract.task.button.tooltip;"
                    oncommand="calendarExtract.extractFromEmail(false);">
       <menupopup id="extractTaskLocaleList"
                  oncommand="calendarExtract.extractWithLocale(event, false);"
                  onpopupshowing="calendarExtract.onShowLocaleMenu(event.target);"/>
     </toolbarbutton>
   </toolbarpalette>
 
   <toolbarpalette id="header-view-toolbar-palette">
@@ -123,44 +123,52 @@
            defaulticonsize="small"
 #endif
            labelalign="end"
            defaultlabelalign="end">
     <toolbarpalette id="CalendarToolbarPalette">
       <toolbarbutton id="calendar-synchronize-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.sync.label;"
+                     tooltiptext="&lightning.toolbar.sync.tooltip;"
                      observes="calendar_reload_remote_calendars"/>
       <toolbarbutton id="calendar-newevent-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.newevent.label;"
+                     tooltiptext="&lightning.toolbar.newevent.tooltip;"
                      observes="calendar_new_event_command"/>
       <toolbarbutton id="calendar-newtask-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.newtask.label;"
+                     tooltiptext="&lightning.toolbar.newtask.tooltip;"
                      observes="calendar_new_todo_command"/>
       <toolbarbutton id="calendar-goto-today-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.gototoday.label;"
+                     tooltiptext="&lightning.toolbar.gototoday.tooltip;"
                      observes="calendar_go_to_today_command"/>
       <toolbarbutton id="calendar-edit-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.edit.label;"
+                     tooltiptext="&lightning.toolbar.edit.tooltip;"
                      observes="calendar_modify_focused_item_command"/>
       <toolbarbutton id="calendar-delete-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.delete.label;"
+                     tooltiptext="&lightning.toolbar.delete.tooltip;"
                      observes="calendar_delete_focused_item_command"/>
       <toolbarbutton id="calendar-print-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.print.label;"
+                     tooltiptext="&lightning.toolbar.print.tooltip;"
                      observes="cmd_print"/>
       <toolbarbutton id="calendar-unifinder-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&showUnifinderCmd.label;"
+                     tooltiptext="&showUnifinderCmd.tooltip;"
                      observes="calendar_show_unifinder_command"/>
       <toolbarbutton id="calendar-appmenu-button"
                      class="toolbarbutton-1 button-appmenu"
                      label="&lightning.toolbar.appmenuButton.label;"
                      tooltiptext="&lightning.toolbar.appmenuButton1.tooltip;"/>
     </toolbarpalette>
 
     <toolbar id="calendar-toolbar2" class="inline-toolbar chromeclass-toolbar"
@@ -185,36 +193,42 @@
            defaulticonsize="small"
 #endif
            labelalign="end"
            defaultlabelalign="end">
     <toolbarpalette id="TaskToolbarPalette">
       <toolbarbutton id="task-synchronize-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.sync.label;"
+                     tooltiptext="&lightning.toolbar.sync.tooltip;"
                      observes="calendar_reload_remote_calendars"/>
       <toolbarbutton id="task-newevent-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.newevent.label;"
+                     tooltiptext="&lightning.toolbar.newevent.tooltip;"
                      observes="calendar_new_event_command"/>
       <toolbarbutton id="task-newtask-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.newtask.label;"
+                     tooltiptext="&lightning.toolbar.newtask.tooltip;"
                      observes="calendar_new_todo_command"/>
       <toolbarbutton id="task-edit-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.edit.label;"
+                     tooltiptext="&lightning.toolbar.edit.tooltip;"
                      observes="calendar_modify_focused_item_command"/>
       <toolbarbutton id="task-delete-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.delete.label;"
+                     tooltiptext="&lightning.toolbar.delete.tooltip;"
                      observes="calendar_delete_focused_item_command"/>
       <toolbarbutton id="task-print-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.print.label;"
+                     tooltiptext="&lightning.toolbar.print.tooltip;"
                      observes="cmd_print"/>
       <toolbarbutton id="task-appmenu-button"
                      class="toolbarbutton-1 button-appmenu"
                      label="&lightning.toolbar.appmenuButton.label;"
                      tooltiptext="&lightning.toolbar.appmenuButton1.tooltip;"/>
     </toolbarpalette>
 
     <toolbar id="task-toolbar2" class="inline-toolbar chromeclass-toolbar"

--- a/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
+++ b/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
@@ -30,16 +30,17 @@
 <!ENTITY calendar.removecalendar.accesskey      "R">
 
 
 <!ENTITY calendar.menu.customize.label          "Customize…">
 <!ENTITY calendar.menu.customize.accesskey      "C">
 
 <!ENTITY showUnifinderCmd.label                 "Find Events">
 <!ENTITY showUnifinderCmd.accesskey             "F">
+<!ENTITY showUnifinderCmd.tooltip               "Toggle the find events pane">
 
 <!ENTITY calendar.displaytodos.checkbox.label       "Show Tasks in Calendar">
 <!ENTITY calendar.displaytodos.checkbox.accesskey   "T">
 
 <!ENTITY goTodayCmd.label                       "Today">
 <!ENTITY goTodayCmd.accesskey                   "T">
 
 <!ENTITY showCurrentView.label                  "Current View">

--- a/calendar/locales/en-US/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/locales/en-US/chrome/lightning/lightning-toolbar.dtd
@@ -3,32 +3,39 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY lightning.toolbar.calendar.name "Calendar Toolbar">
 <!ENTITY lightning.toolbar.calendar.name.accesskey "C">
 <!ENTITY lightning.toolbar.task.name "Task Toolbar">
 <!ENTITY lightning.toolbar.task.name.accesskey "T">
 
 <!ENTITY lightning.toolbar.sync.label "Synchronize">
+<!ENTITY lightning.toolbar.sync.tooltip "Reload calendars and synchronize changes">
 <!ENTITY lightning.toolbar.delete.label "Delete">
+<!ENTITY lightning.toolbar.delete.tooltip "Delete selected events or tasks">
 <!ENTITY lightning.toolbar.edit.label "Edit">
+<!ENTITY lightning.toolbar.edit.tooltip "Edit selected event or task">
 <!ENTITY lightning.toolbar.gototoday.label "Go to Today">
+<!ENTITY lightning.toolbar.gototoday.tooltip "Go to Today">
 <!ENTITY lightning.toolbar.print.label "Print">
+<!ENTITY lightning.toolbar.print.tooltip "Print events or tasks">
 
 <!-- Mode Toolbar -->
 <!ENTITY lightning.toolbar.calendar.label     "Calendar">
 <!ENTITY lightning.toolbar.calendar.tooltip   "Switch to the calendar tab">
 <!ENTITY lightning.toolbar.calendar.accesskey "C">
 <!ENTITY lightning.toolbar.task.label         "Tasks">
 <!ENTITY lightning.toolbar.task.tooltip       "Switch to the tasks tab">
 <!ENTITY lightning.toolbar.task.accesskey     "T">
 
 <!-- Toolbar write button -->
 <!ENTITY lightning.toolbar.newevent.label     "Event">
+<!ENTITY lightning.toolbar.newevent.tooltip   "Create a new event">
 <!ENTITY lightning.toolbar.newtask.label      "Task">
+<!ENTITY lightning.toolbar.newtask.tooltip    "Create a new task">
 
 <!-- Calendar and Task Mode Toolbar -->
 <!ENTITY lightning.toolbar.day.label                 "Day">
 <!ENTITY lightning.toolbar.day.accesskey             "D">
 <!ENTITY lightning.toolbar.week.label                "Week">
 <!ENTITY lightning.toolbar.week.accesskey            "W">
 <!ENTITY lightning.toolbar.multiweek.label           "Multiweek">
 <!ENTITY lightning.toolbar.multiweek.accesskey       "u">