diff --git a/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js b/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
index 917e9e1a0..36ac2c258 100644
--- a/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
+++ b/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
@@ -28,7 +28,7 @@ describe.skip(['tagmultiuser'], 'Multiuser sheet operations', function() {
 
 		// Add one more sheet
 		cy.cSetActiveFrame(frameId1);
-		cy.cGet('#tb_spreadsheet-toolbar_item_insertsheet').click();
+		cy.cGet('#insertsheet').click();
 
 		//assert for user-1/2
 		cy.cGet('.spreadsheet-tab').should('have.length', 2);
@@ -123,7 +123,7 @@ describe(['tagmultiuser'], 'Check overlays after tab switching/operations', func
 		cy.cGet('input#addressInput').should('have.prop', 'value', 'F6');
 
 		cy.cSetActiveFrame('#iframe1');
-		cy.cGet('#tb_spreadsheet-toolbar_item_insertsheet').click();
+		cy.cGet('#insertsheet').click();
 
 		// check that there is no cell view cursor;
 		// in fact in the other view the new sheet has never been selected
diff --git a/cypress_test/integration_tests/multiuser/writer/invalidations_spec.js b/cypress_test/integration_tests/multiuser/writer/invalidations_spec.js
index 499556a26..77e8947dd 100644
--- a/cypress_test/integration_tests/multiuser/writer/invalidations_spec.js
+++ b/cypress_test/integration_tests/multiuser/writer/invalidations_spec.js
@@ -31,13 +31,13 @@ describe(['tagmultiuser'], 'Joining a document should not trigger an invalidatio
 		ceHelper.type('X');
 
 		cy.cSetActiveFrame('#iframe2');
-		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    1 word, 1 character');
+		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '1 word, 1 character');
 
 		cy.cSetActiveFrame('#iframe1');
 		writerHelper.selectAllTextOfDoc();
-		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    Selected: 1 word, 1 character');
+		cy.cGet('#toolbar-down #StateWordCount').should('have.text', 'Selected: 1 word, 1 character');
 		cy.cGet('.leaflet-layer').click();
-		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    1 word, 1 character');
+		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '1 word, 1 character');
 
 		cy.cGet('.empty-deltas').then(($before) => {
 			const beforeCount = $before.text();
@@ -48,9 +48,9 @@ describe(['tagmultiuser'], 'Joining a document should not trigger an invalidatio
 
 			cy.cSetActiveFrame('#iframe1');
 			writerHelper.selectAllTextOfDoc();
-			cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    Selected: 1 word, 1 character');
+			cy.cGet('#toolbar-down #StateWordCount').should('have.text', 'Selected: 1 word, 1 character');
 			cy.cGet('.leaflet-layer').click();
-			cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    1 word, 1 character');
+			cy.cGet('#toolbar-down #StateWordCount').should('have.text', '1 word, 1 character');
 
 			cy.cGet('.empty-deltas').should(($after) => {
 				expect($after.text()).to.eq(beforeCount);
@@ -71,13 +71,13 @@ describe(['tagmultiuser'], 'Joining a document should not trigger an invalidatio
 		ceHelper.type('X');
 
 		cy.cSetActiveFrame('#iframe2');
-		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    1 word, 1 character');
+		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '1 word, 1 character');
 
 		cy.cSetActiveFrame('#iframe1');
 		writerHelper.selectAllTextOfDoc();
-		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    Selected: 1 word, 1 character');
+		cy.cGet('#toolbar-down #StateWordCount').should('have.text', 'Selected: 1 word, 1 character');
 		cy.cGet('.leaflet-layer').click();
-		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    1 word, 1 character');
+		cy.cGet('#toolbar-down #StateWordCount').should('have.text', '1 word, 1 character');
 
 		cy.cGet('.empty-deltas').then(($before) => {
 			var beforeCount = parseInt($before.text());
@@ -94,11 +94,11 @@ describe(['tagmultiuser'], 'Joining a document should not trigger an invalidatio
 
 			cy.cSetActiveFrame('#iframe1');
 			writerHelper.selectAllTextOfDoc();
-			cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    Selected: 1 word, 1 character');
+			cy.cGet('#toolbar-down #StateWordCount').should('have.text', 'Selected: 1 word, 1 character');
 			cy.cGet('.leaflet-layer').click();
-			cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    1 word, 1 character');
+			cy.cGet('#toolbar-down #StateWordCount').should('have.text', '1 word, 1 character');
 			ceHelper.type('X');
-			cy.cGet('#toolbar-down #StateWordCount').should('have.text', '    1 word, 2 characters');
+			cy.cGet('#toolbar-down #StateWordCount').should('have.text', '1 word, 2 characters');
 
 			cy.cGet('.empty-deltas').should(($after) => {
 				// allow one row of empty deltas, the case this protects regression against