diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 897672ec44..f0cc2844f4 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1459,7 +1459,7 @@ img.calendar_print_button, img.calendar_print_appicon {
 	padding: 4px 3px 3px;
 	background: #b4cee773;
 	border-radius: 3px;
-	min-width: 19em;
+	min-width: fit-content;
 	border: 1px solid #d4d4d8;
 	text-align: center;
 }
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index b99d0119e1..3292586773 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -1424,11 +1424,11 @@ img.calendar_print_appicon {
 #calendar-toolbar_app_header {
   color: #000;
   font-size: 14px;
-  height: 1.7em;
+  height: 1.6em;
   padding: 4px 3px 3px;
   background: #b4cee773;
   border-radius: 3px;
-  min-width: 19em;
+  min-width: fit-content;
   border: 1px solid #d4d4d8;
   text-align: center;
 }
@@ -1436,7 +1436,6 @@ 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"],
@@ -1459,6 +1458,15 @@ et2-switch#calendar-toolbar_toolbar-weekend {
 #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/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 45f2b4ec4d..daad566182 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1416,7 +1416,7 @@ img.calendar_print_appicon {
   padding: 4px 3px 3px;
   background: #b4cee773;
   border-radius: 3px;
-  min-width: 19em;
+  min-width: fit-content;
   border: 1px solid #d4d4d8;
   text-align: center;
 }