diff --git a/src/routes/(console)/organization-[organization]/domains/+page.svelte b/src/routes/(console)/organization-[organization]/domains/+page.svelte
index a4b6699d9..04c0d6add 100644
--- a/src/routes/(console)/organization-[organization]/domains/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/+page.svelte
@@ -15,6 +15,7 @@
     } from '@appwrite.io/pink-icons-svelte';
     import {
         ActionMenu,
+        Badge,
         Card,
         Empty,
         Icon,
@@ -76,13 +77,30 @@
                         <Table.Cell column={column.id} {root}>
                             <Typography.Text truncate>
                                 {#if column.id === 'domain'}
-                                    <Link
-                                        external
-                                        icon
-                                        href={`${$protocol}${domain.domain}`}
-                                        variant="quiet">
-                                        {domain.domain}
-                                    </Link>
+                                    <Layout.Stack direction="row" gap="none">
+                                        <Link
+                                            external
+                                            href={`${$protocol}${domain.domain}`}
+                                            variant="quiet"
+                                            icon>
+                                            <Typography.Text truncate>
+                                                {domain.domain}
+                                            </Typography.Text>
+                                        </Link>
+                                        {#if domain.status === 'verifying'}
+                                            <Badge
+                                                variant="secondary"
+                                                type="warning"
+                                                content="Verifying"
+                                                size="s" />
+                                        {:else if domain.status !== 'verified'}
+                                            <Badge
+                                                variant="secondary"
+                                                type="error"
+                                                content="Verification failed"
+                                                size="s" />
+                                        {/if}
+                                    </Layout.Stack>
                                 {:else if column.id === 'registrar'}
                                     {domain.registrar || '-'}
                                 {:else if column.id === 'nameservers'}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
index 4fe75d81a..0619e44e9 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
@@ -43,18 +43,30 @@
             {#each $columns as column}
                 <Table.Cell column={column.id} {root}>
                     {#if column.id === 'domain'}
-                        <Link external href={`${$protocol}${domain.domain}`} variant="quiet" icon>
-                            <Typography.Text truncate>
-                                {domain.domain}
-                                {#if domain.status !== 'verified'}
-                                    <Badge
-                                        variant="secondary"
-                                        type="error"
-                                        content="Verification failed"
-                                        size="s" />
-                                {/if}
-                            </Typography.Text>
-                        </Link>
+                        <Layout.Stack direction="row" gap="none">
+                            <Link
+                                external
+                                href={`${$protocol}${domain.domain}`}
+                                variant="quiet"
+                                icon>
+                                <Typography.Text truncate>
+                                    {domain.domain}
+                                </Typography.Text>
+                            </Link>
+                            {#if domain.status === 'verifying'}
+                                <Badge
+                                    variant="secondary"
+                                    type="warning"
+                                    content="Verifying"
+                                    size="s" />
+                            {:else if domain.status !== 'verified'}
+                                <Badge
+                                    variant="secondary"
+                                    type="error"
+                                    content="Verification failed"
+                                    size="s" />
+                            {/if}
+                        </Layout.Stack>
                     {:else if column.id === 'target'}
                         {domain?.redirectUrl
                             ? 'Redirect to ' + domain.redirectUrl
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte
index 8529c72dc..464f6510c 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte
@@ -43,18 +43,30 @@
             {#each $columns as column}
                 <Table.Cell column={column.id} {root}>
                     {#if column.id === 'domain'}
-                        <Link external href={`${$protocol}${domain.domain}`} variant="quiet" icon>
-                            <Typography.Text truncate>
-                                {domain.domain}
-                                {#if domain.status !== 'verified'}
-                                    <Badge
-                                        variant="secondary"
-                                        type="error"
-                                        content="Verification failed"
-                                        size="s" />
-                                {/if}
-                            </Typography.Text>
-                        </Link>
+                        <Layout.Stack direction="row" gap="none">
+                            <Link
+                                external
+                                href={`${$protocol}${domain.domain}`}
+                                variant="quiet"
+                                icon>
+                                <Typography.Text truncate>
+                                    {domain.domain}
+                                </Typography.Text>
+                            </Link>
+                            {#if domain.status === 'verifying'}
+                                <Badge
+                                    variant="secondary"
+                                    type="warning"
+                                    content="Verifying"
+                                    size="s" />
+                            {:else if domain.status !== 'verified'}
+                                <Badge
+                                    variant="secondary"
+                                    type="error"
+                                    content="Verification failed"
+                                    size="s" />
+                            {/if}
+                        </Layout.Stack>
                     {/if}
                 </Table.Cell>
             {/each}
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
index 0f80c03e9..2304487a8 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
@@ -43,24 +43,31 @@
             {#each $columns as column}
                 <Table.Cell column={column.id} {root}>
                     {#if column.id === 'domain'}
-                        <Link external href={`${$protocol}${domain.domain}`} variant="quiet" icon>
-                            <Typography.Text truncate>
-                                {domain.domain}
-                                {#if domain.status === 'verifying'}
-                                    <Badge
-                                        variant="secondary"
-                                        type="warning"
-                                        content="Verifying"
-                                        size="s" />
-                                {:else if domain.status !== 'verified'}
-                                    <Badge
-                                        variant="secondary"
-                                        type="error"
-                                        content="Verification failed"
-                                        size="s" />
-                                {/if}
-                            </Typography.Text>
-                        </Link>
+                        <Layout.Stack direction="row" gap="none">
+                            <Link
+                                external
+                                href={`${$protocol}${domain.domain}`}
+                                variant="quiet"
+                                icon>
+                                <Typography.Text truncate>
+                                    {domain.domain}
+                                </Typography.Text>
+                            </Link>
+
+                            {#if domain.status === 'verifying'}
+                                <Badge
+                                    variant="secondary"
+                                    type="warning"
+                                    content="Verifying"
+                                    size="s" />
+                            {:else if domain.status !== 'verified'}
+                                <Badge
+                                    variant="secondary"
+                                    type="error"
+                                    content="Verification failed"
+                                    size="s" />
+                            {/if}
+                        </Layout.Stack>
                     {:else if column.id === 'target'}
                         {domain?.redirectUrl
                             ? 'Redirect to ' + domain.redirectUrl