diff --git a/src/lib/components/imagePreview.svelte b/src/lib/components/imagePreview.svelte
index 1c5f3cfdf8..e377b07390 100644
--- a/src/lib/components/imagePreview.svelte
+++ b/src/lib/components/imagePreview.svelte
@@ -12,6 +12,8 @@
     style="inline-size: 100%; block-size: 100%;"
     target="_blank"
     rel="noopener noreferrer"
+    on:click|stopPropagation
+    on:mousedown|stopPropagation
     aria-label="open file in new window">
     <div class="file-preview-image">
         <img src={$app.themeInUse === 'dark' ? darkSrc : lightSrc} {alt} />
diff --git a/src/lib/elements/forms/helper.svelte b/src/lib/elements/forms/helper.svelte
index 99e580c8d8..76ac8cab5c 100644
--- a/src/lib/elements/forms/helper.svelte
+++ b/src/lib/elements/forms/helper.svelte
@@ -5,7 +5,7 @@
 </script>
 
 <p
-    class="helper u-margin-block-start-8 {classes}"
+    class="helper u-margin-block-start-6 {classes}"
     class:u-color-text-info={type === 'info'}
     class:u-color-text-danger={type === 'error'}
     class:u-color-text-success={type === 'success'}
diff --git a/src/lib/layout/responsiveContainerHeader.svelte b/src/lib/layout/responsiveContainerHeader.svelte
index 29eed0f56c..98e10321b8 100644
--- a/src/lib/layout/responsiveContainerHeader.svelte
+++ b/src/lib/layout/responsiveContainerHeader.svelte
@@ -1,6 +1,11 @@
 <script lang="ts">
     import { SearchQuery, ViewSelector } from '$lib/components';
-    import { FiltersBottomSheet, ParsedTagList, queryParamToMap } from '$lib/components/filters';
+    import {
+        FiltersBottomSheet,
+        ParsedTagList,
+        queryParamToMap,
+        Filters
+    } from '$lib/components/filters';
     import QuickFilters from '$lib/components/filters/quickFilters.svelte';
     import Button from '$lib/elements/forms/button.svelte';
     import { View } from '$lib/helpers/load';
@@ -23,6 +28,7 @@
         hasSearch = false,
         searchPlaceholder = 'Search by ID',
         hasFilters = false,
+        hasCustomFiltersOnly = false,
         analyticsSource = '',
         children
     }: {
@@ -33,6 +39,7 @@
         hasSearch?: boolean;
         searchPlaceholder?: string;
         hasFilters?: boolean;
+        hasCustomFiltersOnly?: boolean;
         analyticsSource?: string;
         children?: Snippet;
     } = $props();
