diff --git a/public/img/brand-small.png b/public/img/brand-small.png
index 6296901..30e7c4d 100644
Binary files a/public/img/brand-small.png and b/public/img/brand-small.png differ
diff --git a/public/img/brand.png b/public/img/brand.png
index 483a6bf..f759814 100644
Binary files a/public/img/brand.png and b/public/img/brand.png differ
diff --git a/public/img/card-opengraph.jpg b/public/img/card-opengraph.jpg
new file mode 100644
index 0000000..48140e2
Binary files /dev/null and b/public/img/card-opengraph.jpg differ
diff --git a/public/img/card-opengraph.png b/public/img/card-opengraph.png
deleted file mode 100644
index 47acbc7..0000000
Binary files a/public/img/card-opengraph.png and /dev/null differ
diff --git a/public/img/framasoft-big-logo.png b/public/img/framasoft-big-logo.png
index 688d7ab..1ab2fc3 100644
Binary files a/public/img/framasoft-big-logo.png and b/public/img/framasoft-big-logo.png differ
diff --git a/public/img/help/cat.png b/public/img/help/cat.png
index b434038..0a79b04 100644
Binary files a/public/img/help/cat.png and b/public/img/help/cat.png differ
diff --git a/public/img/help/dog.png b/public/img/help/dog.png
index 6577d96..d394315 100644
Binary files a/public/img/help/dog.png and b/public/img/help/dog.png differ
diff --git a/public/img/help/panda.png b/public/img/help/panda.png
index b496931..0d0d953 100644
Binary files a/public/img/help/panda.png and b/public/img/help/panda.png differ
diff --git a/public/img/help/rabbit.png b/public/img/help/rabbit.png
index ad71e68..27ba46b 100644
Binary files a/public/img/help/rabbit.png and b/public/img/help/rabbit.png differ
diff --git a/public/img/mascot/arguing.png b/public/img/mascot/arguing.png
index 154c45c..c922f2b 100644
Binary files a/public/img/mascot/arguing.png and b/public/img/mascot/arguing.png differ
diff --git a/public/img/mascot/default.png b/public/img/mascot/default.png
index e0a1410..695520b 100644
Binary files a/public/img/mascot/default.png and b/public/img/mascot/default.png differ
diff --git a/public/img/mascot/defeated.png b/public/img/mascot/defeated.png
index 58e1ce1..c22588a 100644
Binary files a/public/img/mascot/defeated.png and b/public/img/mascot/defeated.png differ
diff --git a/public/img/mascot/happy.png b/public/img/mascot/happy.png
index a51f9df..104ed06 100644
Binary files a/public/img/mascot/happy.png and b/public/img/mascot/happy.png differ
diff --git a/public/img/mascot/oh.png b/public/img/mascot/oh.png
index 168b11b..f505ea0 100644
Binary files a/public/img/mascot/oh.png and b/public/img/mascot/oh.png differ
diff --git a/public/img/mascot/pointing.png b/public/img/mascot/pointing.png
index 670702f..ede2f44 100644
Binary files a/public/img/mascot/pointing.png and b/public/img/mascot/pointing.png differ
diff --git a/public/img/peertube-federation-2-instances.jpg b/public/img/peertube-federation-2-instances.jpg
new file mode 100644
index 0000000..ec187ea
Binary files /dev/null and b/public/img/peertube-federation-2-instances.jpg differ
diff --git a/public/img/peertube-federation-2-instances.png b/public/img/peertube-federation-2-instances.png
deleted file mode 100644
index 8980492..0000000
Binary files a/public/img/peertube-federation-2-instances.png and /dev/null differ
diff --git a/public/img/peertube-federation-multiplicity.jpg b/public/img/peertube-federation-multiplicity.jpg
new file mode 100644
index 0000000..4415462
Binary files /dev/null and b/public/img/peertube-federation-multiplicity.jpg differ
diff --git a/public/img/peertube-federation-multiplicity.png b/public/img/peertube-federation-multiplicity.png
deleted file mode 100644
index a118356..0000000
Binary files a/public/img/peertube-federation-multiplicity.png and /dev/null differ
diff --git a/public/img/peertube-free-software.jpg b/public/img/peertube-free-software.jpg
new file mode 100644
index 0000000..9ac7590
Binary files /dev/null and b/public/img/peertube-free-software.jpg differ
diff --git a/public/img/peertube-free-software.png b/public/img/peertube-free-software.png
deleted file mode 100644
index b5a62ea..0000000
Binary files a/public/img/peertube-free-software.png and /dev/null differ
diff --git a/public/img/peertube-interface.jpg b/public/img/peertube-interface.jpg
new file mode 100644
index 0000000..5e3d891
Binary files /dev/null and b/public/img/peertube-interface.jpg differ
diff --git a/public/img/peertube-interface.png b/public/img/peertube-interface.png
deleted file mode 100644
index a4739b0..0000000
Binary files a/public/img/peertube-interface.png and /dev/null differ
diff --git a/public/img/peertube-mastodon-federation.png b/public/img/peertube-mastodon-federation.png
deleted file mode 100644
index c218b9a..0000000
Binary files a/public/img/peertube-mastodon-federation.png and /dev/null differ
diff --git a/public/img/peertube-p2p.jpg b/public/img/peertube-p2p.jpg
new file mode 100644
index 0000000..62ca30a
Binary files /dev/null and b/public/img/peertube-p2p.jpg differ
diff --git a/public/img/peertube-p2p.png b/public/img/peertube-p2p.png
deleted file mode 100644
index f89a7dd..0000000
Binary files a/public/img/peertube-p2p.png and /dev/null differ
diff --git a/public/img/peertube-upload.jpg b/public/img/peertube-upload.jpg
new file mode 100644
index 0000000..7183b00
Binary files /dev/null and b/public/img/peertube-upload.jpg differ
diff --git a/public/img/peertube-upload.png b/public/img/peertube-upload.png
deleted file mode 100644
index e102a27..0000000
Binary files a/public/img/peertube-upload.png and /dev/null differ
diff --git a/public/index.html b/public/index.html
index 6bd1b14..0ea4ea9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -12,7 +12,7 @@
     <meta property="og:url" content="https://joinpeertube.org">
     <meta property="og:title" content="JoinPeerTube">
     <meta property="og:description" content="PeerTube is a decentralized video hosting network, based on free/libre software. Join the federation and take back control of your videos!">
