diff --git a/packages/core/admin/admin/src/pages/Webhooks/ListView/index.js b/packages/core/admin/admin/src/pages/Webhooks/ListView/index.js
index f52fc13a5e..f5f288a15a 100644
--- a/packages/core/admin/admin/src/pages/Webhooks/ListView/index.js
+++ b/packages/core/admin/admin/src/pages/Webhooks/ListView/index.js
@@ -6,30 +6,43 @@
 
 import React, { useEffect, useReducer, useRef, useState } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import { Header, List } from '@buffetjs/custom';
-import { Button } from '@buffetjs/core';
 import { Plus } from '@buffetjs/icons';
-import { omit } from 'lodash';
 import { useIntl } from 'react-intl';
 import {
   request,
-  ListButton,
   PopUpWarning,
   useRBAC,
   LoadingIndicatorPage,
   EmptyState,
   useNotification,
 } from '@strapi/helper-plugin';
-import adminPermissions from '../../../permissions';
-import PageTitle from '../../../components/SettingsPageTitle';
-import { ListRow } from '../../../components/Webhooks';
-import Wrapper from './Wrapper';
+
+import { HeaderLayout, Layout, ContentLayout } from '@strapi/parts/Layout';
+import { Row } from '@strapi/parts/Row';
+import { Box } from '@strapi/parts/Box';
+import { IconButton } from '@strapi/parts/IconButton';
+import { BaseCheckbox } from '@strapi/parts/BaseCheckbox';
+import { Table, Thead, Tr, Th, Tbody, Td, TFooter } from '@strapi/parts/Table';
+import { Text, TableLabel } from '@strapi/parts/Text';
+import { Button } from '@strapi/parts/Button';
+import { VisuallyHidden } from '@strapi/parts/VisuallyHidden';
+import { Switch } from '@strapi/parts/Switch';
+import AddIcon from '@strapi/icons/AddIcon';
+import EditIcon from '@strapi/icons/EditIcon';
+import DeleteIcon from '@strapi/icons/DeleteIcon';
 import reducer, { initialState } from './reducer';
