diff --git a/packages/core/admin/admin/src/components/HeaderSearch/index.js b/packages/core/admin/admin/src/components/HeaderSearch/index.js
index ca2f5115e7..006f8a0b42 100644
--- a/packages/core/admin/admin/src/components/HeaderSearch/index.js
+++ b/packages/core/admin/admin/src/components/HeaderSearch/index.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 import { useHistory } from 'react-router-dom';
 import { useIntl } from 'react-intl';
 import { useQuery } from '@strapi/helper-plugin';
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js b/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
index 651c90a83b..962df35250 100644
--- a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
+++ b/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
@@ -1,6 +1,6 @@
 import { Box, Row, TableLabel } from '@strapi/parts';
 import { MultiSelectNested } from '@strapi/parts/Select';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { useIntl } from 'react-intl';
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/UpperFirst.js b/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/UpperFirst.js
index 33905c788c..4784590693 100644
--- a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/UpperFirst.js
+++ b/packages/core/admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/UpperFirst.js
@@ -1,5 +1,5 @@
 /* eslint-disable jsx-a11y/click-events-have-key-events */
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 
 const UpperFirst = ({ content }) => upperFirst(content);
 
diff --git a/packages/core/admin/admin/src/components/Webhooks/EventInput/EventRow.js b/packages/core/admin/admin/src/components/Webhooks/EventInput/EventRow.js
index 0ea3ef7454..846fd6c3db 100644
--- a/packages/core/admin/admin/src/components/Webhooks/EventInput/EventRow.js
+++ b/packages/core/admin/admin/src/components/Webhooks/EventInput/EventRow.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Checkbox, BaseCheckbox } from '@strapi/parts';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 
 const EventRow = ({ disabledEvents, name, events, inputValue, handleChange, handleChangeAll }) => {
   const enabledCheckboxes = events.filter(event => {
diff --git a/packages/core/admin/admin/src/components/Webhooks/EventInput/index.js b/packages/core/admin/admin/src/components/Webhooks/EventInput/index.js
index 97ee76ac98..a1d980c0fa 100644
--- a/packages/core/admin/admin/src/components/Webhooks/EventInput/index.js
+++ b/packages/core/admin/admin/src/components/Webhooks/EventInput/index.js
@@ -1,8 +1,8 @@
-import { Stack, FieldLabel, P, TableLabel } from '@strapi/parts';
+import { FieldLabel, P, Stack, TableLabel } from '@strapi/parts';
 import { useFormikContext } from 'formik';
 import PropTypes from 'prop-types';
 import React from 'react';
-import { FormattedMessage, useIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 import EventRow from './EventRow';
 import formatValue from './utils/formatValue';
@@ -111,15 +111,16 @@ const EventInput = ({ isDraftAndPublish }) => {
             {headersName.map(header => {
               if (header === 'app.utils.publish' || header === 'app.utils.unpublish') {
                 return (
-                  <FormattedMessage id="Settings.webhooks.event.publish-tooltip" key={header}>
-                    {msg => (
-                      <td title={msg}>
-                        <TableLabel textColor="neutral600">
-                          {formatMessage({ id: header })}
-                        </TableLabel>
-                      </td>
-                    )}
-                  </FormattedMessage>
+                  <td
+                    key={header}
+                    title={formatMessage({
+                      id: 'Settings.webhooks.event.publish-tooltip',
+                      defaultMessage:
+                        'This event only exists for contents with Draft/Publish system enabled',
+                    })}
+                  >
+                    <TableLabel textColor="neutral600">{formatMessage({ id: header })}</TableLabel>
+                  </td>
                 );
               }
 
diff --git a/packages/core/admin/admin/src/components/Webhooks/HeadersInput/index.js b/packages/core/admin/admin/src/components/Webhooks/HeadersInput/index.js
index 7c356fd9fc..612b9abb41 100644
--- a/packages/core/admin/admin/src/components/Webhooks/HeadersInput/index.js
+++ b/packages/core/admin/admin/src/components/Webhooks/HeadersInput/index.js
@@ -49,7 +49,11 @@ const HeadersInput = () => {
                       name={`headers.${i}.key`}
                       aria-label={`row ${i + 1} key`}
                       error={
-                        errors.headers?.[i]?.key && formatMessage({ id: errors.headers[i]?.key })
+                        errors.headers?.[i]?.key &&
+                        formatMessage({
+                          id: errors.headers[i]?.key,
+                          defaultMessage: errors.headers[i]?.key,
+                        })
                       }
                     />
                   </GridItem>
@@ -62,7 +66,10 @@ const HeadersInput = () => {
                           name={`headers.${i}.value`}
                           error={
                             errors.headers?.[i]?.value &&
-                            formatMessage({ id: errors.headers[i]?.value })
+                            formatMessage({
+                              id: errors.headers[i]?.value,
+                              defaultMessage: errors.headers[i]?.value,
+                            })
                           }
                         />
                       </Box>
diff --git a/packages/core/admin/admin/src/components/Webhooks/WebhookForm/index.js b/packages/core/admin/admin/src/components/Webhooks/WebhookForm/index.js
index 923248d13e..7ea6a5627f 100644
--- a/packages/core/admin/admin/src/components/Webhooks/WebhookForm/index.js
+++ b/packages/core/admin/admin/src/components/Webhooks/WebhookForm/index.js
@@ -88,7 +88,10 @@ const WebhookForm = ({
             }
             navigationAction={
               <Link startIcon={<BackIcon />} to="/settings/webhooks">
-                Go back
+                {formatMessage({
+                  id: 'app.components.go-back',
+                  defaultMessage: 'Go back',
+                })}
               </Link>
             }
             as="h1"
diff --git a/packages/core/admin/admin/src/content-manager/components/PopupForm/index.js b/packages/core/admin/admin/src/content-manager/components/PopupForm/index.js
index 9db55440f0..580b9ae1d5 100644
--- a/packages/core/admin/admin/src/content-manager/components/PopupForm/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/PopupForm/index.js
@@ -9,7 +9,7 @@ import {
   ModalForm,
 } from '@strapi/helper-plugin';
 import { FormattedMessage } from 'react-intl';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 import { AttributeIcon, Button } from '@buffetjs/core';
 
 const PopupForm = ({
diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json
index d6ac2e872f..c8467c3356 100644
--- a/packages/core/admin/admin/src/translations/en.json
+++ b/packages/core/admin/admin/src/translations/en.json
@@ -202,6 +202,7 @@
   "Users.components.List.empty": "There is no users...",
   "Users.components.List.empty.withFilters": "There is no users with the applied filters...",
   "Users.components.List.empty.withSearch": "There is no users corresponding to the search ({search})...",
+  "app.components.go-back": "Go back",
   "app.components.ToggleCheckbox.on-label": "On",
   "app.components.ToggleCheckbox.off-label": "Off",
   "app.components.BlockLink.code": "Code examples",
diff --git a/packages/core/content-type-builder/admin/src/components/AllowedTypesSelect/index.js b/packages/core/content-type-builder/admin/src/components/AllowedTypesSelect/index.js
index 7a120e963f..c9d6b617d5 100644
--- a/packages/core/content-type-builder/admin/src/components/AllowedTypesSelect/index.js
+++ b/packages/core/content-type-builder/admin/src/components/AllowedTypesSelect/index.js
@@ -2,7 +2,7 @@ import React, { useRef } from 'react';
 import PropTypes from 'prop-types';
 import Select from 'react-select';
 import { useIntl } from 'react-intl';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 import MenuList from './MenuList';
 import getTrad from '../../utils/getTrad';
 
diff --git a/packages/core/content-type-builder/admin/src/components/ComponentSelect/MenuList.js b/packages/core/content-type-builder/admin/src/components/ComponentSelect/MenuList.js
index 9accd612b6..b48715f0ca 100644
--- a/packages/core/content-type-builder/admin/src/components/ComponentSelect/MenuList.js
+++ b/packages/core/content-type-builder/admin/src/components/ComponentSelect/MenuList.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { components } from 'react-select';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 import { useQuery } from '@strapi/helper-plugin';
 import useDataManager from '../../hooks/useDataManager';
 import Ul from '../SelectMenuUl';
diff --git a/packages/core/content-type-builder/admin/src/components/UpperFirst/index.js b/packages/core/content-type-builder/admin/src/components/UpperFirst/index.js
index 98e940a875..606d51b3a6 100644
--- a/packages/core/content-type-builder/admin/src/components/UpperFirst/index.js
+++ b/packages/core/content-type-builder/admin/src/components/UpperFirst/index.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 
 const UpperFirst = ({ content }) => upperFirst(content);
 
diff --git a/packages/core/helper-plugin/lib/src/hooks/useRBAC/utils/generateAllowedActions.js b/packages/core/helper-plugin/lib/src/hooks/useRBAC/utils/generateAllowedActions.js
index 01e5782f37..1b7a7db4c8 100644
--- a/packages/core/helper-plugin/lib/src/hooks/useRBAC/utils/generateAllowedActions.js
+++ b/packages/core/helper-plugin/lib/src/hooks/useRBAC/utils/generateAllowedActions.js
@@ -1,4 +1,4 @@
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 
 const generateAllowedActions = permissionsNames =>
   permissionsNames.reduce((acc, current) => {
diff --git a/packages/core/helper-plugin/lib/src/hooks/useRBAC/utils/generateResultsObject.js b/packages/core/helper-plugin/lib/src/hooks/useRBAC/utils/generateResultsObject.js
index 81fdfeca4c..9afdf4382c 100644
--- a/packages/core/helper-plugin/lib/src/hooks/useRBAC/utils/generateResultsObject.js
+++ b/packages/core/helper-plugin/lib/src/hooks/useRBAC/utils/generateResultsObject.js
@@ -1,4 +1,4 @@
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 
 const generateResultsObject = array =>
   array.reduce((acc, current) => {
diff --git a/packages/core/helper-plugin/lib/src/old/components/FilterButton/index.js b/packages/core/helper-plugin/lib/src/old/components/FilterButton/index.js
index 56ab01c367..b44aa0e7a5 100644
--- a/packages/core/helper-plugin/lib/src/old/components/FilterButton/index.js
+++ b/packages/core/helper-plugin/lib/src/old/components/FilterButton/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 
 import Wrapper from './Wrapper';
 import RemoveButton from './RemoveButton';
diff --git a/packages/plugins/users-permissions/admin/src/components/PrefixedIcon/index.js b/packages/plugins/users-permissions/admin/src/components/PrefixedIcon/index.js
index 96c6ffe242..051dc2d5d5 100644
--- a/packages/plugins/users-permissions/admin/src/components/PrefixedIcon/index.js
+++ b/packages/plugins/users-permissions/admin/src/components/PrefixedIcon/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Flex, Padded, Text } from '@buffetjs/core';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 import PropTypes from 'prop-types';
 
 const PrefixedIcon = ({ icon, name }) => {