diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index fb94340a54..fa5096c795 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -727,12 +727,12 @@ div.calendar {
   /* They are the navigation buttons */
   padding: 2px;
   /* Make the buttons seem like they're pressing */
-  background-color: #ffdd73;
+  background-color: #ffc200;
 }
 .calendar .nav {
   /*background: url(../images/menuarrow.png) no-repeat 100% 100%;*/
   background-image: none;
-  background-color: #ffdd73;
+  background-color: #ffc200;
 }
 .calendar thead .title {
   /* This holds the current "month, year" */
@@ -740,15 +740,13 @@ div.calendar {
   /* Pressing it will take you to the current date */
   /*text-align: center;*/
   background-color: #679fd2;
-  /*color: #000;*/
-  /*padding: 2px;*/
 }
 .calendar thead .title:hover {
   background-color: #e6e6e6 !important;
 }
 .calendar thead .headrow {
   /* Row <TR> containing navigation buttons */
-  background-color: #ffdd73;
+  background-color: #ffc200;
   color: #fff;
 }
 .calendar thead .daynames {
@@ -836,7 +834,8 @@ div.calendar {
 .calendar tbody td.today {
   /* Cell showing selected date */
   font-weight: normal;
-  color: #00f;
+  color: #0c5da5;
+  background-color: #ffc200;
 }
 .calendar tbody .disabled {
   color: #999;
@@ -1275,7 +1274,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 /* marks a day in the colum-header as today
 */
 .calendar_calToday {
-  background-color: #ffdd73;
+  background-color: #ffc200;
 }
 .calendar_calWeek {
   background-color: #ffffff;
@@ -1295,10 +1294,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 /* marks a day in the colum-header as holiday
 */
 .calendar_calHoliday {
-  background-color: #ffdd73;
+  background-color: #679fd2;
 }
 .calendar_calHoliday a {
-  color: #1e1e1e !important;
+  color: #e6e6e6 !important;
   font-size: 0.9em;
 }
 /* marks a day in the column-header additionaly as birthday of some contact,
@@ -1405,12 +1404,18 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   line-height: 12px;
   z-index: 30;
 }
+.calendar_calDayColHeader a img,
+.calendar_calGridHeader a img {
+  position: relative;
+  top: 0px;
+}
 .calendar_calGridHeader {
   border: none;
 }
 .calendar_calDayColHeader img {
   vertical-align: middle;
 }
+/*header for the weekCol*/
 .calendar_calWeekNavHeader,
 .calendar_calMonthNavHeader {
   top: 3px;
@@ -1433,6 +1438,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   position: relative;
   top: 3px;
 }
+.calendar_calMonthNavHeader a img {
+  top: 0px;
+}
 .calendar_calWeekNavHeader,
 .calendar_calMonthNavHeader img {
   vertical-align: middle;
@@ -1728,6 +1736,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 /******************************************************
  * CSS settings for the planner views (calendar_plannerWidget) *
  ******************************************************/
+.row_on {
+  background-color: #ffffff;
+}
+.row_off {
+  background-color: #fafafa;
+}
 /* calendar_plannerWidget represents the whole planner, consiting of the calendar_plannerHeader and multiple plannerRowWidgets
  */
 .calendar_plannerWidget {
@@ -2176,18 +2190,23 @@ div#calendar-container div.calendar {
 }
 div#calendar-container div.calendar table {
   background-color: #fafafa;
-  font-family: Verdana, Helvetica, Sans-Serif;
-  /*    font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/
+  font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif;
+}
+div#calendar-container div.calendar table thead .button {
+  background-color: #ffdd73;
 }
 div#calendar-container div.calendar table thead .title {
   border: none;
   box-shadow: none;
   -webkit-box-shadow: none;
-  background-color: #ffc200;
+  background-color: #ffdd73;
 }
 div#calendar-container div.calendar table thead .headrow {
   color: #1e1e1e;
 }
+div#calendar-container div.calendar table thead .headrow td {
+  background-color: #ffc200;
+}
 div#calendar-container div.calendar table thead .daynames {
   background-color: #679fd2;
 }
@@ -2199,9 +2218,16 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
 }
 #calendar_cat_id,
 #calendar_filter,
-#uical_select_owner {
+#uical_select_owner,
+#calendar_merge {
   font-size: 11px;
 }
+#uical_select_owner {
+  margin: 9px 0 9px;
+}
+#calendar_merge {
+  margin: 9px 0 0 0;
+}
 /*#calendar_sidebox_content {
     .egw_fw_ui_category_content {
     // Last Element rounded