diff --git a/customize.dist/four-oh-four.js b/customize.dist/four-oh-four.js
index 9f0a8c230..ab19f577d 100644
--- a/customize.dist/four-oh-four.js
+++ b/customize.dist/four-oh-four.js
@@ -18,7 +18,7 @@ define([
     var loggedIn = LocalStore.isLoggedIn();
     var link = h('a#cp-link', {
         href: loggedIn? '/drive/': '/',
-    }, loggedIn? Messages.four04_goToDrive: Messages.four04_goToHome);
+    }, loggedIn? Messages.header_logoTitle: Messages.header_homeTitle);
 
     var content = h('div#cp-main', [
         img,
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 81b8c9421..0ba3413a3 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -683,10 +683,8 @@ define(function () {
     out.tos_logs = "Les meta-données fournies par votre navigateur au serveur peuvent être enregistrées dans le but de maintenir le service.";
     out.tos_3rdparties = "Nous ne fournissons aucune donnée individuelle à des tierces parties à moins d'y être contraints par la loi.";
 
-    // BottomBar.html
-
-    out.bottom_france = '<a href="http://www.xwiki.com/fr" target="_blank" rel="noopener noreferrer">Fait avec <img class="bottom-bar-heart" src="/customize/heart.png" alt="amour" /> en <img class="bottom-bar-fr" src="/customize/fr.png" alt="France" /></a>';
-    out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">Un projet <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs</a> avec le soutien de <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+    // 404 page
+    out.four04_pageNotFound = "Nous n'avons pas trouvé la page que vous cherchez.";
 
     // Header.html
 
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 6bc891878..b83b54930 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -690,9 +690,8 @@ define(function () {
     out.tos_logs = "Metadata provided by your browser to the server may be logged for the purpose of maintaining the service.";
     out.tos_3rdparties = "We do not provide individualized data to third parties unless required to by law.";
 
+    // 404 page
     out.four04_pageNotFound = "We couldn't find the page you were looking for.";
-    out.four04_goToHome = "Go to the home page.";
-    out.four04_goToDrive = "Go to your CryptDrive";
 
     // BottomBar.html