diff --git a/content/datepicker/datepicker.xml b/content/datepicker/datepicker.xml
index 6ee92d66a..85b003301 100644
--- a/content/datepicker/datepicker.xml
+++ b/content/datepicker/datepicker.xml
@@ -173,8 +173,8 @@
 				<parameter name="date"/>
 				<body><![CDATA[
 					try {
-						this.currentDay = date.getDate(); 
-						this.currentMonth = date.getMonth();
+						this.currentDay = date.getDate(); 
+						this.currentMonth = date.getMonth();
 						this.currentYear = date.getFullYear();
 					} catch(e) {}
 				]]></body>
@@ -184,7 +184,7 @@
 	<binding id="datepicker-view">
 		<content orient="vertical" today="" currentmonth="" currentyear="" ismonth="false" isyear="false">
 			<xul:toolbox>
-				<xul:toolbar anonid="datepicker-month-toolbar">
+				<xul:toolbar anonid="datepicker-month-toolbar" grippyhidden="true">
 					<xul:datepicker-button class="previous-month" oncommand="this.parentNode.parentNode.parentNode.currentMonth--"/>
 					<xul:datepicker-button class="today" oncommand="this.parentNode.parentNode.parentNode.setDate(new Date())"/>
 					<xul:toolbaritem orient="vertical">
@@ -313,54 +313,54 @@
 			]]></handler>
 		</handlers>
 	</binding>
-	<binding id="datepicker-button">
-		<content>
-			<xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle"/>
-		</content>
-		<implementation>
-			<constructor><![CDATA[
-				this.setAttribute("id", "spinbutton-arrow"+Math.random());
-				this.id=this.getAttribute("id");
+	<binding id="datepicker-button">
+		<content>
+			<xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle"/>
+		</content>
+		<implementation>
+			<constructor><![CDATA[
+				this.setAttribute("id", "spinbutton-arrow"+Math.random());
+				this.id=this.getAttribute("id");
 			]]></constructor>
-			<field name="_timer">null</field>
-			<field name="_delay">400</field>
-			<field name="id"></field>
-			<method name="_fireEvent">
-				<body><![CDATA[
-				var evt = document.createEvent("MouseEvents");
-				try {
-					evt.initMouseEvent("mousedown", true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, this);
-					this.dispatchEvent(evt);
-				} catch(e) {};
-			]]></body>
-			</method>
-		</implementation>
-		<handlers>
-			<handler event="click"><![CDATA[
-				this._delay = 400;
-				clearTimeout(this._timer);
-			]]></handler>
-			<handler event="mouseout"><![CDATA[
-				this._delay = 400;
-				clearTimeout(this._timer);
-			]]></handler>
-			<handler event="mouseup"><![CDATA[
-				this._delay = 400;
-				clearTimeout(this._timer);
-			]]></handler>
-			<handler event="mousedown" button="0"><![CDATA[
-				var evt = document.createEvent("MouseEvents");
-				try {
-					evt.initMouseEvent("action", true, true, window, 1, event.screenX, event.screenY, event.clientX, event.clientY, false, false, false, false, 0, this);
-				} catch(e) {};
-				this.dispatchEvent(evt);
-				this._timer = setTimeout("document.getElementById('"+this.id+"')._fireEvent()", this._delay);
-				if(this._delay>50) this._delay = this._delay*0.8;
-			]]></handler>
-			<handler event="action"><![CDATA[
-				var command = this.getAttribute("oncommand");
-				if(command!="") try {eval(command);} catch(e) {}
-			]]></handler>
-		</handlers>
+			<field name="_timer">null</field>
+			<field name="_delay">400</field>
+			<field name="id"></field>
+			<method name="_fireEvent">
+				<body><![CDATA[
+				var evt = document.createEvent("MouseEvents");
+				try {
+					evt.initMouseEvent("mousedown", true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, this);
+					this.dispatchEvent(evt);
+				} catch(e) {};
+			]]></body>
+			</method>
+		</implementation>
+		<handlers>
+			<handler event="click"><![CDATA[
+				this._delay = 400;
+				clearTimeout(this._timer);
+			]]></handler>
+			<handler event="mouseout"><![CDATA[
+				this._delay = 400;
+				clearTimeout(this._timer);
+			]]></handler>
+			<handler event="mouseup"><![CDATA[
+				this._delay = 400;
+				clearTimeout(this._timer);
+			]]></handler>
+			<handler event="mousedown" button="0"><![CDATA[
+				var evt = document.createEvent("MouseEvents");
+				try {
+					evt.initMouseEvent("action", true, true, window, 1, event.screenX, event.screenY, event.clientX, event.clientY, false, false, false, false, 0, this);
+				} catch(e) {};
+				this.dispatchEvent(evt);
+				this._timer = setTimeout("document.getElementById('"+this.id+"')._fireEvent()", this._delay);
+				if(this._delay>50) this._delay = this._delay*0.8;
+			]]></handler>
+			<handler event="action"><![CDATA[
+				var command = this.getAttribute("oncommand");
+				if(command!="") try {eval(command);} catch(e) {}
+			]]></handler>
+		</handlers>
 	</binding>
 </bindings>
\ No newline at end of file
