diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index cfa358217f..2d1c26b686 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -643,10 +643,10 @@ div.calendar {
   /* This holds the current "month, year" */
   font-weight: bold;
   /* Pressing it will take you to the current date */
-  text-align: center;
+  /*text-align: center;*/
   background-color: #679fd2;
-  color: #000;
-  padding: 2px;
+  /*color: #000;*/
+  /*padding: 2px;*/
 }
 .calendar thead .title:hover {
   background-color: #ffffff !important;
@@ -662,10 +662,10 @@ div.calendar {
 }
 .calendar thead .name {
   /* Cells <TD> containing the day names */
-  border-bottom: 1px solid #556;
-  padding: 2px;
-  text-align: center;
-  color: #000;
+  /*border-bottom: 1px solid #556;*/
+  /*padding: 2px;*/
+  /*text-align: center;*/
+  /*color: #000;*/
 }
 .calendar thead .weekend {
   /* How a weekend day name shows in header */
@@ -677,10 +677,10 @@ div.calendar {
   -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);
-  color: #000;
-  border: 0px solid;
+  /*color: #000;*/
+  /*border: 0px solid;*/
   border-color: #828282;
-  padding: 1px;
+  /*padding: 1px;*/
 }
 .calendar thead .active {
   /* Active (pressed) buttons in header */
@@ -694,9 +694,9 @@ div.calendar {
 .calendar tbody .day {
   /* Cells <TD> containing month days dates */
   /*width: 2em;*/
-  color: #456;
-  text-align: right;
-  padding: 2px 4px 2px 2px;
+  /*color: #456;*/
+  /*text-align: right;*/
+  /*padding: 2px 4px 2px 2px;*/
   /*border: 1px;*/
 }
 .calendar tbody .day.othermonth {
@@ -714,20 +714,20 @@ div.calendar {
 }
 .calendar tbody td.hilite {
   /* Hovered cells <TD> */
-  background: #def;
-  padding: 1px 3px 1px 1px;
-  border: 1px solid #bbb;
+  /*background: #def;*/
+  /*padding: 1px 3px 1px 1px;*/
+  /*border: 1px solid #bbb;*/
 }
 .calendar tbody td.active {
   /* Active (pressed) cells <TD> */
   background: #cde;
-  padding: 2px 2px 0px 2px;
+  /*padding: 2px 2px 0px 2px;*/
 }
 .calendar tbody td.selected {
   /* Cell showing today date */
-  font-weight: bold;
-  border: 1px solid #000;
-  padding: 1px 3px 1px 1px;
+  /*font-weight: bold;*/
+  /*border: 1px solid #000;*/
+  /*padding: 1px 3px 1px 1px;*/
   background: #fff;
   color: #000;
   -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -874,6 +874,10 @@ div#calendar-edit {
   /*###########################################*/
   /*###########################################*/
   /*###########################################*/
+  /*###########################################*/
+  /*// Historie*/
+  /*###########################################*/
+  /*// Toolbar*/
 }
 div#calendar-edit label.et2_label {
   /*padding: 0 2px;*/
@@ -924,6 +928,12 @@ div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category {
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
+div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category li .ui-state-hover {
+  font-weight: normal !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);
+}
 div#calendar-edit #calendar-edit_calendar-edit-participants tr.optional {
   background-color: rgba(255, 221, 115, 0.1);
 }
@@ -1016,6 +1026,9 @@ div#calendar-edit #calendar-edit_calendar-edit-history tbody {
   display: table-row-group;
   width: 100%;
 }
+div#calendar-edit tr.dialog-footer-toolbar label.et2_label {
+  top: 0px !important;
+}
 .calendar_inputFullWidth input {
   width: 60%;
 }
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index e2b6b7b687..f576f05389 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -23,12 +23,12 @@
 
 .egw_fw_ui_category_content{
     padding-left: 0px !important;
-    
+
     // Icon before genrell hidden
     img.egw_fw_ui_sidemenu_listitem_icon {
-                                                display: none;
-                                            }
-    
+        display: none;
+    }
+
 
 }
 
@@ -45,7 +45,7 @@ img.sideboxstar {
         background-color: @color_positive_action_active !important;}
 }
 
