Fixing look of top multiweek view button.

calendar/resources/content/calendar.xul

@@ -292,7 +292,7 @@
 		<toolbarseparator class="toolbarseparator-primary"/>
 		<toolbarbutton class="toolbarbutton-1" id="calendar-day-view-button"       label="&calendar.dayview.button.label;"         tooltiptext="&calendar.dayview.button.tooltip;"      observes="day_view_command"/>
 		<toolbarbutton class="toolbarbutton-1" id="calendar-week-view-button"      label="&calendar.weekview.button.label;"        tooltiptext="&calendar.weekview.button.tooltip;"     observes="week_view_command"/>
-		<toolbarbutton class="toolbarbutton-2" id="calendar-multiweek-view-button"     label="&calendar.multiweekview.button.label;"       tooltiptext="&calendar.multiweekview.button.tooltip;"    observes="multiweek_view_command"/>
+		<toolbarbutton class="toolbarbutton-1" id="calendar-multiweek-view-button"     label="&calendar.multiweekview.button.label;"       tooltiptext="&calendar.multiweekview.button.tooltip;"    observes="multiweek_view_command"/>
 		<toolbarbutton class="toolbarbutton-1" id="calendar-month-view-button"     label="&calendar.monthview.button.label;"       tooltiptext="&calendar.monthview.button.tooltip;"    observes="month_view_command"/>
 
 		<spacer flex="1"/>

calendar/resources/locale/en-US/calendar.dtd

@@ -155,7 +155,7 @@
 <!ENTITY calendar.flat.topbar.dayview          "Day View" >
 <!ENTITY calendar.flat.topbar.weekview         "Week View" >
 <!ENTITY calendar.flat.topbar.monthview        "Month View" >
-<!ENTITY calendar.flat.topbar.multiweekview   "Multiweek View" >
+<!ENTITY calendar.flat.topbar.multiweekview   "Multiweek" >
 
 <!ENTITY calendar.tools.delete.tooltip         "Delete Event" >
 <!ENTITY calendar.tools.modify.tooltip         "Modify Event" >
@@ -224,7 +224,7 @@
 <!ENTITY calendar.dayview.button.label          "Day View" >
 <!ENTITY calendar.weekview.button.label         "Week View" >
 <!ENTITY calendar.monthview.button.label        "Month View" >
-<!ENTITY calendar.multiweekview.button.label        "Multiweek View" >
+<!ENTITY calendar.multiweekview.button.label        "Multiweek" >
 <!ENTITY calendar.onlyworkday.checkbox.label    "Monday-Friday Only" >
 <!ENTITY calendar.displaytodos.checkbox.label   "Tasks in View" >
 

calendar/resources/skin/classic/calendar.css

@@ -197,19 +197,8 @@
 /*--------------------------------------------------------------------
  *   Change to multiweek view button
  *-------------------------------------------------------------------*/
-/* OLD
-    -moz-image-region: rect(42px 32px 63px 0px);
-    -moz-image-region: rect(42px 128px 63px 96px);
-    -moz-image-region: rect(42px 64px 63px 32px);
-*/
-.toolbarbutton-2 {
+.toolbarbutton-1#calendar-multiweek-view-button {
   list-style-image: url("chrome://calendar/skin/btnwm1.gif");
-  min-width       : 47px ;
-  -moz-box-orient : vertical ;
-  padding-top     : 2px ;
-  padding-right   : 7px ;
-  padding-bottom  : 2px ;
-  padding-left    : 6px ;
 }
 
 #calendar-multiweek-view-button 

calendar/resources/skin/modern/calendar.css

@@ -204,14 +204,8 @@
 /*--------------------------------------------------------------------
  *   Change to multiweek view button
  *-------------------------------------------------------------------*/
-.toolbarbutton-2 {
+.toolbarbutton-1#calendar-multiweek-view-button {
   list-style-image: url("chrome://calendar/skin/btnwm1.gif");
-  min-width       : 47px ;
-  -moz-box-orient : vertical ;
-  padding-top     : 2px ;
-  padding-right   : 7px ;
-  padding-bottom  : 2px ;
-  padding-left    : 6px ;
 }
 
 #calendar-multiweek-view-button