diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
index c5165e20a..b179d160c 100644
--- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx
+++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx
@@ -87,7 +87,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
       <PageHeader outlined={false}>
         <Box grow="Yes" gap="200">
           <Box grow="Yes" alignItems="Center" gap="200">
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               Developer Tools
             </Text>
           </Box>
diff --git a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
index c5250c5c4..e8efd2439 100644
--- a/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
+++ b/src/app/features/common-settings/emojis-stickers/EmojisStickers.tsx
@@ -24,7 +24,7 @@ export function EmojisStickers({ requestClose }: EmojisStickersProps) {
       <PageHeader outlined={false}>
         <Box grow="Yes" gap="200">
           <Box grow="Yes" alignItems="Center" gap="200">
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               Emojis & Stickers
             </Text>
           </Box>
diff --git a/src/app/features/common-settings/members/Members.tsx b/src/app/features/common-settings/members/Members.tsx
index 9bb2a8f18..15dca312f 100644
--- a/src/app/features/common-settings/members/Members.tsx
+++ b/src/app/features/common-settings/members/Members.tsx
@@ -156,7 +156,7 @@ export function Members({ requestClose }: MembersProps) {
       <PageHeader outlined={false}>
         <Box grow="Yes" gap="200">
           <Box grow="Yes" alignItems="Center" gap="200">
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               {room.getJoinedMemberCount()} Members
             </Text>
           </Box>
diff --git a/src/app/features/create-room/CreateRoomModal.tsx b/src/app/features/create-room/CreateRoomModal.tsx
index 4dd215e6a..c175dd6cc 100644
--- a/src/app/features/create-room/CreateRoomModal.tsx
+++ b/src/app/features/create-room/CreateRoomModal.tsx
@@ -58,7 +58,7 @@ function CreateRoomModal({ state }: CreateRoomModalProps) {
                   }}
                 >
                   <Box grow="Yes">
-                    <Text size="H4">
+                    <Text as="h2" size="H4">
                       {type === CreateRoomType.VoiceRoom ? 'New Voice Room' : 'New Chat Room'}
                     </Text>
                   </Box>
diff --git a/src/app/features/create-space/CreateSpaceModal.tsx b/src/app/features/create-space/CreateSpaceModal.tsx
index 10a26a9de..a93b09658 100644
--- a/src/app/features/create-space/CreateSpaceModal.tsx
+++ b/src/app/features/create-space/CreateSpaceModal.tsx
@@ -58,7 +58,7 @@ function CreateSpaceModal({ state }: CreateSpaceModalProps) {
                   }}
                 >
                   <Box grow="Yes">
-                    <Text size="H4">New Space</Text>
+                    <Text as="h2" size="H4">New Space</Text>
                   </Box>
                   <Box shrink="No">
                     <IconButton size="300" radii="300" onClick={closeDialog} aria-label="Close">
