diff --git a/messages/en-US.json b/messages/en-US.json
index 5c0ca434b..8414f0a2f 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -3141,5 +3141,6 @@
     "idpUnassociateMenu": "Unassociate",
     "idpDeleteAllOrgsMenu": "Delete",
     "publicIpEndpoint": "Endpoint",
-    "lastTriggeredAt": "Last Trigger"
+    "lastTriggeredAt": "Last Trigger",
+    "reject": "Reject"
 }
diff --git a/server/apiServer.ts b/server/apiServer.ts
index dafec1b85..9a91d473e 100644
--- a/server/apiServer.ts
+++ b/server/apiServer.ts
@@ -121,7 +121,7 @@ export function createApiServer() {
     const httpServer = apiServer.listen(externalPort, (err?: any) => {
         if (err) throw err;
         logger.info(
-            `API server is running on http://localhost:${externalPort}`
+            `Dashboard API server is running on http://localhost:${externalPort}`
         );
     });
 
diff --git a/server/internalServer.ts b/server/internalServer.ts
index 7ba046e4b..83872e7f9 100644
--- a/server/internalServer.ts
+++ b/server/internalServer.ts
@@ -36,7 +36,7 @@ export function createInternalServer() {
     internalServer.listen(internalPort, (err?: any) => {
         if (err) throw err;
         logger.info(
-            `Internal server is running on http://localhost:${internalPort}`
+            `Internal API server is running on http://localhost:${internalPort}`
         );
     });
 
diff --git a/server/lib/telemetry.ts b/server/lib/telemetry.ts
index fda59f394..8d341bf1d 100644
--- a/server/lib/telemetry.ts
+++ b/server/lib/telemetry.ts
@@ -72,7 +72,7 @@ class TelemetryClient {
                         logger.debug("Successfully sent analytics data");
                     });
             },
