diff --git a/api/js/etemplate/et2_widget_toolbar.ts b/api/js/etemplate/et2_widget_toolbar.ts
index 99ddf776c3..fd5e7aaa89 100644
--- a/api/js/etemplate/et2_widget_toolbar.ts
+++ b/api/js/etemplate/et2_widget_toolbar.ts
@@ -630,6 +630,7 @@ export class et2_toolbar extends et2_DOMWidget implements et2_IInput
 				toggleOff: action.data.toggle_off,
 				class: `et2_toolbar_draggable${this.id}`,
 			}, this);
+			widget.style.backgroundImage = `url(${action.iconUrl})`;
 			widget.value = action.checked;
 			action.data.widget = widget;
 			widget.onchange = actionHandler;
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 1730726f8d..831928d88b 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -2797,6 +2797,10 @@ div.ui-dialog div.ui-dialog-content > div {
 
 .et2_toolbar *[class ^="et2_toolbar_draggable"] {cursor: pointer !important;}
 
+.et2_toolbar et2-button.et2_toolbar_onlyCaption,
+.et2_toolbar .et2_toolbar_actionlist et2-button.et2_toolbar_onlyCaption::part(prefix) {
+    width: auto;
+}
 div.et2_toolbar.ui-widget-header {
     background: none;
 }
@@ -2881,7 +2885,7 @@ div.et2_toolbar.ui-widget-header {
     background-color: #fafafa;
 }
 
-.et2_toolbar et2-button {
+.et2_toolbar et2-button, .et2_toolbar et2-switch {
     margin-right: 1ex;
     min-width: 24px;
 }
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 955b6d9071..0e88e6fa55 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1577,12 +1577,14 @@ img.calendar_print_button, img.calendar_print_appicon {
 	filter: grayscale(1) contrast(0.9999) opacity(0.7);
 	width: 24px;
 }
+et2-switch#calendar-toolbar_toolbar-weekend {
+	background-image: none !important;
+}
 #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]{
 	filter: none;
 	box-shadow: inset 1px 1px 1px 1px gray !important;
-	width: var(--width);
 }
 #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch span.label,
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"] span.label,
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 413b4da2fc..cdb6b52563 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1532,12 +1532,14 @@ img.calendar_print_appicon {
   filter: grayscale(1) contrast(0.9999) opacity(0.7);
   width: 24px;
 }
+et2-switch#calendar-toolbar_toolbar-weekend {
+  background-image: none !important;
+}
 #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] {
   filter: none;
   box-shadow: inset 1px 1px 1px 1px gray !important;
-  width: var(--width);
 }
 #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch span.label,
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"] span.label,