-   
+
 
 .chzn-container {
     max-width: 85% !important;
@@ -62,8 +62,8 @@ img.sideboxstar {
     border: none;
 
 
-        
-        
+
+
 
 
 } // Ende Iframe
@@ -77,8 +77,8 @@ img.sideboxstar {
 
 .calendar_calEventBodySmall img[src$="svg"],
 .calendar_calDayColHeader img[src$="svg"]  {
-            .gradient_vertical (@egw_color_2_a, @egw_color_2_a);
-        }
+    .gradient_vertical (@egw_color_2_a, @egw_color_2_a);
+}
 
 
 
@@ -119,16 +119,16 @@ div.calendar { position: relative; }
         .background_table_cal_head;
     }
 
-    
+
 
     thead {
         .title { /* This holds the current "month, year" */
             font-weight: bold;      /* Pressing it will take you to the current date */
-            text-align: center;
+            /*text-align: center;*/
             background-color: @egw_color_2_e;
-            color: #000;
-            padding: 2px;
-            
+            /*color: #000;*/
+            /*padding: 2px;*/
+
             &:hover {background-color: @gray_0 !important;}
         }
         .headrow { /* Row <TR> containing navigation buttons */
@@ -141,10 +141,10 @@ div.calendar { position: relative; }
         }
 
         .name { /* Cells <TD> containing the day names */
-            border-bottom: 1px solid #556;
-            padding: 2px;
-            text-align: center;
-            color: #000;
+            /*border-bottom: 1px solid #556;*/
+            /*padding: 2px;*/
+            /*text-align: center;*/
+            /*color: #000;*/
         }
 
         .weekend { /* How a weekend day name shows in header */
@@ -155,10 +155,10 @@ div.calendar { position: relative; }
         .hilite { /* How do the buttons in header appear when hover */
             .background_color_0_gray;
             .box_shadow_standard_light_inset;
-            color: #000;
-            border: 0px solid;
+            /*color: #000;*/
+            /*border: 0px solid;*/
             border-color: @gray_50;
-            padding: 1px;
+            /*padding: 1px;*/
         }
 
         .active { /* Active (pressed) buttons in header */
@@ -171,14 +171,14 @@ div.calendar { position: relative; }
     /* The body part -- contains all the days in month. */
 
     tbody {
-        
+
         tr, td {border: 1px;}
-        
+
         .day { /* Cells <TD> containing month days dates */
             /*width: 2em;*/
-            color: #456;
-            text-align: right;
-            padding: 2px 4px 2px 2px;
+            /*color: #456;*/
+            /*text-align: right;*/
+            /*padding: 2px 4px 2px 2px;*/
             /*border: 1px;*/
         }
 
@@ -200,20 +200,20 @@ div.calendar { position: relative; }
         }
 
         td.hilite { /* Hovered cells <TD> */
-            background: #def;
-            padding: 1px 3px 1px 1px;
-            border: 1px solid #bbb;
+            /*background: #def;*/
+            /*padding: 1px 3px 1px 1px;*/
+            /*border: 1px solid #bbb;*/
         }
 
         td.active { /* Active (pressed) cells <TD> */
             background: #cde;
-            padding: 2px 2px 0px 2px;
+            /*padding: 2px 2px 0px 2px;*/
         }
 
         td.selected { /* Cell showing today date */
-            font-weight: bold;
-            border: 1px solid #000;
-            padding: 1px 3px 1px 1px;
+            /*font-weight: bold;*/
+            /*border: 1px solid #000;*/
+            /*padding: 1px 3px 1px 1px;*/
             background: #fff;
             color: #000;
             .box_shadow_standard_light_inset;
@@ -414,11 +414,11 @@ div#calendar-edit{
         height: 299px;
         overflow: auto;
 
-            table.et2_grid {
-        // Listendarstellung
-        tr:nth-child(even) {background: @color_even;}
-        tr:nth-child(odd) {background: @color_odd;}
-    }
+        table.et2_grid {
+            // Listendarstellung
+            tr:nth-child(even) {background: @color_even;}
+            tr:nth-child(odd) {background: @color_odd;}
+        }
 
     }
 
@@ -435,9 +435,6 @@ div#calendar-edit{
 
             width: 72% !important;
 
-
-
-
             td {
                 padding: 4px;
             }
@@ -445,12 +442,8 @@ div#calendar-edit{
             #calendar-edit_duration{
                 float: left;
             }
-
             // Terminsuche
-
-/*            button#calendar-edit_freetime {background-image: url('images/add.png') !important;}*/
-
-
+            /*            button#calendar-edit_freetime {background-image: url('images/add.png') !important;}*/
             // hole day
             .et2_checkbox,
             input#calendar-edit_whole_day {margin-left: 5px important; border-left: 10px solid red;}
@@ -464,21 +457,28 @@ div#calendar-edit{
             border: 1px solid;
             border-color: @gray_30;
             .border_radius_button_normal;
+
+            li{
+                .ui-state-hover{
+                    font-weight: normal !important;
+                    .box_shadow_standard_light_hover;
+                }
+            }
         }
 
     }
 
