diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 2d1c26b686..1833190644 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1487,6 +1487,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   border: 1px solid gray;
   padding-right: 3px;
 }
+.calendar_plannerWidget img {
+  height: 16px;
+}
 /* calendar_plannerHeader contains a calendar_plannerHeaderTitle and multiple calendar_plannerHeaderRows
  */
 .calendar_plannerHeader {
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index f576f05389..007e7436d6 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -1023,6 +1023,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
     width: 99.5%;
     border: 1px solid gray;
     padding-right: 3px;
+    
+    img{.dimension_height_s;}
 }
 
 /* calendar_plannerHeader contains a calendar_plannerHeaderTitle and multiple calendar_plannerHeaderRows
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index cb777c4ac4..264a54112e 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -190,7 +190,7 @@ div.filemanager_navigation > label {
     left: 0px;
     right: 30%;
     position: relative;*/
-  top: -15px;
+  top: 0px;
   float: left;
   position: absolute;
   right: 0;
@@ -235,7 +235,7 @@ div.filemanager_navigation > label > input {
   width: 32px !important;
   height: 32px !important;
   position: relative;
-  top: 13px;
+  top: 0px;
 }
 #filemanager-index .filters {
   vertical-align: center;
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index ffa4208ae0..e41f29c8c6 100644
--- a/filemanager/templates/pixelegg/app.less
+++ b/filemanager/templates/pixelegg/app.less
@@ -87,7 +87,7 @@ div.filemanager_navigation > label {
     left: 0px;
     right: 30%;
     position: relative;*/
-    top: -15px;
+    top: 0px;
     
     float: left;
     position: absolute;
@@ -128,7 +128,7 @@ div.filemanager_navigation > label > input {
         width: 32px !important; 
         height: 32px !important;
         position: relative;
-        top: 13px;
+        top: 0px;
     }
     
     
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 0f5d838891..79ea5af2f8 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -5,9 +5,9 @@
 			<html id="msg" class="message"/>
 			<vbox class="mailCompose mailComposeHeaderSection" width="99%">
 				<hbox class="et2_toolbar ui-widget-header ui-corner-all mail-compose_toolbar">
-				<description class="email-button-group sent">	
+					
                                     <button class="et2_button ui-button mail-compose_button" label="Send" id="button[send]"/>
-				</description> 	
+					
                                 <description class="email-button-group save">
                                             <buttononly class="et2_button ui-button" label="Save as Draft" value="saveAsDraft" id="button[saveAsDraft]" image="fileexport" onclick="app.mail.saveAsDraft"/>
                                             <buttononly class="et2_button ui-button" label="Save as Draft and Print" value="saveAsDraftAndPrint" id="button[saveAsDraftAndPrint]" image="print" onclick="app.mail.saveAsDraftAndPrint"/>
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 504d3db8f5..bbeeb4426b 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -779,14 +779,25 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
   /*######################################*/
 }
 #mail-compose .mail-compose_toolbar span.email-button-group {
-  margin: 3px 4px 4px 4px;
-  padding: 2px;
-  background-color: #cdcdcd;
-  /*.background_linear_gradient !important;*/
-  height: 24px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
+  float: left;
+  margin: 0 6px 5px 0;
+  padding: 0px 2px;
+  border: 1px solid #a6a6a6;
+  border-bottom-color: #979797;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5), 0 0 2px rgba(255, 255, 255, 0.15) inset, 0 1px 0 rgba(255, 255, 255, 0.15) inset;
+  -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5), 0 0 2px rgba(255, 255, 255, 0.15) inset, 0 1px 0 rgba(255, 255, 255, 0.15) inset;
+  box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5), 0 0 2px rgba(255, 255, 255, 0.15) inset, 0 1px 0 rgba(255, 255, 255, 0.15) inset;
+  background: #e4e4e4;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#e4e4e4));
+  background-image: -moz-linear-gradient(top, #ffffff, #e4e4e4);
+  background-image: -webkit-linear-gradient(top, #ffffff, #e4e4e4);
+  background-image: -o-linear-gradient(top, #ffffff, #e4e4e4);
+  background-image: -ms-linear-gradient(top, #ffffff, #e4e4e4);
+  background-image: linear-gradient(top, #ffffff, #e4e4e4);
+  filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#ffffff', endColorstr='#e4e4e4');
 }
 #mail-compose .mail-compose_toolbar span.sent {
   float: left;
@@ -818,11 +829,6 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
 #mail-compose .mail-compose_toolbar span.priority span.et2_label {
   line-height: 25px;
 }
-#mail-compose .mail-compose_toolbar button.et2_button {
-  height: 24px;
-  /*             &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;}
-             &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;}*/
-}
 #mail-compose .mail-compose_toolbar img {
   height: 24px;
 }
@@ -854,15 +860,23 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
   background-repeat: repeat-x;
 }
 #mail-compose .mail-compose_toolbar span.et2_label {
