diff --git a/docs/components/PkgLayout.tsx b/docs/components/PkgLayout.tsx
index 63c262aebab9..345873cc2267 100644
--- a/docs/components/PkgLayout.tsx
+++ b/docs/components/PkgLayout.tsx
@@ -85,6 +85,11 @@ export function PkgLayout({
 					<Fragment>
 						{!pkg.unreleased ? (
 							<Prose>
+								<p>
+									{pkg.title} component(s) can be imported via the{' '}
+									<code>{pkg.name}</code> entrypoint in the{' '}
+									<code>@ag.ds-next/react</code> package.
+								</p>
 								<pre>
 									<code>{`import { ... } from '@ag.ds-next/react/${pkg.name}';`}</code>
 								</pre>
diff --git a/docs/lib/mdx/packages.ts b/docs/lib/mdx/packages.ts
index e2a4b8fc26e1..f09429097e9b 100644
--- a/docs/lib/mdx/packages.ts
+++ b/docs/lib/mdx/packages.ts
@@ -38,10 +38,15 @@ async function getPkgSubNavItems(slug: string) {
 		const meta = pkgNavMetaData(slug, data);
 		return [
 			{
-				label: 'Overview',
+				label: 'Usage',
 				href: `/components/${meta.slug}`,
 				path: pkgReadmePath(slug),
 			},
+			{
+				label: 'Props',
+				href: `/components/${meta.slug}/code`,
+				path: `${pkgDocsPath(slug)}/code.mdx`,
+			},
 			{
 				label: 'Rationale',
 				href: `/components/${meta.slug}/rationale`,
@@ -52,11 +57,6 @@ async function getPkgSubNavItems(slug: string) {
 				href: `/components/${meta.slug}/content`,
 				path: `${pkgDocsPath(slug)}/content.mdx`,
 			},
-			{
-				label: 'Code',
-				href: `/components/${meta.slug}/code`,
-				path: `${pkgDocsPath(slug)}/code.mdx`,
-			},
 			{
 				label: 'Accessibility',
 				href: `/components/${meta.slug}/accessibility`,
diff --git a/docs/pages/components/[slug]/code.tsx b/docs/pages/components/[slug]/code.tsx
index 947d99742f81..b704fc4cc998 100644
--- a/docs/pages/components/[slug]/code.tsx
+++ b/docs/pages/components/[slug]/code.tsx
@@ -46,16 +46,6 @@ export default function PackagesCode({
 					]}
 				/>
 				<Prose id="pkg-content">
-					<h2 id="usage">Usage</h2>
-					<p>
-						{pkg.title} components can be imported via the{' '}
-						<code>{pkg.name}</code> entrypoint in the{' '}
-						<code>@ag.ds-next/react</code> package.
-					</p>
-					<p>For example:</p>
-					<pre>
-						<code>{`import { ... } from '@ag.ds-next/react/${pkg.name}';`}</code>
-					</pre>
 					<MDXRemote {...source} components={mdxComponents} />
 					<h2 id="source">Source</h2>
 					<p>
diff --git a/docs/pages/components/[slug]/index.tsx b/docs/pages/components/[slug]/index.tsx
index 45fc3c5d426c..79a2b8d572eb 100644
--- a/docs/pages/components/[slug]/index.tsx
+++ b/docs/pages/components/[slug]/index.tsx
@@ -43,6 +43,7 @@ export default function Packages({
 					/>
 				) : null}
 				<Prose id="pkg-content">
+					<h2 id="overview">Overview</h2>
 					<MDXRemote {...source} components={mdxComponents} />
 					{relatedComponents?.length ? (
 						<Fragment>
@@ -137,7 +138,16 @@ export const getStaticProps: GetStaticProps<
 			pkg,
 			navLinks,
 			breadcrumbs,
-			toc,
+			toc: [
+				{
+					title: 'Overview',
+					slug: 'overview',
+					id: 'overview',
+					level: 2,
+					items: [],
+				},
+				...toc,
+			],
 			source: pkgContent.source,
 			relatedPatterns,
 			relatedComponents,
diff --git a/packages/react/src/a11y/docs/code.mdx b/packages/react/src/a11y/docs/code.mdx
index d65578c41e47..899b2b5f668d 100644
--- a/packages/react/src/a11y/docs/code.mdx
+++ b/packages/react/src/a11y/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="VisuallyHidden" />
 
 <ComponentPropsTable name="ExternalLinkCallout" />
diff --git a/packages/react/src/accordion/docs/code.mdx b/packages/react/src/accordion/docs/code.mdx
index 7528aa20847d..ee7ffdaf20bf 100644
--- a/packages/react/src/accordion/docs/code.mdx
+++ b/packages/react/src/accordion/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Accordion" />
 
 <ComponentPropsTable name="AccordionItem" />
diff --git a/packages/react/src/ag-branding/docs/code.mdx b/packages/react/src/ag-branding/docs/code.mdx
index 6c02dbc2608a..65686f9c2927 100644
--- a/packages/react/src/ag-branding/docs/code.mdx
+++ b/packages/react/src/ag-branding/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Logo" />
diff --git a/packages/react/src/app-layout/docs/code.mdx b/packages/react/src/app-layout/docs/code.mdx
index b8cfca9b4d1d..eb064ae285ab 100644
--- a/packages/react/src/app-layout/docs/code.mdx
+++ b/packages/react/src/app-layout/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="AppLayout" />
 
 <ComponentPropsTable name="AppLayoutHeader" />
diff --git a/packages/react/src/autocomplete/docs/code.mdx b/packages/react/src/autocomplete/docs/code.mdx
index c61e87bfa890..3b26daa59f6c 100644
--- a/packages/react/src/autocomplete/docs/code.mdx
+++ b/packages/react/src/autocomplete/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Autocomplete" />
 
 <ComponentPropsTable name="AutocompleteRenderItem" />
diff --git a/packages/react/src/avatar/docs/code.mdx b/packages/react/src/avatar/docs/code.mdx
index c50095f209f3..57e421bd3e53 100644
--- a/packages/react/src/avatar/docs/code.mdx
+++ b/packages/react/src/avatar/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Avatar" />
diff --git a/packages/react/src/box/docs/code.mdx b/packages/react/src/box/docs/code.mdx
index 6db967cca82b..b51b0e2f6b6f 100644
--- a/packages/react/src/box/docs/code.mdx
+++ b/packages/react/src/box/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Box" />
diff --git a/packages/react/src/breadcrumbs/docs/code.mdx b/packages/react/src/breadcrumbs/docs/code.mdx
index b528c4777578..6e9fc24a35a7 100644
--- a/packages/react/src/breadcrumbs/docs/code.mdx
+++ b/packages/react/src/breadcrumbs/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Breadcrumbs" />
diff --git a/packages/react/src/button/docs/code.mdx b/packages/react/src/button/docs/code.mdx
index 09c25e02937d..d15612a38873 100644
--- a/packages/react/src/button/docs/code.mdx
+++ b/packages/react/src/button/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Button" />
 
 <ComponentPropsTable name="ButtonLink" />
diff --git a/packages/react/src/call-to-action/docs/code.mdx b/packages/react/src/call-to-action/docs/code.mdx
index 90a6ad792d96..81b07159d735 100644
--- a/packages/react/src/call-to-action/docs/code.mdx
+++ b/packages/react/src/call-to-action/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="CallToActionLink" />
 
 <ComponentPropsTable name="CallToActionButton" />
diff --git a/packages/react/src/callout/docs/code.mdx b/packages/react/src/callout/docs/code.mdx
index f63eb5434447..97480f79563e 100644
--- a/packages/react/src/callout/docs/code.mdx
+++ b/packages/react/src/callout/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Callout" />
 
 <ComponentPropsTable name="CalloutTitle" />
diff --git a/packages/react/src/card/docs/code.mdx b/packages/react/src/card/docs/code.mdx
index 43aeb247d313..28ec727e46cb 100644
--- a/packages/react/src/card/docs/code.mdx
+++ b/packages/react/src/card/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Card" />
 
 <ComponentPropsTable name="CardInner" />
diff --git a/packages/react/src/checkbox/docs/code.mdx b/packages/react/src/checkbox/docs/code.mdx
index b60fd1bfaa91..53ca54f8025d 100644
--- a/packages/react/src/checkbox/docs/code.mdx
+++ b/packages/react/src/checkbox/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Checkbox" />
diff --git a/packages/react/src/columns/docs/code.mdx b/packages/react/src/columns/docs/code.mdx
index 2dd125cc118e..17a6fce37353 100644
--- a/packages/react/src/columns/docs/code.mdx
+++ b/packages/react/src/columns/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Columns" />
 
 <ComponentPropsTable name="Column" />
diff --git a/packages/react/src/combobox/docs/code.mdx b/packages/react/src/combobox/docs/code.mdx
index ed3b762db78f..f966c7031c8c 100644
--- a/packages/react/src/combobox/docs/code.mdx
+++ b/packages/react/src/combobox/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Combobox" />
 
 <ComponentPropsTable name="ComboboxAsync" />
diff --git a/packages/react/src/content/docs/code.mdx b/packages/react/src/content/docs/code.mdx
index 3591ce7c65fc..82e6821824e2 100644
--- a/packages/react/src/content/docs/code.mdx
+++ b/packages/react/src/content/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="PageContent" />
 
 <ComponentPropsTable name="SectionContent" />
diff --git a/packages/react/src/control-group/docs/code.mdx b/packages/react/src/control-group/docs/code.mdx
index ed57907a9d56..f271a0cb091b 100644
--- a/packages/react/src/control-group/docs/code.mdx
+++ b/packages/react/src/control-group/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="ControlGroup" />
diff --git a/packages/react/src/core/docs/code.mdx b/packages/react/src/core/docs/code.mdx
index 9bb1296b280f..6d5a015f2d33 100644
--- a/packages/react/src/core/docs/code.mdx
+++ b/packages/react/src/core/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Core" />
 
 <ComponentPropsTable name="CoreProvider" />
diff --git a/packages/react/src/date-picker/docs/code.mdx b/packages/react/src/date-picker/docs/code.mdx
index 5e8bb5113f18..851add084f4c 100644
--- a/packages/react/src/date-picker/docs/code.mdx
+++ b/packages/react/src/date-picker/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="DatePicker" />
diff --git a/packages/react/src/date-range-picker/docs/code.mdx b/packages/react/src/date-range-picker/docs/code.mdx
index 6a59bb3241a9..dd81d5c629b7 100644
--- a/packages/react/src/date-range-picker/docs/code.mdx
+++ b/packages/react/src/date-range-picker/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="DateRangePicker" />
diff --git a/packages/react/src/details/docs/code.mdx b/packages/react/src/details/docs/code.mdx
index 6c689d03870b..7bf13af96a11 100644
--- a/packages/react/src/details/docs/code.mdx
+++ b/packages/react/src/details/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Details" />
diff --git a/packages/react/src/direction-link/docs/code.mdx b/packages/react/src/direction-link/docs/code.mdx
index ea2bc7fdca2a..59259812f193 100644
--- a/packages/react/src/direction-link/docs/code.mdx
+++ b/packages/react/src/direction-link/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="DirectionLink" />
 
 <ComponentPropsTable name="DirectionButton" />
diff --git a/packages/react/src/divider/docs/code.mdx b/packages/react/src/divider/docs/code.mdx
index fb7688b177ac..05fdde5d4228 100644
--- a/packages/react/src/divider/docs/code.mdx
+++ b/packages/react/src/divider/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Divider" />
diff --git a/packages/react/src/drawer/docs/code.mdx b/packages/react/src/drawer/docs/code.mdx
index 9c8a645004df..5236cde8a13e 100644
--- a/packages/react/src/drawer/docs/code.mdx
+++ b/packages/react/src/drawer/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Drawer" />
diff --git a/packages/react/src/dropdown-menu/docs/code.mdx b/packages/react/src/dropdown-menu/docs/code.mdx
index 7538f95da794..395790d93f5a 100644
--- a/packages/react/src/dropdown-menu/docs/code.mdx
+++ b/packages/react/src/dropdown-menu/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="DropdownMenu" />
 
 <ComponentPropsTable name="DropdownMenuButton" />
diff --git a/packages/react/src/feature-link-list/docs/code.mdx b/packages/react/src/feature-link-list/docs/code.mdx
index 31b00a06957a..c20dd64864a2 100644
--- a/packages/react/src/feature-link-list/docs/code.mdx
+++ b/packages/react/src/feature-link-list/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="FeatureLinkList" />
diff --git a/packages/react/src/field/docs/code.mdx b/packages/react/src/field/docs/code.mdx
index a4d0c544e5ae..48de85f213ac 100644
--- a/packages/react/src/field/docs/code.mdx
+++ b/packages/react/src/field/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Field" />
 
 <ComponentPropsTable name="FieldContainer" />
diff --git a/packages/react/src/fieldset/docs/code.mdx b/packages/react/src/fieldset/docs/code.mdx
index 5b4f3235fc74..197a79222358 100644
--- a/packages/react/src/fieldset/docs/code.mdx
+++ b/packages/react/src/fieldset/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Fieldset" />
 
 <ComponentPropsTable name="FieldsetLegend" />
diff --git a/packages/react/src/file-input/docs/code.mdx b/packages/react/src/file-input/docs/code.mdx
index b070fe8a73de..c4babd786ca0 100644
--- a/packages/react/src/file-input/docs/code.mdx
+++ b/packages/react/src/file-input/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="FileInput" />
diff --git a/packages/react/src/file-upload/docs/code.mdx b/packages/react/src/file-upload/docs/code.mdx
index 99195e4a1175..1f75cfd1c367 100644
--- a/packages/react/src/file-upload/docs/code.mdx
+++ b/packages/react/src/file-upload/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="FileUpload" />
diff --git a/packages/react/src/filter-sidebar/docs/code.mdx b/packages/react/src/filter-sidebar/docs/code.mdx
index f4d329b3153b..ab7d7d61aba8 100644
--- a/packages/react/src/filter-sidebar/docs/code.mdx
+++ b/packages/react/src/filter-sidebar/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="FilterSidebar" />
diff --git a/packages/react/src/flex/docs/code.mdx b/packages/react/src/flex/docs/code.mdx
index b45f3df00a6e..0f9e98e1ed4d 100644
--- a/packages/react/src/flex/docs/code.mdx
+++ b/packages/react/src/flex/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Flex" />
diff --git a/packages/react/src/footer/docs/code.mdx b/packages/react/src/footer/docs/code.mdx
index c9dc16bd999c..e288b11f77ca 100644
--- a/packages/react/src/footer/docs/code.mdx
+++ b/packages/react/src/footer/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Footer" />
 
 <ComponentPropsTable name="FooterDivider" />
diff --git a/packages/react/src/form-stack/docs/code.mdx b/packages/react/src/form-stack/docs/code.mdx
index 21e275464209..f87326fb3494 100644
--- a/packages/react/src/form-stack/docs/code.mdx
+++ b/packages/react/src/form-stack/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="FormStack" />
diff --git a/packages/react/src/global-alert/docs/code.mdx b/packages/react/src/global-alert/docs/code.mdx
index a2bba01fc8c8..019f16e4f119 100644
--- a/packages/react/src/global-alert/docs/code.mdx
+++ b/packages/react/src/global-alert/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="GlobalAlert" />
diff --git a/packages/react/src/grouped-fields/docs/code.mdx b/packages/react/src/grouped-fields/docs/code.mdx
index f60bc886329e..58ff1ad6b874 100644
--- a/packages/react/src/grouped-fields/docs/code.mdx
+++ b/packages/react/src/grouped-fields/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="GroupedFields" />
diff --git a/packages/react/src/header/docs/code.mdx b/packages/react/src/header/docs/code.mdx
index 548ff24d3dc9..98185cdf8a7b 100644
--- a/packages/react/src/header/docs/code.mdx
+++ b/packages/react/src/header/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Header" />
diff --git a/packages/react/src/heading/docs/code.mdx b/packages/react/src/heading/docs/code.mdx
index 313e8d879333..6c8518f4290d 100644
--- a/packages/react/src/heading/docs/code.mdx
+++ b/packages/react/src/heading/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Heading" />
diff --git a/packages/react/src/hero-banner/docs/code.mdx b/packages/react/src/hero-banner/docs/code.mdx
index 1ee72ca962da..df86aa0c4f06 100644
--- a/packages/react/src/hero-banner/docs/code.mdx
+++ b/packages/react/src/hero-banner/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="HeroBanner" />
 
 <ComponentPropsTable name="HeroBannerTitleContainer" />
diff --git a/packages/react/src/icon/docs/code.mdx b/packages/react/src/icon/docs/code.mdx
index 4a7e448c6312..4ba594cee533 100644
--- a/packages/react/src/icon/docs/code.mdx
+++ b/packages/react/src/icon/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="AvatarIcon" />
diff --git a/packages/react/src/indicator-dot/docs/code.mdx b/packages/react/src/indicator-dot/docs/code.mdx
index 2f5d40d6edca..99642c6125b8 100644
--- a/packages/react/src/indicator-dot/docs/code.mdx
+++ b/packages/react/src/indicator-dot/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="IndicatorDot" />
diff --git a/packages/react/src/inpage-nav/docs/code.mdx b/packages/react/src/inpage-nav/docs/code.mdx
index 57d2b8d51f7c..089dd9bf3615 100644
--- a/packages/react/src/inpage-nav/docs/code.mdx
+++ b/packages/react/src/inpage-nav/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="InpageNav" />
diff --git a/packages/react/src/link-list/docs/code.mdx b/packages/react/src/link-list/docs/code.mdx
index 8ce863eeec07..fc1d4d6b3aed 100644
--- a/packages/react/src/link-list/docs/code.mdx
+++ b/packages/react/src/link-list/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="LinkList" />
diff --git a/packages/react/src/list/docs/code.mdx b/packages/react/src/list/docs/code.mdx
index 500bffa1f38a..2b9964436c75 100644
--- a/packages/react/src/list/docs/code.mdx
+++ b/packages/react/src/list/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="UnorderedList" />
 
 <ComponentPropsTable name="OrderedList" />
diff --git a/packages/react/src/loading/docs/code.mdx b/packages/react/src/loading/docs/code.mdx
index df4feeca086b..09ff486bbd22 100644
--- a/packages/react/src/loading/docs/code.mdx
+++ b/packages/react/src/loading/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="LoadingBlanket" />
 
 <ComponentPropsTable name="LoadingDots" />
diff --git a/packages/react/src/main-nav/docs/code.mdx b/packages/react/src/main-nav/docs/code.mdx
index 8d55f2e19184..0fdcbb08fc8d 100644
--- a/packages/react/src/main-nav/docs/code.mdx
+++ b/packages/react/src/main-nav/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="MainNav" />
diff --git a/packages/react/src/modal/docs/code.mdx b/packages/react/src/modal/docs/code.mdx
index 648f4e703892..5c1fd7cc90e0 100644
--- a/packages/react/src/modal/docs/code.mdx
+++ b/packages/react/src/modal/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Modal" />
diff --git a/packages/react/src/notification-badge/docs/code.mdx b/packages/react/src/notification-badge/docs/code.mdx
index dd80f9e8abb1..907639dcfea7 100644
--- a/packages/react/src/notification-badge/docs/code.mdx
+++ b/packages/react/src/notification-badge/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="NotificationBadge" />
diff --git a/packages/react/src/page-alert/docs/code.mdx b/packages/react/src/page-alert/docs/code.mdx
index 605860f0315a..e5fb204d71df 100644
--- a/packages/react/src/page-alert/docs/code.mdx
+++ b/packages/react/src/page-alert/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="PageAlert" />
 
 <ComponentPropsTable name="PageAlertTitle" />
diff --git a/packages/react/src/pagination/docs/code.mdx b/packages/react/src/pagination/docs/code.mdx
index 1b0b32f96928..368113a0efbb 100644
--- a/packages/react/src/pagination/docs/code.mdx
+++ b/packages/react/src/pagination/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Pagination" />
 
 <ComponentPropsTable name="PaginationButtons" />
diff --git a/packages/react/src/password-input/docs/code.mdx b/packages/react/src/password-input/docs/code.mdx
index a3978bc6eb5c..5781eee47398 100644
--- a/packages/react/src/password-input/docs/code.mdx
+++ b/packages/react/src/password-input/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="PasswordInput" />
diff --git a/packages/react/src/progress-indicator/docs/code.mdx b/packages/react/src/progress-indicator/docs/code.mdx
index 00a33a10e68b..ca7fa1d3eaf2 100644
--- a/packages/react/src/progress-indicator/docs/code.mdx
+++ b/packages/react/src/progress-indicator/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="ProgressIndicator" />
diff --git a/packages/react/src/prose/docs/code.mdx b/packages/react/src/prose/docs/code.mdx
index ec77fbd32aab..49835b4ba85e 100644
--- a/packages/react/src/prose/docs/code.mdx
+++ b/packages/react/src/prose/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Prose" />
diff --git a/packages/react/src/radio/docs/code.mdx b/packages/react/src/radio/docs/code.mdx
index 48d68522c72b..ddbf67abefd3 100644
--- a/packages/react/src/radio/docs/code.mdx
+++ b/packages/react/src/radio/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Radio" />
diff --git a/packages/react/src/search-box/docs/code.mdx b/packages/react/src/search-box/docs/code.mdx
index c0b18445253f..3c545fec8918 100644
--- a/packages/react/src/search-box/docs/code.mdx
+++ b/packages/react/src/search-box/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="SearchBox" />
 
 <ComponentPropsTable name="SearchBoxInput" />
diff --git a/packages/react/src/search-input/docs/code.mdx b/packages/react/src/search-input/docs/code.mdx
index aa1fc074f8e6..1fa9b1c26995 100644
--- a/packages/react/src/search-input/docs/code.mdx
+++ b/packages/react/src/search-input/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="SearchInput" />
diff --git a/packages/react/src/section-alert/docs/code.mdx b/packages/react/src/section-alert/docs/code.mdx
index 46aba125413d..acd3179acbc0 100644
--- a/packages/react/src/section-alert/docs/code.mdx
+++ b/packages/react/src/section-alert/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="SectionAlert" />
diff --git a/packages/react/src/select/docs/code.mdx b/packages/react/src/select/docs/code.mdx
index c9441d6021ef..c7f83c88a144 100644
--- a/packages/react/src/select/docs/code.mdx
+++ b/packages/react/src/select/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Select" />
diff --git a/packages/react/src/side-nav/docs/code.mdx b/packages/react/src/side-nav/docs/code.mdx
index 8045a66d476f..5c3297e2b98d 100644
--- a/packages/react/src/side-nav/docs/code.mdx
+++ b/packages/react/src/side-nav/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="SideNav" />
diff --git a/packages/react/src/skeleton/docs/code.mdx b/packages/react/src/skeleton/docs/code.mdx
index 1ae906e5a221..802fa6565e94 100644
--- a/packages/react/src/skeleton/docs/code.mdx
+++ b/packages/react/src/skeleton/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="SkeletonHeading" />
 
 <ComponentPropsTable name="SkeletonText" />
diff --git a/packages/react/src/skip-link/docs/code.mdx b/packages/react/src/skip-link/docs/code.mdx
index 8bf8a1117949..e6cd43aa4545 100644
--- a/packages/react/src/skip-link/docs/code.mdx
+++ b/packages/react/src/skip-link/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="SkipLinks" />
diff --git a/packages/react/src/stack/docs/code.mdx b/packages/react/src/stack/docs/code.mdx
index e5b51257c0f5..7121375831c4 100644
--- a/packages/react/src/stack/docs/code.mdx
+++ b/packages/react/src/stack/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Stack" />
diff --git a/packages/react/src/status-badge/docs/code.mdx b/packages/react/src/status-badge/docs/code.mdx
index a948330af05b..4c5d072a3497 100644
--- a/packages/react/src/status-badge/docs/code.mdx
+++ b/packages/react/src/status-badge/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="StatusBadge" />
diff --git a/packages/react/src/sub-nav/docs/code.mdx b/packages/react/src/sub-nav/docs/code.mdx
index 90c4fa1000e1..135be1b70751 100644
--- a/packages/react/src/sub-nav/docs/code.mdx
+++ b/packages/react/src/sub-nav/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="SubNav" />
diff --git a/packages/react/src/summary-list/docs/code.mdx b/packages/react/src/summary-list/docs/code.mdx
index ba001bb3f2cb..3482d9e82103 100644
--- a/packages/react/src/summary-list/docs/code.mdx
+++ b/packages/react/src/summary-list/docs/code.mdx
@@ -16,8 +16,6 @@ It is important that this component is composed correctly to ensure the correct
 </SummaryList>
 ```
 
-## Props
-
 <ComponentPropsTable name="SummaryList" />
 <ComponentPropsTable name="SummaryListItem" />
 <ComponentPropsTable name="SummaryListItemTerm" />
diff --git a/packages/react/src/switch/docs/code.mdx b/packages/react/src/switch/docs/code.mdx
index bb394b37cd86..9bce586cbdba 100644
--- a/packages/react/src/switch/docs/code.mdx
+++ b/packages/react/src/switch/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Switch" />
diff --git a/packages/react/src/table/docs/code.mdx b/packages/react/src/table/docs/code.mdx
index 142258ee1259..0d5265ce62d5 100644
--- a/packages/react/src/table/docs/code.mdx
+++ b/packages/react/src/table/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="TableWrapper" />
 
 <ComponentPropsTable name="Table" />
diff --git a/packages/react/src/tabs/docs/code.mdx b/packages/react/src/tabs/docs/code.mdx
index bb0ce2ccf370..05e74a9d2280 100644
--- a/packages/react/src/tabs/docs/code.mdx
+++ b/packages/react/src/tabs/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="Tabs" />
 
 <ComponentPropsTable name="TabList" />
diff --git a/packages/react/src/tags/docs/code.mdx b/packages/react/src/tags/docs/code.mdx
index fd61f7900354..64c7c6dadbca 100644
--- a/packages/react/src/tags/docs/code.mdx
+++ b/packages/react/src/tags/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Tags" />
diff --git a/packages/react/src/task-list/docs/code.mdx b/packages/react/src/task-list/docs/code.mdx
index 6b27575d5cd5..7b3659f82be9 100644
--- a/packages/react/src/task-list/docs/code.mdx
+++ b/packages/react/src/task-list/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="TaskList" />
diff --git a/packages/react/src/text-input/docs/code.mdx b/packages/react/src/text-input/docs/code.mdx
index 0a9c178399af..734b4d905529 100644
--- a/packages/react/src/text-input/docs/code.mdx
+++ b/packages/react/src/text-input/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="TextInput" />
diff --git a/packages/react/src/text-link/docs/code.mdx b/packages/react/src/text-link/docs/code.mdx
index f5f6848dacab..ea1e4bb21763 100644
--- a/packages/react/src/text-link/docs/code.mdx
+++ b/packages/react/src/text-link/docs/code.mdx
@@ -1,5 +1,3 @@
-## Props
-
 <ComponentPropsTable name="TextLink" />
 
 <ComponentPropsTable name="TextLinkExternal" />
diff --git a/packages/react/src/text/docs/code.mdx b/packages/react/src/text/docs/code.mdx
index fd5a79be8ebf..714271f76b32 100644
--- a/packages/react/src/text/docs/code.mdx
+++ b/packages/react/src/text/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Text" />
diff --git a/packages/react/src/textarea/docs/code.mdx b/packages/react/src/textarea/docs/code.mdx
index 28f7dbbdcfee..1a2725d8dff1 100644
--- a/packages/react/src/textarea/docs/code.mdx
+++ b/packages/react/src/textarea/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="Textarea" />
diff --git a/packages/react/src/time-input/docs/code.mdx b/packages/react/src/time-input/docs/code.mdx
index fa8b310226c2..2b507b7da17d 100644
--- a/packages/react/src/time-input/docs/code.mdx
+++ b/packages/react/src/time-input/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="TimeInput" />
diff --git a/packages/react/src/time-picker/docs/code.mdx b/packages/react/src/time-picker/docs/code.mdx
index 87578bf1b188..4056b2c4b529 100644
--- a/packages/react/src/time-picker/docs/code.mdx
+++ b/packages/react/src/time-picker/docs/code.mdx
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="TimePicker" />
diff --git a/plop-templates/component/docs/code.mdx.hbs b/plop-templates/component/docs/code.mdx.hbs
index dae6b79503b3..86d5c3834606 100644
--- a/plop-templates/component/docs/code.mdx.hbs
+++ b/plop-templates/component/docs/code.mdx.hbs
@@ -1,3 +1 @@
-## Props
-
 <ComponentPropsTable name="{{componentName}}" />