diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index e493190a7b..9538a4a3cc 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1163,7 +1163,8 @@ body {
 }
 #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-disposition:hover,
+#mail-compose #mail-compose_composeToolbar button#composeToolbar-to_calendar:hover {
   background: none;
 }
 #mail-compose table.et2_grid {
@@ -1389,7 +1390,10 @@ body {
 #mail-display mail-display_displayToolbar button[id*="toolbar-infolog"]:active,
 #mail-display .et2_toolbar button[id*="toolbar-tracker"]:active,
 #mail-display #mail-display_toolbar button[id*="toolbar-tracker"]:active,
-#mail-display mail-display_displayToolbar button[id*="toolbar-tracker"]:active {
+#mail-display mail-display_displayToolbar button[id*="toolbar-tracker"]:active,
+#mail-display .et2_toolbar button[id*="toolbar-calendar"]:active,
+#mail-display #mail-display_toolbar button[id*="toolbar-calendar"]:active,
+#mail-display mail-display_displayToolbar button[id*="toolbar-calendar"]:active {
   background-color: .background_color_15_gray;
 }
 #mail-display .et2_toolbar span.ui-state-default,
@@ -1577,7 +1581,10 @@ body {
 #mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-infolog"]:hover,
 #mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-tracker"]:hover,
 #mail-display #mail-display_toolbar #toolbar-actionlist button[id*="toolbar-tracker"]:hover,
-#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-tracker"]:hover {
+#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-tracker"]:hover,
+#mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-calendar"]:hover,
+#mail-display #mail-display_toolbar #toolbar-actionlist button[id*="toolbar-calendar"]:hover,
+#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-calendar"]:hover {
   background-color: #ffc200;
 }
 #mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-infolog"]:active,
@@ -1585,7 +1592,10 @@ body {
 #mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-infolog"]:active,
 #mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-tracker"]:active,
 #mail-display #mail-display_toolbar #toolbar-actionlist button[id*="toolbar-tracker"]:active,
-#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-tracker"]:active {
+#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-tracker"]:active,
+#mail-display .et2_toolbar #toolbar-actionlist button[id*="toolbar-calendar"]:active,
+#mail-display #mail-display_toolbar #toolbar-actionlist button[id*="toolbar-calendar"]:active,
+#mail-display mail-display_displayToolbar #toolbar-actionlist button[id*="toolbar-calendar"]:active {
   background-color: .background_color_15_gray;
 }
 #mail-display .mailDisplayAttachments {
@@ -2383,7 +2393,8 @@ input[type=button] {
   background-color: #ae1d00;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:focus,
-#mail-index_toolbar button[id*="toolbar-tracker"]:focus {
+#mail-index_toolbar button[id*="toolbar-tracker"]:focus,
+#mail-index_toolbar button[id*="toolbar-calendar"]:focus {
   background-color: #ffc200;
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
@@ -2395,7 +2406,8 @@ input[type=button] {
   background-repeat: repeat-x;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:focus img[src$="svg"],
-#mail-index_toolbar button[id*="toolbar-tracker"]:focus img[src$="svg"] {
+#mail-index_toolbar button[id*="toolbar-tracker"]:focus img[src$="svg"],
+#mail-index_toolbar button[id*="toolbar-calendar"]:focus img[src$="svg"] {
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
   background-image: -ms-linear-gradient(top, #ffc200, #ffc200);
@@ -2407,7 +2419,8 @@ input[type=button] {
   background-color: #ffc200;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:hover,
-#mail-index_toolbar button[id*="toolbar-tracker"]:hover {
+#mail-index_toolbar button[id*="toolbar-tracker"]:hover,
+#mail-index_toolbar button[id*="toolbar-calendar"]:hover {
   background-color: #ffc200;
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
@@ -2419,7 +2432,8 @@ input[type=button] {
   background-repeat: repeat-x;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:hover img[src$="svg"],
-#mail-index_toolbar button[id*="toolbar-tracker"]:hover img[src$="svg"] {
+#mail-index_toolbar button[id*="toolbar-tracker"]:hover img[src$="svg"],
+#mail-index_toolbar button[id*="toolbar-calendar"]:hover img[src$="svg"] {
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
   background-image: -ms-linear-gradient(top, #ffc200, #ffc200);
@@ -2431,7 +2445,8 @@ input[type=button] {
   background-color: #ffc200;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:active,
-#mail-index_toolbar button[id*="toolbar-tracker"]:active {
+#mail-index_toolbar button[id*="toolbar-tracker"]:active,
+#mail-index_toolbar button[id*="toolbar-calendar"]:active {
   background-color: #ffc200;
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
@@ -2443,7 +2458,8 @@ input[type=button] {
   background-repeat: repeat-x;
 }
 #mail-index_toolbar button[id*="toolbar-infolog"]:active img[src$="svg"],
-#mail-index_toolbar button[id*="toolbar-tracker"]:active img[src$="svg"] {
+#mail-index_toolbar button[id*="toolbar-tracker"]:active img[src$="svg"],
+#mail-index_toolbar button[id*="toolbar-calendar"]:active img[src$="svg"] {
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
   background-image: -moz-linear-gradient(top, #ffc200, #ffc200);
   background-image: -ms-linear-gradient(top, #ffc200, #ffc200);
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index dbd8103be6..9d82ed3d24 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -378,7 +378,10 @@ body {
             &:disabled {background-color: @color_disabled !important;}
 
         }
-		button#composeToolbar-to_infolog:hover, button#composeToolbar-to_tracker:hover, button#composeToolbar-disposition:hover {
+		button#composeToolbar-to_infolog:hover,
+		button#composeToolbar-to_tracker:hover,
+		button#composeToolbar-disposition:hover,
+		button#composeToolbar-to_calendar:hover {
 			background: none;
 		}
     } // Toolbar Ende
@@ -549,7 +552,8 @@ div.mailUploadSection {
             }
 
             button[id*="toolbar-infolog"],
-            button[id*="toolbar-tracker"]{
+            button[id*="toolbar-tracker"],
+			button[id*="toolbar-calendar"]{
                 &:active {background-color: .background_color_15_gray;}
             }
 
@@ -695,7 +699,8 @@ div.mailUploadSection {
                     }
 
                     button[id*="toolbar-infolog"],
-                    button[id*="toolbar-tracker"]{
+                    button[id*="toolbar-tracker"],
+					button[id*="toolbar-calendar"]{
                         &:hover {background-color: @egw_color_1_a;}
                         &:active {background-color: .background_color_15_gray;}
                     }
@@ -1531,7 +1536,8 @@ input[type=button] {
             }
 
             button[id*="toolbar-infolog"],
-            button[id*="toolbar-tracker"]{
+            button[id*="toolbar-tracker"],
+			button[id*="toolbar-calendar"]{
                                 &:focus {
                     background-color: @egw_color_1_a;
                     .gradient_vertical (@egw_color_1_a, @egw_color_1_a);