diff --git a/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx b/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
index 99f4cb53b..81571f8b0 100644
--- a/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
@@ -94,7 +94,20 @@ export function BillDetailEditReturn({
                 <table style={{ tableLayout: "auto", width: "100%" }}>
                   <thead>
                     <tr>
-                      <td></td>
+                      <td>
+                        <Checkbox
+                          onChange={(e) => {
+                            form.setFieldsValue({
+                              billlines: form
+                                .getFieldsValue()
+                                .billlines.map((b) => ({
+                                  ...b,
+                                  selected: e.target.checked,
+                                })),
+                            });
+                          }}
+                        />
+                      </td>
                       <td>{t("billlines.fields.line_desc")}</td>
                       <td>{t("billlines.fields.quantity")}</td>
                       <td>{t("billlines.fields.actual_price")}</td>
diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx
index 8257c0b39..9dea48f71 100644
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -67,39 +67,7 @@ export function BillsListTableComponent({
           jobRO
         }
       />
-      <Button
-        disabled={
-          record.is_credit_memo ||
-          record.vendorid === bodyshop.inhousevendorid ||
-          jobRO
-        }
-        onClick={() => {
-          setPartsOrderContext({
-            actions: {},
-            context: {
-              jobId: job.id,
-              vendorId: record.vendorid,
-              returnFromBill: record.id,
-              invoiceNumber: record.invoice_number,
-              linesToOrder: record.billlines.map((i) => {
-                return {
-                  line_desc: i.line_desc,
-                  // db_price: i.actual_price,
-                  act_price: i.actual_price,
-                  cost: i.actual_cost,
-                  quantity: i.quantity,
-                  joblineid: i.joblineid,
-                  oem_partno: i.jobline && i.jobline.oem_partno,
-                  part_type: i.jobline && i.jobline.part_type,
-                };
-              }),
-              isReturn: true,
-            },
-          });
-        }}
-      >
-        {t("bills.actions.return")}
-      </Button>
+
       {record.isinhouse && (
         <PrintWrapperComponent
           templateObject={{