diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php
index 45517a4f..20dc7f06 100644
--- a/bureau/admin/bro_main.php
+++ b/bureau/admin/bro_main.php
@@ -142,7 +142,7 @@ if ($c===false) $error=$err->errstr();
 <?php if ($error) echo "<font color=\"red\">$error</font>"; ?>
 
 <table><tr>
-<td valign="top" style="border: 1px solid #aaa; padding: 10px">
+<td class="formcell">
 
      <form action="bro_main.php" enctype="multipart/form-data" method="post">
      <input type="hidden" name="R" value="<?php echo $R; ?>" />
@@ -158,7 +158,7 @@ if ($c===false) $error=$err->errstr();
 
 </td>
 <td style="width: 20px">&nbsp;</td>
-<td valign="top" style="border: 1px solid #aaa; padding: 10px">
+<td class="formcell">
 
 <?php __("New file or folder:"); ?><br />
 <form action="bro_main.php" method="post" name="nn" id="nn">
@@ -281,11 +281,15 @@ document.write("<input type=\"checkbox\" value=\"1\" class=\"inb\" onclick=\"Che
 //  -->
 </script>
 </th>
+<?php if ($p["showicons"]) { ?>
 <th></th>
+      <?php } ?>
 <th><?php __("Filename"); ?></th>
 <th><?php __("Size"); ?></th>
 <th><?php __("Last modification"); ?></th>
+<?php if ($p["showtype"]) { ?>
 <th><?php __("File Type"); ?></th>
+				 <?php } ?>
 <th></th>
 </tr>
 <?php
@@ -527,10 +531,10 @@ else {
 </p><p>
 <span class="ina"><?php
 if ($hta->is_protected($R)) {
-echo "<a href=\"hta_edit.php?dir=$R\">"._("Edit this folder's restrictions")."</a>";
+echo "<a href=\"hta_edit.php?dir=".(($R)?$R:"/")."\">"._("Edit this folder's restrictions")."</a>";
 }
 else {
-echo "<a href=\"hta_add.php?value=$R\">"._("Protect this folder")."</a>";
+  echo "<a href=\"hta_add.php?value=".(($R)?$R:"/")."\">"._("Protect this folder")."</a>";
 }
 ?></span> <?php __("with a login and a password"); ?>
 </p><p>
diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index d3b80eda..8e905bd7 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -69,7 +69,7 @@ function dnsoff() {
 <!-- *****************************************
 		 gestion des sous-domaines
  -->
-<table cellspacing="0" cellpadding="3">
+<table class="tlist">
 <tr><th colspan="2"><?php __("Actions"); ?></th><th><?php __("Subdomain"); ?></th><th><?php __("Place"); ?></th></tr>
 <?php
 $col=1;
@@ -79,6 +79,7 @@ for($i=0;$i<$r["nsub"];$i++) {
 	<tr class="lst<?php echo $col; ?>">
 		<td class="center">
 			<div class="ina"><a href="dom_subedit.php?domain=<?php echo urlencode($r["name"]) ?>&amp;sub=<?php  echo urlencode($r["sub"][$i]["name"]) ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div>
+
 			</td><td class="center">
 			<div class="ina"><a href="dom_subdel.php?domain=<?php echo urlencode($r["name"]) ?>&amp;sub=<?php  echo urlencode($r["sub"][$i]["name"]) ?>"><img src="images/delete.png" alt="<?php __("Delete"); ?>" /><?php __("Delete"); ?></a></div>
 		</td>
@@ -90,7 +91,7 @@ for($i=0;$i<$r["nsub"];$i++) {
 <br />
 <hr/>
 <br />
-<form action="dom_subdoedit.php?" method="post" name="main" id="main">
+<form action="dom_subdoedit.php" method="post" name="main" id="main">
 	<table border="0">
 		<tr>
 			<td colspan="2">
diff --git a/bureau/admin/ftp_add.php b/bureau/admin/ftp_add.php
index 86250252..237de3ec 100644
--- a/bureau/admin/ftp_add.php
+++ b/bureau/admin/ftp_add.php
@@ -47,7 +47,7 @@ if (!$quota->cancreate("ftp")) {
 	}
 ?>
 <form method="post" action="ftp_doadd.php" name="main" id="main">
-<table><thead><?php __("Create a new ftp account"); ?></thead>
+<table>
 <tr><th><input type="hidden" name="id" value="<?php echo $id ?>" />
 <label for="login"><?php __("Username"); ?></label></th><td>
 	<select class="inl" name="prefixe"><?php $ftp->select_prefix_list($prefixe); ?></select>&nbsp;<b>_</b>&nbsp;<input type="text" class="int" name="login" id="login" value="<?php echo $login; ?>" size="20" maxlength="64" />
diff --git a/bureau/admin/hta_add.php b/bureau/admin/hta_add.php
index 83490c1a..14ff6e0f 100644
--- a/bureau/admin/hta_add.php
+++ b/bureau/admin/hta_add.php
@@ -33,7 +33,7 @@ include_once("head.php");
 ?>
 <h3><?php __("Protect a folder"); ?></h3>
 <p>
-<?php __("The folder must exists."); ?>
+<?php __("Enter the name of the folder you want to protect. It must already exists."); ?>
 </p>
 <?php
 	if ($error) {
@@ -46,15 +46,17 @@ include_once("head.php");
 <table border="1" cellspacing="0" cellpadding="4">
 <tr>
 	<td><label for="dir"><?php __("Folder"); ?></label></td>
-	<td><input type="text" class="int" name="dir" id="dir" value="<?php echo $value ?>" size="20" maxlength="64" />
+	<td><input type="text" class="int" name="dir" id="dir" value="<?php echo $value ?>" maxlength="255" />
 <script type="text/javascript">
 <!--
-  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.dir');\" value=\" ... \" class=\"inb\">");
+  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.dir');\" value=\" <?php __("Choose a folder..."); ?> \" class=\"bff\">");
 //  -->
-</script></td>
+</script>
+</td>
 </tr>
-<tr><td colspan="2"><input type="submit" class="inb" value="<?php __("Protect this folder"); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" value="<?php __("Protect this folder"); ?>" />
 </form>
 <script type="text/javascript">
 document.forms['main'].dir.focus();
diff --git a/bureau/admin/hta_adduser.php b/bureau/admin/hta_adduser.php
index 183d8a8f..a4046eae 100644
--- a/bureau/admin/hta_adduser.php
+++ b/bureau/admin/hta_adduser.php
@@ -23,7 +23,7 @@
 
  To read the license please visit http://www.gnu.org/copyleft/gpl.html
  ----------------------------------------------------------------------
- Original Author of file: Franck Missoum
+ Original Author of file: Franck Missoum, Benjamin Sonntag
  Purpose of file: Add a username to a protected folder
  ----------------------------------------------------------------------
 */
@@ -61,10 +61,10 @@ getFields($fields);
 		<td><label for="passwordconf"><?php __("Confirm password"); ?></label></td>
 		<td><input type="password" class="int" name="passwordconf" id="passwordconf" value="" size="20" maxlength="64" /></td>
 	</tr>
-	<tr>
-		<td colspan="2"><input type="submit" class="inb" value="<?php __("Add this user"); ?>" /></td>
-	</tr>
 </table>
+<br />
+<input type="submit" class="inb" value="<?php __("Add this user"); ?>" />
+  <input type="button" class="inb" value="<?php __("Cancel"); ?>" onclick="document.location='hta_edit.php?dir=<?php echo urlencode($dir);  ?>';" />
 </form>
 <script type="text/javascript">
 document.forms['main'].user.focus();
diff --git a/bureau/admin/hta_edit.php b/bureau/admin/hta_edit.php
index be86ae67..96afda84 100644
--- a/bureau/admin/hta_edit.php
+++ b/bureau/admin/hta_edit.php
@@ -23,7 +23,7 @@
 
  To read the license please visit http://www.gnu.org/copyleft/gpl.html
  ----------------------------------------------------------------------
- Original Author of file: Franck Missoum
+ Original Author of file: Franck Missoum, Benjamin Sonntag
  Purpose of file: Edit a protected folder
  ----------------------------------------------------------------------
 */
@@ -49,18 +49,14 @@ if (!$dir) {
 <?php
 	if (!count($r)) {
 		echo "<p class=\"error\">".sprintf(_("No authorized user in %s"),$dir)."</p>";
-		echo "<a href=\"hta_adduser.php?dir=$dir\">"._("Add a username")."</a><br />";
-		echo "<br /><small><a href=\"bro_main.php?R=$dir\">"._("File browser")."</a><br /></small>";
-		include_once("foot.php");
-		exit();
-	}
-reset($r);
-
+	} else {
+	  reset($r);
+	  
 ?>
 <form method="post" action="hta_dodeluser.php">
 <table cellspacing="0" cellpadding="4">
 	<tr>
-		<th colspan="2" ><input type="hidden" name="dir" value="<?php echo $dir?>">&nbsp;</th>
+   <th colspan="2" ><input type="hidden" name="dir" value="<?php echo $dir?>"><?php __("Actions"); ?></th>
 		<th><?php __("Username"); ?></th>
 	</tr>
 <?php
@@ -71,20 +67,53 @@ for($i=0;$i<count($r);$i++){
 ?>
 	<tr class="lst<?php echo $col; ?>">
 		<td align="center"><input type="checkbox" class="inc" name="d[]"" value="<?php echo $r[$i]?>" /></td>
-		<td><a href="hta_edituser.php?user=<?php echo $r[$i]?>&amp;dir=<?php echo $dir?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /></a></td>
+		<td>
+<div class="ina"><a href="hta_edituser.php?user=<?php echo $r[$i]?>&amp;dir=<?php echo $dir?>"><img src="icon/encrypted.png" alt="<?php __("Change this user's password"); ?>" /><?php __("Change this user's password"); ?></a></div>
+</td>
 		<td><?php echo $r[$i]; ?></td>
 	</tr>
 <?php
 }
 ?>
-<tr><td colspan="3"><input type="submit" class="inb" name="submit" value="<?php __("Delete the checked users"); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" name="submit" value="<?php __("Delete the checked users"); ?>" />
 </form>
 
+<?php } ?>
 <p>
-<a href="hta_adduser.php?dir=<?php echo $dir ?>"><?php __("Add a username"); ?></a>
-</p>
-<p>
-<small><a href="bro_main.php?R=<?php echo $dir ?>"><?php __("File browser"); ?></a></small>
+<span class="inb"><a href="bro_main.php?R=<?php echo $dir ?>"><?php __("Show this folder's content in the File Browser"); ?></a></span>
 </p>
+
+<p>&nbsp;</p>
+
+<hr />
+<p><?php __("Adding an authorized user"); ?></p>
+
+<form method="post" action="hta_doadduser.php" name="main" id="main">
+<table class="tedit">
+	<tr>
+		<td><input type="hidden" name="dir" value="<?php echo $dir ?>" /><?php __("Folder"); ?></td>
+		<td><code><?php echo $dir; ?></code></td>
+	</tr>
+	<tr>
+		<td><label for="user"><?php __("Username"); ?></label></td>
+		<td><input type="text" class="int" name="user" id="user" value="" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><label for="password"><?php __("Password"); ?></label></td>
+		<td><input type="password" class="int" name="password" id="password" value="" size="20" maxlength="64" /></td>
+	</tr>
+	<tr>
+		<td><label for="passwordconf"><?php __("Confirm password"); ?></label></td>
+		<td><input type="password" class="int" name="passwordconf" id="passwordconf" value="" size="20" maxlength="64" /></td>
+	</tr>
+</table>
+<br />
+<input type="submit" class="inb" value="<?php __("Add this user"); ?>" />
+</form>
+<script type="text/javascript">
+document.forms['main'].user.focus();
+</script>
+
 <?php include_once("foot.php"); ?>
\ No newline at end of file
diff --git a/bureau/admin/hta_list.php b/bureau/admin/hta_list.php
index 2d315eb0..ed8eb610 100644
--- a/bureau/admin/hta_list.php
+++ b/bureau/admin/hta_list.php
@@ -61,8 +61,8 @@ $mem->show_help("hta_list2");
 </p>
 
 <form method="post" action="hta_del.php">
-<table cellspacing="0" cellpadding="4">
-<tr><th colspan="2">&nbsp;</th><th><?php __("Folder"); ?></th></tr>
+<table class="tlist">
+  <tr><th colspan="2"><?php __("Actions"); ?></th><th><?php __("Folder"); ?></th></tr>
 <?php
 $col=1;
 
@@ -72,18 +72,20 @@ for($i=0;$i<count($r);$i++){
 ?>
 	<tr  class="lst<?php echo $col; ?>">
 		<td align="center"><input type="checkbox" class="inc" name="del_<?php echo $r[$i] ?>" value="<?php echo $r[$i] ?>" /></td>
-		<td><a href="hta_edit.php?dir=<?php echo $r[$i]?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /></a></td>
+		<td>
+<div class="ina"><a href="hta_edit.php?dir=<?php echo $r[$i]?>"><img src="icon/encrypted.png" alt="<?php __("Edit login and passwords"); ?>" /><?php __("Edit login and passwords"); ?></a></div>
+</td>
 		<td><code><?php echo "$r[$i]"?></code></td>
 	</tr>
     <?php
 	}
 ?>
-<tr><td colspan="3"><input type="submit" class="inb" name="submit" value="<?php __("Unprotect the checked folders"); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" name="submit" value="<?php __("Unprotect the checked folders"); ?>" />
+			<span class="inb"><a href="hta_add.php"><?php __("Protect a folder"); ?></a></span>
 </form>
-<p>
-<a href="hta_add.php"><?php __("Protect a folder"); ?></a>
-</p>
+
 <p>
 <?php $mem->show_help("hta_list"); ?>
 </p>
diff --git a/bureau/admin/icon/doc.png b/bureau/admin/icon/doc.png
index fa88841e..1137f3b0 100644
Binary files a/bureau/admin/icon/doc.png and b/bureau/admin/icon/doc.png differ
diff --git a/bureau/admin/icon/exe.png b/bureau/admin/icon/exe.png
index 678d971f..a6de4167 100644
Binary files a/bureau/admin/icon/exe.png and b/bureau/admin/icon/exe.png differ
diff --git a/bureau/admin/icon/file.png b/bureau/admin/icon/file.png
index 7323203b..25a06efb 100644
Binary files a/bureau/admin/icon/file.png and b/bureau/admin/icon/file.png differ
diff --git a/bureau/admin/icon/folder.png b/bureau/admin/icon/folder.png
index f1ae1bbc..d2edbaad 100644
Binary files a/bureau/admin/icon/folder.png and b/bureau/admin/icon/folder.png differ
diff --git a/bureau/admin/icon/htm.png b/bureau/admin/icon/htm.png
index 68921013..125dc40b 100644
Binary files a/bureau/admin/icon/htm.png and b/bureau/admin/icon/htm.png differ
diff --git a/bureau/admin/icon/jpg.png b/bureau/admin/icon/jpg.png
index afdbace6..09f9c1af 100644
Binary files a/bureau/admin/icon/jpg.png and b/bureau/admin/icon/jpg.png differ
diff --git a/bureau/admin/icon/m3u.png b/bureau/admin/icon/m3u.png
index 0468529e..bb3db46a 100644
Binary files a/bureau/admin/icon/m3u.png and b/bureau/admin/icon/m3u.png differ
diff --git a/bureau/admin/icon/pdf.png b/bureau/admin/icon/pdf.png
index 1357fcf2..35ca44b0 100644
Binary files a/bureau/admin/icon/pdf.png and b/bureau/admin/icon/pdf.png differ
diff --git a/bureau/admin/icon/ppt.png b/bureau/admin/icon/ppt.png
index 13214c3e..fb87643a 100644
Binary files a/bureau/admin/icon/ppt.png and b/bureau/admin/icon/ppt.png differ
diff --git a/bureau/admin/icon/ra.png b/bureau/admin/icon/ra.png
index 88c4356c..b76d8b9e 100644
Binary files a/bureau/admin/icon/ra.png and b/bureau/admin/icon/ra.png differ
diff --git a/bureau/admin/icon/swf.png b/bureau/admin/icon/swf.png
index d5d3a086..4a63816c 100644
Binary files a/bureau/admin/icon/swf.png and b/bureau/admin/icon/swf.png differ
diff --git a/bureau/admin/icon/txt.png b/bureau/admin/icon/txt.png
index c445d96e..34315a39 100644
Binary files a/bureau/admin/icon/txt.png and b/bureau/admin/icon/txt.png differ
diff --git a/bureau/admin/icon/wav.png b/bureau/admin/icon/wav.png
index 12feca8f..994ef397 100644
Binary files a/bureau/admin/icon/wav.png and b/bureau/admin/icon/wav.png differ
diff --git a/bureau/admin/icon/xls.png b/bureau/admin/icon/xls.png
index ca600ced..cd92c674 100644
Binary files a/bureau/admin/icon/xls.png and b/bureau/admin/icon/xls.png differ
diff --git a/bureau/admin/icon/zip.png b/bureau/admin/icon/zip.png
index 47156d68..4779bae1 100644
Binary files a/bureau/admin/icon/zip.png and b/bureau/admin/icon/zip.png differ
diff --git a/bureau/admin/mail_add.php b/bureau/admin/mail_add.php
index cee1312d..38717659 100644
--- a/bureau/admin/mail_add.php
+++ b/bureau/admin/mail_add.php
@@ -49,7 +49,7 @@ if ($error) {
 <table border="1" cellspacing="0" cellpadding="4">
 	<tr><td><input type="hidden" name="domain" value="<?php echo $domain ?>" />
 <label for="email"><?php __("Email address"); ?></label></td><td><input class="int" type="text" name="email" id="email" value="<?php echo $email ?>" size="20" maxlength="32" />@<?php echo $domain ?></td></tr>
-	<tr><td><label for="ispop"><?php __("Is it a POP account?"); ?></label></td><td><input id="ispop" class="inc" type="checkbox" name="pop" value="1" <?php if ($pop=="1") echo "checked=\"checked\""; ?> /></td></tr>
+	<tr><td><label for="ispop"><?php __("Is it a POP/IMAP account?"); ?></label></td><td><input id="ispop" class="inc" type="checkbox" name="pop" value="1" <?php if ($pop=="1") echo "checked=\"checked\""; ?> /></td></tr>
 	<tr><td><label for="pass"><?php __("POP password"); ?></label></td><td><input class="int" type="password" name="pass" id="pass" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
 	<tr><td><label for="passconf"><?php __("Confirm password"); ?></label></td><td><input class="int" type="password" name="passconf" id="passconf" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
 	<tr><td><label for="alias"><?php __("Other recipients"); ?></label></td><td>(<?php __("One email per line"); ?>)<br /><textarea class="int" cols="32" rows="5" name="alias" id="alias"><?php echo $alias; ?></textarea></td></tr>
diff --git a/bureau/admin/mail_edit.php b/bureau/admin/mail_edit.php
index 36875a86..3d61aa5c 100644
--- a/bureau/admin/mail_edit.php
+++ b/bureau/admin/mail_edit.php
@@ -58,16 +58,18 @@ if ($error_edit) {
 } ?>
 
 <form action="mail_doedit.php" method="post" name="main" id="main">
-<table border="1" cellspacing="0" cellpadding="4">
+<table class="tedit">
 	<tr><th colspan="2"><input type="hidden" name="email" value="<?php echo $email; ?>" />
 <input type="hidden" name="domain" value="<?php echo $domain; ?>" />
-<?php printf(_("Edit the mailbox %s"),$email); ?></th></tr>
+<?php printf(_("Edit the mailbox <b>%s</b>"),$email); ?></th></tr>
         <tr><td><label for="ispop"><?php __("Is it a POP account?"); ?></label></td><td><input id="ispop" type="checkbox" class="inc" name="pop" value="1" <?php if ($pop=="1") echo "checked=\"checked\""; ?> /><?php if ($pop) { __("WARNING: turning POP off will DELETE the mailbox and its content"); }?></td></tr>
 	<tr><td><label for="pass"><?php __("POP password"); ?></label></td><td><input type="password" class="int" name="pass" id="pass" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
 	<tr><td><label for="passconf"><?php __("Confirm password"); ?></label></td><td><input type="password" class="int" name="passconf" id="passconf" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
 	<tr><td><label for="alias"><?php __("Other recipients"); ?></label></td><td>(<?php __("One email per line"); ?>)<br /><textarea class="int" cols="32" rows="5" name="alias" id="alias"><?php echo $alias; ?></textarea></td></tr>
-	<tr><td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Change this mailbox"); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" name="submit" value="<?php __("Change this mailbox"); ?>" />
+<input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='mail_list.php?domain=<?php echo urlencode($domain); ?>'"/>
 </form>
 <p><small>
 <?php __("help_mail_edit"); ?>
diff --git a/bureau/admin/mail_list.php b/bureau/admin/mail_list.php
index 5a9c0e29..9b88f4d9 100644
--- a/bureau/admin/mail_list.php
+++ b/bureau/admin/mail_list.php
@@ -51,9 +51,12 @@ if(!$res=$mail->enum_doms_mails($domain,1,$letter)) {
 if ($error) {
   echo "<p class=\"error\">$error</p>";
 }
-echo "<p><a href=\"mail_add.php?domain=$domain\">".sprintf(_("Add a mailbox on <b>%s</b>"),$domain)."</a><br />";
-echo "   <a href=\"mail_add.php?many=1&amp;domain=$domain\">".sprintf(_("Add many mailboxes on <b>%s</b>"),$domain)."</a></p>";
-
+?>
+<p>
+  <span class="inb"><a href="mail_add.php?domain=<?php echo $domain; ?>"><?php printf(_("Add a mailbox on <b>%s</b>"),$domain); ?></a></span> 
+  <span class="inb"><a href="mail_add.php?many=1&amp;domain=<?php echo $domain; ?>"><?php printf(_("Add many mailboxes on <b>%s</b>"),$domain); ?></a></span>
+</p>
+<?
 }
 else
 {
@@ -64,37 +67,47 @@ else
 if ($error) {
   echo "<p class=\"error\">$error</p>";
 }
-
-echo "<p><a href=\"mail_add.php?domain=$domain\">".sprintf(_("Add a mailbox on <b>%s</b>"),$domain)."</a><br />";
-echo "   <a href=\"mail_add.php?many=1&amp;domain=$domain\">".sprintf(_("Add many mailboxes on <b>%s</b>"),$domain)."</a></p>";
+?>
+<p>
+  <span class="inb"><a href="mail_add.php?domain=<?php echo $domain; ?>"><?php printf(_("Add a mailbox on <b>%s</b>"),$domain); ?></a></span> 
+  <span class="inb"><a href="mail_add.php?many=1&amp;domain=<?php echo $domain; ?>"><?php printf(_("Add many mailboxes on <b>%s</b>"),$domain); ?></a></span>
+</p>
+<?php
 
 if(!$letters=$mail->enum_doms_mails_letters($domain))
   $error=$err->errstr();
 else{
+  echo "<p>";
+  __("Show only mail starting by:"); 
+  echo " ";
   for($i=0;$i<count($letters);$i++){
     $val=$letters[$i];
     echo "   <a href=\"mail_list.php?domain=$domain&amp;letter=$val\">$val&nbsp;</a>";
   }
   echo "   <a href=\"mail_list.php?domain=$domain\">".sprintf(_("All"))."</a>";
+  echo "</p>";
 }
 
  if ($res["count"]) {
 ?>
 <form method="post" action="mail_del.php" id="main">
 
-<table cellspacing="0" cellpadding="4">
+<table class="tlist">
 
-<tr><th><input type="hidden" name="domain" value="<?php echo $domain ?>"/>
-<?php __("Delete"); ?></th><th><?php __("Email address"); ?></th><th><?php __("Action"); ?></th><th><?php __("Size"); ?></th></tr>
+<tr><th colspan="2"><input type="hidden" name="domain" value="<?php echo $domain ?>"/>
+<?php __("Actions"); ?></th><th><?php __("Email address"); ?></th><th><?php __("Size"); ?></th></tr>
 <?php
 $col=1;
 for($i=0;$i<$res["count"];$i++) {
 	$col=3-$col;
 	$val=$res[$i];
 	echo "<tr class=\"lst$col\">";
-	echo "<td align=\"center\"><input class=\"inc\" type=\"checkbox\" id=\"del_$i\" name=\"d[]\" value=\"".$val["mail"]."\" /></td>
-	<td><label for=\"del_$i\">".$val["mail"]."</label></td>
-	<td class=\"center\"><a href=\"mail_edit.php?email=".urlencode($val["mail"])."&amp;domain=".urlencode($domain)."\"><img src=\"images/edit.png\" alt=\""._("Edit")."\" /></a></td>";
+	echo "<td align=\"center\"><input class=\"inc\" type=\"checkbox\" id=\"del_$i\" name=\"d[]\" value=\"".$val["mail"]."\" /></td>";
+?>
+<td><div class="ina"><a href="mail_edit.php?email=<?php echo urlencode($val["mail"]);  ?>&amp;domain=<?php echo urlencode($domain); ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div></td>
+
+<?php
+	echo "<td><label for=\"del_$i\">".$val["mail"]."</label></td>";
 	if ($val["pop"]) {
 		echo "<td>".format_size($val["size"])."</td>";
 	} else {
@@ -104,8 +117,9 @@ for($i=0;$i<$res["count"];$i++) {
 
 }
 ?>
-<tr><td colspan="5"><input type="submit" class="inb" name="submit" value="<?php __("Delete the selected mailboxes"); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" name="submit" value="<?php __("Delete the selected mailboxes"); ?>" />
 </form>
 
 <?php
diff --git a/bureau/admin/sql_add.php b/bureau/admin/sql_add.php
index 66e7d4fb..cffbc54a 100644
--- a/bureau/admin/sql_add.php
+++ b/bureau/admin/sql_add.php
@@ -47,11 +47,12 @@ if (!$quota->cancreate("mysql")) {
 	}
 ?>
 <form method="post" action="sql_doadd.php" id="main">
-<table border="1" cellspacing="0" cellpadding="4">
+<table class="tedit">
 <tr><th><label for="dbn"><?php __("Database"); ?></label></th><td>
 	<?php echo $mem->user["login"]; ?>&nbsp;<b>_</b>&nbsp;<input type="text" class="int" name="dbn" id="dbn" value="<?php echo $dbn; ?>" size="20" maxlength="30" />
 </td></tr>
-<tr><td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Create this new database."); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" name="submit" value="<?php __("Create this new database."); ?>" />
 </form>
 <?php include_once("foot.php"); ?>
diff --git a/bureau/admin/sql_bck.php b/bureau/admin/sql_bck.php
index 098ce145..9c86be4c 100644
--- a/bureau/admin/sql_bck.php
+++ b/bureau/admin/sql_bck.php
@@ -51,8 +51,8 @@ if (is_array($r)) {
 <h3><?php printf(_("Manage the SQL backup for database %s"),$r["db"]); ?></h3>
 
 <form action="sql_dobck.php" method="post" id="main" name="main">
-<table cellspacing="0" cellpadding="4">
-<tr class="lst2">
+<table class="tedit">
+<tr>
 	<th><label for="bck_mode"><?php __("Do sql backup?"); ?></label></th>
 	<td>
         <input type="hidden" name="id" value="<?php echo $id; ?>" />
@@ -62,7 +62,7 @@ if (is_array($r)) {
 	<option value="2"<?php if ($r["bck"]==2) echo " selected=\"selected\""; ?>><?php __("Daily backup"); ?></option>
 	</select></td>
 </tr>
-<tr class="lst1">
+<tr>
 	<th><label for="bck_history"><?php __("How many backup should be kept?"); ?></label></th>
 	<td><select class="inl" name="bck_history" id="bck_history">
 	<?php
@@ -74,28 +74,26 @@ if (is_array($r)) {
 	?>
 	</select></td>
 </tr>
-<tr class="lst2">
+<tr>
 	<th><label for="bck_gzip"><?php __("Compress the backups? (gzip)"); ?></label></th>
 	<td><select class="inl" name="bck_gzip" id="bck_gzip">
 	<option value="0"<?php if ($r["gzip"]==0) echo " selected=\"selected\""; ?>><?php __("No"); ?></option>
 	<option value="1"<?php if ($r["gzip"]==1) echo " selected=\"selected\""; ?>><?php __("Yes"); ?></option>
 	</select></td>
 </tr>
-<tr class="lst1">
+<tr>
 	<th><label for="bck_dir"><?php __("In which folder do you want to store the backups?"); ?></label></th>
 	<td><input type="text" class="int" name="bck_dir" id="bck_dir" size="30" maxlength="255" value="<?php echo $r["dir"]; ?>" />
 <script type="text/javascript">
 <!--
-  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.bck_dir');\" value=\" ... \" class=\"inb\" />");
+  document.write("&nbsp;<input type=\"button\" name=\"bff\" class=\"bff\" onclick=\"browseforfolder('main.bck_dir');\" value=\" <?php __("Choose a folder..."); \" />");
 //  -->
 </script>
 </td>
 </tr>
-<tr>
-<td colspan="2"><input class="inb" type="submit" name="submit" value="<?php __("Change the SQL backup parameters"); ?>" /></td>
-</tr>
-
 </table>
+<br />
+<input class="inb" type="submit" name="submit" value="<?php __("Change the SQL backup parameters"); ?>" />
 </form>
 <?php
 	$mem->show_help("sql_bck");
diff --git a/bureau/admin/sql_del.php b/bureau/admin/sql_del.php
index fcd4bd07..adf66374 100644
--- a/bureau/admin/sql_del.php
+++ b/bureau/admin/sql_del.php
@@ -64,7 +64,7 @@ while (list($key,$val)=each($_POST)) {
 
 ?>
 <br />
-<input type="submit" class="inb" name="sub" value="<?php __("Yes"); ?>" /> - <input type="button" class="inb" name="non" value="<?php __("No"); ?>" onclick="history.back()" />
+<input type="submit" class="inb" name="sub" value="<?php __("Yes"); ?>" /> <input type="button" class="inb" name="non" value="<?php __("No"); ?>" onclick="history.back()" />
 </p>
 </form>
 <?php include_once("foot.php"); ?>
\ No newline at end of file
diff --git a/bureau/admin/sql_getparam.php b/bureau/admin/sql_getparam.php
index e2bbc400..98f48c80 100644
--- a/bureau/admin/sql_getparam.php
+++ b/bureau/admin/sql_getparam.php
@@ -43,20 +43,20 @@ if (!$r=$mysql->get_dblist()) {
 
 ?>
 <p><?php __("Your current settings are"); ?> : </p>
-<table cellspacing="0" cellpadding="4">
-	<tr class="lst2">
+<table class="tedit">
+	<tr>
 		<th><?php __("Username"); ?></th>
 		<td><code><?php echo $mem->user["login"]; ?></code></td>
 	</tr>
-	<tr class="lst1">
+	<tr>
 		<th><?php __("Password"); ?></th>
 		<td><code><?php echo $r[0]["pass"]; ?></code></td>
 	</tr>
-	<tr class="lst2">
+	<tr>
 		<th><?php __("SQL Server"); ?></th>
 		<td><code><?php echo $mysql->server; ?></code></td>
 	</tr>
-	<tr class="lst1">
+	<tr>
 		<th><?php __("Database"); ?></th>
 		<td><code><?php echo $r[0]["db"]; ?></code></td>
 	</tr>
diff --git a/bureau/admin/sql_list.php b/bureau/admin/sql_list.php
index e8487e9f..bbe8b766 100644
--- a/bureau/admin/sql_list.php
+++ b/bureau/admin/sql_list.php
@@ -45,7 +45,7 @@ echo "<p>"._("help_sql_list_ok")."</p>";
 ?>
 
 <form method="post" action="sql_del.php" name="main" id="main">
-<table cellspacing="0" cellpadding="4">
+<table class="tlist">
    <tr><th>&nbsp;</th><th><?php __("Database"); ?></th><th><?php __("Backup"); ?></th><th><?php __("Restore"); ?></th><th><?php __("Size"); ?></th></tr>
 
 <?php
@@ -58,8 +58,8 @@ for($i=0;$i<count($r);$i++) {
 	<tr  class="lst<?php echo $col; ?>">
 		<td align="center"><input type="checkbox" class="inc" id="del_<?php echo $val["name"]; ?>" name="del_<?php echo $val["name"]; ?>" value="<?php echo $val["name"]; ?>" /></td>
 	   <td><label for="del_<?php echo $val["name"]; ?>"><?php echo $val["db"]; ?></label></td>
-		<td><a href="sql_bck.php?id=<?php echo $val["name"] ?>"><?php __("Backup"); ?></a></td>
-		<td><a href="sql_restore.php?id=<?php echo $val["name"] ?>"><?php __("Restore"); ?></a></td>
+		<td><div class="ina"><a href="sql_bck.php?id=<?php echo $val["name"] ?>"><?php __("Backup"); ?></a></div></td>
+		<td><div class="ina"><a href="sql_restore.php?id=<?php echo $val["name"] ?>"><?php __("Restore"); ?></a></div></td>
 		<td><code><?php echo format_size($val["size"]); ?></code></td>
 	</tr>
 <?php
diff --git a/bureau/admin/sta2_add_raw.php b/bureau/admin/sta2_add_raw.php
index 5a0f19db..653025c8 100644
--- a/bureau/admin/sta2_add_raw.php
+++ b/bureau/admin/sta2_add_raw.php
@@ -44,20 +44,21 @@ include_once("head.php");
 	}
 ?>
 <form method="post" action="sta2_doadd_raw.php" id="main" name="main">
-<table border="1" cellspacing="0" cellpadding="4">
+<table class="tedit">
 <tr><th><input type="hidden" name="id" value="<?php echo $id ?>" />
-        <label for="hostname"><?php __("Domain name"); ?></label></th><td>
+  <label for="hostname"><?php __("Domain name:"); ?></label></th><td>
 	<select class="inl" name="hostname" id="hostname"><?php $sta2->select_host_list($hostname); ?></select>
 </td></tr>
-<tr><th><label for="folder"><?php __("Folder"); ?></label></th><td><input type="text" class="int" name="folder" id="folder" value="<?php echo $folder; ?>" size="20" maxlength="255" />
+<tr><th><label for="dir"><?php __("Folder where we will put the log file:"); ?></label></th><td><input type="text" class="int" name="dir" id="dir" value="<?php echo $dir; ?>" size="20" maxlength="255" />
 <script type="text/javascript">
 <!--
-  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.folder');\" value=\" ... \" class=\"inb\" />");
+  document.write("&nbsp;<input type=\"button\" name=\"bff\" class=\"bff\" onclick=\"browseforfolder('main.dir');\" value=\" <?php __("Choose a folder..."); ?> \" />");
 //  -->
 </script>
 </td></tr>
-<tr><td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Create those raw statistics"); ?>" /></td></tr>
 </table>
+<br />
+<input type="submit" class="inb" name="submit" value="<?php __("Create those raw statistics"); ?>" />
 </form>
 <?php $mem->show_help("sta2_add"); ?>
 <?php include_once("foot.php"); ?>
\ No newline at end of file
diff --git a/bureau/admin/sta2_doadd_raw.php b/bureau/admin/sta2_doadd_raw.php
index 16500b52..d7aed651 100644
--- a/bureau/admin/sta2_doadd_raw.php
+++ b/bureau/admin/sta2_doadd_raw.php
@@ -29,7 +29,13 @@
 */
 require_once("../class/config.php");
 
-$r=$sta2->add_stats_raw($hostname,$folder);
+$fields = array (
+	"hostname"    => array ("post", "string", ""),
+	"dir"          => array ("post", "string", ""),
+);
+getFields($fields);
+
+$r=$sta2->add_stats_raw($hostname,$dir);
 if (!$r) {
 	$error=$err->errstr();
 	include("sta2_add_raw.php");
diff --git a/bureau/admin/sta2_doedit_raw.php b/bureau/admin/sta2_doedit_raw.php
index 464576a5..ad33a402 100644
--- a/bureau/admin/sta2_doedit_raw.php
+++ b/bureau/admin/sta2_doedit_raw.php
@@ -32,7 +32,7 @@ require_once("../class/config.php");
 if (!$id) {
 	$error=_("No Statistics selected!");
 } else {
-	$r=$sta2->put_stats_details_raw($id,$folder);
+	$r=$sta2->put_stats_details_raw($id,$dir);
 	if (!$r) {
 		$error=$err->errstr();
 		include("sta2_edit_raw.php");
diff --git a/bureau/admin/sta2_edit_raw.php b/bureau/admin/sta2_edit_raw.php
index 9bd57e59..09c8f632 100644
--- a/bureau/admin/sta2_edit_raw.php
+++ b/bureau/admin/sta2_edit_raw.php
@@ -52,13 +52,13 @@ if (!$id) {
 <form method="post" action="sta2_doedit_raw.php" id="main" name="main">
 <table border="1" cellspacing="0" cellpadding="4">
 <tr><th><input type="hidden" name="id" value="<?php echo $id ?>" />
-        <?php __("Domain name"); ?></th><td>
+        <?php __("Domain name:"); ?></th><td>
 	<?php echo $r["hostname"]; ?>
 </td></tr>
-<tr><th><label for="folder"><?php __("Folder"); ?></label></th><td><input type="text" class="int" name="folder" id="folder" value="<?php echo $r["folder"]; ?>" size="20" maxlength="255" />
+<tr><th><label for="dir"><?php __("Folder where we will put the log file:"); ?></label></th><td><input type="text" class="int" name="dir" id="dir" value="<?php echo $r["folder"]; ?>" size="20" maxlength="255" />
 <script type="text/javascript">
 <!--
-  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.folder');\" value=\" ... \" class=\"inb\" />");
+  document.write("&nbsp;<input type=\"button\" name=\"bff\" class=\"bff\" onclick=\"browseforfolder('main.dir');\" value=\" <?php __("Choose a folder..."); ?> \" />");
 //  -->
 </script>
 </td></tr>
diff --git a/bureau/admin/sta2_list.php b/bureau/admin/sta2_list.php
index a6b745ed..665218d9 100644
--- a/bureau/admin/sta2_list.php
+++ b/bureau/admin/sta2_list.php
@@ -36,7 +36,7 @@ include_once("head.php");
 <?php
 	if ($quota->cancreate("sta2")) { ?>
 <p>
-		- <a href="sta2_add_raw.php"><?php __("Create new Raw Statistics (apache)"); ?></a>
+<span class="ina"><a href="sta2_add_raw.php"><?php __("Create new Raw Statistics (apache)"); ?></a></span>
 </p>
 <?php  	}
 
@@ -52,8 +52,8 @@ if (!$r=$sta2->get_list_raw()) {
 ?>
 
 <form method="post" action="sta2_del_raw.php">
-<table cellspacing="0" cellpadding="4">
-<tr><th colspan="2">&nbsp;</th><th><?php __("Domain name"); ?></th><th><?php __("Folder"); ?></th><th><?php __("View"); ?></th></tr>
+<table class="tlist">
+    <tr><th colspan="2"><?php __("Actions"); ?></th><th><?php __("Domain name"); ?></th><th><?php __("Folder"); ?></th><th><?php __("View"); ?></th></tr>
 <?php
 reset($r);
 $col=1;
@@ -63,7 +63,7 @@ while (list($key,$val)=each($r))
 ?>
         <tr class="lst<?php echo $col; ?>">
                 <td><input type="checkbox" class="inc" name="del_<?php echo $val["id"]; ?>" value="<?php echo $val["id"]; ?>" /></td>
-                <td><a href="sta2_edit_raw.php?id=<?php echo $val["id"] ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" alt="<?php __("Edit"); ?>" /></a></td>
+	   <td><div class="ina"><a href="sta2_edit_raw.php?id=<?php echo $val["id"] ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div></td>
                 <td><?php echo $val["hostname"] ?></td>
                 <td><code>/<?php echo $val["folder"] ?></code></td>
                 <td><?php
diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index d9945bab..90c769f7 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -194,7 +194,7 @@ img {
 	margin-right: auto;
 	margin-top: 20px;
 	margin-bottom: 20px;
-	width: 980px;
+	width: 1020px;
 	border: 5px solid #1D6A9F;
 	-moz-border-radius: 10px;
 	background-color: #F0F0FA;
@@ -213,7 +213,7 @@ img {
 
 #content {
 	display: block;
-	width: 730px;
+	width: 770px;
 	padding-left: 10px;
 	padding-right: 10px;
 	vertical-align: top;
@@ -368,3 +368,31 @@ a:hover {
     border-left: 0;
     padding-left: 0;
 }
+
+.tedit { 
+         border: 1px solid #aaa;
+         padding: 6px;
+         margin: 0;
+         border-collapse: collapse;
+ }
+.tedit td, .tedit th { 
+         border: 1px solid #aaa;
+         padding: 6px;
+         margin: 0;                       
+ }
+
+.formcell { 
+            vertical-align: top;
+            border: 1px solid #aaa; 
+            padding: 10px;
+ }
+
+.tlist, .tlist td, .tlist th { 
+         padding: 6px;
+         margin: 0;
+         border-collapse: collapse;
+ }
+
+input#dir, input#sub_local { 
+       width: 200px;
+ }
\ No newline at end of file
diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php
index 14c40c58..852eaf32 100644
--- a/bureau/class/m_dom.php
+++ b/bureau/class/m_dom.php
@@ -389,7 +389,7 @@ class m_dom {
     }
     // pour ajouter un nouveau TLD, utiliser le code ci-dessous.
     //	echo "serveur : $serveur <br />";
-    if (($fp=fsockopen($serveur, 43))>0) {
+    if (($fp=@fsockopen($serveur, 43))>0) {
       fputs($fp, "$egal$domain\r\n");
       $found = false;
       $state=0;
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index 11c055ed..d3758426 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -61,7 +61,7 @@ msgstr "Ajout d'un membre"
 #: ../admin/sql_getparam.php:48 ../admin/sql_list.php:93
 #: ../admin/sql_passchg.php:49 ../admin/sql_users_list.php:92
 msgid "Username"
-msgstr "Nom"
+msgstr "Utilisateur"
 
 #: ../admin/adm_add.php:58
 msgid "Initial password"
@@ -1355,8 +1355,8 @@ msgstr "Ajout d'un mail sur le domaine %s"
 
 #: ../admin/mail_add.php:49 ../admin/mail_edit.php:58 ../admin/mail_add.php:52
 #: ../admin/mail_edit.php:65
-msgid "Is it a POP account?"
-msgstr "Compte POP ?"
+msgid "Is it a POP/IMAP account?"
+msgstr "Est-ce un compte POP/IMAP ?"
 
 #: ../admin/mail_add.php:50 ../admin/mail_edit.php:59 ../admin/mail_add.php:53
 #: ../admin/mail_edit.php:66
@@ -1443,8 +1443,8 @@ msgstr "Modification d'un email du domaine %s"
 
 #: ../admin/mail_edit.php:57 ../admin/mail_edit.php:64
 #, php-format
-msgid "Edit the mailbox %s"
-msgstr "Modification du mail %s"
+msgid "Edit the mailbox <b>%s</b>"
+msgstr "Modification du mail <b>%s</b>"
 
 #: ../admin/mail_edit.php:62 ../admin/mail_edit.php:69
 msgid "Change this mailbox"
@@ -1488,7 +1488,7 @@ msgstr "Ajouter plusieurs emails sur <b>%s</b>"
 #: ../admin/mail_list.php:76 ../admin/mail_list.php:78
 #, php-format
 msgid "All"
-msgstr "Tout"
+msgstr "Tous"
 
 #: ../admin/mail_list.php:88 ../admin/sql_list.php:53 ../admin/sql_list.php:49
 msgid "Size"
@@ -2713,3 +2713,88 @@ msgstr "Impossible de modifier la politique de mot de passe, une erreur est appa
 
 #~ msgid "<-No Password->"
 #~ msgstr "<-Aucun mot de passe->"
+
+msgid "Show this folder's content in the File Browser"
+msgstr "Afficher le contenu de ce dossier dans le Gestionnaire de Fichiers"
+
+msgid "Adding an authorized user"
+msgstr "Ajout d'un utilisateur autorisé"
+
+msgid "Change this user's password"
+msgstr "Changer le mot de passe de cet utilisateur"
+
+msgid "Do you want to point this domain to another domain already installed in your account?"
+msgstr "Voulez-vous pointer ce domaine sur un autre déjà installé sur votre compte ?"
+
+msgid "No: This domain will have its own folder."
+msgstr "Non : ce domaine aura son propre dossier."
+
+msgid "Yes, redirect this new domain to this one:"
+msgstr "Oui, redirigez ce nouveau domaine vers ce domaine existant :"
+
+msgid "-- Choose a domain --"
+msgstr "-- Choisir un nom de domaine --"
+
+msgid "Subdomain"
+msgstr "Sous-domaine"
+
+msgid "Place"
+msgstr "Emplacement"
+
+msgid "Add this subdomain"
+msgstr "Ajouter ce sous-domaine"
+
+msgid "Choose a folder..."
+msgstr "Choisir un répertoire ..."
+
+msgid "Send one file:"
+msgstr "Envoyer un fichier:"
+
+msgid "New file or folder:"
+msgstr "Créer un fichier ou un dossier:"
+
+msgid "Send this file"
+msgstr "Envoyer ce fichier"
+
+msgid "Filename"
+msgstr "Nom du fichier"
+
+msgid "To"
+msgstr "Vers"
+
+msgid "Last modification"
+msgstr "Dernière modification"
+
+msgid "File Type"
+msgstr "Type de fichier"
+
+msgid "Show size of directories"
+msgstr "Afficher la taille des répertoires"
+
+msgid "(slow)"
+msgstr "(lent)"
+
+msgid "Edit this folder's restrictions"
+msgstr "Modifier les restriction dans ce dossier"
+
+msgid "with a login and a password"
+msgstr "utilisant un nom d'utilisateur et un mot de passe"
+
+msgid "Download this folder"
+msgstr "Télécharger ce dossier"
+
+msgid "as a %s file"
+msgstr "comme fichier %s"
+
+msgid "Show only mail starting by:"
+msgstr "N'afficher que les mails commençant par :"
+
+
+msgid "Delete %s from this server"
+msgstr "Effacer le domaine %s de ce serveur"
+
+msgid "Folder where we will put the log file:"
+msgstr "Dossier qui accueillera vos logs :"
+
+msgid "Domain name:"
+msgstr "Nom de domaine :"
\ No newline at end of file