-     /*###########################################*/
-     /*Tab Beschreibung*/
+    /*###########################################*/
+    /*Tab Beschreibung*/
 
     /*###########################################*/
     // Teilnehmer
 
     #calendar-edit_calendar-edit-participants{
 
-           tr.optional {background-color: @color_optional;}
+        tr.optional {background-color: @color_optional;}
 
-          tbody{
+        tbody{
             display: table;
             width: 100%;
 
@@ -560,7 +560,7 @@ div#calendar-edit{
             .et2_link_to {width: auto !important;}
         }
 
-       span.et2_label {padding:  1em;}
+        span.et2_label {padding:  1em;}
     }
 
     /*###########################################*/
@@ -575,8 +575,8 @@ div#calendar-edit{
             tr.add_alarm_action {background-color: @color_optional; margin-bottom: 1em;}
         }
     }
-
-    // Historie
+    /*###########################################*/
+    /*// Historie*/
 
     #calendar-edit_calendar-edit-history{
         max-width: 800px;
@@ -586,6 +586,19 @@ div#calendar-edit{
 
         }
     }
+    
+    /*###########################################*/
+    /*// Toolbar*/
+    
+    tr.dialog-footer-toolbar{
+        
+        label.et2_label {top: 0px !important;}
+        
+    }
+    
+    
+    
+    
 }
 //###################################################################
 //# generell
@@ -624,15 +637,15 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 /* custom ui-tooltip style for calendar
 */
 .calendar_uitooltip {
-	padding: 0px;
-	position: absolute;
-	border: none;
-	max-height: 400px;
-	z-index: 9999;
-	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px;
-	-moz-box-shadow: 0 0 5px;
-	box-shadow: 0 0 5px;
+    padding: 0px;
+    position: absolute;
+    border: none;
+    max-height: 400px;
+    z-index: 9999;
+    max-width: 300px;
+    -webkit-box-shadow: 0 0 5px;
+    -moz-box-shadow: 0 0 5px;
+    box-shadow: 0 0 5px;
 }
 
 .calendar_size120b { font-size: 120%; font-weight: bold; }
@@ -944,7 +957,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
         img[src$="svg"]  {
             .gradient_vertical (@egw_color_2_a, @egw_color_2_a);
         }
