diff --git a/cypress/integration/folder_navigation.js b/cypress/integration/folder_navigation.js
index d4fe569828..1ff38005ad 100644
--- a/cypress/integration/folder_navigation.js
+++ b/cypress/integration/folder_navigation.js
@@ -1,79 +1,79 @@
 context('Folder Navigation', () => {
-	before(() => {
-		cy.visit('/login');
-		cy.login();
-		cy.visit('/app/file');
-	});
-    
-	it('Adding Folders', () => {
-		//Adding filter to go into the home folder
-		cy.get('.filter-selector > .btn').click();
-		cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click();
-		cy.get('.filter-action-buttons > .text-muted').click();
-		cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}');
-		cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}');
-		cy.get('.filter-action-buttons > div > .btn-primary').click();
+    before(() => {
+        cy.visit('/login');
+        cy.login();
+        cy.visit('/app/file');
+    });
 
-		//Adding folder (Test Folder)
-		cy.get('.menu-btn-group > .btn').click();
-		cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click();
-		cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder');
-		cy.get('.modal-footer > .standard-actions > .btn-primary').click();    
-	});
+    it('Adding Folders', () => {
+        //Adding filter to go into the home folder
+        cy.get('.filter-selector > .btn').click();
+        cy.findByRole('button', {name: 'Clear Filters'}).click();
+        cy.get('.filter-action-buttons > .text-muted').click();
+        cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}');
+        cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}');
+        cy.get('.filter-action-buttons > div > .btn-primary').click();
 
-	it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => {
-		//Navigating inside the Attachments folder
-		cy.get('[title="Attachments"] > span').click();
+        //Adding folder (Test Folder)
+        cy.get('.menu-btn-group > .btn').click();
+        cy.get('.menu-btn-group [data-label="New Folder"]').click();
+        cy.get('form > [data-fieldname="value"]').type('Test Folder');
+        cy.findByRole('button', {name: 'Create'}).click();   
+    });
 
-		//To check if the URL formed after visiting the attachments folder is correct
-		cy.location('pathname').should('eq', '/app/file/view/home/Attachments');
-		cy.visit('/app/file/view/home/Attachments');
+    it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => {
+        //Navigating inside the Attachments folder
+        cy.get('[title="Attachments"] > span').click();
 
-		//Adding folder inside the attachments folder
-		cy.get('.menu-btn-group > .btn').click();
-		cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click();
-		cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder');
-		cy.get('.modal-footer > .standard-actions > .btn-primary').click();
+        //To check if the URL formed after visiting the attachments folder is correct
+        cy.location('pathname').should('eq', '/app/file/view/home/Attachments');
+        cy.visit('/app/file/view/home/Attachments');
 
-		//Navigating inside the added folder in the Attachments folder
-		cy.get('[title="Test Folder"] > span').click();
+        //Adding folder inside the attachments folder
+        cy.get('.menu-btn-group > .btn').click();
+        cy.get('.menu-btn-group [data-label="New Folder"]').click();
+        cy.get('form > [data-fieldname="value"]').type('Test Folder');
+        cy.findByRole('button', {name: 'Create'}).click();
 
-		//To check if the URL is correct after visiting the Test Folder
-		cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder');
-		cy.visit('/app/file/view/home/Attachments/Test%20Folder');
+        //Navigating inside the added folder in the Attachments folder
+        cy.get('[title="Test Folder"] > span').click();
 
-		//Adding a file inside the Test Folder
-		cy.get('.primary-action').contains('Add File').eq(0).click({force: true});
-		cy.get('.mt-2 > .btn > .mt-1').eq(2).click();
-		cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg');
-		cy.get('.btn-primary').contains('Upload').click();
+        //To check if the URL is correct after visiting the Test Folder
+        cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder');
+        cy.visit('/app/file/view/home/Attachments/Test%20Folder');
 
-		//To check if the added file is present in the Test Folder
-		cy.get('span.level-item > span').should('contain', 'Test Folder');
-		cy.get('.list-row-container').eq(0).should('contain.text', '72402.jpg');
-		cy.get('.list-row-checkbox').eq(0).click();
+        //Adding a file inside the Test Folder
+        cy.findByRole('button', {name: 'Add File'}).eq(0).click({force: true});
+        cy.get('.mt-2 > .btn > .mt-1').eq(2).click();
+        cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg');
+        cy.findByRole('button', {name: 'Upload'}).click();
 
-		//Deleting the added file from the Test folder
-		cy.get('.actions-btn-group > .btn').click();
-		cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click();
-		cy.wait(700);
-		cy.click_modal_primary_button('Yes', {force: true, delay: 700});
-		cy.wait(700);
+        //To check if the added file is present in the Test Folder
+        cy.get('span.level-item > span').should('contain', 'Test Folder');
+        cy.get('.list-row-container').eq(0).should('contain.text', '72402.jpg');
+        cy.get('.list-row-checkbox').eq(0).click();
 
-		//Deleting the Test Folder
-		cy.visit('/app/file/view/home/Attachments');
-		cy.get('.list-row-checkbox').eq(0).click();
-		cy.get('.actions-btn-group > .btn').click();
-		cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click();
-		cy.click_modal_primary_button('Yes');   
-	});
+        //Deleting the added file from the Test folder
+        cy.findByRole('button', {name: 'Actions'}).click();
+        cy.get('.actions-btn-group [data-label="Delete"]').click();
+        cy.wait(700);
+        cy.findByRole('button', {name: 'Yes'}).click();
+        cy.wait(700);
 
-	it('Deleting Test Folder from the home', () => {
-		//Deleting the Test Folder added in the home directory
-		cy.visit('/app/file/view/home');
-		cy.get('.list-row-container > .list-row > .level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500});
-		cy.get('.actions-btn-group > .btn').click();
-		cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click();
-		cy.click_modal_primary_button('Yes', {force: true});    
-	});
-});
\ No newline at end of file
+        //Deleting the Test Folder
+        cy.visit('/app/file/view/home/Attachments');
+        cy.get('.list-row-checkbox').eq(0).click();
+        cy.findByRole('button', {name: 'Actions'}).click();
+        cy.get('.actions-btn-group [data-label="Delete"]').click();  
+        cy.findByRole('button', {name: 'Yes'}).click();
+    });
+
+    it('Deleting Test Folder from the home', () => {
+        //Deleting the Test Folder added in the home directory
+        cy.visit('/app/file/view/home');
+        cy.get('.level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500});
+        cy.findByRole('button', {name: 'Actions'}).click();
+        cy.get('.actions-btn-group [data-label="Delete"]').click();
+        cy.findByRole('button', {name: 'Yes'}).click();
+    });
+});