diff --git a/index.md b/index.md
index 21576d77..7335ef10 100644
--- a/index.md
+++ b/index.md
@@ -30,7 +30,7 @@
 
 <div class="boring-part" markdown="1">
 
-  <h1>YunoHost <small>is a server operating system aiming to make self-hosting accessible to everyone.</small></h1>
+  <h1>YunoHost <small>is an operating system designed for you to easily manage a server for your friends, association or enterprise. <a href="/whatsyunohost" style="font-size:0.6em;">Learn more</a></small></h1>
 
   <div class="home-panel">
     <img src="/images/home_panel.jpg" />
@@ -39,12 +39,13 @@
   <div class="call-to-action">
     <a class="btn btn-primary btn-lg" href="/try">Try it</a>
     <a class="btn btn-success btn-lg" href="/install">Get started</a>
-    <p class="text-muted"><small><a href="https://forum.yunohost.org/t/yunohost-3-6-release-sortie-de-yunohost-3-6/8359">YunoHost v3.6</a></small></p>
+    <h2 style="margin-top: 0"><small><a href="https://forum.yunohost.org/c/announcement">Latest news</a></small></h2>
   </div>
 
+
   <div class="row cf">
-    <div class="col-md-7">
-      <h1>Install <small>your server with ease, you already have everything at home</small></h1>
+    <div class="col-md-7 text-right">
+      <h1>Setup <small>your server with ease, you already have everything at home</small></h1>
       <p><br /><a href="/hardware">See the requirements</a></p>
     </div>
     <div class="col-md-4">
@@ -57,59 +58,45 @@
   <hr />
 
   <div class="row cf">
-    <div class="col-md-4">
-      <div class="feature-pic">
-        <img src="/images/home_enjoy.jpg" />
-      </div>
-    </div>
-    <div class="col-md-7 text-right">
-      <h1>Enjoy <small>your apps and make your little corner of Internet</small></h1>
-      <p><br /><a href="/apps">List of available apps</a></p>
-    </div>
-  </div>
-
-  <hr />
-
-  <div class="row cf">
-    <div class="col-md-7">
-      <h1>Manage <small>your server the way you like: via Web, mobile or command-line</small></h1>
-      <p><br /><a href="/try">Try the administration</a></p>
-    </div>
     <div class="col-md-4">
       <div class="feature-pic">
         <img src="/images/home_manage.jpg" />
       </div>
     </div>
+    <div class="col-md-7">
+      <h1>Manage <small>your server from a clean and simple web interface</small></h1>
+      <p><br /><a href="/try">Try the administration</a></p>
+    </div>
   </div>
 
   <hr />
 
   <div class="row cf">
-    <div class="col-md-4 button-list">
-      <a class="btn btn-lg btn-block btn-primary" href="/whatsyunohost">About YunoHost</a>
-      <a class="btn btn-lg btn-block btn-info" href="/docs">Documentation</a>
-      <a class="btn btn-lg btn-block btn-success" href="/contribute">Get involved</a>
-      <a class="btn btn-lg btn-block btn-warning" href="https://forum.yunohost.org/" target="_blank">Forum</a>
-      <a class="btn btn-lg btn-block btn-default" href="chat_rooms_en" target="_blank">Chat rooms</a>
-      <a class="btn btn-lg btn-block btn-danger" href="https://forum.yunohost.org/c/announcement">Latest news</a>
-      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help_fr">Support</a>
-    </div>
     <div class="col-md-7 text-right">
-      <h1>Explore <small>what you can do with a server, and why it is important</small></h1>
-      <p><br /><a href="/docs">Read the documentation</a></p>
+      <h1>Install <small>applications to build your little corner of Internet</small></h1>
+      <p><br /><a href="/apps">Browse available apps</a></p>
+    </div>
+    <div class="col-md-4">
+      <div class="feature-pic">
+        <img src="/images/home_enjoy.jpg" />
+      </div>
     </div>
   </div>
 
   <hr />
 
-  <div class="text-center">
-    <h1>Hey! We are humans!<br /><small> If you have questions, problems or if you are just an enthusiast, leave a message on our chatroom by clicking on the button below &nbsp;<span class="glyphicon glyphicon-share-alt"></span> </small></h1>
+  <div class="row cf">
+    <div class="text-center">
+    <h1>Hey! We are humans!<br />
+    <small>If you have questions, issues or if you are just an enthusiast, come and leave a message on our forum or chatroom!</small></h1>
 
-   <p class="liberapay">
-     <a href="https://liberapay.com/YunoHost" target="_blank"><img src="/images/liberapay_logo.svg" alt="Donation button" title="Liberapay" /></a>
-    </p>
-
-  </div>
+    <div class="col-md-4 col-md-offset-4 button-list">
+      <a class="btn btn-lg btn-block btn-info" href="/docs"><span class="glyphicon glyphicon-book"></span> Documentation</a>
+      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help_fr"><span class="glyphicon glyphicon-comment"></span> Forum and chat</a>
+      <a class="btn btn-lg btn-block btn-success" href="/contribute"><span class="glyphicon glyphicon-heart"></span> Get involved</a>
+      <a class="btn btn-lg btn-block btn-primary" href="https://donate.yunohost.org/" style="background-color: #ffd236; border-color: #ffd236;"><span class="glyphicon glyphicon-usd"></span> Donate</a>
+    </div>
+ </div>
 
 </div><!-- boring-part -->
 
@@ -146,4 +133,3 @@
     });
 
 </script>
-
diff --git a/index_fr.md b/index_fr.md
index d358e760..e2d1faf7 100644
--- a/index_fr.md
+++ b/index_fr.md
@@ -26,7 +26,7 @@
 
 <div class="boring-part" markdown="1">
 