-        
+
         img {
             .Complete_Button_normal;
             .dimension_width_height_s;
@@ -959,17 +972,17 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 
     table {
 
-                // Listendarstellung
+        // Listendarstellung
         // Reihen ohne Border left und right
         tr:nth-child(even) {background: @color_even;}
         tr:nth_child(odd) {background: @color_odd;}
 
         td {
             padding: 3px;
-            
+
             img[src$="svg"]  {
-            .gradient_vertical (@egw_color_2_a, @egw_color_2_a);
-        }
+                .gradient_vertical (@egw_color_2_a, @egw_color_2_a);
+            }
 
             img {
                 .dimension_width_height_xs;
diff --git a/filemanager/templates/default/file.xet b/filemanager/templates/default/file.xet
index 0786ac36f0..b4bf975e06 100644
--- a/filemanager/templates/default/file.xet
+++ b/filemanager/templates/default/file.xet
@@ -123,9 +123,9 @@
 		</grid>
 	</template>
 	<template id="filemanager.file.eacl" template="" lang="" group="0" version="1.9.001">
-		<grid width="450" height="300" spacing="10">
+		<grid width="550" height="300" spacing="10">
 			<columns>
-				<column/>
+				<column width="120"/>
 				<column/>
 				<column/>
 			</columns>
@@ -162,13 +162,13 @@
 					</groupbox>
 				</row>
 				<row valign="bottom" disabled="!@is_owner">
-					<menulist>
+					<menulist class="filemanager-file_filemanager-file-eaclowner eaclAccount">
 						<menupopup type="select-account" class="eaclAccount" label="Owner" id="eacl[owner]" options="select one,both"/>
 					</menulist>
 					<menulist>
 						<menupopup class="eaclRights" statustext="You can only grant additional rights, you can NOT take rights away!" label="Rights" id="eacl[rights]"/>
 					</menulist>
-					<button label="Add" id="button[eacl]"/>
+					<button label="Add" id="button[eacl]" image="add" background_image="1"/>
 				</row>
 			</rows>
 		</grid>
@@ -251,7 +251,7 @@
 				<row disabled="!@msg">
 					<description id="msg" span="all" class="redItalic"/>
 				</row>
-				<row>
+				<row class="dialog-tabs">
 					<tabbox id="tabs" span="all">
 						<tabs>
 							<tab id="filemanager.file.general" label="General"/>
@@ -269,14 +269,14 @@
 						</tabpanels>
 					</tabbox>
 				</row>
-				<row>
+				<row class="dialog-footer-toolbar">
 					<hbox>
 						<hbox>
-							<button label="Save" id="button[save]"/>
-							<button label="Apply" id="button[apply]"/>
-							<buttononly label="Cancel" id="button[cancel]" onclick="window.close();"/>
+							<button label="Save" id="button[save]" image="save" background_image="1"/>
+							<button label="Apply" id="button[apply]" image="apply" background_image="1"/>
+							<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
 						</hbox>
-						<buttononly align="right" statustext="Enter setup user and password to get root rights" label="Superuser" id="sudo" onclick="\$j('.superuser').css('display','inline'); document.getElementById(form::name('sudo[user]')).focus();"/>
+						<buttononly align="right" statustext="Enter setup user and password to get root rights" label="Superuser" id="sudo" onclick="\$j('.superuser').css('display','inline'); document.getElementById(form::name('sudo[user]')).focus();" image="superuser" background_image="1"/>
 					</hbox>
 				</row>
 				<row>
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index ed5020c5b2..cb777c4ac4 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -207,23 +207,12 @@ div.filemanager_navigation > label > input {
   /*background-color: @egw_color_2_a;*/
   height: 24px;
 }
-#filemanager-index .et2_file:before {
-  content: "+";
-  font-size: 25px;
-  color: #ffc200;
-  line-height: 40px;
-  padding-right: 0em;
-  position: relative;
-  top: -8px;
+#filemanager-index .et2_file input#filemanager-index_upload {
+  color: #ffffff;
+  width: 250px;
   background-color: #0c5da5;
-  -webkit-border-radius: 3px;
-  -webkit-border-top-left-radius: 10px;
-  -moz-border-radius: 3px;
-  -moz-border-radius-topleft: 10px;
-  border-radius: 3px;
-  border-top-left-radius: 10px;
 }
-#filemanager-index .et2_file:hover {
+#filemanager-index .et2_file input#filemanager-index_upload:hover {
   background-color: #66a1d2 !important;
   color: #ffc200;
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -236,16 +225,9 @@ div.filemanager_navigation > label > input {
   border-radius: 3px;
   border-top-left-radius: 10px;
 }
-#filemanager-index .et2_file:active {
+#filemanager-index .et2_file input#filemanager-index_upload:active {
   background-color: #1aa200 !important;
 }
-#filemanager-index .et2_file input#filemanager-index_upload {
-  margin-left: 2em;
-  margin-right: -2em;
-  position: relative;
-  top: -39px;
-  width: 217px;
-}
 #filemanager-index .et2_file div.progress {
   width: 0px;
 }
