diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index 6726718cdd..e3755ff2df 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -484,9 +484,9 @@ function display_monthcalendar($month, $year, $agenda_items) {
 				if (($curday>0) && ($curday<=$numberofdays[$month])) {
 
 					$bgcolor = $ii<5 ? 'class="row_odd"' : 'class="row_even"';
-					$dayheader = "$curday";
+					$dayheader = Display::div($curday, array('class'=>'agenda_day'));
 
-					if (key_exists($curday, $agenda_items)) {					    
+					if (key_exists($curday, $agenda_items)) {				    
 					    $dayheader = Display::div($curday, array('class'=>'agenda_day'));
 						foreach ($agenda_items[$curday] as $value) {
     							$some_content = false;				
@@ -501,7 +501,8 @@ function display_monthcalendar($month, $year, $agenda_items) {
     								if (!empty($value['end_date']) && $value['end_date'] != '0000-00-00 00:00:00') {
     								   $end_time 	= '-&nbsp;<i>'.api_convert_and_format_date($value['end_date'],DATE_TIME_FORMAT_LONG);
     								}		
-    								$time = '<i>'.$start_time.'</i>&nbsp;'.$end_time;
+    								//$time = '<i>'.$start_time.'</i>&nbsp;'.$end_time;
+    								$time = '<i>'.$start_time.'</i>';
     												
     								switch($value['calendar_type']) {
     								    case 'personal':
@@ -524,13 +525,13 @@ function display_monthcalendar($month, $year, $agenda_items) {
     								$dayheader.= '<div class="rounded_div_agenda" style="background-color:'.$bg_color.';">';
     							                                                    
     								$value['title'] = Display::tag('strong', $value['title']);									
-    								$dayheader .= $time.' '.$subtitle.'<br />'.$value['title'];
+    								$dayheader .= $time.' '.$subtitle.' '.$value['title'];
     								$dayheader .= '</div>';
     							}
     							
     							//Do not show links with no content
     							if (!$some_content) {
-    								$dayheader = $curday;
+    								$dayheader = Display::div($curday, array('class'=>'agenda_day'));
     							}						    
 						}
 					}
diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php
index 7e290a841b..350398a74f 100755
--- a/main/calendar/myagenda.inc.php
+++ b/main/calendar/myagenda.inc.php
@@ -198,9 +198,9 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
 			}
 			if (($curday > 0) && ($curday <= $numberofdays[$month])) {
 				$bgcolor = $class = 'class="days_week"';
-				$dayheader = "<b>$curday</b><br />";
+				$dayheader = Display::div($curday, array('class'=>'agenda_day'));
 				if (($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
-					$dayheader = "<b>$curday</b><br />";
+					
 					$class = "class=\"days_today\" style=\"width:10%;\"";
 				}
 				echo "<td ".$class.">".$dayheader;
@@ -213,7 +213,8 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
                         if (!empty($value['end_date']) && $value['end_date'] != '0000-00-00 00:00:00') {
                            $end_time    = '-&nbsp;<i>'.api_convert_and_format_date($value['end_date'], DATE_TIME_FORMAT_LONG);
                         }       
-                        $time = '<i>'.$start_time.'</i>&nbsp;'.$end_time;  
+                        //$time = '<i>'.$start_time.'</i>&nbsp;'.$end_time;  
+                        $time = '<i>'.$start_time.'</i>';
 
 				        switch($value['calendar_type']) {
                             case 'personal':
@@ -235,12 +236,10 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
 				        $result = '<div class="rounded_div_agenda" style="background-color:'.$bg_color.';">';
                                                                     
                         $value['title'] = Display::tag('strong', $value['title']);                                  
-                        $result .= $time.' - '.$subtitle.'<br />'.$value['title'];                        
+                        $result .= $time.' '.$subtitle.' '.$value['title'];                        
                         $result .= '</div>';
                         echo $result;
 				   }
-				
-	         
 				}
 				echo "</td>";
 				$curday ++;
diff --git a/main/css/base.css b/main/css/base.css
index f73559859c..71f8474612 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -271,15 +271,15 @@ padding-top:10px;
 .rounded_div_agenda {
 	background: none repeat scroll 0 0 #FFFFFF;
         
-    -webkit-border-radius: 11px;
-    -opera-border-radius: 11px;
-    -moz-border-radius: 11px;
-    border-radius: 11px;
+    -webkit-border-radius: 6px;
+    -opera-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
         
-    -webkit-box-shadow: 0 4px 18px #C8C8C8;
-    -opera-box-shadow: 0 4px 18px #C8C8C8;
-    -moz-box-shadow: 0 4px 18px #C8C8C8;
-    box-shadow: 0 4px 18px #C8C8C8;
+    -webkit-box-shadow: 0 2px 5px #C8C8C8;
+    -opera-box-shadow: 0 2px 5px #C8C8C8;
+    -moz-box-shadow: 0 2px 5px #C8C8C8;
+    box-shadow: 0 2px 5px #C8C8C8;
     
     float: left;
     height: auto;
@@ -290,11 +290,25 @@ padding-top:10px;
 
 .agenda_day {
 	float:left;
-	margin:5px 5px 10px 5px;    
-	width:100%;
+	    
+	width:100%;	
+    background-color: #F8F9FF;    
+    color: #666666;
+    line-height: 16px;
+    overflow: hidden;    
+	margin-bottom:5px;
+}
+.days_today .agenda_day {
+    float:left;      
+	  
+    width:100%; 
+    background-color: #FAD163;    
+    color: #666666;
+    line-height: 16px;
+    overflow: hidden;    
+    margin-bottom:5px;    
 }
 
-
 a.tag {
     background-color: #E0EAF1;
     border-bottom: 1px solid #3E6D8E;