diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
index 5168aed452f..5a5cfa25937 100644
--- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -95,17 +95,26 @@
         accesskey="&lightning.calendar.accesskey;"
         insertbefore="tasksMenu">
     <menupopup id="ltncalendarMenuPopup">
+      <menuitem id="ltnEditSelectedCalendar"
+                label="&lightning.toolbar.edit.calendar.label;"
+                accesskey="&lightning.toolbar.edit.calendar.accesskey;"
+                oncommand="ltnEditSelectedCalendar();"/>
+      <menuitem id="ltnDeleteSelectedCalendar"
+                label="&lightning.toolbar.delete.calendar.label;"
+                accesskey="&lightning.toolbar.delete.calendar.accesskey;"
+                oncommand="ltnDeleteSelectedCalendar();"/>
+      <menuseparator/>
       <menuitem id="ltnChangeViewDay"
-                label="&lightning.toolbar.dayview.label;"
-                accesskey="&lightning.toolbar.dayview.accesskey;"
+                label="&lightning.toolbar.day.label;"
+                accesskey="&lightning.toolbar.day.accesskey;"
                 oncommand="showCalendarView('day')"/>
       <menuitem id="ltnChangeViewWeek"
-                label="&lightning.toolbar.weekview.label;"
-                accesskey="&lightning.toolbar.weekview.accesskey;"
+                label="&lightning.toolbar.week.label;"
+                accesskey="&lightning.toolbar.week.accesskey;"
                 oncommand="showCalendarView('week')"/>
       <menuitem id="ltnChangeViewMonth"
-                label="&lightning.toolbar.monthview.label;"
-                accesskey="&lightning.toolbar.monthview.accesskey;"
+                label="&lightning.toolbar.month.label;"
+                accesskey="&lightning.toolbar.month.accesskey;"
                 oncommand="showCalendarView('month')"/>
       <menuseparator/>
       <menu label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
@@ -247,15 +256,6 @@
             <vbox id="agenda-tab-panel"/>    
             <vbox id="todo-tab-panel"/>
             <vbox id="calendar-tab-panel" flex="1">
-              <hbox id="ltnCalendarButtonsBox">
-                <button id="cal-sidebar-new-calendar" label="&lightning.sidebar.new.label;" 
-                        oncommand="ltnNewCalendar();"/>
-                <button id="cal-sidebar-edit-calendar" label="&lightning.sidebar.edit.label;" 
-                        oncommand="ltnEditSelectedCalendar();"/>
-                <spacer orient="horizontal" flex="5"/>
-                <button id="cal-sidebar-delete-calendar" label="&lightning.sidebar.delete.label;" 
-                        oncommand="ltnDeleteSelectedCalendar();"/>
-              </hbox>
               <tree id="calendarTree" hidecolumnpicker="true" seltype="single"
                     onfocus="selectedCalendarPane(event)" flex="1"
                     onselect="ltnSidebarCalendarSelected(this);"
diff --git a/mozilla/calendar/locales/en-US/chrome/lightning/lightning.dtd b/mozilla/calendar/locales/en-US/chrome/lightning/lightning.dtd
index 5a9aa527b14..8ddbc495382 100644
--- a/mozilla/calendar/locales/en-US/chrome/lightning/lightning.dtd
+++ b/mozilla/calendar/locales/en-US/chrome/lightning/lightning.dtd
@@ -65,9 +65,6 @@
 <!ENTITY lightning.sidebar.agenda.label      "Agenda">
 <!ENTITY lightning.sidebar.todo.label        "Todo">
 <!ENTITY lightning.sidebar.calendars.label   "Calendars">
-<!ENTITY lightning.sidebar.new.label         "New…">
-<!ENTITY lightning.sidebar.edit.label        "Edit…">
-<!ENTITY lightning.sidebar.delete.label      "Delete">
 <!ENTITY lightning.calendar.label            "Calendar">
 <!ENTITY lightning.calendar.accesskey        "C">
 <!ENTITY lightning.sidebar.showCompletedTasks.label "Show completed tasks">
@@ -87,12 +84,16 @@
 <!ENTITY customize.toolbar.location.bottom   "Bottom">
 
 <!-- Messenger Toolbar -->
-<!ENTITY lightning.toolbar.dayview.label     "Day View">
-<!ENTITY lightning.toolbar.dayview.accesskey "D">
-<!ENTITY lightning.toolbar.weekview.label    "Week View">
-<!ENTITY lightning.toolbar.weekview.accesskey "W">
-<!ENTITY lightning.toolbar.monthview.label   "Month View">
-<!ENTITY lightning.toolbar.monthview.accesskey "M">
+<!ENTITY lightning.toolbar.edit.calendar.label       "Edit selected calendar">
+<!ENTITY lightning.toolbar.edit.calendar.accesskey   "E">
+<!ENTITY lightning.toolbar.delete.calendar.label     "Delete selected calendar">
+<!ENTITY lightning.toolbar.delete.calendar.accesskey "t">
+<!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.month.label               "Month">
+<!ENTITY lightning.toolbar.month.accesskey           "M">
 
 <!--Views' context menu-->
 <!ENTITY lightning.context.deleteitem.accesskey  "D">