diff --git a/src/components/pages/inventory/product/InventoryProductTable.tsx b/src/components/pages/inventory/product/InventoryProductTable.tsx
index 316bd103..cfbc284a 100644
--- a/src/components/pages/inventory/product/InventoryProductTable.tsx
+++ b/src/components/pages/inventory/product/InventoryProductTable.tsx
@@ -2,13 +2,8 @@
 
 import Button from '@/components/Button';
 import DebouncedTextInput from '@/components/input/DebouncedTextInput';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
 import Table from '@/components/Table';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
 import RequirePermission from '@/components/helper/RequirePermission';
-import { ROWS_OPTIONS } from '@/config/constant';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { cn, formatCurrency, formatNumber } from '@/lib/helper';
 import { InventoryProductApi } from '@/services/api/inventory';
@@ -18,28 +13,59 @@ import { Icon } from '@iconify/react';
 import { CellContext, ColumnDef, SortingState } from '@tanstack/react-table';
 import { ChangeEventHandler, useMemo, useState } from 'react';
 import useSWR from 'swr';
+import PopoverButton from '@/components/popover/PopoverButton';
+import PopoverContent from '@/components/popover/PopoverContent';
 
 const RowOptionsMenu = ({
-  type = 'dropdown',
+  popoverPosition = 'bottom',
   props,
 }: {
-  type: 'dropdown' | 'collapse';
+  popoverPosition: 'bottom' | 'top';
   props: CellContext<InventoryProduct, unknown>;
-}) => (
-  <RowOptionsMenuWrapper type={type}>
-    <RequirePermission permissions='lti.inventory.product_stock.detail'>
-      <Button
-        href={`/inventory/product/detail?inventoryProductId=${props.row.original.id}`}
+}) => {
+  const popoverId = `product#${props.row.original.id}`;
+  const popoverAnchorName = `--anchor-product#${props.row.original.id}`;
+
+  const closePopover = () => {
+    document.getElementById(popoverId)?.hidePopover();
+  };
+
+  return (
+    <div className='relative'>
+      <PopoverButton
+        tabIndex={0}
         variant='ghost'
-        color='primary'
-        className='justify-start text-sm'
+        color='none'
+        popoverTarget={popoverId}
+        anchorName={popoverAnchorName}
       >
-        <Icon icon='mdi:eye-outline' width={16} height={16} />
-        Detail
-      </Button>
-    </RequirePermission>
-  </RowOptionsMenuWrapper>
-);
+        <Icon icon='material-symbols:more-vert' width={16} height={16} />
+      </PopoverButton>
+
+      <PopoverContent
+        id={popoverId}
+        anchorName={popoverAnchorName}
+        position={popoverPosition === 'bottom' ? 'bottom-start' : 'left'}
+        className='w-full max-w-40 rounded-xl border border-base-content/5 shadow-sm'
+      >
+        <div className='flex flex-col bg-base-100 rounded-xl'>
+          <RequirePermission permissions='lti.inventory.product_stock.detail'>
+            <Button
+              href={`/inventory/product/detail?inventoryProductId=${props.row.original.id}`}
+              variant='ghost'
+              color='none'
+              className='p-3 justify-start text-sm font-semibold w-full'
+              onClick={closePopover}
+            >
+              <Icon icon='heroicons:eye' width={20} height={20} />
+              Detail
+            </Button>
+          </RequirePermission>
+        </div>
+      </PopoverContent>
+    </div>
+  );
+};
 
 const InventoryProductTable = () => {
   const {
@@ -69,16 +95,10 @@ const InventoryProductTable = () => {
     updateFilter('search', e.target.value);
   };
 
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
-    const newVal = val as OptionType;
-    setPageSize(newVal.value as number);
-    setPage(1);
-  };
-
   const columns: ColumnDef<InventoryProduct>[] = useMemo(
     () => [
       {
-        header: '#',
+        header: 'No',
         cell: (props) =>
           tableFilterState.pageSize * (tableFilterState.page - 1) +
           props.row.index +
@@ -125,7 +145,7 @@ const InventoryProductTable = () => {
       },
       {
         header: 'Aksi',
-        cell: (props) => {
+        cell: (props: CellContext<InventoryProduct, unknown>) => {
           const currentPageSize =
             props.table.getPaginationRowModel().rows.length;
           const currentPageRows = props.table.getPaginationRowModel().flatRows;
@@ -135,58 +155,57 @@ const InventoryProductTable = () => {
           const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
 
           return (
-            <>
-              {currentPageSize > 2 && (
-                <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                  <RowOptionsMenu type='dropdown' props={props} />
-                </RowDropdownOptions>
-              )}
-
-              {currentPageSize <= 2 && (
-                <RowCollapseOptions>
-                  <RowOptionsMenu type='collapse' props={props} />
-                </RowCollapseOptions>
-              )}
-            </>
+            <RowOptionsMenu
+              props={props}
+              popoverPosition={isLast2Rows ? 'top' : 'bottom'}
+            />
           );
         },
       },
     ],
-    []
+    [tableFilterState.pageSize, tableFilterState.page]
   );
 
   return (
-    <>
-      <div className='w-full p-0 sm:p-4'>
-        <div className='flex flex-col gap-2 mb-4'>
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
-            <div className='w-full flex flex-row gap-2'></div>
-          </div>
-
-          <div className='flex justify-between items-end gap-4'>
-            <DebouncedTextInput
-              name='search'
-              placeholder='Cari Produk'
-              value={tableFilterState.search}
-              onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
-            />
-            <SelectInput
-              label='Baris'
-              options={ROWS_OPTIONS}
-              value={{
-                label: String(tableFilterState.pageSize),
-                value: tableFilterState.pageSize,
-              }}
-              onChange={pageSizeChangeHandler}
-              className={{
-                wrapper:
-                  'col-span-6 sm:col-span-4 max-w-28 sm:justify-self-end',
-              }}
-            />
-          </div>
+    <div className='w-full'>
+      {/* Header Section */}
+      <div className='w-full p-3 flex flex-row justify-between gap-3 flex-wrap border-b border-base-content/10'>
+        {/* Action Buttons */}
+        <div className='w-fit flex flex-row gap-3 flex-wrap'>
+          <RequirePermission permissions='lti.inventory.product_stock.create'>
+            <Button
+              href='/inventory/product/add'
+              color='primary'
+              className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
+            >
+              <Icon icon='heroicons:plus' width={20} height={20} />
+              Add Product
+            </Button>
+          </RequirePermission>
         </div>
 
+        {/* Search */}
+        <div className='flex flex-1 flex-row justify-start sm:justify-end items-center gap-3 flex-wrap'>
+          <DebouncedTextInput
+            name='search'
+            placeholder='Cari Produk'
+            value={tableFilterState.search ?? ''}
+            onChange={searchChangeHandler}
+            startAdornment={
+              <Icon icon='heroicons:magnifying-glass' width={20} height={20} />
+            }
+            className={{
+              wrapper: 'w-full min-w-24 max-w-3xs',
+              inputWrapper: 'rounded-xl! shadow-button-soft',
+              input:
+                'placeholder:font-semibold placeholder:text-base-content/50',
+            }}
+          />
+        </div>
+      </div>
+
+      {/* Table Section */}
+      <div className='flex flex-col mb-4'>
         <Table<InventoryProduct>
           data={
             isResponseSuccess(inventoryProducts) ? inventoryProducts?.data : []
@@ -204,27 +223,21 @@ const InventoryProductTable = () => {
               : 0
           }
           onPageChange={setPage}
+          onPageSizeChange={setPageSize}
           isLoading={isLoading}
           sorting={sorting}
           setSorting={setSorting}
           className={{
-            containerClassName: cn({
-              'mb-20':
+            containerClassName: cn('p-3 mb-0', {
+              'w-full':
                 isResponseSuccess(inventoryProducts) &&
                 inventoryProducts?.data?.length === 0,
             }),
-            tableWrapperClassName: 'overflow-x-auto min-h-full!',
-            tableClassName: 'font-inter w-full table-auto min-h-full!',
-            headerRowClassName: 'border-b border-b-gray-200',
-            headerColumnClassName:
-              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-            bodyRowClassName: 'border-b border-b-gray-200',
-            bodyColumnClassName:
-              'px-6 py-3 last:flex last:flex-row last:justify-end',
+            headerColumnClassName: 'text-nowrap',
           }}
         />
       </div>
-    </>
+    </div>
   );
 };