diff --git a/modules/customer-invoices/src/web/proformas/list/ui/blocks/proforma-summary-panel/proforma-header.tsx b/modules/customer-invoices/src/web/proformas/list/ui/blocks/proforma-summary-panel/proforma-header.tsx
index bb295430..604de0b1 100644
--- a/modules/customer-invoices/src/web/proformas/list/ui/blocks/proforma-summary-panel/proforma-header.tsx
+++ b/modules/customer-invoices/src/web/proformas/list/ui/blocks/proforma-summary-panel/proforma-header.tsx
@@ -1,8 +1,9 @@
-import { Avatar, AvatarFallback, Badge } from "@repo/shadcn-ui/components";
+import { InitialsAvatar } from "@repo/rdx-ui/components";
+import { Badge } from "@repo/shadcn-ui/components";
 import { Building2Icon, CopyIcon, UserIcon } from "lucide-react";
 
 import type { Proforma } from "../../../../shared";
-import { Initials, ProformaStatusBadge } from "../../components";
+import { ProformaStatusBadge } from "../../components";
 
 export const ProformaHeader = ({ proforma }: { proforma: Proforma }) => {
   const handleCopyTin = async () => {
@@ -16,17 +17,7 @@ export const ProformaHeader = ({ proforma }: { proforma: Proforma }) => {
   return (
     <div className="p-4">
       <div className="flex items-start gap-4">
-        <Avatar className="size-10 border-2 border-background shadow-sm">
-          <AvatarFallback
-            className={
-              proforma.status !== "draft"
-                ? "bg-blue-100 text-blue-700"
-                : "bg-muted text-muted-foreground"
-            }
-          >
-            <Initials name={proforma.recipient.name} />
-          </AvatarFallback>
-        </Avatar>
+        <InitialsAvatar name={proforma.recipient.name} />
 
         <div className="min-w-0 flex-1">
           <div className="flex items-center gap-2">
diff --git a/modules/customer-invoices/src/web/proformas/list/ui/blocks/proformas-grid/use-proforma-grid-columns.tsx b/modules/customer-invoices/src/web/proformas/list/ui/blocks/proformas-grid/use-proforma-grid-columns.tsx
index 2c8ea746..aa38d346 100644
--- a/modules/customer-invoices/src/web/proformas/list/ui/blocks/proformas-grid/use-proforma-grid-columns.tsx
+++ b/modules/customer-invoices/src/web/proformas/list/ui/blocks/proformas-grid/use-proforma-grid-columns.tsx
@@ -103,7 +103,6 @@ export function useProformasGridColumns(
                   <Tooltip>
                     <TooltipTrigger>
                       <Button
-                        asChild
                         className="size-6 text-foreground hover:text-primary"
                         size="icon"
                         variant="ghost"
@@ -143,7 +142,7 @@ export function useProformasGridColumns(
           return (
             <div>
               <button
-                className="text-primary hover:underline font-semibold"
+                className="text-primary hover:underline font-semibold text-ellipsis"
                 onClick={() => actionHandlers.onPreviewClick?.(proforma)}
                 type="button"
               >
@@ -158,10 +157,6 @@ export function useProformasGridColumns(
         accessorKey: "series",
         header: "Serie",
       },
-      {
-        accessorKey: "reference",
-        header: "Reference",
-      },
       {
         accessorKey: "invoiceDate",
         header: ({ column }) => {
diff --git a/modules/customer-invoices/src/web/proformas/list/ui/pages/list-proformas-page.tsx b/modules/customer-invoices/src/web/proformas/list/ui/pages/list-proformas-page.tsx
index 18a7bb58..5a911286 100644
--- a/modules/customer-invoices/src/web/proformas/list/ui/pages/list-proformas-page.tsx
+++ b/modules/customer-invoices/src/web/proformas/list/ui/pages/list-proformas-page.tsx
@@ -97,7 +97,7 @@ export const ListProformasPage = () => {
   }
 
   return (
-    <>
+    <section>
       <AppHeader>
         <PageHeader
           description={t("pages.proformas.list.description")}
@@ -193,6 +193,6 @@ export const ListProformasPage = () => {
           />
         </>
       </AppContent>
-    </>
+    </section>
   );
 };
diff --git a/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.tsx b/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.tsx
index f38beb6d..9208b991 100644
--- a/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.tsx
+++ b/modules/customer-invoices/src/web/proformas/update/ui/pages/proforma-update-page.tsx
@@ -103,6 +103,7 @@ export const ProformaUpdatePage = () => {
                 isSubmitting={updateCtrl.isUpdating}
                 onChangeCustomerClick={selectCustomerCtrl.selectCtrl.openDialog}
                 //onCreateCustomerClick={selectCustomerCtrl.createCtrl.openDialog}
+                onCreateCustomerClick={() => null}
                 onReset={updateCtrl.resetForm}
                 onSubmit={updateCtrl.onSubmit}
                 selectedCustomer={updateCtrl.selectedCustomer}
diff --git a/modules/customers/src/common/features/customer-selection/ui/dialogs/select-customer-dialog.tsx b/modules/customers/src/common/features/customer-selection/ui/dialogs/select-customer-dialog.tsx
index 1529e638..4ba7ceda 100644
--- a/modules/customers/src/common/features/customer-selection/ui/dialogs/select-customer-dialog.tsx
+++ b/modules/customers/src/common/features/customer-selection/ui/dialogs/select-customer-dialog.tsx
@@ -3,43 +3,20 @@ import {
   Button,
   Dialog,
   DialogContent,
+  DialogFooter,
   DialogHeader,
   DialogTitle,
-  Item,
-  ItemContent,
-  ItemDescription,
-  ItemGroup,
-  ItemTitle,
 } from "@repo/shadcn-ui/components";
-import { cn } from "@repo/shadcn-ui/lib/utils";
+import { useState } from "react";
 
 import type { CustomerSelectionOption } from "../../../../../common/features";
 import { useTranslation } from "../../../../../web/i18n";
 import type { useSelectCustomerDialogController } from "../../controllers";
 
-import { SelectCustomerEmptyCard } from "./select-customer-empty-card";
+import { SelectCustomerSelectionList } from "./select-customer-selection-list";
 
 type SelectCustomerDialogController = ReturnType<typeof useSelectCustomerDialogController>;
 
-/*export const useSelectCustomerDialogController = () => {
-  isOpen: boolean;
-  closeDialog: () => void;
-
-  search: string;
-  setSearchValue: (value: string) => void;
-  
-  customers: CustomerSelectionOption[];
-  isLoading: boolean;
-  isFetching: boolean;
-
-  isErrror: boolean;
-  error: unknown;
-
-  
-
-  selectCustomer: (customer: CustomerSelectionOption) => void;
-};*/
-
 type SelectCustomerDialogProps = {
   ctrl: SelectCustomerDialogController;
   onCreateNewCustomerClick?: () => void;
@@ -49,8 +26,21 @@ export const SelectCustomerDialog = ({
   ctrl,
   onCreateNewCustomerClick,
 }: SelectCustomerDialogProps) => {
+  const [selectedCustomer, setSelectedCustomer] = useState<CustomerSelectionOption | undefined>(
+    undefined
+  );
   const { t } = useTranslation();
 
+  const handleSelect = (customer: CustomerSelectionOption) => {
+    setSelectedCustomer((prev) => (prev?.id === customer.id ? undefined : customer));
+  };
+
+  const handleConfirm = () => {
+    if (selectedCustomer) {
+      ctrl.selectCustomer(selectedCustomer);
+    }
+  };
+
   return (
     <Dialog onOpenChange={(open) => !open && ctrl.closeDialog()} open={ctrl.isOpen}>
       <DialogContent className="flex max-h-[85vh] flex-col sm:max-w-3xl">
@@ -80,60 +70,23 @@ export const SelectCustomerDialog = ({
         </div>
 
         <div className="min-h-0 flex-1 overflow-hidden">
-          <CustomerSelectionList
+          <SelectCustomerSelectionList
             customers={ctrl.customers}
             isLoading={ctrl.isLoading}
-            onSelect={ctrl.selectCustomer}
+            onSelect={handleSelect}
+            selectedCustomer={selectedCustomer}
           />
         </div>
+
+        <DialogFooter className="gap-2">
+          <Button onClick={ctrl.closeDialog} variant="outline">
+            Cancelar
+          </Button>
+          <Button disabled={ctrl.isLoading || !selectedCustomer} onClick={handleConfirm}>
+            {selectedCustomer ? "Confirmar selección" : "Seleccionar cliente"}
+          </Button>
+        </DialogFooter>
       </DialogContent>
     </Dialog>
   );
 };
-
-type CustomerSelectionListProps = {
-  customers: CustomerSelectionOption[];
-  isLoading: boolean;
-  onSelect: (customer: CustomerSelectionOption) => void;
-};
-
-const CustomerSelectionList = ({ customers, isLoading, onSelect }: CustomerSelectionListProps) => {
-  const { t } = useTranslation();
-
-  //const columns = useCustomersGridColumns({});
-
-  if (isLoading) {
-    return (
-      <div className="space-y-2 py-2">
-        <div className="h-14 rounded-md border" />
-        <div className="h-14 rounded-md border" />
-        <div className="h-14 rounded-md border" />
-      </div>
-    );
-  }
-
-  if (customers.length === 0) {
-    return <SelectCustomerEmptyCard />;
-  }
-
-  return (
-    <ItemGroup>
-      {customers.map((customer) => (
-        <Item
-          asChild
-          className={cn("bg-muted/50 font-medium transition hover:text-primary hover:bg-muted")}
-          key={customer.id}
-          onClick={() => onSelect(customer)}
-          role="listitem"
-        >
-          <a href="#" rel="noopener noreferrer" target="_blank">
-            <ItemContent>
-              <ItemTitle className="line-clamp-1">{customer.name}</ItemTitle>
-              <ItemDescription>{customer.tin}</ItemDescription>
-            </ItemContent>
-          </a>
-        </Item>
-      ))}
-    </ItemGroup>
-  );
-};
diff --git a/modules/customers/src/common/features/customer-selection/ui/dialogs/select-customer-selection-list.tsx b/modules/customers/src/common/features/customer-selection/ui/dialogs/select-customer-selection-list.tsx
new file mode 100644
index 00000000..1a606c31
--- /dev/null
+++ b/modules/customers/src/common/features/customer-selection/ui/dialogs/select-customer-selection-list.tsx
@@ -0,0 +1,77 @@
+import { InitialsAvatar } from "@repo/rdx-ui/components";
+import {
+  Item,
+  ItemContent,
+  ItemDescription,
+  ItemGroup,
+  ItemMedia,
+  ItemTitle,
+} from "@repo/shadcn-ui/components";
+import { cn } from "@repo/shadcn-ui/lib/utils";
+
+import { useTranslation } from "../../../../../web/i18n";
+import type { CustomerSelectionOption } from "../../entities";
+
+import { SelectCustomerEmptyCard } from "./select-customer-empty-card";
+
+type SelectCustomerSelectionListProps = {
+  customers: CustomerSelectionOption[];
+  isLoading: boolean;
+  selectedCustomer?: CustomerSelectionOption;
+  onSelect: (customer: CustomerSelectionOption) => void;
+};
+
+export const SelectCustomerSelectionList = ({
+  customers,
+  isLoading,
+  selectedCustomer,
+  onSelect,
+}: SelectCustomerSelectionListProps) => {
+  const { t } = useTranslation();
+
+  //const columns = useCustomersGridColumns({});
+  console.log(selectedCustomer);
+
+  if (isLoading) {
+    return (
+      <div className="space-y-2 py-2">
+        <div className="h-14 rounded-md border" />
+        <div className="h-14 rounded-md border" />
+        <div className="h-14 rounded-md border" />
+      </div>
+    );
+  }
+
+  if (customers.length === 0) {
+    return <SelectCustomerEmptyCard />;
+  }
+
+  return (
+    <ItemGroup>
+      {customers.map((customer) => (
+        <Item
+          className={cn(
+            "cursor-pointer",
+            customer.id === selectedCustomer?.id && "border-primary bg-accent"
+          )}
+          key={customer.id}
+          onClick={() => onSelect(customer)}
+          role="listitem"
+          variant={"outline"}
+        >
+          <ItemMedia>
+            <InitialsAvatar
+              name={customer.name}
+              variant={customer.id === selectedCustomer?.id ? "primary" : "muted"}
+            />
+          </ItemMedia>
+
+          <ItemContent>
+            <ItemTitle className="line-clamp-1">{customer.name}</ItemTitle>
+            <ItemDescription>{customer.tin}</ItemDescription>
+          </ItemContent>
+        </Item>
+      ))}
+    </ItemGroup>
+  );
+};
diff --git a/modules/customers/src/web/list/ui/blocks/customer-summary-panel/customer-header.tsx b/modules/customers/src/web/list/ui/blocks/customer-summary-panel/customer-header.tsx
index 25a98955..72a20133 100644
--- a/modules/customers/src/web/list/ui/blocks/customer-summary-panel/customer-header.tsx
+++ b/modules/customers/src/web/list/ui/blocks/customer-summary-panel/customer-header.tsx
@@ -1,24 +1,14 @@
-import { Avatar, AvatarFallback, Badge } from "@repo/shadcn-ui/components";
+import { InitialsAvatar } from "@repo/rdx-ui/components";
+import { Badge } from "@repo/shadcn-ui/components";
 import { Building2Icon, CopyIcon, UserIcon } from "lucide-react";
 
 import type { Customer } from "../../../../shared";
-import { Initials } from "../../components";
 
 export const CustomerHeader = ({ customer }: { customer: Customer }) => {
   return (
     <div className="p-4">
       <div className="flex items-start gap-4">
-        <Avatar className="size-10 border-2 border-background shadow-sm">
-          <AvatarFallback
-            className={
-              customer.status === "active"
-                ? "bg-blue-100 text-blue-700"
-                : "bg-muted text-muted-foreground"
-            }
-          >
-            <Initials name={customer.name} />
-          </AvatarFallback>
-        </Avatar>
+        <InitialsAvatar name={customer.name} />
 
         <div className="min-w-0 flex-1">
           <div className="flex items-center gap-2">
diff --git a/modules/customers/src/web/list/ui/blocks/customers-grid/use-customer-grid-columns.tsx b/modules/customers/src/web/list/ui/blocks/customers-grid/use-customer-grid-columns.tsx
index 2a01f584..baa4fb30 100644
--- a/modules/customers/src/web/list/ui/blocks/customers-grid/use-customer-grid-columns.tsx
+++ b/modules/customers/src/web/list/ui/blocks/customers-grid/use-customer-grid-columns.tsx
@@ -1,8 +1,6 @@
 import { safeHTTPUrl } from "@erp/core/client";
-import { DataTableColumnHeader } from "@repo/rdx-ui/components";
+import { DataTableColumnHeader, InitialsAvatar } from "@repo/rdx-ui/components";
 import {
-  Avatar,
-  AvatarFallback,
   Badge,
   Button,
   DropdownMenu,
@@ -18,7 +16,7 @@ import * as React from "react";
 
 import { useTranslation } from "../../../../i18n";
 import type { CustomerListRow } from "../../../../shared";
-import { AddressCell, ContactCell, Initials } from "../../components";
+import { AddressCell, ContactCell } from "../../components";
 
 type GridActionHandlers = {
   onEditClick?: (customer: CustomerListRow) => void;
@@ -58,17 +56,7 @@ export function useCustomersGridColumns(
               type="button"
             >
               <div className="flex items-start gap-3">
-                <Avatar className="size-10 border-2 border-background shadow-sm">
-                  <AvatarFallback
-                    className={
-                      customer.status === "active"
-                        ? "bg-blue-100 text-blue-700"
-                        : "bg-muted text-muted-foreground"
-                    }
-                  >
-                    <Initials name={customer.name} />
-                  </AvatarFallback>
-                </Avatar>
+                <InitialsAvatar name={customer.name} variant="primary" />
 
                 <div className="flex flex-col gap-1">
                   <div className="flex items-center gap-2">
diff --git a/modules/customers/src/web/list/ui/components/index.ts b/modules/customers/src/web/list/ui/components/index.ts
index 46dd269b..c73ea6d7 100644
--- a/modules/customers/src/web/list/ui/components/index.ts
+++ b/modules/customers/src/web/list/ui/components/index.ts
@@ -1,5 +1,4 @@
 export * from "./address-cell";
 export * from "./contact-cell";
-export * from "./initials";
 export * from "./kind-badge";
 export * from "./soft";
diff --git a/modules/customers/src/web/list/ui/components/initials.tsx b/modules/customers/src/web/list/ui/components/initials.tsx
deleted file mode 100644
index 87b187ca..00000000
--- a/modules/customers/src/web/list/ui/components/initials.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-export const Initials = ({ name }: { name: string }) => {
-  const parts = name.trim().split(/\s+/).slice(0, 2);
-  return <> {parts.map((p) => p[0]?.toUpperCase() ?? "").join("") || "?"} </>;
-};