diff --git a/site/src/components/Avatar/AvatarData.tsx b/site/src/components/Avatar/AvatarData.tsx
index 008aaafd27..5eda0e326d 100644
--- a/site/src/components/Avatar/AvatarData.tsx
+++ b/site/src/components/Avatar/AvatarData.tsx
@@ -37,31 +37,17 @@ export const AvatarData: FC<AvatarDataProps> = ({
 	}
 
 	return (
-		<Stack spacing={1} direction="row" className="w-full">
+		<div className="flex items-center w-full gap-3">
 			{avatar}
 
-			<Stack spacing={0} className="w-full">
-				<span
-					css={{
-						color: theme.palette.text.primary,
-						fontWeight: 600,
-					}}
-				>
-					{title}
-				</span>
+			<div className="flex flex-col w-full">
+				<span className="text-sm font-semibold">{title}</span>
 				{subtitle && (
-					<span
-						css={{
-							fontSize: 13,
-							color: theme.palette.text.secondary,
-							lineHeight: 1.5,
-							maxWidth: 540,
-						}}
-					>
+					<span className="text-content-secondary text-xs font-medium">
 						{subtitle}
 					</span>
 				)}
-			</Stack>
-		</Stack>
+			</div>
+		</div>
 	);
 };
diff --git a/site/src/components/Avatar/AvatarDataSkeleton.tsx b/site/src/components/Avatar/AvatarDataSkeleton.tsx
index b360e80611..13083ce8b0 100644
--- a/site/src/components/Avatar/AvatarDataSkeleton.tsx
+++ b/site/src/components/Avatar/AvatarDataSkeleton.tsx
@@ -4,13 +4,13 @@ import type { FC } from "react";
 
 export const AvatarDataSkeleton: FC = () => {
 	return (
-		<Stack spacing={1} direction="row" className="w-full">
-			<Skeleton variant="rectangular" className="size-6 rounded-sm" />
+		<div className="flex items-center gap-3 w-full">
+			<Skeleton variant="rectangular" className="size-10 rounded-sm" />
 
-			<Stack spacing={0}>
+			<div className="flex flex-col w-full">
 				<Skeleton variant="text" width={100} />
 				<Skeleton variant="text" width={60} />
-			</Stack>
-		</Stack>
+			</div>
+		</div>
 	);
 };
diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
index 3d51570f9f..5d2a512980 100644
--- a/site/src/pages/TemplatesPage/TemplatesPageView.tsx
+++ b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
@@ -113,6 +113,7 @@ const TemplateRow: FC<TemplateRowProps> = ({ showOrganizations, template }) => {
 					subtitle={template.description}
 					avatar={
 						<Avatar
+							size="lg"
 							variant="icon"
 							src={template.icon}
 							fallback={template.display_name || template.name}
diff --git a/site/src/pages/WorkspacesPage/WorkspacesTable.tsx b/site/src/pages/WorkspacesPage/WorkspacesTable.tsx
index dc6843af3a..5f6d32614a 100644
--- a/site/src/pages/WorkspacesPage/WorkspacesTable.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspacesTable.tsx
@@ -221,7 +221,7 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({
 											}
 											subtitle={
 												<div>
-													<span css={{ ...visuallyHidden }}>User: </span>
+													<span css={{ ...visuallyHidden }}>Owner: </span>
 													{workspace.owner_name}
 												</div>
 											}
@@ -230,6 +230,7 @@ export const WorkspacesTable: FC<WorkspacesTableProps> = ({
 													variant="icon"
 													src={workspace.template_icon}
 													fallback={workspace.name}
+													size="lg"
 												/>
 											}
 										/>
diff --git a/site/tailwind.config.js b/site/tailwind.config.js
index aa5a338c34..449b07b54d 100644
--- a/site/tailwind.config.js
+++ b/site/tailwind.config.js
@@ -15,7 +15,7 @@ module.exports = {
 			},
 			fontSize: {
 				"2xs": ["0.625rem", "0.875rem"],
-				xs: ["0.75rem", "1.125rem"],
+				xs: ["0.75rem", "1rem"],
 				sm: ["0.875rem", "1.5rem"],
 				"3xl": ["2rem", "2.5rem"],
 			},