@@ -261,8 +243,8 @@ div.filemanager_navigation > label > input {
 #filemanager-index .filters #filemanager-index_filter {
   margin-top: 0.5em;
 }
-/*// Dialog filemanager 
-// #####################################################*/
+/*// #####################################################*/
+/*Dialog filemanager*/
 #filemanager-select {
   padding: 0px 8px 0 0;
 }
@@ -309,3 +291,102 @@ div.filemanager_navigation > label > input {
   width: 16px;
   height: 16px;
 }
+/*// #####################################################*/
+/*Dialog filemanager edit POPUP WINDOW*/
+div#filemanager-file {
+  margin: 0.5em;
+}
+div#filemanager-file_tabs {
+  width: 564px;
+  /*eacl*/
+  /*Abonements*/
+}
+div#filemanager-file_tabs .et2_tabs {
+  width: 554px;
+}
+div#filemanager-file_tabs img {
+  width: 24px;
+  height: 24px;
+}
+div#filemanager-file_tabs span.ui-icon-search {
+  /*.background_color_10_gray;*/
+  -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  position: relative;
+  top: 3px;
+  margin-left: 3px;
+}
+div#filemanager-file_tabs span.ui-icon-search:hover {
+  /*.background_color_20_gray;*/
+  -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);
+  border: 1px solid rgba(0, 0, 0, 0.5);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+div#filemanager-file_tabs span.ui-icon-search:active {
+  /*.background_color_30_gray;*/
+  border: 1px solid rgba(0, 0, 0, 0.9);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -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);
+  background-color: #1aa200;
+}
+div#filemanager-file_tabs #filemanager-file_filemanager-file-eacl {
+  /*Owner*/
+}
+div#filemanager-file_tabs #filemanager-file_filemanager-file-eacl td.filemanager-file_filemanager-file-eaclowner span {
+  display: flex;
+  margin-right: 1px;
+}
+div#filemanager-file_tabs #filemanager-file_filemanager-file-eacl td.filemanager-file_filemanager-file-eaclowner span.ui-icon-search {
+  position: relative;
+  top: 15px;
+  margin-left: -3px;
+  margin-right: 3px;
+}
+div#filemanager-file_tabs td.eaclAccount {
+  width: 200px;
+}
+/*// #####################################################*/
+/*Dialog filemanager upload POPUP WINDOW*/
+div#stylite-filemanager-upload {
+  margin: 0.5em;
+}
+div#stylite-filemanager-upload .et2_file {
+  height: 24px;
+}
+div#stylite-filemanager-upload .et2_file input {
+  color: #ffffff;
+  width: 250px;
+  background-color: #0c5da5;
+}
+div#stylite-filemanager-upload .et2_file input:hover {
+  background-color: #66a1d2 !important;
+  color: #ffc200;
+  -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);
+  -webkit-border-radius: 3px;
+  -webkit-border-top-left-radius: 10px;
+  -moz-border-radius: 3px;
+  -moz-border-radius-topleft: 10px;
+  border-radius: 3px;
+  border-top-left-radius: 10px;
+}
+div#stylite-filemanager-upload .et2_file input:active {
+  background-color: #1aa200 !important;
+}
+div#stylite-filemanager-upload .et2_file div.progress {
+  width: 0px;
+}
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index 1af8e1e7bd..ffa4208ae0 100644
--- a/filemanager/templates/pixelegg/app.less
+++ b/filemanager/templates/pixelegg/app.less
@@ -112,37 +112,16 @@ div.filemanager_navigation > label > input {
     .et2_file{
        /*background-color: @egw_color_2_a;*/
        .dimension_height_m;
-        
-       &:before {
-            content: "+";
-            font-size: 25px;
-            color: #ffc200;
-            line-height: 40px;
-            padding-right: 0em;
-            position: relative;
-            top: -8px;
+       input#filemanager-index_upload {
+            color: @gray_0;
+            width: 250px;
             background-color: @egw_color_2_a;
-            .border_radius_button_lefttop;
-                }
-                
         &:hover {.Complete_Button_add_only_plus_hover;}
-        &:active {background-color: @color_positive_action_active !important;}        
-        
-       
-        input#filemanager-index_upload {
-            margin-left: 2em;
-            margin-right: -2em;
-            position: relative;
-            top: -39px;
-            width: 217px;
-            
+        &:active {background-color: @color_positive_action_active !important;}  
         }
         
         div.progress {width: 0px;}
-
-
-
-    }
+  }
 
 
     #filemanager-index_tarp {
