diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 4196b2b25a..3b70b04bf7 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1502,10 +1502,11 @@ img.calendar_print_button, img.calendar_print_appicon {
 	background-size: contain;
 	background-repeat: no-repeat;
 	background-position: center;
-	filter: grayscale(1) contrast(0.1);
+	filter: grayscale(1) contrast(0.9999) opacity(0.7);
 }
 #calendar-toolbar_toolbar span[id^="toolbar-integration_"].switchOn {
 	filter: none;
+	box-shadow: inset 1px 1px 1px 1px gray !important;
 }
 #calendar-toolbar_toolbar span[id^="toolbar-integration_"] span.slideSwitch_container {
 	background: none;
@@ -1596,7 +1597,7 @@ img.calendar_print_button, img.calendar_print_appicon {
 .category_report_cats {height:80%;overflow-y: auto;display:block;}
 #calendar-category_report_grid {display:block;max-height: 550px;overflow-y: auto;}
 
-#toolbar-weekend {background-image: none !important}
+#toolbar-weekend {background-image: none !important; filter:none;}
 
 #calendar-list_nm {
 	.nextmatch_header .header_count {margin-right:-4px;}
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index 1e4cf7cf26..61381ad0a9 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -1476,10 +1476,11 @@ img.calendar_print_appicon {
   background-size: contain;
   background-repeat: no-repeat;
   background-position: center;
-  filter: grayscale(1) contrast(0.1);
+  filter: grayscale(1) contrast(0.9999) opacity(0.7);
 }
 #calendar-toolbar_toolbar span[id^="toolbar-integration_"].switchOn {
   filter: none;
+  box-shadow: inset 1px 1px 1px 1px gray !important;
 }
 #calendar-toolbar_toolbar span[id^="toolbar-integration_"] span.slideSwitch_container {
   background: none;
@@ -1573,6 +1574,7 @@ img.calendar_print_appicon {
 }
 #toolbar-weekend {
   background-image: none !important;
+  filter: none;
 }
 #calendar-list_nm .nextmatch_header .header_count {
   margin-right: -4px;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 2c298fd8fa..7855053348 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1464,10 +1464,11 @@ img.calendar_print_appicon {
   background-size: contain;
   background-repeat: no-repeat;
   background-position: center;
-  filter: grayscale(1) contrast(0.1);
+  filter: grayscale(1) contrast(0.9999) opacity(0.7);
 }
 #calendar-toolbar_toolbar span[id^="toolbar-integration_"].switchOn {
   filter: none;
+  box-shadow: inset 1px 1px 1px 1px gray !important;
 }
 #calendar-toolbar_toolbar span[id^="toolbar-integration_"] span.slideSwitch_container {
   background: none;
@@ -1561,6 +1562,7 @@ img.calendar_print_appicon {
 }
 #toolbar-weekend {
   background-image: none !important;
+  filter: none;
 }
 #calendar-list_nm .nextmatch_header .header_count {
   margin-right: -4px;
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index cfcf949c2f..a3b27ced2c 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -1129,11 +1129,23 @@ body {
 #mail-compose .et2_toolbar button.toolbar_toggled:hover {
   background-color: white !important;
 }
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:hover,
 #mail-compose #mail-compose_composeToolbar button#composeToolbar-to_tracker:hover,
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:hover,
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:hover {
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:hover {
   background-color: rgba(153, 204, 255, 0.4);
+  box-shadow: none;
+}
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_tracker:not(.toolbar_toggled),
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:not(.toolbar_toggled) {
+  filter: grayscale(1) contrast(0.9999) opacity(0.9);
+}
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:hover,
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:hover {
+  background-color: rgba(153, 204, 255, 0.4);
+  box-shadow: none;
+}
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:not(.toolbar_toggled),
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:not(.toolbar_toggled) {
+  filter: grayscale(1) contrast(0.9999) opacity(0.7);
 }
 #mail-compose table.et2_grid {
   display: inline-block;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 0a131f9f64..670013e7dc 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1117,11 +1117,23 @@ body {
 #mail-compose .et2_toolbar button.toolbar_toggled:hover {
   background-color: white !important;
 }
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:hover,
 #mail-compose #mail-compose_composeToolbar button#composeToolbar-to_tracker:hover,
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:hover,
-#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:hover {
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:hover {
   background-color: rgba(153, 204, 255, 0.4);
+  box-shadow: none;
+}
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_tracker:not(.toolbar_toggled),
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-disposition:not(.toolbar_toggled) {
+  filter: grayscale(1) contrast(0.9999) opacity(0.9);
+}
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:hover,
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:hover {
+  background-color: rgba(153, 204, 255, 0.4);
+  box-shadow: none;
+}
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:not(.toolbar_toggled),
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_infolog:not(.toolbar_toggled) {
+  filter: grayscale(1) contrast(0.9999) opacity(0.7);
 }
 #mail-compose table.et2_grid {
   display: inline-block;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index b542efb8c7..c73a11a8e3 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -219,11 +219,16 @@ body {
 		button#composeToolbar-send {
 
 		}
-		button#composeToolbar-to_infolog:hover,
-		button#composeToolbar-to_tracker:hover,
-		button#composeToolbar-disposition:hover,
-		button#composeToolbar-to_calendar:hover {
-			background-color: @color_hover_row;;
+		button#composeToolbar-to_tracker,
+		button#composeToolbar-disposition
+		{
+			&:hover{background-color: @color_hover_row;box-shadow: none;}
+			&:not(.toolbar_toggled){filter: grayscale(1) contrast(0.9999) opacity(0.9);}
+		}
+		button#composeToolbar-to_calendar,
+		button#composeToolbar-to_infolog {
+			&:hover{background-color: @color_hover_row;box-shadow: none;}
+			&:not(.toolbar_toggled){filter: grayscale(1) contrast(0.9999) opacity(0.7);}
 		}
 	} // Toolbar Ende
 
