diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index 2f40d9f6c4..b9ae75c253 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -685,7 +685,7 @@ class calendar_uiviews extends calendar_ui
 			$content .= $this->timeGridWidget($this->tagWholeDayOnTop($week),$weeks == 2 ? 30 : 60,200,'',$title,0,$week_start+WEEK_s >= $this->last);
 		}
 		
-		$navHeader = '<div class="calendar_calMonth">'
+		$navHeader = '<div class="calendar_calMonthNavHeader calendar_calMonth">'
 				.html::a_href(html::image('phpgwapi','left',lang('previous'),$options=' alt="<<"'),array(
 				'menuaction' => $this->view_menuaction,
 				'date'       => date('Ymd',strtotime("-".$weekNavH,  $weeks? $this->first: $this->bo->date2ts($this->date))),
@@ -851,7 +851,7 @@ class calendar_uiviews extends calendar_ui
 		#		$class = $class == 'row_on' ? 'th' : 'row_on';
 		//echo "<p>weekdaystarts='".$this->cal_prefs['weekdaystarts']."', get_weekday_start($this->year,$this->month,$this->day)=".date('l Y-m-d',$wd_start).", first=".date('l Y-m-d',$this->first)."</p>\n";
 		
-		$navHeader = '<div class="calendar_calWeek">'
+		$navHeader = '<div class="calendar_calWeek calendar_calWeekNavHeader">'
 				.html::a_href(html::image('phpgwapi','left',lang('previous'),$options=' alt="<<"'),array(
 				'menuaction' => $this->view_menuaction,
 				'date'       => date('Ymd',$this->first-$days*DAY_s),
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 38f11e7da8..74401c7e12 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -173,7 +173,24 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calDayColHeader img {
 	vertical-align: middle;
 }
-
+.calendar_calWeekNavHeader,.calendar_calMonthNavHeader {
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  right: 0px;
+  /* does not work in IE, but looks better in other browsers then width:100% */
+  text-align: center;
+  font-size: 100%;
+  white-space: nowrap;
+  border-bottom: 1px solid silver;
+  border-right: 1px solid silver;
+  height: 16px;
+  line-height: 12px;
+  z-index: 30;
+}
+.calendar_calWeekNavHeader,.calendar_calMonthNavHeader img {
+  vertical-align: middle;
+}
 .calendar_calViewUserNameBox {
 	position: absolute;
 	top: -1px;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 0df4ebc5be..aa97a53a22 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
  * @package calendar
  * @version $Id$
  */
-/* $Id: app.css 45624 2014-02-10 08:53:42Z hnategh $ */
+/* $Id: app.css 45951 2014-02-25 14:20:27Z hnategh $ */
 .calendar_inputFullWidth input {
   width: 100%;
 }
@@ -185,6 +185,26 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calDayColHeader img {
   vertical-align: middle;
 }
+.calendar_calWeekNavHeader,
+.calendar_calMonthNavHeader {
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  right: 0px;
+  /* does not work in IE, but looks better in other browsers then width:100% */
+  text-align: center;
+  font-size: 100%;
+  white-space: nowrap;
+  border-bottom: 1px solid silver;
+  border-right: 1px solid silver;
+  height: 16px;
+  line-height: 12px;
+  z-index: 30;
+}
+.calendar_calWeekNavHeader,
+.calendar_calMonthNavHeader img {
+  vertical-align: middle;
+}
 .calendar_calViewUserNameBox {
   position: absolute;
   top: -1px;
@@ -1378,6 +1398,26 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calDayColHeader img {
   vertical-align: middle;
 }
+.calendar_calWeekNavHeader,
+.calendar_calMonthNavHeader {
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  right: 0px;
+  /* does not work in IE, but looks better in other browsers then width:100% */
+  text-align: center;
+  font-size: 100%;
+  white-space: nowrap;
+  border-bottom: 1px solid silver;
+  border-right: 1px solid silver;
+  height: 16px;
+  line-height: 12px;
+  z-index: 30;
+}
+.calendar_calWeekNavHeader,
+.calendar_calMonthNavHeader img {
+  vertical-align: middle;
+}
 .calendar_calViewUserNameBox {
   position: absolute;
   top: -1px;
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 150cd34549..d91a8d4847 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -905,7 +905,23 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calDayColHeader img {
     vertical-align: middle;
 }
-
+.calendar_calWeekNavHeader,.calendar_calMonthNavHeader{
+    top: 0px;
+    left: 0px;
+    width: 100%;
+    right: 0px;	/* does not work in IE, but looks better in other browsers then width:100% */
+    text-align: center;
+    font-size: 100%; 
+    white-space: nowrap;
+    border-bottom: 1px solid silver;
+    border-right: 1px solid silver;
+    .dimension_height_s;
+    line-height: 12px;
+    z-index: 30;
+}
+.calendar_calWeekNavHeader,.calendar_calMonthNavHeader img{
+    vertical-align: middle;
+}
 .calendar_calViewUserNameBox {
     position: absolute;
     top: -1px;