@@ -170,9 +149,9 @@ div.filemanager_navigation > label > input {
 
 
 
+/*// #####################################################*/
+/*Dialog filemanager*/ 
 
-/*// Dialog filemanager 
-// #####################################################*/
 #filemanager-select{
 
     padding: 0px 8px 0 0;
@@ -222,7 +201,74 @@ div.filemanager_navigation > label > input {
 
 
 
+/*// #####################################################*/
+/*Dialog filemanager edit POPUP WINDOW*/ 
+
+div#filemanager-file {margin: 0.5em;}
+
+div#filemanager-file_tabs {
+    
+    width: 564px;
+
+    .et2_tabs{width: 554px;}
+    
+    img {.dimension_width_height_m;}
+    
+    span.ui-icon-search { 
+                .Complete_Button_Icon_normal;
+                position: relative;
+                top: 3px;
+                margin-left: 3px;
+            
+                &:hover {.Complete_Button_Icon_hover;}
+                &:active {.Complete_Button_Icon_active;}
+            }
+    
+    
+    /*eacl*/
+    #filemanager-file_filemanager-file-eacl{
+        
+        /*Owner*/
+        td.filemanager-file_filemanager-file-eaclowner{
+            
+            span {display: flex; margin-right: 1px;}
+                span.ui-icon-search { 
+                position: relative;
+                top: 15px;
+                margin-left: -3px;
+                margin-right: 3px;
+                }
+            
+        }
+        
+    }
+    
+    
+    /*Abonements*/
+    td.eaclAccount {width: 200px;}
+}
+
+/*// #####################################################*/
+/*Dialog filemanager upload POPUP WINDOW*/ 
+
+div#stylite-filemanager-upload{
+    margin: 0.5em;
+
+    .et2_file{
+       .dimension_height_m;
+       input {
+            color: @gray_0;
+            width: 250px;
+            background-color: @egw_color_2_a;
+        &:hover {.Complete_Button_add_only_plus_hover;}
+        &:active {background-color: @color_positive_action_active !important;}  
+        }
+        
+        div.progress {width: 0px;}
+  }                           
+
+
+}
 
 
-// Ende filemanager
 //
\ No newline at end of file
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 42fa6eda52..61bf32b7d6 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -658,7 +658,6 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
 }
 .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate],
 .egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"] {
-  /*background-color: @egw_color_blue_lighter !important;*/
   color: #FFF;
   text-shadow: none;
   /*    height: auto;*/
@@ -742,6 +741,17 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
   width: 870px;
   padding: 5px;
 }
+#mail-compose img[src$="svg"] {
+  background-color: #679fd2;
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjNjc5ZmQyIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNjc5ZmQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #679fd2, #679fd2);
+  background-image: -ms-linear-gradient(top, #679fd2, #679fd2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#679fd2), to(#679fd2));
+  background-image: -webkit-linear-gradient(top, #679fd2, #679fd2);
+  background-image: -o-linear-gradient(top, #679fd2, #679fd2);
+  background-image: linear-gradient(top, #679fd2, #679fd2);
+  background-repeat: repeat-x;
+}
 #mail-compose .mailComposeHeaders:first-child {
   /*background-color: @gray-0;*/
   /*.background-color-5-gray;*/
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index a91a3a858b..032f321880 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -302,6 +302,11 @@ div#mail-index{
     width: 870px;
     padding: 5px;
     
+    img[src$="svg"]{
+            .gradient_vertical (@egw_color_2_e, @egw_color_2_e);
+}
+    
+    
     // ##################################
     //	Identity
     .mailComposeHeaders:first-child{