diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index 9a4484bc10..655e159447 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -179,6 +179,10 @@ div.calendar_conflicts {
   width: 22px;
   height: 22px;
 }
+.calendar_conflicts table[id*="conflicting_participants"] > tbody > tr.r .et2_label {
+  /* Color for resources */
+  color: blue;
+}
 /* Loader - hide sizing behind overlay*/
 #egw-loadin-prompt_calendar::before {
   opacity: 1;
@@ -391,13 +395,13 @@ Hide subsequent headers in week view with non-consolidated owners
   top: 2em;
 }
 #calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {
-  height: calc(33.5em);
+  height: calc(1.5em + 32px);
 }
 #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
   white-space: nowrap;
   display: block;
   position: static;
-  width: calc(42%);
+  width: calc(100% - 58px);
   margin-left: 58px;
   color: white;
   background-color: #2D6393;
@@ -2736,7 +2740,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
   filter: none !important;
 }
 #calendar-toolbar_toolbar span.et2_checkbox_slideSwitch {
-  margin: 0px;
   height: 22px;
 }
 #calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container {
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index bf26c75b30..150e517f45 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -383,13 +383,13 @@ Hide subsequent headers in week view with non-consolidated owners
   top: 2em;
 }
 #calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {
-  height: calc(33.5em);
+  height: calc(1.5em + 32px);
 }
 #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
   white-space: nowrap;
   display: block;
   position: static;
-  width: calc(42%);
+  width: calc(100% - 58px);
   margin-left: 58px;
   color: white;
   background-color: #2D6393;