-  font-size: 9px;
+  font-size: 8px;
+}
+#mail-compose .mail-compose_toolbar button.et2_button {
+  /*.dimension_height_m;*/
+  /*             &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;}
+             &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;}*/
 }
 #mail-compose .mail-compose_toolbar .mail-compose_button {
-  /*margin-right: 15px !important;*/
+  height: 27px;
+  margin-right: 3px !important;
+  margin-top: 0px !important;
   padding: 0 3px 0 0;
   text-align: left;
   font-weight: bold;
   padding-left: 20px;
   width: 71px;
+  float: left;
   background-image: url(images/mail_send.png) !important;
   background-position: left;
   background-repeat: no-repeat;
@@ -1043,6 +1057,12 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
   text-align: right;
   padding-right: 5px;
 }
+#mail-compose .mailComposeHeaders span.ms-close-btn,
+#mail-compose .mailComposeHeadersSection span.ms-close-btn {
+  width: auto;
+  background-repeat: no-repeat;
+  padding-right: 8px;
+}
 #mail-compose .mailComposeHeaders div,
 #mail-compose .mailComposeHeadersSection div {
   max-width: 770px;
@@ -1062,6 +1082,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
 #mail-compose .mailComposeHeaders select#mail-compose_mailaccount,
 #mail-compose .mailComposeHeadersSection select#mail-compose_mailaccount {
   width: 100%;
+  height: 30px;
 }
 #mail-compose .mailComposeHeaders span#mail-compose_cc_expander,
 #mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander {
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index d04a5e6217..ffeb43c907 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -324,12 +324,7 @@ div#mail-index{
         width: 100%;
 
         span.email-button-group {
-            margin: 3px 4px 4px 4px;
-            padding: 2px;
-            background-color: @gray_20;
-            /*.background_linear_gradient !important;*/
-            .dimension_height_m;
-            .rounded (5px);
+            .span_tool_group;
         }
 
         span.sent {float: left;}
@@ -350,12 +345,6 @@ div#mail-index{
                     span.et2_label {line-height: 25px;}    
         }
 
-        button.et2_button {
-            .dimension_height_m;
-/*             &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;}
-             &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;}*/
-        }
-
         img{.dimension_height_m;}
         img[src$="svg"]{ 
             .gradient_vertical (@gray_30, @gray_40); 
@@ -368,18 +357,28 @@ div#mail-index{
             }
         }
 
-        span.et2_label {font-size: 9px;}
+        span.et2_label {font-size: 8px;}
 
         /*######################################*/
         /*// Button senden -> dev_buttons.less*/
+        button.et2_button {
+            /*.dimension_height_m;*/
+            
+/*             &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;}
+             &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;}*/
+        }
+        
+        
         .mail-compose_button{
-            /*margin-right: 15px !important;*/
+            height: 27px;
+            margin-right: 3px !important;
+            margin-top: 0px !important;
             padding: 0 3px 0 0;
             text-align: left;
             font-weight: bold;
             padding-left: 20px;
             width: 71px;
-
+            float: left;
             background-image: url(images/mail_send.png) !important;
             background-position: left;
             background-repeat: no-repeat;
@@ -490,7 +489,18 @@ div#mail-index{
         margin: 2px 0;
         width: 98%;
 
-        span { width: 8em; font-size: 0.8em; text-align: right; padding-right: 5px;}
+        span { 
+               width: 8em; 
+               font-size: 0.8em; 
+               text-align: right; 
+               padding-right: 5px;
+        }
+        
+        span.ms-close-btn {
+            width: auto; 
+            background-repeat: no-repeat;
+            padding-right: 8px;
+        }
 
         div{ max-width: 770px; 	}
 
@@ -502,7 +512,7 @@ div#mail-index{
         }
 
         /*Von*/
-        select#mail-compose_mailaccount {width: 100%;}
+        select#mail-compose_mailaccount {width: 100%; height: 30px;}
         /*An*/
         
         /*Kopie*/
@@ -1422,4 +1432,4 @@ div.mailDisplayHeaders > span:first-child, div.mailComposeHeaders > span:first-c
 }
 
 
