Rename throbber2 back to throbber so that other themes can override it

calendar/resources/content/calendar.xul

@@ -450,7 +450,7 @@
 
       <spacer flex="1"/>
       <hbox id="throbber-box" align="center">
-         <button id="navigator-throbber2"
+         <button id="navigator-throbber"
                  oncommand="displayCalendarVersion()"
                  tooltiptext="&throbber.tooltip;"/>
       </hbox>

calendar/resources/skin/classic/calendar.css

@@ -286,14 +286,21 @@
  *   Throbber button
  *-------------------------------------------------------------------*/
 
-#navigator-throbber2 {
+#navigator-throbber {
    -moz-appearance: none;
+   -moz-binding: url("chrome://global/content/bindings/button.xml#button-image");
    -moz-user-focus: ignore;
-  margin: 0 !important;
-  border: none !important;
-  padding: 0px !important;
+   -moz-box-align: center;
+   -moz-box-pack: center;
+   margin: 1px 2px 1px 10px;
+   border: 2px solid;
+   -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight;
+   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
+   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
+   -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight;
+   -moz-border-radius: 0;
+   padding: 1px;
    min-width: 0;
-  background-color: transparent;
    list-style-image: url('chrome://calendar/content/sunbird_small.png');
 }
 

calendar/resources/skin/modern/calendar.css

@@ -292,15 +292,21 @@
 /*--------------------------------------------------------------------
  *   Throbber button
  *-------------------------------------------------------------------*/
-
-#navigator-throbber2 {
+#navigator-throbber {
    -moz-appearance: none;
+   -moz-binding: url("chrome://global/content/bindings/button.xml#button-image");
    -moz-user-focus: ignore;
-  margin: 0 !important;
-  border: none !important;
-  padding: 0px !important;
+   -moz-box-align: center;
+   -moz-box-pack: center;
+   margin: 1px 2px 1px 10px;
+   border: 2px solid;
+   -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight;
+   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
+   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
+   -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight;
+   -moz-border-radius: 0;
+   padding: 1px;
    min-width: 0;
-  background-color: transparent;
    list-style-image: url('chrome://calendar/content/sunbird_small.png');
 }