diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 9538a4a3cc..07e1725093 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1133,8 +1133,8 @@ body {
   /*background-color: @gray-0;*/
   /*.gradient_thead;*/
 }
-#mail-compose .et2_toolbar button.toolbar_toggled {
-  background-color: #189800;
+#mail-compose .et2_toolbar button.toolbar_toggled:hover {
+  background-color: white !important;
 }
 #mail-compose #mail-compose_composeToolbar button#composeToolbar-send {
   height: 24px;
@@ -1165,7 +1165,7 @@ body {
 #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 {
-  background: none;
+  background-color: #ffc200;
 }
 #mail-compose table.et2_grid {
   display: inline-block;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 9d82ed3d24..8a399d662a 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -347,14 +347,11 @@ body {
 
     // ##################################
     //	Toolbar
-.et2_toolbar button.toolbar_toggled {
-    background-color: @color_positive_action;
-}
-
-
-
-
-
+	.et2_toolbar button.toolbar_toggled {
+		&:hover{
+			background-color: white !important;
+		}
+	}
 
 	#mail-compose_composeToolbar{
 
@@ -382,7 +379,7 @@ body {
 		button#composeToolbar-to_tracker:hover,
 		button#composeToolbar-disposition:hover,
 		button#composeToolbar-to_calendar:hover {
-			background: none;
+			background-color: @egw_color_1_a;;
 		}
     } // Toolbar Ende