-            48 * 60 * 60 * 1000
+            336 * 60 * 60 * 1000
         );
 
         this.collectAndSendAnalytics().catch((err) => {
diff --git a/server/nextServer.ts b/server/nextServer.ts
index deb74d309..18b14a397 100644
--- a/server/nextServer.ts
+++ b/server/nextServer.ts
@@ -29,7 +29,7 @@ export async function createNextServer() {
     nextServer.listen(nextPort, (err?: any) => {
         if (err) throw err;
         logger.info(
-            `Next.js server is running on http://localhost:${nextPort}`
+            `Dashboard Web UI server is running on http://localhost:${nextPort}`
         );
     });
 
diff --git a/server/private/lib/acmeCertSync.ts b/server/private/lib/acmeCertSync.ts
index faa45b08e..62a18b805 100644
--- a/server/private/lib/acmeCertSync.ts
+++ b/server/private/lib/acmeCertSync.ts
@@ -89,7 +89,7 @@ async function pushCertUpdateToAffectedNewts(
         return;
     }
 
-    logger.info(
+    logger.debug(
         `acmeCertSync: pushing cert update to ${affectedResources.length} affected site resource(s) for domain "${domain}"`
     );
 
@@ -187,7 +187,7 @@ async function pushCertUpdateToAffectedNewts(
                     newt.version
                 );
 
-                logger.info(
+                logger.debug(
                     `acmeCertSync: pushed cert update to newt for site ${siteId}, resource ${resource.siteResourceId}`
                 );
             }
@@ -400,7 +400,7 @@ async function syncAcmeCerts(
                 })
                 .where(eq(certificates.domain, domain));
 
-            logger.info(
+            logger.debug(
                 `acmeCertSync: updated certificate for ${domain} (expires ${expiresAt ? new Date(expiresAt * 1000).toISOString() : "unknown"})`
             );
 
@@ -423,7 +423,7 @@ async function syncAcmeCerts(
                 wildcard
             });
 
-            logger.info(
+            logger.debug(
                 `acmeCertSync: inserted new certificate for ${domain} (expires ${expiresAt ? new Date(expiresAt * 1000).toISOString() : "unknown"})`
             );
 
@@ -461,7 +461,7 @@ export function initAcmeCertSync(): void {
     const resolver = privateConfigData.acme?.resolver ?? "letsencrypt";
     const intervalMs = privateConfigData.acme?.sync_interval_ms ?? 5000;
 
-    logger.info(
+    logger.debug(
         `acmeCertSync: starting ACME cert sync from "${acmeJsonPath}" using resolver "${resolver}" every ${intervalMs}ms`
     );
 
diff --git a/server/routers/newt/pingAccumulator.ts b/server/routers/newt/pingAccumulator.ts
index b63bf97d3..9b2f04c8e 100644
--- a/server/routers/newt/pingAccumulator.ts
+++ b/server/routers/newt/pingAccumulator.ts
@@ -381,7 +381,7 @@ export function startPingAccumulator(): void {
     // Don't prevent the process from exiting
     flushTimer.unref();
 
-    logger.info(
+    logger.debug(
         `Ping accumulator started (flush interval: ${FLUSH_INTERVAL_MS}ms)`
     );
 }
diff --git a/src/app/[orgId]/settings/access/users/create/page.tsx b/src/app/[orgId]/settings/access/users/create/page.tsx
index 2c3292f9e..cec399a32 100644
--- a/src/app/[orgId]/settings/access/users/create/page.tsx
+++ b/src/app/[orgId]/settings/access/users/create/page.tsx
@@ -50,6 +50,7 @@ import IdpTypeIcon from "@app/components/IdpTypeIcon";
 import { usePaidStatus } from "@app/hooks/usePaidStatus";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import OrgRolesTagField from "@app/components/OrgRolesTagField";
+import CopyToClipboard from "@app/components/CopyToClipboard";
 
 type UserType = "internal" | "oidc";
 
@@ -670,9 +671,8 @@ export default function Page() {
                                                     days: expiresInDays
                                                 })}
                                             </p>
-                                            <CopyTextBox
+                                            <CopyToClipboard
                                                 text={inviteLink}
-                                                wrapText={false}
                                             />
                                         </div>
                                     </SettingsSectionBody>
diff --git a/src/components/LayoutMobileMenu.tsx b/src/components/LayoutMobileMenu.tsx
index 854cad6db..13efdd564 100644
--- a/src/components/LayoutMobileMenu.tsx
+++ b/src/components/LayoutMobileMenu.tsx
@@ -101,7 +101,6 @@ export function LayoutMobileMenu({
                                                                     "serverAdmin"
                                                                 )}
                                                             </span>
-                                                            <ArrowRight className="h-4 w-4 shrink-0 ml-auto opacity-70" />
                                                         </Link>
                                                     </div>
                                                 )}
diff --git a/src/components/LayoutSidebar.tsx b/src/components/LayoutSidebar.tsx
index a66a8300b..19a095419 100644
--- a/src/components/LayoutSidebar.tsx
+++ b/src/components/LayoutSidebar.tsx
@@ -189,7 +189,6 @@ export function LayoutSidebar({
                                         <span className="flex-1">
                                             {t("serverAdmin")}
                                         </span>
-                                        <ArrowRight className="h-4 w-4 shrink-0 ml-auto opacity-70" />
                                     </>
                                 )}
                             </Link>
diff --git a/src/components/PendingSitesTable.tsx b/src/components/PendingSitesTable.tsx
index a6625037d..d32aee95e 100644
--- a/src/components/PendingSitesTable.tsx
+++ b/src/components/PendingSitesTable.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { Badge } from "@app/components/ui/badge";
 import { Button } from "@app/components/ui/button";
 import {
@@ -24,7 +25,8 @@ import {
     ArrowUpRight,
     Check,
     ChevronsUpDownIcon,
-    MoreHorizontal
+    MoreHorizontal,
+    X
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
@@ -62,6 +64,9 @@ export default function PendingSitesTable({
 
     const [isRefreshing, startTransition] = useTransition();
     const [approvingIds, setApprovingIds] = useState<Set<number>>(new Set());
+    const [rejectingIds, setRejectingIds] = useState<Set<number>>(new Set());
+    const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+    const [selectedSite, setSelectedSite] = useState<SiteRow | null>(null);
 
     const api = createApiClient(useEnvContext());
     const t = useTranslations();
@@ -128,6 +133,33 @@ export default function PendingSitesTable({
         }
     }
 
+    async function rejectSite(siteId: number) {
+        setRejectingIds((prev) => new Set(prev).add(siteId));
+        try {
+            await api.delete(`/site/${siteId}`);
+            toast({
+                title: t("success"),
+                description: t("siteDeleted"),
+                variant: "default"
+            });
+            setIsDeleteModalOpen(false);
+            setSelectedSite(null);
+            router.refresh();
+        } catch (e) {
+            toast({
+                variant: "destructive",
+                title: t("siteErrorDelete"),
+                description: formatAxiosError(e, t("siteErrorDelete"))
+            });
+        } finally {
+            setRejectingIds((prev) => {
+                const next = new Set(prev);
+                next.delete(siteId);
+                return next;
+            });
+        }
+    }
+
     const columns: ExtendedColumnDef<SiteRow>[] = [
         {
             accessorKey: "name",
@@ -387,6 +419,7 @@ export default function PendingSitesTable({
             cell: ({ row }) => {
                 const siteRow = row.original;
                 const isApproving = approvingIds.has(siteRow.id);
+                const isRejecting = rejectingIds.has(siteRow.id);
                 return (
                     <div className="flex items-center gap-2 justify-end">
                         <DropdownMenu>
@@ -409,7 +442,18 @@ export default function PendingSitesTable({
                         </DropdownMenu>
                         <Button
                             variant="outline"
-                            disabled={isApproving}
+                            disabled={isApproving || isRejecting}
+                            onClick={() => {
+                                setSelectedSite(siteRow);
+                                setIsDeleteModalOpen(true);
+                            }}
+                        >
+                            <X className="mr-2 w-4 h-4" />
+                            {t("reject")}
+                        </Button>
+                        <Button
+                            variant="outline"
+                            disabled={isApproving || isRejecting}
                             onClick={() => approveSite(siteRow.id)}
                         >
                             <Check className="mr-2 w-4 h-4" />
@@ -446,28 +490,51 @@ export default function PendingSitesTable({
     }, 300);
 
     return (
-        <ControlledDataTable
-            columns={columns}
-            rows={sites}
-            tableId="pending-sites-table"
-            searchPlaceholder={t("searchSitesProgress")}
-            pagination={pagination}
-            onPaginationChange={handlePaginationChange}
-            searchQuery={searchParams.get("query")?.toString()}
-            onSearch={handleSearchChange}
-            onRefresh={refreshData}
-            isRefreshing={isRefreshing || isFiltering}
-            refreshButtonDisabled={!canUseSiteProvisioning}
-            rowCount={rowCount}
-            columnVisibility={{
-                niceId: false,
-                nice: false,
-                exitNode: false,
-                address: false
-            }}
-            enableColumnVisibility
-            stickyLeftColumn="name"
-            stickyRightColumn="actions"
-        />
+        <>
+            {selectedSite && (
+                <ConfirmDeleteDialog
+                    open={isDeleteModalOpen}
+                    setOpen={(val) => {
+                        setIsDeleteModalOpen(val);
+                        if (!val) {
+                            setSelectedSite(null);
+                        }
+                    }}
+                    dialog={
+                        <div className="space-y-2">
+                            <p>{t("siteQuestionRemove")}</p>
+                            <p>{t("siteMessageRemove")}</p>
+                        </div>
+                    }
+                    buttonText={t("siteConfirmDelete")}
+                    onConfirm={async () => rejectSite(selectedSite.id)}
+                    string={selectedSite.name}
+                    title={t("siteDelete")}
+                />
+            )}
+            <ControlledDataTable
+                columns={columns}
+                rows={sites}
+                tableId="pending-sites-table"
+                searchPlaceholder={t("searchSitesProgress")}
+                pagination={pagination}
+                onPaginationChange={handlePaginationChange}
+                searchQuery={searchParams.get("query")?.toString()}
+                onSearch={handleSearchChange}
+                onRefresh={refreshData}
+                isRefreshing={isRefreshing || isFiltering}
+                refreshButtonDisabled={!canUseSiteProvisioning}
+                rowCount={rowCount}
+                columnVisibility={{
+                    niceId: false,
+                    nice: false,
+                    exitNode: false,
+                    address: false
+                }}
+                enableColumnVisibility
+                stickyLeftColumn="name"
+                stickyRightColumn="actions"
+            />
+        </>
     );
 }
diff --git a/src/components/UsersTable.tsx b/src/components/UsersTable.tsx
index 979c59425..50915c02b 100644
--- a/src/components/UsersTable.tsx
+++ b/src/components/UsersTable.tsx
@@ -382,6 +382,7 @@ export default function UsersTable({
                 pagination={pagination}
                 rowCount={rowCount}
                 isNavigatingToAddPage={isNavigatingToAddPage}
+                addButtonText={t("accessUserCreate")}
                 searchQuery={searchParams.get("query")?.toString()}
                 onSearch={handleSearchChange}
                 onPaginationChange={handlePaginationChange}
diff --git a/src/components/alert-rule-editor/AlertRuleGraphEditor.tsx b/src/components/alert-rule-editor/AlertRuleGraphEditor.tsx
index 85dd61c5a..c41cf32bd 100644
--- a/src/components/alert-rule-editor/AlertRuleGraphEditor.tsx
+++ b/src/components/alert-rule-editor/AlertRuleGraphEditor.tsx
@@ -40,6 +40,7 @@ import { useTranslations } from "next-intl";
 import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
 import { SwitchInput } from "@app/components/SwitchInput";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
+import { Badge } from "../ui/badge";
 
 const FORM_ID = "alert-rule-form";
 
@@ -181,9 +182,9 @@ export default function AlertRuleGraphEditor({
                                     >
                                         <div className="flex flex-wrap items-center gap-2">
                                             {isNew && (
-                                                <span className="text-xs rounded-md border bg-muted px-2 py-1 text-muted-foreground">
+                                                <Badge variant="secondary" >
                                                     {t("alertingDraftBadge")}
-                                                </span>
+                                                </Badge>
                                             )}
                                         </div>
                                         <FormField
diff --git a/src/components/ui/badge.tsx b/src/components/ui/badge.tsx
index 2b474f45b..d24788aff 100644
--- a/src/components/ui/badge.tsx
+++ b/src/components/ui/badge.tsx
@@ -4,7 +4,7 @@ import { cva, type VariantProps } from "class-variance-authority";
 import { cn } from "@app/lib/cn";
 
 const badgeVariants = cva(
-    "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors outline-none focus:outline-none focus-visible:outline-none focus-visible:ring-0",
+    "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs transition-colors outline-none focus:outline-none focus-visible:outline-none focus-visible:ring-0",
     {
         variants: {
             variant: {
@@ -13,7 +13,7 @@ const badgeVariants = cva(
                 outlinePrimary:
                     "border-transparent bg-transparent border-primary text-primary",
                 secondary:
-                    "border-transparent bg-secondary text-secondary-foreground",
+                    "bg-muted border text-secondary-foreground",
                 destructive:
                     "border-transparent bg-destructive text-destructive-foreground",
                 outline: "text-foreground",
diff --git a/src/components/ui/controlled-data-table.tsx b/src/components/ui/controlled-data-table.tsx
index 7217006e8..116ce644a 100644
--- a/src/components/ui/controlled-data-table.tsx
+++ b/src/components/ui/controlled-data-table.tsx
@@ -17,6 +17,7 @@ import {
     TableHeader,
     TableRow
 } from "@/components/ui/table";
+import { DataTableEmptyState } from "@/components/ui/data-table-empty-state";
 import { DataTablePagination } from "@app/components/DataTablePagination";
 import type { DataTableAddAction } from "@app/components/ui/data-table";
 import { Button } from "@app/components/ui/button";
@@ -249,6 +250,38 @@ export function ControlledDataTable<TData, TValue>({
         return "";
     };
 
+    const tableRows = table.getRowModel().rows;
+    const hasRows = tableRows.length > 0;
+    const hasAddAction = Boolean(
+        addButtonText && ((addActions && addActions.length > 0) || onAdd)
+    );
+    const showAddActionInEmptyState = !hasRows && hasAddAction;
+    const addAction = addActions && addActions.length > 0 && addButtonText ? (
+        <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+                <Button
+                    disabled={addButtonDisabled || isNavigatingToAddPage}
+                >
+                    <Plus className="mr-2 h-4 w-4" />
+                    {addButtonText}
+                    <ChevronDown className="ml-2 h-4 w-4" />
+                </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+                {addActions.map((action, i) => (
+                    <DropdownMenuItem key={i} onSelect={() => action.onSelect()}>
+                        {action.label}
+                    </DropdownMenuItem>
+                ))}
+            </DropdownMenuContent>
+        </DropdownMenu>
+    ) : onAdd && addButtonText ? (
+        <Button onClick={onAdd} loading={isNavigatingToAddPage} disabled={addButtonDisabled}>
+            <Plus className="mr-2 h-4 w-4" />
+            {addButtonText}
+        </Button>
+    ) : null;
+
     return (
         <div className="container mx-auto max-w-12xl">
             <Card>
@@ -367,51 +400,15 @@ export function ControlledDataTable<TData, TValue>({
                                 </Button>
                             </div>
                         )}
-                        {addActions &&
-                        addActions.length > 0 &&
-                        addButtonText ? (
-                            <div>
-                                <DropdownMenu>
-                                    <DropdownMenuTrigger asChild>
-                                        <Button
-                                            disabled={
-                                                addButtonDisabled ||
-                                                isNavigatingToAddPage
-                                            }
-                                        >
-                                            <Plus className="mr-2 h-4 w-4" />
-                                            {addButtonText}
-                                            <ChevronDown className="ml-2 h-4 w-4" />
-                                        </Button>
-                                    </DropdownMenuTrigger>
-                                    <DropdownMenuContent align="end">
-                                        {addActions.map((action, i) => (
-                                            <DropdownMenuItem
-                                                key={i}
-                                                onSelect={() =>
-                                                    action.onSelect()
-                                                }
-                                            >
-                                                {action.label}
-                                            </DropdownMenuItem>
-                                        ))}
-                                    </DropdownMenuContent>
-                                </DropdownMenu>
-                            </div>
-                        ) : (
-                            onAdd &&
-                            addButtonText && (
-                                <div>
-                                    <Button
-                                        onClick={onAdd}
-                                        loading={isNavigatingToAddPage}
-                                        disabled={addButtonDisabled}
-                                    >
-                                        <Plus className="mr-2 h-4 w-4" />
-                                        {addButtonText}
-                                    </Button>
-                                </div>
-                            )
+                        {addAction && (
+                            <>
+                                <div className="sm:hidden">{addAction}</div>
+                                {!showAddActionInEmptyState && (
+                                    <div className="hidden sm:block">
+                                        {addAction}
+                                    </div>
+                                )}
+                            </>
                         )}
                     </div>
                 </CardHeader>
@@ -606,14 +603,18 @@ export function ControlledDataTable<TData, TValue>({
                                         </TableRow>
                                     ))
                                 ) : (
-                                    <TableRow>
-                                        <TableCell
-                                            colSpan={columns.length}
-                                            className="h-24 text-center"
-                                        >
-                                            No results found.
-                                        </TableCell>
-                                    </TableRow>
+                                    <DataTableEmptyState
+                                        colSpan={columns.length}
+                                        action={
+                                            showAddActionInEmptyState
+                                                ? (
+                                                      <div className="hidden sm:block">
+                                                          {addAction}
+                                                      </div>
+                                                  )
+                                                : undefined
+                                        }
+                                    />
                                 )}
                             </TableBody>
                         </Table>
diff --git a/src/components/ui/data-table-empty-state.tsx b/src/components/ui/data-table-empty-state.tsx
new file mode 100644
index 000000000..793c360f4
--- /dev/null
+++ b/src/components/ui/data-table-empty-state.tsx
@@ -0,0 +1,46 @@
+"use client";
+
+import { TableCell, TableRow } from "@/components/ui/table";
+import { useTranslations } from "next-intl";
+import { type ReactNode } from "react";
+
+const PLACEHOLDER_ROW_COUNT = 5;
+
+type DataTableEmptyStateProps = {
+    colSpan: number;
+    action?: ReactNode;
+};
+
+export function DataTableEmptyState({
+    colSpan,
+    action
+}: DataTableEmptyStateProps) {
+    const t = useTranslations();
+    return (
+        <TableRow className="hidden sm:table-row hover:bg-transparent data-[state=selected]:bg-transparent">
+            <TableCell colSpan={colSpan} className="p-0">
+                <div className="relative min-h-[11rem] w-full overflow-hidden">
+                    <div
+                        className="absolute inset-0 flex flex-col justify-start"
+                        aria-hidden
+                    >
+                        {Array.from({ length: PLACEHOLDER_ROW_COUNT }).map(
+                            (_, i) => (
+                                <div
+                                    key={i}
+                                    className="h-10 shrink-0 border-b border-border/30"
+                                />
+                            )
+                        )}
+                    </div>
+                    <div className="relative flex min-h-[11rem] w-full flex-col items-center justify-center gap-4 px-4 py-8">
+                        <p className="text-sm text-muted-foreground">
+                            {t("noResults")}
+                        </p>
+                        {action}
+                    </div>
+                </div>
+            </TableCell>
+        </TableRow>
+    );
+}
diff --git a/src/components/ui/data-table.tsx b/src/components/ui/data-table.tsx
index 2c0e5e48c..82aafe1f4 100644
--- a/src/components/ui/data-table.tsx
+++ b/src/components/ui/data-table.tsx
@@ -29,6 +29,7 @@ import {
     TableHeader,
     TableRow
 } from "@/components/ui/table";
+import { DataTableEmptyState } from "@/components/ui/data-table-empty-state";
 import { Button } from "@app/components/ui/button";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { Input } from "@app/components/ui/input";
@@ -515,6 +516,36 @@ export function DataTable<TData, TValue>({
         return "";
     };
 
+    const tableRows = table.getRowModel().rows;
+    const hasRows = tableRows.length > 0;
+    const hasAddAction = Boolean(
+        addButtonText && ((addActions && addActions.length > 0) || onAdd)
+    );
+    const showAddActionInEmptyState = !hasRows && hasAddAction;
+    const addAction = addActions && addActions.length > 0 && addButtonText ? (
+        <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+                <Button disabled={addButtonDisabled}>
+                    <Plus className="mr-2 h-4 w-4" />
+                    {addButtonText}
+                    <ChevronDown className="ml-2 h-4 w-4" />
+                </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+                {addActions.map((action, i) => (
+                    <DropdownMenuItem key={i} onSelect={() => action.onSelect()}>
+                        {action.label}
+                    </DropdownMenuItem>
+                ))}
+            </DropdownMenuContent>
+        </DropdownMenu>
+    ) : onAdd && addButtonText ? (
+        <Button onClick={onAdd} disabled={addButtonDisabled}>
+            <Plus className="mr-2 h-4 w-4" />
+            {addButtonText}
+        </Button>
+    ) : null;
+
     return (
         <div className="container mx-auto max-w-12xl">
             <Card>
@@ -651,45 +682,15 @@ export function DataTable<TData, TValue>({
                                 </Button>
                             </div>
                         )}
-                        {addActions && addActions.length > 0 && addButtonText ? (
-                            <div>
-                                <DropdownMenu>
-                                    <DropdownMenuTrigger asChild>
-                                        <Button
-                                            disabled={addButtonDisabled}
-                                        >
-                                            <Plus className="mr-2 h-4 w-4" />
-                                            {addButtonText}
-                                            <ChevronDown className="ml-2 h-4 w-4" />
-                                        </Button>
-                                    </DropdownMenuTrigger>
-                                    <DropdownMenuContent align="end">
-                                        {addActions.map((action, i) => (
-                                            <DropdownMenuItem
-                                                key={i}
-                                                onSelect={() =>
-                                                    action.onSelect()
-                                                }
-                                            >
-                                                {action.label}
-                                            </DropdownMenuItem>
-                                        ))}
-                                    </DropdownMenuContent>
-                                </DropdownMenu>
-                            </div>
-                        ) : (
-                            onAdd &&
-                            addButtonText && (
-                                <div>
-                                    <Button
-                                        onClick={onAdd}
-                                        disabled={addButtonDisabled}
-                                    >
-                                        <Plus className="mr-2 h-4 w-4" />
-                                        {addButtonText}
-                                    </Button>
-                                </div>
-                            )
+                        {addAction && (
+                            <>
+                                <div className="sm:hidden">{addAction}</div>
+                                {!showAddActionInEmptyState && (
+                                    <div className="hidden sm:block">
+                                        {addAction}
+                                    </div>
+                                )}
+                            </>
                         )}
                     </div>
                 </CardHeader>
@@ -884,14 +885,18 @@ export function DataTable<TData, TValue>({
                                         </TableRow>
                                     ))
                                 ) : (
-                                    <TableRow>
-                                        <TableCell
-                                            colSpan={columns.length}
-                                            className="h-24 text-center"
-                                        >
-                                            No results found.
-                                        </TableCell>
-                                    </TableRow>
+                                    <DataTableEmptyState
+                                        colSpan={columns.length}
+                                        action={
+                                            showAddActionInEmptyState
+                                                ? (
+                                                      <div className="hidden sm:block">
+                                                          {addAction}
+                                                      </div>
+                                                  )
+                                                : undefined
+                                        }
+                                    />
                                 )}
                             </TableBody>
                         </Table>