diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index c5a4920bb6..487aba80ed 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: -26px;*/
+  top: -5px;
   float: left;
   position: absolute;
   right: 0;
@@ -211,8 +211,16 @@ div.filemanager_navigation > label > input {
   font-size: 2em;
   color: #ffc200;
   line-height: 0.6em;
-  padding-left: 0.1em;
   padding-right: 0em;
+  position: relative;
+  top: 15px;
+  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 {
   background-color: #66a1d2 !important;
@@ -231,13 +239,10 @@ div.filemanager_navigation > label > input {
   background-color: #1aa200 !important;
 }
 #filemanager-index .et2_file input#filemanager-index_upload {
+  margin-left: 2em;
+  position: relative;
+  top: -8px;
   width: 250px;
-  /*.Complete_Button_add_only_plus;*/
-  /*.dimension_width_height_s;*/
-  /*background-color: @egw_color_2_a;*/
-  /*position: relative; top: 7px;*/
-  /*background-image: url(images/gradient01.png);*/
-  /*input {display: none;}*/
 }
 #filemanager-index .et2_file div.progress {
   width: 0px;
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index 0837bd462a..c5626b33cd 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: -26px;*/
+    top: -5px;
     
     float: left;
     position: absolute;
@@ -111,31 +111,29 @@ div.filemanager_navigation > label > input {
 
     .et2_file{
        /*background-color: @egw_color_2_a;*/
-        &:before {
-                        content: "+"; 
-                        font-size: 2em; 
-                        color: @egw_color_1_a; 
-                        line-height: 0.6em; 
-                        padding-left: 0.1em;
-                        padding-right: 0em;
+        
+       &:before {
+            content: "+";
+            font-size: 2em;
+            color: #ffc200;
+            line-height: 0.6em;
+            padding-right: 0em;
+            position: relative;
+            top: 15px;
+            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;
+            position: relative;
+            top: -8px;
             width: 250px;
             
-            /*.Complete_Button_add_only_plus;*/
-            /*.dimension_width_height_s;*/
-            /*background-color: @egw_color_2_a;*/
-            /*position: relative; top: 7px;*/
-            /*background-image: url(images/gradient01.png);*/
-            
-            /*input {display: none;}*/
-            
-            
         }
         
         div.progress {width: 0px;}
diff --git a/resources/templates/default/edit.xet b/resources/templates/default/edit.xet
index dc14743476..49293ee247 100644
--- a/resources/templates/default/edit.xet
+++ b/resources/templates/default/edit.xet
@@ -214,16 +214,16 @@
 				<column/>
 				<column/>
 				<column/>
-				<column width="100%"/>
+				<column/>
 			</columns>
 			<rows>
 				<row>
 					<hbox span="3">
-						<button statustext="Saves entry and exits" label="Save" id="save"/>
-						<button label="Apply" id="apply"/>
-						<button label="Cancel" onclick="window.close();"/>
+						<button statustext="Saves entry and exits" label="Save" id="save" image="save" background_image="1"/>
+						<button label="Apply" id="apply" image="apply" background_image="1"/>
+						<button label="Cancel" id="cancel" onclick="window.close();" image="close" background_image="1"/>
 					</hbox>
-					<button align="right" label="Delete" id="delete" onclick="et2_dialog.confirm(widget,'Do you really want do delte this resource?','Delete')"/>
+					<button align="right" label="Delete" id="delete" onclick="et2_dialog.confirm(widget,'Do you really want do delte this resource?','Delete')" image="delete" background_image="1"/>
 				</row>
 			</rows>
 		</grid>
@@ -237,7 +237,7 @@
 				<row disabled="!@msg">
 					<description id="msg" no_lang="1" span="all" class="message"/>
 				</row>
-				<row>
+				<row class="th dialog-header">
 					<hbox>
 						<textbox statustext="Name of resource" label="Name" id="name" needed="1"/>
 						<textbox label="Inventory number" id="inventory_number"/>
@@ -249,7 +249,7 @@
 				<row>
 					<template id="resources.edit_tabs"/>
 				</row>
-				<row>
+				<row class="dialog-footer-toolbar">
 					<template id="resources.edit_buttons"/>
 				</row>
 			</rows>
diff --git a/resources/templates/pixelegg/app.css b/resources/templates/pixelegg/app.css
index 7bde706d3d..e69c830a3d 100755
--- a/resources/templates/pixelegg/app.css
+++ b/resources/templates/pixelegg/app.css
@@ -50,3 +50,6 @@ button#resources-show_add:hover {
 button#resources-show_add:active {
   background-color: #1aa200 !important;
 }
+div#resources-edit {
+  margin: 0.5em;
+}
diff --git a/resources/templates/pixelegg/app.less b/resources/templates/pixelegg/app.less
index d61adb3c01..d36f7d8e1e 100755
--- a/resources/templates/pixelegg/app.less
+++ b/resources/templates/pixelegg/app.less
@@ -45,5 +45,11 @@
 
 
 
-// Dialog Tracker bearbeiten und alle weiteren
-//
\ No newline at end of file
+// Dialog Resources bearbeiten und alle weiteren
+//
+
+div#resources-edit {
+  
+    margin: 0.5em;
+    
+}
\ No newline at end of file