-    <meta property="og:image" content="https://chocobozzz.frama.io<%= BASE_URL %>img/card-opengraph.png">
+    <meta property="og:image" content="https://joinpeertube.org<%= BASE_URL %>img/card-opengraph.jpg">
     <meta property="og:site_name" content="JoinPeerTube">
 
     <meta name="twitter:card" content="summary_large_image">
@@ -20,7 +20,7 @@
     <meta name="twitter:creator" content="@chocobozzz">
     <meta name="twitter:title" content="JoinPeerTube">
     <meta name="twitter:description" content="PeerTube is a decentralized video hosting network, based on free/libre software. Join the federation and take back control of your videos!.">
-    <meta name="twitter:image" content="https://chocobozzz.frama.io<%= BASE_URL %>img/card-opengraph.png">
+    <meta name="twitter:image" content="https://joinpeertube.org<%= BASE_URL %>img/card-opengraph.jpg">
   </head>
 
   <body>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index f3c264b..2f6c5fb 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -80,7 +80,7 @@
         </div>
 
         <div class="one-column">
-          <img :src="buildImgUrl('peertube-federation-multiplicity.png')" alt="Funny federation schema"/>
+          <img :src="buildImgUrl('peertube-federation-multiplicity.jpg')" alt="Funny federation schema"/>
 
           <div>
             <div v-translate>PeerTube is not meant to become a huge platform that would centralize videos from all around the world.</div>
@@ -122,7 +122,7 @@
         </div>
 
         <div class="one-column">
-          <img :src="buildImgUrl('peertube-federation-2-instances.png')" alt="Funny 2 instances communication schema"/>
+          <img :src="buildImgUrl('peertube-federation-2-instances.jpg')" alt="Funny 2 instances communication schema"/>
 
           <p v-translate>
             And there's more! PeerTube uses Activity Pub, a federating protocol that <strong>allows you to interact with other
@@ -148,7 +148,7 @@
         </div>
 
         <div class="one-column">
-          <img :src="buildImgUrl('peertube-free-software.png')" alt="PeerTube is a free software funny schema"/>
+          <img :src="buildImgUrl('peertube-free-software.jpg')" alt="PeerTube is a free software funny schema"/>
 
           <p v-translate>
             Mainstream online video broadcasting services make money off of your data by analyzing your interactions
@@ -194,7 +194,7 @@
         </div>
 
         <div class="one-column">
-          <img :src="buildImgUrl('peertube-upload.png')" alt="PeerTube upload illustration"/>
+          <img :src="buildImgUrl('peertube-upload.jpg')" alt="PeerTube upload illustration"/>
 
           <div class="citation">
             <div class="left-bar"></div>
@@ -237,7 +237,7 @@
         </div>
 
         <div class="one-column">
-          <img :src="buildImgUrl('peertube-p2p.png')" alt="PeerTube P2P illustration"/>
+          <img :src="buildImgUrl('peertube-p2p.jpg')" alt="PeerTube P2P illustration"/>
 
           <div class="citation">
             <div class="left-bar"></div>
@@ -270,7 +270,7 @@
         </div>
 
         <div class="one-column">
-          <img :src="buildImgUrl('peertube-federation-multiplicity.png')" alt="PeerTube you play illustration"/>
+          <img :src="buildImgUrl('peertube-federation-multiplicity.jpg')" alt="PeerTube you play illustration"/>
         </div>
 
         <div class="buttons-row explore-create-account">