diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 256dd08f9a8..03f3d364cca 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -353,7 +353,8 @@ if ($action == 'edit')	// Edit
 	print '</tr>';
 
 	// Hide wiki link on login page
-	print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td>';
+	$pictohelp='<span class="fa fa-question-circle"></span>';
+	print '<tr><td class="titlefield">'.$langs->trans("DisableLinkToHelp",$pictohelp).'</td><td>';
 	print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0,1);
 	print '</td>';
 	print '<td width="20">&nbsp;</td>';
@@ -441,7 +442,7 @@ else	// Show
 {
 	// Language
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td></td><td>&nbsp;</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Language").'</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
 
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
 	$s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
@@ -467,48 +468,35 @@ else	// Show
 
 	// Other
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '</td>';
-	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
 	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMaxSizeShortList").'</td><td>' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '</td>';
-	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
-	/*
-    print '<tr><td>'.$langs->trans("showInputBorder").'</td><td>';
-    print yn($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)."</td>";
-    print '<td width="20">&nbsp;</td>';
-    print "</tr>";
-	*/
-
 	// Disable javascript/ajax
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableJavascript").'</td><td>';
 	print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";
-	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
 	// First day for weeks
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("WeekStartOnDay").'</td><td>';
 	print $langs->trans("Day".(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'));
 	print '</td>';
-	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// DefaultWorkingDays
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingDays").'</td><td>';
 	print isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5';
 	print '</td>';
-	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// DefaultWorkingHours
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultWorkingHours").'</td><td>';
 	print isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18';
 	print '</td>';
-	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Firstname / Name position
@@ -516,17 +504,15 @@ else	// Show
 	if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print $langs->trans("Firstname").' '.$langs->trans("Lastname"); }
 	else { print $langs->trans("Lastname").' '.$langs->trans("Firstname"); }
 	print '</td>';
-	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
 	// Hide unauthorized button
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ButtonHideUnauthorized").'</td><td>';
 	print yn((isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)?$conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED:0),1);
 	print '</td></tr>';
 
 	// Show logo
 	print '<tr class="oddeven"><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
-	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
 	// Hide version link
@@ -534,23 +520,22 @@ else	// Show
 	 print '<tr><td class="titlefield">'.$langs->trans("HideVersionLink").'</td><td>';
 	 print yn($conf->global->MAIN_HIDE_VERSION);
 	 print '</td>';
-	 print '<td width="20">&nbsp;</td>';
 	 print '</tr>';
 	 */
 
 	// Show bugtrack link
 	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
 	print yn($conf->global->MAIN_BUGTRACK_ENABLELINK)."</td>";
-	print '<td width="20">&nbsp;</td>';
 	print "</tr>";
 
 	// Link to wiki help
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/helpdoc.png','',1)).'</td><td colspan="2">';
+	$pictohelp='<span class="fa fa-question-circle"></span>';
+	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelp",$pictohelp).'</td><td>';
 	print yn((isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0),1);
 	print '</td></tr>';
 
 	// Message of the day
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("MessageOfDay").'</td><td>';
 	if (isset($conf->global->MAIN_MOTD)) print dol_htmlcleanlastbr($conf->global->MAIN_MOTD);
 	else print '&nbsp;';
 	print '</td></tr>'."\n";
@@ -561,21 +546,21 @@ else	// Show
 
 	// Login page
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("LoginPage").'</td><td></td><td>&nbsp;</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("LoginPage").'</td><td></td></tr>';
 
 	// Message login
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("MessageLogin").'</td><td>';
 	if (isset($conf->global->MAIN_HOME)) print dol_htmlcleanlastbr($conf->global->MAIN_HOME);
 	else print '&nbsp;';
 	print '</td></tr>'."\n";
 
 	// Link to help center
-	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
 	print yn((isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0),1);
 	print '</td></tr>';
 
 	// Background login
-	print '<tr class="oddeven"><td>'.$langs->trans("BackgroundImageLogin").'</td><td colspan="2">';
+	print '<tr class="oddeven"><td>'.$langs->trans("BackgroundImageLogin").'</td><td>';
 	print '<div class="centpercent inline-block">';
 	print $conf->global->MAIN_LOGIN_BACKGROUND;
 	if ($conf->global->MAIN_LOGIN_BACKGROUND && is_file($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND))
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 148ef1ba50f..b1ebdda2981 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1164,7 +1164,7 @@ div.fiche {
 
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'23':'6')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'25':'6')); ?>px;
 	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'25':'6')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
 	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 70162c4c863..76cc8ff64b7 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -788,6 +788,11 @@ class Website extends CommonObject
 
 		$filesql = $conf->website->dir_temp.'/'.$website->ref.'/export/pages.sql';
 		$fp = fopen($filesql,"w");
+		if (empty($fp))
+		{
+			setEventMessage("Failed to create file ".$filesql, null, 'errors');
+			return '';
+		}
 
 		$objectpages = new WebsitePage($this->db);
 		$listofpages = $objectpages->fetchAll($website->id);
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 220a1e9663d..360578f7da0 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1169,14 +1169,17 @@ if (GETPOST('exportsite'))
 {
 	$fileofzip = $object->exportWebSite();
 
-	$file_name = basename($fileofzip);
+	if ($fileofzip)
+	{
+		$file_name = basename($fileofzip);
 
-	header("Content-Type: application/zip");
-	header("Content-Disposition: attachment; filename=".$file_name);
-	header("Content-Length: " . filesize($fileofzip));
+		header("Content-Type: application/zip");
+		header("Content-Disposition: attachment; filename=".$file_name);
+		header("Content-Length: " . filesize($fileofzip));
 
-	readfile($fileofzip);
-	exit;
+		readfile($fileofzip);
+		exit;
+	}
 }