diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png
index e3098c6280e..e5f6e01ef0a 100644
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png and b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png
index 499911bc463..4bee78eb535 100644
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png and b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/blogging_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/blogging_thumb_large.png
index 0d51dc65f84..7c8661964e8 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/blogging_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/blogging_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/blogging_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/blogging_thumb_small.png
index 600981c2569..883c3377d6b 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/blogging_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/blogging_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/coffee_break_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/coffee_break_thumb_large.png
index 1f54e93498b..a2b9a8a2819 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/coffee_break_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/coffee_break_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/coffee_break_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/coffee_break_thumb_small.png
index fc007ab5b15..e7f528232e5 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/coffee_break_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/coffee_break_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/event_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/event_thumb_large.png
index 5c03a038b27..4a89e142b30 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/event_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/event_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/event_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/event_thumb_small.png
index 45077ac5e22..e8e3219e2f6 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/event_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/event_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_large.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_large.png
index 8e9041a4db7..cd8a795c9b4 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_large.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_large.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_small.png b/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_small.png
index 87040326390..53cbad65ecb 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_small.png and b/addons/mass_mailing_themes/static/src/img/theme_imgs/newsletter_thumb_small.png differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_newsletter/social-twitter.png b/addons/mass_mailing_themes/static/src/img/theme_newsletter/social-twitter.png
index 0a5f27a7d45..62505e8204b 100644
Binary files a/addons/mass_mailing_themes/static/src/img/theme_newsletter/social-twitter.png and b/addons/mass_mailing_themes/static/src/img/theme_newsletter/social-twitter.png differ
diff --git a/addons/web/static/fonts/twitter_x_only.woff b/addons/web/static/fonts/twitter_x_only.woff
new file mode 100644
index 00000000000..918190cb940
Binary files /dev/null and b/addons/web/static/fonts/twitter_x_only.woff differ
diff --git a/addons/web/static/src/scss/fontawesome_overridden.scss b/addons/web/static/src/scss/fontawesome_overridden.scss
index e1b3396a8b2..8d7fbbb55be 100644
--- a/addons/web/static/src/scss/fontawesome_overridden.scss
+++ b/addons/web/static/src/scss/fontawesome_overridden.scss
@@ -1,4 +1,4 @@
-// This is a patch of the font awesome library to add the TikTok icon.
+// This is a patch of the font awesome library to add TikTok & Twitter icons.
 @font-face {
     font-family: 'FontAwesome-tiktok-only';
     src: url('../../fonts/tiktok_only.woff');
@@ -6,6 +6,15 @@
     font-style: normal;
     font-display: block;
 }
+
+@font-face {
+    font-family: 'FontAwesome-twitter-x-only';
+    src: url('../../fonts/twitter_x_only.woff');
+    font-weight: normal;
+    font-style: normal;
+    font-display: block;
+}
+
 .fa.fa-tiktok {
     font-family: 'FontAwesome-tiktok-only' !important;
 
@@ -14,6 +23,25 @@
     }
 }
 
