diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index 06be8685d1e..a24aa2fcff5 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -788,6 +788,7 @@ $html .= '</table>';
 $html .= '</div>';
 $html .= '</div>';
 
+$html .= '<br>';
 $html .= 'You can use this URL for RSS notifications: <a href="/'.$outputfilerss.'">'.$outputfilerss.'</a><br><br>';
 
 $html .= '</section>';
@@ -926,6 +927,7 @@ if ($fh) {
 }
 
 
+
 /**
  * function to format a number
  *
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index e3e9858af59..6cf99137d44 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3118,7 +3118,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 			if (isModEnabled('category')) {
 				//print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&dol_hide_leftmenu=1&nosearch=1&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"></span></a>';
-				print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), '<span class="fa fa-tags"></span>', '/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.urlencode($website->ref), $disabled);
+				print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), '<span class="fa fa-tags"></span>', '/categories/index.php?leftmenu=website&nosearch=1&type='.urlencode(Categorie::TYPE_WEBSITE_PAGE).'&website='.urlencode($website->ref), $disabled);
 			}
 
 			print '</span>';
@@ -4520,6 +4520,9 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 		print '<tr><td class="toptd">'.$form->editfieldkey('Categories', 'categories', '', $objectpage, 0).'</td><td>';
 		print img_picto('', 'category', 'class="pictofixedwidth"');
 		print $form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, 'minwidth200 widthcentpercentminusxx');
+
+		print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), img_picto('', 'add'), '/categories/index.php?leftmenu=website&nosearch=1&type='.urlencode(Categorie::TYPE_WEBSITE_PAGE).'&website='.urlencode($website->ref), $disabled);
+
 		print "</td></tr>";
 	}