diff --git a/packages/core/src/renderer/components/item-object-list/content.tsx b/packages/core/src/renderer/components/item-object-list/content.tsx
index 5f7fce51c1..601e9cf442 100644
--- a/packages/core/src/renderer/components/item-object-list/content.tsx
+++ b/packages/core/src/renderer/components/item-object-list/content.tsx
@@ -14,8 +14,6 @@ import type { TableProps, TableRowProps, TableSortCallbacks } from "../table";
 import { TableCell, TableHead, TableRow } from "../table";
 import type { IClassName, StrictReactNode } from "@k8slens/utilities";
 import { cssNames, isDefined, isReactNode, noop, prevDefault, stopPropagation } from "@k8slens/utilities";
-import type { AddRemoveButtonsProps } from "../add-remove-buttons";
-import { AddRemoveButtons } from "../add-remove-buttons";
 import { NoItems } from "../no-items";
 import { Spinner } from "../spinner";
 import type { GeneralKubeObjectListLayoutColumn, ItemObject, TableCellProps } from "@k8slens/list-layout";
@@ -35,7 +33,7 @@ import type { ToggleTableColumnVisibility } from "../../../features/user-prefere
 import toggleTableColumnVisibilityInjectable from "../../../features/user-preferences/common/toggle-table-column-visibility.injectable";
 import type { IsTableColumnHidden } from "../../../features/user-preferences/common/is-table-column-hidden.injectable";
 import isTableColumnHiddenInjectable from "../../../features/user-preferences/common/is-table-column-hidden.injectable";
-import type { TableComponent } from "@k8slens/table";
+import { AddOrRemoveButtons, AddRemoveButtonsProps, TableComponent, addOrRemoveButtonsInjectionToken } from "@k8slens/table";
 import { tableComponentInjectionToken } from "@k8slens/table";
 
 export interface ItemListLayoutContentProps<Item extends ItemObject, PreLoadStores extends boolean> {
@@ -83,6 +81,7 @@ interface Dependencies {
   toggleTableColumnVisibility: ToggleTableColumnVisibility;
   isTableColumnHidden: IsTableColumnHidden;
   table: TableComponent;
+  addOrRemoveButtons: AddOrRemoveButtons;
 }
 
 @observer
@@ -303,7 +302,7 @@ class NonInjectedItemListLayoutContent<
     const {
       store, hasDetailsView, addRemoveButtons = {}, virtual, sortingCallbacks,
       detailsItem, className, tableProps = {}, tableId, getItems, activeTheme,
-      table,
+      table, addOrRemoveButtons
     } = this.props;
     const selectedItemId = detailsItem && detailsItem.getId();
     const classNames = cssNames(className, "box", "grow", activeTheme.get().type);
@@ -331,7 +330,7 @@ class NonInjectedItemListLayoutContent<
 
         <Observer>
           {() => (
-            <AddRemoveButtons
+            <addOrRemoveButtons.Component
               onRemove={
                 (store.removeItems || store.removeSelectedItems) && selectedItems.length > 0
                   ? () => this.removeItemsDialog(selectedItems)
@@ -391,5 +390,6 @@ export const ItemListLayoutContent = withInjectables<Dependencies, ItemListLayou
     toggleTableColumnVisibility: di.inject(toggleTableColumnVisibilityInjectable),
     isTableColumnHidden: di.inject(isTableColumnHiddenInjectable),
     table: di.inject(tableComponentInjectionToken),
+    addOrRemoveButtons: di.inject(addOrRemoveButtonsInjectionToken),
   }),
 }) as <Item extends ItemObject, PreLoadStores extends boolean>(props: ItemListLayoutContentProps<Item, PreLoadStores>) => React.ReactElement;
diff --git a/packages/table/index.ts b/packages/table/index.ts
index 67a48d618b..099926bd01 100644
--- a/packages/table/index.ts
+++ b/packages/table/index.ts
@@ -51,6 +51,6 @@ export const tableComponentInjectionToken = getInjectionToken<TableComponent>({
   id: "table-component-injection-token",
 });
 
-export const addOrRemoveButtonsInjectionToken = getInjectionToken<TableComponent>({
+export const addOrRemoveButtonsInjectionToken = getInjectionToken<AddOrRemoveButtons>({
   id: "add-or-remove-buttons-injection-token",
 });
\ No newline at end of file