+// Don't write `.fa.fa-twitter` or this will be considered like a new icon in
+// the media dialog. The css here is just about overriding the existing twitter
+// icon and should not be considered as a new icon, otherwise those icons will
+// be shown twice in the media dialog. Grep: `iconsParser` and `fontIcons`.
+.fa-twitter.fa {
+    font-family: 'FontAwesome-twitter-x-only' !important;
+
+    &:before {
+        content: '\e800';
+    }
+}
+.fa-twitter-square.fa {
+    font-family: 'FontAwesome-twitter-x-only' !important;
+
+    &:before {
+        content: '\e803';
+    }
+}
+
 // This is rtl language specific fix
 // It will override the font awesome symbols and flip them 180 degree
 .o_rtl {
@@ -51,4 +79,4 @@
             transform: rotate(180deg);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/addons/website/static/src/img/snippets_thumbs/s_twitter_scroll.svg b/addons/website/static/src/img/snippets_thumbs/s_twitter_scroll.svg
index 6cf17fa1b72..8e264fa7024 100644
--- a/addons/website/static/src/img/snippets_thumbs/s_twitter_scroll.svg
+++ b/addons/website/static/src/img/snippets_thumbs/s_twitter_scroll.svg
@@ -1,74 +1,108 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="82" height="60" viewBox="0 0 82 60">
-  <defs>
-    <path id="path-1" d="M0 1v27a1 1 0 0 0 1 1h40V1a1 1 0 0 0-1-1H1a1 1 0 0 0-1 1zm1 27.188V1h39v13.797l1 1.217V29H23l-1.5-.812H1z"/>
-    <filter id="filter-2" width="102.4%" height="106.9%" x="-1.2%" y="-1.7%" filterUnits="objectBoundingBox">
-      <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
-      <feComposite in="shadowOffsetOuter1" in2="SourceAlpha" operator="out" result="shadowOffsetOuter1"/>
-      <feColorMatrix in="shadowOffsetOuter1" values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.292012675 0"/>
-    </filter>
-    <path id="path-3" d="M17 11v1h-4v-1h4zm6-3v1H13V8h10zm7-3v1H13V5h17z"/>
-    <filter id="filter-4" width="105.9%" height="128.6%" x="-2.9%" y="-7.1%" filterUnits="objectBoundingBox">
-      <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
-      <feComposite in="shadowOffsetOuter1" in2="SourceAlpha" operator="out" result="shadowOffsetOuter1"/>
-      <feColorMatrix in="shadowOffsetOuter1" values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.0995137675 0"/>
-    </filter>
-    <rect id="path-5" width="16" height="2" x="13" y="0"/>
-    <filter id="filter-6" width="106.2%" height="200%" x="-3.1%" y="-25%" filterUnits="objectBoundingBox">
-      <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
-      <feComposite in="shadowOffsetOuter1" in2="SourceAlpha" operator="out" result="shadowOffsetOuter1"/>
-      <feColorMatrix in="shadowOffsetOuter1" values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.292012675 0"/>
-    </filter>
-    <rect id="path-7" width="10.353" height="13.349" x="0" y="0"/>
-    <linearGradient id="linearGradient-9" x1="72.875%" x2="40.332%" y1="46.142%" y2="32.596%">
-      <stop offset="0%" stop-color="#008374"/>
-      <stop offset="100%" stop-color="#006A59"/>
-    </linearGradient>
-    <linearGradient id="linearGradient-10" x1="88.517%" x2="50%" y1="38.363%" y2="50%">
-      <stop offset="0%" stop-color="#00AA89"/>
-      <stop offset="100%" stop-color="#009989"/>
-    </linearGradient>
-    <linearGradient id="linearGradient-11" x1="50%" x2="50%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#00A09D"/>
-      <stop offset="100%" stop-color="#00E2FF"/>
-    </linearGradient>
-    <path id="path-12" d="M44 20.781a7.843 7.843 0 0 1-1.85 1.957 11.013 11.013 0 0 1-.423 3.533 11.124 11.124 0 0 1-1.319 2.913c-.59.93-1.293 1.752-2.107 2.466-.815.715-1.797 1.286-2.947 1.711-1.15.426-2.38.639-3.689.639-2.063 0-3.952-.566-5.665-1.7.266.032.563.048.89.048 1.714 0 3.24-.54 4.58-1.618a3.539 3.539 0 0 1-2.146-.755 3.701 3.701 0 0 1-1.302-1.87c.25.04.483.06.696.06.328 0 .651-.044.971-.13a3.614 3.614 0 0 1-2.119-1.306c-.56-.692-.839-1.495-.839-2.409v-.047a3.59 3.59 0 0 0 1.667.48 3.747 3.747 0 0 1-1.199-1.347 3.764 3.764 0 0 1-.445-1.804c0-.688.167-1.325.502-1.91a10.515 10.515 0 0 0 3.364 2.794c1.321.7 2.735 1.088 4.243 1.166a4.31 4.31 0 0 1-.091-.867c0-1.047.36-1.94 1.079-2.678.72-.738 1.59-1.107 2.61-1.107 1.066 0 1.964.398 2.695 1.195a7.123 7.123 0 0 0 2.341-.914 3.66 3.66 0 0 1-1.621 2.086A7.204 7.204 0 0 0 44 20.781z"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd" class="snippets_thumbs">
-    <g class="s_twitter_scroll">
-      <rect width="82" height="60" class="bg"/>
-      <g class="group" transform="translate(19 13)">
-        <g class="shape">
-          <use fill="#000" filter="url(#filter-2)" xlink:href="#path-1"/>
-          <use fill="#FFF" fill-opacity=".78" xlink:href="#path-1"/>
-        </g>
-        <g class="group_2" transform="translate(5 6)">
-          <g class="combined_shape">
-            <use fill="#000" filter="url(#filter-4)" xlink:href="#path-3"/>
-            <use fill="#FFF" fill-opacity=".348" xlink:href="#path-3"/>
-          </g>
-          <g class="rectangle">
-            <use fill="#000" filter="url(#filter-6)" xlink:href="#path-5"/>
-            <use fill="#FFF" fill-opacity=".78" xlink:href="#path-5"/>
-          </g>
-          <g class="image_1_border">
-            <rect width="11" height="14" fill="#FFF" class="rectangle"/>
-            <g class="oval___oval_mask" transform="translate(.324 .326)">
-              <mask id="mask-8" fill="#fff">
-                <use xlink:href="#path-7"/>
-              </mask>
-              <use fill="#79D1F2" class="mask" xlink:href="#path-7"/>
-              <ellipse cx="6.632" cy="3.419" fill="#F3EC60" class="oval" mask="url(#mask-8)" rx="2.426" ry="2.442"/>
-              <ellipse cx="10.515" cy="14.651" fill="url(#linearGradient-9)" class="oval" mask="url(#mask-8)" rx="7.603" ry="4.884"/>
-              <ellipse cx="-5.662" cy="14.814" fill="url(#linearGradient-10)" class="oval" mask="url(#mask-8)" rx="12.132" ry="7.651"/>
-            </g>
-            <path fill="#FFF" d="M11 0v14H0V0h11zm-1 1H1v12h9V1z" class="rectangle_2"/>
-          </g>
-        </g>
-        <mask id="mask-13" fill="#fff">
-          <use xlink:href="#path-12"/>
-        </mask>
-        <use fill="url(#linearGradient-11)" class="twitter" xlink:href="#path-12"/>
-      </g>
+<svg width="82" height="60" viewBox="0 0 82 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <mask id="mask0_20039_116" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0"
+    width="82" height="60">
+    <path d="M0 0H82V60H0V0Z" fill="white" />
+  </mask>
+  <g mask="url(#mask0_20039_116)">
+    <g filter="url(#filter0_i_20039_116)">
+      <path
+        d="M19 14V41C19 41.2652 19.1054 41.5196 19.2929 41.7071C19.4804 41.8946 19.7348 42 20 42H60V14C60 13.7348 59.8946 13.4804 59.7071 13.2929C59.5196 13.1054 59.2652 13 59 13H20C19.7348 13 19.4804 13.1054 19.2929 13.2929C19.1054 13.4804 19 13.7348 19 14ZM20 41.188V14H59V27.797L60 29.014V42H42L40.5 41.188H20Z"
+        fill="black" />
     </g>
+    <path
+      d="M19 14V41C19 41.2652 19.1054 41.5196 19.2929 41.7071C19.4804 41.8946 19.7348 42 20 42H60V14C60 13.7348 59.8946 13.4804 59.7071 13.2929C59.5196 13.1054 59.2652 13 59 13H20C19.7348 13 19.4804 13.1054 19.2929 13.2929C19.1054 13.4804 19 13.7348 19 14ZM20 41.188V14H59V27.797L60 29.014V42H42L40.5 41.188H20Z"
+      fill="white" fill-opacity="0.78" />
+    <g filter="url(#filter1_i_20039_116)">
+      <path d="M41 30V31H37V30H41ZM47 27V28H37V27H47ZM54 24V25H37V24H54Z" fill="black" />
+    </g>
+    <path d="M41 30V31H37V30H41ZM47 27V28H37V27H47ZM54 24V25H37V24H54Z" fill="white"
+      fill-opacity="0.348" />
+    <g filter="url(#filter2_i_20039_116)">
+      <path d="M53 19H37V21H53V19Z" fill="black" />
+    </g>
+    <path d="M53 19H37V21H53V19Z" fill="white" fill-opacity="0.78" />
+    <path d="M35 19H24V33H35V19Z" fill="white" />
+    <path d="M34.6772 19.3259H24.3242V32.6749H34.6772V19.3259Z" fill="#79D1F2" />
+    <mask id="mask1_20039_116" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="24" y="19"
+      width="11" height="14">
+      <path d="M34.6772 19.3259H24.3242V32.6749H34.6772V19.3259Z" fill="white" />
+    </mask>
+    <g mask="url(#mask1_20039_116)">
+      <path
+        d="M30.9563 25.187C31.2759 25.1859 31.5922 25.1219 31.8871 24.9986C32.182 24.8754 32.4498 24.6952 32.675 24.4684C32.9003 24.2417 33.0787 23.9728 33.2001 23.677C33.3214 23.3813 33.3833 23.0646 33.3823 22.745C33.3833 22.4253 33.3214 22.1086 33.2001 21.8129C33.0787 21.5172 32.9003 21.2483 32.675 21.0215C32.4498 20.7948 32.182 20.6146 31.8871 20.4913C31.5922 20.368 31.2759 20.304 30.9563 20.303C30.6366 20.304 30.3203 20.368 30.0254 20.4913C29.7305 20.6146 29.4628 20.7948 29.2375 21.0215C29.0123 21.2483 28.8338 21.5172 28.7125 21.8129C28.5911 22.1086 28.5292 22.4253 28.5303 22.745C28.5292 23.0646 28.5911 23.3813 28.7125 23.677C28.8338 23.9728 29.0123 24.2417 29.2375 24.4684C29.4628 24.6952 29.7305 24.8754 30.0254 24.9986C30.3203 25.1219 30.6366 25.1859 30.9563 25.187Z"
+        fill="#F3EC60" />
+    </g>
+    <mask id="mask2_20039_116" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="24" y="19"
+      width="11" height="14">
+      <path d="M34.6772 19.3259H24.3242V32.6749H34.6772V19.3259Z" fill="white" />
+    </mask>
+    <g mask="url(#mask2_20039_116)">
+      <path
+        d="M34.8403 38.861C39.0383 38.861 42.4423 36.674 42.4423 33.977C42.4423 31.28 39.0383 29.093 34.8393 29.093C30.6403 29.093 27.2363 31.28 27.2363 33.977C27.2363 36.674 30.6413 38.861 34.8403 38.861Z"
+        fill="url(#paint0_linear_20039_116)" />
+    </g>
+    <mask id="mask3_20039_116" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="24" y="19"
+      width="11" height="14">
+      <path d="M34.6772 19.3259H24.3242V32.6749H34.6772V19.3259Z" fill="white" />
+    </mask>
+    <g mask="url(#mask3_20039_116)">
+      <path
+        d="M18.6623 41.791C25.3623 41.791 30.7943 38.366 30.7943 34.14C30.7943 29.914 25.3623 26.489 18.6623 26.489C11.9623 26.489 6.53027 29.914 6.53027 34.14C6.53027 38.365 11.9623 41.791 18.6623 41.791Z"
+        fill="url(#paint1_linear_20039_116)" />
+    </g>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M35 19V33H24V19H35ZM34 20H25V32H34V20Z"
+      fill="white" />
+    <path fill-rule="evenodd" clip-rule="evenodd"
+      d="M56.6007 32H59.0542L53.6947 38.3532L60 47H55.0621L51.1947 41.756L46.7708 47H44.3173L50.0504 40.2042L44 32H49.0619L52.5571 36.7932L56.6007 32ZM55.7394 45.477H57.099L48.324 33.4434H46.865L55.7394 45.477Z"
+      fill="white" />
   </g>
+  <defs>
+    <filter id="filter0_i_20039_116" x="19" y="13" width="41" height="30"
+      filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix" />
+      <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+      <feColorMatrix in="SourceAlpha" type="matrix"
+        values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha" />
+      <feOffset dy="1" />
+      <feGaussianBlur stdDeviation="2" />
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+      <feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.292013 0" />
+      <feBlend mode="normal" in2="shape" result="effect1_innerShadow_20039_116" />
+    </filter>
+    <filter id="filter1_i_20039_116" x="37" y="24" width="17" height="8"
+      filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix" />
+      <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+      <feColorMatrix in="SourceAlpha" type="matrix"
+        values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha" />
+      <feOffset dy="1" />
+      <feGaussianBlur stdDeviation="2" />
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+      <feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.0995138 0" />
+      <feBlend mode="normal" in2="shape" result="effect1_innerShadow_20039_116" />
+    </filter>
+    <filter id="filter2_i_20039_116" x="37" y="19" width="16" height="3"
+      filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix" />
+      <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+      <feColorMatrix in="SourceAlpha" type="matrix"
+        values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha" />
+      <feOffset dy="1" />
+      <feGaussianBlur stdDeviation="2" />
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1" />
+      <feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.292013 0" />
+      <feBlend mode="normal" in2="shape" result="effect1_innerShadow_20039_116" />
+    </filter>
+    <linearGradient id="paint0_linear_20039_116" x1="1135.37" y1="479.808" x2="726.474" y2="214.849"
+      gradientUnits="userSpaceOnUse">
+      <stop stop-color="#008374" />
+      <stop offset="1" stop-color="#006A59" />
+    </linearGradient>
+    <linearGradient id="paint1_linear_20039_116" x1="2154.31" y1="613.52" x2="1324.8" y2="1010.91"
+      gradientUnits="userSpaceOnUse">
+      <stop stop-color="#00AA89" />
+      <stop offset="1" stop-color="#009989" />
+    </linearGradient>
+  </defs>
 </svg>
+