@@ -1043,7 +1048,7 @@ input[type=button] {
 	height:35px;
     // alle Buttons / drag + drop
     #toolbar-actionlist{
-        
+
     }
     /* Elemente */
 	button {
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index bb47db2f68..843798faf6 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -1144,6 +1144,12 @@
   span.et2_checkbox_slideSwitch > span.slideSwitch_container {
     background-color: #fafafa;
   }
+  .et2_toolbar span.et2_checkbox_slideSwitch {
+    filter: grayscale(1) contrast(0.9999) opacity(0.7);
+  }
+  .et2_toolbar span.et2_checkbox_slideSwitch.switchOn {
+    filter: none;
+  }
   /*#################################### ADMIN PART #####################################################*/
   iframe#admin-index_iframe {
     background-color: yellow;
@@ -2364,15 +2370,15 @@ button.et2_button_text:hover,
 input[type=button]:hover {
   /*background-color: @gray_30;*/
   text-shadow: 0px 0px;
-  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
-  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
-  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
+  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
+  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 }
 button.et2_button_text:active,
 input[type=button]:active {
-  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
-  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
-  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
+  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 /* ########################################################################################
  * Content Element
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 6de69adbf5..b129ba1614 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -1124,6 +1124,12 @@
   span.et2_checkbox_slideSwitch > span.slideSwitch_container {
     background-color: #fafafa;
   }
+  .et2_toolbar span.et2_checkbox_slideSwitch {
+    filter: grayscale(1) contrast(0.9999) opacity(0.7);
+  }
+  .et2_toolbar span.et2_checkbox_slideSwitch.switchOn {
+    filter: none;
+  }
   /*#################################### ADMIN PART #####################################################*/
   iframe#admin-index_iframe {
     background-color: yellow;
@@ -2344,15 +2350,15 @@ button.et2_button_text:hover,
 input[type=button]:hover {
   /*background-color: @gray_30;*/
   text-shadow: 0px 0px;
-  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
-  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
-  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
+  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
+  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 }
 button.et2_button_text:active,
 input[type=button]:active {
-  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
-  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
-  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
+  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 /* ########################################################################################
  * Content Element
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 51a157562b..186bdcd995 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -1134,6 +1134,12 @@
   span.et2_checkbox_slideSwitch > span.slideSwitch_container {
     background-color: #fafafa;
   }
+  .et2_toolbar span.et2_checkbox_slideSwitch {
+    filter: grayscale(1) contrast(0.9999) opacity(0.7);
+  }
+  .et2_toolbar span.et2_checkbox_slideSwitch.switchOn {
+    filter: none;
+  }
   /*#################################### ADMIN PART #####################################################*/
   iframe#admin-index_iframe {
     background-color: yellow;
@@ -2354,15 +2360,15 @@ button.et2_button_text:hover,
 input[type=button]:hover {
   /*background-color: @gray_30;*/
   text-shadow: 0px 0px;
-  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
-  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
-  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
+  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
+  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 }
 button.et2_button_text:active,
 input[type=button]:active {
-  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
-  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
-  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
+  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 /* ########################################################################################
  * Content Element
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index e09e8964eb..38ac12262d 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -988,7 +988,12 @@ span.et2_checkbox_slideSwitch:hover {
 	cursor: pointer;
 }
 span.et2_checkbox_slideSwitch > span.slideSwitch_container {background-color: #fafafa;}
-
+.et2_toolbar {
+	span.et2_checkbox_slideSwitch {
+		filter: grayscale(1) contrast(0.9999) opacity(0.7);
+	}
+	span.et2_checkbox_slideSwitch.switchOn {filter:none;}
+}
 /*#################################### ADMIN PART #####################################################*/
 
 iframe#admin-index_iframe{
diff --git a/pixelegg/less/layout_buttons.less b/pixelegg/less/layout_buttons.less
index f301461d85..28c1ee836d 100644
--- a/pixelegg/less/layout_buttons.less
+++ b/pixelegg/less/layout_buttons.less
@@ -77,9 +77,9 @@ input[type=button] {
         &:hover{
             /*background-color: @gray_30;*/
             text-shadow: 0px 0px;
-            .box_shadow_standard_light_hover !important;
+            .box_shadow_standard_light_hover;
            }
-        &:active {.box_shadow_standard_light_active !important;}
+        &:active {.box_shadow_standard_light_active}
 }
 
 /* ########################################################################################
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index cbc8dc435a..706814a4ca 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -1155,6 +1155,12 @@
   span.et2_checkbox_slideSwitch > span.slideSwitch_container {
     background-color: #fafafa;
   }
+  .et2_toolbar span.et2_checkbox_slideSwitch {
+    filter: grayscale(1) contrast(0.9999) opacity(0.7);
+  }
+  .et2_toolbar span.et2_checkbox_slideSwitch.switchOn {
+    filter: none;
+  }
   /*#################################### ADMIN PART #####################################################*/
   iframe#admin-index_iframe {
     background-color: yellow;
@@ -2375,15 +2381,15 @@ button.et2_button_text:hover,
 input[type=button]:hover {
   /*background-color: @gray_30;*/
   text-shadow: 0px 0px;
-  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
-  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
-  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
+  -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
+  -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 }
 button.et2_button_text:active,
 input[type=button]:active {
-  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
-  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
-  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important;
+  -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
+  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 /* ########################################################################################
  * Content Element