diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 23940e9b9ba..7e0f057e253 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -143,5 +143,5 @@ ConfirmSitemapsCreation=Confirm sitemap generation
 SitemapGenerated=Sitemap Generated
 ImportFavicon=Favicon
 ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be of size 32x32
-FaviconTooltip=Upload an image which needs to be a png of 32x32
+ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
+FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 0f13cfb0e5b..2fb031d6789 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1362,7 +1362,11 @@ if ($action == 'updatecss' && $usercanedit) {
 				}
 				$filetoread = realpath(dol_osencode($_FILES['addedfile']['tmp_name']));
 				$filesize = getimagesize($filetoread);
-				if ($filesize[0] != 32 || $filesize[1] != 32) {
+				if ($filesize[0] != $filesize[1]) {
+					$error++;
+					setEventMessages($langs->trans('ErrorFaviconMustBeASquaredImage'), array(), 'errors');
+				}
+				if (! $error && ($filesize[0] != 16 || $filesize[0] != 32 || $filesize[0] != 64)) {
 					$error++;
 					setEventMessages($langs->trans('ErrorFaviconSize'), array(), 'errors');
 				}