diff --git a/calendar/js/app.js b/calendar/js/app.js
index 24e9ee0911..4d851e4cf6 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -2593,9 +2593,9 @@ app.classes.calendar = AppJS.extend(
 								}
 							}
 							// Add to, not replace, current value
-							if(typeof state[key] == 'object' && typeof app.calendar.state[key])
+							if(typeof state[key] == 'object' && typeof app.calendar.state[key] == 'object')
 							{
-								jQuery.extend(state[key],app.calendar.state[key]);
+								jQuery.merge(state[key],app.calendar.state[key]);
 							}
 						}
 					}
@@ -2706,14 +2706,13 @@ app.classes.calendar = AppJS.extend(
 			// Today
 			var today = et2_createWidget('buttononly', {image: 'calendar/today', label: 'Today', id: 'today'},date);
 			today.set_image('calendar/today');
+			today.set_label(egw.lang('Today'));
 			var today_button = $j(today.getDOMNode());
 			today_button
 				.prependTo(date.getDOMNode())
+				.addClass('et2_clickable')
 				.on('click', function() {
-					var inst = $j.datepicker._getInst(datepicker[0]);
-					inst.drawMonth = new Date().getUTCMonth();
-					inst.drawYear = new Date().getFullYear();
-					jQuery.datepicker._updateDatepicker(inst);
+					app.calendar.update_state({date: new Date().toJSON()});
 				});
 			var position_today = function() {
 				var week_col = $j('#calendar-sidebox_date th.ui-datepicker-week-col');
diff --git a/calendar/templates/default/sidebox.xet b/calendar/templates/default/sidebox.xet
index a51da44b42..827544bbd5 100644
--- a/calendar/templates/default/sidebox.xet
+++ b/calendar/templates/default/sidebox.xet
@@ -26,7 +26,7 @@ Egroupware
 				</columns>
 				<rows><row width="100%">
 				<buttononly align="center" class="sideboxstar" id="add" onclick="egw.open(null,'calendar','add');" image="new" label="Add"/>
-				<buttononly align="center" class="sideboxstar" id="day" image="today" label="Day view" onclick="app.calendar.update_state({view:'day'});"/>
+				<buttononly align="center" class="sideboxstar" id="day" image="day" label="Day view" onclick="app.calendar.update_state({view:'day'});"/>
 				<buttononly align="center" class="sideboxstar" id="week" image="week" label="Weekview" onclick="app.calendar.update_state({view:'week'});"/>
 				<buttononly align="center" class="sideboxstar" id="weekN" image="multiweek" label="Multiple week view" onclick="app.calendar.update_state({view:'weekN'});"/>
 				<buttononly align="center" class="sideboxstar" id="month" image="month" label="Month view" onclick="app.calendar.update_state({view:'month'});"/>
diff --git a/calendar/templates/pixelegg/images/day.png b/calendar/templates/pixelegg/images/day.png
new file mode 100755
index 0000000000..20a9b762ca
Binary files /dev/null and b/calendar/templates/pixelegg/images/day.png differ
diff --git a/calendar/templates/pixelegg/images/today.png b/calendar/templates/pixelegg/images/today.png
index 20a9b762ca..47396d1cd0 100755
Binary files a/calendar/templates/pixelegg/images/today.png and b/calendar/templates/pixelegg/images/today.png differ