diff --git a/frontend/src/component/addons/AddonForm/AddonForm.jsx b/frontend/src/component/addons/AddonForm/AddonForm.jsx
index d47e76c6d1..889d20c51f 100644
--- a/frontend/src/component/addons/AddonForm/AddonForm.jsx
+++ b/frontend/src/component/addons/AddonForm/AddonForm.jsx
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { TextField, FormControlLabel, Switch } from '@material-ui/core';
-import { FormButtons, styles as commonStyles } from '../../common';
+import { TextField, FormControlLabel, Switch, Button } from '@material-ui/core';
+import { styles as commonStyles } from '../../common';
 import { trim } from '../../common/util';
 import { AddonParameters } from './AddonParameters/AddonParameters';
 import { AddonEvents } from './AddonEvents/AddonEvents';
@@ -79,7 +79,7 @@ export const AddonForm = ({ editMode, provider, addon, fetch }) => {
         setErrors({ ...errors, events: undefined });
     };
 
-    const handleCancel = () => {
+    const onCancel = () => {
         history.goBack();
     };
 
@@ -203,10 +203,12 @@ export const AddonForm = ({ editMode, provider, addon, fetch }) => {
                     />
                 </section>
                 <section className={styles.formSection}>
-                    <FormButtons
-                        submitText={submitText}
-                        onCancel={handleCancel}
-                    />
+                    <Button type="submit" color="primary" variant="contained">
+                        {submitText}
+                    </Button>
+                    <Button type="button" onClick={onCancel}>
+                        Cancel
+                    </Button>
                 </section>
             </form>
         </PageContent>
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 7defb1f187..7ddbbce1e8 100644
--- a/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx
+++ b/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx
@@ -123,7 +123,6 @@ export const ConfiguredAddons = ({ getAddonIcon }: IConfigureAddonsProps) => {
                 </PermissionIconButton>
                 <PermissionIconButton
                     permission={UPDATE_ADDON}
-                    tooltip={'Edit Addon'}
                     onClick={() => {
                         history.push(`/addons/edit/${addon.id}`);
                     }}
@@ -132,7 +131,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/api-token/ApiTokenList/ApiTokenList.tsx b/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.tsx
index 7f6058b383..1961237f53 100644
--- a/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.tsx
+++ b/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.tsx
@@ -249,7 +249,7 @@ export const ApiTokenList = () => {
                                         }
                                         data-test={CREATE_API_TOKEN_BUTTON}
                                     >
-                                        Create API token
+                                        New API token
                                     </Button>
                                 }
                             />
diff --git a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx b/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx
index 6b9b752bea..8e1fd2605b 100644
--- a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx
+++ b/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx
@@ -126,7 +126,7 @@ to resources within a project"
                 getRoleKey={getRoleKey}
             >
                 <PermissionButton permission={ADMIN} type="submit">
-                    Edit role
+                    Save
                 </PermissionButton>
             </ProjectRoleForm>
         </FormTemplate>
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 386363abfd..1de114a65f 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
@@ -51,7 +51,6 @@ const RoleListItem = ({
                     <PermissionIconButton
                         data-loading
                         aria-label="Edit"
-                        tooltip="Edit"
                         disabled={type === BUILTIN_ROLE_TYPE}
                         onClick={() => {
                             history.push(`/admin/roles/${id}/edit`);
@@ -63,7 +62,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/admin/users/EditUser/EditUser.tsx b/frontend/src/component/admin/users/EditUser/EditUser.tsx
index c82b818ccd..60f3b26c18 100644
--- a/frontend/src/component/admin/users/EditUser/EditUser.tsx
+++ b/frontend/src/component/admin/users/EditUser/EditUser.tsx
@@ -96,7 +96,7 @@ const EditUser = () => {
                 mode={EDIT}
             >
                 <PermissionButton permission={ADMIN} type="submit">
-                    Edit user
+                    Save
                 </PermissionButton>
             </UserForm>
         </FormTemplate>
diff --git a/frontend/src/component/admin/users/UsersAdmin.tsx b/frontend/src/component/admin/users/UsersAdmin.tsx
index 0b9f2c7cf6..bb16b611d9 100644
--- a/frontend/src/component/admin/users/UsersAdmin.tsx
+++ b/frontend/src/component/admin/users/UsersAdmin.tsx
@@ -35,7 +35,7 @@ const UsersAdmin = () => {
                                             history.push('/admin/create-user')
                                         }
                                     >
-                                        Add new user
+                                        New user
                                     </Button>
                                 }
                                 elseShow={
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 3e6dae15b6..021772cef0 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 708f5b5af5..f4a78c7615 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/context/ContextList/ContextList.jsx b/frontend/src/component/context/ContextList/ContextList.jsx
index f751349da3..355a450854 100644
--- a/frontend/src/component/context/ContextList/ContextList.jsx
+++ b/frontend/src/component/context/ContextList/ContextList.jsx
@@ -128,7 +128,7 @@ const ContextList = () => {
                             color="primary"
                             variant="contained"
                         >
-                            Add new context field
+                            New context field
                         </Button>
                     }
                 />
diff --git a/frontend/src/component/context/EditContext/EditContext.tsx b/frontend/src/component/context/EditContext/EditContext.tsx
index 411d207281..cf2c51cedf 100644
--- a/frontend/src/component/context/EditContext/EditContext.tsx
+++ b/frontend/src/component/context/EditContext/EditContext.tsx
@@ -102,7 +102,7 @@ export const EditContext = () => {
                     permission={UPDATE_CONTEXT_FIELD}
                     type="submit"
                 >
-                    Edit context
+                    Save
                 </PermissionButton>
             </ContextForm>
         </FormTemplate>
diff --git a/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx b/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx
index 88efef7748..68d3147282 100644
--- a/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx
+++ b/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx
@@ -87,7 +87,7 @@ const EditEnvironment = () => {
                 clearErrors={clearErrors}
             >
                 <PermissionButton permission={ADMIN} type="submit">
-                    Edit environment
+                    Save
                 </PermissionButton>
             </EnvironmentForm>
         </FormTemplate>
diff --git a/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx b/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx
index 44136ed7ee..533b34f496 100644
--- a/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx
+++ b/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx
@@ -175,12 +175,11 @@ const EnvironmentList = () => {
                             <ResponsiveButton
                                 onClick={navigateToCreateEnvironment}
                                 maxWidth="700px"
-                                tooltip="Add environment"
                                 Icon={Add}
                                 permission={ADMIN}
                                 disabled={!Boolean(uiConfig.flags.EEA)}
                             >
-                                Add Environment
+                                New Environment
                             </ResponsiveButton>
                         </>
                     }
diff --git a/frontend/src/component/feature/EditFeature/EditFeature.tsx b/frontend/src/component/feature/EditFeature/EditFeature.tsx
index d23fb042d2..3f3378704a 100644
--- a/frontend/src/component/feature/EditFeature/EditFeature.tsx
+++ b/frontend/src/component/feature/EditFeature/EditFeature.tsx
@@ -107,7 +107,7 @@ const EditFeature = () => {
                     projectId={project}
                     type="submit"
                 >
-                    Edit toggle
+                    Save
                 </PermissionButton>
             </FeatureForm>
         </FormTemplate>
diff --git a/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx
index fad1e7b31d..a4c55d08df 100644
--- a/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx
+++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx
@@ -183,7 +183,7 @@ const FeatureToggleList = ({
                                                         skeleton: loading,
                                                     })}
                                                 >
-                                                    Create feature toggle
+                                                    New feature toggle
                                                 </Button>
                                             }
                                         />
diff --git a/frontend/src/component/feature/FeatureToggleList/__tests__/__snapshots__/list-component-test.jsx.snap b/frontend/src/component/feature/FeatureToggleList/__tests__/__snapshots__/list-component-test.jsx.snap
index 3b925f0413..e365ef90c2 100644
--- a/frontend/src/component/feature/FeatureToggleList/__tests__/__snapshots__/list-component-test.jsx.snap
+++ b/frontend/src/component/feature/FeatureToggleList/__tests__/__snapshots__/list-component-test.jsx.snap
@@ -165,7 +165,7 @@ exports[`renders correctly with one feature 1`] = `
               <span
                 className="MuiButton-label"
               >
-                Create feature toggle
+                New feature toggle
               </span>
             </a>
           </div>
@@ -362,7 +362,7 @@ exports[`renders correctly with one feature without permissions 1`] = `
               <span
                 className="MuiButton-label"
               >
-                Create feature toggle
+                New feature toggle
               </span>
             </a>
           </div>
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 819900aae3..2ec938d3df 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx
@@ -95,7 +95,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 663e627289..ee20818126 100644
--- a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx
@@ -102,7 +102,6 @@ const FeatureSettingsProject = () => {
                 show={
                     <PermissionButton
                         permission={MOVE_FEATURE_TOGGLE}
-                        tooltip="Update feature"
                         onClick={() => setShowConfirmDialog(true)}
                         projectId={projectId}
                     >
diff --git a/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.tsx b/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.tsx
index 5845f78f53..0cc45cf4e0 100644
--- a/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.tsx
@@ -282,7 +282,7 @@ const FeatureStrategiesEnvironments = () => {
                                         environmentId={activeEnvironment.name}
                                         permission={CREATE_FEATURE_STRATEGY}
                                     >
-                                        Add new strategy
+                                        New strategy
                                     </ResponsiveButton>
                                 }
                             />
diff --git a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsList.tsx b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsList.tsx
index 5ce4a91d2e..328ff1c9f6 100644
--- a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsList.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsList.tsx
@@ -294,7 +294,7 @@ const FeatureOverviewVariants = () => {
                     permission={UPDATE_FEATURE_VARIANTS}
                     projectId={projectId}
                 >
-                    Add variant
+                    New variant
                 </PermissionButton>
                 <ConditionallyRender
                     condition={editable}
diff --git a/frontend/src/component/project/Project/EditProject/EditProject.tsx b/frontend/src/component/project/Project/EditProject/EditProject.tsx
index b7b39de3bc..660987a99a 100644
--- a/frontend/src/component/project/Project/EditProject/EditProject.tsx
+++ b/frontend/src/component/project/Project/EditProject/EditProject.tsx
@@ -92,7 +92,7 @@ const EditProject = () => {
                 validateIdUniqueness={validateIdUniqueness}
             >
                 <PermissionButton permission={UPDATE_PROJECT} type="submit">
-                    Edit project
+                    Save
                 </PermissionButton>
             </ProjectForm>
         </FormTemplate>
diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx
index 7f17840c9e..3c33778bb0 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 c6a04fdb04..405538cf3e 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/project/ProjectList/ProjectList.tsx b/frontend/src/component/project/ProjectList/ProjectList.tsx
index 98be2717f0..d4afcb3bcd 100644
--- a/frontend/src/component/project/ProjectList/ProjectList.tsx
+++ b/frontend/src/component/project/ProjectList/ProjectList.tsx
@@ -139,7 +139,7 @@ const ProjectListNew = () => {
                                 tooltip={createButtonData.title}
                                 disabled={createButtonData.disabled}
                             >
-                                Add new project
+                                New project
                             </ResponsiveButton>
                         }
                     />
diff --git a/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx b/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx
index 40281137ac..e75db53b6d 100644
--- a/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx
+++ b/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx
@@ -72,7 +72,6 @@ export const StrategiesList = () => {
                             data-test={ADD_NEW_STRATEGY_ID}
                             onClick={() => history.push('/strategies/create')}
                             permission={CREATE_STRATEGY}
-                            tooltip={'Add new strategy'}
                         >
                             <Add />
                         </PermissionIconButton>
@@ -83,9 +82,8 @@ export const StrategiesList = () => {
                             color="primary"
                             permission={CREATE_STRATEGY}
                             data-test={ADD_NEW_STRATEGY_ID}
-                            tooltip={'Add new strategy'}
                         >
-                            Add new strategy
+                            New strategy
                         </PermissionButton>
                     }
                 />
@@ -168,7 +166,6 @@ export const StrategiesList = () => {
             <PermissionIconButton
                 onClick={() => onReactivateStrategy(strategy)}
                 permission={UPDATE_STRATEGY}
-                tooltip={'Reactivate activation strategy'}
             >
                 <VisibilityOff />
             </PermissionIconButton>
@@ -208,7 +205,6 @@ export const StrategiesList = () => {
                 <PermissionIconButton
                     onClick={() => onDeleteStrategy(strategy)}
                     permission={DELETE_STRATEGY}
-                    tooltip={'Delete strategy'}
                 >
                     <Delete />
                 </PermissionIconButton>
diff --git a/frontend/src/component/strategies/StrategyForm/StrategyForm.tsx b/frontend/src/component/strategies/StrategyForm/StrategyForm.tsx
index c980baa622..2d87e2ce3a 100644
--- a/frontend/src/component/strategies/StrategyForm/StrategyForm.tsx
+++ b/frontend/src/component/strategies/StrategyForm/StrategyForm.tsx
@@ -178,7 +178,7 @@ export const StrategyForm = ({ editMode, strategy }: IStrategyFormProps) => {
                             color="primary"
                             style={{ display: 'block' }}
                         >
-                            Update
+                            Save
                         </Button>
                     }
                     elseShow={
diff --git a/frontend/src/component/strategies/__tests__/__snapshots__/list-component-test.jsx.snap b/frontend/src/component/strategies/__tests__/__snapshots__/list-component-test.jsx.snap
index c3cceed402..073d9db764 100644
--- a/frontend/src/component/strategies/__tests__/__snapshots__/list-component-test.jsx.snap
+++ b/frontend/src/component/strategies/__tests__/__snapshots__/list-component-test.jsx.snap
@@ -38,7 +38,7 @@ exports[`renders correctly with one strategy 1`] = `
           onMouseOver={[Function]}
           onTouchEnd={[Function]}
           onTouchStart={[Function]}
-          title="Add new strategy"
+          title=""
         >
           <button
             className="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary"
@@ -62,7 +62,7 @@ exports[`renders correctly with one strategy 1`] = `
             <span
               className="MuiButton-label"
             >
-              Add new strategy
+              New strategy
               <span
                 className="MuiButton-endIcon MuiButton-iconSizeMedium"
               />
@@ -135,7 +135,7 @@ exports[`renders correctly with one strategy 1`] = `
             onMouseOver={[Function]}
             onTouchEnd={[Function]}
             onTouchStart={[Function]}
-            title="Deprecate activation strategy"
+            title=""
           >
             <button
               className="MuiButtonBase-root MuiIconButton-root"
@@ -263,7 +263,7 @@ exports[`renders correctly with one strategy without permissions 1`] = `
           onMouseOver={[Function]}
           onTouchEnd={[Function]}
           onTouchStart={[Function]}
-          title="Add new strategy"
+          title=""
         >
           <button
             className="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary"
@@ -287,7 +287,7 @@ exports[`renders correctly with one strategy without permissions 1`] = `
             <span
               className="MuiButton-label"
             >
-              Add new strategy
+              New strategy
               <span
                 className="MuiButton-endIcon MuiButton-iconSizeMedium"
               />
@@ -360,7 +360,7 @@ exports[`renders correctly with one strategy without permissions 1`] = `
             onMouseOver={[Function]}
             onTouchEnd={[Function]}
             onTouchStart={[Function]}
-            title="Deprecate activation strategy"
+            title=""
           >
             <button
               className="MuiButtonBase-root MuiIconButton-root"
diff --git a/frontend/src/component/tags/EditTagType/EditTagType.tsx b/frontend/src/component/tags/EditTagType/EditTagType.tsx
index 5749a26838..fbbbb18709 100644
--- a/frontend/src/component/tags/EditTagType/EditTagType.tsx
+++ b/frontend/src/component/tags/EditTagType/EditTagType.tsx
@@ -76,7 +76,7 @@ const EditTagType = () => {
                 clearErrors={clearErrors}
             >
                 <PermissionButton permission={UPDATE_TAG_TYPE} type="submit">
-                    Edit type
+                    Save
                 </PermissionButton>
             </TagForm>
         </FormTemplate>
diff --git a/frontend/src/component/tags/TagTypeList/TagTypeList.jsx b/frontend/src/component/tags/TagTypeList/TagTypeList.jsx
index 1c4bd90924..ea0a9844e3 100644
--- a/frontend/src/component/tags/TagTypeList/TagTypeList.jsx
+++ b/frontend/src/component/tags/TagTypeList/TagTypeList.jsx
@@ -81,7 +81,7 @@ export const TagTypeList = () => {
                                         history.push('/tag-types/create')
                                     }
                                 >
-                                    Add new tag type
+                                    New tag type
                                 </Button>
                             }
                         />
diff --git a/frontend/src/component/tags/TagTypeList/__tests__/__snapshots__/TagTypeList.test.js.snap b/frontend/src/component/tags/TagTypeList/__tests__/__snapshots__/TagTypeList.test.js.snap
index 54f61d645e..505b5326f3 100644
--- a/frontend/src/component/tags/TagTypeList/__tests__/__snapshots__/TagTypeList.test.js.snap
+++ b/frontend/src/component/tags/TagTypeList/__tests__/__snapshots__/TagTypeList.test.js.snap
@@ -50,7 +50,7 @@ exports[`renders a list with elements correctly 1`] = `
           <span
             className="MuiButton-label"
           >
-            Add new tag type
+            New tag type
           </span>
           <span
             className="MuiTouchRipple-root"
@@ -126,7 +126,7 @@ exports[`renders an empty list correctly 1`] = `
           <span
             className="MuiButton-label"
           >
-            Add new tag type
+            New tag type
           </span>
         </button>
       </div>