diff --git a/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx b/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx
index 7b614c1..f053f62 100644
--- a/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx
+++ b/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx
@@ -12,7 +12,7 @@ import {
   checkIfBuiltInInstanceNamespaceScoped,
   useBuiltinResources,
 } from '@prorobotech/openapi-k8s-toolkit'
-import { FlexGrow, OverflowMaxHeightContainer, MarginTopContainer } from 'components'
+import { FlexGrow, OverflowMaxHeightContainer } from 'components'
 import { TABLE_PROPS } from 'constants/tableProps'
 import {
   HEAD_FIRST_ROW,
@@ -175,7 +175,7 @@ export const TableBuiltinInfo: FC<TTableBuiltinInfoProps> = ({ namespace, typeNa
             tableProps={TABLE_PROPS}
           />
         )}
-        {selectedRowKeys.length > 0 && (
+        {/* {selectedRowKeys.length > 0 && (
           <MarginTopContainer $top={-40}>
             <Flex gap={16}>
               <Button type="primary" onClick={clearSelected}>
@@ -188,7 +188,7 @@ export const TableBuiltinInfo: FC<TTableBuiltinInfoProps> = ({ namespace, typeNa
               </Button>
             </Flex>
           </MarginTopContainer>
-        )}
+        )} */}
       </OverflowMaxHeightContainer>
       <FlexGrow />
       <Flex justify="space-between">
@@ -209,6 +209,16 @@ export const TableBuiltinInfo: FC<TTableBuiltinInfoProps> = ({ namespace, typeNa
           <PlusOutlined />
           Add
         </Button>
+        <Flex gap={16}>
+          <Button type="primary" onClick={clearSelected}>
+            <ClearOutlined />
+            Clear
+          </Button>
+          <Button type="primary" onClick={() => setIsDeleteModalManyOpen(selectedRowsData)}>
+            <MinusOutlined />
+            Delete
+          </Button>
+        </Flex>
       </Flex>
       {isDeleteModalOpen && (
         <DeleteModal
diff --git a/src/components/organisms/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx b/src/components/organisms/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx
index 4647a0f..9ca06e4 100644
--- a/src/components/organisms/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx
+++ b/src/components/organisms/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx
@@ -11,7 +11,7 @@ import {
   TAdditionalPrinterColumns,
   useCrdResources,
 } from '@prorobotech/openapi-k8s-toolkit'
-import { FlexGrow, OverflowMaxHeightContainer, MarginTopContainer } from 'components'
+import { FlexGrow, OverflowMaxHeightContainer } from 'components'
 import { TABLE_PROPS } from 'constants/tableProps'
 import {
   HEAD_FIRST_ROW,
@@ -174,7 +174,7 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
             tableProps={TABLE_PROPS}
           />
         )}
-        {selectedRowKeys.length > 0 && (
+        {/* {selectedRowKeys.length > 0 && (
           <MarginTopContainer $top={-40}>
             <Flex gap={16}>
               <Button type="primary" onClick={clearSelected}>
@@ -187,7 +187,7 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
               </Button>
             </Flex>
           </MarginTopContainer>
-        )}
+        )} */}
       </OverflowMaxHeightContainer>
       <FlexGrow />
       <Flex justify="space-between">
@@ -210,6 +210,16 @@ export const ResourceInfo: FC<TResourceInfoProps> = ({
           <PlusOutlined />
           Add
         </Button>
+        <Flex gap={16}>
+          <Button type="primary" onClick={clearSelected}>
+            <ClearOutlined />
+            Clear
+          </Button>
+          <Button type="primary" onClick={() => setIsDeleteModalManyOpen(selectedRowsData)}>
+            <MinusOutlined />
+            Delete
+          </Button>
+        </Flex>
       </Flex>
       {isDeleteModalOpen && (
         <DeleteModal
diff --git a/src/components/organisms/TableNonCrdInfo/TableNonCrdInfo.tsx b/src/components/organisms/TableNonCrdInfo/TableNonCrdInfo.tsx
index 2e9724f..6ee9a89 100644
--- a/src/components/organisms/TableNonCrdInfo/TableNonCrdInfo.tsx
+++ b/src/components/organisms/TableNonCrdInfo/TableNonCrdInfo.tsx
@@ -13,7 +13,7 @@ import {
   checkIfApiInstanceNamespaceScoped,
   useApiResources,
 } from '@prorobotech/openapi-k8s-toolkit'
-import { FlexGrow, OverflowMaxHeightContainer, MarginTopContainer } from 'components'
+import { FlexGrow, OverflowMaxHeightContainer } from 'components'
 import { TABLE_PROPS } from 'constants/tableProps'
 import {
   HEAD_FIRST_ROW,
@@ -189,7 +189,7 @@ export const TableNonCrdInfo: FC<TTableNonCrdInfoProps> = ({
             tableProps={TABLE_PROPS}
           />
         )}
-        {selectedRowKeys.length > 0 && (
+        {/* {selectedRowKeys.length > 0 && (
           <MarginTopContainer $top={-40}>
             <Flex gap={16}>
               <Button type="primary" onClick={clearSelected}>
@@ -202,7 +202,7 @@ export const TableNonCrdInfo: FC<TTableNonCrdInfoProps> = ({
               </Button>
             </Flex>
           </MarginTopContainer>
-        )}
+        )} */}
       </OverflowMaxHeightContainer>
       <FlexGrow />
       <Flex justify="space-between">
@@ -225,6 +225,16 @@ export const TableNonCrdInfo: FC<TTableNonCrdInfoProps> = ({
           <PlusOutlined />
           Add
         </Button>
+        <Flex gap={16}>
+          <Button type="primary" onClick={clearSelected}>
+            <ClearOutlined />
+            Clear
+          </Button>
+          <Button type="primary" onClick={() => setIsDeleteModalManyOpen(selectedRowsData)}>
+            <MinusOutlined />
+            Delete
+          </Button>
+        </Flex>
       </Flex>
       {isDeleteModalOpen && (
         <DeleteModal