-  <h1>YunoHost <small>est un outil qui vous permet d’installer et d’utiliser facilement votre propre serveur.</small></h1>
+  <h1>YunoHost <small>est un système conçu pour gérer facilement un serveur pour ses amis, son asso ou son entreprise. <a href="/whatsyunohost" style="font-size:0.6em;">En savoir plus</a></small></h1>
 
   <div class="home-panel">
     <img src="/images/home_panel.jpg" />
@@ -35,13 +35,13 @@
   <div class="call-to-action">
     <a class="btn btn-primary btn-lg" href="/try_fr">Essayer</a>
     <a class="btn btn-success btn-lg" href="/install_fr">Installer</a>
-    <p class="text-muted"><small><a href="https://forum.yunohost.org/t/yunohost-3-6-release-sortie-de-yunohost-3-6/8359">YunoHost v3.6</a></small></p>
+    <h2 style="margin-top: 0"><small><a href="https://forum.yunohost.org/c/announcement">Dernières nouvelles</a></small></h2>
   </div>
 
   <hr />
 
   <div class="row cf">
-    <div class="col-md-7">
+    <div class="col-md-7 text-right">
       <h1>Installez <small>votre serveur simplement, vous avez déjà tout ce qu’il faut à la maison</small></h1>
       <p><a href="/hardware_fr">Voir les prérequis</a></p>
     </div>
@@ -55,60 +55,44 @@
   <hr />
 
   <div class="row cf">
-    <div class="col-md-4">
-      <div class="feature-pic">
-        <img src="/images/home_enjoy.jpg" />
-      </div>
-    </div>
-    <div class="col-md-7 text-right">
-      <h1>Profitez <small>de vos applications web, et fabriquez votre coin d’Internet</small></h1>
-      <p><br /><a href="/apps_fr">Liste des applications disponibles</a></p>
-    </div>
-  </div>
-
-  <hr />
-
-  <div class="row cf">
-    <div class="col-md-7">
-      <h1>Gérez <small>votre serveur comme vous le voulez : via web, mobile ou ligne de commande</small></h1>
-      <p><br /><a href="/try_fr">Essayez l’interface d’administration</a></p>
-    </div>
     <div class="col-md-4">
       <div class="feature-pic">
         <img src="/images/home_manage.jpg" />
       </div>
     </div>
+    <div class="col-md-7">
+      <h1>Gérez <small>votre serveur depuis une interface web simple et propre</small></h1>
+      <p><br /><a href="/try_fr">Essayez l’interface d’administration</a></p>
+    </div>
   </div>
 
   <hr />
 
   <div class="row cf">
-    <div class="col-md-4 button-list">
-
-      <a class="btn btn-lg btn-block btn-primary" href="/whatsyunohost_fr">Qu’est-ce que YunoHost ?</a>
-      <a class="btn btn-lg btn-block btn-info" href="/docs_fr">Documentation</a>
-      <a class="btn btn-lg btn-block btn-success" href="/contribute_fr">Comment contribuer</a>
-      <a class="btn btn-lg btn-block btn-warning" href="https://forum.yunohost.org" target="_blank">Forum</a>
-      <a class="btn btn-lg btn-block btn-default" href="chat_rooms_fr" target="_blank">Salons de discussions</a>
-      <a class="btn btn-lg btn-block btn-danger" href="https://forum.yunohost.org/c/announcement">Dernières nouvelles</a>
-      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help_fr">Support</a>
-
-    </div>
     <div class="col-md-7 text-right">
-      <h1>Explorez <small>les possibilités de votre serveur, et apprenez pourquoi c’est important</small></h1>
-      <p><br /><a href="/docs_fr">Lire la documentation</a></p>
+      <h1>Construisez <small>votre petit bout d'Internet en ajoutant des applications en quelques clics</small></h1>
+      <p><br /><a href="/apps">Parcourir les applications disponibles</a></p>
+    </div>
+    <div class="col-md-4">
+      <div class="feature-pic">
+        <img src="/images/home_enjoy.jpg" />
+      </div>
     </div>
   </div>
 
   <hr />
 
-  <div class="text-center">
-    <h1>Hey ! Nous sommes humains !<br /><small> Si vous avez une question, un problème, ou que vous êtes tout simplement intéressé, passez dire « Bonjour » sur notre salon de discussion en cliquant sur le bouton en bas &nbsp;<span class="glyphicon glyphicon-share-alt"></span> </small></h1>
+  <div class="row cf">
+    <div class="text-center">
+    <h1>Hey ! Nous sommes humains !<br />
+    <small>Si vous avez une question, un problème, ou que vous êtes tout simplement intéressé, passez dire « Bonjour » sur notre forum ou le chat!</small></h1>
 
-<p class="liberapay">
-      <a href="https://liberapay.com/YunoHost" target="_blank"><img src="/images/liberapay_logo.svg" alt="Donation button" title="Liberapay" /></a>
-    </p>
-    
+    <div class="col-md-4 col-md-offset-4 button-list">
+      <a class="btn btn-lg btn-block btn-info" href="/docs"><span class="glyphicon glyphicon-book"></span> Documentation</a>
+      <a class="btn btn-lg btn-block btn-danger btn-support" href="/help_fr"><span class="glyphicon glyphicon-comment"></span> Forum et chat</a>
+      <a class="btn btn-lg btn-block btn-success" href="/contribute"><span class="glyphicon glyphicon-heart"></span> Contribuer</a>
+      <a class="btn btn-lg btn-block btn-primary" href="https://donate.yunohost.org/" style="background-color: #ffd236; border-color: #ffd236;"><span class="glyphicon glyphicon-usd"></span> Faire un don</a>
+     </div>
   </div>
 
 </div><!-- boring-part -->