diff --git a/apps/web/src/app/(dashboard)/contacts/[contactBookId]/contact-list.tsx b/apps/web/src/app/(dashboard)/contacts/[contactBookId]/contact-list.tsx
index 44f8c62..f91a5b5 100644
--- a/apps/web/src/app/(dashboard)/contacts/[contactBookId]/contact-list.tsx
+++ b/apps/web/src/app/(dashboard)/contacts/[contactBookId]/contact-list.tsx
@@ -23,7 +23,8 @@ import { api } from "~/trpc/react";
 import { getGravatarUrl } from "~/utils/gravatar-utils";
 import DeleteContact from "./delete-contact";
 import EditContact from "./edit-contact";
-
+import { Input } from "@unsend/ui/src/input";
+import { useDebouncedCallback } from "use-debounce";
 export default function ContactList({
   contactBookId,
 }: {
@@ -31,12 +32,14 @@ export default function ContactList({
 }) {
   const [page, setPage] = useUrlState("page", "1");
   const [status, setStatus] = useUrlState("status");
+  const [search, setSearch] = useUrlState("search");
 
   const pageNumber = Number(page);
 
   const contactsQuery = api.contacts.contacts.useQuery({
     contactBookId,
     page: pageNumber,
+    search: search ?? undefined,
     subscribed:
       status === "Subscribed"
         ? true
@@ -45,9 +48,21 @@ export default function ContactList({
           : undefined,
   });
 
+  const debouncedSearch = useDebouncedCallback((value: string) => {
+    setSearch(value);
+  }, 1000);
+
   return (
     <div className="mt-10 flex flex-col gap-4">
-      <div className="flex justify-end">
+      <div className="flex justify-between">
+        <div>
+          <Input
+            placeholder="Search by email or name"
+            className="w-[350px] mr-4"
+            defaultValue={search ?? ""}
+            onChange={(e) => debouncedSearch(e.target.value)}
+          />
+        </div>
         <Select
           value={status ?? "All"}
           onValueChange={(val) => setStatus(val === "All" ? null : val)}
@@ -95,15 +110,22 @@ export default function ContactList({
                     <div className="flex items-center gap-2">
                       <Image
                         src={getGravatarUrl(contact.email, {
-                          size: 35,
-                          defaultImage: "identicon",
+                          size: 75,
+                          defaultImage: "robohash",
                         })}
                         alt={contact.email + "'s gravatar"}
                         width={35}
                         height={35}
                         className="rounded-full"
                       />
-                      {contact.email}
+                      <div className="flex flex-col">
+                        <span className="text-sm font-medium">
+                          {contact.email}
+                        </span>
+                        <span className="text-xs text-muted-foreground">
+                          {contact.firstName} {contact.lastName}
+                        </span>
+                      </div>
                     </div>
                   </TableCell>
                   <TableCell>
diff --git a/apps/web/src/server/api/routers/contacts.ts b/apps/web/src/server/api/routers/contacts.ts
index 48ff000..c37b585 100644
--- a/apps/web/src/server/api/routers/contacts.ts
+++ b/apps/web/src/server/api/routers/contacts.ts
@@ -100,6 +100,7 @@ export const contactsRouter = createTRPCRouter({
       z.object({
         page: z.number().optional(),
         subscribed: z.boolean().optional(),
+        search: z.string().optional(),
       })
     )
     .query(async ({ ctx: { db }, input }) => {
@@ -112,6 +113,15 @@ export const contactsRouter = createTRPCRouter({
         ...(input.subscribed !== undefined
           ? { subscribed: input.subscribed }
           : {}),
+        ...(input.search
+          ? {
+              OR: [
+                { email: { contains: input.search, mode: "insensitive" } },
+                { firstName: { contains: input.search, mode: "insensitive" } },
+                { lastName: { contains: input.search, mode: "insensitive" } },
+              ],
+            }
+          : {}),
       };
 
       const countP = db.contact.count({ where: whereConditions });
diff --git a/apps/web/src/utils/gravatar-utils.ts b/apps/web/src/utils/gravatar-utils.ts
index 6ecb592..e2699fa 100644
--- a/apps/web/src/utils/gravatar-utils.ts
+++ b/apps/web/src/utils/gravatar-utils.ts
@@ -32,7 +32,7 @@ export function getGravatarUrl(
     size: 80,
     defaultImage: "identicon",
     rating: "g",
-  },
+  }
 ) {
   const trimmedEmail = email.trim().toLowerCase();
   const hash = crypto.createHash("sha256").update(trimmedEmail).digest("hex");