diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte
index dce36d66f..cfe3e61bc 100644
--- a/src/lib/layout/activity.svelte
+++ b/src/lib/layout/activity.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { AvatarInitials, PaginationWithLimit, Trim } from '$lib/components';
     import { Container } from '$lib/layout';
-    import { toLocaleDateTime } from '$lib/helpers/date';
+    import DualTimeView from '$lib/components/dualTimeView.svelte';
     import type { Models } from '@appwrite.io/console';
     import { Layout, Table, Card, Empty } from '@appwrite.io/pink-svelte';
     import Button from '$lib/elements/forms/button.svelte';
@@ -72,7 +72,7 @@
                             {log.ip}
                         </Table.Cell>
                         <Table.Cell column="date" {root}>
-                            {toLocaleDateTime(log.time)}
+                            <DualTimeView time={log.time} showDatetime={true} />
                         </Table.Cell>
                     </Table.Row.Base>
                 {/each}
diff --git a/src/routes/(console)/account/identities.svelte b/src/routes/(console)/account/identities.svelte
index 924d22621..e95ce962a 100644
--- a/src/routes/(console)/account/identities.svelte
+++ b/src/routes/(console)/account/identities.svelte
@@ -5,7 +5,6 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { identities } from './store';
-    import { toLocaleDateTime } from '$lib/helpers/date';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { oAuthProviders } from '$lib/stores/oauth-providers';
@@ -82,7 +81,13 @@
                             <DualTimeView time={identity.$createdAt} />
                         </Table.Cell>
                         <Table.Cell column="expiryDate" {root}>
-                            {toLocaleDateTime(identity.providerAccessTokenExpiry)}
+                            {#if identity.providerAccessTokenExpiry}
+                                <DualTimeView
+                                    time={identity.providerAccessTokenExpiry}
+                                    showDatetime={true} />
+                            {:else}
+                                -
+                            {/if}
                         </Table.Cell>
                         <Table.Cell column="actions" {root}>
                             <Button text on:click={() => deleteIdentity(identity.$id)}>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/table.svelte
index 10ec6f307..9abf7f252 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/table.svelte
@@ -2,7 +2,7 @@
     import { base } from '$app/paths';
     import { page } from '$app/state';
     import { Id } from '$lib/components';
-    import { toLocaleDateTime } from '$lib/helpers/date';
+    import DualTimeView from '$lib/components/dualTimeView.svelte';
     import { columns } from './store';
     import { IconExclamation } from '@appwrite.io/pink-icons-svelte';
     import { Layout, Tooltip, Table, Icon } from '@appwrite.io/pink-svelte';
@@ -72,8 +72,10 @@
                                 {`Last backup: ${lastBackup}`}
                             </span>
                         </Tooltip>
+                    {:else if column.type === 'datetime'}
+                        <DualTimeView time={database[column.id]} showDatetime={true} />
                     {:else}
-                        {toLocaleDateTime(database[column.id])}
+                        {database[column.id]}
                     {/if}
                 </Table.Cell>
             {/each}
diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
index 4ee496dec..d62752a45 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
@@ -2,7 +2,7 @@
     import { base } from '$app/paths';
     import { page } from '$app/state';
     import { Empty, Id } from '$lib/components';
-    import { toLocaleDateTime } from '$lib/helpers/date';
+    import DualTimeView from '$lib/components/dualTimeView.svelte';
     import { Container } from '$lib/layout';
     import { Button } from '$lib/elements/forms';
     import type { PageData } from './$types';
@@ -58,7 +58,11 @@
                             {:else if column.id === 'events'}
                                 {webhook.events.length}
                             {:else if column.type === 'datetime'}
-                                {webhook[column.id] ? toLocaleDateTime(webhook[column.id]) : '-'}
+                                {#if webhook[column.id]}
+                                    <DualTimeView time={webhook[column.id]} showDatetime={true} />
+                                {:else}
+                                    -
+                                {/if}
                             {:else if column.id === 'enabled'}
                                 <Layout.Stack direction="row" gap="s" alignItems="normal">
                                     <Status
diff --git a/src/routes/(console)/project-[region]-[project]/sites/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/table.svelte
index 680c82d38..3f98cf22b 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/table.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { base } from '$app/paths';
     import { page } from '$app/state';
-    import { timeFromNow, toLocaleDateTime } from '$lib/helpers/date';
+    import { timeFromNow } from '$lib/helpers/date';
     import { Avatar, Icon, Layout, Popover, Table, Typography } from '@appwrite.io/pink-svelte';
     import { columns } from './store';
     import type { Models } from '@appwrite.io/console';
@@ -80,7 +80,7 @@
                                 time={site?.latestDeploymentCreatedAt ?? site.$createdAt} />
                         {/if}
                     {:else if column.id === '$createdAt'}
-                        {toLocaleDateTime(site[column.id])}
+                        <DualTimeView time={site[column.id]} showDatetime={true} />
                     {/if}
                 </Table.Cell>
             {/each}
diff --git a/src/routes/(console)/project-[region]-[project]/storage/table.svelte b/src/routes/(console)/project-[region]-[project]/storage/table.svelte
index accff4d00..bf31c4852 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/table.svelte
@@ -2,7 +2,7 @@
     import { base } from '$app/paths';
     import { page } from '$app/state';
     import { Id } from '$lib/components';
-    import { toLocaleDateTime } from '$lib/helpers/date';
+    import DualTimeView from '$lib/components/dualTimeView.svelte';
     import type { PageData } from './$types';
     import { columns } from './store';
     import { Table } from '@appwrite.io/pink-svelte';
@@ -30,8 +30,10 @@
                         {/key}
                     {:else if column.id === 'name'}
                         {bucket.name}
+                    {:else if column.type === 'datetime'}
+                        <DualTimeView time={bucket[column.id]} showDatetime={true} />
                     {:else}
-                        {toLocaleDateTime(bucket[column.id])}
+                        {bucket[column.id]}
                     {/if}
                 </Table.Cell>
             {/each}