diff --git a/apps/web/src/app/agents/page.tsx b/apps/web/src/app/agents/page.tsx
index 56d2d94..e395de6 100644
--- a/apps/web/src/app/agents/page.tsx
+++ b/apps/web/src/app/agents/page.tsx
@@ -224,7 +224,7 @@ export default function PublicAgentsPage(): React.ReactElement {
                   TableRow: (props) => (
                     <tr
                       {...props}
-                      className="border-b border-border bg-white dark:bg-zinc-900 hover:bg-surface transition-all duration-150 group"
+                      className="border-b border-border bg-surface hover:bg-surface-secondary transition-all duration-150 group"
                     />
                   ),
                 }}
diff --git a/apps/web/src/app/collections/page.tsx b/apps/web/src/app/collections/page.tsx
index 24adb50..ef05728 100644
--- a/apps/web/src/app/collections/page.tsx
+++ b/apps/web/src/app/collections/page.tsx
@@ -269,7 +269,7 @@ export default function PublicCollectionsPage(): React.ReactElement {
                   TableRow: (props) => (
                     <tr
                       {...props}
-                      className="border-b border-border bg-white dark:bg-zinc-900 hover:bg-surface transition-all duration-150 group"
+                      className="border-b border-border bg-surface hover:bg-surface-secondary transition-all duration-150 group"
                     />
                   ),
                 }}
diff --git a/apps/web/src/app/tool/tool-search/page.tsx b/apps/web/src/app/tool/tool-search/page.tsx
index 5fb3ab8..52c475e 100644
--- a/apps/web/src/app/tool/tool-search/page.tsx
+++ b/apps/web/src/app/tool/tool-search/page.tsx
@@ -315,7 +315,7 @@ export default function ToolSearchPage(): React.ReactElement {
                 TableRow: (props) => (
                   <tr
                     {...props}
-                    className="border-b border-border bg-white dark:bg-zinc-900 hover:bg-surface transition-all duration-150 group"
+                    className="border-b border-border bg-surface hover:bg-surface-secondary transition-all duration-150 group"
                   />
                 ),
               }}
diff --git a/packages/ui/src/Table/Table.tsx b/packages/ui/src/Table/Table.tsx
index d351547..dd650d0 100644
--- a/packages/ui/src/Table/Table.tsx
+++ b/packages/ui/src/Table/Table.tsx
@@ -83,9 +83,9 @@ const TableRow = forwardRef<HTMLTableRowElement, TableRowProps>(
     <tr
       ref={ref}
       className={cn(
-        'border-b border-border bg-white dark:bg-zinc-900 transition-colors',
-        interactive && 'cursor-pointer hover:bg-surface',
-        selected && 'bg-surface',
+        'border-b border-border bg-surface transition-colors',
+        interactive && 'cursor-pointer hover:bg-surface-secondary',
+        selected && 'bg-surface-secondary',
         className
       )}
       {...props}