@@ -1632,13 +1632,13 @@ img.sideboxstar:active {
 .calendar_calEventBodySmall img[src$="svg"],
 .calendar_calDayColHeader img[src$="svg"] {
   background-color: #0c5da5;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5));
-  background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: -o-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: linear-gradient(top, #0c5da5, #0c5da5);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMEM1REE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMEM1REE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: -ms-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0C5DA5), to(#0C5DA5));
+  background-image: -webkit-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: -o-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: linear-gradient(top, #0C5DA5, #0C5DA5);
   background-repeat: repeat-x;
 }
 /* calender view*/
@@ -1662,26 +1662,26 @@ div.calendar {
   /* They are the navigation buttons */
   padding: 2px;
   /* Make the buttons seem like they're pressing */
-  background-color: #ffdd73;
+  background-color: #FFDD73;
 }
 .calendar .nav {
   /*background: url(../images/menuarrow.png) no-repeat 100% 100%;*/
   background-image: none;
-  background-color: #ffdd73;
+  background-color: #FFDD73;
 }
 .calendar thead .title {
   /* This holds the current "month, year" */
   font-weight: bold;
   /* Pressing it will take you to the current date */
   /*text-align: center;*/
-  background-color: #679fd2;
+  background-color: #679FD2;
 }
 .calendar thead .title:hover {
-  background-color: #e6e6e6 !important;
+  background-color: #E6E6E6 !important;
 }
 .calendar thead .headrow {
   /* Row <TR> containing navigation buttons */
-  background-color: #ffdd73;
+  background-color: #FFDD73;
   color: #fff;
 }
 .calendar thead .daynames {
@@ -1711,7 +1711,7 @@ div.calendar {
 }
 .calendar thead .active {
   /* Active (pressed) buttons in header */
-  background_color: #408dd2;
+  background_color: #408DD2;
   /*padding: 2px 0px 0px 2px;*/
 }
 .calendar tbody tr,
@@ -1756,7 +1756,7 @@ div.calendar {
   /*border: 0px solid @gray_50;*/
   /*padding: 1px 3px 1px 1px;*/
   /*padding: 0px;*/
-  background-color: #ffdd73;
+  background-color: #FFDD73;
   color: #000;
   -webkit-box-shadow: inset 1px 2px 1px #000000;
   -moz-box-shadow: inset 1px 2px 1px #000000;
@@ -1938,7 +1938,7 @@ div.calendar {
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 }
 #calendar-edit #calendar-edit_calendar-edit-details #calendar-edit_details_alarms {
-  background-color: #cdcdcd;
+  background-color: #CDCDCD;
   display: block !important;
 }
 #calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_details_category {
@@ -1956,7 +1956,7 @@ div.calendar {
 }
 #calendar-edit #calendar-edit_calendar-edit-description #calendar-edit_category {
   border: 1px solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
@@ -2063,10 +2063,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 */
 .calendar_calToday,
 .calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
-  background-color: #ffdd73;
+  background-color: #FFDD73;
 }
 .calendar_calWeek {
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   width: auto;
   margin: 0 auto;
   text-align: center;
@@ -2074,7 +2074,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 }
 .calendar_calMonth {
   /*.background_table_cal_head;*/
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   width: auto;
   margin: 0 auto;
   text-align: center;
@@ -2182,12 +2182,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
      *  border-color: depending on category
      *  background: depending on category (shade)
      */
-  background-color: #679fd2;
+  background-color: #679FD2;
   border-top: 1px solid;
 }
 .calendar_calEvent:not([class*=" cat_"]) {
   /* Defaults for no category, so we don't override it */
-  background-color: #679fd2;
+  background-color: #679FD2;
 }
 /**
  * All participants accepted the invitation
@@ -2203,7 +2203,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   overflow: auto;
 }
 .calendar_calDayColHeader .calendar_calAddEvent:hover {
-  background-color: #ffdd73;
+  background-color: #FFDD73;
   cursor: pointer;
   color: #ffffff;
 }
@@ -2228,7 +2228,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   position: absolute;
   right: 0px;
   top: 0px;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
@@ -2250,13 +2250,13 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 }
 .calendar_calDayTodos .calendar_calDayTodosHeader a img[src$="svg"] {
   background-color: #0c5da5;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5));
-  background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: -o-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: linear-gradient(top, #0c5da5, #0c5da5);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMEM1REE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMEM1REE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: -ms-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0C5DA5), to(#0C5DA5));
+  background-image: -webkit-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: -o-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: linear-gradient(top, #0C5DA5, #0C5DA5);
   background-repeat: repeat-x;
 }
 .calendar_calDayTodos .calendar_calDayTodosHeader a img {
@@ -2277,7 +2277,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   width: 16px;
   height: 16px;
 }
@@ -2288,7 +2288,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   background-color: inherit;
 }
 .calendar_calDayTodos .calendar_calDayTodosTable table tr:nth-child(even) {
-  background: #ffffff;
+  background: #FFFFFF;
 }
 .calendar_calDayTodos .calendar_calDayTodosTable table tr:nth_child(odd) {
   background: #f2f2f2;
@@ -2298,13 +2298,13 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 }
 .calendar_calDayTodos .calendar_calDayTodosTable table td img[src$="svg"] {
   background-color: #0c5da5;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5));
-  background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: -o-linear-gradient(top, #0c5da5, #0c5da5);
-  background-image: linear-gradient(top, #0c5da5, #0c5da5);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMEM1REE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMEM1REE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: -ms-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0C5DA5), to(#0C5DA5));
+  background-image: -webkit-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: -o-linear-gradient(top, #0C5DA5, #0C5DA5);
+  background-image: linear-gradient(top, #0C5DA5, #0C5DA5);
   background-repeat: repeat-x;
 }
 .calendar_calDayTodos .calendar_calDayTodosTable table td img {
@@ -2473,7 +2473,7 @@ button#series {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2483,13 +2483,13 @@ button#series {
 }
 button#series img[url*="svg"] {
   background-color: #b4b4b4;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-  background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+  background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
   background-repeat: repeat-x;
   fill: red;
 }
@@ -2526,7 +2526,7 @@ button#exception {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2536,13 +2536,13 @@ button#exception {
 }
 button#exception img[url*="svg"] {
   background-color: #b4b4b4;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-  background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+  background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
   background-repeat: repeat-x;
   fill: red;
 }
@@ -2606,22 +2606,22 @@ div#calendar-container div.calendar table {
   font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif;
 }
 div#calendar-container div.calendar table thead .button {
-  background-color: #ffdd73;
+  background-color: #FFDD73;
 }
 div#calendar-container div.calendar table thead .title {
   border: none;
   box-shadow: none;
   -webkit-box-shadow: none;
-  background-color: #ffdd73;
+  background-color: #FFDD73;
 }
 div#calendar-container div.calendar table thead .headrow {
-  color: #1e1e1e;
+  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;
+  background-color: #679FD2;
 }
 div#calendar-container div.calendar table tbody tr.daysrow:hover {
   background-color: #ffc200;
@@ -2650,7 +2650,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
   box-shadow: none;
 }
 #calendar-sidebox_date .ui-datepicker-today {
-  background-color: #ffdd73;
+  background-color: #FFDD73;
 }
 #calendar-sidebox_date .ui-datepicker-calendar .ui-state-hover {
   background-color: rgba(153, 204, 255, 0.4);
@@ -2728,7 +2728,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
   filter: none !important;
 }
 #calendar-toolbar_toolbar span.et2_checkbox_slideSwitch {
-  margin: 0px;
   height: 22px;
 }
 #calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container {
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index b30c93e5fc..03127bb46e 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -1233,7 +1233,6 @@ div#calendar-container {
 		}
 	}
 	span.et2_checkbox_slideSwitch {
-		margin: 0px;
 		height: 22px;
 		span.slideSwitch_container {
 			span.on {