diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 45e88192d8..e0b04610d1 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -2901,10 +2901,6 @@ div.et2_toolbar.ui-widget-header {
     height: 18px;
 }
 
-.nextmatch_header_row et2-button img {
-    width: 16px;
-}
-
 et2-button.transparent-button {
     border: none;
     background: transparent;
@@ -3134,10 +3130,6 @@ et2-button.transparent-button::part(container) {
     width: 1em;
     overflow: hidden;
 }
-.et2_toolbar_actionlist et2-button::part(prefix),
-.ui-toolbar-menulist et2-button::part(prefix){
-    width: 1.2em;
-}
 .et2_toolbar_actionlist et2-button.et2_toolbar_hasCaption {
     width:auto;
 }
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index ea2cfa9db5..c78d0e4f09 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1562,7 +1562,7 @@ img.calendar_print_button, img.calendar_print_appicon {
 	padding: 4px 3px 3px;
 	background: #b4cee773;
 	border-radius: 3px;
-	width: 25em;
+	min-width: 19em;
 	border: 1px solid #d4d4d8;
 	text-align: center;
 }
@@ -1576,7 +1576,7 @@ img.calendar_print_button, img.calendar_print_appicon {
 #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch,
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"] ,
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"] {
-	background-size: 16px;
+	background-size: 20px;
 	background-repeat: no-repeat;
 	background-position: center;
 	filter: grayscale(1) contrast(0.9999) opacity(0.7);
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index b4b5f49b64..9fd3888caf 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1518,7 +1518,7 @@ img.calendar_print_appicon {
   padding: 4px 3px 3px;
   background: #b4cee773;
   border-radius: 3px;
-  width: 25em;
+  min-width: 19em;
   border: 1px solid #d4d4d8;
   text-align: center;
 }
@@ -1530,7 +1530,7 @@ img.calendar_print_appicon {
 #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch,
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"],
 #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"] {
-  background-size: 16px;
+  background-size: 20px;
   background-repeat: no-repeat;
   background-position: center;
   filter: grayscale(1) contrast(0.9999) opacity(0.7);