diff --git a/cypress/e2e/models/migration/controls/tagcategory.ts b/cypress/e2e/models/migration/controls/tagcategory.ts
index b2b64f598..23c9ce584 100644
--- a/cypress/e2e/models/migration/controls/tagcategory.ts
+++ b/cypress/e2e/models/migration/controls/tagcategory.ts
@@ -18,14 +18,25 @@ import {
     cancelForm,
     click,
     clickByText,
+    clickItemInKebabMenu,
     confirm,
     inputText,
+    performRowActionByIcon,
     selectItemsPerPage,
     selectUserPerspective,
     submitForm,
 } from "../../../../utils/utils";
 import { navMenu, navTab } from "../../../views/menu.view";
-import { button, controls, migration, SEC, tags, tdTag, trTag } from "../../../types/constants";
+import {
+    button,
+    controls,
+    deleteAction,
+    migration,
+    SEC,
+    tags,
+    tdTag,
+    trTag,
+} from "../../../types/constants";
 import { createTagCategoryButton, rankInput } from "../../../views/tags.view";
 import * as commonView from "../../../views/common.view";
 import { clickTags, fillName } from "./tags";
@@ -90,12 +101,7 @@ export class TagCategory {
 
     edit(updatedValue: { name?: string; rank?: number; color?: string }, cancel = false): void {
         TagCategory.openList();
-        cy.get(tdTag)
-            .contains(this.name)
-            .parent(trTag)
-            .within(() => {
-                click(commonView.editButton);
-            });
+        performRowActionByIcon(this.name, commonView.pencilIcon);
         if (cancel) {
             cancelForm();
         } else {
@@ -118,12 +124,8 @@ export class TagCategory {
     delete(cancel = false): void {
         // Opening tags list only if another tab is opened
         TagCategory.openList();
-        cy.get(tdTag, { timeout: 2 * SEC })
-            .contains(this.name)
-            .parent(trTag)
-            .within(() => {
-                click(commonView.deleteButton);
-            });
+
+        clickItemInKebabMenu(this.name, deleteAction);
         if (cancel) {
             click(commonView.confirmCancelButton);
         } else {
diff --git a/cypress/e2e/models/migration/controls/tags.ts b/cypress/e2e/models/migration/controls/tags.ts
index 72be93ab5..7c0a95d32 100644
--- a/cypress/e2e/models/migration/controls/tags.ts
+++ b/cypress/e2e/models/migration/controls/tags.ts
@@ -38,6 +38,7 @@ import {
     applyAction,
     confirm,
     click,
+    performRowActionByIcon,
 } from "../../../../utils/utils";
 import {
     dropdownMenuToggle,
@@ -114,7 +115,7 @@ export class Tag {
     edit(updatedValue: { name?: string; tagcategory?: string }, cancel = false): void {
         Tag.openList();
         expandRowDetails(this.tagCategory);
-        this.clickTagAction(editAction);
+        performRowActionByIcon(this.name, commonView.pencilIcon);
         if (cancel) {
             cancelForm();
         } else {