diff --git a/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx b/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx
index 7ddbbce1e8..64a33df5dc 100644
--- a/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx
+++ b/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx
@@ -112,7 +112,6 @@ export const ConfiguredAddons = ({ getAddonIcon }: IConfigureAddonsProps) => {
             <ListItemSecondaryAction>
                 <PermissionIconButton
                     permission={UPDATE_ADDON}
-                    tooltip={addon.enabled ? 'Disable addon' : 'Enable addon'}
                     onClick={() => toggleAddon(addon)}
                 >
                     <ConditionallyRender
diff --git a/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.tsx b/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.tsx
index 103d6294d4..9abbcae0fb 100644
--- a/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.tsx
+++ b/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.tsx
@@ -48,7 +48,6 @@ const NoItemsStrategies = ({
                 condition={Boolean(onClick)}
                 show={
                     <PermissionButton
-                        // @ts-expect-error
                         variant="contained"
                         permission={CREATE_FEATURE_STRATEGY}
                         projectId={projectId}
diff --git a/frontend/src/component/common/PermissionButton/PermissionButton.tsx b/frontend/src/component/common/PermissionButton/PermissionButton.tsx
index b8c961e394..6633c4725b 100644
--- a/frontend/src/component/common/PermissionButton/PermissionButton.tsx
+++ b/frontend/src/component/common/PermissionButton/PermissionButton.tsx
@@ -1,13 +1,11 @@
-import { Button, Tooltip } from '@material-ui/core';
+import { Button, Tooltip, ButtonProps } from '@material-ui/core';
 import { Lock } from '@material-ui/icons';
 import AccessContext from 'contexts/AccessContext';
 import React, { useContext } from 'react';
 import ConditionallyRender from '../ConditionallyRender';
 
-export interface IPermissionButtonProps
-    extends React.HTMLProps<HTMLButtonElement> {
+export interface IPermissionButtonProps extends ButtonProps {
     permission: string | string[];
-    tooltip?: string;
     onClick?: (e: any) => void;
     disabled?: boolean;
     projectId?: string;
@@ -16,7 +14,6 @@ export interface IPermissionButtonProps
 
 const PermissionButton: React.FC<IPermissionButtonProps> = ({
     permission,
-    tooltip,
     onClick,
     children,
     disabled,
@@ -65,7 +62,6 @@ const PermissionButton: React.FC<IPermissionButtonProps> = ({
                     onClick={onClick}
                     disabled={disabled || !access}
                     variant="contained"
-                    // @ts-expect-error
                     color="primary"
                     {...rest}
                     endIcon={
diff --git a/frontend/src/component/common/PermissionIconButton/PermissionIconButton.tsx b/frontend/src/component/common/PermissionIconButton/PermissionIconButton.tsx
index 65ecd803c3..5fd81788f8 100644
--- a/frontend/src/component/common/PermissionIconButton/PermissionIconButton.tsx
+++ b/frontend/src/component/common/PermissionIconButton/PermissionIconButton.tsx
@@ -1,16 +1,13 @@
-import { IconButton, Tooltip } from '@material-ui/core';
+import { IconButton, Tooltip, IconButtonProps } from '@material-ui/core';
 import React, { useContext } from 'react';
 import AccessContext from '../../../contexts/AccessContext';
 
-interface IPermissionIconButtonProps
-    extends React.HTMLProps<HTMLButtonElement> {
+interface IPermissionIconButtonProps extends IconButtonProps {
     permission: string;
     Icon?: React.ElementType;
-    tooltip?: string;
     onClick?: (e: any) => void;
     projectId?: string;
     environmentId?: string;
-    edge?: string;
     className?: string;
     title?: string;
 }
@@ -18,7 +15,6 @@ interface IPermissionIconButtonProps
 const PermissionIconButton: React.FC<IPermissionIconButtonProps> = ({
     permission,
     Icon,
-    tooltip,
     onClick,
     projectId,
     children,
@@ -43,7 +39,6 @@ const PermissionIconButton: React.FC<IPermissionIconButtonProps> = ({
     return (
         <Tooltip title={tooltipText} arrow>
             <span>
-                {/* @ts-expect-error */}
                 <IconButton onClick={onClick} disabled={!access} {...rest}>
                     {children}
                 </IconButton>
diff --git a/frontend/src/component/common/ResponsiveButton/ResponsiveButton.tsx b/frontend/src/component/common/ResponsiveButton/ResponsiveButton.tsx
index a97a7a5ba5..1320868650 100644
--- a/frontend/src/component/common/ResponsiveButton/ResponsiveButton.tsx
+++ b/frontend/src/component/common/ResponsiveButton/ResponsiveButton.tsx
@@ -7,7 +7,6 @@ import React from 'react';
 interface IResponsiveButtonProps {
     Icon: React.ElementType;
     onClick: () => void;
-    tooltip?: string;
     disabled?: boolean;
     permission: string;
     projectId?: string;
@@ -20,7 +19,6 @@ const ResponsiveButton: React.FC<IResponsiveButtonProps> = ({
     Icon,
     onClick,
     maxWidth,
-    tooltip,
     disabled = false,
     children,
     permission,
@@ -40,7 +38,6 @@ const ResponsiveButton: React.FC<IResponsiveButtonProps> = ({
                     permission={permission}
                     projectId={projectId}
                     environmentId={environmentId}
-                    tooltip={tooltip}
                     data-loading
                     {...rest}
                 >
@@ -53,11 +50,9 @@ const ResponsiveButton: React.FC<IResponsiveButtonProps> = ({
                     permission={permission}
                     projectId={projectId}
                     color="primary"
-                    // @ts-expect-error
                     variant="contained"
                     disabled={disabled}
                     environmentId={environmentId}
-                    tooltip={tooltip}
                     data-loading
                     {...rest}
                 >
diff --git a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsInformation/FeatureSettingsInformation.tsx b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsInformation/FeatureSettingsInformation.tsx
index 5428b586bb..37aaf4d8c7 100644
--- a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsInformation/FeatureSettingsInformation.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsInformation/FeatureSettingsInformation.tsx
@@ -31,7 +31,6 @@ export const FeatureSettingsInformation = ({
                 </Typography>
                 <PermissionIconButton
                     permission={UPDATE_FEATURE}
-                    tooltip={'Edit feature'}
                     projectId={projectId}
                     data-loading
                     onClick={onEdit}
diff --git a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsMetadata/FeatureSettingsMetadata.tsx b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsMetadata/FeatureSettingsMetadata.tsx
index 196b0868c7..a548e01a78 100644
--- a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsMetadata/FeatureSettingsMetadata.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsMetadata/FeatureSettingsMetadata.tsx
@@ -84,7 +84,6 @@ const FeatureSettingsMetadata = () => {
                 condition={dirty}
                 show={
                     <PermissionButton
-                        tooltip="Save changes"
                         permission={UPDATE_FEATURE}
                         onClick={handleSubmit}
                         projectId={projectId}
diff --git a/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategyEditable/FeatureStrategyEditable.tsx b/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategyEditable/FeatureStrategyEditable.tsx
index ce9efc24e7..d072c5f114 100644
--- a/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategyEditable/FeatureStrategyEditable.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategyEditable/FeatureStrategyEditable.tsx
@@ -175,7 +175,6 @@ const FeatureStrategyEditable = ({
                                     permission={UPDATE_FEATURE_STRATEGY}
                                     projectId={projectId}
                                     environmentId={activeEnvironment?.name}
-                                    // @ts-expect-error
                                     variant="contained"
                                     color="primary"
                                     className={styles.editButton}
@@ -189,8 +188,8 @@ const FeatureStrategyEditable = ({
                                     onClick={discardChanges}
                                     className={styles.editButton}
                                     disabled={loading}
-                                    color="tertiary"
                                     // @ts-expect-error
+                                    color="tertiary"
                                     variant="text"
                                     permission={UPDATE_FEATURE_STRATEGY}
                                     projectId={projectId}
diff --git a/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx b/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx
index 25219c006d..7959e08102 100644
--- a/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx
@@ -165,8 +165,7 @@ const FeatureStrategyAccordionBody: React.FC<
                         <PermissionButton
                             className={styles.addConstraintBtn}
                             onClick={toggleConstraints}
-                            // @ts-expect-error
-                            variant={'text'}
+                            variant="text"
                             data-test={ADD_CONSTRAINT_ID}
                             permission={[
                                 UPDATE_FEATURE_STRATEGY,
diff --git a/frontend/src/component/feature/FeatureView/FeatureStrategies2/FeatureStrategiesEnvironments/FeatureStrategyEditable/FeatureStrategyEditable.tsx b/frontend/src/component/feature/FeatureView/FeatureStrategies2/FeatureStrategiesEnvironments/FeatureStrategyEditable/FeatureStrategyEditable.tsx
index 8af98de7c7..924c70a65d 100644
--- a/frontend/src/component/feature/FeatureView/FeatureStrategies2/FeatureStrategiesEnvironments/FeatureStrategyEditable/FeatureStrategyEditable.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureStrategies2/FeatureStrategiesEnvironments/FeatureStrategyEditable/FeatureStrategyEditable.tsx
@@ -201,7 +201,6 @@ const FeatureStrategyEditable = ({
                                     permission={UPDATE_FEATURE_STRATEGY}
                                     projectId={projectId}
                                     environmentId={activeEnvironment?.name}
-                                    // @ts-expect-error
                                     variant="contained"
                                     color="primary"
                                     className={styles.editButton}
@@ -215,8 +214,8 @@ const FeatureStrategyEditable = ({
                                     onClick={discardChanges}
                                     className={styles.editButton}
                                     disabled={loading}
-                                    color="tertiary"
                                     // @ts-expect-error
+                                    color="tertiary"
                                     variant="text"
                                     permission={UPDATE_FEATURE_STRATEGY}
                                     projectId={projectId}
diff --git a/frontend/src/component/feature/FeatureView/FeatureStrategies2/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx b/frontend/src/component/feature/FeatureView/FeatureStrategies2/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx
index 6dc936dc6e..579a1a92c8 100644
--- a/frontend/src/component/feature/FeatureView/FeatureStrategies2/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureStrategies2/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx
@@ -230,7 +230,6 @@ const FeatureStrategyAccordionBody: React.FC<
                         <PermissionButton
                             className={styles.addConstraintBtn}
                             onClick={addConstraint}
-                            // @ts-expect-error
                             variant={'text'}
                             data-test={ADD_CONSTRAINT_ID}
                             permission={[
diff --git a/frontend/src/component/feature/FeatureView/FeatureView.tsx b/frontend/src/component/feature/FeatureView/FeatureView.tsx
index e96ff159cf..ab96f70e41 100644
--- a/frontend/src/component/feature/FeatureView/FeatureView.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureView.tsx
@@ -166,7 +166,6 @@ export const FeatureView = () => {
                                 <PermissionIconButton
                                     permission={CREATE_FEATURE}
                                     projectId={projectId}
-                                    tooltip="Copy"
                                     data-loading
                                     // @ts-expect-error
                                     component={Link}
@@ -177,7 +176,6 @@ export const FeatureView = () => {
                                 <PermissionIconButton
                                     permission={DELETE_FEATURE}
                                     projectId={projectId}
-                                    tooltip="Archive feature toggle"
                                     data-loading
                                     onClick={() => setShowDelDialog(true)}
                                 >
@@ -187,7 +185,6 @@ export const FeatureView = () => {
                                     onClick={() => setOpenStaleDialog(true)}
                                     permission={UPDATE_FEATURE}
                                     projectId={projectId}
-                                    tooltip="Toggle stale status"
                                     data-loading
                                 >
                                     <WatchLater titleAccess="Toggle stale status" />
@@ -196,7 +193,6 @@ export const FeatureView = () => {
                                     onClick={() => setOpenTagDialog(true)}
                                     permission={UPDATE_FEATURE}
                                     projectId={projectId}
-                                    tooltip="Add tag"
                                     data-loading
                                 >
                                     <Label titleAccess="Add tag" />
diff --git a/frontend/src/component/project/ProjectAccess/ProjectAccessList/ProjectAccessListItem/ProjectAccessListItem.tsx b/frontend/src/component/project/ProjectAccess/ProjectAccessList/ProjectAccessListItem/ProjectAccessListItem.tsx
index 77dd9768c8..7539e1e135 100644
--- a/frontend/src/component/project/ProjectAccess/ProjectAccessList/ProjectAccessListItem/ProjectAccessListItem.tsx
+++ b/frontend/src/component/project/ProjectAccess/ProjectAccessList/ProjectAccessListItem/ProjectAccessListItem.tsx
@@ -73,15 +73,8 @@ export const ProjectAccessListItem = ({
                     edge="end"
                     aria-label="delete"
                     title="Remove access"
-                    onClick={() => {
-                        handleRemoveAccess(user);
-                    }}
+                    onClick={() => handleRemoveAccess(user)}
                     disabled={access.users.length === 1}
-                    tooltip={
-                        access.users.length === 1
-                            ? 'A project must have at least one owner'
-                            : 'Remove access'
-                    }
                 >
                     <Delete />
                 </PermissionIconButton>
diff --git a/frontend/src/component/project/ProjectList/ProjectList.tsx b/frontend/src/component/project/ProjectList/ProjectList.tsx
index 173adcb080..13a544339d 100644
--- a/frontend/src/component/project/ProjectList/ProjectList.tsx
+++ b/frontend/src/component/project/ProjectList/ProjectList.tsx
@@ -154,7 +154,6 @@ export const ProjectListNew = () => {
                                 onClick={() => history.push('/projects/create')}
                                 maxWidth="700px"
                                 permission={CREATE_PROJECT}
-                                tooltip={createButtonData.title}
                                 disabled={createButtonData.disabled}
                             >
                                 New project
diff --git a/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx b/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx
index c75cc09f58..1caa625dac 100644
--- a/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx
+++ b/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx
@@ -189,7 +189,6 @@ export const StrategiesList = () => {
                     <PermissionIconButton
                         onClick={() => onDeprecateStrategy(strategy)}
                         permission={UPDATE_STRATEGY}
-                        tooltip={'Deprecate activation strategy'}
                     >
                         <Visibility />
                     </PermissionIconButton>
@@ -207,7 +206,6 @@ export const StrategiesList = () => {
                         history.push(`/strategies/${strategy?.name}/edit`)
                     }
                     permission={UPDATE_STRATEGY}
-                    tooltip={'Edit strategy'}
                 >
                     <Edit titleAccess="Edit strategy" />
                 </PermissionIconButton>
diff --git a/frontend/src/component/strategies/StrategyView/StrategyView.tsx b/frontend/src/component/strategies/StrategyView/StrategyView.tsx
index c0f9caf52b..63ca09f6b3 100644
--- a/frontend/src/component/strategies/StrategyView/StrategyView.tsx
+++ b/frontend/src/component/strategies/StrategyView/StrategyView.tsx
@@ -41,7 +41,6 @@ export const StrategyView = () => {
                             show={
                                 <PermissionIconButton
                                     permission={UPDATE_STRATEGY}
-                                    tooltip={'Edit strategy'}
                                     data-loading
                                     onClick={handleEdit}
                                 >
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 03fe37364c..cf6f49899e 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -5776,7 +5776,7 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@^2.1.2, fsevents@^2.1.3, fsevents@~2.3.1:
+fsevents@^2.1.2, fsevents@^2.1.3, fsevents@~2.3.1, fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==