diff --git a/filemanager/templates/default/app.css b/filemanager/templates/default/app.css
index 87a0eb1605..50bef5969a 100644
--- a/filemanager/templates/default/app.css
+++ b/filemanager/templates/default/app.css
@@ -28,6 +28,7 @@
 div.filemanager_navigation {
 	position: relative;
 	width: 100%;
+	white-space: normal;
 }
 div.filemanager_navigation > * {
 	vertical-align: middle;
@@ -37,7 +38,8 @@ div.filemanager_navigation > * {
 }
 #filemanager-index_buttons > * {
 	vertical-align: middle;
-	padding-left: 3px;
+	//padding-left: 2px;
+	margin:0;
 }
 div.filemanager_navigation > label {
 	position: absolute;
@@ -50,6 +52,10 @@ div.filemanager_navigation > label {
 div.filemanager_navigation > label > input {
 	width: 100%;
 }
+#filemanager-index_buttons div.et2_file {
+	width: 130px;
+	margin-top: 2px;
+}
 #filemanager-index-buttons div.et2_file .progress {
   position: absolute;
   right: 0px;
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index 215661fe12..b277a5b08a 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -60,6 +60,7 @@
 div.filemanager_navigation {
   position: relative;
   width: 100%;
+  white-space: normal;
 }
 div.filemanager_navigation > * {
   vertical-align: middle;
@@ -69,7 +70,7 @@ div.filemanager_navigation > * {
 }
 #filemanager-index_buttons > * {
   vertical-align: middle;
-  padding-left: 3px;
+  margin: 0;
 }
 div.filemanager_navigation > label {
   position: absolute;
@@ -82,6 +83,10 @@ div.filemanager_navigation > label {
 div.filemanager_navigation > label > input {
   width: 100%;
 }
+#filemanager-index_buttons div.et2_file {
+  width: 130px;
+  margin-top: 2px;
+}
 #filemanager-index-buttons div.et2_file .progress {
   position: absolute;
   right: 0px;
@@ -200,6 +205,9 @@ div.filemanager_navigation > label {
   vertical-align: middle;
   margin-right: 0.2em;
 }
+#filemanager-index_buttons div.et2_file {
+  width: 139px;
+}
 div.filemanager_navigation > label > input {
   width: 95%;
 }
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index b03e22974c..4bceeb12fc 100644
--- a/filemanager/templates/pixelegg/app.less
+++ b/filemanager/templates/pixelegg/app.less
@@ -100,6 +100,9 @@ div.filemanager_navigation > label {
     margin-right: 0.2em;
 }
 
+#filemanager-index_buttons div.et2_file {
+	width: 139px;
+}
 
 div.filemanager_navigation > label > input {
     width: 95%;