diff --git a/src/css/common/_upsell.scss b/src/css/common/_upsell.scss
index 0cbb16cb..fc95667a 100644
--- a/src/css/common/_upsell.scss
+++ b/src/css/common/_upsell.scss
@@ -76,9 +76,6 @@
 	p {
 		margin-block: 0;
 		margin-inline: 2em;
-	}
-
-	h1 + p {
 		font-size: 16px;
 	}
 
@@ -86,11 +83,6 @@
 		inline-size: 82px;
 	}
 
-	h2 {
-		text-transform: uppercase;
-		font-size: 12px;
-	}
-
 	ul {
 		display: grid;
 		inline-size: 100%;
diff --git a/src/css/edit.scss b/src/css/edit.scss
index a99b100e..c08c4689 100644
--- a/src/css/edit.scss
+++ b/src/css/edit.scss
@@ -91,6 +91,14 @@
 	}
 }
 
+.wrap > h2:first-of-type {
+	font-size: 1.5rem;
+	font-weight: 400;
+	line-height: 1.3;
+	padding: 0;
+	margin-block: 50px 1rem;
+}
+
 .snippet-name-wrapper {
 	display: flex;
 	gap: 0.5em;
diff --git a/src/css/manage.scss b/src/css/manage.scss
index 6ad811ac..59fb45b7 100644
--- a/src/css/manage.scss
+++ b/src/css/manage.scss
@@ -34,25 +34,12 @@
 	margin-inline: 0;
 }
 
-.snippets-table-heading {
-	display: flex;
-	align-items: center;
-	margin-block: 50px 1.4rem;
-
-	h1 {
-		font-size: 1.6rem;
-		padding: 0;
-	}
-
-	.button-primary {
-		margin-inline-start: auto;
-	}
-}
-
-.wrap > h1:first-of-type {
-	font-size: 1.6rem;
+.wrap > h2:first-of-type {
+	font-size: 1.5rem;
+	font-weight: 400;
+	line-height: 1.3;
 	padding: 0;
-	margin-block: 50px 1.4rem;
+	margin-block: 50px 1rem;
 
 	.subtitle {
 		vertical-align: middle;
diff --git a/src/css/settings.scss b/src/css/settings.scss
index 7bb8e3cd..54b451ec 100644
--- a/src/css/settings.scss
+++ b/src/css/settings.scss
@@ -3,6 +3,14 @@
 
 $sections: general, editor, debug, version-switch;
 
+.wrap > h2:first-of-type {
+	font-size: 1.5rem;
+	font-weight: 400;
+	line-height: 1.3;
+	padding: 0;
+	margin-block: 50px 1rem;
+}
+
 p.submit {
 	display: flex;
 	justify-content: space-between;
diff --git a/src/css/welcome.scss b/src/css/welcome.scss
index 5943e561..ca4eebcc 100644
--- a/src/css/welcome.scss
+++ b/src/css/welcome.scss
@@ -6,11 +6,12 @@
 $breakpoint: 1060px;
 
 .code-snippets-welcome {
-	padding: 25px;
-
 	h2 {
-		font-size: 32px;
-		margin-block: 48px 32px;
+		font-size: 1.5rem;
+		font-weight: 500;
+		line-height: 1.3;
+		padding: 0;
+		margin-block: 50px 1rem;
 	}
 }
 
@@ -176,15 +177,6 @@ $breakpoint: 1060px;
 		margin: 1em 0;
 	}
 
-	h5 {
-		font-size: 12px;
-		text-transform: uppercase;
-		margin: 0 0 16px;
-		display: flex;
-		gap: 5px;
-		align-items: center;
-	}
-
 	ul {
 		margin-block-start: 5px;
 	}
diff --git a/src/js/components/ManageMenu/CommunityCloud/CommunityCloud.tsx b/src/js/components/ManageMenu/CommunityCloud/CommunityCloud.tsx
index 8bd9f4ca..c6109564 100644
--- a/src/js/components/ManageMenu/CommunityCloud/CommunityCloud.tsx
+++ b/src/js/components/ManageMenu/CommunityCloud/CommunityCloud.tsx
@@ -24,7 +24,7 @@ export const CommunityCloud = () => {
 
 	return (
 		<div className="wrap">
-			<h1>{__('Community Cloud', 'code-snippets')}</h1>
+			<h2>{__('Community Cloud', 'code-snippets')}</h2>
 
 			<nav
 				className="nav-tab-wrapper"
diff --git a/src/js/components/ManageMenu/SnippetsTable/SnippetsTable.tsx b/src/js/components/ManageMenu/SnippetsTable/SnippetsTable.tsx
index 614ca07d..5d69f4ee 100644
--- a/src/js/components/ManageMenu/SnippetsTable/SnippetsTable.tsx
+++ b/src/js/components/ManageMenu/SnippetsTable/SnippetsTable.tsx
@@ -61,7 +61,7 @@ const PageHeading = () => {
 				{__('Create new snippet', 'code-snippets')}
 			</a>
 
-			<h1>
+			<h2>
 				{__('Manage Code Snippets', 'code-snippets')}
 
 				{searchQueryText || currentTag
@@ -86,7 +86,7 @@ const PageHeading = () => {
 						</Button>
 					</span>
 					: null}
-			</h1>
+			</h2>
 
 			<SafeModeNotice />
 		</>
diff --git a/src/js/components/common/UpsellDialog.tsx b/src/js/components/common/UpsellDialog.tsx
index 84fd2c43..d699f047 100644
--- a/src/js/components/common/UpsellDialog.tsx
+++ b/src/js/components/common/UpsellDialog.tsx
@@ -45,7 +45,7 @@ export const UpsellDialog: React.FC<UpsellDialogProps> = ({ isOpen, setIsOpen })
 				{__('Explore Code Snippets Pro', 'code-snippets')}
 			</a>
 
-			<h2>{__("Here's what else you get with Pro:", 'code-snippets')}</h2>
+			<p>{__("Here's what else you get with Pro:", 'code-snippets')}</p>
 			<ul>
 				<li>{__('Create, explain and verify snippets with AI', 'code-snippets')}</li>
 				<li>{__('Control when snippets run with Conditions', 'code-snippets')}</li>
diff --git a/src/php/Admin/Menus/Settings_Menu.php b/src/php/Admin/Menus/Settings_Menu.php
index 60929b8e..2981107d 100644
--- a/src/php/Admin/Menus/Settings_Menu.php
+++ b/src/php/Admin/Menus/Settings_Menu.php
@@ -199,7 +199,7 @@ public function render() {
 
 		?>
 		<div class="code-snippets-settings wrap" data-active-tab="<?php echo esc_attr( $current_section ); ?>">
-			<h1>
+			<h2>
 				<?php
 				esc_html_e( 'Settings', 'code-snippets' );
 
@@ -219,7 +219,7 @@ public function render() {
 					}
 				}
 				?>
-			</h1>
+			</h2>
 
 			<?php settings_errors( OPTION_NAME ); ?>
 
@@ -275,7 +275,7 @@ protected function do_settings_tabs() {
 
 			if ( $section['title'] ) {
 				printf(
-					'<h2 id="%s-settings" class="settings-section-title">%s</h2>' . "\n",
+					'<h3 id="%s-settings" class="settings-section-title">%s</h3>' . "\n",
 					esc_attr( $section['id'] ),
 					esc_html( $section['title'] )
 				);