diff --git a/nx-dev/feature-doc-viewer/src/lib/doc-viewer.tsx b/nx-dev/feature-doc-viewer/src/lib/doc-viewer.tsx
index 0bfdf9ef57..9e827b3579 100644
--- a/nx-dev/feature-doc-viewer/src/lib/doc-viewer.tsx
+++ b/nx-dev/feature-doc-viewer/src/lib/doc-viewer.tsx
@@ -29,7 +29,7 @@ export function DocViewer({
           images: [
             {
               url: router.asPath.includes('turbo-and-nx')
-                ? 'https://nx.dev/images/nx-media-monorepo.jpg'
+                ? 'https://nx.dev/socials/nx-media-monorepo.jpg'
                 : `https://nx.dev/images/open-graph/${router.asPath
                     .replace('/', '')
                     .replace(/\//gi, '-')}.jpg`,
@@ -39,7 +39,7 @@ export function DocViewer({
               type: 'image/jpeg',
             },
           ],
-          site_name: 'Nx',
+          siteName: 'Nx',
           type: 'website',
         }}
       />
diff --git a/nx-dev/nx-dev/pages/_document.tsx b/nx-dev/nx-dev/pages/_document.tsx
index cfabd08f09..d7de33facc 100644
--- a/nx-dev/nx-dev/pages/_document.tsx
+++ b/nx-dev/nx-dev/pages/_document.tsx
@@ -8,24 +8,24 @@ export default function Document(): JSX.Element {
         <link
           rel="apple-touch-icon"
           sizes="180x180"
-          href="/images/apple-touch-icon.png"
+          href="/favicon/apple-touch-icon.png"
         />
         <link
           rel="icon"
           type="image/png"
           sizes="32x32"
-          href="/images/favicon-32x32.png"
+          href="/favicon/favicon-32x32.png"
         />
         <link
           rel="icon"
           type="image/png"
           sizes="16x16"
-          href="/images/favicon-16x16.png"
+          href="/favicon/favicon-16x16.png"
         />
-        <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+        <link rel="icon" type="image/x-icon" href="/favicon/favicon.ico" />
         <link
           rel="mask-icon"
-          href="/images/safari-pinned-tab.svg"
+          href="/favicon/safari-pinned-tab.svg"
           color="#5bbad5"
         />
         <meta name="apple-mobile-web-app-title" content="Nx" />
diff --git a/nx-dev/nx-dev/pages/index.tsx b/nx-dev/nx-dev/pages/index.tsx
index 28a4d8f5cb..3d732dbf2d 100644
--- a/nx-dev/nx-dev/pages/index.tsx
+++ b/nx-dev/nx-dev/pages/index.tsx
@@ -27,11 +27,11 @@ export default function Index(): JSX.Element {
             'Nx is a smart, fast and extensible build system which comes with first class monorepo support and powerful integrations.',
           images: [
             {
-              url: 'https://nx.dev/images/nx-media.jpg',
-              width: 800,
-              height: 421,
+              url: 'https://nx.dev/socials/nx-media.png',
+              width: 1200,
+              height: 600,
               alt: 'Nx: Smart, Fast and Extensible Build System',
-              type: 'image/jpeg',
+              type: 'image/png',
             },
           ],
           siteName: 'Nx',
diff --git a/nx-dev/nx-dev/pages/packages.tsx b/nx-dev/nx-dev/pages/packages.tsx
index 04934e63e2..7beb99cb98 100644
--- a/nx-dev/nx-dev/pages/packages.tsx
+++ b/nx-dev/nx-dev/pages/packages.tsx
@@ -46,11 +46,11 @@ export default function Packages(props: ReferencesProps): JSX.Element {
           description: 'Reference: Official Packages & API',
           images: [
             {
-              url: 'https://nx.dev/images/nx-media.jpg',
-              width: 800,
-              height: 421,
+              url: 'https://nx.dev/socials/nx-media.png',
+              width: 1200,
+              height: 600,
               alt: 'Nx: Smart, Fast and Extensible Build System',
-              type: 'image/jpeg',
+              type: 'image/png',
             },
           ],
           siteName: 'NxDev',
diff --git a/nx-dev/nx-dev/public/favicon.ico b/nx-dev/nx-dev/public/favicon.ico
deleted file mode 100644
index 317ebcb233..0000000000
Binary files a/nx-dev/nx-dev/public/favicon.ico and /dev/null differ
diff --git a/nx-dev/nx-dev/public/favicon/android-chrome-192x192.png b/nx-dev/nx-dev/public/favicon/android-chrome-192x192.png
new file mode 100644
index 0000000000..94535c2165
Binary files /dev/null and b/nx-dev/nx-dev/public/favicon/android-chrome-192x192.png differ
diff --git a/nx-dev/nx-dev/public/favicon/android-chrome-512x512.png b/nx-dev/nx-dev/public/favicon/android-chrome-512x512.png
new file mode 100644
index 0000000000..9ff4fd762d
Binary files /dev/null and b/nx-dev/nx-dev/public/favicon/android-chrome-512x512.png differ
diff --git a/nx-dev/nx-dev/public/favicon/apple-touch-icon.png b/nx-dev/nx-dev/public/favicon/apple-touch-icon.png
new file mode 100644
index 0000000000..4d47879b27
Binary files /dev/null and b/nx-dev/nx-dev/public/favicon/apple-touch-icon.png differ
diff --git a/nx-dev/nx-dev/public/favicon/favicon-16x16.png b/nx-dev/nx-dev/public/favicon/favicon-16x16.png
new file mode 100644
index 0000000000..325a3164f5
Binary files /dev/null and b/nx-dev/nx-dev/public/favicon/favicon-16x16.png differ
diff --git a/nx-dev/nx-dev/public/favicon/favicon-32x32.png b/nx-dev/nx-dev/public/favicon/favicon-32x32.png
new file mode 100644
index 0000000000..c0d99a09dc
Binary files /dev/null and b/nx-dev/nx-dev/public/favicon/favicon-32x32.png differ
diff --git a/nx-dev/nx-dev/public/favicon/favicon.ico b/nx-dev/nx-dev/public/favicon/favicon.ico
new file mode 100644
index 0000000000..10d3f7a352
Binary files /dev/null and b/nx-dev/nx-dev/public/favicon/favicon.ico differ
diff --git a/nx-dev/nx-dev/public/favicon/mstile-150x150.png b/nx-dev/nx-dev/public/favicon/mstile-150x150.png
new file mode 100644
index 0000000000..2ba17a44d7
Binary files /dev/null and b/nx-dev/nx-dev/public/favicon/mstile-150x150.png differ
diff --git a/nx-dev/nx-dev/public/favicon/safari-pinned-tab.svg b/nx-dev/nx-dev/public/favicon/safari-pinned-tab.svg
new file mode 100644
index 0000000000..aecc990541
--- /dev/null
+++ b/nx-dev/nx-dev/public/favicon/safari-pinned-tab.svg
@@ -0,0 +1,3 @@
+<svg width="640" height="640" viewBox="0 0 640 640" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M319.655 376.44L236.918 506.488L99.7372 283.877L99.4202 516.923H3V123H100.503L239.111 356.337L239.243 250.724L319.655 376.44V376.44ZM335.531 224.254C336.165 222.986 335.531 124.294 335.742 123H239.322C239.375 124.559 239.19 222.749 239.243 224.254H335.531V224.254ZM484.362 333.46C473.107 333.244 462.062 336.522 452.747 342.842C443.432 349.162 436.305 358.215 432.347 368.753C438.904 358.942 448.61 351.662 459.863 348.112C471.116 344.563 483.243 344.958 494.241 349.231C504.702 353.484 518.465 360.379 529.375 356.707C524.257 349.536 517.505 343.687 509.677 339.645C501.849 335.602 493.171 333.482 484.362 333.46V333.46ZM573.914 361.488C564.007 358.054 552.78 354.171 544.618 343.499C543.033 341.385 541.553 339.008 539.968 336.498C536.432 329.977 531.648 324.215 525.888 319.539C518.122 313.833 507.925 311.033 494.717 311.033C481.733 311.036 469.043 314.894 458.255 322.118C447.467 329.341 439.066 339.605 434.117 351.608C440.391 342.875 448.848 335.942 458.642 331.502C468.435 327.062 479.223 325.272 489.926 326.309C500.629 327.347 510.873 331.177 519.631 337.415C528.39 343.653 535.357 352.082 539.836 361.858C542.067 365.521 545.425 368.361 549.407 369.952C553.389 371.543 557.78 371.799 561.92 370.681C574.944 367.907 574.072 380.191 593.699 384.365V380.851C593.62 369.07 587.201 366.322 573.887 361.488H573.914ZM627.381 394.932C630.259 393.181 632.624 390.699 634.234 387.739C635.843 384.779 636.642 381.446 636.547 378.078C636.283 299.964 572.883 233.13 494.69 233.13C471.186 233.111 448.045 238.939 427.353 250.09C406.662 261.24 389.069 277.363 376.16 297.005C375.895 296.319 335.954 233.87 335.531 233.13H239.243L330.723 376.387L241.462 516.923H334.976L375.658 454.421L417.079 516.923H510.62L425.823 383.467C424.418 380.867 423.657 377.968 423.604 375.013C423.6 365.679 425.436 356.436 429.005 347.812C432.575 339.187 437.808 331.35 444.407 324.749C451.006 318.148 458.841 312.911 467.464 309.338C476.087 305.766 485.33 303.927 494.664 303.927H494.69C533.998 303.927 540.549 327.437 549.029 338.479C565.777 360.299 599.221 350.737 599.221 379.187C599.281 382.451 600.195 385.641 601.872 388.441C603.549 391.241 605.931 393.553 608.78 395.145C611.628 396.738 614.845 397.557 618.109 397.519C621.372 397.482 624.569 396.589 627.381 394.932V394.932ZM636.626 398.445C632.056 408.272 621.833 407.374 616.682 415.325C612.033 422.484 619.693 426.209 619.693 426.209C619.693 426.209 628.596 430.33 633.905 417.993C636.653 411.891 637.604 405.102 636.626 398.445V398.445Z" fill="#CBD5E1"/>
+</svg>
diff --git a/nx-dev/nx-dev/public/images/apple-touch-icon.png b/nx-dev/nx-dev/public/images/apple-touch-icon.png
deleted file mode 100644
index 78dfd572d4..0000000000
Binary files a/nx-dev/nx-dev/public/images/apple-touch-icon.png and /dev/null differ
diff --git a/nx-dev/nx-dev/public/images/favicon-16x16.png b/nx-dev/nx-dev/public/images/favicon-16x16.png
deleted file mode 100644
index ea82d7c30d..0000000000
Binary files a/nx-dev/nx-dev/public/images/favicon-16x16.png and /dev/null differ
diff --git a/nx-dev/nx-dev/public/images/favicon-32x32.png b/nx-dev/nx-dev/public/images/favicon-32x32.png
deleted file mode 100644
index a9e95b69b4..0000000000
Binary files a/nx-dev/nx-dev/public/images/favicon-32x32.png and /dev/null differ
diff --git a/nx-dev/nx-dev/public/images/nx-media.jpg b/nx-dev/nx-dev/public/images/nx-media.jpg
deleted file mode 100644
index fe9d5fbc00..0000000000
Binary files a/nx-dev/nx-dev/public/images/nx-media.jpg and /dev/null differ
diff --git a/nx-dev/nx-dev/public/images/safari-pinned-tab.svg b/nx-dev/nx-dev/public/images/safari-pinned-tab.svg
deleted file mode 100644
index adfd97595e..0000000000
--- a/nx-dev/nx-dev/public/images/safari-pinned-tab.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="540.000000pt" height="540.000000pt" viewBox="0 0 540.000000 540.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,540.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M132 2920 l0 -1627 399 -1 399 -1 1 307 c0 169 1 599 1 955 0 474 3
-646 12 637 6 -6 22 -30 36 -55 14 -24 54 -92 90 -152 36 -59 67 -113 70 -118
-3 -6 125 -211 272 -456 147 -246 275 -461 285 -478 10 -17 74 -124 143 -238
-69 -115 126 -211 128 -215 2 -4 27 -47 56 -95 l53 -88 399 -2 399 -3 40 63
-c45 71 212 329 259 399 17 26 33 47 36 48 3 0 81 -115 173 -254 l168 -254 385
-0 c311 0 384 3 380 13 -2 7 -30 53 -61 102 -32 48 -79 122 -105 163 -26 41
--72 113 -101 159 -30 47 -83 131 -119 188 -148 234 -216 342 -262 411 -26 41
--48 79 -48 86 0 33 74 157 119 199 137 128 312 153 500 71 108 -48 221 -63
-256 -34 19 16 30 7 60 -49 38 -70 83 -92 178 -89 74 2 74 2 136 -45 58 -43
-122 -70 183 -76 4 -1 14 -14 23 -30 53 -104 220 -99 271 7 45 94 -1 372 -95
-576 -67 143 -148 256 -265 369 -222 214 -511 328 -816 321 -133 -3 -166 -7
--275 -35 -107 -27 -208 -71 -310 -133 -131 -79 -238 -175 -326 -291 -23 -30
--43 -55 -45 -55 -3 0 -51 74 -180 275 -31 50 -78 122 -103 160 l-46 70 -2 445
-c-1 245 -2 452 -2 461 -1 15 -37 17 -395 17 -285 0 -396 -4 -399 -12 -2 -6 -4
--433 -4 -949 -1 -516 -3 -941 -6 -943 -3 -4 -269 434 -381 629 -18 31 -215
-363 -557 937 -90 151 -171 289 -180 305 l-16 30 -405 1 -405 1 -1 -1627z"/>
-<path d="M5343 2246 c-11 -13 -46 -39 -77 -57 -88 -53 -106 -123 -36 -147 68
--24 131 60 139 186 1 23 1 42 -1 42 -3 0 -14 -11 -25 -24z"/>
-</g>
-</svg>
diff --git a/nx-dev/nx-dev/public/images/nx-media-monorepo.jpg b/nx-dev/nx-dev/public/socials/nx-media-monorepo.jpg
similarity index 100%
rename from nx-dev/nx-dev/public/images/nx-media-monorepo.jpg
rename to nx-dev/nx-dev/public/socials/nx-media-monorepo.jpg
diff --git a/nx-dev/nx-dev/public/socials/nx-media.png b/nx-dev/nx-dev/public/socials/nx-media.png
new file mode 100644
index 0000000000..462f48376e
Binary files /dev/null and b/nx-dev/nx-dev/public/socials/nx-media.png differ