@@ -109,7 +116,11 @@
                 </Layout.Stack>
                 <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
                     {#if hasFilters && $columns?.length}
-                        <QuickFilters {columns} {analyticsSource} {filterCols} />
+                        {#if hasCustomFiltersOnly}
+                            <Filters query="[]" {columns} {analyticsSource} />
+                        {:else}
+                            <QuickFilters {columns} {analyticsSource} {filterCols} />
+                        {/if}
                     {/if}
                     {#if hasDisplaySettings}
                         <ViewSelector ui="new" {view} {columns} {hideView} {hideColumns} />
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/createMessageDropdown.svelte b/src/routes/(console)/project-[region]-[project]/messaging/createMessageDropdown.svelte
index e91f92669d..49e018a16f 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/createMessageDropdown.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/createMessageDropdown.svelte
@@ -7,7 +7,7 @@
     import { page } from '$app/state';
 </script>
 
-<Popover let:toggle padding="none" placement="bottom-start">
+<Popover let:toggle padding="none" placement="bottom-end">
     <slot {toggle}>
         <Button on:click={toggle} event="create_message">
             <Icon icon={IconPlus} slot="start" size="s" />
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTargets.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTargets.svelte
index 7a851da483..5ec9d511e6 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTargets.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTargets.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { MessagingProviderType, type Models } from '@appwrite.io/console';
-    import { CardGrid, Empty, PaginationInline, EmptySearch } from '$lib/components';
+    import { CardGrid, Empty, PaginationInline } from '$lib/components';
     import { onMount } from 'svelte';
     import { sdk } from '$lib/stores/sdk';
     import { invalidate } from '$app/navigation';
@@ -12,8 +12,17 @@
     import UserTargetsModal from '../userTargetsModal.svelte';
     import { isValueOfStringEnum } from '$lib/helpers/types';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
-    import { Alert, Icon, Layout, Table, Typography } from '@appwrite.io/pink-svelte';
+    import {
+        Alert,
+        Card,
+        Empty as PinkEmpty,
+        Icon,
+        Layout,
+        Table,
+        Typography
+    } from '@appwrite.io/pink-svelte';
     import { page } from '$app/state';
+    import { Link } from '$lib/elements';
 
     export let message: Models.Message & { data: Record<string, unknown> };
     export let selectedTargetsById: Record<string, Models.Target>;
@@ -207,17 +216,17 @@
             {:else if isDraft}
                 <Empty on:click={() => (showTargets = true)}>Add a target</Empty>
             {:else if !sum && !hasDeletedUsers}
-                <EmptySearch hidePagination>
-                    <div class="u-text-center">
-                        No targets have been selected.
-                        <p>
-                            Need a hand? Check out our <Button
-                                href="https://appwrite.io/docs/products/messaging/targets">
-                                documentation</Button
+                <Card.Base padding="none">
+                    <PinkEmpty type="secondary" title="No targets were selected">
+                        <svelte:fragment slot="description">
+                            Need a hand? Check out our <Link
+                                variant="muted"
+                                href="https://appwrite.io/docs/products/messaging/targets"
+                                external>documentation</Link
                             >.
-                        </p>
-                    </div>
-                </EmptySearch>
+                        </svelte:fragment>
+                    </PinkEmpty>
+                </Card.Base>
             {/if}
         </svelte:fragment>
         <svelte:fragment slot="actions">
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
index cc80b73af9..5d3929d966 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
@@ -23,6 +23,7 @@
         view={View.Table}
         hideView
         hasFilters
+        hasCustomFiltersOnly
         hasSearch
         analyticsSource="messaging_providers"
         searchPlaceholder="Search by name or ID">
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte
index e8a711d863..e273aa4624 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte
@@ -186,7 +186,7 @@
     }
 </script>
 
-<Wizard title="Create provider" columnSize="l">
+<Wizard title="Create provider" columnSize="l" confirmExit>
     <Form bind:this={formRef} onSubmit={create} isModal={false}>
         <Layout.Stack gap="xxl">
             <Fieldset legend="Provider">
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/createProviderDropdown.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/createProviderDropdown.svelte
index b210dc61b8..ea8f548396 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/createProviderDropdown.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/createProviderDropdown.svelte
@@ -9,7 +9,7 @@
     import { ActionMenu, Popover } from '@appwrite.io/pink-svelte';
 </script>
 
-<Popover let:toggle padding="none" placement="bottom-start">
+<Popover let:toggle padding="none" placement="bottom-end">
     <slot {toggle} />
     <ActionMenu.Root slot="tooltip">
         {#each Object.entries(providers) as [type, option]}
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte
index 47a3056034..30682ca9d7 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte
@@ -70,6 +70,7 @@
         view={View.Table}
         hideView
         hasFilters
+        hasCustomFiltersOnly
         hasSearch
         analyticsSource="messaging_topics_filter"
         searchPlaceholder="Search by name or ID">
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
index 50e8468c64..565ecd9f95 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
@@ -72,7 +72,7 @@
             await Promise.all(promises);
             addNotification({
                 type: 'success',
-                message: `${targetIds.length} subscriber${targetIds.length !== 1 ? 's' : ''} have been added`
+                message: `${targetIds.length} subscriber${targetIds.length !== 1 ? 's' : ''} created`
             });
             trackEvent(Submit.MessagingTopicSubscriberAdd);
             await invalidate(Dependencies.MESSAGING_TOPIC_SUBSCRIBERS);
@@ -88,7 +88,7 @@
 
 <Container>
     <Layout.Stack direction="row" justifyContent="space-between">
-        <SearchQuery placeholder="Search by type or IDs"></SearchQuery>
+        <SearchQuery placeholder="Search by type or ID"></SearchQuery>
         <Layout.Stack direction="row" inline>
             <Filters query={data.query} {columns} analyticsSource="messaging_topics" />
             <ViewSelector ui="new" view={View.Table} {columns} hideView />
@@ -99,7 +99,7 @@
                 }}
                 event="create_subscriber">
                 <Icon icon={IconPlus} slot="start" size="s" />
-                Add subscriber
+                Create subscriber
             </Button>
         </Layout.Stack>
     </Layout.Stack>
@@ -115,14 +115,11 @@
     {:else if $hasPageQueries}
         <EmptyFilter resource="subscribers" />
     {:else if data.search}
-        <EmptySearch>
-            <div class="u-text-center">
-                <b>Sorry, we couldn't find '{data.search}'</b>
-                <p>There are no subscribers that match your search.</p>
-            </div>
+        <EmptySearch bind:search={data.search} target="subscribers">
             <Button
                 secondary
                 href={`${base}/project-${page.params.region}-${page.params.project}/messaging/topics/topic-${page.params.topic}/subscribers`}>
+                Clear Search
             </Button>
         </EmptySearch>
     {:else}
@@ -141,7 +138,7 @@
     on:update={addTargets}>
     <svelte:fragment slot="description">
         <Typography.Text>
-            Add subscribers to this topic by selecting the targets for directing messages.{' '}
+            Create subscribers for this topic by selecting the targets for directing messages.{' '}
             <Link
                 href="https://appwrite.io/docs/products/messaging/topics#subscribe-targets-to-topics"
                 external>
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
index 38e2d5f28c..6c23ef4ca9 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
@@ -16,29 +16,19 @@
     import { getProviderText } from './helper';
     import { page } from '$app/state';
 
-    let {
-        providerType,
-        show = $bindable(),
-        topicsById = $bindable(),
-        title = 'Select topics'
-    } = $props<{
-        providerType: MessagingProviderType;
-        show: boolean;
-        topicsById: Record<string, Models.Topic>;
-        title?: string;
-    }>();
+    export let providerType: MessagingProviderType;
+    export let show: boolean;
+    export let topicsById: Record<string, Models.Topic>;
+    export let title: string = 'Select topics';
 
     const dispatch = createEventDispatcher();
 
-    let search = $state('');
-    let offset = $state(0);
-    let totalResults = $state(0);
-    let topicResultsById = $state<Record<string, Models.Topic>>({});
-    let selected = $state<Record<string, Models.Topic>>({});
-    let emptyTopicsExists = $state(false);
-
-    let previousSearch = $state('');
-    let wasOpen = $state(false);
+    let search = '';
+    let offset = 0;
+    let totalResults = 0;
+    let topicResultsById: Record<string, Models.Topic> = {};
+    let selected: Record<string, Models.Topic> = {};
+    let emptyTopicsExists = false;
 
     function getTopicTotal(topic: Models.Topic): number {
         switch (providerType) {
@@ -96,44 +86,38 @@
     }
 
     function onTopicSelection(event: CustomEvent<boolean>, topic: Models.Topic) {
+        const updatedSelected = { ...selected };
+
         if (event.detail) {
-            selected = {
-                ...selected,
-                [topic.$id]: topic
-            };
+            updatedSelected[topic.$id] = topic;
         } else {
-            const { [topic.$id]: _, ...rest } = selected;
-            selected = rest;
+            delete updatedSelected[topic.$id];
         }
-    }
 
-    $effect(() => {
-        if (search !== previousSearch) {
-            previousSearch = search;
-            offset = 0;
-        }
-    });
+        selected = updatedSelected;
+    }
 
-    $effect(() => {
-        if (!show) return;
-        offset ?? null;
-        search ?? null;
+    $: if (show) {
         request();
-    });
-
-    $effect(() => {
-        if (show && !wasOpen) {
-            selected = topicsById;
-        }
-        wasOpen = show;
-    });
+    }
+    $: if (offset !== null) {
+        request();
+    }
+    $: if (search !== null) {
+        offset = 0;
+        request();
+    }
 
-    let selectedSize = $derived(Object.keys(selected).length);
-    let hasSelection = $derived(selectedSize > 0);
+    $: selectedSize = Object.keys(selected).length;
+    $: hasSelection = selectedSize > 0;
 
-    let topicSelectionStates = $derived(
-        Object.fromEntries(Object.keys(topicResultsById).map((id) => [id, !!selected[id]]))
+    $: topicSelectionStates = Object.fromEntries(
+        Object.keys(topicResultsById).map((id) => [id, !!selected[id]])
     );
+
+    $: if (show) {
+        selected = topicsById;
+    }
 </script>
 
 <Modal {title} bind:show onSubmit={submit} on:close={reset}>
@@ -185,7 +169,7 @@
                 <Empty
                     type="secondary"
                     title={`You have no topics${
-                        emptyTopicsExists ? ` with ${providerType.toUpperCase()} targets` : ''
+                        emptyTopicsExists ? ` with ${providerType.toLowerCase()} targets` : ''
                     }`}
                     description={`Create a topic to see them here.`}>
                     <Button
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte
index 179c869d9a..e02be6c80f 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte
@@ -139,7 +139,7 @@
 </script>
 
 <Modal {title} bind:show onSubmit={submit} on:close={reset}>
-    <slot name="description" />
+    <slot name="description" slot="description" />
     <Layout.Stack>
         <InputSearch
             autofocus