Merge branch 'dev' into boards

# Conflicts:
#	pnpm-lock.yaml

src/app/(main)/websites/WebsitesDataTable.tsx

@@ -1,6 +1,8 @@
+import { Icon, Row } from '@umami/react-zen';
 import Link from 'next/link';
 import { DataGrid } from '@/components/common/DataGrid';
 import { useLoginQuery, useNavigation, useUserWebsitesQuery } from '@/components/hooks';
+import { Favicon } from '@/index';
 import { WebsitesTable } from './WebsitesTable';
 
 export function WebsitesDataTable({
@@ -21,7 +23,12 @@ export function WebsitesDataTable({
   const { renderUrl } = useNavigation();
 
   const renderLink = (row: any) => (
-    <Link href={renderUrl(`/websites/${row.id}`, false)}>{row.name}</Link>
+    <Row alignItems="center" gap="3">
+      <Icon size="md" color="muted">
+        <Favicon domain={row.domain} />
+      </Icon>
+      <Link href={renderUrl(`/websites/${row.id}`, false)}>{row.name}</Link>
+    </Row>
   );
 
   return (

src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx

@@ -13,12 +13,18 @@ export function WebsiteHeader({ showActions }: { showActions?: boolean }) {
   const { renderUrl, pathname } = useNavigation();
   const isSettings = pathname.endsWith('/settings');
 
+  const { formatMessage, labels } = useMessages();
+
   if (isSettings) {
     return null;
   }
 
   return (
-    <PageHeader title={website.name} icon={<Favicon domain={website.domain} />} marginBottom="3">
+    <PageHeader
+      title={website.name}
+      icon={<Favicon domain={website.domain} />}
+      titleHref={renderUrl(`/websites/${website.id}`, false)}
+    >
       <Row alignItems="center" gap="6" wrap="wrap">
         <ActiveUsers websiteId={website.id} />
 
@@ -29,7 +35,7 @@ export function WebsiteHeader({ showActions }: { showActions?: boolean }) {
               <Icon>
                 <Edit />
               </Icon>
-              <Text>Edit</Text>
+              <Text>{formatMessage(labels.edit)}</Text>
             </LinkButton>
           </Row>
         )}