diff --git a/bureau/admin/bro_pref.php b/bureau/admin/bro_pref.php
index 8eca2175..d7d1b347 100644
--- a/bureau/admin/bro_pref.php
+++ b/bureau/admin/bro_pref.php
@@ -62,8 +62,8 @@ include_once("head.php");
 <form action="bro_pref.php" method="post">
 
 
-<table cellpadding="6" border="1" cellspacing="0">
-<tr><td><?php __("Horizontal window size"); ?></td><td><select class="inl" name="editsizex">
+<table cellpadding="6" border="1" cellspacing="0" class='tedit'>
+<tr><th><?php __("Horizontal window size"); ?></th><td><select class="inl" name="editsizex">
 <?php
 for($i=50;$i<=200;$i+=10) {
 	echo "<option";
@@ -71,7 +71,7 @@ for($i=50;$i<=200;$i+=10) {
 	echo ">$i";
 }
 ?></select></td></tr>
-<tr><td><?php __("Vertical window size"); ?></td><td><select class="inl" name="editsizey">
+<tr><th><?php __("Vertical window size"); ?></th><td><select class="inl" name="editsizey">
 <?php
 for($i=4;$i<=80;$i+=2) {
 	echo "<option";
@@ -79,7 +79,7 @@ for($i=4;$i<=80;$i+=2) {
 	echo ">$i";
 }
 ?></select></td></tr>
-<tr><td><?php __("File editor font name"); ?></td><td><select class="inl" name="editor_font">
+<tr><th><?php __("File editor font name"); ?></th><td><select class="inl" name="editor_font">
 <?php
 for($i=0;$i<count($bro->l_editor_font);$i++) {
 	echo "<option";
@@ -87,7 +87,7 @@ for($i=0;$i<count($bro->l_editor_font);$i++) {
 	echo ">"._($bro->l_editor_font[$i]);
 }
 ?></select></td></tr>
-<tr><td><?php __("File editor font size"); ?></td><td><select class="inl" name="editor_size">
+<tr><th><?php __("File editor font size"); ?></th><td><select class="inl" name="editor_size">
 <?php
 for($i=0;$i<count($bro->l_editor_size);$i++) {
 	echo "<option";
@@ -95,7 +95,7 @@ for($i=0;$i<count($bro->l_editor_size);$i++) {
 	echo ">"._($bro->l_editor_size[$i]);
 }
 ?></select></td></tr>
-<tr><td><?php __("File list view"); ?></td><td><select class="inl" name="listmode">
+<tr><th><?php __("File list view"); ?></th><td><select class="inl" name="listmode">
 <?php
 for($i=0;$i<count($bro->l_mode);$i++) {
 	echo "<option";
@@ -103,7 +103,7 @@ for($i=0;$i<count($bro->l_mode);$i++) {
 	echo " value=\"$i\">"._($bro->l_mode[$i])."</option>";
 }
 ?></select></td></tr>
-<tr><td><?php __("Downloading file format"); ?></td><td><select class="inl" name="downfmt">
+<tr><th><?php __("Downloading file format"); ?></th><td><select class="inl" name="downfmt">
 <?php
 for($i=0;$i<count($bro->l_tgz);$i++) {
 	echo "<option";
@@ -111,7 +111,7 @@ for($i=0;$i<count($bro->l_tgz);$i++) {
 	echo " value=\"$i\">"._($bro->l_tgz[$i])."</option>";
 }
 ?></select></td></tr>
-<tr><td><?php __("What to do after creating a file"); ?></td><td><select class="inl" name="createfile">
+<tr><th><?php __("What to do after creating a file"); ?></th><td><select class="inl" name="createfile">
 <?php
 for($i=0;$i<count($bro->l_createfile);$i++) {
 	echo "<option";
@@ -119,7 +119,7 @@ for($i=0;$i<count($bro->l_createfile);$i++) {
 	echo " value=\"$i\">"._($bro->l_createfile[$i])."</option>";
 }
 ?></select></td></tr>
-<tr><td><?php __("Show icons?"); ?></td><td><select class="inl" name="showicons">
+<tr><th><?php __("Show icons?"); ?></th><td><select class="inl" name="showicons">
 <?php
 for($i=0;$i<count($bro->l_icons);$i++) {
 	echo "<option";
@@ -127,7 +127,7 @@ for($i=0;$i<count($bro->l_icons);$i++) {
 	echo " value=\"$i\">"._($bro->l_icons[$i])."</option>";
 }
 ?></select></td></tr>
-<tr><td><?php __("Show file types?"); ?></td><td><select class="inl" name="showtype">
+<tr><th><?php __("Show file types?"); ?></th><td><select class="inl" name="showtype">
 <?php
 for($i=0;$i<count($bro->l_icons);$i++) {
 	echo "<option";
@@ -135,7 +135,7 @@ for($i=0;$i<count($bro->l_icons);$i++) {
 	echo " value=\"$i\">"._($bro->l_icons[$i])."</option>";
 }
 ?></select></td></tr>
-<tr><td><?php __("Remember last visited directory?"); ?></td><td><select class="inl" name="golastdir">
+<tr><th><?php __("Remember last visited directory?"); ?></th><td><select class="inl" name="golastdir">
 <?php
 for($i=0;$i<count($bro->l_icons);$i++) {
 	echo "<option";
@@ -143,13 +143,12 @@ for($i=0;$i<count($bro->l_icons);$i++) {
 	echo " value=\"$i\">"._($bro->l_icons[$i])."</option>";
 }
 ?></select></td></tr>
+</table>
+<br/>
 
-<tr class="trbtn"><td colspan="2">
   <input type="submit" name="submit" class="inb" value="<?php __("Change my settings"); ?>" />
   <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='bro_main.php'"/>
 
-</td></tr>
-</table>
 
 </form>
 <?php include_once("foot.php"); ?>
diff --git a/bureau/admin/menu_adm.php b/bureau/admin/menu_adm.php
index cf95a455..5ad9472e 100644
--- a/bureau/admin/menu_adm.php
+++ b/bureau/admin/menu_adm.php
@@ -42,9 +42,9 @@ if ($mem->checkRight()) { ?>
   <li><a href="/alternc-sql/"><span class="adminmenu"><?php __("General PhpMyAdmin"); ?></span></a></li>
   <li><a href="alternc_debugme.php?enable=<?php echo $debug_alternc->status?"0":"1"; ?>"><span class="adminmenu"><?php if ($debug_alternc->status) __("Switch debug Off"); else __("Switch debug On");  ?></span></a></li>
 <?php if ( empty($L_INOTIFY_UPDATE_DOMAIN) || file_exists("$L_INOTIFY_UPDATE_DOMAIN") ) { ?>
-  <li><a href='javascript:alert("<?php __("Reload already in progress"); ?>");'><span class="adminmenu"><?php __("Reload in progress..."); ?></span></a></li>
+  <li><a href='javascript:alert("<?php __("Regeneration already in progress"); ?>");'><span class="adminmenu"><?php __("Changes in progress..."); ?></span></a></li>
 <?php } else { // file L_INOTIFY_UPDATE_DOMAIN don't exist ?>
-  <li><a href="/adm_update_domains.php" onClick='return confirm("<?php echo addslashes(_("Server configuration is regenerate every 5 minutes (if there is changes). Do you want to force a regeneration right now?"));?>");'><span class="adminmenu"><?php __("Force a reload"); ?></span></a></li>
+  <li><a href="/adm_update_domains.php" onClick='return confirm("<?php echo addslashes(_("Server configuration is regenerate every 5 minutes (if there is changes). Do you want to force a regeneration right now?"));?>");'><span class="adminmenu"><?php __("Apply changes"); ?></span></a></li>
 <?php } // file exist L_INOTIFY_UPDATE_DOMAIN ?>
 <?php } ?>
 </ul>
diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php
index 946b133b..1f3ce951 100644
--- a/bureau/class/m_bro.php
+++ b/bureau/class/m_bro.php
@@ -245,7 +245,7 @@ class m_bro {
     else
       $ext=$t[count($t)-1];
     // Now seek the extension
-    if (!$bro_icon[$ext]) {
+    if (!isset($bro_icon[$ext]) || ! $bro_icon[$ext]) {
       return "file.png";
     } else {
       return $bro_icon[$ext].".png";
@@ -271,7 +271,7 @@ class m_bro {
     else
       $ext=$t[count($t)-1];
     // Now seek the extension
-    if (!$bro_type[$ext]) {
+    if (empty($bro_type[$ext])) {
       return "File";
     } else {
       return $bro_type[$ext];