diff --git a/src/app/features/room-settings/general/General.tsx b/src/app/features/room-settings/general/General.tsx
index 62916bc41..b9f89519f 100644
--- a/src/app/features/room-settings/general/General.tsx
+++ b/src/app/features/room-settings/general/General.tsx
@@ -30,7 +30,7 @@ export function General({ requestClose }: GeneralProps) {
       <PageHeader outlined={false}>
         <Box grow="Yes" gap="200">
           <Box grow="Yes" alignItems="Center" gap="200">
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               General
             </Text>
           </Box>
diff --git a/src/app/features/room-settings/permissions/Permissions.tsx b/src/app/features/room-settings/permissions/Permissions.tsx
index 83c75791c..d5be03173 100644
--- a/src/app/features/room-settings/permissions/Permissions.tsx
+++ b/src/app/features/room-settings/permissions/Permissions.tsx
@@ -40,7 +40,7 @@ export function Permissions({ requestClose }: PermissionsProps) {
       <PageHeader outlined={false}>
         <Box grow="Yes" gap="200">
           <Box grow="Yes" alignItems="Center" gap="200">
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               Permissions
             </Text>
           </Box>
diff --git a/src/app/features/space-settings/general/General.tsx b/src/app/features/space-settings/general/General.tsx
index 934858a80..e4c763b43 100644
--- a/src/app/features/space-settings/general/General.tsx
+++ b/src/app/features/space-settings/general/General.tsx
@@ -28,7 +28,7 @@ export function General({ requestClose }: GeneralProps) {
       <PageHeader outlined={false}>
         <Box grow="Yes" gap="200">
           <Box grow="Yes" alignItems="Center" gap="200">
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               General
             </Text>
           </Box>
diff --git a/src/app/features/space-settings/permissions/Permissions.tsx b/src/app/features/space-settings/permissions/Permissions.tsx
index 83c75791c..d5be03173 100644
--- a/src/app/features/space-settings/permissions/Permissions.tsx
+++ b/src/app/features/space-settings/permissions/Permissions.tsx
@@ -40,7 +40,7 @@ export function Permissions({ requestClose }: PermissionsProps) {
       <PageHeader outlined={false}>
         <Box grow="Yes" gap="200">
           <Box grow="Yes" alignItems="Center" gap="200">
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               Permissions
             </Text>
           </Box>
diff --git a/src/app/pages/auth/AuthLayout.tsx b/src/app/pages/auth/AuthLayout.tsx
index 0d71eca5a..050902562 100644
--- a/src/app/pages/auth/AuthLayout.tsx
+++ b/src/app/pages/auth/AuthLayout.tsx
@@ -135,7 +135,7 @@ export function AuthLayout() {
           <Header className={css.AuthHeader} size="600" variant="Surface">
             <Box grow="Yes" direction="Row" gap="300" alignItems="Center">
               <img className={css.AuthLogo} src={LotusLogo} alt="Lotus Chat Logo" />
-              <Text size="H3">Lotus Chat</Text>
+              <Text as="h1" size="H3">Lotus Chat</Text>
             </Box>
           </Header>
           <Box className={css.AuthCardContent} direction="Column">
diff --git a/src/app/pages/auth/register/Register.tsx b/src/app/pages/auth/register/Register.tsx
index 7176489ba..0e0c86e30 100644
--- a/src/app/pages/auth/register/Register.tsx
+++ b/src/app/pages/auth/register/Register.tsx
@@ -35,7 +35,7 @@ export function Register() {
 
   return (
     <Box direction="Column" gap="500">
-      <Text size="H2" priority="400">
+      <Text as="h2" size="H2" priority="400">
         Register
       </Text>
       {registerFlows.status === RegisterFlowStatus.RegistrationDisabled && !sso && (
diff --git a/src/app/pages/auth/reset-password/ResetPassword.tsx b/src/app/pages/auth/reset-password/ResetPassword.tsx
index c5e1d2ad3..4f9aef029 100644
--- a/src/app/pages/auth/reset-password/ResetPassword.tsx
+++ b/src/app/pages/auth/reset-password/ResetPassword.tsx
@@ -23,7 +23,7 @@ export function ResetPassword() {
 
   return (
     <Box direction="Column" gap="500">
-      <Text size="H2" priority="400">
+      <Text as="h2" size="H2" priority="400">
         Reset Password
       </Text>
       <PasswordResetForm defaultEmail={resetPasswordSearchParams.email} />
diff --git a/src/app/pages/client/explore/Explore.tsx b/src/app/pages/client/explore/Explore.tsx
index 24036be0c..ed402fb4e 100644
--- a/src/app/pages/client/explore/Explore.tsx
+++ b/src/app/pages/client/explore/Explore.tsx
@@ -94,7 +94,7 @@ export function AddServer() {
                 size="500"
               >
                 <Box grow="Yes">
-                  <Text size="H4">Add Server</Text>
+                  <Text as="h2" size="H4">Add Server</Text>
                 </Box>
                 <IconButton size="300" onClick={() => setDialog(false)} radii="300" aria-label="Close">
                   <Icon src={Icons.Cross} />
diff --git a/src/app/pages/client/explore/Featured.tsx b/src/app/pages/client/explore/Featured.tsx
index b47fef4c6..6b729cb4a 100644
--- a/src/app/pages/client/explore/Featured.tsx
+++ b/src/app/pages/client/explore/Featured.tsx
@@ -56,7 +56,7 @@ export function FeaturedRooms() {
                 <Box direction="Column" gap="700">
                   {spaces && spaces.length > 0 && (
                     <Box direction="Column" gap="400">
-                      <Text size="H4">Featured Spaces</Text>
+                      <Text as="h2" size="H4">Featured Spaces</Text>
                       <RoomCardGrid>
                         {spaces.map((roomIdOrAlias) => (
                           <RoomSummaryLoader key={roomIdOrAlias} roomIdOrAlias={roomIdOrAlias}>
@@ -85,7 +85,7 @@ export function FeaturedRooms() {
                   )}
                   {rooms && rooms.length > 0 && (
                     <Box direction="Column" gap="400">
-                      <Text size="H4">Featured Rooms</Text>
+                      <Text as="h3" size="H4">Featured Rooms</Text>
                       <RoomCardGrid>
                         {rooms.map((roomIdOrAlias) => (
                           <RoomSummaryLoader key={roomIdOrAlias} roomIdOrAlias={roomIdOrAlias}>
diff --git a/src/app/pages/client/explore/Server.tsx b/src/app/pages/client/explore/Server.tsx
index eea6f3e1e..9eefd20b3 100644
--- a/src/app/pages/client/explore/Server.tsx
+++ b/src/app/pages/client/explore/Server.tsx
@@ -489,7 +489,7 @@ export function PublicRooms() {
 
             <Box grow="No" justifyContent="Center" alignItems="Center" gap="200">
               {screenSize !== ScreenSize.Mobile && <Icon size="400" src={Icons.Search} />}
-              <Text size="H3" truncate>
+              <Text as="h2" size="H3" truncate>
                 Search
               </Text>
             </Box>
@@ -510,7 +510,7 @@ export function PublicRooms() {
             </Box>
             <Box grow="Yes" justifyContent="Center" alignItems="Center" gap="200">
               {screenSize !== ScreenSize.Mobile && <Icon size="400" src={Icons.Server} />}
-              <Text size="H3" truncate>
+              <Text as="h2" size="H3" truncate>
                 {server}
               </Text>
             </Box>
@@ -534,9 +534,9 @@ export function PublicRooms() {
                 <Box direction="Column" gap="400">
                   <Box direction="Column" gap="300">
                     {isSearch ? (
-                      <Text size="H4">{`Results for "${serverSearchParams.term}"`}</Text>
+                      <Text as="h3" size="H4">{`Results for "${serverSearchParams.term}"`}</Text>
                     ) : (
-                      <Text size="H4">Popular Communities</Text>
+                      <Text as="h3" size="H4">Popular Communities</Text>
                     )}
                     <Box gap="200">
                       {roomTypeFilters.map((filter) => (
diff --git a/src/app/pages/client/home/Search.tsx b/src/app/pages/client/home/Search.tsx
index e76e9d537..45bc6853f 100644
--- a/src/app/pages/client/home/Search.tsx
+++ b/src/app/pages/client/home/Search.tsx
@@ -28,7 +28,7 @@ export function HomeSearch() {
           </Box>
           <Box justifyContent="Center" alignItems="Center" gap="200">
             {screenSize !== ScreenSize.Mobile && <Icon size="400" src={Icons.Search} />}
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               Message Search
             </Text>
           </Box>
diff --git a/src/app/pages/client/inbox/Invites.tsx b/src/app/pages/client/inbox/Invites.tsx
index 5e87b28a1..5aef45ebb 100644
--- a/src/app/pages/client/inbox/Invites.tsx
+++ b/src/app/pages/client/inbox/Invites.tsx
@@ -429,7 +429,7 @@ function KnownInvites({
 }: KnownInvitesProps) {
   return (
     <Box direction="Column" gap="200">
-      <Text size="H4">Primary</Text>
+      <Text as="h3" size="H4">Primary</Text>
       {invites.length > 0 ? (
         <Box direction="Column" gap="100">
           {invites.map((invite) => (
@@ -488,7 +488,7 @@ function UnknownInvites({
   return (
     <Box direction="Column" gap="200">
       <Box gap="200" justifyContent="SpaceBetween" alignItems="Center">
-        <Text size="H4">Public</Text>
+        <Text as="h3" size="H4">Public</Text>
         <Box>
           {invites.length > 0 && (
             <Chip
@@ -585,7 +585,7 @@ function SpamInvites({
 
   return (
     <Box direction="Column" gap="200">
-      <Text size="H4">Spam</Text>
+      <Text as="h3" size="H4">Spam</Text>
       {invites.length > 0 ? (
         <Box direction="Column" gap="100">
           <SequenceCard
@@ -762,7 +762,7 @@ export function Invites() {
           </Box>
           <Box alignItems="Center" gap="200">
             {screenSize !== ScreenSize.Mobile && <Icon size="400" src={Icons.Mail} />}
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               Invites
             </Text>
           </Box>
diff --git a/src/app/pages/client/inbox/Notifications.tsx b/src/app/pages/client/inbox/Notifications.tsx
index 7e999ed68..e39a462af 100644
--- a/src/app/pages/client/inbox/Notifications.tsx
+++ b/src/app/pages/client/inbox/Notifications.tsx
@@ -651,7 +651,7 @@ export function Notifications() {
           </Box>
           <Box alignItems="Center" gap="200">
             {screenSize !== ScreenSize.Mobile && <Icon size="400" src={Icons.Message} />}
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               Notification Messages
             </Text>
           </Box>
diff --git a/src/app/pages/client/space/Search.tsx b/src/app/pages/client/space/Search.tsx
index 12ceddad5..b5f7d0061 100644
--- a/src/app/pages/client/space/Search.tsx
+++ b/src/app/pages/client/space/Search.tsx
@@ -43,7 +43,7 @@ export function SpaceSearch() {
           </Box>
           <Box justifyContent="Center" alignItems="Center" gap="200">
             {screenSize !== ScreenSize.Mobile && <Icon size="400" src={Icons.Search} />}
-            <Text size="H3" truncate>
+            <Text as="h2" size="H3" truncate>
               Message Search
             </Text>
           </Box>