diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index 981233d2a9..c14342f354 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -175,6 +175,10 @@ div.calendar_conflicts {
   max-height: 540px;
   overflow-y: auto;
 }
+.calendar_conflicts img {
+  width: 22px;
+  height: 22px;
+}
 /* Loader - hide sizing behind overlay*/
 #egw-loadin-prompt_calendar::before {
   opacity: 1;
@@ -799,12 +803,17 @@ Hide subsequent headers in week view with non-consolidated owners
 }
 .calendar_calEventTooltip img {
   max-width: 1.5em;
+  vertical-align: middle;
+  padding-left: 5px;
+}
+.calendar_calEventTooltip [data-videoconference] {
+  cursor: pointer;
 }
 .calendar_calAddEvent {
   width: 100%;
   z-index: 10;
 }
-.calendar_calAddEvent:hover {
+.calendar_calDayColHeader .calendar_calAddEvent:hover {
   background-color: #D2D7FF;
   cursor: pointer;
 }
@@ -2172,7 +2181,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   max-height: 400px;
   overflow: auto;
 }
-.calendar_calAddEvent:hover {
+.calendar_calDayColHeader .calendar_calAddEvent:hover {
   background-color: #FFDD73;
   cursor: pointer;
   color: #ffffff;
@@ -2203,17 +2212,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
-.calendar_calEventIcons img[src$="svg"] {
-  background-color: #828282 !important;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjODI4MjgyIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjODI4MjgyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=) !important;
-  background-image: -moz-linear-gradient(top, #828282, #828282) !important;
-  background-image: -ms-linear-gradient(top, #828282, #828282) !important;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#828282), to(#828282)) !important;
-  background-image: -webkit-linear-gradient(top, #828282, #828282) !important;
-  background-image: -o-linear-gradient(top, #828282, #828282) !important;
-  background-image: linear-gradient(top, #828282, #828282) !important;
-  background-repeat: repeat-x !important;
-}
 .calendar_calEventHeaderSmall .calendar_calEventIcons img {
   height: 13px;
 }
@@ -2671,8 +2669,9 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
   background-color: transparent;
 }
 #calendar-sidebox_header_today {
-  width: 20px;
+  width: 19px;
   height: 20px;
+  margin-left: 6px;
   background-image: url('../../../pixelegg/images/bullet.svg');
   text-indent: 140%;
   border: none;
@@ -2701,20 +2700,20 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
 #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
   width: calc(100% - 58px);
 }
-span.et2_checkbox_slideSwitch.switchOn span.off {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch.switchOn span.off {
   filter: invert(1);
 }
-span.et2_checkbox_slideSwitch.switchOn span.on {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch.switchOn span.on {
   filter: none !important;
 }
-span.et2_checkbox_slideSwitch {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch {
   margin: 0px;
   height: 22px;
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container {
   padding: 0px;
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container span.on {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container span.on {
   background-image: url(../../../pixelegg/images/7_day_view.svg);
   background-size: 18px 18px;
   background-repeat: no-repeat;
@@ -2723,7 +2722,7 @@ span.et2_checkbox_slideSwitch span.slideSwitch_container span.on {
   top: 0;
   filter: invert(1);
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container span.off {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container span.off {
   background-image: url(../../../pixelegg/images/5_day_view.svg);
   background-size: 18px 18px;
   background-repeat: no-repeat;
@@ -2731,10 +2730,10 @@ span.et2_checkbox_slideSwitch span.slideSwitch_container span.off {
   height: 21px;
   top: 0;
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container span {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container span {
   color: transparent !important;
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container a {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container a {
   background: none;
 }
 /* ########################################################################################
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index f8287e1738..621b342383 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -2688,20 +2688,20 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
 #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
   width: calc(100% - 58px);
 }
-span.et2_checkbox_slideSwitch.switchOn span.off {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch.switchOn span.off {
   filter: invert(1);
 }
-span.et2_checkbox_slideSwitch.switchOn span.on {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch.switchOn span.on {
   filter: none !important;
 }
-span.et2_checkbox_slideSwitch {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch {
   margin: 0px;
   height: 22px;
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container {
   padding: 0px;
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container span.on {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container span.on {
   background-image: url(../../../pixelegg/images/7_day_view.svg);
   background-size: 18px 18px;
   background-repeat: no-repeat;
@@ -2710,7 +2710,7 @@ span.et2_checkbox_slideSwitch span.slideSwitch_container span.on {
   top: 0;
   filter: invert(1);
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container span.off {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container span.off {
   background-image: url(../../../pixelegg/images/5_day_view.svg);
   background-size: 18px 18px;
   background-repeat: no-repeat;
@@ -2718,10 +2718,10 @@ span.et2_checkbox_slideSwitch span.slideSwitch_container span.off {
   height: 21px;
   top: 0;
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container span {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container span {
   color: transparent !important;
 }
-span.et2_checkbox_slideSwitch span.slideSwitch_container a {
+#calendar-toolbar_toolbar span.et2_checkbox_slideSwitch span.slideSwitch_container a {
   background: none;
 }
 /* ########################################################################################
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 3e74122351..9c301a78da 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -1222,41 +1222,44 @@ div#calendar-container {
 		.calendar_calGridHeader  > span.et2_label {width:~"calc(100% - 58px)";}
 	}
 }
-span.et2_checkbox_slideSwitch.switchOn {
-	span.off {
-		filter: invert(1);
-	}
-	span.on {
-		filter: none !important;
-	}
-}
-span.et2_checkbox_slideSwitch {
-	margin: 0px;
-	height: 22px;
-	span.slideSwitch_container {
-		span.on {
-			background-image: url(../../../pixelegg/images/7_day_view.svg);
-			background-size: 18px 18px;
-			background-repeat: no-repeat;
-			background-position: center;
-			height: 21px;
-			top:0;
+#calendar-toolbar_toolbar {
+	span.et2_checkbox_slideSwitch.switchOn {
+		span.off {
 			filter: invert(1);
 		}
-		span.off {
-			background-image: url(../../../pixelegg/images/5_day_view.svg);
-			background-size: 18px 18px;
-			background-repeat: no-repeat;
-			background-position: center;
-			height: 21px;
-			top:0;
+		span.on {
+			filter: none !important;
 		}
-		padding: 0px;
-		span {color:transparent !important;}
+	}
+	span.et2_checkbox_slideSwitch {
+		margin: 0px;
+		height: 22px;
+		span.slideSwitch_container {
+			span.on {
+				background-image: url(../../../pixelegg/images/7_day_view.svg);
+				background-size: 18px 18px;
+				background-repeat: no-repeat;
+				background-position: center;
+				height: 21px;
+				top:0;
+				filter: invert(1);
+			}
+			span.off {
+				background-image: url(../../../pixelegg/images/5_day_view.svg);
+				background-size: 18px 18px;
+				background-repeat: no-repeat;
+				background-position: center;
+				height: 21px;
+				top:0;
+			}
+			padding: 0px;
+			span {color:transparent !important;}
 
-		a {background: none;}
+			a {background: none;}
+		}
 	}
 }
+
 /* ########################################################################################
 /* * Calendar END */