diff --git a/api/js/etemplate/et2_widget_toolbar.js b/api/js/etemplate/et2_widget_toolbar.js
index 3fbe960455..1bfee9563c 100644
--- a/api/js/etemplate/et2_widget_toolbar.js
+++ b/api/js/etemplate/et2_widget_toolbar.js
@@ -709,8 +709,8 @@ var et2_toolbar = (function(){ "use strict"; return et2_DOMWidget.extend([et2_II
 	_admin_settings_dialog: function (_actions, _default_prefs)
 	{
 		var buttons = [
-			{text: egw.lang("Close"), id:"close"},
 			{text: egw.lang("Save"), id:"save"},
+			{text: egw.lang("Close"), id:"close"}
 		];
 		var self = this;
 		var sel_options = {actions:[]};
@@ -767,7 +767,7 @@ var et2_toolbar = (function(){ "use strict"; return et2_DOMWidget.extend([et2_II
 			},
 			title: egw.lang('admin settings for %1', this.dom_id),
 			buttons: buttons,
-			minWidth: 500,
+			minWidth: 600,
 			minHeight: 300,
 			value:{content: content, sel_options: sel_options},
 			template: egw.webserverUrl+'/api/templates/default/toolbarAdminSettings.xet?1',
diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index e10387ba0c..84f5e174cc 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -350,7 +350,7 @@ class calendar_uiviews extends calendar_ui
 			),
 			'weekend' => array(
 				'caption' => 'Weekend',
-				'icon' => 'weekend',
+				'icon' => '7_day_view',
 				'checkbox'	=> true,
 				'checked' => $this->cal_prefs['saved_states']['weekend'],
 				'group' => $group,
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index efd8ce1b32..b57e2a70c4 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1542,4 +1542,6 @@ img.calendar_print_button, img.calendar_print_appicon {
 #calendar-edit_quantity, #calendar-edit_role {float:left;}
 
 .category_report_cats {height:80%;overflow-y: auto;display:block;}
-#calendar-category_report_grid {display:block;max-height: 550px;overflow-y: auto;}
\ No newline at end of file
+#calendar-category_report_grid {display:block;max-height: 550px;overflow-y: auto;}
+
+#toolbar-weekend {background-image: none !important}
\ No newline at end of file
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index fffad1a4d3..981233d2a9 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -1518,6 +1518,9 @@ img.calendar_print_appicon {
   max-height: 550px;
   overflow-y: auto;
 }
+#toolbar-weekend {
+  background-image: none !important;
+}
 /*generell*/
 .egw_fw_content_browser_iframe img[src$="svg"] {
   background-color: #828282 !important;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index fb7a271410..d8e3bd7bfe 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -164,10 +164,9 @@ div.calendar_conflicts {
   overflow-y: auto;
 }
 .calendar_conflicts img {
-	width: 22px;
-	height: 22px;
+  width: 22px;
+  height: 22px;
 }
-
 /* Loader - hide sizing behind overlay*/
 #egw-loadin-prompt_calendar::before {
   opacity: 1;
@@ -1511,6 +1510,9 @@ img.calendar_print_appicon {
   max-height: 550px;
   overflow-y: auto;
 }
+#toolbar-weekend {
+  background-image: none !important;
+}
 /*generell*/
 .egw_fw_content_browser_iframe img[src$="svg"] {
   background-color: #828282 !important;