-//
\ No newline at end of file
+//                                                                                                                                                                                                                                                                    
\ No newline at end of file
diff --git a/mail/templates/pixelegg/images/mail_forward.svg b/mail/templates/pixelegg/images/mail_forward.svg
new file mode 100755
index 0000000000..b41ffce30f
--- /dev/null
+++ b/mail/templates/pixelegg/images/mail_forward.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<svg version="1.1" id="mail_mail_forward" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347"
+	 xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M1.163,12.027v4.322c0,2.673,2.164,4.84,4.834,4.84h5.239
+	l0.011,2.973l1.643,1.643c1.828,1.828,4.789,1.832,6.615,0.006l6.312-8.312c1.824-1.824,1.82-4.786-0.008-6.615l-6.342-8.341
+	c-1.828-1.829-4.789-1.832-6.613-0.007l-1.678,1.678l0.01,2.975H5.997C3.327,7.188,1.163,9.354,1.163,12.027z M4.063,12.994
+	c0-1.604,1.297-2.902,2.898-2.902h7.226l-0.009-4.91c1.096-1.095,2.873-1.093,3.971,0.004l5.016,7.017
+	c1.098,1.098,1.1,2.875,0.004,3.969l-4.99,6.992c-1.096,1.094-2.873,1.093-3.969-0.004l-0.009-4.875H6.962
+	c-1.602,0-2.898-1.3-2.898-2.903V12.994z"/>
+</svg>
diff --git a/mail/templates/pixelegg/images/mail_reply.svg b/mail/templates/pixelegg/images/mail_reply.svg
new file mode 100755
index 0000000000..d001a0bdc5
--- /dev/null
+++ b/mail/templates/pixelegg/images/mail_reply.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<svg version="1.1" id="mail_mail_reply" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347"
+	 xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M22.35,7.187h-5.19l0.01-2.975l-1.678-1.678
+	c-1.824-1.824-4.786-1.821-6.614,0.007l-6.342,8.341c-1.828,1.829-1.832,4.792-0.007,6.616l6.312,8.312
+	c1.825,1.826,4.786,1.822,6.615-0.006l1.643-1.643l0.01-2.973h5.24c2.67,0,4.834-2.167,4.834-4.84v-4.323
+	C27.184,9.353,25.02,7.187,22.35,7.187z M24.283,15.381c0,1.604-1.298,2.904-2.899,2.904h-7.239l-0.008,4.875
+	c-1.097,1.097-2.874,1.098-3.969,0.004l-4.991-6.992c-1.095-1.094-1.093-2.872,0.004-3.969l5.017-7.017
+	c1.098-1.097,2.875-1.099,3.97-0.004l-0.008,4.91h7.225c1.602,0,2.899,1.299,2.899,2.902V15.381z"/>
+</svg>
diff --git a/mail/templates/pixelegg/images/mail_replyall.svg b/mail/templates/pixelegg/images/mail_replyall.svg
new file mode 100755
index 0000000000..de0d830953
--- /dev/null
+++ b/mail/templates/pixelegg/images/mail_replyall.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<svg version="1.1" id="mail_mail_replyall" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347"
+	 xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M23.377,7.188h-1.965l0.008-2.975l-1.506-1.678
+	c-1.639-1.824-4.297-1.821-5.939,0.007l-0.205,0.3l-0.275-0.307C11.857,0.71,9.197,0.713,7.557,2.542l-5.694,8.341
+	c-1.641,1.829-1.645,4.791-0.006,6.616l5.669,8.312c1.637,1.825,4.295,1.821,5.938-0.007l0.271-0.301l0.21,0.308
+	c1.639,1.825,4.297,1.821,5.939-0.007l1.475-1.643l0.01-2.973h2.01c2.396,0,4.34-2.166,4.34-4.84v-4.323
+	C27.717,9.354,25.773,7.188,23.377,7.188z M8.715,23.164l-4.482-6.991C3.25,15.078,3.252,13.3,4.237,12.204l4.505-7.017
+	c0.959-1.069,2.494-1.09,3.481-0.079l-3.942,5.775c-1.64,1.829-1.644,4.791-0.004,6.616l3.913,5.741
+	C11.201,24.248,9.67,24.229,8.715,23.164z M25.113,15.382c0,1.604-0.27,2.904-1.707,2.904h-4.703l-0.006,4.874
+	c-0.986,1.098-2.582,1.099-3.562,0.004l-4.482-6.991c-0.982-1.095-0.98-2.873,0.004-3.969l4.504-7.017
+	c0.986-1.097,2.582-1.099,3.562-0.004l-0.006,4.909h4.689c1.438,0,1.707,1.3,1.707,2.903V15.382z"/>
+</svg>
