diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 9b6088895f..30809b548e 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1481,6 +1481,18 @@ img.calendar_print_button, img.calendar_print_appicon {
 et2-switch#calendar-toolbar_toolbar-weekend {
 	background-image: none !important;
 }
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend::part(base){width: 100%}
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend .label span {
+	background-size: 20px;
+	height: 30px;
+}
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend .label {
+	width: 100%;
+}
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend {min-width: 60px;}
+et2-switch#calendar-toolbar_toolbar-weekend::part(control) {width: 100%;}
+et2-switch#calendar-toolbar_toolbar-weekend::part(label) {width: 100%;}
+
 #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch[checked],
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"][checked] ,
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"][checked]{
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index 8aecd45412..b99d0119e1 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -290,7 +290,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 }
 #calendar-view .calendar_calBirthday,
 #calendar-planner .calendar_plannerHeader .calendar_calBirthdayIcon {
-  background-image: url(../default/images/cake.svg);
+  background-image: url(../../../api/templates/default/images/cake.svg);
   background-repeat: no-repeat;
   background-size: 16px;
   background-position: 10px center;
@@ -1436,6 +1436,7 @@ img.calendar_print_appicon {
 #calendar-toolbar_toolbar et2-switch {
   height: var(--height);
   display: inline-flex;
+  min-width: 60px;
 }
 #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch,
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"],
@@ -1448,6 +1449,16 @@ img.calendar_print_appicon {
 et2-switch#calendar-toolbar_toolbar-weekend {
   background-image: none !important;
 }
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend::part(base) {
+  width: 100%;
+}
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend .label span {
+  background-size: 20px;
+  height: 30px;
+}
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend .label {
+  width: 100%;
+}
 #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch[checked],
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"][checked],
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"][checked] {
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index e713dd1b4a..89f52dbc4d 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1436,6 +1436,25 @@ img.calendar_print_appicon {
 et2-switch#calendar-toolbar_toolbar-weekend {
   background-image: none !important;
 }
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend::part(base) {
+  width: 100%;
+}
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend .label span {
+  background-size: 20px;
+  height: 30px;
+}
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend .label {
+  width: 100%;
+}
+#calendar-toolbar_toolbar et2-switch#calendar-toolbar_toolbar-weekend {
+  min-width: 60px;
+}
+et2-switch#calendar-toolbar_toolbar-weekend::part(control) {
+  width: 100%;
+}
+et2-switch#calendar-toolbar_toolbar-weekend::part(label) {
+  width: 100%;
+}
 #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch[checked],
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"][checked],
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"][checked] {