diff --git a/api/js/etemplate/Et2Switch/Et2SwitchIcon.ts b/api/js/etemplate/Et2Switch/Et2SwitchIcon.ts
index 8758b57868..1d1870a974 100644
--- a/api/js/etemplate/Et2Switch/Et2SwitchIcon.ts
+++ b/api/js/etemplate/Et2Switch/Et2SwitchIcon.ts
@@ -149,6 +149,7 @@ export class Et2SwitchIcon extends Et2InputWidget(LitElement)
 	{
 		return html`
             <sl-switch
+                    part="switch"
                     exportparts="base:switch-label"
                     .label=${this.label}
                     .value=${live(this.value)}
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 71d9efd861..658dd49534 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -2762,6 +2762,15 @@ div.et2_toolbar.ui-widget-header {
 	height: 18px;
 }
 
+.et2_toolbar .ui-toolbar-menulist et2-switch-icon::part(switch-label),
+.et2_toolbar .ui-toolbar-menulist et2-switch-icon::part(switch) {
+	width: 100%;
+}
+
+.et2_toolbar .ui-toolbar-menulist et2-switch-icon::part(control) {
+	width: 100%;
+	justify-content: space-evenly;
+}
 et2-button.transparent-button {
 	border: none;
 	background: transparent;
diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index bd4b25770c..ac4968b3d1 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -428,7 +428,6 @@ class calendar_uiviews extends calendar_ui
 					$actions[$key]['toolbarDefault'] = true;
 				}
 			}
-			$actions['weekend']['data'] = array('toggle_off' => '7', 'toggle_on' => '5');
 			unset($actions['pgp']);
 		}
 		return $actions;