diff --git a/docs/content/1.docs/5.community/1.nuxt-community.md b/docs/content/1.docs/5.community/1.nuxt-community.md
index 3371918b67..179abdcf42 100644
--- a/docs/content/1.docs/5.community/1.nuxt-community.md
+++ b/docs/content/1.docs/5.community/1.nuxt-community.md
@@ -4,7 +4,7 @@ navigation.icon: ph:users-bold
 <!-- markdownlint-disable -->
 <!-- @case-police-disable -->
 
-::community-hero
+::docs-hero
 ---
 image:
   path: '/assets/docs/getting-started/nuxt-community/nuxt-community'
diff --git a/docs/content/2.modules.md b/docs/content/2.modules.md
index 64cf190900..dcadc9cbe3 100644
--- a/docs/content/2.modules.md
+++ b/docs/content/2.modules.md
@@ -5,7 +5,14 @@ navigation.icon: ph:puzzle-piece
 image: '/socials/modules.jpg'
 ---
 
-::modules-hero
+::page-hero
+---
+image:
+  src: '/assets/modules/hero'
+  format: 'webp'
+  height: '216'
+  width: '400'
+---
 #title
 Modules
 #description
diff --git a/docs/content/3.showcase.md b/docs/content/3.showcase.md
index 8a650b9a3a..7df080ef83 100644
--- a/docs/content/3.showcase.md
+++ b/docs/content/3.showcase.md
@@ -5,11 +5,20 @@ navigation.icon: icon-park-outline:new-computer
 image: '/socials/showcase.jpg'
 ---
 
-::showcases-hero
+::page-hero
+---
+image:
+  src: '/assets/showcase/hero'
+  format: 'webp'
+  height: '216'
+  width: '400'
+---
 #title
 Showcase
 #description
 Discover our selection of websites built with Nuxt. This collection is powered by VueTelescope.
+#extra
+:::showcases-buttons-hero
 ::
 
 :ShowcasesList
diff --git a/docs/content/4.support/1.solutions.md b/docs/content/4.support/1.solutions.md
index 4432774bfc..764d981cbc 100644
--- a/docs/content/4.support/1.solutions.md
+++ b/docs/content/4.support/1.solutions.md
@@ -4,7 +4,14 @@ description: Find experts near you to help you to build and enhance your project
 image: '/socials/support.jpg'
 ---
 
-::support-hero
+::page-hero
+---
+image:
+  src: '/assets/support/solutions/hero'
+  format: 'webp'
+  height: '216'
+  width: '400'
+---
 #title
 Nuxt Support
 #description
diff --git a/docs/content/4.support/2.agencies/1.index.md b/docs/content/4.support/2.agencies/1.index.md
index 52e0bffff3..c52156cbd3 100644
--- a/docs/content/4.support/2.agencies/1.index.md
+++ b/docs/content/4.support/2.agencies/1.index.md
@@ -3,21 +3,19 @@ title: Nuxt Partner Agencies
 description: Consult our agency partner catalog and find an agency near you with the right set of skills.
 head.titleTemplate: '%s'
 ---
-
-::agencies-hero
+::page-hero
 ---
-buttons:
-  - label: Submit my agency
-    to: https://docs.google.com/forms/d/e/1FAIpQLSf85qskit5QqmGJcruGkGF0U7240Bh9MeN0pHB18UiOMWC8dA/viewform
-    variant: primary-gradient
-    target: _blank
+image:
+  src: '/assets/support/agencies/hero'
+  format: 'svg'
+  height: '216'
+  width: '400'
+buttonText: 'Submit my agency'
+to: 'https://docs.google.com/forms/d/e/1FAIpQLSf85qskit5QqmGJcruGkGF0U7240Bh9MeN0pHB18UiOMWC8dA/viewform'
 ---
 #title
-
 Agencies
-
 #description
-
 Are you looking for a trusted partner with a strong expertise in Nuxt development? Consult our agency partner catalog and find an agency near you with the right set of skills.
 ::
 
diff --git a/docs/content/4.support/3.us.md b/docs/content/4.support/3.us.md
index ffc1fde11b..58cf3b8ddd 100644
--- a/docs/content/4.support/3.us.md
+++ b/docs/content/4.support/3.us.md
@@ -4,8 +4,20 @@ description: Nuxt is an open-source framework totally free to use thanks to our
 image: '/socials/sponsors.jpg'
 ---
 
-::sponsors-hero
-::
+::page-hero
+---
+image:
+  src: '/assets/support/sponsors/hero'
+  format: 'webp'
+  height: '216'
+  width: '400'
+buttonText: 'Become a sponsor'
+to: 'https://github.com/sponsors/nuxt'
+---
+#title
+Sponsors
+#description
+Nuxt is an open-source framework totally free to use thanks to our generous sponsors. If you use Nuxt in your daily work and feel that it has made your life easier, please consider backing us.
 
 ::sponsors-section
 ::
diff --git a/docs/content/4.support/4.jobs.md b/docs/content/4.support/4.jobs.md
index 1078eda0c4..14d11f0213 100644
--- a/docs/content/4.support/4.jobs.md
+++ b/docs/content/4.support/4.jobs.md
@@ -4,7 +4,20 @@ description: Browse available openings for coding with Vue and Nuxt all over the
 image: '/socials/jobs.jpg'
 ---
 
-::jobs-hero
+::page-hero
+---
+image:
+  src: '/assets/support/jobs/hero'
+  format: 'webp'
+  height: '216'
+  width: '400'
+buttonText: 'Post a job'
+to: 'https://vuejobs.com/jobs/create'
+---
+#title
+Explore Nuxt Jobs
+#description
+Browse available openings for coding with Vue and Nuxt all over the world.
 ::
 
 ::jobs-list
diff --git a/docs/content/design-kit.md b/docs/content/design-kit.md
index 15470d13b7..a8b11e7463 100644
--- a/docs/content/design-kit.md
+++ b/docs/content/design-kit.md
@@ -4,13 +4,21 @@ description: Welcome to Nuxt design definition page. Identity was redefined by h
 image: '/socials/design-kit.jpg'
 ---
 
-::resources-design-kit-hero
+::page-hero
+---
+image:
+  src: '/assets/design-kit/hero-designkit'
+  format: 'webp'
+  height: '216'
+  width: '400'
+---
 #title
 Design Kit
 #description
 Welcome to Nuxt design definition page. Identity was redefined by handpicking conscientiously colors, typography and shapes in order to put forward how performant, useful & easy Nuxt products are.
-#buttonText
-Download design kit
+#extra
+:::resources-design-kit-assets-link
+:::
 ::
 
 ::resources-design-kit-section
diff --git a/docs/public/assets/support/agencies/hero-light.webp b/docs/public/assets/support/agencies/hero-light.webp
new file mode 100644
index 0000000000..9fdab9eda6
Binary files /dev/null and b/docs/public/assets/support/agencies/hero-light.webp differ