diff --git a/app/react/components/LinkButton.tsx b/app/react/components/LinkButton.tsx
index 7bae0bcdc..f4e63ad66 100644
--- a/app/react/components/LinkButton.tsx
+++ b/app/react/components/LinkButton.tsx
@@ -25,9 +25,8 @@ export function LinkButton({
       props={{
         to,
         params,
-        'data-cy': `${dataCy}-link`,
       }}
-      data-cy={`${dataCy}-button`}
+      data-cy={dataCy}
     >
       {children}
     </Button>
diff --git a/app/react/components/buttons/AddButton.tsx b/app/react/components/buttons/AddButton.tsx
index 6f222342c..9891839f8 100644
--- a/app/react/components/buttons/AddButton.tsx
+++ b/app/react/components/buttons/AddButton.tsx
@@ -25,10 +25,10 @@ export function AddButton({
   return (
     <Button
       as={Link}
-      props={{ to, params, 'data-cy': `${dataCy}-link` }}
+      props={{ to, params }}
       icon={Plus}
       className="!m-0"
-      data-cy={`${dataCy}-button`}
+      data-cy={dataCy}
       color={color}
       disabled={disabled}
     >
diff --git a/app/react/components/buttons/Button.tsx b/app/react/components/buttons/Button.tsx
index 66bfc08fb..24be9f640 100644
--- a/app/react/components/buttons/Button.tsx
+++ b/app/react/components/buttons/Button.tsx
@@ -41,7 +41,7 @@ export interface Props<TasProps = unknown>
   as?: ComponentType<TasProps> | string;
   onClick?: MouseEventHandler<HTMLButtonElement>;
   mRef?: React.ForwardedRef<HTMLButtonElement>;
-  props?: TasProps;
+  props?: Omit<TasProps, keyof Props>;
 }
 
 export const ButtonWithRef = forwardRef<HTMLButtonElement, Omit<Props, 'mRef'>>(
diff --git a/app/react/docker/DashboardView/ClusterVisualizerLink.tsx b/app/react/docker/DashboardView/ClusterVisualizerLink.tsx
index df5363e67..219e774ec 100644
--- a/app/react/docker/DashboardView/ClusterVisualizerLink.tsx
+++ b/app/react/docker/DashboardView/ClusterVisualizerLink.tsx
@@ -13,7 +13,6 @@ export function ClusterVisualizerLink() {
           icon={TrelloIcon}
           props={{
             to: 'docker.swarm.visualizer',
-            'data-cy': 'cluster-visualizer',
           }}
           data-cy="cluster-visualizer"
         >
diff --git a/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx b/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx
index 536b2c068..3bffb1361 100644
--- a/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx
+++ b/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx
@@ -181,7 +181,6 @@ function ImportExportButtons({
           disabled={isExportInProgress}
           props={{
             to: 'docker.images.import',
-            'data-cy': 'image-importImageLink',
           }}
         >
           Import
diff --git a/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx b/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
index eff498af9..8a9c2660f 100644
--- a/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
+++ b/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
@@ -103,7 +103,6 @@ function Cell({
                 id: item.Id,
                 nodeName: item.NodeName,
               },
-              'data-cy': `volume-browse-link-${name}`,
             }}
             data-cy={`volume-browse-button-${name}`}
           >
diff --git a/app/react/kubernetes/namespaces/ListView/columns/actions.tsx b/app/react/kubernetes/namespaces/ListView/columns/actions.tsx
index cd4fba63f..5510b3cf3 100644
--- a/app/react/kubernetes/namespaces/ListView/columns/actions.tsx
+++ b/app/react/kubernetes/namespaces/ListView/columns/actions.tsx
@@ -37,7 +37,6 @@ function Cell({
       props={{
         to: 'kubernetes.resourcePools.resourcePool.access',
         params: { id: item.Namespace.Name },
-        'data-cy': `manage-access-link-${item.Namespace.Name}`,
       }}
       icon={Users}
       data-cy={`manage-access-button-${item.Namespace.Name}`}
diff --git a/app/react/portainer/account/CreateAccessTokenView/DisplayUserAccessToken.tsx b/app/react/portainer/account/CreateAccessTokenView/DisplayUserAccessToken.tsx
index 75bd4d39b..49a01c80e 100644
--- a/app/react/portainer/account/CreateAccessTokenView/DisplayUserAccessToken.tsx
+++ b/app/react/portainer/account/CreateAccessTokenView/DisplayUserAccessToken.tsx
@@ -1,11 +1,9 @@
-import { useRouter } from '@uirouter/react';
-
 import { Button, CopyButton } from '@@/buttons';
 import { FormSectionTitle } from '@@/form-components/FormSectionTitle';
 import { TextTip } from '@@/Tip/TextTip';
+import { Link } from '@@/Link';
 
 export function DisplayUserAccessToken({ apikey }: { apikey: string }) {
-  const router = useRouter();
   return (
     <>
       <FormSectionTitle>New access token</FormSectionTitle>
@@ -27,9 +25,11 @@ export function DisplayUserAccessToken({ apikey }: { apikey: string }) {
         <hr />
       </div>
       <Button
-        type="button"
+        as={Link}
+        props={{
+          to: 'portainer.account',
+        }}
         data-cy="create-access-token-done-button"
-        onClick={() => router.stateService.go('portainer.account')}
       >
         Done
       </Button>
diff --git a/app/react/portainer/environments/ListView/columns/actions.tsx b/app/react/portainer/environments/ListView/columns/actions.tsx
index d525271e9..9e40f621b 100644
--- a/app/react/portainer/environments/ListView/columns/actions.tsx
+++ b/app/react/portainer/environments/ListView/columns/actions.tsx
@@ -31,7 +31,6 @@ function Cell({
       props={{
         to: 'portainer.endpoints.endpoint.access',
         params: { id: environment.Id },
-        'data-cy': `environment-manage-access-${environment.Name}`,
       }}
       color="link"
       icon={Users}
diff --git a/app/react/portainer/environments/environment-groups/ListView/EnvironmentGroupsDatatable/columns.tsx b/app/react/portainer/environments/environment-groups/ListView/EnvironmentGroupsDatatable/columns.tsx
index 63773d33d..98118911b 100644
--- a/app/react/portainer/environments/environment-groups/ListView/EnvironmentGroupsDatatable/columns.tsx
+++ b/app/react/portainer/environments/environment-groups/ListView/EnvironmentGroupsDatatable/columns.tsx
@@ -26,7 +26,6 @@ function ActionsCell({
       props={{
         to: '.group.access',
         params: { id: item.Id },
-        'data-cy': `manage-access-link_${item.Name}`,
       }}
       color="link"
       icon={Users}
diff --git a/app/react/portainer/registries/ListView/RegistriesDatatable/columns/actions.tsx b/app/react/portainer/registries/ListView/RegistriesDatatable/columns/actions.tsx
index 86735e3d5..da26992c3 100644
--- a/app/react/portainer/registries/ListView/RegistriesDatatable/columns/actions.tsx
+++ b/app/react/portainer/registries/ListView/RegistriesDatatable/columns/actions.tsx
@@ -57,7 +57,6 @@ export function BrowseButton({
           props={{
             to: 'portainer.registries.registry.repositories',
             params: { id: registry.Id, endpointId: environmentId },
-            'data-cy': `browse-registry-link-${registry.Name}`,
           }}
           disabled={isLimited}
           icon={Search}
diff --git a/app/react/portainer/registries/environments/ListView/EnvironmentRegistriesDatatable/columns/actions.tsx b/app/react/portainer/registries/environments/ListView/EnvironmentRegistriesDatatable/columns/actions.tsx
index 28f612854..b4562d550 100644
--- a/app/react/portainer/registries/environments/ListView/EnvironmentRegistriesDatatable/columns/actions.tsx
+++ b/app/react/portainer/registries/environments/ListView/EnvironmentRegistriesDatatable/columns/actions.tsx
@@ -43,7 +43,6 @@ function Cell({
             props={{
               to: '.access',
               params: { id: item.Id },
-              'data-cy': `manage-access-link-${item.Name}`,
             }}
             data-cy={`registry-manage-access-button-${item.Name}`}
           >
diff --git a/app/react/portainer/templates/app-templates/AppTemplatesListItem.tsx b/app/react/portainer/templates/app-templates/AppTemplatesListItem.tsx
index 9c2ebed7b..b39c500bf 100644
--- a/app/react/portainer/templates/app-templates/AppTemplatesListItem.tsx
+++ b/app/react/portainer/templates/app-templates/AppTemplatesListItem.tsx
@@ -46,7 +46,6 @@ export function AppTemplatesListItem({
                   appTemplateId: template.Id,
                   type: duplicateCustomTemplateType,
                 },
-                'data-cy': `app-templates-duplicate-${template.Name}`,
               }}
             >
               Copy as Custom
diff --git a/app/react/portainer/templates/custom-templates/ListView/CustomTemplatesListItem.tsx b/app/react/portainer/templates/custom-templates/ListView/CustomTemplatesListItem.tsx
index 32b058acc..95c6c9a3c 100644
--- a/app/react/portainer/templates/custom-templates/ListView/CustomTemplatesListItem.tsx
+++ b/app/react/portainer/templates/custom-templates/ListView/CustomTemplatesListItem.tsx
@@ -54,7 +54,6 @@ export function CustomTemplatesListItem({
                   params: {
                     id: template.Id,
                   },
-                  'data-cy': `custom-templates-edit-link-${template.Id}`,
                 }}
                 icon={Edit}
                 data-cy={`custom-templates-edit-button-${template.Id}`}
diff --git a/app/react/portainer/templates/custom-templates/ListView/StackFromCustomTemplateFormWidget/DeployForm.tsx b/app/react/portainer/templates/custom-templates/ListView/StackFromCustomTemplateFormWidget/DeployForm.tsx
index 983a8cf19..3bea73914 100644
--- a/app/react/portainer/templates/custom-templates/ListView/StackFromCustomTemplateFormWidget/DeployForm.tsx
+++ b/app/react/portainer/templates/custom-templates/ListView/StackFromCustomTemplateFormWidget/DeployForm.tsx
@@ -159,7 +159,6 @@ export function DeployForm({
               as={Link}
               props={{
                 to: '.',
-                'data-cy': 'cancel-stack-creation',
                 params: { template: null },
               }}
               color="default"