diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index 801120af17..9d574d45af 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -677,7 +677,7 @@ app.classes.filemanager = AppJS.extend(
 		egw().open_link(egw.link('/index.php', {
 			menuaction: 'filemanager.filemanager_ui.file',
 			path: path
-		}), 'fileprefs', '495x425');
+		}), 'fileprefs', '510x425');
 	},
 
 	/**
diff --git a/filemanager/templates/default/file.xet b/filemanager/templates/default/file.xet
index 896f51f96c..61518b7280 100644
--- a/filemanager/templates/default/file.xet
+++ b/filemanager/templates/default/file.xet
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="filemanager.file.general" template="" lang="" group="0" version="1.7.002">
-		<grid width="450" height="300" spacing="10">
+		<grid width="450" spacing="10">
 			<columns>
 				<column width="80"/>
 				<column/>
@@ -41,13 +41,13 @@
 				</row>
 				<row>
 					<description for="comment" value="Comment"/>
-					<textbox multiline="true" id="comment" class="comment"/>
+					<textbox multiline="true" id="comment" class="comment" height="200"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
 	<template id="filemanager.file.perms" template="" lang="" group="0" version="1.5.001">
-		<grid width="450" height="300" spacing="10">
+		<grid width="450" spacing="10">
 			<columns>
 				<column/>
 			</columns>
@@ -123,7 +123,7 @@
 		</grid>
 	</template>
 	<template id="filemanager.file.eacl" template="" lang="" group="0" version="1.9.001">
-		<grid width="550" height="300" spacing="10">
+		<grid width="550" spacing="10">
 			<columns>
 				<column width="120"/>
 				<column/>
@@ -174,7 +174,7 @@
 		</grid>
 	</template>
 	<template id="filemanager.file.preview" template="" lang="" group="0" version="1.5.001">
-		<grid width="450" height="300" spacing="10" overflow="auto">
+		<grid width="450" spacing="10" overflow="auto">
 			<columns>
 				<column/>
 			</columns>
@@ -192,7 +192,7 @@
 		</grid>
 	</template>
 	<template id="filemanager.file.custom" template="" lang="" group="0" version="1.5.001">
-		<grid width="450" height="300" spacing="10" overflow="auto">
+		<grid width="450" spacing="10" overflow="auto">
 			<columns>
 				<column/>
 			</columns>
@@ -204,7 +204,7 @@
 		</grid>
 	</template>
 	<template id="filemanager.file.merge" template="" lang="" group="0" version="1.9.001">
-		<grid width="450" height="300" spacing="10" overflow="auto">
+		<grid width="450" spacing="10" overflow="auto">
 			<columns>
 				<column/>
 			</columns>
@@ -243,7 +243,7 @@
 		</grid>
 	</template>
 	<template id="filemanager.file" template="" lang="" group="0" version="1.9.001">
-		<grid>
+		<grid width="100%">
 			<columns>
 				<column/>
 			</columns>
@@ -252,7 +252,7 @@
 					<description id="msg" span="all" class="redItalic"/>
 				</row>
 				<row class="dialogTabs">
-					<tabbox id="tabs" span="all">
+					<tabbox id="tabs" span="all" tab_height = "400">
 						<tabs>
 							<tab id="filemanager.file.general" label="General"/>
 							<tab id="filemanager.file.perms" label="Permissions"/>
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index a1dfab0340..7b083f908a 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -399,17 +399,10 @@ table.egwGridView_grid img {
 }
 /*// #####################################################*/
 /*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;
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index aa7f4d80d1..80c0f98138 100644
--- a/filemanager/templates/pixelegg/app.less
+++ b/filemanager/templates/pixelegg/app.less
@@ -269,14 +269,8 @@ table.egwGridView_grid img {
 /*// #####################################################*/
 /*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 {