diff --git a/frontend/src/component/addons/AddonList/AvailableAddons/AvailableAddons.tsx b/frontend/src/component/addons/AddonList/AvailableAddons/AvailableAddons.tsx
index 9632b0e9e5..b9d470291a 100644
--- a/frontend/src/component/addons/AddonList/AvailableAddons/AvailableAddons.tsx
+++ b/frontend/src/component/addons/AddonList/AvailableAddons/AvailableAddons.tsx
@@ -44,7 +44,6 @@ export const AvailableAddons = ({
                     onClick={() =>
                         history.push(`/addons/create/${provider.name}`)
                     }
-                    tooltip={`Configure ${provider.name} Addon`}
                 >
                     Configure
                 </PermissionButton>
diff --git a/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx b/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx
index 78ef5188cc..c3ee7595f2 100644
--- a/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx
+++ b/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx
@@ -122,7 +122,6 @@ export const ConfiguredAddons = ({ getAddonIcon }: IConfigureAddonsProps) => {
                 </PermissionIconButton>
                 <PermissionIconButton
                     permission={UPDATE_ADDON}
-                    tooltip={'Edit Addon'}
                     onClick={() => {
                         history.push(`/addons/edit/${addon.id}`);
                     }}
@@ -131,7 +130,6 @@ export const ConfiguredAddons = ({ getAddonIcon }: IConfigureAddonsProps) => {
                 </PermissionIconButton>
                 <PermissionIconButton
                     permission={DELETE_ADDON}
-                    tooltip={'Remove Addon'}
                     onClick={() => {
                         setDeletedAddon(addon);
                         setShowDelete(true);
diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx
index fc32da759d..f6baeeb150 100644
--- a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx
+++ b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx
@@ -50,7 +50,6 @@ const RoleListItem = ({
                     <PermissionIconButton
                         data-loading
                         aria-label="Edit"
-                        tooltip="Edit"
                         disabled={type === BUILTIN_ROLE_TYPE}
                         onClick={() => {
                             history.push(`/admin/roles/${id}/edit`);
@@ -62,7 +61,6 @@ const RoleListItem = ({
                     <PermissionIconButton
                         data-loading
                         aria-label="Remove role"
-                        tooltip="Remove role"
                         disabled={type === BUILTIN_ROLE_TYPE}
                         onClick={() => {
                             setCurrentRole({ id, name, description });
diff --git a/frontend/src/component/common/Constraint/Constraint.tsx b/frontend/src/component/common/Constraint/Constraint.tsx
index 4a89e7bc1c..47092e0373 100644
--- a/frontend/src/component/common/Constraint/Constraint.tsx
+++ b/frontend/src/component/common/Constraint/Constraint.tsx
@@ -52,7 +52,6 @@ const Constraint = ({
                     <div className={styles.btnContainer}>
                         <PermissionIconButton
                             onClick={editCallback}
-                            tooltip="Edit strategy"
                             permission={UPDATE_FEATURE}
                             projectId={projectId}
                         >
@@ -61,7 +60,6 @@ const Constraint = ({
 
                         <PermissionIconButton
                             onClick={deleteCallback}
-                            tooltip="Delete strategy"
                             permission={UPDATE_FEATURE}
                             projectId={projectId}
                         >
diff --git a/frontend/src/component/common/PermissionButton/PermissionButton.tsx b/frontend/src/component/common/PermissionButton/PermissionButton.tsx
index 161a2ee05c..d5ead64d8c 100644
--- a/frontend/src/component/common/PermissionButton/PermissionButton.tsx
+++ b/frontend/src/component/common/PermissionButton/PermissionButton.tsx
@@ -16,7 +16,7 @@ export interface IPermissionIconButtonProps
 
 const PermissionButton: React.FC<IPermissionIconButtonProps> = ({
     permission,
-    tooltip = 'Click to perform action',
+    tooltip,
     onClick,
     children,
     disabled,
@@ -54,9 +54,9 @@ const PermissionButton: React.FC<IPermissionIconButtonProps> = ({
 
     access = handleAccess();
 
-    const tooltipText = access
-        ? tooltip
-        : "You don't have access to perform this operation";
+    const tooltipText = !access
+        ? "You don't have access to perform this operation"
+        : '';
 
     return (
         <Tooltip title={tooltipText} arrow>
diff --git a/frontend/src/component/common/PermissionIconButton/PermissionIconButton.tsx b/frontend/src/component/common/PermissionIconButton/PermissionIconButton.tsx
index d987e05a94..3de4f88456 100644
--- a/frontend/src/component/common/PermissionIconButton/PermissionIconButton.tsx
+++ b/frontend/src/component/common/PermissionIconButton/PermissionIconButton.tsx
@@ -39,9 +39,9 @@ const PermissionIconButton: React.FC<IPermissionIconButtonProps> = ({
         access = hasAccess(permission);
     }
 
-    const tooltipText = access
-        ? tooltip || ''
-        : "You don't have access to perform this operation";
+    const tooltipText = !access
+        ? "You don't have access to perform this operation"
+        : '';
 
     return (
         <Tooltip title={tooltipText} arrow>
diff --git a/frontend/src/component/common/PermissionSwitch/PermissionSwitch.tsx b/frontend/src/component/common/PermissionSwitch/PermissionSwitch.tsx
index fa6f3d0da2..a9aa89e609 100644
--- a/frontend/src/component/common/PermissionSwitch/PermissionSwitch.tsx
+++ b/frontend/src/component/common/PermissionSwitch/PermissionSwitch.tsx
@@ -19,7 +19,7 @@ const PermissionSwitch = React.forwardRef<
 >((props, ref) => {
     const {
         permission,
-        tooltip = '',
+        tooltip,
         disabled,
         projectId,
         environmentId,
@@ -39,9 +39,9 @@ const PermissionSwitch = React.forwardRef<
         access = hasAccess(permission);
     }
 
-    const tooltipText = access
-        ? tooltip
-        : "You don't have access to perform this operation";
+    const tooltipText = !access
+        ? "You don't have access to perform this operation"
+        : '';
 
     return (
         <Tooltip title={tooltipText} arrow>
diff --git a/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx b/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx
index a2903ca300..83532c44f9 100644
--- a/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx
+++ b/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx
@@ -172,7 +172,6 @@ const EnvironmentList = () => {
                             <ResponsiveButton
                                 onClick={navigateToCreateEnvironment}
                                 maxWidth="700px"
-                                tooltip="Add new environment"
                                 Icon={Add}
                             >
                                 New Environment
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx
index 96d6a68999..dd0b11ee86 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx
@@ -93,7 +93,6 @@ const FeatureOverviewEnvSwitch = ({
                 checked={env.enabled}
                 onChange={toggleEnvironment}
                 environmentId={env.name}
-                tooltip={''}
             />
             {content}
         </div>
diff --git a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx
index b33c203f1c..8aa3f3ebe0 100644
--- a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx
@@ -101,7 +101,6 @@ const FeatureSettingsProject = () => {
                 show={
                     <PermissionButton
                         permission={MOVE_FEATURE_TOGGLE}
-                        tooltip="Update feature"
                         onClick={() => setShowConfirmDialog(true)}
                         projectId={projectId}
                     >
diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx
index c61f71dbe8..3c2938d843 100644
--- a/frontend/src/component/project/Project/Project.tsx
+++ b/frontend/src/component/project/Project/Project.tsx
@@ -125,7 +125,6 @@ const Project = () => {
                         <div className={styles.titleText}>{project?.name}</div>
                         <PermissionIconButton
                             permission={UPDATE_PROJECT}
-                            tooltip="Edit"
                             projectId={project?.id}
                             onClick={() => history.push(`/projects/${id}/edit`)}
                             data-loading
diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
index 33e2bea70a..f15eebdef7 100644
--- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
+++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
@@ -66,7 +66,6 @@ const ProjectFeatureToggles = ({
                                     )
                                 }
                                 maxWidth="700px"
-                                tooltip="New feature toggle"
                                 Icon={Add}
                                 projectId={id}
                                 permission={CREATE_FEATURE}
diff --git a/frontend/src/component/project/Project/ProjectInfo/ProjectInfo.tsx b/frontend/src/component/project/Project/ProjectInfo/ProjectInfo.tsx
index f70a85174c..769b886a87 100644
--- a/frontend/src/component/project/Project/ProjectInfo/ProjectInfo.tsx
+++ b/frontend/src/component/project/Project/ProjectInfo/ProjectInfo.tsx
@@ -50,7 +50,6 @@ const ProjectInfo = ({
     const permissionButton = (
         <PermissionIconButton
             permission={UPDATE_PROJECT}
-            tooltip={'Edit description'}
             projectId={id}
             component={Link}
             className={permissionButtonClass}
diff --git a/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx b/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx
index cbe3a9f6b9..6ef3c3b2e2 100644
--- a/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx
+++ b/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx
@@ -67,7 +67,6 @@ export const StrategiesList = () => {
                             data-test={ADD_NEW_STRATEGY_ID}
                             onClick={() => history.push('/strategies/create')}
                             permission={CREATE_STRATEGY}
-                            tooltip={'Add new strategy'}
                         >
                             <Add />
                         </PermissionIconButton>
@@ -78,7 +77,6 @@ export const StrategiesList = () => {
                             color="primary"
                             permission={CREATE_STRATEGY}
                             data-test={ADD_NEW_STRATEGY_ID}
-                            tooltip={'Add new strategy'}
                         >
                             New strategy
                         </PermissionButton>
@@ -163,7 +161,6 @@ export const StrategiesList = () => {
             <PermissionIconButton
                 onClick={() => onReactivateStrategy(strategy)}
                 permission={UPDATE_STRATEGY}
-                tooltip={'Reactivate activation strategy'}
             >
                 <VisibilityOff />
             </PermissionIconButton>
@@ -203,7 +200,6 @@ export const StrategiesList = () => {
                 <PermissionIconButton
                     onClick={() => onDeleteStrategy(strategy)}
                     permission={DELETE_STRATEGY}
-                    tooltip={'Delete strategy'}
                 >
                     <Delete />
                 </PermissionIconButton>