Use newer version of Puppeteer for UI tests (#17880)

* Use latest version of Puppeteer for UI tests * use newer node on travis * test * use waitForTimeout / waitForSelector instead of waitFor * Handle BC for removed waitFor method * Updates expected UI test files * update submodules * improve/fix some UI tests * Updates expected UI test files * improve/fix some UI tests * update url-parse dependency * simplify some UI tests * update screenshot * avoid using merged assets that are broken * fix expected compare exit code * don't use merged assets for TwoFactorAuth UI tests it seems due to too many requests to login, logout and other pages merging the CoreJS assets somehow fails, and results in returning an empty file. Even the reload fails to serve the correct content, so maybe the file, the content should be written to, is somehow locked. Disabling the merged assets seems to fix this issue for this tests. Locally the tests are also running correctly with merged assets. * improve handling of automatic css / js reloading in UI tests * increase timeouts of TwoFactorAuth UI tests * fix 2fa ui test * revert change * update new screenshot * updates UI screenshots * submodule updates
author: Stefan Giehl <stefan@matomo.org> 2021-09-01 16:37:38 +0300
committer: GitHub <noreply@github.com> 2021-09-01 16:37:38 +0300
commit: a3ee690ea3863ff16a828ac0afbc77243bb45f5b (patch)
tree: 77f3341e86608894b1020725700b348bbcd44567 /plugins
parent: ba1facfd1ecb4e618f3162aedbdb3170e9461e50 (diff)
305 files changed, 792 insertions, 766 deletions
diff --git a/plugins/Actions/tests/UI/ActionsDataTable_spec.js b/plugins/Actions/tests/UI/ActionsDataTable_spec.js
index 97d54c5a27..927ea0b354 100644
--- a/plugins/Actions/tests/UI/ActionsDataTable_spec.js
+++ b/plugins/Actions/tests/UI/ActionsDataTable_spec.js
@@ -32,7 +32,7 @@ describe("ActionsDataTable", function () {
         await page.mouse.move(-10, -10);
 
         await page.waitForNetworkIdle();
-        await page.waitFor(250); // rendering
+        await page.waitForTimeout(250); // rendering
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('subtables_loaded');
     });
@@ -41,7 +41,7 @@ describe("ActionsDataTable", function () {
         await page.click('.dropdownConfigureIcon');
         await page.mouse.move(-10, -10);
         const element = await page.$('.tableConfiguration');
-        await page.waitFor(250); // rendering
+        await page.waitForTimeout(250); // rendering
         expect(await element.screenshot()).to.matchImage('configuration_options');
     });
 
@@ -77,6 +77,7 @@ describe("ActionsDataTable", function () {
     });
 
     it("should generate a proper title for the visitor log segmented by the current row", async function() {
+        await page.mouse.move(-10, -10);
         const row = 'tr:contains("thankyou") ';
         const first = await page.jQuery(row + 'td.column:first');
         await first.hover();
@@ -100,14 +101,14 @@ describe("ActionsDataTable", function () {
         await page.click('.ui-widget .ui-dialog-titlebar-close');
         const elem = await page.jQuery('tr:contains("thankyou") td.column:eq(2)');
         await elem.hover();
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
         expect(await page.screenshot({ fullPage: true })).to.matchImage('unique_pageview_percentages');
     });
 
     it("should show the search when clicking on the search icon", async function() {
         await page.click('.dataTableAction.searchAction');
         await page.mouse.move(-10, -10);
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
         expect(await page.screenshot({ fullPage: true })).to.matchImage('search_visible');
     });
 
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
index 2f5974dd40..c621596a24 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a2e33653941467df83ccc1b7c5169b3b5c2cd6dd2fed001fc6856e95486d45f
-size 389213
+oid sha256:943efef6a111645bba99408ba8816c7fb2e9ecd1063dfd0c1637f73a925fac81
+size 390107
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
index 905eb18e12..c2204eafed 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c74c99414e935ba4de637ba8c72f6ba00e3da4d5bf7823c8e45ceb22a9bd2d05
-size 364044
+oid sha256:bf88c02a14c5de403939674beca872b1f13b05e0d0deec24b39daa6436cff2f6
+size 363615
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
index 01ce3704fb..7f729a68ac 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b2d07948a40d582b2d4b24f62b572d63147d51707f19075c3aa4cbbf78435ac
-size 70301
+oid sha256:b260e5f90a4499cc9b063eba4cfe91647b79d14b90dc485457f0100911b5f407
+size 70885
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
index e2249a8a91..da3003396f 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be56bbd7fb1ea9cc83fa730d62d44b60aa95f8a5f747b4b3a39198e3b1f046bd
-size 472673
+oid sha256:3c8be898a1e002b1996e5c38ccb567fda47535f7eefe498be0232a70bec7613c
+size 466574
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png
index de87bfc468..3a3b481f1c 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:587b0818c65f965018b541098049a9314fa3b16dd8e98131ba433f3296ee1e53
-size 363592
+oid sha256:91becfb0f5f7248177de3b6b67031ed4b1bda81444934aed484b4ca5c52ca05d
+size 363443
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
index 54429cb145..69458ca509 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4fb372053d8e8165b7c2fc16f5c9aad4fb4932ec1995c6f89890f0df322ba53
-size 59044
+oid sha256:a5b865302ec248e7543b088de9d247e92f3ad62c693079922690071faae00f53
+size 60606
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png
index a390215f7d..9b366cda08 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84aa7e78abe2ca4bda44439eac489cbc89e9fca3057eb9ba43996d48c83ca3a3
-size 71162
+oid sha256:3bb6510f04c528d103db45e9f27ff49d12e0edfb60ebbebe56cd471ef51ce4ae
+size 73526
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png
index 7b154d056d..dd959ebf2f 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:830fb714b7f3b133c79284c43c18ed233ed4b4e7247e698d7f9927f41404e5a6
-size 51559
+oid sha256:0214c0907c223d219ba6230e1ad23d65c44c8af59f5d17102979d07482961cb8
+size 53377
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png
index 1900ebb4ca..b9bc676535 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b903108f502f76fae4b852ca9f9816e9488509e8e9e262e7496ab4cf91b2349
-size 56710
+oid sha256:12a5c28c5dcdfaa3198dfd3ebd626caea03da7a23954028bd447f12442565611
+size 62507
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
index 64b8952690..cd8e55ae87 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b78b9de5fd88065f15184c8f994c140c1a0cc2a5e09a086d71be965503a076a0
-size 377619
+oid sha256:924ae218a7fd6cb96012cf4b970cca14304949ca242eea9381a203f8d96a3056
+size 377602
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
index be3cfd436f..cc50053822 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bba08d576cf0d1d0854039942065bcdbba420a2d351236f614dad47e3e9732e
-size 63783
+oid sha256:cecbdebfc18409f6dabaad7411f581b3e315343be10373b8e432a8e0548358fc
+size 67984
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
index c901e9734d..8bb3ecb49a 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b79b18faee2bc3ee3a43452b38b9eba5c92e535d88b11d0c13a6ac8bc17ff6ac
-size 379373
+oid sha256:71e3e2238b43afca2a5b7fd52709871e13e174b853be160097282bd426f4a8d6
+size 379466
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
index 7b154d056d..dd959ebf2f 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:830fb714b7f3b133c79284c43c18ed233ed4b4e7247e698d7f9927f41404e5a6
-size 51559
+oid sha256:0214c0907c223d219ba6230e1ad23d65c44c8af59f5d17102979d07482961cb8
+size 53377
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
index 54429cb145..bd80dfbca1 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4fb372053d8e8165b7c2fc16f5c9aad4fb4932ec1995c6f89890f0df322ba53
-size 59044
+oid sha256:d85c80162da86999958ea5d891663788c0da334beb8a111d18811567155a855c
+size 64592
diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement
-Subproject 89715ebabd08baf78954fdac603a0ed3030d8f8
+Subproject 2f7e2e748d08b5d6a571566b69e1f5d7f130d20
diff --git a/plugins/Bandwidth b/plugins/Bandwidth
-Subproject a04b8c3de354b8547e2d54ee3e748c1d102175b
+Subproject de286cf0fc8673184f572aaa0854f94be1289b2
diff --git a/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js b/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js
index 398e9bb0a7..d5e66f101a 100644
--- a/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js
+++ b/plugins/CoreAdminHome/tests/UI/TrackingFailures_spec.js
@@ -42,7 +42,7 @@ describe("TrackingFailures", function () {
 
     it('should show widget with failures', async function () {
         generateTrackingFailures();
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
         await page.goto(widgetUrl);
         expect(await page.screenshot({ fullPage: true })).to.matchImage('widget_with_failures');
     });
@@ -50,7 +50,7 @@ describe("TrackingFailures", function () {
     it('should show manage page with failures', async function () {
         await page.goto(manageUrl);
         await page.waitForSelector('.matomoTrackingFailures td');
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         const elem = await page.$('.matomoTrackingFailures');
         expect(await elem.screenshot()).to.matchImage('manage_with_failures');
@@ -61,8 +61,8 @@ describe("TrackingFailures", function () {
             $('.matomoTrackingFailures table tbody tr:nth-child(2) .icon-delete').click();
         });
 
-        const elem = await page.waitFor('.modal.open');
-        await page.waitFor(500);
+        const elem = await page.waitForSelector('.modal.open');
+        await page.waitForTimeout(500);
         expect(await elem.screenshot()).to.matchImage('manage_with_failures_delete_one_ask_confirmation');
     });
 
@@ -70,9 +70,9 @@ describe("TrackingFailures", function () {
         await confirmModal();
         await page.waitForNetworkIdle();
 
-        await page.waitFor('.matomoTrackingFailures td .icon-delete');
+        await page.waitForSelector('.matomoTrackingFailures td .icon-delete');
 
-        await page.waitFor(500); // animation
+        await page.waitForTimeout(500); // animation
 
         const elem = await page.$('.matomoTrackingFailures');
         expect(await elem.screenshot()).to.matchImage('manage_with_failures_delete_one_confirmed');
@@ -80,15 +80,15 @@ describe("TrackingFailures", function () {
 
     it('should show ask to confirm delete all', async function () {
         await page.click('.matomoTrackingFailures .deleteAllFailures');
-        await page.waitFor('.modal.open');
-        await page.waitFor(500);
+        await page.waitForSelector('.modal.open');
+        await page.waitForTimeout(500);
         expect(await (await page.$('.modal.open')).screenshot()).to.matchImage('manage_with_failures_delete_all_ask_confirmation');
     });
 
     it('should show nothing when confirmed', async function () {
         await confirmModal();
-        await page.waitFor('.matomoTrackingFailures td .icon-ok');
-        await page.waitFor(500);
+        await page.waitForSelector('.matomoTrackingFailures td .icon-ok');
+        await page.waitForTimeout(500);
         const frame = await page.waitForSelector('.matomoTrackingFailures');
         expect(await frame.screenshot()).to.matchImage('manage_with_failures_delete_all_confirmed');
     });
diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_admin_svg.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_admin_svg.png
index f7543585ec..c9684eaf96 100644
--- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_admin_svg.png
+++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_admin_svg.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31ca5ec6e91ec9bf22ccea61cb7a667f58192ab1e510410b644cf5bb23898a29
-size 11117
+oid sha256:5aa33b34d1c2aa38ec3a0f456c3ef689b41ec54dc667580cc1856893bd5de6ed
+size 11191
diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_login_svg.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_login_svg.png
index 3a9780f16d..d25de0587b 100644
--- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_login_svg.png
+++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_login_svg.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15e04ef417d01b8f669585040da0311c31dff60c3af98129741ddd0227d1f63c
-size 3955
+oid sha256:4694c1f7d384f46610e74b6f9f79e5515acf599689e0802515f48c81ff1174a6
+size 3976
diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_unsubscribe_svg.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_unsubscribe_svg.png
index 3a9780f16d..d25de0587b 100644
--- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_unsubscribe_svg.png
+++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/CustomLogo_unsubscribe_svg.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15e04ef417d01b8f669585040da0311c31dff60c3af98129741ddd0227d1f63c
-size 3955
+oid sha256:4694c1f7d384f46610e74b6f9f79e5515acf599689e0802515f48c81ff1174a6
+size 3976
diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png
index 6572fd23e4..1d34f107f8 100644
--- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png
+++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c07d50aed2ae2caa61b554574cab3e127c6ec6483df31dc6d399fc2b3cdd1475
-size 24509
+oid sha256:1167f33855f98e5975c84a75b0cfb7792c9397fa5c2f4c772e7c8126db291b5d
+size 25268
diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png
index 0f44eb186f..5da1e75278 100644
--- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png
+++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d48b5544ece3f513ef643a21d68d0683ce6671b02e75f68018fe3fca1f5d109e
-size 72115
+oid sha256:3c5c028cb5846b7051b2d91ee75a4bcfa245f38828374aca2d5451363641082e
+size 74261
diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png
index 6572fd23e4..1d34f107f8 100644
--- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png
+++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c07d50aed2ae2caa61b554574cab3e127c6ec6483df31dc6d399fc2b3cdd1475
-size 24509
+oid sha256:1167f33855f98e5975c84a75b0cfb7792c9397fa5c2f4c772e7c8126db291b5d
+size 25268
diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png
index b855252a4b..1a773098ea 100644
--- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png
+++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc8775d82cda2eb4fcc4d0bf4d404e367f2336ce41c03128894823746fc6a71f
-size 46526
+oid sha256:9b2d05c767a1368b7639a7abbb4290dd5d6233cf967abee30c641c846120ffa1
+size 46633
diff --git a/plugins/CoreHome/tests/UI/SingleMetricView_spec.js b/plugins/CoreHome/tests/UI/SingleMetricView_spec.js
index 7884bf087e..93b1959894 100644
--- a/plugins/CoreHome/tests/UI/SingleMetricView_spec.js
+++ b/plugins/CoreHome/tests/UI/SingleMetricView_spec.js
@@ -28,7 +28,7 @@ describe('SingleMetricView', function () {
 
         var elem = await page.waitForSelector('#widgetCoreVisualizationssingleMetricViewcolumn');
         await page.waitForNetworkIdle();
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         expect(await elem.screenshot()).to.matchImage('loaded');
     });
@@ -41,7 +41,7 @@ describe('SingleMetricView', function () {
             $('#dashboardWidgetsArea .jqplot-seriespicker-popover label:contains(Revenue)').click();
         });
         await page.waitForNetworkIdle();
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         var elem = await page.waitForSelector('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn');
         expect(await elem.screenshot()).to.matchImage('formatted_metric');
@@ -51,12 +51,12 @@ describe('SingleMetricView', function () {
         await page.evaluate(function(){
             $('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn .jqplot-seriespicker').last().trigger('mouseenter');
         });
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
         await page.evaluate(function(){
             $('#dashboardWidgetsArea .jqplot-seriespicker-popover label:contains(_x)').click()
         });
         await page.waitForNetworkIdle();
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         var elem = await page.$('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn');
         expect(await elem.screenshot()).to.matchImage('goal_metric');
@@ -67,12 +67,12 @@ describe('SingleMetricView', function () {
         await page.evaluate(function(){
             $('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn .jqplot-seriespicker').trigger('mouseenter');
         });
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
         await page.evaluate(function(){
             $('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn .jqplot-seriespicker-popover label:contains(Revenue)').click()
         });
         await page.waitForNetworkIdle();
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         var elem = await page.$('#dashboardWidgetsArea #widgetCoreVisualizationssingleMetricViewcolumn');
         expect(await elem.screenshot()).to.matchImage('range');
diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close.png b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close.png
index 3d32433f03..1dbdb3ed8f 100644
--- a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close.png
+++ b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ab00ad8715daf05847c359e48ab19e7e82b26f40edd79e1445c0167a59e12a6
-size 5887
+oid sha256:f166fb1cc0d58fc6d8edaacffbb70310d85328353921a8820ab023af6c1875e3
+size 5884
diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close_reload.png b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close_reload.png
index 3d32433f03..1dbdb3ed8f 100644
--- a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close_reload.png
+++ b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_close_reload.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ab00ad8715daf05847c359e48ab19e7e82b26f40edd79e1445c0167a59e12a6
-size 5887
+oid sha256:f166fb1cc0d58fc6d8edaacffbb70310d85328353921a8820ab023af6c1875e3
+size 5884
diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_loaded.png b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_loaded.png
index fefd4863d1..d955c28822 100644
--- a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_loaded.png
+++ b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:003ae9a97b33f35347d699eb03700e0a38bd153b5d58e32e8991a18b590bede0
-size 17049
+oid sha256:79240e5a37b12a4f6f296cac0d2e3c4e7785bb30e14f90c04bbf999797e87e70
+size 17041
diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_reloaded.png b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_reloaded.png
index f063ecc752..667c716495 100644
--- a/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_reloaded.png
+++ b/plugins/CoreHome/tests/UI/expected-screenshots/Notifications_reloaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30518830c1a132dbe2978eae8e5022a9c61f7705121bb1048f37e5283d50c8f4
-size 11767
+oid sha256:eeedebf0a2a1a06debf6d0610db9666999d82e3a90af851fded7016a5b944300
+size 11760
diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png
index 965c8818ef..26ce8b42b5 100644
--- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png
+++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_formatted_metric.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d1c17811b2347ffac0c2609378c3ccef2bae94b34d638e63db45a228a190caf
-size 6494
+oid sha256:fb9305159cdcbf107a6747b315cba146214a1f73f404c200aa37d6734706ccc2
+size 6485
diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png
index 947165fc2e..e6cdfa9a26 100644
--- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png
+++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_goal_metric.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:285156337a075fc6523c05e7b4617472b55be269797a74bfe2c2183a67dc93ef
-size 8956
+oid sha256:33bbb2c1fe617afaf7dc2216e981057698abe7679814ca3d4a729517b7859b33
+size 8952
diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png
index c3a8d28729..9dcc86fc15 100644
--- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png
+++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37d9eb86e57ebdcdaf5a0ab5faeb7ee6a71de6b2d7a7576d451b0fb823325155
-size 4753
+oid sha256:da10b7861b5b8208164116aebb716bb8d6028701544c7430bf172d9b328fbe74
+size 4741
diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png
index 08ec15bc4f..5cb9e50b39 100644
--- a/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png
+++ b/plugins/CoreHome/tests/UI/expected-screenshots/SingleMetricView_range.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3aa84abbc6d84620b272ed3db58367463ed27f7f2e6cda1ef10f19bad2e5833d
-size 5016
+oid sha256:b4bc0c7c4e99fd8d622f86462379886fb124959392c19487c36829525f51944d
+size 5019
diff --git a/plugins/CorePluginsAdmin/tests/UI/TagManagerTeaser_spec.js b/plugins/CorePluginsAdmin/tests/UI/TagManagerTeaser_spec.js
index a9ac485f90..752c2fed50 100644
--- a/plugins/CorePluginsAdmin/tests/UI/TagManagerTeaser_spec.js
+++ b/plugins/CorePluginsAdmin/tests/UI/TagManagerTeaser_spec.js
@@ -63,7 +63,7 @@ describe("TagManagerTeaser", function () {
         await page.click('#login_form_submit');
 
         await page.waitForNetworkIdle();
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         expect(await page.screenshotSelector('.pageWrap')).to.matchImage('super_user_activate_plugin');
     });
@@ -80,7 +80,7 @@ describe("TagManagerTeaser", function () {
         setAdminUser();
         await page.click('.activateTagManager .dontShowAgainBtn');
         await page.waitForNetworkIdle();
-        await page.waitFor('.widget');
+        await page.waitForSelector('.widget');
         await page.waitForNetworkIdle();
         expect(await page.screenshotSelector('.pageWrap')).to.matchImage('admin_page_disable');
     });
diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png
index 7ed039d102..c26ef930b1 100644
--- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png
+++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4dc5e649c001e476256d37d51c2f4bf5dd5d3c6d5b9f7977c5e90ab11fb0d0b
-size 181456
+oid sha256:06a762ba654863e8641f1989fdb66ac9c4d49f40b5c0ebc22c1ff7181c0993cd
+size 181407
diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png
index 4854fe425d..0908ac8ef9 100644
--- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png
+++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69c0b4ae3f17972ecb5e70ac99483e67e500b53c9ed0d29276e3cc134eb13f92
-size 348771
+oid sha256:88d2b601b770783a3cb9a71357859c6bf7ef48775ce2b7e59412ad6abb8099a9
+size 348613
diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png
index 21e97f858c..7e62977a0f 100644
--- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png
+++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ddf010f6ba6b6e68ea16635d67b2ca2c20024035c3aff81b3c4ae2e751b0b96
-size 350350
+oid sha256:abe28d78c7cf52bcfd71a3b77641db7dbcdb428157ba10d7f07ea59e324576d1
+size 350194
diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png
index c0486b0ddf..5ae9d1d17a 100644
--- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png
+++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54250cb246a4d53bce07ae13c935a2ef8cac06dadfebff14181d5ced2ecb3a3a
-size 83276
+oid sha256:505f9dce5bb643558c218dbcf53be6ed963531694ea66fcf39083659f9df419f
+size 83145
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
-Subproject 2af4a1d48dc6d67101c75f0bd7cccd8ba69c2b1
+Subproject 08391126914fe1e1cfb270571371fad37d82b43
diff --git a/plugins/CustomDimensions/tests/UI/CustomDimensions_spec.js b/plugins/CustomDimensions/tests/UI/CustomDimensions_spec.js
index 1aed4a0176..329c32fda5 100644
--- a/plugins/CustomDimensions/tests/UI/CustomDimensions_spec.js
+++ b/plugins/CustomDimensions/tests/UI/CustomDimensions_spec.js
@@ -24,27 +24,28 @@ describe("CustomDimensions", function () {
     var popupSelector = '.ui-dialog:visible';
 
     async function capturePageWrap (screenName, test) {
-        await test();
-        var elem = await page.jQuery('.pageWrap');
-        expect(await elem.screenshot()).to.matchImage(screenName);
+        await captureSelector(screenName, '.pageWrap', test)
     }
 
     async function captureSelector (screenName, selector, test) {
+        await page.webpage.setViewport({
+            width: 1350,
+            height: 768,
+        });
         await test();
-        var elem = await page.jQuery(selector);
-        expect(await elem.screenshot()).to.matchImage(screenName);
+        expect(await page.screenshotSelector(selector)).to.matchImage(screenName);
     }
 
     async function closeOpenedPopover()
     {
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
         const closeButton = await page.jQuery('.ui-dialog:visible .ui-icon-closethick:visible');
         if (!closeButton) {
             return;
         }
 
         await closeButton.click();
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
     }
 
     async function triggerRowAction(labelToClick, nameOfRowActionToTrigger)
@@ -52,11 +53,11 @@ describe("CustomDimensions", function () {
         var rowToMatch = 'td.label:contains(' + labelToClick + '):first';
 
         await (await page.jQuery('table.dataTable tbody ' + rowToMatch)).hover();
-        await page.waitFor(50);
+        await page.waitForTimeout(50);
         await (await page.jQuery(rowToMatch + ' a.'+ nameOfRowActionToTrigger + ':visible')).hover(); // necessary to get popover to display
         await (await page.jQuery(rowToMatch + ' a.' + nameOfRowActionToTrigger + ':visible')).click();
         await page.mouse.move(-10, -10);
-        await page.waitFor(250); // wait for animation
+        await page.waitForTimeout(250); // wait for animation
         await page.waitForNetworkIdle();
     }
 
@@ -86,7 +87,7 @@ describe("CustomDimensions", function () {
             await page.goto( "?" + urlBase + "#?" + generalParams + "&category=Goals_Goals&subcategory=General_Overview");
             await (await page.jQuery('.reportsByDimensionView .dimension:contains(MyName1)')).click();
             await page.waitForNetworkIdle();
-            await page.waitFor(100);
+            await page.waitForTimeout(100);
         });
     });
 
@@ -108,12 +109,13 @@ describe("CustomDimensions", function () {
 
     it('should offer only segmented visitor log and row action for first level entries', async function () {
         await capturePageWrap('report_actions_rowactions', async function () {
-            await (await page.jQuery('td.label:contains(en):first')).hover();
+            await page.hover('tr:first-child td.label');
         });
     });
 
     it('should be able to render insights', async function () {
         await capturePageWrap('report_action_insights', async function () {
+            await page.mouse.move(0, 0);
             await page.evaluate(function(){
                 $('[data-footer-icon-id="insightsVisualization"]').click();
             });
@@ -146,7 +148,7 @@ describe("CustomDimensions", function () {
             await (await page.jQuery('.dataTable .subDataTable .value:contains(en):first')).click();
             await page.waitForNetworkIdle();
             await (await page.jQuery('td.label:contains(en_US)')).hover();
-            await page.waitFor(100);
+            await page.waitForTimeout(100);
         });
     });
 
@@ -169,9 +171,9 @@ describe("CustomDimensions", function () {
             await page.goto(reportUrlDimension3);
             await (await page.jQuery('.dataTable .subDataTable .value:contains(en):first')).click();
             await page.waitForNetworkIdle();
-            await page.waitFor(100);
+            await page.waitForTimeout(100);
             await (await page.jQuery('td.label:contains(en_US)')).hover();
-            await page.waitFor(100);
+            await page.waitForTimeout(100);
             await triggerRowAction('en_US', 'actionTransitions');
         });
     });
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png
index 5a8af9f5c5..e60fa0e00f 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8bbb87ed594a62115a605fe4887f13a1dbbb8637544763e77855f843e1f1869
-size 28747
+oid sha256:adedd01ca10b9805ae9a40a88936d2ce80e09430918cd0a5cf85172f9f1482d9
+size 30844
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_insights.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_insights.png
index f4c4bca85e..30fff46fd4 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_insights.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_insights.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed42e651e67b065861556c898c2fe001b8c1a41a9511c70594d000466ab66744
-size 31867
+oid sha256:602134cce513f2284c9e1481fe52dd23304b8919c8e2571e11578850237d77f5
+size 30740
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png
index 2520f01035..6765908e4c 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62c436230351fa8304633315b2f2967195a00b43257a944283d74921be736bdc
-size 53014
+oid sha256:502c692ae468f9d294ae83902c8222afb4fc3f7a8d1b3dea53bca2505f21c9c4
+size 56262
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png
index 01224b4494..416b66d07d 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_rowevolution.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:932a692a8708986cf165484598f4cfa6774ecef70aa4d463f3519d1f3a9b637c
-size 74177
+oid sha256:6368680ecc7e5982ddd961fe1b3dc1d257d68879d2122f8e382e15de21679391
+size 74140
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png
index 3f7086c9fe..82e5e940f7 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_action_subtable_segmented_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c0e85ea9d85f3c1b0ce1fc5ea9d017b73bb69320d7632419230010f5bb3130e
-size 83646
+oid sha256:e80673f1b62256a6760afd19ac8eb13c07413c4fff615a49d9259fa7a2be9546
+size 83644
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png
index 8ac2bd6eac..35aeb50e8f 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowactions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b583778122329745abd12f69cdc51006fa889677e0055341b5171db17b0b411f
-size 31887
+oid sha256:de9a7441eeec02ed6c0eaacf58fb14fe14fcd851edc0d5acbfdbff7eb08217fc
+size 33729
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png
index 19405f4018..65a5718b17 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_rowevolution.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cfc899633bead41bffc486b99434c27ef987892213b1e12aceb7f85a13d2bb3
-size 64404
+oid sha256:bf25b1aa3ca129e0b54df11e5de08097256e911946a4e4ff086b6d70621773a2
+size 64439
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png
index d0fc011e38..6559166c58 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_actions_segmented_visitorlog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:859274ab2a28c233cd91f61b4e42900a4f3554b948c37cb9f47ccd51eb984a56
-size 118695
+oid sha256:c43ccaa361c22602defc19b854b2319ffb027e7a3e618b4347a86b4b2b797d43
+size 118687
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png
index 42bbd023f2..54ee01d97a 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa2ad7bedc67e12b50977b5eb03186961af944ecd335ee44aa75baeae73ad208
-size 69652
+oid sha256:bec61778342a5246850e71f6f9a6971824d93f98ad76ad67df5417c8adb1782e
+size 71713
diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png
index c7fb6f8559..b360054aec 100644
--- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png
+++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_visit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e863697a73b5e7e3fc61e75926e8b48103da6d0cac0844adcc65af14773c176
-size 23463
+oid sha256:f6fac7d21dd5e7e737c965de7d3355a908b249a395e23bae391c06ddaaf69674
+size 24312
diff --git a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png
index 4f877c54fe..d1bb119c5b 100644
--- a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png
+++ b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f65f9eebd4ddc3692742e6855bf681c83ed01e4d7f83bfd76d23d6226816e2f2
-size 227709
+oid sha256:db63ee6ac4e4f3ccf4128086087ae8bb00a3fff17fff1320483c7365730a18a3
+size 232259
diff --git a/plugins/Dashboard/tests/UI/DashboardManager_spec.js b/plugins/Dashboard/tests/UI/DashboardManager_spec.js
index 2b23b6575d..5207523176 100644
--- a/plugins/Dashboard/tests/UI/DashboardManager_spec.js
+++ b/plugins/Dashboard/tests/UI/DashboardManager_spec.js
@@ -64,7 +64,7 @@ describe("DashboardManager", function () {
     it("should create new dashboard with new default widget selection when create dashboard process completed", async function() {
         await page.click('.dashboard-manager .title');
         await page.click('li[data-action="createDashboard"]');
-        await page.waitFor('#createDashboardName', { visible: true });
+        await page.waitForSelector('#createDashboardName', { visible: true });
 
         // try to type the text a few times, as it sometimes doesn't get the full value
         var name = 'newdash2';
@@ -73,7 +73,7 @@ describe("DashboardManager", function () {
                 $('#createDashboardName').val('');
             });
             await page.type('#createDashboardName', name);
-            await page.waitFor(500); // sometimes the text doesn't seem to type fast enough
+            await page.waitForTimeout(500); // sometimes the text doesn't seem to type fast enough
 
             var value = await page.evaluate(function() {
                 return $('#createDashboardName').attr('value');
@@ -89,7 +89,7 @@ describe("DashboardManager", function () {
 
         await page.mouse.move(-10, -10);
         await page.waitForNetworkIdle();
-        await page.waitFor('.widget');
+        await page.waitForSelector('.widget');
         await page.waitForNetworkIdle();
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('create_new');
@@ -102,7 +102,7 @@ describe("DashboardManager", function () {
         await button.click();
 
         await page.mouse.move(-10, -10);
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
         await page.waitForNetworkIdle();
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('removed');
diff --git a/plugins/Dashboard/tests/UI/Dashboard_spec.js b/plugins/Dashboard/tests/UI/Dashboard_spec.js
index 03c5b8bccc..7d7e36d0f4 100644
--- a/plugins/Dashboard/tests/UI/Dashboard_spec.js
+++ b/plugins/Dashboard/tests/UI/Dashboard_spec.js
@@ -74,7 +74,7 @@ describe("Dashboard", function () {
         await col2.hover();
         await page.mouse.up();
         await page.waitForNetworkIdle();
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
         await page.mouse.move(-10, -10);
 
         await page.waitForNetworkIdle();
@@ -173,7 +173,7 @@ describe("Dashboard", function () {
         await button.click();
 
         await page.mouse.move(-10, -10);
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('widget_move_removed');
     });
@@ -185,7 +185,7 @@ describe("Dashboard", function () {
         var button = await page.jQuery('.modal.open .modal-footer a:contains(Save)');
         await button.click();
         await page.mouse.move(-10, -10);
-        await page.waitFor(500); // animation
+        await page.waitForTimeout(1500); // animation
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('change_layout');
     });
@@ -194,7 +194,7 @@ describe("Dashboard", function () {
         await page.click('.dashboard-manager .title');
         await page.click('li[data-action="renameDashboard"]');
         await page.evaluate(() => $('#newDashboardName').val('newname'));
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
         var button = await page.jQuery('.modal.open .modal-footer a:contains(Save)');
         await button.click();
         await page.mouse.move(-10, -10);
@@ -206,7 +206,7 @@ describe("Dashboard", function () {
     it("should copy dashboard successfully when copy dashboard process completed", async function() {
         await page.click('.dashboard-manager .title');
         await page.click('li[data-action="copyDashboardToUser"]');
-        await page.waitFor(100); // wait for animation
+        await page.waitForTimeout(100); // wait for animation
         await page.evaluate(function () {
             $('#copyDashboardName').val('');
         });
@@ -243,7 +243,7 @@ describe("Dashboard", function () {
         var button = await page.jQuery('.modal.open .modal-footer a:contains(Yes)');
         await button.click();
         await page.mouse.move(-10, -10);
-        await page.waitFor(200);
+        await page.waitForTimeout(200);
         await page.waitForNetworkIdle();
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('removed');
@@ -255,7 +255,7 @@ describe("Dashboard", function () {
         await page.click('li[data-action="setAsDefaultWidgets"]');
         var button = await page.jQuery('.modal.open .modal-footer a:contains(Yes)');
         await button.click();
-        await page.waitFor(200);
+        await page.waitForTimeout(200);
         await page.waitForNetworkIdle();
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('default_widget_selection_changed');
@@ -264,7 +264,7 @@ describe("Dashboard", function () {
     it("should create new dashboard with new default widget selection when create dashboard process completed", async function() {
         await page.click('.dashboard-manager .title');
         await page.click('li[data-action="createDashboard"]');
-        await page.waitFor('#createDashboardName', { visible: true });
+        await page.waitForSelector('#createDashboardName', { visible: true });
 
         // try to type the text a few times, as it sometimes doesn't get the full value
         var name = 'newdash2';
@@ -273,7 +273,7 @@ describe("Dashboard", function () {
                 $('#createDashboardName').val('');
             });
             await page.type('#createDashboardName', name);
-            await page.waitFor(500); // sometimes the text doesn't seem to type fast enough
+            await page.waitForTimeout(500); // sometimes the text doesn't seem to type fast enough
 
             var value = await page.evaluate(function() {
                 return $('#createDashboardName').attr('value');
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
index 64f5a4acf0..e137896427 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6871a707b2f371d945c83f6c1b89356903a35936ac6e11e0de2613f5935ad2e1
-size 313601
+oid sha256:2db0147a760b37a63f5cf42a5020c0640d1e0832042a94772478a9cb7278cc90
+size 313984
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png
index 67cf53e8ea..bcb3eeac30 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76e1d243ec2d998e3df1d1e105c88c3842eb51f41e9e7d42679774a38e66665a
-size 52938
+oid sha256:3f0f616f47aa8424b0ecf9c059b39de13e5017fbd868b11fb6fd552a1151b265
+size 52940
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
index e72dec5ced..144da4d624 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b8964d6bce6a334af86bf7ef4afa9b63215fa3d073585e2f056fc41b2d87db7
-size 480691
+oid sha256:c22573b452593809c2d43f595585f2a4ee94a921b0ebdea1836268abe5df59de
+size 481373
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png
index 66e942016b..f3d1023422 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a722db3c7277f4d261ac07593b525b989128472ff40f941dd28646979ef0442
-size 66489
+oid sha256:d0669faad6b479fc5cc66e11bf3acef5e54f26d6daeb083dcd9e52d2703c18b9
+size 66488
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
index a0cc85a5bd..33252d0a78 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52c5a0f945beb09577e1edc28f5bdf054432a085bac72b685af453344f43f36f
+oid sha256:592f35df58fc2d0a901315a355dca652145fa769da901dad0a79fe2ddbe93738
 size 78661
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png
index 04683d6e2f..411b3ea678 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_change_layout.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:686d56b9c62a53560de8238223ddd1e85e09ce2e665a43669fc08f61d21532b9
+oid sha256:23f2a458e09d6ace2c9f3c0eaff05dd21d24af6c281afed78e4db4e32dafed0c
 size 28593
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png
index 85d70b8561..28eb224427 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0a794e8662f2ccfca7bc51a9a46e3cf2e5a771ee42831e3e8dca23e7cb67dec
-size 32310
+oid sha256:62fc2afd2afafb0c31effa327eff0050496ebe55af35f3b8b31aabe33b916922
+size 32321
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
index cc56a272d4..e9a80e99e9 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e02cbdcd04e9dc92c0a6edbc2adf7f78f105393c5dcc0bfa536b2bf0b6416ef2
-size 744193
+oid sha256:3c96a8a6ce4dab0ec2f4138ed3a70c0280e99632739c9b1d94b519a30881c15a
+size 743925
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png
index 1ca48b5333..c836a70c1b 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rename.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a853f2995666c3dd4ec5ba6a16868cf1b28ba117b90de697e4e497d573aeaa1
-size 29215
+oid sha256:f9922fc549ac8536f8867058477ede868cca547ec1ce9a10efff8dac23d714ae
+size 29214
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
index 3c5d1590ab..3c356037f2 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95ece5261a337dc4f73d6a912350196c1fb8f0cea61a74c258ae0647db8699cd
-size 375293
+oid sha256:a6df239036c205d8108be7c52a58a05e8f61c8bd8df202e1cabdcb5ec3c052bf
+size 375134
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
index 3ad96c2af8..b8ff6fbf31 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:912f3968c867310296b81871770524c79780c161ac9814b8d769e8cea164c05f
-size 213697
+oid sha256:c2b997ee6136c0d06b4f68259bf9324d4902f09c86a392f45ee87c618fd92b2c
+size 212811
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png
index aec55094b1..1b9ad6f428 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:793785094f8d249d2c8627fee92a556490f75c54853972703fa474b37f3a6aee
-size 32998
+oid sha256:79b8b2c3f2fbaacaed1e5c5384f3cd4ee0b4b66ec38e81f069a1908d1e325d3c
+size 33007
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png
index e9cae85db1..fd03e9cfc6 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_minimised.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b555268f689ccf2ca223b8a8200be68f7fb67a0deed852684f302c99ba988dc6
-size 22143
+oid sha256:65784789084d9929fd11e2edaecb0f1dddd8effb7a36a3e693d0fdf1255ba531
+size 22158
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png
index 18ab0dabc0..265213cb5d 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64c141ebdaefca852da48b9ac8cfbac3da7a8db76b545efcfa44a34b759b62d0
-size 31196
+oid sha256:8c5ef999d10b65a1fc9de30f8e36a57adeaca0518c0deaba3c7b9a585e50d93a
+size 31224
diff --git a/plugins/DeviceDetectorCache b/plugins/DeviceDetectorCache
-Subproject ec65d1736713a8b984f3ad5ad48cac293d07561
+Subproject 3a4ec60ab1d7d18bffc88a2bbb0293ba3380516
diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
index c198d9febd..c1a2898f64 100644
--- a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
+++ b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b468903e5e1aa258f41b7f4327354ee4a72fd8e6b91ccdeaf8e1e364f15892fa
-size 463061
+oid sha256:579f0b7e6e66f5bd4ec11b730b76f6b2b410781eef8878403fb8201bcad0458a
+size 464227
diff --git a/plugins/Feedback/tests/UI/FeedbackPopup_spec.js b/plugins/Feedback/tests/UI/FeedbackPopup_spec.js
index 5073ff9594..cdfbbeb36e 100644
--- a/plugins/Feedback/tests/UI/FeedbackPopup_spec.js
+++ b/plugins/Feedback/tests/UI/FeedbackPopup_spec.js
@@ -24,7 +24,7 @@ describe("FeedbackPopup", function () {
         await page.goto(url);
         await page.waitForNetworkIdle();
 
-        var modal = await page.waitFor('.modal.open', { visible: true });
+        var modal = await page.waitForSelector('.modal.open', { visible: true });
         expect(await modal.screenshot()).to.matchImage('feedback_popup');
 
         // Click on the "Remind me in 90 days" button = the popup shouldn't appear for the next test
diff --git a/plugins/Feedback/tests/UI/ReferBanner_spec.js b/plugins/Feedback/tests/UI/ReferBanner_spec.js
index 7b0364f111..84b8c1bb33 100644
--- a/plugins/Feedback/tests/UI/ReferBanner_spec.js
+++ b/plugins/Feedback/tests/UI/ReferBanner_spec.js
@@ -24,7 +24,7 @@ describe("ReferBannerTest", function () {
         await page.goto(url);
         await page.waitForNetworkIdle();
 
-        var banner = await page.waitFor('.refer-banner', { visible: true });
+        var banner = await page.waitForSelector('.refer-banner', { visible: true });
         expect(await banner.screenshot()).to.matchImage('feedback_popup');
     });
 });
diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
index 6cc0baaa47..7ca34edd9d 100644
--- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
+++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdae452443e888644ea410706b751f8931d93f1760db6fed533059caef0d742c
-size 269138
+oid sha256:37bddab33dbd00a473c45f015a96bf420c6b3d9f21e0b4e668e0d569fb9d471f
+size 269098
diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png
index 47b7b15d4e..a6c7a12fe9 100644
--- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png
+++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:569affdd2877633a19212a4d409a2254f76593e1f1d5629a2caf6703586495be
-size 27962
+oid sha256:d5e4c0571a535a90244639b4d6f68c9679f53300dd0f1eedd3ac6024d3e0571a
+size 27936
diff --git a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png
index 03067a11d8..ef70542040 100644
--- a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png
+++ b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:280a9c6d9e2a7fda228368cc2c0a38919a6d7d46568f7082cb4cc123b3216a93
-size 151547
+oid sha256:62c638edcde3ecbe2dfd2fda9d3866f82f380db4a52f750c60e1f49d6eb969b0
+size 151176
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png
index 89f503a929..79d4e0e32e 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2554655af0da05aaa8bf264ec54d14b93f7c2cb57f03367f8f1c27a0fa508696
-size 235575
+oid sha256:3d1146cfd0c79d6c5d40ed44cb620fb53d9459b26e667e2c36cdf0bbb49f5583
+size 237627
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png
index 970b4baa4f..abc3f12601 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1d87b1483312d63ac5f18f2db086fd2a35eea2213cf2866122b9f8970c36149
-size 44306
+oid sha256:0fb592393904c7bfe7c6eb25e5724c0220d244ef8e58bdcaa05d6e4c70758215
+size 45937
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png
index dc5f5b5941..32cccd8f30 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6614f18a029016b58b878f8c924a18035b184b37879bb4d0605773490604422
-size 55967
+oid sha256:97d80a1084b8ef6662a4d1190b4b8b24f718f80f102d36421f9edaa086598b06
+size 57602
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png
index aa77762378..30effbb7cc 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17647c289e082f0e9e1250e7564c80acb7fa5c1a9e0097e724ef717688a74f16
-size 65215
+oid sha256:fef06d503975ea6f1e8be4e4b1c619ad769a80d230c867a482894ea8f2130af8
+size 66891
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png
index 0cccd30d8c..9260c2e11b 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad5bd993d8ac509429d42a87ba484f08e2891e7ef23505f95e1dbc91d0c77c6b
-size 236944
+oid sha256:0c3f2db19b7892b71e573b04a3eaf034350ca5f47a5cb2747a7042e041fb86d5
+size 238543
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png
index 292e6c48e0..4901a35469 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9181e8c0225ed4d89b25c7979716327986ec6b505103b6f76d263750dd54d18a
-size 77143
+oid sha256:e895f33367d187ad234215ba3f3fdb8774bbae5079beb8f71fb847f6c918bfb9
+size 78768
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png
index adc59a73bb..e1f2b3d87e 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00a5682d9d547a8c77e62027796d034d958b24a29a24ee34d46def9a480d0eac
-size 81993
+oid sha256:e28e405e304b02f9c9e5ec12fd77130b62bfa3997e0a32900ebf18209a7a533c
+size 83655
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png
index e7774f4d4c..0c52e06d4d 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fede79745ca8c90d989a556286416183272296f9b22f22d521857c5d44f09904
-size 50371
+oid sha256:4e563cc9ff0f28ca1b0445416a8de79dc4c46bce6ee6a15480aeeb2abba8e789
+size 52347
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png
index ec6425699e..e080240816 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c78f147d8c04386354fd67e6d3b5797dbc67ee24a03cda796d5ada4f4994bd17
-size 95702
+oid sha256:c8eb9f5ddc08af2e4ef54c497ec15d444c0da1c59a7cdc9804903acfadafe24e
+size 96913
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png
index 0d91c6de13..34da9e6696 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:164373455dbeae733fbac1f187d902f44852bd7291522e79835cbd4e1c92d5fc
-size 111499
+oid sha256:482d82c55db4807aacc9576e4b2aff98b558cd3f95f156853254cba303e7a1ec
+size 113296
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png
index 8aaca962c7..ed09de8e15 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bc403833c1e39337e016129e653589b9fc9fc421584a5395be8860a3058c5f4
-size 109618
+oid sha256:af9729f0c9222deec706649748d40d8d4b4b71c6a35d3bb9842b83ca2ec07a95
+size 110963
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
index 4e144e1496..1a12421ecc 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:045de8fcb76c9a5d77aa8d97069926d3b31b045b0698f2f804e46fdf92a1e44d
-size 274313
+oid sha256:0fc783ae07f00e3cc8a782288eae50ec1120018690e2120927e855fed69841fc
+size 273637
diff --git a/plugins/IntranetMeasurable/tests/UI/IntranetMeasurable_spec.js b/plugins/IntranetMeasurable/tests/UI/IntranetMeasurable_spec.js
index 17357ab2ee..46063f9108 100644
--- a/plugins/IntranetMeasurable/tests/UI/IntranetMeasurable_spec.js
+++ b/plugins/IntranetMeasurable/tests/UI/IntranetMeasurable_spec.js
@@ -26,7 +26,7 @@ describe("IntranetMeasurable", function () {
     it("should show intranet selection", async function () {
         await page.goto(url);
         await (await page.jQuery('.SitesManager .addSite:first')).click();
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
 
         const elem = await page.$('.modal.open');
         expect(await elem.screenshot()).to.matchImage('add_new_dialog');
@@ -35,7 +35,7 @@ describe("IntranetMeasurable", function () {
     it("should load intranet specific fields", async function () {
         await (await page.jQuery('.modal.open .btn:contains(Intranet)')).click();
         await page.waitForNetworkIdle();
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         await page.evaluate(function () {
             $('.form-help:contains(UTC time is)').hide();
diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png
index 3509f3fceb..cbfc4f027e 100644
--- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png
+++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f51b2683c2e1ab32986beb154bc519ad9b605050d3d08bc213fcb5ceaa4708e
-size 8851
+oid sha256:bdfcc21b1beecf04a25776751532d54379a401cda39ade6989025064fe33f06c
+size 8545
diff --git a/plugins/Live/tests/UI/DeactivatedFeatures_spec.js b/plugins/Live/tests/UI/DeactivatedFeatures_spec.js
index 508dfbe26f..d98a38d730 100644
--- a/plugins/Live/tests/UI/DeactivatedFeatures_spec.js
+++ b/plugins/Live/tests/UI/DeactivatedFeatures_spec.js
@@ -48,7 +48,7 @@ describe("DeactivatedFeatures", function () {
     it('menu should contain visits log & realtime when enabled', async function () {
         await setFeatures(1, 0, 1);
         await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2009-01-04#?idSite=1&period=year&date=2009-01-04&category=General_Visitors&subcategory=General_Overview");
-        await page.waitFor('#secondNavBar', {visible: true});
+        await page.waitForSelector('#secondNavBar', {visible: true});
 
         const vlog = await page.$('#secondNavBar .navbar a[href*="Live_VisitorLog"]');
         expect(vlog).to.be.ok;
@@ -63,7 +63,7 @@ describe("DeactivatedFeatures", function () {
     it('menu should not contain visits log & realtime when deactivated', async function () {
         await setFeatures(1, 1, 1);
         await page.reload();
-        await page.waitFor('#secondNavBar', {visible: true});
+        await page.waitForSelector('#secondNavBar', {visible: true});
 
         const vlog = await page.$('#secondNavBar .navbar a[href*="Live_VisitorLog"]');
         expect(vlog).to.be.not.ok;
@@ -102,7 +102,7 @@ describe("DeactivatedFeatures", function () {
     it('menu should contain ecommerce log when visits log enabled', async function () {
         await setFeatures(1, 0, 1);
         await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2009-01-04#?idSite=1&period=year&date=2009-01-04&category=Goals_Ecommerce&subcategory=Goals_EcommerceLog");
-        await page.waitFor('#secondNavBar', {visible: true});
+        await page.waitForSelector('#secondNavBar', {visible: true});
 
         const element = await page.$('#secondNavBar .navbar a[href*="Goals_EcommerceLog"]');
         expect(element).to.be.ok;
@@ -111,7 +111,7 @@ describe("DeactivatedFeatures", function () {
     it('menu should not contain ecommerce log when visits log deactivated', async function () {
         await setFeatures(1, 1, 1);
         await page.reload();
-        await page.waitFor('#secondNavBar', {visible: true});
+        await page.waitForSelector('#secondNavBar', {visible: true});
 
         const element = await page.$('#secondNavBar .navbar a[href*="Goals_EcommerceLog"]');
         expect(element).to.be.not.ok;
@@ -128,7 +128,7 @@ describe("DeactivatedFeatures", function () {
     it('it should show profile link in visits log when enabled', async function () {
         await setFeatures(1, 0, 0);
         await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2012-08-09#?idSite=1&period=year&date=2012-08-09&category=General_Visitors&subcategory=Live_VisitorLog");
-        await page.waitFor('.dataTableVizVisitorLog');
+        await page.waitForSelector('.dataTableVizVisitorLog');
 
         const element = await page.$('.dataTableVizVisitorLog .card .visitor-log-visitor-profile-link');
         expect(element).to.be.ok;
@@ -137,7 +137,7 @@ describe("DeactivatedFeatures", function () {
     it('it should not show profile link in visits log when disabled', async function () {
         await setFeatures(1, 0, 1);
         await page.reload();
-        await page.waitFor('.dataTableVizVisitorLog');
+        await page.waitForSelector('.dataTableVizVisitorLog');
 
         const element = await page.$('.dataTableVizVisitorLog .card .visitor-log-visitor-profile-link');
         expect(element).to.be.not.ok;
@@ -146,7 +146,7 @@ describe("DeactivatedFeatures", function () {
     it('it should show button to test new segments with enabled visits log', async function () {
         await setFeatures(1, 0, 1);
         await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2012-07-09#?idSite=1&period=year&date=2012-07-09&category=General_Visitors&subcategory=General_Overview");
-        await page.waitFor('.segmentationContainer');
+        await page.waitForSelector('.segmentationContainer');
         await page.click('.segmentationContainer');
         await page.click('.add_new_segment');
 
@@ -157,7 +157,7 @@ describe("DeactivatedFeatures", function () {
     it('it should not show button to test new segments with disabled visits log', async function () {
         await setFeatures(1, 1, 1);
         await page.reload();
-        await page.waitFor('.segmentationContainer');
+        await page.waitForSelector('.segmentationContainer');
         await page.click('.segmentationContainer');
         await page.click('.add_new_segment');
 
@@ -171,7 +171,7 @@ describe("DeactivatedFeatures", function () {
         await page.waitForNetworkIdle();
 
         await (await page.jQuery('#widgetDevicesDetectiongetOsVersions td.label:first')).hover();
-        await page.waitFor('#widgetDevicesDetectiongetOsVersions .dataTableRowActions', {visible: true});
+        await page.waitForSelector('#widgetDevicesDetectiongetOsVersions .dataTableRowActions', {visible: true});
 
         const element = await page.$('#widgetDevicesDetectiongetOsVersions .dataTableRowActions .actionSegmentVisitorLog');
         expect(element).to.be.ok;
@@ -183,7 +183,7 @@ describe("DeactivatedFeatures", function () {
         await page.waitForNetworkIdle();
 
         await (await page.jQuery('#widgetDevicesDetectiongetOsVersions td.label:first')).hover();
-        await page.waitFor('#widgetDevicesDetectiongetOsVersions .dataTableRowActions', {visible: true});
+        await page.waitForSelector('#widgetDevicesDetectiongetOsVersions .dataTableRowActions', {visible: true});
 
         const element = await page.$('#widgetDevicesDetectiongetOsVersions .dataTableRowActions .actionSegmentVisitorLog');
         expect(element).to.be.not.ok;
@@ -195,7 +195,7 @@ describe("DeactivatedFeatures", function () {
         await page.waitForNetworkIdle();
 
         await (await page.jQuery('.widgetpreview-categorylist li:contains("Visitors"):first')).hover();
-        await page.waitFor('.widgetpreview-widgetlist', {visible: true});
+        await page.waitForSelector('.widgetpreview-widgetlist', {visible: true});
 
         const profile = await page.$('.widgetpreview-widgetlist [uniqueid=widgetLivegetVisitorProfilePopup]');
         expect(profile).to.be.ok;
@@ -216,7 +216,7 @@ describe("DeactivatedFeatures", function () {
         await page.waitForNetworkIdle();
 
         await (await page.jQuery('.widgetpreview-categorylist li:contains("Visitors"):first')).hover();
-        await page.waitFor('.widgetpreview-widgetlist', {visible: true});
+        await page.waitForSelector('.widgetpreview-widgetlist', {visible: true});
 
         const profile = await page.$('.widgetpreview-widgetlist [uniqueid=widgetLivegetVisitorProfilePopup]');
         expect(profile).to.be.not.ok;
@@ -234,7 +234,7 @@ describe("DeactivatedFeatures", function () {
     it('Goal overview contains segmented visitor log link when activated', async function () {
         await setFeatures(1, 0, 1);
         await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2012-08-08#?idSite=1&period=year&date=2012-08-08&category=Goals_Goals&subcategory=1");
-        await page.waitFor('#widgetGoalsgoalConversionsOverviewidGoal1', {visible: true});
+        await page.waitForSelector('#widgetGoalsgoalConversionsOverviewidGoal1', {visible: true});
 
         const profile = await page.$('#widgetGoalsgoalConversionsOverviewidGoal1 a.segmentedlog');
         expect(profile).to.be.ok;
@@ -243,7 +243,7 @@ describe("DeactivatedFeatures", function () {
     it('Goal overview does not contain segmented visitor log link when disabled', async function () {
         await setFeatures(1, 1, 1);
         await page.reload();
-        await page.waitFor('#widgetGoalsgoalConversionsOverviewidGoal1', {visible: true});
+        await page.waitForSelector('#widgetGoalsgoalConversionsOverviewidGoal1', {visible: true});
 
         const profile = await page.$('#widgetGoalsgoalConversionsOverviewidGoal1 a.segmentedlog');
         expect(profile).to.be.not.ok;
@@ -305,7 +305,7 @@ describe("DeactivatedFeatures", function () {
     it('menu should not contain visits log when deactivated globally', async function () {
         await setConfig(1, 1);
         await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2009-01-04#?idSite=1&period=year&date=2009-01-04&category=General_Visitors&subcategory=General_Overview");
-        await page.waitFor('#secondNavBar', {visible: true});
+        await page.waitForSelector('#secondNavBar', {visible: true});
 
         const element = await page.$('#secondNavBar .navbar a[href*="Live_VisitorLog"]');
         expect(element).to.be.not.ok;
diff --git a/plugins/Live/tests/UI/Live_spec.js b/plugins/Live/tests/UI/Live_spec.js
index 9e0ba37874..d31d470c6c 100644
--- a/plugins/Live/tests/UI/Live_spec.js
+++ b/plugins/Live/tests/UI/Live_spec.js
@@ -21,7 +21,7 @@ describe("Live", function () {
         await page.goto("?module=CoreHome&action=index&idSite=1&period=year&date=2010-01-03#?idSite=1&period=year&date=2010-01-03&category=General_Visitors&subcategory=Live_VisitorLog");
 
         await page.waitForNetworkIdle();
-        await page.waitFor('.dataTableVizVisitorLog');
+        await page.waitForSelector('.dataTableVizVisitorLog');
 
         var report = await page.$('.reporting-page');
         expect(await report.screenshot()).to.matchImage('visitor_log');
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
index 7e03b3f7c4..50c5d91ecd 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa1d5a108f3089599ccdb091f89e779b6a032327d16aaefe84ce94e2ac06321c
-size 386172
+oid sha256:5a606dc50663830984e0e30edb727860db7de042c9241e625009923210b89196
+size 386185
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png
index dda52a344b..8264bbfaa6 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_actions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a77301420974e3f3194c752116bf22c6cd75882ad638f245efc048631374632
-size 51599
+oid sha256:f0086120e8f9548298357d45ffec30ceb507701687009fc69b9f64917388b970
+size 51598
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_content_actions.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_content_actions.png
index 710eda75ee..701c3d9152 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_content_actions.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_content_actions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef5b12f774f5934f05b82e972ac8df8ee7ae3376e446aef3b5f6896657df32be
-size 39891
+oid sha256:d9bd76f258af9a88e0cf58090d49593d5e4328d4c788d1e94d19a61d70d7797e
+size 39886
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png
index e686666fef..bb3c6f5196 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log_expand_pageview_actions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bbd83ebe4e1ba806261871abf562b27743ace121064c5ec143fc8b64e331eeb
-size 102070
+oid sha256:a1b8136cf7a0607857f929eddafd7eaa2719284e94d99434e08ca4b5bde6034f
+size 102065
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
index df19c3ecb6..96bf7578de 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28054cad7ff7bc20b613371a3ac9fe41dc2c36f7f5b2998ff508f8dad82ddc0c
-size 423220
+oid sha256:87dfa7cbb02b66ff0ae21baf441e80cc612a45f3abb45ee533deef3839636132
+size 423221
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png
index b2561c1d7b..69407fc7f8 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c2ddc545cc4767795cf9b4cecea826f9018be6353eae7e2a76c2ce20747dd8a
+oid sha256:1e8980055f55066eed4f95bfb2e40e293a953a2478ca18ac15c2a7db3192dd7c
 size 311397
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png
index d5c441a312..1545c63998 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9970312f1e90aaaeb333b100855f6d6c4f4164cc32abf40b40bd544f5e874e2c
+oid sha256:69241c8e7ab81203abf8faffcb241616151ba000afa093a4efc052b04aba9408
 size 449462
diff --git a/plugins/LogViewer b/plugins/LogViewer
-Subproject 3204e829f960ccfc0a9ddb4b509dea5a4f6529e
+Subproject f5d293176e05a220d050fe30a3fd1869b5d5b35
diff --git a/plugins/Login/tests/UI/Login_spec.js b/plugins/Login/tests/UI/Login_spec.js
index 653f2149f0..968bea18eb 100644
--- a/plugins/Login/tests/UI/Login_spec.js
+++ b/plugins/Login/tests/UI/Login_spec.js
@@ -64,9 +64,9 @@ describe("Login", function () {
     it("should load correctly", async function() {
         await page.goto("");
         await page.waitForNetworkIdle();
-        await page.waitFor('input');
+        await page.waitForSelector('input');
         await page.mouse.click(0, 0);
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('login_form');
     });
@@ -78,9 +78,9 @@ describe("Login", function () {
             $('#login_form_submit').click();
         });
         await page.waitForNetworkIdle();
-        await page.waitFor('.notification');
+        await page.waitForSelector('.notification');
         await page.mouse.click(0, 0);
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('login_fail');
     });
@@ -101,9 +101,9 @@ describe("Login", function () {
     it("should redirect to login when logout link clicked", async function() {
         await page.click("nav .right .icon-sign-out");
         await page.waitForNetworkIdle();
-        await page.waitFor('input');
+        await page.waitForSelector('input');
         await page.mouse.click(0, 0);
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('login_form_logout');
     });
@@ -123,7 +123,7 @@ describe("Login", function () {
     it("should display password reset form when forgot password link clicked", async function() {
         await page.click("nav .right .icon-sign-out");
         await page.waitForNetworkIdle();
-        await page.waitFor("a#login_form_nav");
+        await page.waitForSelector("a#login_form_nav");
         await page.click("a#login_form_nav");
         await page.waitForNetworkIdle();
 
@@ -135,7 +135,7 @@ describe("Login", function () {
         await page.type("#reset_form_password", "superUserPass2");
         await page.click("#reset_form_submit");
         await page.waitForNetworkIdle();
-        await page.waitFor('.notification');
+        await page.waitForSelector('.notification');
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('password_reset_error');
     });
diff --git a/plugins/Login/tests/UI/NoAccess_spec.js b/plugins/Login/tests/UI/NoAccess_spec.js
index d829962daa..fe69896a2a 100644
--- a/plugins/Login/tests/UI/NoAccess_spec.js
+++ b/plugins/Login/tests/UI/NoAccess_spec.js
@@ -50,7 +50,7 @@ describe("NoAccess", function () {
             $('#login_form_submit').click();
         });
 
-        await page.waitFor(60500); // wait for session timeout
+        await page.waitForTimeout(60500); // wait for session timeout
 
         await page.click('#topmenu-corehome');
         await page.waitForNetworkIdle();
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedapi.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedapi.png
index 6fadc05759..7d1919e08f 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedapi.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedapi.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b59ee6a447784996410aba5a54c5e2cb03608ca2b59277aca245754f5095e34
+oid sha256:96d146d0451779db1b91b233b8e65a36406a096339ad3138ac3b6d693968f785
 size 13253
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogin.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogin.png
index 8d9da40589..9a42cde0a9 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogin.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogin.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7602b4dcf8fc4e77750e3335051d106415dbeea5082b154347245ac2e08dd0e
-size 48281
+oid sha256:bf87c9ad23692ec0ffe133b3cd75aa2aafc729ccbb094e8628d6b99d0f802517
+size 48163
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogme.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogme.png
index 8d9da40589..9a42cde0a9 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogme.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_blockedlogme.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7602b4dcf8fc4e77750e3335051d106415dbeea5082b154347245ac2e08dd0e
-size 48281
+oid sha256:bf87c9ad23692ec0ffe133b3cd75aa2aafc729ccbb094e8628d6b99d0f802517
+size 48163
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png
index 72ff2004c8..5e12f8534c 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a144c6e43a86a9286defe3dfc1798408d85f51472f136983e42afe86edb1ec79
-size 49830
+oid sha256:0fb0f55731af170b52697c4ca0319c4cc66dab563fb7ec0cdaabd385180cbde6
+size 49836
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png
index 449e5c19b9..1e1f1312db 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a731f0f05758fcd67663059bc5d4acf6677483501c1ad4d8e88703d12911c9d1
-size 67431
+oid sha256:7c13b6ae466331318983ff9f1fc50653c6f564be343df20a4e03fda7cb7b191a
+size 67218
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png b/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png
index 49f09695cb..2525c91025 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77164625203d044ec1d7058bdea51af51634f1c9c818ddf2f626944694824543
-size 29965
+oid sha256:d3ace83bcac411282ada8a81a209c30e70d3ea70f0db03ff6c06b889d6c60d58
+size 29973
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png b/plugins/Login/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png
index 1fd4733ba8..bad0c494d8 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f668dbd2e6ed9b1ebbd825898c5957638825799668b23330454bef9d5f2b7440
-size 33192
+oid sha256:ae8fb99e397c00cb3cc44e55e064508985e28dce029a3e8cc6fbe3752c2da516
+size 33169
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png
index 983318fb64..435afa8475 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b0f2591ce9a6bb387980941bf109f654f5ac79776fa253256ffbef6adcf0b71
-size 32034
+oid sha256:79c147975d2d9560ba63653449e0f2f0aabe58557bb4cd1dedaa9bcf376d6fd4
+size 32041
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png
index 92b9b407b7..0e8689e442 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:747ed4268328512117426c37c653f0e812276f348ae72da7585c3dd9ca0e8278
-size 24643
+oid sha256:a5bad4d68be89fb9986d704e6a09cebfbd2536674f4ba780e1e656eacb13dadc
+size 24653
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png
index 92b9b407b7..0e8689e442 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:747ed4268328512117426c37c653f0e812276f348ae72da7585c3dd9ca0e8278
-size 24643
+oid sha256:a5bad4d68be89fb9986d704e6a09cebfbd2536674f4ba780e1e656eacb13dadc
+size 24653
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_logme_disabled.png b/plugins/Login/tests/UI/expected-screenshots/Login_logme_disabled.png
index 7d60d43c04..d82f273614 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_logme_disabled.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_logme_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f65dfc6e14865782065da6c644112ca2bfa50c16966b42e963a999e4ab97610
-size 41859
+oid sha256:ad7e8efb37f95b6938c6864869dab551479ab45614873b11d80c3060006462f5
+size 41697
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_logme_redirect_invalid.png b/plugins/Login/tests/UI/expected-screenshots/Login_logme_redirect_invalid.png
index 3b8b2359ea..8c84e8146d 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_logme_redirect_invalid.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_logme_redirect_invalid.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:882e9ee5db5d65cba04c14b34f56058625c631df67d45b1dce3e46ac0231283b
-size 62022
+oid sha256:e6857b08acc900c2889c681cdbbb8b467635da9f071c7152c86c6efac9f6d6cd
+size 61861
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png
index d185c34b07..02ff47119b 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fcc817e7ee5912d68b32cf776144b27dd98bc616f25b5c51c17728b1acb0e9e
-size 35064
+oid sha256:a746bb9a3c3ce0d903932b0b9f02e5c023ce0eabd0ca4630dfa4f73681d8386e
+size 35075
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png
index be5bef5d82..444c34ef1c 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d1debd74ba8a5a1a2c39891f5e203f5b5aa41509308813b89ce88f29655c1d5
-size 29315
+oid sha256:75c01e8424d84fcffd001bdc461150ddc599f1442b509c8279443289296f8d8f
+size 29322
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_confirm.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_confirm.png
index 5cbabdf2f9..a8d316b14b 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_confirm.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_confirm.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec46909c1a4f613f345285313d8b3b41fc446d123bddc096a2d45759f2c14c0b
-size 34444
+oid sha256:e1dc84be8b6ff77a388fb1f32ab9264a2f3b55f103117b2f697dd9fd6d4f00e3
+size 34453
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png
index 0f411b3ed9..5518708478 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fe053b046f9d701b8fddb21ba3e266c808fbd58af106fe5d3b4a789da0860ec
-size 38912
+oid sha256:e06a70d46e00b5b3ee12f67c404302873240d432d704d8ece727c495b8d1591f
+size 38921
diff --git a/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_noaccess.png b/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_noaccess.png
index 2391c68a79..1f36d7d639 100644
--- a/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_noaccess.png
+++ b/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_noaccess.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c2bf876689974ba0e3bbd46b1dd309877f1838809344d37e28633cd4b8c0bc9
-size 31939
+oid sha256:8cad0d53718fdf9e776a22b2f0a1c9ced6b710585e085789e697f7a4f725f2af
+size 31950
diff --git a/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_session_timeout.png b/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_session_timeout.png
index cc31f29313..84a2b2ae4b 100644
--- a/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_session_timeout.png
+++ b/plugins/Login/tests/UI/expected-screenshots/NoAccess_login_session_timeout.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8c62cd426bd1fc44e9456bd1d7b65a424e52bb01cc919ddff6f07442abb50e1
-size 34146
+oid sha256:c943113aa506b42f3055fd2735fefd42adeebdc53941039f4525d968d69bbc2e
+size 34156
diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting
-Subproject 67ce24997dad02146dd3333d609eddb3bee314c
+Subproject b92efcc78fe2a28e0a8e4462263be6f93faff19
diff --git a/plugins/Marketplace/tests/UI/Marketplace_spec.js b/plugins/Marketplace/tests/UI/Marketplace_spec.js
index 00b0a29e10..b38dde471d 100644
--- a/plugins/Marketplace/tests/UI/Marketplace_spec.js
+++ b/plugins/Marketplace/tests/UI/Marketplace_spec.js
@@ -28,7 +28,7 @@ describe("Marketplace", function () {
         const elem = await page.waitForSelector('.card-title [piwik-plugin-name="' + pluginName + '"]');
         await elem.click();
         await page.waitForNetworkIdle();
-        await page.waitFor('.ui-dialog .pluginDetails');
+        await page.waitForSelector('.ui-dialog .pluginDetails');
     }
 
     async function captureSelector(screenshotName, selector)
@@ -205,7 +205,7 @@ describe("Marketplace", function () {
         await page.click('.marketplace-paid-intro'); // click outside so change event is triggered
         await page.click('#submit_license_key input');
         await page.waitForNetworkIdle();
-        await page.waitFor(200);
+        await page.waitForTimeout(200);
 
         await captureWithNotification(mode + '_invalid_license_key_entered');
     });
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png
index c577b0fafa..3def75c148 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:988793ced1e9a478872bd673acd607be8901d6951c322b31226e6424f6d4ae8f
-size 64335
+oid sha256:0b1d28443e8cca788567c8cf140d329f7bec728cd946f40918466397327fe365
+size 64450
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png
index 3e4b1a8bfa..c86438059a 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71e854b225230373f15d4aa61017076ca9a3ba95bfd4fe2b26580cde993aa51e
-size 47871
+oid sha256:13a70c9f7215c0642a04c663099fb27972dad0c9798745c16068ccbaf5f4dce8
+size 47971
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png
index f6d2579c1c..1307bda852 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01de68e6fb414ace23c96991d629b17f1d0702bdf930f6bcc8f5de2ccdb4dc98
-size 45796
+oid sha256:84ebba9f15e638ef8331333d81d8ec96488cad172b06c83eb0e604d86852c576
+size 45888
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png
index 72c8f15e63..91f98f5735 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_expiredLicense.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:634329b245566bb0c9d186787e385f62231306ac6209c0674d5d0954e7dba42c
-size 21996
+oid sha256:0489951df24323e1c0bd5a1c6b3cfcf28dc283c951198f4a5a841bd639c25cce
+size 21995
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png
index 3572d5c3b3..1edb8cb62c 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_notification_plugincheck_noLicense.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e88c5a8963588aacc177324f385c91d38a042fb6d5c71ebcff185936b9be9bd6
+oid sha256:67d5b6ba62eeaec71106f1fbfc14b59f4c9723833e640452e72fc9e778c2edb8
 size 24025
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png
index cf97096475..6f03142313 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a53b44050672b5bc722a3ba897e1611b271d61fe8c5986ddf447af86af8f4fa
-size 107029
+oid sha256:4b54e9f8dc2c27eb149eac5d9196d6b9ae563e7abcedc110186864026405508b
+size 107027
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png
index 60519d6d20..f0348ee368 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87795ec9b8e6856457db7206bf6fa88b4662540a93478e1384a5ed9dd5837ece
-size 90193
+oid sha256:9a391304e758ab0cff6daad85ad1daa47cd6ccc0c35fe17e6200bc896ceb3d01
+size 90192
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png
index 631a11f55a..5ed4d5a73b 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd90a3a991cf25eff7f6cbb888deaaac9f246086feb7e8e3e2275d73f04eadfd
-size 76180
+oid sha256:a8f4c2eccfb82d52d1f09ac6d4af7a8968c21c79a21096c92828ce8678ef5f6f
+size 76181
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png
index 902bfd00e6..47f4f73d96 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23ee17bc6882bdc8c154632207b1553d274758d955d35540861804b951d938bb
-size 106455
+oid sha256:e1454b85549aa8618cc001515b30a712e1afd37c0783a204b3666bdcfde29f69
+size 106456
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png
index 43dbdecdf6..5521860fab 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8dfd6b2decc446b475a1eff2a93d937e546b520861ccbc65d3f0859cec4938fb
+oid sha256:46cb19680cbd6081e728cc799c2bd5a7db6b256e1b90eb0aec576522f30c6ad8
 size 90142
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png
index 6961ba62d4..80e34ec955 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20a42aa2b08a30fe739e1b8e430025256c3c175cebd10703cda2738524e4883f
+oid sha256:209cd3420c768d7189b4cbaeb2d7435ad0c3bd9a2c9ff8df2b929cb338dfb069
 size 75797
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png
index 67ad927c5b..e991011e85 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7734014cfad92514f7a47bf58ffc4592d3a2b6e42e22376480de52230a7f017
-size 91176
+oid sha256:d74386b723aee822d2386c4c6b102952a13970509f827ce01a09f76d5fc0d598
+size 91175
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
index b5d34a9324..98ed34ef97 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f20f760fd2d925ddc88fcc7bb567bb0157747a66f6eb9fda35e424916ce44223
-size 56241
+oid sha256:e7b962e21b83262b9f071da707dcf99883239a00aef690cb3a9728b12a75016e
+size 56228
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
index b5d34a9324..98ed34ef97 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f20f760fd2d925ddc88fcc7bb567bb0157747a66f6eb9fda35e424916ce44223
-size 56241
+oid sha256:e7b962e21b83262b9f071da707dcf99883239a00aef690cb3a9728b12a75016e
+size 56228
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
index 7845a39027..30fc2ac132 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88512c74a009c571a521727c2e8fc772f2b3a2dd9de3c15d7e41f42b3acb0cee
-size 65473
+oid sha256:ed2d7cd62d9e6e32477756124df7155a5e6e682ba06639604478c48fcea4988d
+size 65469
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
index 7845a39027..30fc2ac132 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88512c74a009c571a521727c2e8fc772f2b3a2dd9de3c15d7e41f42b3acb0cee
-size 65473
+oid sha256:ed2d7cd62d9e6e32477756124df7155a5e6e682ba06639604478c48fcea4988d
+size 65469
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
index 57ef576086..eaf6c692ac 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4611cd4efc8ce354eaec8cc76d1495e1884536b6f952f2ec589a419828eabe6a
-size 66793
+oid sha256:42c4a75028c228db7e08ab9942cfcb83da26e9b8c144a9cf0b04ed6ba24bf914
+size 66783
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
index c9fd364467..b1c5f838ac 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ec4fac2f476aa8cddbf89404e3303a9f7296db48c13e0fad8f6ad1ff37e63f4
-size 66886
+oid sha256:7ae653825869011af8da4691ad7e29d5848f153a248c9d146d33d32f4e2feab2
+size 66882
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png
index 9b42fce88f..5f22268c36 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2ee97122303e5b239be255f0fd42f4459cec2a0ae320a95f159e7920d5f667d
-size 74328
+oid sha256:05fbdaf72bfde3fd9958cc8b72011244ddb27730d09aa1d805d077457241614d
+size 75933
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png
index 4225878d21..3652c14730 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:feaf4c4cdfca77795e6c3327a599be889ec4181a54362f1823e8deb092d779ed
-size 80720
+oid sha256:0114db17ce137b48996c161f6afe7429539e01156f206c7be15661986ac49ade
+size 82343
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png
index f15b515e40..b479147c6c 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0492a19d58e8a94dad2e81dd885af338f6b81c294274c9aba8a20068ac055163
-size 53588
+oid sha256:fe46572fc2535a8950daf79dcecf5749efe2e6dd19e4a7d3ac419cb05470e082
+size 54797
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
index 10fd216eb1..087941d9c9 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e583c6f0580684c3d60fe19b6efb21cbbc4762f847826ca4aac6bd068316463
-size 822034
+oid sha256:1b3a87ad7dd6d416b7b2e368016ddb9494781e381adfe2597d0edbf7789f9599
+size 823436
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
index ddbe066dcb..5c30ccc3e4 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ee346ef13561007c67d21728dfc02c92a98942be80a004fc0097d2324af11ca
-size 848621
+oid sha256:c9274a1fd72ec7562b807d1820e42a0024c11bbe50ff938d68ca0f31596fc976
+size 849857
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
index 5abc2f6ace..8108d2f3b9 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e94f70c08f67483bc32ed570e927e306fa1c757721d13d2e7866dfa7e2818f5
-size 840109
+oid sha256:9d765922d6d4b7dc83027a28b0d887cdd745038521507dee7daa9060fa55e949
+size 841322
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
index 881748af13..90ba410bf0 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21c27d27975c1012e09fc66218406fd6f83c8dc8909fc40df0c296b6dee600d3
-size 834643
+oid sha256:6df29c4584f2a504ccacb5fb41ffd500457ad6ec02d6138a398556d8e66dbba3
+size 835965
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
index 628ee438d8..0eb4ec5a23 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fff31e00d36c7727c6fcfbfcbe21d60f5c0cc94e2e0ca85234d1a69f6244ff97
-size 843776
+oid sha256:518f897c8a30a9533abb9c193cd35bd397c6c626389b2aaf8cc78362df28fe40
+size 845122
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
index 27728202a6..5c78442ebc 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f81df66dbe5ac0a178a0d7c619cbe8a2c86d76d1e19ea858067eeb59db94724e
-size 164467
+oid sha256:8672f349e163b774a2e391e31d70a2abc751f18c70071361120b2282dca47092
+size 164466
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
index 69c3af4990..722d331f3c 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:babb545e93278d12e0d0899a46b4e9e8b42d285f3c9f9a67417b27eb5468f3af
-size 161527
+oid sha256:786bea8d1726b113e8595e28c77bdad43a93f40b92962a69c343d888d748b2d2
+size 161520
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png
index 47203bee06..480a053cb8 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d47e4600963d355dbdf42d6b0c052668a1c42316e7c4a08f486f0c264f7c5bb
-size 34101
+oid sha256:f4de412d2b8c924ea7a40c368b751ce6ca077f16fff991fd31a3c4d406473f6c
+size 33782
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png
index 2ede6e355d..65a5a4ae0f 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddfe48afcb1a73a4f5a3ae4b0f79b601bae168b67de0940291ff5a8e61bcd070
-size 33722
+oid sha256:57f350e42f335e129b1df05d322628e44994ee03215879d7381809b3651f9334
+size 33254
diff --git a/plugins/Morpheus/tests/UI/Morpheus_spec.js b/plugins/Morpheus/tests/UI/Morpheus_spec.js
index a6685d85ce..44f5de9302 100644
--- a/plugins/Morpheus/tests/UI/Morpheus_spec.js
+++ b/plugins/Morpheus/tests/UI/Morpheus_spec.js
@@ -18,13 +18,13 @@ describe("Morpheus", function () {
 
     it("should show all UI components and CSS classes", async function() {
         await page.goto(url);
-        await page.waitFor('.progressbar img');
+        await page.waitForSelector('.progressbar img');
         await page.evaluate(() => {
             $('img[src~=loading],.progressbar img').each(function () {
                 $(this).hide();
             });
         });
-        await page.waitFor(500); // wait for rendering
+        await page.waitForTimeout(500); // wait for rendering
         expect(await page.screenshot({ fullPage: true })).to.matchImage('load');
     });
 });
diff --git a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
index 9658f9a389..e9f27f7dff 100644
--- a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
+++ b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5aac1670a60d3d05918ac70af0f6f2fd519225a75b0c0f5ecdd4651532c77b59
-size 1669625
+oid sha256:194ae49ce59d719738177a06b90df92805753936160f23e5e12a32904ff20c47
+size 1670689
diff --git a/plugins/MultiSites/tests/UI/MultiSites_spec.js b/plugins/MultiSites/tests/UI/MultiSites_spec.js
index d043ec0fda..5c6856cf28 100644
--- a/plugins/MultiSites/tests/UI/MultiSites_spec.js
+++ b/plugins/MultiSites/tests/UI/MultiSites_spec.js
@@ -44,7 +44,7 @@ describe("MultiSitesTest", function () {
 
     it('should load the all websites dashboard correctly', async function() {
         await page.goto("?" + generalParams + "&module=MultiSites&action=index");
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
         await page.waitForNetworkIdle();
 
         expect(await page.screenshotSelector(selector)).to.matchImage('all_websites');
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
index b75b6f2b4b..8344dbbe7c 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:827c39b6477d331340650288de48c389fa345115cf5cb52a1b1ae97cc2d83f43
-size 281242
+oid sha256:438e52f1fa6410fc55c8c3c9569ad075068bf3cac9798d96395705b8dec106db
+size 283053
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
index 089787d20b..8434198e43 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f866b750ce195cbf1f250213de7d128e562d7bab2ec10a58c9365ce79595ee9b
-size 56046
+oid sha256:154a12a32098b5a46b45f3c41f6a006e92edc80a159e4cd893e04ce0e1316ef8
+size 56207
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
index 8522855680..0f53d2cf80 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a477ea5a3e53e3a1e82181385159e312b79d97792f084868c62c9ef14225d41d
-size 72809
+oid sha256:527984361b44bbf7d7903e1b8c37994df2fe08f2d32fe82bc56d1adbc121faff
+size 73075
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
index a204ad66f1..c735b5fe75 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b46bed462c5fca2eda732e8e680eafd6edf147c38df617f2ce0b5222b7371216
-size 244905
+oid sha256:ca5cdfdbcc53b91c26c0d2a5fadd06857dedbd0b4dc608b865c5aa62a7b0d2ff
+size 245998
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
index 1e521d9989..ad8f299b87 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0f8a6ba0033f2a3844dec327de82b547481f4b97b5bdd50b7d3955c9157b1fb
-size 56046
+oid sha256:76e8dce8a637a01ee34e473ae69df607a2b5d88b549df997f5768ac934cc2093
+size 56231
diff --git a/plugins/Overlay/tests/UI/Overlay_spec.js b/plugins/Overlay/tests/UI/Overlay_spec.js
index 70f916c1f0..2d2c9e7960 100644
--- a/plugins/Overlay/tests/UI/Overlay_spec.js
+++ b/plugins/Overlay/tests/UI/Overlay_spec.js
@@ -74,7 +74,7 @@ describe("Overlay", function () {
         await page.evaluate(function(){
             $('.dropdown-toggle', $('iframe').contents())[0].click();
         });
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
 
         await removeOptOutIframe();
         expect(await page.screenshot({ fullPage: true })).to.matchImage('page_new_links');
@@ -102,7 +102,7 @@ describe("Overlay", function () {
             $('#overlayDateRangeSelect').val('day;yesterday').trigger('change');
         });
 
-        await page.waitFor('.overlayMainMetrics,.overlayNoData');
+        await page.waitForSelector('.overlayMainMetrics,.overlayNoData');
         await page.waitForNetworkIdle();
 
         await removeOptOutIframe();
@@ -113,7 +113,7 @@ describe("Overlay", function () {
         await page.evaluate(function(){
             $('#overlayRowEvolution').click();
         });
-        await page.waitFor(500); // for modal to appear
+        await page.waitForTimeout(500); // for modal to appear
         await page.waitForNetworkIdle();
         await page.evaluate(function () {
             $('.jqplot-xaxis').hide(); // xaxis will change every day so hide it
@@ -125,10 +125,10 @@ describe("Overlay", function () {
 
     it("should open transitions popup when transitions link clicked", async function() {
         await page.click('button.ui-dialog-titlebar-close');
-        await page.waitFor('#overlayTransitions');
+        await page.waitForSelector('#overlayTransitions');
         await page.click('#overlayTransitions');
         await page.waitForNetworkIdle();
-        await page.waitFor(2000);
+        await page.waitForTimeout(2000);
 
         await removeOptOutIframe();
         expect(await page.screenshot({ fullPage: true })).to.matchImage('transitions');
@@ -138,10 +138,10 @@ describe("Overlay", function () {
         await page.goto(urlWithSegment);
         await page.waitForNetworkIdle();
 
-        await page.waitFor(2000);
+        await page.waitForTimeout(2000);
 
         const frame = page.frames().find(f => f.name() === 'overlayIframe');
-        await frame.waitFor('.PIS_LinkTag');
+        await frame.waitForSelector('.PIS_LinkTag');
 
         await removeOptOutIframe();
         expect(await page.screenshot({ fullPage: true })).to.matchImage('loaded_with_segment');
@@ -153,7 +153,7 @@ describe("Overlay", function () {
         testEnvironment.save();
 
         await page.goto(baseUrl + '&token_auth=a4ca4238a0b923820dcc509a6f75849f' + hash);
-        await page.waitFor('.overlayMainMetrics,.overlayNoData');
+        await page.waitForSelector('.overlayMainMetrics,.overlayNoData');
 
         await removeOptOutIframe();
         expect(await page.screenshot({ fullPage: true })).to.matchImage('framed_loaded');
diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png
index 0196affde9..546d19452e 100644
--- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png
+++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ae853425f91e6c6a48ea52f649e68ccb729a7da29940029f68fcf44e976cdbe
-size 108795
+oid sha256:6c87f9c4fc7dda4389d292b5a57d81fb827914b9b5e047c4378efa0616b6f92e
+size 108840
diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png
index 0196affde9..546d19452e 100644
--- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png
+++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ae853425f91e6c6a48ea52f649e68ccb729a7da29940029f68fcf44e976cdbe
-size 108795
+oid sha256:6c87f9c4fc7dda4389d292b5a57d81fb827914b9b5e047c4378efa0616b6f92e
+size 108840
diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
index 01f31d8034..96d641e061 100644
--- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
+++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fce72411ddd693022a38639f0be4c000d53fdf4b9b3591c43c710e037869ada
-size 106338
+oid sha256:4325d7a68e6995c176d0ecb3bb71fe206362d4c469fcb0f79998a8614ecfc9ab
+size 106348
diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png
index b8bfe42027..a4f80d5663 100644
--- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png
+++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf1bf009951ed867e2161e17534b042d1c7ea13ea78cc0a0696a017dae1d801e
-size 211836
+oid sha256:a701ee45201215b8ec896f20ed39e31d5f53c7a797b893cd6b6251ceea55fbaf
+size 211791
diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
index 350eb5dc32..a0fa94a612 100644
--- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
+++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7715360cb3b14279139ccae621e1803203deec1f6d88a8f3f6113e14f790e4b
-size 115273
+oid sha256:93e75037f960563ccb410347395323cec9b15e11f8623152a2ca7643820b6a1b
+size 115324
diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png
index 50da428837..c39aaba1d9 100644
--- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png
+++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7c873292bf318a732ce524d36db32059cb76db48f99a1cdf83861daf9c4a7b2
-size 112572
+oid sha256:da9eb1f73eebeb6dd1511a4337ccffba3297c36ff71fe8c69849070faa7b3dd0
+size 112605
diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png
index 22c1e60812..0bac002c40 100644
--- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png
+++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:412b4fb646ab220c7b477a13adda252b3aeb5b90e746d6b942010e898726f891
-size 213915
+oid sha256:7206af018288375c9d07cdbfbf025c3da5be80a4bc80b2a0879bee9cfe3b0f23
+size 213892
diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png
index 91d5cab8f1..d9cb6994e6 100644
--- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png
+++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:256821270feb48a1820ac1cdb44410fcb8d6d1dc25cd73eeb99de787b08f5844
-size 100399
+oid sha256:ebc9efab191105b84d0f5794c561be8cd431e511c34b5886d7539642938310dc
+size 100448
diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png
index 36c037c0fc..45e6ad7568 100644
--- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png
+++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b895a2e3cda3b098f6c0de1a0bb069320ae0f33f8bc24427d1bd4e74ece4729
-size 150463
+oid sha256:3c0144378fd29bba131acaf0e4bacbc64cc7d6d4ca3c4965e65531096c841eb1
+size 150476
diff --git a/plugins/PagePerformance/tests/UI/PagePerformance_spec.js b/plugins/PagePerformance/tests/UI/PagePerformance_spec.js
index e7c7281832..43e9c3b235 100644
--- a/plugins/PagePerformance/tests/UI/PagePerformance_spec.js
+++ b/plugins/PagePerformance/tests/UI/PagePerformance_spec.js
@@ -34,7 +34,7 @@ describe("PagePerformance", function () {
         // hover first row
         const row = await page.waitForSelector('.dataTable tbody tr:first-child');
         await row.hover();
-        await page.waitFor(50);
+        await page.waitForTimeout(50);
 
         pageWrap = await page.$('.pageWrap');
         expect(await pageWrap.screenshot()).to.matchImage('rowactions');
@@ -45,7 +45,7 @@ describe("PagePerformance", function () {
         await subtablerow.click();
 
         await page.waitForNetworkIdle();
-        await page.waitFor(200);
+        await page.waitForTimeout(200);
 
         // hover first row
         const row = await page.jQuery('tr.subDataTable:eq(1) + tr');
@@ -68,10 +68,10 @@ describe("PagePerformance", function () {
         const pageWrap = await page.waitForSelector('.ui-dialog');
 
         await page.hover('.piwik-graph');
-        await page.waitFor('.ui-tooltip', { visible: true });
+        await page.waitForSelector('.ui-tooltip', { visible: true });
 
         await ensureTooltipIsVisibleInScreenshot();
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
 
         expect(await pageWrap.screenshot()).to.matchImage('pageurl_overlay');
     });
@@ -82,7 +82,7 @@ describe("PagePerformance", function () {
         // hover visualization selection
         const icon = await page.jQuery('.activateVisualizationSelection');
         await icon.click();
-        await page.waitFor(500); // animation
+        await page.waitForTimeout(500); // animation
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('visualizations');
     });
@@ -114,10 +114,10 @@ describe("PagePerformance", function () {
         pageWrap = await page.waitForSelector('.ui-dialog');
 
         await page.hover('.piwik-graph');
-        await page.waitFor('.ui-tooltip', { visible: true });
+        await page.waitForSelector('.ui-tooltip', { visible: true });
 
         await ensureTooltipIsVisibleInScreenshot();
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         expect(await pageWrap.screenshot()).to.matchImage('pagetitle_overlay');
     });
diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png
index 5631df0372..1b69a16338 100644
--- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png
+++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8ec7c876d639f0aad0f998eeced67a51198480895420f3fd8db2926f72d0a91
-size 121513
+oid sha256:682ee95a66dd23c16fcbc544537f937ed41d03b893cdd3f8767979784247f4e6
+size 129795
diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png
index 5472f84482..8dd5033705 100644
--- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png
+++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6ee3af8a32edc0ec828185a27c84bfb80872f514045c85a951b7e5e1267c868
-size 152079
+oid sha256:56c7894ea208305c18353344c9bde90366f386776e31dd80dda79b2e839fc1d2
+size 152088
diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png
index d62afb8d11..0a48c89ca8 100644
--- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png
+++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92ac5d7b67c03192a128cc55bcf76c48444855d07167802c930a0f393839f09e
-size 151246
+oid sha256:bdf30fc712e58504d1ba01c750eb6da19741d443ab15de8664c379e49638fa1d
+size 151258
diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png
index fa02298f77..e495622299 100644
--- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png
+++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f758598ab3331d661a9c391973993736ea0b929db8a8a72cefd80950c1cad8d5
-size 27851
+oid sha256:03f2d2581e12fe18b472bf19b0191ed72f99195c3993fb67e9f46279b2318705
+size 30487
diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png
index 2f45eb4d7a..8a268eb7f4 100644
--- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png
+++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d3e4999cee03fe42d264f6f43ef34e637ef88fbc1c5ce366a41fc1a90ee882d
-size 32410
+oid sha256:63bf3433197a59c23f5706ef5b8479cd3f46b88e0a461f191f44577663108ebf
+size 33491
diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png
index 4c941c1929..fde3a1623f 100644
--- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png
+++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9058a4edc52e3e5a8a598758e0f945d460747a5a6322036eb60eb0e216d326a9
-size 35306
+oid sha256:f774c17d50b119452eb7b663a4b37d4f634bef0ddd18ee65a805a633940cbffc
+size 36640
diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png
index e5fc974b92..5beccecb15 100644
--- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png
+++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:279e3191c246816d9d8e4311f7609175cbc938716b351f1215bf8cbb58f26919
-size 40110
+oid sha256:58f88d69240f785fd22548ce805f31f03c80c326d2df5fbe7d48a0d41e1699cd
+size 40328
diff --git a/plugins/PrivacyManager/tests/UI/PrivacyManager_spec.js b/plugins/PrivacyManager/tests/UI/PrivacyManager_spec.js
index 7573d9902b..6e4410867a 100644
--- a/plugins/PrivacyManager/tests/UI/PrivacyManager_spec.js
+++ b/plugins/PrivacyManager/tests/UI/PrivacyManager_spec.js
@@ -23,7 +23,7 @@ describe("PrivacyManager", function () {
     async function setAnonymizeStartEndDate()
     {
         // make sure tests do not fail every day
-        await page.waitFor('input.anonymizeStartDate');
+        await page.waitForSelector('input.anonymizeStartDate');
         await page.evaluate(function () {
             $('input.anonymizeStartDate').val('2018-03-02').change();
             $('input.anonymizeEndDate').val('2018-03-02').change();
@@ -44,7 +44,7 @@ describe("PrivacyManager", function () {
     {
         var elem = await page.jQuery('.modal.open .modal-footer a:contains('+button+')');
         await elem.click();
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
         await page.waitForNetworkIdle();
     }
 
@@ -52,19 +52,19 @@ describe("PrivacyManager", function () {
     {
         await page.click('.findDataSubjects .btn');
         await page.waitForNetworkIdle();
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
     }
 
     async function anonymizePastData()
     {
         await page.click('.anonymizePastData .btn');
-        await page.waitFor(1000); // wait for animation
+        await page.waitForTimeout(1000); // wait for animation
     }
 
     async function deleteDataSubjects()
     {
         await page.evaluate(() => $('.deleteDataSubjects input').click());
-        await page.waitFor(500); // wait for animation
+        await page.waitForTimeout(500); // wait for animation
     }
 
     async function enterSegmentMatchValue(value) {
@@ -84,7 +84,7 @@ describe("PrivacyManager", function () {
         await page.waitForFunction('$("'+selector+'").length > 0');
         var elem = await page.jQuery(selector);
         await elem.click();
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
     }
 
     async function selectActionColumn(title)
@@ -182,7 +182,7 @@ describe("PrivacyManager", function () {
         await loadActionPage('privacySettings');
         await page.click('[name="anonymizeLocation"] label');
         await page.click('[name="anonymizeTheUserId"] label');
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
         await selectActionColumn('time_spent_ref_action');
         await selectActionColumn('idaction_content_name');
 
@@ -192,7 +192,7 @@ describe("PrivacyManager", function () {
     it('should confirm anonymize location and action column', async function() {
         await anonymizePastData();
         await selectModalButton('Yes');
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
         await setAnonymizeStartEndDate();
 
         await captureAnonymizeLogData('anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed');
@@ -200,7 +200,7 @@ describe("PrivacyManager", function () {
 
     it('should anonymize only one site and different date pre filled', async function() {
         await page.click('.form-group #anonymizeSite .title');
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
         await page.click(".form-group #anonymizeSite [title='Site 1']");
         await page.click('[name="anonymizeIp"] label');
         await page.evaluate(function () {
@@ -214,7 +214,7 @@ describe("PrivacyManager", function () {
     it('should anonymize only one site and different date confirmed', async function() {
         await anonymizePastData();
         await selectModalButton('Yes');
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
         await setAnonymizeStartEndDate();
 
         await captureAnonymizeLogData('anonymizelogdata_one_site_and_custom_date_confirmed');
@@ -229,7 +229,7 @@ describe("PrivacyManager", function () {
     it('should show no visitor found message', async function() {
         await enterSegmentMatchValue('userfoobar');
         await findDataSubjects();
-        await page.waitFor('.manageGdpr tr');
+        await page.waitForSelector('.manageGdpr tr');
         await page.mouse.move(-10, -10);
 
         await capturePage('gdpr_tools_no_visits_found');
@@ -267,19 +267,19 @@ describe("PrivacyManager", function () {
 
     it('should ask for confirmation before deleting any visit', async function() {
         await deleteDataSubjects();
-        const modal = await page.waitFor('.modal.open', { visible: true });
+        const modal = await page.waitForSelector('.modal.open', { visible: true });
         expect(await modal.screenshot()).to.matchImage('gdpr_tools_delete_visit_unconfirmed');
     });
 
     it('should be able to cancel deletion and not delete any data', async function() {
         await selectModalButton('No');
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
         await capturePage('gdpr_tools_delete_visit_cancelled');
     });
 
     it('should verify really no data deleted', async function() {
         await loadActionPage('gdprTools');
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
         await enterSegmentMatchValue('userId203');
         await findDataSubjects();
         await page.click('.entityTable tbody tr:nth-child(2) .checkInclude label');
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png
index 2a733502b0..1e61e9cf40 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:955a5c35636f3f70431b59938387cfa968540e88dceda3cc89e39cf8b4eb8c6c
-size 215966
+oid sha256:638e813c43505b2d715de1e299770b964990fd0c3c18c3788e4ece77aa8bce47
+size 215963
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png
index 527e87d3e6..2eb399ddc4 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b426466ee070d0fd02306617343ab61ea98ab6a778cea28432e7f5f80290f1a
-size 219332
+oid sha256:06495f98a6b727d1da6bbc84921e6559b9cfcb8290a906d42e46cc9cd57dfcdb
+size 220870
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png
index 2a733502b0..1e61e9cf40 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:955a5c35636f3f70431b59938387cfa968540e88dceda3cc89e39cf8b4eb8c6c
-size 215966
+oid sha256:638e813c43505b2d715de1e299770b964990fd0c3c18c3788e4ece77aa8bce47
+size 215963
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png
index 3ba2b8b5b6..cb450b77f4 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d96c01eabcee611b916292525c7656a426c4d6f166cd555d7961ee6345f42dbf
-size 231979
+oid sha256:193b062a5a058a6955ce2ef7d66580aa898aee2de16b8484b02cdd68647d0572
+size 233321
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png
index 83c16ff82a..222188c6db 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e578921ac9da901a299077ef55c9a99201ecc96223912d18efda4ca861b23b9f
-size 228619
+oid sha256:c6da3e4e4b69ca9e75de221171d5993ec26b5eb5debade3fb0b1e9975ca02621
+size 229863
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png
index a882c9a832..5187405a6d 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce0b972bae27b789467196a74d1311987e97de3a53d45f4bcd02da3865dcb4fc
-size 240513
+oid sha256:87084a49a3174ba506c19cebb0fc3a6ce91ce26836e79c9db1c88e9d3edcb56b
+size 241565
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png
index 30f41c3473..77336c5088 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcbe5429259d3fdd0b26e3bdc78e826600d79bcd0f4e07babf201cb231126688
-size 231567
+oid sha256:631206c6bba4d1c65179c171de3f34aed6efab4d05f9f7008385576adbc1eaa0
+size 232923
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png
index 8a01ce40eb..d04e6e7362 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b05186a554001b0ac13caf51778acb72565b2955478f20e2486481d47ed2ca0a
-size 62774
+oid sha256:0dc061653083632c413a46a669eaf8d5a30b743f60a6ed3ff6b2cd334e06df85
+size 62462
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png
index 6e8392eecb..1bccf2b8ba 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8931e34b2f9c591e7b293a0fd1c3078bdbd3d081d1cb6e119b024a71fc96ddf
-size 581083
+oid sha256:29f7a8a10f4ae63d3cddf9c80644378e7625d1d17b30986503444c6a2111db89
+size 567547
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png
index 6216e88f41..f5d266a55a 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:323b04402124efac3c47a76fb178d05a2989ffdf3fceb7d780096160720feb84
-size 574962
+oid sha256:c96c2d345f869408f4e5e346577b7d9245cbe961c651810cee2811606b92103e
+size 561835
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png
index 788f1fce8d..f8b86a7ce9 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86f7d76734614cd895bed0e973bb469a50d936c704260f94b328e5055a061d43
-size 129652
+oid sha256:f91d4fea1087cfcf6ab7683fe71831cbd869db1aff9fdc16e9655e29a2da2c71
+size 129007
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png
index a5c0c71d0f..911bd61f01 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42452acb7ad8a17c73f51eb3b7d49bbd33f1366d546faab54ee2373f25a870db
-size 581465
+oid sha256:6b3f74a93a0d0ce9a458f08b79106edec939a20403a9730ced8a8f2c7677e2fe
+size 567895
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png
index bd47680816..8898412f55 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:148476ea54401b0a3ba9a6e2eb3a8c27d912f029fd44dc33813fc35dce151e55
-size 68531
+oid sha256:2d5c09c53ebcd95563f4675f34f6b723004f41ba9fbc642f79b90f94f212edf8
+size 68186
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png
index 6e8392eecb..1bccf2b8ba 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8931e34b2f9c591e7b293a0fd1c3078bdbd3d081d1cb6e119b024a71fc96ddf
-size 581083
+oid sha256:29f7a8a10f4ae63d3cddf9c80644378e7625d1d17b30986503444c6a2111db89
+size 567547
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png
index dcda22afde..218292e2fd 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03fb293c3e477a3e51c966aa5d9a401e95c124b531b1398bc5336a75a0a06467
-size 575315
+oid sha256:81fde2b193c87cbd81b092e8d8509ad12aa7cef5efe6c131c6d6ed48f9e3c730
+size 562200
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png
index c04fc1e707..24026075be 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e2a05a2210124164554166a5a381cb1cb4cea7889c2e6efae56c24602302f0f
-size 545190
+oid sha256:39b338e165b7fe1ef7333d1ad3a2be3285fb5a899e1d29eb4dc5fbd4b4daa700
+size 545154
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png
index 89a9410ba8..656a98e691 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20306dce97d09ad756083c0cf55d53b02ea44023f68c7a3fad8dddc151c9b499
-size 154394
+oid sha256:32f3b9b6be11da85e702b0c40d3dcab5a0b41b5e627bd6b62b4773365e752807
+size 154252
diff --git a/plugins/Provider b/plugins/Provider
-Subproject b04a23f50c6e050904ad83e927a49dfe10b8134
+Subproject 5c00f923fb43e90243959e90b2af03c2b4b540c
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
-Subproject 277f5d0419cff1d560d0274f8545b1088e61f52
+Subproject 5111c442695fd3e1639e9b8fe77053efc92d6a1
diff --git a/plugins/Referrers/tests/UI/CampaignBuilder_spec.js b/plugins/Referrers/tests/UI/CampaignBuilder_spec.js
index c85c5b13db..2220ec39ba 100644
--- a/plugins/Referrers/tests/UI/CampaignBuilder_spec.js
+++ b/plugins/Referrers/tests/UI/CampaignBuilder_spec.js
@@ -27,7 +27,7 @@ describe("CampaignBuilder", function () {
 
     async function ensureHighlightEffectIsGone()
     {
-        await page.waitFor(2000);
+        await page.waitForTimeout(2000);
     }
 
     async function generateUrl()
@@ -52,7 +52,7 @@ describe("CampaignBuilder", function () {
     it('can reset form', async function () {
         await captureUrlBuilder('generate_url_reset', async function () {
             await page.click('.resetCampaignUrl');
-            await page.waitFor(500); // wait to re-render
+            await page.waitForTimeout(500); // wait to re-render
         });
     });
 
diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png
index cbdd8947ea..62c59dcf04 100644
--- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png
+++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e09225db1cc83e68bff85c6e83b2d9883964b61968fb0e1952dde2079959cad
-size 80504
+oid sha256:b0664444e8bde22e8277a0b6af1ee94074153501e64bd646c61cbd031fd84e29
+size 81375
diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png
index 31e48709c6..38b18b46aa 100644
--- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png
+++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ead716ad603eff5de3c0dc930b281da67aa4192228e612041207ad81d1d982c
-size 55083
+oid sha256:dd27a0ea1baaac6119da8ddb37a49eee8383f2c4228d427adf810fafa8f55adf
+size 55076
diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png
index 3080f480e5..3c97c6c65e 100644
--- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png
+++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6be9f15de845583fb98557f58de61a0528d68255e12d0098c4e1aa7d23a6af40
-size 81871
+oid sha256:aacf7ee6d657454d0793cde5ae3a3bd9e300eb876f20167be25f7b699b3556fe
+size 82686
diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png
index 7f9915afa7..46b075250d 100644
--- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png
+++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b7e052ce139948ae037eebe9df462b54b5591f6e47913556f5dc195e6f639cf
-size 70788
+oid sha256:2a594900bd42d3f57192001b48eb4614a41c11dccc3f1c85bcb212456cd6b9e1
+size 70782
diff --git a/plugins/SEO/tests/UI/expected-ui-screenshots/SeoWidgetTest_widget.png b/plugins/SEO/tests/UI/expected-ui-screenshots/SeoWidgetTest_widget.png
index d7aa33a571..fea3695823 100644
--- a/plugins/SEO/tests/UI/expected-ui-screenshots/SeoWidgetTest_widget.png
+++ b/plugins/SEO/tests/UI/expected-ui-screenshots/SeoWidgetTest_widget.png
diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png
index d7b67c1df2..ef779fd0c1 100644
--- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png
+++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72b8f441235e5f423c93f306c97e688f40209d143a9dd36d5f62dd38cf989045
-size 26135
+oid sha256:c99a7ec540b2a08e67881758cabd40bfb2bdf948b6d1f5c436449067e5a79e37
+size 26144
diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png
index eb059ba213..8739373cc8 100644
--- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png
+++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:851d5640bd655170b1bbaa1b968a45e68a61f9948ba15104f77c97c8b6f03df9
-size 20465
+oid sha256:1b556d90cbfa3100684f22783b7019f43fb46b26e9de3d9a015e7fb5c254d47e
+size 20475
diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png
index f4a0a6b357..f52e2e631e 100644
--- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png
+++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aab0e3b7032be2d225a45ca1348a088a8ca05d03f64da01189be15cd9403081f
-size 25354
+oid sha256:c13291e89a14c66d46471ecc10c93ad42e25e03eb2b75e1c93bb210ceb0bfdd4
+size 25364
diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png
index e6ca75d1b3..0e7f393b88 100644
--- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png
+++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e72e498d08109eab2b1bf112faca40fb2122bd5834d36104e74318821061717
-size 23606
+oid sha256:b1d66bfda29c89cbf0f06cf94287c0aa7857b74d4199a62619efcfa767f08532
+size 23613
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
-Subproject 9164ac73a2cb9c7ef03dc71eb064c455044c462
+Subproject f2d4db3c4b99337c6714721a6dd5b0e80593abb
diff --git a/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js b/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js
index 2847220768..35179aa6eb 100644
--- a/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js
+++ b/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js
@@ -53,7 +53,7 @@ describe("SegmentSelectorEditorTest", function () {
 
     it("should start editing segment name when segment name edit link clicked", async function() {
         await page.click('.segmentEditorPanel .editSegmentName');
-        await page.waitFor(250); // animation
+        await page.waitForTimeout(250); // animation
         expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('3_segment_editor_edit_name');
     });
 
@@ -81,7 +81,7 @@ describe("SegmentSelectorEditorTest", function () {
         await page.click('.segmentationContainer .title');
         await page.click('.add_new_segment');
         await page.waitForNetworkIdle();
-        await page.waitFor('.segmentRow0');
+        await page.waitForSelector('.segmentRow0');
         expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('8_segment_editor_create');
     });
 
@@ -94,13 +94,13 @@ describe("SegmentSelectorEditorTest", function () {
     it("should show suggested segment values when a segment value input is focused", async function() {
         await page.click('.segmentEditorPanel .segmentRow0 .ui-autocomplete-input');
         await page.waitForNetworkIdle();
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
         expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('suggested_values');
     });
 
     it("should add an OR condition when clicking on add OR", async function() {
         await page.click('.segmentEditorPanel .segment-add-or');
-        await page.waitFor(() => !! $('.segmentRow0 .segment-rows>div:eq(1)').length);
+        await page.waitForFunction(() => !! $('.segmentRow0 .segment-rows>div:eq(1)').length);
         await page.waitForNetworkIdle();
         expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('add_new_or_condition');
     });
@@ -113,7 +113,7 @@ describe("SegmentSelectorEditorTest", function () {
 
     it("should add an AND condition when clicking on add AND", async function() {
         await page.click('.segmentEditorPanel .segment-add-row');
-        await page.waitFor('.segmentRow1');
+        await page.waitForSelector('.segmentRow1');
         await page.waitForNetworkIdle();
         expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('add_new_and_condition');
     });
@@ -138,7 +138,7 @@ describe("SegmentSelectorEditorTest", function () {
             $('button.saveAndApply').click();
         });
         await page.waitForNetworkIdle();
-        await page.waitFor('.segmentationContainer');
+        await page.waitForSelector('.segmentationContainer');
 
         await page.click('.segmentationContainer');
         expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('saved');
@@ -177,8 +177,8 @@ describe("SegmentSelectorEditorTest", function () {
         await page.evaluate(function () {
             $('button.saveAndApply').click();
         });
-        await page.waitFor('.modal.open');
-        await page.waitFor(500); // animation to show confirm
+        await page.waitForSelector('.modal.open');
+        await page.waitForTimeout(500); // animation to show confirm
 
         const modal = await page.$('.modal.open');
         expect(await modal.screenshot()).to.matchImage('update_confirmation');
@@ -203,14 +203,14 @@ describe("SegmentSelectorEditorTest", function () {
         await page.click('.segmentList li[data-idsegment="4"] .editSegment');
         await page.waitForNetworkIdle();
 
-        await page.waitFor('.segmentListContainer .metricValueBlock');
+        await page.waitForSelector('.segmentListContainer .metricValueBlock');
 
         expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('updated_details');
     });
 
     it("should correctly show delete dialog when the delete link is clicked", async function() {
         await page.click('.segmentEditorPanel a.delete');
-        await page.waitFor(500); // animation
+        await page.waitForTimeout(500); // animation
 
         const modal = await page.$('.modal.open');
         expect(await modal.screenshot()).to.matchImage('deleted_dialog');
@@ -241,7 +241,7 @@ describe("SegmentSelectorEditorTest", function () {
         await page.click('a.add_new_segment');
         await page.type('input.edit_segment_name', 'complex segment');
 
-        await page.waitFor('.segmentRow0');
+        await page.waitForSelector('.segmentRow0');
         await selectDimension('.segmentRow0', 'Visitors', 'Browser');
         await selectFieldValue('.segmentRow0 .segment-row:eq(0) .metricMatchBlock', 'Is not');
 
@@ -251,7 +251,7 @@ describe("SegmentSelectorEditorTest", function () {
         });
 
         await page.click('.segment-add-or');
-        await page.waitFor(() => !! $('.segmentRow0 .segment-row:eq(1)').length);
+        await page.waitForFunction(() => !! $('.segmentRow0 .segment-row:eq(1)').length);
 
         // configure or condition
         await selectDimension('.segmentRow0 .segment-row:eq(1)', 'Visitors', 'Browser');
@@ -263,7 +263,7 @@ describe("SegmentSelectorEditorTest", function () {
         });
 
         await page.click('.segment-add-row');
-        await page.waitFor('.segmentRow1 .segment-row');
+        await page.waitForSelector('.segmentRow1 .segment-row');
 
         // configure and condition
         await selectDimension('.segmentRow1', 'Visitors', 'Browser');
@@ -278,7 +278,7 @@ describe("SegmentSelectorEditorTest", function () {
         });
 
         await page.waitForNetworkIdle();
-        await page.waitFor('.dataTable');
+        await page.waitForSelector('.dataTable');
         await page.waitForNetworkIdle();
 
         expect(await page.screenshot()).to.matchImage('complex_segment');
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png
index ee61563dca..894a5d79c4 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_1_selector_open.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fb8751253fe7344839ca033ebfa81f39024ed5263a0bbc7ed33288ec1c492f9
-size 15225
+oid sha256:acca466f937dd8e0bcf565a1bba9800addf148718c58ffcc01eb60cebefa0fbc
+size 15205
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png
index c8f1c53f70..dc0affb84e 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6dbd23e6d202c5c64c254505c3e13662642a166d6313b1d5c59085dce92cc6b
-size 38357
+oid sha256:2d86d3812dccc6082d3927a4050da8177367477589fd554c9b3dd964132ae8ab
+size 37687
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png
index f878b52336..01b61abcbb 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0149934cf9533489ee580d06abb994585fba0e353a842759d8d395303d4376a9
-size 38921
+oid sha256:ca0435eaa39c7f1bfd35c95a3a8b96009f48d73c4a7da84908fd81cee6969dc8
+size 38242
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png
index e8f29fddaf..7743cc40ea 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_different.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82b57871d5469942fc5b1c26ba362a2bc9b026db3ca5410be36420ac8567b522
-size 33391
+oid sha256:1c9d5c9c276b84c748bc10981750fb56765b80d87826bb450454082fe2c2747f
+size 32661
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png
index 66955ddf55..0350cb4d5d 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f61a9b54beeeb80b5fb0d3e8fc4ddb3d6a95105832b10aab8af395b047af9248
-size 44183
+oid sha256:5a03084a18379d2da0956a298db9db1e86576cd9e1dc0249e5791e3b885eb69a
+size 43522
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png
index e8f29fddaf..7743cc40ea 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82b57871d5469942fc5b1c26ba362a2bc9b026db3ca5410be36420ac8567b522
-size 33391
+oid sha256:1c9d5c9c276b84c748bc10981750fb56765b80d87826bb450454082fe2c2747f
+size 32661
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png
index a86de17965..8e08dc97eb 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb115ee871a7312e876f14c03c038394a9c506e0fe683ebf49ebd83bd49db332
-size 47631
+oid sha256:c664031b2aad2bd73b42ed00fc9d3be17af3bc4e45e09293e74e0d50aa778fcd
+size 46590
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png
index 27238e1f3b..1beb529da9 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:820471641dcf978f323bfa199534671da78549943da1cf1f0eeec1581c3c5288
-size 37813
+oid sha256:b0358f3c95322545675d41de22ddab9aaa17444a74159e7a4901f2a4ebc42edf
+size 36928
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
index 03204707cb..340bed10d0 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4a2066a969dd539a4c7440b0c25bd969b149fe945f0b978aec0a98d0993c10d
-size 136803
+oid sha256:25045c7cb174f1ff0be141fea30547f6bf01148f14589bf7c37d39170cf64e8f
+size 141812
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png
index ee61563dca..894a5d79c4 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fb8751253fe7344839ca033ebfa81f39024ed5263a0bbc7ed33288ec1c492f9
-size 15225
+oid sha256:acca466f937dd8e0bcf565a1bba9800addf148718c58ffcc01eb60cebefa0fbc
+size 15205
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png
index 62cba20e62..b342abc4bd 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be626bf76ce341f75fd9db42af159b96cde90e2f041292a45065e4d387ef1288
-size 32691
+oid sha256:41f219682f3144bb5699363a8d2c552e6af5e5babdba1fc74d3d0c13923a5f62
+size 32106
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png
index 623b05ec1d..dc81b09ad7 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16f3faacb58a2eec2f6be03818f6f609efd3cfbc73b5b05b6242a15f58444392
-size 47298
+oid sha256:c7ab6bf39d96dce3f86ae4594a258567a26bc96a3bee8b42a031949b7f180acc
+size 46402
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png
index 93cf758020..3e59b45457 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1542f783708a0655cfee8cf6c8b3284eccc4202199e8a65773320c601ca0cf3c
-size 37455
+oid sha256:04a33532477986127bc74f79efc8137e19117c51bcc184a69c8b7e0305e5f732
+size 36663
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png
index e963fbb338..6a35cf8d5e 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_enabled_create_realtime_segments.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e7fb81540efa149807a564a0d1633527a4c50d5d60381f5977b550d372286ad
-size 30024
+oid sha256:2433b1efd095d1e0d84e21474f3cfdbce3e8842b3255cb7e69f44ba4f5619ce4
+size 29354
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png
index 9fb2a52f1a..8fb08a52b6 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f699f9b3c6f4c74c64555d08b280d854cf1dd46cb1f553dac5d9fb7b63f56224
-size 16925
+oid sha256:24ef536c95a1fb4d0e650001b9b7dda2b057ad725c35f774481a59890a2973fa
+size 16930
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png
index 12b157d9fe..a640ecb5ca 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc0718e8fcc5c9d45af51d66e6ef0297fe55634a53a6f98a800f8c43e64fa6bd
-size 49295
+oid sha256:db02585d0d19dd562c894d502b1234509d8b631ddadbe9e78e3f44a41add3cf4
+size 48319
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png
index 6b34a8187d..c0c5564850 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfc10b3c4e6e438fe5374d3689ae46af99caef8037e1066f30b1f95e5edc98ea
-size 59474
+oid sha256:f4f2b8e0ab34ae892c2c84772d103eafed5c55f50f44e47631d9599c69f4eee8
+size 59411
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png
index bfdf3774b4..90041e0adf 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1002209a0ba75c6fa20dce796274e18ba41413049f40ebf344c6c11eb5db99d
-size 17272
+oid sha256:8ec01eeb3dfab42067c2cd406724ef5ed10068ca95081230cb3c64eb91edf698
+size 17267
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png
index ff43b39f16..c25f0cbfa0 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61883dfef7a605f068d57e397c601420715795a8884fd7a2415dbda6969a7b69
-size 50643
+oid sha256:557b99f235608aae163ec16d0ec35aaa43d973626039d056139f503bd44e9192
+size 49518
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png
index 1365b16311..e952b59637 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99493f8d72c4d239a236b0e5c7a7701de8a0b11175bc94abe4b801bb3447dc3d
-size 53956
+oid sha256:c7ad6d091e6f319d6959346d0623a8a54e013167fdcb4481c8440469c7295ebc
+size 53983
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png
index a8a2b568f3..ea5c093b45 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:427f83e084082ff5007e3c4540108103ec20202532329e8d7dace57c4f8e361d
-size 95013
+oid sha256:884a69a457a334ae65a53d5ea099fa0e37741a0667203bcde3f4d55c66b1ffc6
+size 95040
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png
index 48a16d2632..84251c5915 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95e04551f119e1e9b8b820c17673d1f406dd0551fd94321230372d8dbefa1b07
-size 177262
+oid sha256:68200821dd8dcd80f2aa81f902cf72f503f80aaec7f709141f9d760af01e011e
+size 177273
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png
index 1ba96865f1..e1d7766a2d 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d62c70361f44a171784cc6192f24099eca39b29edd6f0f7845d38968eee4e8b6
-size 181767
+oid sha256:3820cb11cd8718ff382e1dc4ac32af4a9a16a67abf275155b0d0c8c6ab8c67a4
+size 181838
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png
index 003dcfbd45..631e0fe272 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15b42566d36e4085a857ff23362139cf4a37587fa69af52c14e46e39d9a5e611
-size 181762
+oid sha256:942604689ef551482739178d6b38fa55485f58fb16cdd86af6d8c354c2b37f2e
+size 181807
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png
index c01e5b6003..9e2fe64b37 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:131138db6f1a134d593409bedf603d869126fd65973987ee1d7c5ea8df272254
-size 184192
+oid sha256:492910921bff6a919229c7f9c08fbae3fd100c002455f31228ca0203a97b119d
+size 184266
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png
index 372ea3b96c..4c33ecd3a9 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24fbc319ff68fd83356d9364df18185af5c63a0ad0f0094789410247130cf67f
-size 176260
+oid sha256:8868d0b416bdf584f500325d7bcd3fb2e266d897458323ba65075d1069324e37
+size 176254
diff --git a/plugins/TagManager b/plugins/TagManager
-Subproject 08b3f02cae322525c001b5dac17b898581a9739
+Subproject 0ed371dad3b8e9ff935a44a076bfea612be554a
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
-Subproject 7287cd7ea0c7320a1f2345923d8794d8f5f2999
+Subproject 36aae6ae41d2ed15383f9c448183ab5953e565b
diff --git a/plugins/TrackingSpamPrevention b/plugins/TrackingSpamPrevention
-Subproject 3051e8eb481cf89ce6a1811f805247a6c596f4a
+Subproject e9c151a0079b919187764959f215bdca8975f2a
diff --git a/plugins/Transitions/tests/UI/Transitions_spec.js b/plugins/Transitions/tests/UI/Transitions_spec.js
index 4d2ebb61ad..ed125f3078 100644
--- a/plugins/Transitions/tests/UI/Transitions_spec.js
+++ b/plugins/Transitions/tests/UI/Transitions_spec.js
@@ -19,7 +19,7 @@ describe("Transitions", function () {
         await page.webpage.evaluate((field) => {
             $(field + ' input.select-dropdown').click()
         }, field);
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
         await page.webpage.evaluate((field, title) => {
             $(field + ' .dropdown-content li:contains("' + title + '"):first').click()
         }, field, title);
@@ -33,7 +33,7 @@ describe("Transitions", function () {
         await (await page.jQuery('a.actionTransitions:visible')).click();
 
         await page.waitForNetworkIdle();
-        await page.waitFor('.ui-dialog', { visible: true });
+        await page.waitForSelector('.ui-dialog', { visible: true });
 
         expect(await page.screenshotSelector('.ui-dialog')).to.matchImage('transitions_popup_titles');
     });
@@ -42,9 +42,15 @@ describe("Transitions", function () {
         await page.goto('about:blank');
         await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Actions&subcategory=General_Pages&"
                     + "popover=RowAction$3ATransitions$3Aurl$3Ahttp$3A$2F$2Fpiwik.net$2Fdocs$2Fmanage-websites$2F");
-        await page.waitFor(500);
         await page.waitForNetworkIdle();
-        await page.hover('.Transitions_CurveTextRight');
+        await page.waitForTimeout(500);
+
+        // for some reason the tooltip isn't shown on the screenshot (even if the whole page is taken)
+        // but it seems to be placed in the HTML code so, we check for it's contents
+        await (await page.$('.Transitions_CurveTextRight')).hover();
+        await page.waitForSelector('.ui-tooltip');
+        const toolTipHtml = await page.evaluate(() => $('.ui-tooltip:visible').html());
+        expect(toolTipHtml).to.equal('<div class="ui-tooltip-content"><strong>4 (out of 4)</strong> to internal pages</div>');
 
         expect(await page.screenshotSelector('.ui-dialog')).to.matchImage('transitions_popup_urls');
     });
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png
index a4ed3ec4d3..73bdf1897e 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:094206c9db59ca1a7936dacf6252f491222688d92e135078b125b7e10d1fe6df
-size 79642
+oid sha256:4aae9a8770b93e45cc82d0b5b34eb048edf1a638f4f8b936032aed97efcec3a4
+size 77649
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png
index 488247eba2..3694b57ccd 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b4d90fd87ff7a11ecb22c53a383aa032f57803a0788518afba9ad04529ae31c
-size 25927
+oid sha256:d27573ead1eb43a421c5a3ca586ca149e581cbe91ea87b36e070cc657421cf3f
+size 25933
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png
index 86a29c6a75..92e2784696 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34dcc72032f6ee30d7bf93cb9ed3921688113e4d4634b2ff4badf1dca8cb7e1d
+oid sha256:cb37e59ffb65412f6a9c17a5969f6308477acd8a7bc520a599552214e232c763
 size 181158
diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png
index 66841f5114..da525d534f 100644
--- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png
+++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a227f3053e2a31c107f2bd671bc55f0778fec680d4cc0e8fab057db3b50a13c7
-size 105193
+oid sha256:50f3434e0d0641f5231f05e3a769bf2210cd2e8d3ca070237a9172d9413fc05d
+size 105201
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
-Subproject 446a680d6f0a4df8f22e5058c890fab5a519c70
+Subproject f47d4c0597e348c0d4a37a0bac1c4460107a041
diff --git a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuthUsersManager_spec.js b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuthUsersManager_spec.js
index a426289eb5..30b2e8a6e6 100644
--- a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuthUsersManager_spec.js
+++ b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuthUsersManager_spec.js
@@ -35,22 +35,22 @@ describe("TwoFactorAuthUsersManager", function () {
         await page.evaluate(function () {
             $('.userEditForm .menuUserTwoFa a').click();
         });
-        await page.waitFor(250);
-        await page.waitFor('.twofa-reset > p', { visible: true });
+        await page.waitForTimeout(250);
+        await page.waitForSelector('.twofa-reset > p', { visible: true });
         expect(await page.screenshotSelector('#content,#notificationContainer')).to.matchImage('edit_with_2fa');
     });
 
     it('should ask for confirmation before resetting 2fa', async function () {
         await page.click('.userEditForm .twofa-reset .resetTwoFa .btn');
-        const modal = await page.waitFor('.modal.open', { visible: true });
-        await page.waitFor(1000); // animation
+        const modal = await page.waitForSelector('.modal.open', { visible: true });
+        await page.waitForTimeout(1000); // animation
         expect(await modal.screenshot()).to.matchImage('edit_with_2fa_reset_confirm');
     });
 
     it('should be possible to confirm the reset', async function () {
         await page.type('.twofa-confirm-modal input[name=currentUserPassword]', 'superUserPass');
         await page.click('.twofa-confirm-modal .modal-close:not(.modal-no)');
-        await page.waitFor(500); // wait for modal to close
+        await page.waitForTimeout(500); // wait for modal to close
         expect(await page.screenshotSelector('#content,#notificationContainer')).to.matchImage('edit_with_2fa_reset_confirmed');
     });
 
diff --git a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js
index 60f57eb093..8608118bab 100644
--- a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js
+++ b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js
@@ -21,6 +21,8 @@ describe("TwoFactorAuth", function () {
     {
         await (await page.jQuery('.modal.open .modal-footer a:contains('+button+')')).click();
         await page.waitForNetworkIdle();
+        await page.waitForTimeout(100);
+        await page.waitForNetworkIdle();
     }
 
     async function loginUser(username, doAuth)
@@ -30,6 +32,9 @@ describe("TwoFactorAuth", function () {
 
         // make sure to log out previous session
         await page.goto(logoutUrl);
+        await page.waitForNetworkIdle();
+        await page.waitForTimeout(100);
+        await page.waitForNetworkIdle();
 
         var cookies = await page.cookies();
         cookies.forEach(cookie => {
@@ -40,13 +45,22 @@ describe("TwoFactorAuth", function () {
             doAuth = true;
         }
         var logMeUrl = '?module=Login&action=logme&login=' + username + '&password=240161a241087c28d92d8d7ff3b6186b';
+
+        // avoid loading dashboard after login as it takes long
+        logMeUrl += '&url=' + encodeURIComponent('index.php?category=General_Visitors&subcategory=Live_VisitorLog&' + generalParams);
+
         if (doAuth) {
             logMeUrl += '&authCode=123456'; // we make sure in test config this code always works
         }
-        await page.waitFor(1000);
         await page.goto(logMeUrl);
         await page.waitForNetworkIdle();
-        await page.waitFor(1000);
+        await page.waitForTimeout(100);
+        await page.waitForNetworkIdle();
+
+        await page.webpage.setViewport({
+            width: 1350,
+            height: 768,
+        });
     }
 
     function requireTwoFa() {
@@ -68,6 +82,7 @@ describe("TwoFactorAuth", function () {
     beforeEach(function () {
         testEnvironment.testUseMockAuth = 0;
         testEnvironment.restoreRecoveryCodes = 1;
+        testEnvironment.configOverride = { Development: { disable_merged_assets: 1 }};
         testEnvironment.save();
     });
 
@@ -82,26 +97,26 @@ describe("TwoFactorAuth", function () {
 
     async function confirmPassword()
     {
-        await page.waitFor('.confirmPasswordForm');
-        await page.waitFor(() => !!window.$);
-        await page.evaluate(function(){
-            $('.confirmPasswordForm #login_form_password').val('123abcDk3_l3');
-            $('.confirmPasswordForm #login_form_submit').click();
-        });
+        await page.waitForSelector('.confirmPasswordForm');
+        await page.waitForNetworkIdle();
+        await page.type('.confirmPasswordForm #login_form_password', '123abcDk3_l3');
+        await page.click('.confirmPasswordForm #login_form_submit');
+        await page.waitForNetworkIdle();
+        await page.waitForTimeout(100);
         await page.waitForNetworkIdle();
-        await page.waitFor(100);
     }
 
     it('a user with 2fa can open the widgetized view by token without needing to verify', async function () {
         await page.goto('?module=Widgetize&action=iframe&moduleToWidgetize=Actions&actionToWidgetize=getPageUrls&date=2018-03-04&token_auth=a4ca4238a0b923820dcc509a6f75849b&' + generalParams);
-        const element = await page.$('.widget');
-        expect(await element.screenshot()).to.matchImage('widgetized_no_verify');
+
+        // check if widget element is present, if login wouldn't work the login screen would be shown instead
+        const widgetsCount = await page.evaluate(() => $('.widget').length);
+        expect(widgetsCount).to.equal(1);
     });
 
     it('when logging in through logme and not providing auth code it should show auth code screen', async function () {
         await loginUser('with2FA', false);
-        await page.waitFor(1000);
-        const section = await page.$('.loginSection');
+        const section = await page.waitForSelector('.loginSection');
         expect(await section.screenshot()).to.matchImage('logme_not_verified');
     });
 
@@ -111,7 +126,7 @@ describe("TwoFactorAuth", function () {
             document.querySelector('.loginTwoFaForm #login_form_submit').click();
         });
         await page.waitForNetworkIdle();
-        const element = await page.$('.loginSection');
+        const element = await page.waitForSelector('.loginSection');
         expect(await element.screenshot()).to.matchImage('logme_not_verified_wrong_code');
     });
 
@@ -120,23 +135,21 @@ describe("TwoFactorAuth", function () {
         testEnvironment.save();
 
         await page.type('.loginTwoFaForm #login_form_authcode', '123456');
-        await page.waitFor(() => !!window.$);
-        await page.evaluate(function(){
-            document.querySelector('.loginTwoFaForm #login_form_submit').click();
-        });
+        await page.click('.loginTwoFaForm #login_form_submit');
         await page.waitForNetworkIdle();
-        await page.waitFor('.widget');
+        await page.waitForSelector('.widget', { timeout: 60000 });
         await page.waitForNetworkIdle();
 
-        const element = await page.$('.pageWrap');
-        expect(await element.screenshot()).to.matchImage('logme_verified');
+        // do not take a screenshot, as it's not relevant. We only check if there is the right amount of widgets loaded
+        const widgetsCount = await page.evaluate(() => $('.widget').length);
+        expect(widgetsCount).to.equal(9);
     });
 
     it('should show user settings when two-fa enabled', async function () {
         await loginUser('with2FA');
         await page.goto(userSettings);
-        await page.waitFor('.userSettings2FA', { visible: true, timeout: 0 });
-        await page.waitFor(750); // animation
+        await page.waitForSelector('.userSettings2FA', { visible: true, timeout: 0 });
+        await page.waitForTimeout(1000); // animation
         const elem = await page.$('.userSettings2FA');
         expect(await elem.screenshot()).to.matchImage('usersettings_twofa_enabled');
     });
@@ -145,36 +158,39 @@ describe("TwoFactorAuth", function () {
         await page.click('.showRecoveryCodesLink');
         await page.waitForNetworkIdle();
         const element = await page.$('.loginSection');
+        await page.waitForNetworkIdle();
+        await page.waitForTimeout(1000);
         expect(await element.screenshot()).to.matchImage('show_recovery_codes_step1');
     });
 
     it('should be possible to show recovery codes step2 done', async function () {
         await confirmPassword();
-        await page.waitForNetworkIdle();
-        const element = await page.$('#content');
-        expect(await element.screenshot()).to.matchImage('show_recovery_codes_step2');
+        expect(await page.screenshotSelector('#content')).to.matchImage('show_recovery_codes_step2');
     });
 
     it('should show user settings when two-fa enabled', async function () {
         requireTwoFa();
         await page.goto(userSettings);
-        const element = await page.$('.userSettings2FA');
-        expect(await element.screenshot()).to.matchImage('usersettings_twofa_enabled_required');
+        await page.waitForTimeout(1000);
+        expect(await page.screenshotSelector('.userSettings2FA')).to.matchImage('usersettings_twofa_enabled_required');
     });
 
     it('should be possible to disable two factor', async function () {
         await loginUser('with2FADisable');
         await page.goto(userSettings);
+        await page.waitForSelector('.disable2FaLink', { timeout: 60000 });
+        await page.waitForTimeout(100);
+        await page.waitForNetworkIdle();
         await page.click('.disable2FaLink');
 
         const modal = await page.$('.modal.open');
-        await page.waitFor(250); // animation
+        await page.waitForTimeout(500); // animation
         expect(await modal.screenshot()).to.matchImage('usersettings_twofa_disable_step1');
     });
 
     it('should be possible to disable two factor step 2 confirmed', async function () {
         await selectModalButton('Yes');
-        await page.waitFor(150);
+        await page.waitForTimeout(150);
 
         const element = await page.$('.loginSection');
         expect(await element.screenshot()).to.matchImage('usersettings_twofa_disable_step2');
@@ -182,7 +198,7 @@ describe("TwoFactorAuth", function () {
 
     it('should be possible to disable two factor step 3 verified', async function () {
         await confirmPassword();
-        await page.waitFor('.userSettings2FA');
+        await page.waitForSelector('.userSettings2FA');
         const elem = await page.$('.userSettings2FA');
         expect(await elem.screenshot()).to.matchImage('usersettings_twofa_disable_step3');
     });
@@ -190,9 +206,11 @@ describe("TwoFactorAuth", function () {
     it('should show setup screen - step 1', async function () {
         await loginUser('without2FA');
         await page.goto(userSettings);
+        await page.waitForTimeout(100);
+        await page.waitForNetworkIdle();
         await page.click('.enable2FaLink');
         await confirmPassword();
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
         const element = await page.$('#content');
         expect(await element.screenshot()).to.matchImage('twofa_setup_step1');
     });
@@ -214,7 +232,7 @@ describe("TwoFactorAuth", function () {
     it('should move to third step in setup - step 3', async function () {
         await page.click('.setupTwoFactorAuthentication .goToStep3');
         await page.waitForNetworkIdle();
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
 
         const element = await page.$('#content');
         expect(await element.screenshot()).to.matchImage('twofa_setup_step3');
@@ -230,7 +248,7 @@ describe("TwoFactorAuth", function () {
             $('.setupConfirmAuthCodeForm .confirmAuthCode').click();
         });
         await page.waitForNetworkIdle();
-        await page.waitFor('#content', { visible: true });
+        await page.waitForSelector('#content', { visible: true, timeout: 60000 });
         await page.waitForNetworkIdle();
         const element = await page.$('#content');
         expect(await element.screenshot()).to.matchImage('twofa_setup_step4');
@@ -245,15 +263,18 @@ describe("TwoFactorAuth", function () {
     it('should force user to setup 2fa when not set up yet but enforced step 2', async function () {
         await (await page.jQuery('.setupTwoFactorAuthentication .backupRecoveryCode:first')).click();
         await page.click('.setupTwoFactorAuthentication .goToStep2');
+        await page.waitForTimeout(100);
+        await page.waitForNetworkIdle();
         await page.mouse.move(-10, -10);
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
         expect(await page.screenshotSelector('.loginSection,#content,#notificationContainer')).to.matchImage('twofa_forced_step2');
     });
 
     it('should force user to setup 2fa when not set up yet but enforced step 3', async function () {
         await page.click('.setupTwoFactorAuthentication .goToStep3');
+        await page.waitForTimeout(100);
+        await page.waitForNetworkIdle();
         await page.mouse.move(-10, -10);
-        await page.waitFor(100);
         expect(await page.screenshotSelector('.loginSection,#content,#notificationContainer')).to.matchImage('twofa_forced_step3');
     });
 
@@ -268,7 +289,12 @@ describe("TwoFactorAuth", function () {
             $('.setupConfirmAuthCodeForm .confirmAuthCode').click();
         });
         await page.waitForNetworkIdle();
-        expect(await page.screenshotSelector('.loginSection,#content,#notificationContainer')).to.matchImage('twofa_forced_step4');
+        await page.waitForSelector('.widget');
+        await page.waitForNetworkIdle();
+
+        // after setting up forced 2fa, the default page will be loaded (dashboard)
+        const widgetsCount = await page.evaluate(() => $('.widget').length);
+        expect(widgetsCount).to.equal(9);
     });
 
 });
 \ No newline at end of file
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png
index a649c1f566..00b3177b19 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f5d14bf5b773d0b92f80ce2d27bdbc10b3b7013f33847d83464162fa3bac827
-size 30303
+oid sha256:dfb6da1208f08bbde331b2574b7d39e945fdee4875f700eea6bccfd088ba0798
+size 30272
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png
index f99a39dbbf..ce0f28d108 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b8feec74a212f4643e059ef8e08ab5daf62d009293613c7180e746b80baee37
-size 33939
+oid sha256:cb7e81d0f1a1e4e227d81839ae30c46d8c52907ab18b1bf413f34958ee479617
+size 33937
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png
index 2d1dd1e5f8..4890953f85 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11f13087ff3f980c9ce8c8c90d86a4aec695a55f3f84af4bdb835f622dc5e252
-size 58618
+oid sha256:3bba934644a119b01e4eda56b4261d0087a638dd607fb3dd57d81ca886f1352d
+size 58963
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png
deleted file mode 100644
index e4f5bea535..0000000000
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c5b3611278ddefdf25b172f6f908a7d1a3ee2b21e7c8e64f00515f41eb0148d
-size 181837
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png
index db073a39d4..7c3fe4293c 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:317088e10aab29f589041e3b7c70c03f8f95f7fd03d16f3be012318d45e3831d
-size 60515
+oid sha256:5e6cd69059dc9ddab922f00acdc798346d308ee7e0c0128f29e052c4d1d39f0b
+size 60377
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png
index a94980cb40..6ef0195023 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a08a4516addbfa086231fec5e44f7a79a3f00e7c308a176e2475cd3efad99238
-size 92541
+oid sha256:e20d431ded80bf04f6c261d237e7599719af8eabac3821e3688ae6f17633da00
+size 92532
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png
index d9b6b2d11f..2c4894f065 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d5ac43111252e3f119176bc4bc2e542fadf3134fba705b931d7d79b7e62ea6a
-size 162365
+oid sha256:857005b9df442b2e755f8a969f55c167aa7f44e91e154ddd470c29d3b9723c77
+size 162355
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png
deleted file mode 100644
index 1d327444bb..0000000000
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72b20c28ef808581019beb6bed33c556b64bc9c905cffd6bf9dd7975414f40d4
-size 180835
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png
index 40698c6f2b..6f9b490fcf 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2ac087bfb9043b707de3d5d37ff50a09039d2b3f6c70732bda97a6afd2304e1
-size 67133
+oid sha256:b5652c92627d5e36e653847fc1978e26885b8c35ab8591d538feeed68ff67e0b
+size 67109
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png
index 903a041bc9..cf227b0622 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f890cdf67f6afc830a0a1705be2341d17a7130a9d83b0b16bf1a31825cbf27ed
-size 114325
+oid sha256:52ec37f081e5a1b1624cf3f93551550cd87a97ae5eafc1c75b8fcefc39f2c68a
+size 114302
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png
index d1df1b1827..79a6b8b3a0 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d7cdec9f2212374664e5e79f63e3e687e2c645c7a1c65f48661cd40ef2bdf40
-size 47304
+oid sha256:1fc401f84f8ae04fba130470f7e0f1708f9b3ae38556478592173f538a0452b5
+size 47350
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_widgetized_no_verify.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_widgetized_no_verify.png
deleted file mode 100644
index 7b907f04bf..0000000000
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_widgetized_no_verify.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:668bf4024f7d8a7fe60fdeaf5eb11b8b78937b60f16fa8fdae61a361d55f5a56
-size 5148
diff --git a/plugins/UserCountryMap/tests/UI/VisitorMap_spec.js b/plugins/UserCountryMap/tests/UI/VisitorMap_spec.js
index 66818224b8..4d14093639 100644
--- a/plugins/UserCountryMap/tests/UI/VisitorMap_spec.js
+++ b/plugins/UserCountryMap/tests/UI/VisitorMap_spec.js
@@ -21,7 +21,7 @@ describe("VisitorMap", function () {
             $('.userCountryMapSelectMetrics').val('bounce_rate').trigger('change');
         });
         await page.mouse.move(900, 140);
-        await page.waitFor(100); // wait for tooltip
+        await page.waitForTimeout(100); // wait for tooltip
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('bounce_rate');
     });
@@ -32,7 +32,7 @@ describe("VisitorMap", function () {
             $('.userCountryMapSelectMetrics').val('avg_time_on_site').trigger('change');
         });
         await page.mouse.move(900, 140);
-        await page.waitFor(100); // wait for tooltip
+        await page.waitForTimeout(100); // wait for tooltip
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('avg_time_on_site');
     });
@@ -40,19 +40,19 @@ describe("VisitorMap", function () {
     it("should display the regions layer correctly", async function() {
         await page.goto(urlWithCities);
         await page.waitForNetworkIdle();
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
         await page.webpage.evaluate(function () {
             // zoom into USA
             var path = window.visitorMap.map.getLayer('countries').getPaths({iso: "USA"})[0].svgPath[0];
             $(path).click();
         });
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
         await page.webpage.evaluate(function () {
             // go to regions view
             var path = window.visitorMap.map.getLayer('countries').getPaths({iso: "USA"})[0].svgPath[0];
             $(path).click();
         });
-        await page.waitFor(1000);
+        await page.waitForTimeout(1000);
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('regions');
     });
@@ -60,7 +60,7 @@ describe("VisitorMap", function () {
     it("should display the cities layer correctly", async function() {
         await page.click('.UserCountryMap-btn-city');
         await page.waitForNetworkIdle();
-        await page.waitFor(1000); // wait for map
+        await page.waitForTimeout(1000); // wait for map
 
         expect(await page.screenshot({ fullPage: true })).to.matchImage('cities');
     });
diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_avg_time_on_site.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_avg_time_on_site.png
index 49f0a0de33..3710eb1fab 100644
--- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_avg_time_on_site.png
+++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_avg_time_on_site.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4072cf29f83a44a4d61d4acda5bfb50c3b9da6f50417cdc58c225ef945b40217
-size 182956
+oid sha256:4ba690f07713973c2d65f9dabbf63e35f17e8f6172f706ae02bfec69893e306c
+size 183104
diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_bounce_rate.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_bounce_rate.png
index f22234873a..63249b2903 100644
--- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_bounce_rate.png
+++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_bounce_rate.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e51ead0e59962605f47aedc6b5153a5f4cfd9a3365899439e40c4e054d320d7d
-size 182284
+oid sha256:e1eeb15860f667ff6b65a393c357f13330f6a534c9052a6fa38c77f0580efdc4
+size 182371
diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png
index 82b59c80a5..8b26e43e3f 100644
--- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png
+++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8fa287087f6e90df90f91566013e868fb4fb8ed7e1a95d474fbae6efcc09552
-size 114508
+oid sha256:aae2ef87d12c962815d1b7ea7a8f9340fa0584b61040212e58e0d348c313464e
+size 114594
diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png
index 5159225887..cdc7d1401a 100644
--- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png
+++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1bb4c48dabc5e484d7e3d93db825f25590805c582016112178af4355fada02c
-size 113953
+oid sha256:a8ec3fe17923915a91c89520995dfbf2990edac49dd4f8fd93466611e2b61556
+size 114039
diff --git a/plugins/UsersManager/tests/UI/UserSettings_spec.js b/plugins/UsersManager/tests/UI/UserSettings_spec.js
index 20a1ac61c2..20480988ec 100644
--- a/plugins/UsersManager/tests/UI/UserSettings_spec.js
+++ b/plugins/UsersManager/tests/UI/UserSettings_spec.js
@@ -23,11 +23,11 @@ describe("UserSettings", function () {
 
     it('should show user security page', async function () {
         await page.goto(userSecurityUrl);
-        await page.waitFor('.listAuthTokens', { visible: true });
+        await page.waitForSelector('.listAuthTokens', { visible: true });
         await page.evaluate(() => { // give table headers constant width so the screenshot stays the same
             $('table.listAuthTokens th').css('width', '25%');
         });
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
         expect(await page.screenshotSelector('.admin')).to.matchImage('load_security');
     });
 
@@ -76,7 +76,7 @@ describe("UserSettings", function () {
             $('#userSettingsTable input#email').val('testlogin123@example.com').change();
         });
         await page.click('#userSettingsTable [piwik-save-button] .btn');
-        await page.waitFor(500); // wait for animation
+        await page.waitForTimeout(500); // wait for animation
 
         let pageWrap = await page.$('.modal.open');
         expect(await pageWrap.screenshot()).to.matchImage('asks_confirmation');
diff --git a/plugins/UsersManager/tests/UI/UsersManager_spec.js b/plugins/UsersManager/tests/UI/UsersManager_spec.js
index f4be261acb..389be58758 100644
--- a/plugins/UsersManager/tests/UI/UsersManager_spec.js
+++ b/plugins/UsersManager/tests/UI/UsersManager_spec.js
@@ -50,7 +50,7 @@ describe("UsersManager", function () {
             $('#user-text-filter').val('ight').change();
         });
         await page.waitForNetworkIdle();
-        await page.waitFor(1000); // wait for rendering
+        await page.waitForTimeout(1000); // wait for rendering
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('filters');
     });
@@ -68,7 +68,7 @@ describe("UsersManager", function () {
             $('.siteSelector .custom_select_container a:contains(relentless)').click();
         });
         await page.waitForNetworkIdle();
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('role_for');
     });
@@ -78,7 +78,7 @@ describe("UsersManager", function () {
         await (await page.jQuery('td.select-cell input:eq(3) + span', { waitFor: true })).click();
         await (await page.jQuery('td.select-cell input:eq(8) + span', { waitFor: true })).click();
         await page.mouse.move(0, 0);
-        await page.waitFor(500); // for checkbox animations
+        await page.waitForTimeout(500); // for checkbox animations
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('rows_selected');
     });
@@ -86,7 +86,7 @@ describe("UsersManager", function () {
     it('should select all rows when all row select is clicked', async function () {
         await page.click('th.select-cell input + span');
         await page.mouse.move(0, 0);
-        await page.waitFor(500); // for checkbox animations
+        await page.waitForTimeout(500); // for checkbox animations
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('all_rows_selected');
     });
@@ -94,7 +94,7 @@ describe("UsersManager", function () {
     it('should select all rows in search when link in table is clicked', async function () {
         await page.click('.toggle-select-all-in-search');
         await page.mouse.move(0, 0);
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('all_rows_in_search');
     });
@@ -102,7 +102,7 @@ describe("UsersManager", function () {
     it('should deselect all rows in search except for displayed rows when link in table is clicked again', async function () {
         await page.click('.toggle-select-all-in-search');
         await page.mouse.move(0, 0);
-        await page.waitFor(100);
+        await page.waitForTimeout(100);
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('all_rows_deselected');
     });
@@ -118,7 +118,7 @@ describe("UsersManager", function () {
         await page.click('.bulk-actions.btn');
         await (await page.jQuery('a[data-target=user-list-bulk-actions]')).hover();
         await (await page.jQuery('#bulk-set-access a:contains(Admin)')).click();
-        await page.waitFor(350); // wait for animation
+        await page.waitForTimeout(350); // wait for animation
 
         expect(await (await page.$('.change-user-role-confirm-modal')).screenshot()).to.matchImage('bulk_set_access_confirm');
     });
@@ -145,17 +145,17 @@ describe("UsersManager", function () {
     it('should go back to first page when previous button is clicked', async function () {
         await page.click('.usersListPagination .btn.next');
         await page.waitForNetworkIdle();
-        await page.waitFor('.pagedUsersList:not(.loading)');
+        await page.waitForSelector('.pagedUsersList:not(.loading)');
 
         await page.click('.usersListPagination .btn.next');
         await page.waitForNetworkIdle();
-        await page.waitFor('.pagedUsersList:not(.loading)');
+        await page.waitForSelector('.pagedUsersList:not(.loading)');
 
         await page.click('.usersListPagination .btn.prev');
         await page.waitForNetworkIdle();
 
         await page.mouse.move(-10, -10);
-        await page.waitFor('.pagedUsersList:not(.loading)');
+        await page.waitForSelector('.pagedUsersList:not(.loading)');
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('previous');
     });
@@ -166,7 +166,7 @@ describe("UsersManager", function () {
         await page.waitForNetworkIdle();
 
         await page.mouse.move(-10, -10);
-        await page.waitFor('.pagedUsersList:not(.loading)');
+        await page.waitForSelector('.pagedUsersList:not(.loading)');
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('delete_single');
     });
@@ -180,7 +180,7 @@ describe("UsersManager", function () {
         await page.waitForNetworkIdle();
 
         await page.mouse.move(-10, -10);
-        await page.waitFor('.pagedUsersList:not(.loading)');
+        await page.waitForSelector('.pagedUsersList:not(.loading)');
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('delete_bulk_access');
     });
@@ -225,9 +225,9 @@ describe("UsersManager", function () {
         await page.waitForNetworkIdle();
 
         await page.click('.userPermissionsEdit th.select-cell input + span');
-        await page.waitFor(500); // for angular to re-render
+        await page.waitForTimeout(500); // for angular to re-render
         await page.evaluate(() => $('.userPermissionsEdit tr.select-all-row a').click());
-        await page.waitFor(500); // for angular to re-render
+        await page.waitForTimeout(500); // for angular to re-render
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage({
             imageName: 'permissions_all_rows_in_search',
@@ -240,14 +240,14 @@ describe("UsersManager", function () {
         await (await page.jQuery('#user-permissions-edit-bulk-actions>li:first>a')).hover();
         await (await page.jQuery('#user-permissions-edit-bulk-actions a:contains(Write)')).click();
 
-        await page.waitFor(250); // animation
-        await page.waitFor('.change-access-confirm-modal', { visible: true });
+        await page.waitForTimeout(250); // animation
+        await page.waitForSelector('.change-access-confirm-modal', { visible: true });
 
         const yes = await page.jQuery('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible');
         await yes.click();
 
         await page.waitForNetworkIdle();
-        await page.waitFor(250); // animation
+        await page.waitForTimeout(250); // animation
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage({
             imageName: 'permissions_all_sites_access',
@@ -267,12 +267,12 @@ describe("UsersManager", function () {
 
     it('should remove access to a single site when noaccess is selected', async function () {
         await page.evaluate(() => $('#sitesForPermission .role-select select').first().val('string:noaccess').change());
-        await page.waitFor('.change-access-confirm-modal', { visible: true });
-        await page.waitFor(250); // animation
+        await page.waitForSelector('.change-access-confirm-modal', { visible: true });
+        await page.waitForTimeout(250); // animation
 
         await (await page.jQuery('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible')).click();
         await page.waitForNetworkIdle();
-        await page.waitFor(250); // animation
+        await page.waitForTimeout(250); // animation
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage({
             imageName: 'permissions_remove_single',
@@ -285,7 +285,7 @@ describe("UsersManager", function () {
         await (await page.jQuery('#sitesForPermission td.select-cell input:eq(3) + span')).click();
         await (await page.jQuery('#sitesForPermission td.select-cell input:eq(8) + span')).click();
         await page.mouse.move(-10, -10);
-        await page.waitFor(1000); // for checkbox animations
+        await page.waitForTimeout(1000); // for checkbox animations
 
         expect(await (await page.$('.usersManager')).screenshot()).to.matchImage({
             imageName: 'permissions_select_multiple',
@@ -295,17 +295,17 @@ describe("UsersManager", function () {
 
     it('should set access to selected sites when set bulk access is used', async function () {
         await page.click('.userPermissionsEdit .bulk-actions > .dropdown-trigger.btn');
-        await page.waitFor(500); // animation
-        await page.evaluate(() => $('#user-permissions-edit-bulk-actions>li:first > a:visible').mouseenter());
-        await page.waitFor(500); // animation
+        await page.waitForTimeout(500); // animation
+        await (await page.jQuery('#user-permissions-edit-bulk-actions>li:first > a')).hover();
+        await page.waitForTimeout(500); // animation
         await (await page.jQuery('#user-permissions-edit-bulk-actions a:contains(Admin):visible', { waitFor: true })).click();
 
-        await page.waitFor('.change-access-confirm-modal');
+        await page.waitForSelector('.change-access-confirm-modal');
 
         await (await page.jQuery('.change-access-confirm-modal .modal-close:not(.modal-no):visible')).click();
         await page.mouse.move(-10, -10);
         await page.waitForNetworkIdle();
-        await page.waitFor(100);
+        await page.waitForTimeout(500);
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage({
             imageName: 'permissions_bulk_access_set',
@@ -320,8 +320,8 @@ describe("UsersManager", function () {
         await page.waitForNetworkIdle();
         await page.type('.userPermissionsEdit div.site-filter>input', 'hunter');
         await page.waitForNetworkIdle();
-        await page.waitFor('#sitesForPermission tr', { visible: true });
-        await page.waitFor(1000);
+        await page.waitForSelector('#sitesForPermission tr', { visible: true });
+        await page.waitForTimeout(1000);
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage({
             imageName: 'permissions_filters',
@@ -331,7 +331,7 @@ describe("UsersManager", function () {
 
     it('should select all displayed rows when the select all checkbox is clicked', async function () {
         await page.click('.userPermissionsEdit th.select-cell input + span');
-        await page.waitFor(250); // for checkbox animations
+        await page.waitForTimeout(250); // for checkbox animations
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage({
             imageName: 'permissions_select_all',
@@ -341,11 +341,11 @@ describe("UsersManager", function () {
 
     it('should set access to all sites selected when set bulk access is used', async function () {
         await page.click('.userPermissionsEdit .bulk-actions > .dropdown-trigger.btn');
-        await page.waitFor(250); // animation
-        await page.evaluate(() => $('#user-permissions-edit-bulk-actions>li:first > a:visible').mouseenter());
-        await page.waitFor(250); // animation
+        await page.waitForTimeout(250); // animation
+        await (await page.jQuery('#user-permissions-edit-bulk-actions>li:first > a:visible')).hover();
+        await page.waitForTimeout(250); // animation
         await (await page.jQuery('#user-permissions-edit-bulk-actions a:contains(View)', { waitFor: true })).click();
-        await page.waitFor(250); // animation
+        await page.waitForTimeout(250); // animation
 
         await (await page.jQuery('.change-access-confirm-modal .modal-close:not(.modal-no):visible')).click();
         await page.waitForNetworkIdle();
@@ -354,7 +354,7 @@ describe("UsersManager", function () {
             $('.access-filter select').val('string:some').change();
         });
         await page.waitForNetworkIdle();
-        await page.waitFor(250); // animation
+        await page.waitForTimeout(250); // animation
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage({
             imageName: 'permissions_bulk_access_set_all',
@@ -367,8 +367,8 @@ describe("UsersManager", function () {
             $('.userPermissionsEdit .role-select:eq(0) select').val('string:admin').change();
         });
 
-        await page.waitFor('.userPermissionsEdit .change-access-confirm-modal', { visible: true });
-        await page.waitFor(100); // animation
+        await page.waitForSelector('.userPermissionsEdit .change-access-confirm-modal', { visible: true });
+        await page.waitForTimeout(100); // animation
         await (await page.jQuery('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible')).click();
         await page.waitForNetworkIdle();
 
@@ -383,12 +383,12 @@ describe("UsersManager", function () {
         await page.evaluate(() => $('.addCapability:eq(0) .expandableListCategory:contains(Tag Manager)').click());
         await page.evaluate(() => $('.addCapability:eq(0) .expandableListItem:contains(Publish Live Container)').click());
 
-        await page.waitFor(250); // animation
+        await page.waitForTimeout(250); // animation
 
         await (await page.jQuery('.userPermissionsEdit .confirmCapabilityToggle .modal-close:not(.modal-no):visible')).click();
         await page.waitForNetworkIdle();
 
-        await page.waitFor(250); // animation
+        await page.waitForTimeout(250); // animation
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage({
             imageName: 'permissions_capability_single_site',
@@ -406,10 +406,10 @@ describe("UsersManager", function () {
         await page.waitForNetworkIdle();
         await page.click('input#perm_edit_select_all + span');
 
-        await page.waitFor('.userPermissionsEdit tr.select-all-row a');
+        await page.waitForSelector('.userPermissionsEdit tr.select-all-row a');
         await page.click('.userPermissionsEdit tr.select-all-row a');
 
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
 
         await page.click('.userPermissionsEdit .bulk-actions > .dropdown-trigger.btn');
         await (await page.jQuery('.userPermissionsEdit a:contains(Remove Permissions)')).click();
@@ -429,10 +429,10 @@ describe("UsersManager", function () {
 
     it('should show superuser confirm modal when the superuser toggle is clicked', async function () {
         await page.click('.userEditForm #superuser_access+span');
-        await page.waitFor(500);
+        await page.waitForSelector('.superuser-confirm-modal');
+        await page.waitForTimeout(500);
 
-        const elem = await page.$('.superuser-confirm-modal');
-        expect(await elem.screenshot()).to.matchImage('superuser_confirm');
+        expect(await page.screenshotSelector('.superuser-confirm-modal')).to.matchImage('superuser_confirm');
     });
 
     it('should fail to set superuser access if password is wrong', async function () {
@@ -440,7 +440,7 @@ describe("UsersManager", function () {
         await (await page.jQuery('.superuser-confirm-modal .modal-close:not(.modal-no):visible')).click();
         await page.waitForNetworkIdle();
 
-        await page.waitFor('.notification-error', { visible: true });
+        await page.waitForSelector('.notification-error', { visible: true });
 
         const notificationHtml = await page.evaluate(() => $('.notification-error>div>div').html());
         expect(notificationHtml).to.equal('The current password you entered is not correct.');
@@ -448,33 +448,33 @@ describe("UsersManager", function () {
 
     it('should give the user superuser access when the superuser modal is confirmed', async function () {
         await page.click('.userEditForm #superuser_access+span');
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
 
         await page.type('input#currentUserPasswordForSuperUser', 'superUserPass');
         await (await page.jQuery('.superuser-confirm-modal .modal-close:not(.modal-no):visible')).click();
         await page.waitForNetworkIdle();
-        await page.waitFor(500);
+        await page.waitForTimeout(500);
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('superuser_set');
     });
 
     it('should go back to the manage users page when the back link is clicked', async function () {
         await page.click('.userEditForm .entityCancelLink');
-        await page.waitFor('piwik-paged-users-list');
+        await page.waitForSelector('piwik-paged-users-list');
 
         await page.evaluate(function () { // remove filter so new user shows
             $('#user-text-filter').val('').change();
         });
         await page.waitForNetworkIdle();
-        await page.waitFor('.pagedUsersList:not(.loading)');
-        await page.waitFor(1000); // rendering
+        await page.waitForSelector('.pagedUsersList:not(.loading)');
+        await page.waitForTimeout(1000); // rendering
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('manage_users_back');
     });
 
     it('should show the edit user form when the edit icon in a row is clicked', async function () {
         await (await page.jQuery('button.edituser:eq(1)', { waitFor: true })).click();
-        await page.waitFor(250);
+        await page.waitForTimeout(250);
         await page.waitForNetworkIdle();
 
         expect(await page.screenshotSelector('.usersManager')).to.matchImage('edit_user_form');
@@ -488,7 +488,7 @@ describe("UsersManager", function () {
         var btnSave = await page.jQuery('.userEditForm .basic-info-tab [piwik-save-button] .btn', { waitFor: true });
         await btnSave.click();
 
-        await page.waitFor(500); // animation
+        await page.waitForTimeout(500); // animation
 
         await page.click('.modal.open h2'); // remove focus from input for screenshot
 
@@ -502,9 +502,9 @@ describe("UsersManager", function () {
         var btnNo = await page.jQuery('.change-password-modal .modal-close:not(.modal-no):visible');
         await btnNo.click();
 
-        await page.waitFor(500); // animation
+        await page.waitForTimeout(500); // animation
         await page.waitForNetworkIdle();
-        await page.waitFor('#notificationContainer .notification');
+        await page.waitForSelector('#notificationContainer .notification');
 
         expect(await page.screenshotSelector('.admin#content,#notificationContainer')).to.matchImage('edit_user_basic_confirmed_wrong_password');
     });
@@ -566,7 +566,7 @@ describe("UsersManager", function () {
             });
 
             await page.click('.add-existing-user');
-            await page.waitFor(500); // wait for animation
+            await page.waitForTimeout(500); // wait for animation
 
             const elem = await page.$('.add-existing-user-modal');
             expect(await elem.screenshot()).to.matchImage('admin_existing_user_modal');
@@ -574,7 +574,7 @@ describe("UsersManager", function () {
 
         it('should add a user by email when an email is entered', async function () {
             await page.type('input[name="add-existing-user-email"]', '0_login3conchords@example.com');
-            await page.waitFor('.add-existing-user-modal');
+            await page.waitForSelector('.add-existing-user-modal');
             await (await page.jQuery('.add-existing-user-modal .modal-close:not(.modal-no):visible')).click();
             await page.waitForNetworkIdle();
 
@@ -585,15 +585,15 @@ describe("UsersManager", function () {
             await page.mouse.move(-10, -10);
 
             await page.waitForNetworkIdle();
-            await page.waitFor('.pagedUsersList:not(.loading)');
-            await page.waitFor(1000); // for opacity to change
+            await page.waitForSelector('.pagedUsersList:not(.loading)');
+            await page.waitForTimeout(1000); // for opacity to change
 
             expect(await page.screenshotSelector('.usersManager')).to.matchImage('admin_add_user_by_email');
         });
 
         it('should add a user by username when a username is entered', async function () {
             await page.click('.add-existing-user');
-            await page.waitFor('.add-existing-user-modal');
+            await page.waitForSelector('.add-existing-user-modal');
             await page.evaluate(() => $('input[name="add-existing-user-email"]').val('').change());
             await page.type('input[name="add-existing-user-email"]', '10_login8');
             await (await page.jQuery('.add-existing-user-modal .modal-close:not(.modal-no):visible')).click();
@@ -606,8 +606,8 @@ describe("UsersManager", function () {
             await page.mouse.move(-10, -10);
 
             await page.waitForNetworkIdle();
-            await page.waitFor('.pagedUsersList:not(.loading)');
-            await page.waitFor(1000); // for opacity to change
+            await page.waitForSelector('.pagedUsersList:not(.loading)');
+            await page.waitForTimeout(1000); // for opacity to change
 
             expect(await page.screenshotSelector('.usersManager')).to.matchImage('admin_add_user_by_login');
         });
@@ -616,7 +616,7 @@ describe("UsersManager", function () {
             await page.click('.add-existing-user');
             await page.evaluate(() => $('input[name="add-existing-user-email"]').val('').change());
             await page.type('input[name="add-existing-user-email"]', 'sldkjfsdlkfjsdkl');
-            await page.waitFor('.add-existing-user-modal');
+            await page.waitForSelector('.add-existing-user-modal');
             await (await page.jQuery('.add-existing-user-modal .modal-close:not(.modal-no):visible')).click();
             await page.waitForNetworkIdle();
 
@@ -627,8 +627,8 @@ describe("UsersManager", function () {
             await page.mouse.move(-10, -10);
 
             await page.waitForNetworkIdle();
-            await page.waitFor('.pagedUsersList:not(.loading)');
-            await page.waitFor(1000); // for opacity to change
+            await page.waitForSelector('.pagedUsersList:not(.loading)');
+            await page.waitForTimeout(1000); // for opacity to change
 
             expect(await page.screenshotSelector('.usersManager')).to.matchImage('admin_add_user_not_exists');
         });
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png
index 44fce9e99e..61222dd8d5 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aea956af521d99b9a8e186642cf7cd6cd9e2dce9878a0bfead6aa357e7c91841
-size 30043
+oid sha256:b675376564f98aecf50420c4c32492aa3214cbd3ce7f595747f2a405d527f713
+size 30053
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png
index 1fda56a20d..18b59bd6aa 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81763af0c3f251daf9d70af413873b98e9b4eeae5789303a4a7739ce1c78f2f5
-size 179439
+oid sha256:6295d2685bdd1a8a862c957f157e945ecc6081973afc62f097c133c4b030030c
+size 179435
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png
index 5fd6e9d287..6354c95272 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ba4f964c60dbfda47d0a5c1453e4ef08a405cf7650fd722e5b1f2e0f8a055a2
-size 203131
+oid sha256:d5c5ed717342771258ec450b888dd92c655e18f9156aa9994448ea3310f897fe
+size 203105
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png
index bab2699ebe..e2144fedbf 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f185b259e545cac59097437e44398a3c640a5e4a1042b27cf93439bac49d7e7
-size 115392
+oid sha256:916feec907a637c256e6ad2978f1ec1680f287426c449535a3a3d2c6f57dacce
+size 115399
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png
index 047c3d5a2b..bf56058a26 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:949eee52f63dc4ab0e99a0396210f503b5e7428b2160a1dc6d064a144ce895e4
-size 190696
+oid sha256:21ffc96319a1379e0af5f224ea5b08f677e23464c448562aedb9dfe8ad3c438b
+size 190715
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_wrong_password_confirmed.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_wrong_password_confirmed.png
index 4a1da2ce61..e274df8f91 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_wrong_password_confirmed.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_wrong_password_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:417c8d8cd2c63a624219428649e13aaea4a7b223be67c745f60e6569348ead28
-size 6094
+oid sha256:0b4b590f49075f280bdda593d1f71c433a14c3234542132168617670e53abf7a
+size 6093
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png
index 99cbecb261..cd37758548 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e968b0504073a6b6478f97d734272663618c5c0ef2fd1754b4775b738f93638
-size 31328
+oid sha256:90bba80ad150f158da4e495020b32fc4090b26fd9fe46ed26fd9acb09a30c057
+size 31294
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png
index 965becbc2b..d1ab8f5895 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fb5c7de1fd2277b4fa35f0ca3eb1af1e813d8306e9d2a36804df283b29e07e9
-size 29344
+oid sha256:63a25e0aef31ebdd66e6cdd47bfc552d7e0a88deb6c7a75cf9b451cf482e8683
+size 29315
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png
index 980c87333d..d94ac299ec 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc7811697c4f45718f8345de63919ae44f9c8ed95512ae5e902acdf1580f9942
-size 27039
+oid sha256:4fdfb637c4b5904b5cc79222d813e366260f80afc884be070ae81241abbc5284
+size 27037
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png
index 58380e19df..e10bcc9b81 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b31b17d9288dfa9d4fc5a5c4622ee38742f2436937b347663ddf346c92dea3f6
-size 81397
+oid sha256:583d72dfcebee5cb574f39db8cf179241958419247bd83ac26efcbf2a2c3c5e1
+size 81601
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
index 7302471261..344bd0c268 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:889ac541a4e8ee759b2bea39f6b8c88e57e235b2f4b75efb7524315dfc0ce8ee
-size 94919
+oid sha256:22ae7ebf89befe1a0975f6a87d0cfa55257b449fd5b937c17888c507ffee091d
+size 94730
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png
index bdadc859f4..9fcdbf9250 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ba5db6f0196f517a005413fb3e6efbe84f6eeff584814d40729818535ff7575
-size 157354
+oid sha256:763ad9348883e7ce3835c886ffcf3123662e2556d225b9fc1b8db4cd5a458aa2
+size 171438
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png
index 9d0e155ca1..f8cde47b2f 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:accebc6c193d3e7659d3179397dea40a5a94689b6f3c0e88974451d2f6a01b15
-size 157952
+oid sha256:d13c5092a3e62d278c2acec21d694e15276fd9236a95f0bad03cc9878810d9ad
+size 172052
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png
index e934173d12..9fcdbf9250 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fe0c8497adf50ac0f5041b965a224eb28fe9ce774639e2dc74b155278d5e1d7
-size 157337
+oid sha256:763ad9348883e7ce3835c886ffcf3123662e2556d225b9fc1b8db4cd5a458aa2
+size 171438
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png
index 58f79ff962..95d6f354ab 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c96afe43af92900441eff8617160ad6da259b28b0b97440b28bf78e32865b424
-size 149146
+oid sha256:69a5c5b50b2a7b51e03a5bcf8259a3f079136d14ce0a12925125511a75fc818f
+size 162842
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png
index b980357459..d17af75b3a 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6522ab26bb0080ddef5099cac6646639426ff3fad469ed452fb612ed5696eb71
-size 140090
+oid sha256:1f875e690ebfbbec8fe1c971412721dd1b16bd3a02b2adc6b3936506776338cc
+size 153294
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png
index 6bf5a3fd57..4a9814a99a 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:608d8b591f44ac2b856677b16cad3f97055c075cbbce204b3b12b5d2c0f17ca0
-size 139692
+oid sha256:a1aa996985875ac9f719aee357dc439a1e5beeb72f7be779fd327a197af02de8
+size 147591
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png
index 9ff1e45623..057b1813ac 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1cc4a0e099407bf7837e778aa4ea0a12e47d6a7160f242d288c14e534089c47
-size 140303
+oid sha256:c66e2f4b376fbcbe96241179dce176e10273c70302306c1ae44030b96fe25e1d
+size 148204
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png
index 72409206c3..e763718e7c 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c807a46f887c8306c060a14c2d84157eb71044fa2a9ddf8d69c7f322a4e71609
-size 31203
+oid sha256:098ac1a3d84991f550f53a186a723eac9b438943508b5c81f2071f735b60396c
+size 31199
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png
index 4636877934..443380e45c 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0f3905a69a2ed766e61b42f7142c4772d54221c4461eac47b44322d2873f446
-size 139313
+oid sha256:93c9ae24d02a6b27c3924cf13f049c0d62be3c7425ec719c6387c7343cb11476
+size 138309
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png
index 8f96911757..763d476350 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:930484c342df272f87d903650aa0a03fd5b0bc2d5b11feba17ef5b9f94d2800e
-size 147915
+oid sha256:0080d41eae4606ff43c7b99b6b91b2579aae6fe4620c4559b27e6f8ce0e9c1c3
+size 148131
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png
index ef57147c2d..37abff71fd 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18825315aeace738458d28b5b28d440122b08c204cb2fc80ec1795ee40d14d9f
-size 149482
+oid sha256:056b637034bd252fbe286885ed9eeeb9b7b1875f0950de1a4f734ce4d0462575
+size 158181
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png
index af396393c0..fdf3fecd83 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b062acaf489b84270689d810fa1494e24b6f7e668e7b944c96fd3e63880e296d
-size 147999
+oid sha256:b52e0333dce2fdb675318e62a778beafbe4806852d5ed2d5dd9192ecf4a1bc64
+size 150713
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png
index ed78da8106..0e1ea76c0b 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d661134a58ff790a8f32fcf56112c4e1fc5f3a2eb33a350d9a744d38b30d41f7
-size 92268
+oid sha256:7f8e3168bfd55b755751e9cfae27b3dd60674019de38c338970b4a22cb2cde57
+size 93240
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png
index 6b81dc495f..ca5768d6ef 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6fdd5a023c7e38623f51b23d3e4afa7947726a702af1d4e609cc7203f15cba77
-size 100970
+oid sha256:d508ef919076c7de2aca6ef361ca5d8c508d340b1bc6d2a3e60e3ca6314bb34e
+size 102083
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
index 6eee1cc461..c0c9549a79 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8abce161c3760b2e2d53a5a9470986ff1eaf8fff6986a2cc07ef50918a048de
-size 110507
+oid sha256:1725a441e91038e86fc3d7931957bdceb7c240423fc710c617e5b02fd6b660f3
+size 110015
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png
index 1e3050747f..19208deb3b 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21fd885472fd9c39d6e6d808007bddd1dd8626755e37067537e6ebd1805091b4
-size 79888
+oid sha256:990108c86e38681e565ccd517fb02369ad98f43a80e7892fe33a940781176596
+size 80978
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png
index 50ab8fc3ed..50f12fb58a 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2e30f8d2096f1e1154a45cc951b0d37e3c5701f106ccb2cf1fc311a54b02f49
-size 92630
+oid sha256:9484fcaf803922946c6cdbddfcfce0908fed6e77619655022d2454ed595f3f4d
+size 92451
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png
index 7661c358cd..cbf99243ba 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4a4c48c2385274694da20d1461e9d1afafbd5ed73bd2f09a0888e62463fe229
-size 80909
+oid sha256:82b0987e271f10a015994227a82c733313da191d5abda6dea80a50c66cca44d9
+size 82163
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png
index b27b9e4b9a..a8ef38d934 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4688e9d941f07ed5899325a2e039edae69e1047d6d3c93d5aad838ab153eb694
-size 66969
+oid sha256:0da4043873fd4a03586344399e4d230cbf49bcfb3a21258af02fb86c283855a2
+size 66659
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png
index 7961dc6232..b655bd93ca 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40044984bae9acbe363da2fa69f91d6e846bfa80e7a449ed5e2c5bd9184e2654
-size 90932
+oid sha256:846991e7dfd320e07e82212bc46bd7bef663289c17863a81f6881aef5df58698
+size 92113
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png
index 71be191b20..32b43b0cc2 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f924e2c3cd5164931a37be080b9fd3bc42d2261ac3de4b2c53372b8134f54447
-size 47831
+oid sha256:2db1d07ee054bb937ddaa3544f447920b01d1ba5dbd9d0371d31d076ec3718d2
+size 47993
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png
index ca51595c12..efeb7da210 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9824e44f3e90bd90a92834d790ad059ac87e1ae26b8e2ac1069735cfed86b6a6
-size 89121
+oid sha256:5b1ac3c0fba9928c19cb39b56cc13ce064f9a8359e2fe91ee887269efd7b64e1
+size 90338
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png
index dc1560093b..5c553934b1 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f71066245d43e71d082011b43af5ed0346f1199008296646f1795bd20c4670f6
-size 69361
+oid sha256:0775b9728bcc5c1ccd4497df6e77ad686ce380c1215d4f79fd8e284f831f0d0c
+size 69078
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png
index 97ea8ee1f1..0436cb04b7 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f78cf106741cd0022563695082c82dcdf18495070eca7055d075dcfbd824bc68
-size 91049
+oid sha256:4b68f0989997324e8575cfaa9ad1ba67bdc62aad3673626a1af495f74749bcba
+size 92270
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png
index eb06fa3795..52d4c428fb 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcab2f88cfb9c65250e39239a07947a2fba03840e5bdb63fc185b471004e2a4c
-size 89030
+oid sha256:c69e778f61c9697067eea1cf4da7293161b3e19fd5d20d8523a7cb87cc36a0e2
+size 89089
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png
index c5b9f255e2..18f5f4462c 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bc1624ae137b15c2ff441e25754ba3b1fe8291cd21d2ca629d29f556e7c1cda
-size 140425
+oid sha256:b97540f25c04a133cb10dcc058b7fc1e4a038ee1b319b082615f23545019bbed
+size 148552
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png
index 531f1b269f..03c60e0fbb 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59f73f76a67e762851c44d59adb60cc2fb7bfeb729c6cb8a0418277f6de189cb
-size 143580
+oid sha256:5110165e05355bc989dad0e06739b37b5c630582403031855ed5300ca90ff3db
+size 157072
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png
index 296ffb98b2..1ae87ef19f 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d06a6da019bc64d8c6f8d3b472941f081511a2fdc9d09800d9d08ef52e80c9d2
-size 145247
+oid sha256:ffc8054f46701ef58b6b3a8cf4195076dbb956d5ddd3a49d70db53553c69eca5
+size 158800
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png
index 184f42ec6e..40e6e80ae1 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6172543c4caac30c3108272e4a987659bc34f83ce29dd1c2d0dfe3ef6706830
-size 19850
+oid sha256:0e5115bf7f5420691d5549811e999b4ead5fb21eedccda6c5527c6e1648a0b11
+size 19854
author	Stefan Giehl <stefan@matomo.org>	2021-09-01 16:37:38 +0300
committer	GitHub <noreply@github.com>	2021-09-01 16:37:38 +0300
commit	a3ee690ea3863ff16a828ac0afbc77243bb45f5b (patch)
tree	77f3341e86608894b1020725700b348bbcd44567 /plugins
parent	ba1facfd1ecb4e618f3162aedbdb3170e9461e50 (diff)