+import PageTitle from '../../../components/SettingsPageTitle';
+import adminPermissions from '../../../permissions';
 
 function ListView() {
   const {
     isLoading,
-    allowedActions: { canCreate, canRead, canUpdate, canDelete },
+    allowedActions: {
+      canCreate,
+      canRead,
+      // canUpdate,
+      // canDelete,
+    },
   } = useRBAC(adminPermissions.settings.webhooks);
   const toggleNotification = useNotification();
   const isMounted = useRef(true);
@@ -101,30 +114,30 @@ function ListView() {
 
   // List props
   const rowsCount = webhooks.length;
-  const titleLabel = `${
-    rowsCount > 1
-      ? formatMessage({ id: 'Settings.webhooks.title' })
-      : formatMessage({ id: 'Settings.webhooks.singular' })
-  }`;
-  const title = `${rowsCount} ${titleLabel}`;
+  // const titleLabel = `${
+  //   rowsCount > 1
+  //     ? formatMessage({ id: 'Settings.webhooks.title' })
+  //     : formatMessage({ id: 'Settings.webhooks.singular' })
+  // }`;
+  // const title = `${rowsCount} ${titleLabel}`;
 
   /* eslint-disable indent */
-  const deleteButtonProps = canDelete
-    ? {
-        color: 'delete',
-        disabled: !(webhooksToDelete.length > 0),
-        label: formatMessage({ id: 'app.utils.delete' }),
-        onClick: () => setShowModal(true),
-        type: 'button',
-      }
-    : null;
+  // const deleteButtonProps = canDelete
+  //   ? {
+  //       color: 'delete',
+  //       disabled: !(webhooksToDelete.length > 0),
+  //       label: formatMessage({ id: 'app.utils.delete' }),
+  //       onClick: () => setShowModal(true),
+  //       type: 'button',
+  //     }
+  //   : null;
   /* eslint-enable indent */
 
-  const listProps = {
-    title,
-    button: deleteButtonProps,
-    items: webhooks,
-  };
+  // const listProps = {
+  //   title,
+  //   button: deleteButtonProps,
+  //   items: webhooks,
+  // };
 
   const fetchData = async () => {
     try {
@@ -151,6 +164,7 @@ function ListView() {
   };
 
   const handleChange = (value, id) => {
+    // console.log(value, id);
     dispatch({
       type: 'SET_WEBHOOKS_TO_DELETE',
       value,
@@ -224,10 +238,10 @@ function ListView() {
       id,
     });
   };
-
+  console.log(webhooks);
   const handleEnabledChange = async (value, id) => {
+    // console.log(!value)
     const webhookIndex = getWebhookIndex(id);
-
     const initialWebhookProps = webhooks[webhookIndex];
     const keys = [webhookIndex, 'isEnabled'];
 
@@ -276,29 +290,106 @@ function ListView() {
   }
 
   return (
-    <Wrapper>
+    <Layout>
       <PageTitle name="Webhooks" />
-      <Header {...headerProps} />
-      {canRead && (
-        <div className="list-wrapper">
+      <HeaderLayout
+        title={headerProps.title.label}
+        subtitle={headerProps.content}
+        primaryAction={(
+          <Button onClick={() => (canCreate ? handleGoTo('create') : {})} startIcon={<AddIcon />}>
+            {headerProps.actions[0].label}
+          </Button>
+        )}
+      />
+
+      <ContentLayout>
+        <>
           {rowsCount > 0 ? (
-            <List
-              {...listProps}
-              customRowComponent={props => {
-                return (
-                  <ListRow
-                    {...props}
-                    canUpdate={canUpdate}
-                    canDelete={canDelete}
-                    onCheckChange={handleChange}
-                    onEditClick={handleGoTo}
-                    onDeleteCLick={handleDeleteClick}
-                    onEnabledChange={handleEnabledChange}
-                    itemsToDelete={webhooksToDelete}
-                  />
-                );
-              }}
-            />
+            <Table
+              colCount={5}
+              rowCount={webhooks.length}
+              footer={(
+                <TFooter onClick={() => (canCreate ? handleGoTo('create') : {})} icon={<AddIcon />}>
+                  Add another field to this collection type
+                </TFooter>
+              )}
+            >
+              <Thead>
+                <Tr>
+                  <Th>
+                    <BaseCheckbox aria-label="Select all entries" />
+                  </Th>
+                  <Th>
+                    <TableLabel>name</TableLabel>
+                  </Th>
+                  <Th>
+                    <TableLabel>url</TableLabel>
+                  </Th>
+                  <Th>
+                    <TableLabel>status</TableLabel>
+                  </Th>
+                  <Th>
+                    <VisuallyHidden>actions</VisuallyHidden>
+                  </Th>
+                </Tr>
+              </Thead>
+              <Tbody>
+                {webhooks.map(webhook => (
+                  <Tr key={webhook.id}>
+                    <Td>
+                      <BaseCheckbox
+                        aria-label={`Select ${webhook.name}`}
+                        onValueChange={value => handleChange(value, webhook.id)}
+                        id={`Select ${webhook.id}`}
+                        name={`Select ${webhook.name}`}
+                      />
+                    </Td>
+                    <Td>
+                      <Text highlighted textColor="neutral800">
+                        {webhook.name}
+                      </Text>
+                    </Td>
+                    <Td>
+                      <Text textColor="neutral800">{webhook.url}</Text>
+                    </Td>
+                    <Td>
+                      <Row>
+                        <Switch
+                          onLabel="Enabled"
+                          offLabel="Not enabled"
+                          label={`${webhook.name} status`}
+                          selected={webhook.isEnabled}
+                          onChange={() => handleEnabledChange(webhook.isEnabled, webhook.id)}
+                          visibleLabels
+                        />
+                      </Row>
+                    </Td>
+                    <Td>
+                      <Row justifyContent="flex-end">
+                        <IconButton
+                          onClick={() => {
+                            handleGoTo(webhook.id);
+                          }}
+                          label="Edit"
+                          icon={<EditIcon />}
+                          noBorder
+                        />
+                        <Box paddingLeft={1}>
+                          <IconButton
+                            onClick={() => {
+                              handleDeleteClick(webhook.id);
+                            }}
+                            label="Delete"
+                            icon={<DeleteIcon />}
+                            noBorder
+                          />
+                        </Box>
+                      </Row>
+                    </Td>
+                  </Tr>
+                ))}
+              </Tbody>
+            </Table>
           ) : (
             <EmptyState
               title={formatMessage({ id: 'Settings.webhooks.list.empty.title' })}
@@ -307,17 +398,57 @@ function ListView() {
               linkText={formatMessage({ id: 'Settings.webhooks.list.empty.link' })}
             />
           )}
-          <ListButton>{canCreate && <Button {...omit(newButtonProps, 'Component')} />}</ListButton>
-        </div>
-      )}
+        </>
+      </ContentLayout>
       <PopUpWarning
         isOpen={showModal}
         toggleModal={() => setShowModal(!showModal)}
         popUpWarningType="danger"
         onConfirm={handleConfirmDelete}
       />
-    </Wrapper>
+    </Layout>
   );
 }
 
 export default ListView;
+
+// TO KEEP AS EXEMPLE UNTIL WE KNOW HOW TO DEAL WITH EVENTS AND FUNCTIONS DEFINED IN THIS COMPONENT
+
+// {canRead && (
+//   <>
+//     {rowsCount > 0 ?
+//     (
+//       <List
+//         {...listProps}
+//         customRowComponent={props => {
+//           return (
+//             <ListRow
+//               {...props}
+//               canUpdate={canUpdate}
+//               canDelete={canDelete}
+//               onCheckChange={handleChange}
+//               onEditClick={handleGoTo}
+//               onDeleteCLick={handleDeleteClick}
+//               onEnabledChange={handleEnabledChange}
+//               itemsToDelete={webhooksToDelete}
+//             />
+//           );
+//         }}
+//       />
+//     ) : (
+//       <EmptyState
+//         title={formatMessage({ id: 'Settings.webhooks.list.empty.title' })}
+//         description={formatMessage({ id: 'Settings.webhooks.list.empty.description' })}
+//         link="https://strapi.io/documentation/developer-docs/latest/development/backend-customization.html#webhooks"
+//         linkText={formatMessage({ id: 'Settings.webhooks.list.empty.link' })}
+//       />
+//     )}
+//     <ListButton>{canCreate && <Button {...omit(newButtonProps, 'Component')} />}</ListButton>
+//   </>
+// )}
+// <PopUpWarning
+//   isOpen={showModal}
+//   toggleModal={() => setShowModal(!showModal)}
+//   popUpWarningType="danger"
+//   onConfirm={handleConfirmDelete}
+// />