UI test improvements (#12405)

* reactivate test

* update UI files

* reactivate skipped dashboard tests

* run ui tests on trusty dist

* update ui files

* take screenshot from relevant part only

* do not retry tests, as retries would have other results

72 files changed, 136 insertions, 151 deletions

diff --git a/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png b/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png
deleted file mode 100644
index 966bf73eba..0000000000
--- a/tests/UI/expected-screenshots/CustomVariables_link_in_menu.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:87ee8d72ec668cde13a9ebfdae7f2c59b07d37f105edc89ef5bc2edc5263635b
-size 14864
diff --git a/tests/UI/expected-screenshots/CustomVariables_manage.png b/tests/UI/expected-screenshots/CustomVariables_manage.png
deleted file mode 100644
index 12d8df878c..0000000000
--- a/tests/UI/expected-screenshots/CustomVariables_manage.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b3a740fc0eedd574d95bebc333d8f5c31ab97941386277af1bbf3a0c3403700a
-size 104351
diff --git a/tests/UI/expected-screenshots/DashboardManager_create_new.png b/tests/UI/expected-screenshots/DashboardManager_create_new.png
index 9effe5d897..ff5a655196 100644
--- a/tests/UI/expected-screenshots/DashboardManager_create_new.png
+++ b/tests/UI/expected-screenshots/DashboardManager_create_new.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e547872cc650d2d04be1a23cff223193a99cec7c32ec55e58054934a07326de4
-size 246689
+oid sha256:070ad71d3b23c6830a80e590cc45d2d49538bfcd44a2afff0f55636c78c13b14
+size 45323
diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png
index b896ecaf69..047a71f4a4 100644
--- a/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7401504a0dae68d0b295e87b2e64d9cd7cc85907d85e1d50a84a8aceb0bb62f
-size 423112
+oid sha256:49269f3c02415803e2b053623227a75e0cbcaf305389505000a548e4fab4f252
+size 423040
diff --git a/tests/UI/expected-screenshots/Dashboard_create_new.png b/tests/UI/expected-screenshots/Dashboard_create_new.png
index 923f861b76..f34e9b5926 100644
--- a/tests/UI/expected-screenshots/Dashboard_create_new.png
+++ b/tests/UI/expected-screenshots/Dashboard_create_new.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0870d40ea3b74614d3c1014dde5cea5cf5e7da6209fe0ce831f6c09f592e98ec
-size 125012
+oid sha256:dc553d56628856e08a4f9a980b9ce4f90f2adb6ccbe460c0c41edc6712fb4566
+size 28211
diff --git a/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png b/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png
index ccb079cc6e..60d616e493 100644
--- a/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png
+++ b/tests/UI/expected-screenshots/Dashboard_default_widget_selection_changed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51b3dd4b9e3183f38f5488ad16432679f18b319841a35903efae8cf6406d2ce2
-size 19870
+oid sha256:7fb97e0ea0f755700a10dbcab6863cb6a57eea007fd0f7101f3ae5aa4573f9d7
+size 27160
diff --git a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
index 560b4dcd92..56355d7845 100644
--- a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
+++ b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e452d3e4e1c296028b2bc6e1bec536ba6e79dd80cdace8a0cbe1375a8bf4bdd5
-size 628281
+oid sha256:1f97944fa590e3fea7162e436cadf3523dd37434e84eac5b8b41243dffd72eb0
+size 628189
diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png
index 8d909065c5..6952370ff5 100644
--- a/tests/UI/expected-screenshots/Dashboard_removed.png
+++ b/tests/UI/expected-screenshots/Dashboard_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbe44b6a04c023f2605ee4035fab38b130ae5035e9b99adbd52d712763fee8f1
-size 627905
+oid sha256:332801d65997e4559fe6f2fc1217370dde096bde3da359254119ef6e2a5a2bdf
+size 627822
diff --git a/tests/UI/expected-screenshots/Dashboard_segmented.png b/tests/UI/expected-screenshots/Dashboard_segmented.png
index d50eae29f1..92bc4316f2 100644
--- a/tests/UI/expected-screenshots/Dashboard_segmented.png
+++ b/tests/UI/expected-screenshots/Dashboard_segmented.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b988a7e008b8c51af57347cca6151733a0eb966a89c4ed363a46fac78977aa1
-size 28975
+oid sha256:5ff9cc14e171fb161ccb0f94b4322e113ac94269995b1465cc29ab744aeed9f0
+size 30250
diff --git a/tests/UI/expected-screenshots/Dashboard_widget_minimised.png b/tests/UI/expected-screenshots/Dashboard_widget_minimised.png
index 7e5a8cb9fd..3cf42fd936 100644
--- a/tests/UI/expected-screenshots/Dashboard_widget_minimised.png
+++ b/tests/UI/expected-screenshots/Dashboard_widget_minimised.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79d54d3af5625a21d03a5687eca27467fb523fd52be4f1072d8721e217084b12
-size 20911
+oid sha256:9ac3cb0919046fac931a47372717b870cc8a71800f20b4c2795cdf033c724743
+size 20910
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
index 3d5e4545f5..84d5fd175d 100644
--- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
+++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a80eb08e25e051d52e8fd87de41b5656c2cd085f91d579803bb076b91b25d39e
-size 328103
+oid sha256:ff5aaef3282dbbdb36edd484b1eb9d82864c00dc620de93eb75fc51c6c67fc3c
+size 328071
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_delete.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_delete.png
index 771a5f4691..41d21abacd 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_annotation_delete.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_annotation_delete.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f2bfdc7721ab5372524cd4c7d8903e92e21653f41aefe3f9cc0d2ded2ed91da
-size 24909
+oid sha256:b41dbad9fcc7cc7c4eaaaff971ae71a32f4eec5712b7c80cf472e44553e06452
+size 24676
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png
index a526505ece..587509e37c 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_form.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:700ea4b0df79c96ff7bd139f2be7e4e10fd457e605f05776896ac3d075a70f1d
-size 30993
+oid sha256:3f59c77050157232bef476ce7db0f7cb142f338f09ecb6b10762825ec1784597
+size 30609
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png
index 1b29dab959..863db84cda 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_annotation_edit_submit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68f2d40120e5d1d183ac55448009668b4e90cad0d2e63742f9a5935b9c49b9aa
-size 27849
+oid sha256:9075e528fb365327b60f16db2857226751b389291321d081899ce1b4a264f239
+size 27210
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png b/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png
index e2ae1a43fe..ef5008365c 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_annotation_starred.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be9ca36adf10dae4fd79ad1f83c6c261f93427511e7775693952bf28a375e9cf
-size 26578
+oid sha256:94d4c9296a23c5932f0b3391e892cdb73386eadae2afa2868f895f3d07726c9b
+size 26131
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png b/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png
index 34496817a5..e7a44d1529 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_annotations_all.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:201f0f5274affddd466681b4fcb61755c7ec72a08c8734bacf581fe2df3ff47e
-size 85480
+oid sha256:b179758966032ee46ccfca480dc3f49d32aebc6892eab19b73458ab139f97652
+size 83792
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png b/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png
index 3f76e46e10..ce160ed771 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_annotations_none.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df6b55f72e2a345b6f873f7c3e90ee8889b935a72a407e05e406c96a9d6d00f1
-size 25045
+oid sha256:e3e87694906156a8cd3dfb61979bd8e167f3cc96f0e7c2037115ecfb325032d2
+size 24833
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png b/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png
index a76be26c87..1932c3d3cd 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_annotations_single_period.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3386f6a1cab8b1bc90f5c13fb6568543e138dee60c1c6a5c0af23272ed656caf
-size 35701
+oid sha256:353eb441717877b73002c7066a4b63b34f21dd5fdae9836a293f20fbd597fccf
+size 35288
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png
index 1479d7a198..9f57ed2cdb 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_form.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb5bddf0ecc590b28d9239cbdef014609b876f6c60eeb90db6fabcb1fac808e8
-size 31493
+oid sha256:e93725975918d888d26e14993655b23a65177488d815da1b60a7d1dc625f16c6
+size 31297
diff --git a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png
index bd5bef5de5..a1c6b5b669 100644
--- a/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png
+++ b/tests/UI/expected-screenshots/EvolutionGraph_new_annotation_submit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82427b4f972c8c2602a13dfbb22e5c659339e9174263cfbf417421cdb5bf501c
-size 26432
+oid sha256:5c61ecd6709639577eaebf67a9c5c3f924a967113bc1a08e11e4bcda8c368433
+size 25978
diff --git a/tests/UI/expected-screenshots/Installation_congrats.png b/tests/UI/expected-screenshots/Installation_congrats.png
index bce38cb608..744573edc4 100644
--- a/tests/UI/expected-screenshots/Installation_congrats.png
+++ b/tests/UI/expected-screenshots/Installation_congrats.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62833169cea606e8429fbba63346045ffc5948946a80296565e94c61f3daf9ff
-size 163919
+oid sha256:2a5ae658114ed5aa7bd1bf600328d05f431688a7f8faac9ea7a3ff0492c5df2d
+size 163850
diff --git a/tests/UI/expected-screenshots/Installation_setup_website.png b/tests/UI/expected-screenshots/Installation_setup_website.png
index 8503c0b15e..c57321d01a 100644
--- a/tests/UI/expected-screenshots/Installation_setup_website.png
+++ b/tests/UI/expected-screenshots/Installation_setup_website.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33b6b974410ca7159767b186462e0406f668d246f599fbe72ca394a9af28da06
-size 73198
+oid sha256:8d71d3dfe494fd9fc1ac64f165ca945795a8d047f0e862e2328210d4fadce3ea
+size 73532
diff --git a/tests/UI/expected-screenshots/Installation_setup_website_fail.png b/tests/UI/expected-screenshots/Installation_setup_website_fail.png
index a0733bbd1d..7d81d35d5b 100644
--- a/tests/UI/expected-screenshots/Installation_setup_website_fail.png
+++ b/tests/UI/expected-screenshots/Installation_setup_website_fail.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7833320f86007dd35b8f7cb38f763c1026481ce037b3a7cf1cf2ee132871ab4
-size 79787
+oid sha256:9e6bc7c4614fb082565f36f3f52556fd996f4d7e6a9b87362e958fa2fe24f643
+size 80117
diff --git a/tests/UI/expected-screenshots/Installation_system_check.png b/tests/UI/expected-screenshots/Installation_system_check.png
index 2b068301b1..84a192b7ba 100644
--- a/tests/UI/expected-screenshots/Installation_system_check.png
+++ b/tests/UI/expected-screenshots/Installation_system_check.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22f5ded27d63055d808e02751a8aa203118e6f58a421d5f16ddf7499f85eadc9
-size 169750
+oid sha256:f200e33779d4d5c5721c0452bd59f1f2558368924290fcbe483feca2f9a8022f
+size 169694
diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
index f64025e5ce..e71e879402 100644
--- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
+++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6dce0c9a2ffbfc3403d591f81a34552a56ed99213c395bc75ca41cecc24cab2
-size 427678
+oid sha256:a86785bdde4c70ca7dea71035926d5b0232742f1a18f6d0d44c21d74642d00e1
+size 427663
diff --git a/tests/UI/expected-screenshots/Menus_admin_changed.png b/tests/UI/expected-screenshots/Menus_admin_changed.png
index 39d51208e1..4235ec5145 100644
--- a/tests/UI/expected-screenshots/Menus_admin_changed.png
+++ b/tests/UI/expected-screenshots/Menus_admin_changed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:060e985bd1fd81a500c98a67f7aa9d08a651491a24b5eed6ea1fe49ef6adab67
-size 45680
+oid sha256:3ffe66ed757c121f58223587c4bd600cc37c783fcf85db7c31dba4a6e0bbc490
+size 45678
diff --git a/tests/UI/expected-screenshots/Menus_admin_loaded.png b/tests/UI/expected-screenshots/Menus_admin_loaded.png
index f6f1b0bb4f..de80755c95 100644
--- a/tests/UI/expected-screenshots/Menus_admin_loaded.png
+++ b/tests/UI/expected-screenshots/Menus_admin_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:140da862238d196decc856719a949b0c49fbc5153da6674630dcc0628b9ef158
-size 45749
+oid sha256:4398c5a1fec699ee777c995f96f14cb52c537f6a549360cf120ed83e9358a5e9
+size 45748
diff --git a/tests/UI/expected-screenshots/Morpheus_load.png b/tests/UI/expected-screenshots/Morpheus_load.png
index 45fa067941..b61ec93cb0 100644
--- a/tests/UI/expected-screenshots/Morpheus_load.png
+++ b/tests/UI/expected-screenshots/Morpheus_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53d9c858e3c6852165b334a0dae64c7b018432179daf374045a8cd1af3171e57
-size 1229610
+oid sha256:14e76b1fb74fc893229b2a42aa0bda1ef204f026fed4fc4e40f325b6207d5b77
+size 1229700
diff --git a/tests/UI/expected-screenshots/Overlay_loaded.png b/tests/UI/expected-screenshots/Overlay_loaded.png
index 473a526a9b..965d71fc8c 100644
--- a/tests/UI/expected-screenshots/Overlay_loaded.png
+++ b/tests/UI/expected-screenshots/Overlay_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e17420367fed1385bb47456181dfbf3769a7967fa7352172b1afc321d934dda7
-size 107726
+oid sha256:e2761682a745b9d623003f32f271e7dcc5b8c266599a111faaf427d2b7cf487a
+size 107708
diff --git a/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
index 1cb242fc95..2938011709 100644
--- a/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
+++ b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:adde7eba47ec565391c12e549cb08166ca0da20199f08bc00d912efb1cbf4081
-size 105001
+oid sha256:5cf2f4a37d882979fd2244ae81048328dff11d332588799a446dd74ac5d97223
+size 104972
diff --git a/tests/UI/expected-screenshots/Overlay_page_change.png b/tests/UI/expected-screenshots/Overlay_page_change.png
index 21ec24ce0c..57da64d460 100644
--- a/tests/UI/expected-screenshots/Overlay_page_change.png
+++ b/tests/UI/expected-screenshots/Overlay_page_change.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:976b961f96068ff2aca8fefd992782cd58a1a125ff1e34b624022c94d18a7157
-size 214351
+oid sha256:3fa06a62fb6443bc26409d2a8fd4f66ac6445b74be5ed32ef103e9a0e3660dc1
+size 214339
diff --git a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
index 69355f13ff..bc4731f38b 100644
--- a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
+++ b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0ba26ee0331e7ff22f64e0a1b648569c82dc0eb423236751d81ec71a88a5f75
-size 114248
+oid sha256:325991f455d03c516d604f3d2fb625474635363fa46e81fc4a634975867eda0a
+size 114237
diff --git a/tests/UI/expected-screenshots/Overlay_page_new_links.png b/tests/UI/expected-screenshots/Overlay_page_new_links.png
index 7e2023f25a..2d3f0bfdce 100644
--- a/tests/UI/expected-screenshots/Overlay_page_new_links.png
+++ b/tests/UI/expected-screenshots/Overlay_page_new_links.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc9dd34c74e1f3572fa646f289a92c60d5c5dd49a778ff1a5c9af1300cfc72f4
-size 118366
+oid sha256:68bb6141bacfcc7ae1bcca1308b9d5c45219c15a0d3b872b500be9e67b5c7919
+size 118259
diff --git a/tests/UI/expected-screenshots/Overlay_period_change.png b/tests/UI/expected-screenshots/Overlay_period_change.png
index dc37737743..64afa403df 100644
--- a/tests/UI/expected-screenshots/Overlay_period_change.png
+++ b/tests/UI/expected-screenshots/Overlay_period_change.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e327c3ded16cfa9670b7ec4f533fdb0c071112aa6a655e64873aa67d5191f2b
-size 215961
+oid sha256:f5d8b42608a8944cb17c55aba560002f836014e55b0e4f2ffc7967183ab5961a
+size 215945
diff --git a/tests/UI/expected-screenshots/SimpleUITest_simplePage.png b/tests/UI/expected-screenshots/SimpleUITest_simplePage.png
deleted file mode 100644
index 13600d6389..0000000000
--- a/tests/UI/expected-screenshots/SimpleUITest_simplePage.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ce81a865a5cef1df048865e5e7e9b1b4c73fbe33cb70a321f7af0d41c60e65d
-size 20004
diff --git a/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png b/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png
deleted file mode 100644
index e930cb417b..0000000000
--- a/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0581efb46621a022f3ed960719a6b20efb45840fa95056af0e9249978008fa5e
-size 15492
diff --git a/tests/UI/expected-screenshots/SiteSelector_search_two_chars.png b/tests/UI/expected-screenshots/SiteSelector_search_two_chars.png
index c222974297..5569208dd2 100644
--- a/tests/UI/expected-screenshots/SiteSelector_search_two_chars.png
+++ b/tests/UI/expected-screenshots/SiteSelector_search_two_chars.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:060f02851110a6e304759eca2ff40fed7578ff70aee5604b5c5f5d880d31d90a
-size 8729
+oid sha256:45a7aed7d9762e25293d3e15c0095527d46a4613b46375f3161809c884f051fd
+size 9040
diff --git a/tests/UI/expected-screenshots/SiteSelector_site_selected.png b/tests/UI/expected-screenshots/SiteSelector_site_selected.png
index 10079502f4..49fef337a6 100644
--- a/tests/UI/expected-screenshots/SiteSelector_site_selected.png
+++ b/tests/UI/expected-screenshots/SiteSelector_site_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb21e754ed508c618e653f7400149cb178fcbfe105d83678069f13682d9685b8
-size 3050
+oid sha256:7f6f87dae8650f187f31ebeaf597d1a1b02c102b7ac87f815e1d349b1fbdbd83
+size 1812
diff --git a/tests/UI/expected-screenshots/SitesManager_global_settings.png b/tests/UI/expected-screenshots/SitesManager_global_settings.png
index 4a7544c1b7..367b51db00 100644
--- a/tests/UI/expected-screenshots/SitesManager_global_settings.png
+++ b/tests/UI/expected-screenshots/SitesManager_global_settings.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19c35feaaf6438237125a8aab914a901ed9204967aae99947664aaade1faa3d9
-size 260824
+oid sha256:d2a6121d0bd6140ff76525be0e9caba01ed07c3fd0a2fa43802444f384ba85d0
+size 260936
diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png
index f832b95d79..37a9f3485b 100644
--- a/tests/UI/expected-screenshots/Theme_home.png
+++ b/tests/UI/expected-screenshots/Theme_home.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4750782a49bee8c1bddab7642460803395b2fea2843e471028d9eb532be2c72a
-size 632524
+oid sha256:69901e8250a0020f14ce1a293de882a5ec53d40c232793970adf18ac924c9e47
+size 632793
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png
index 9d651f8d6d..90307bf56f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d051d154ebaf07bf92478ed155ee8017569d2b2fa781fbc5dfdd7a75202f256b
-size 395061
+oid sha256:212de79552cbb94c4f9772bfdf3e16f19d7cd3034e540f2cde879ede855d8dfc
+size 394903
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png
index 2e7d4a1f3a..746e079cae 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f62df237a187ab053f63d5b01f4d95d4d78827e7652c5e79ca73b4ae6007dd0e
-size 343789
+oid sha256:1df4babf39b6768260f7bb993a4293e3c4228fa33bd6960eb70f4b470fc5464c
+size 343785
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index ddf70950bf..fccf3f5944 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b473a535072a8812a8dccdd8d1401455a5d5d3f63341d653c7a20c2eaa530f5
-size 3793849
+oid sha256:e629e1f475f674c953601c18bac0fd259a3062ba17d80964af2eed55a6585f15
+size 3793867
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
index 8503c491b9..a8d6eb5fb9 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:802770602b9cf5bf51dfdb676d2b7d0169bd26a68d0aa85fb7987a2d988a6e55
-size 126797
+oid sha256:fe39599d49c2c38115e77ea6cf2fb4b1d2203b03f6994ed618014378c1ec26b1
+size 126897
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
index 93374c50e5..8c5fb40d12 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53c71ad2658c4aee22a1e7b376c11cdc9436f05cb8e30f0b1e7ee4f6628e5045
-size 301435
+oid sha256:1fcde47828188c8bbc16c17c428f60936a87ac13552a9d823a8e211e882c3a1a
+size 302606
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_users.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_users.png
index 04e557a6d1..39c7395f66 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_users.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_users.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2099c87e7883bfacd05747ff972bc8090800c89bbb167ce630d9097bcfe2bf62
-size 109186
+oid sha256:5ec0e9766949099fcf397d47d6bae1569ae94092c77d8fd4edf6d2828446bcd6
+size 109188
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png
index 04e557a6d1..d94ea62894 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2099c87e7883bfacd05747ff972bc8090800c89bbb167ce630d9097bcfe2bf62
-size 109186
+oid sha256:f8e8f78257c27111817b0ffc91167ba73b8ccd1e488cc45b2161dad8f14f8500
+size 194581
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_settings.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_settings.png
index 4ff28a59f7..7fe2bc2cdb 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_settings.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_privacy_settings.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4358bdd7716e4436466c63e3cd64e2b8d7ffe1cd1123026d64a287bd151bd7bd
-size 258567
+oid sha256:70fa3bf708bb0a58e1566013cf0534bcf00b8b7c83f137b765d91fe37ebc06ef
+size 258590
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
index ecf4ec3d70..7d494c8c16 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9291466e1d0a7c6779da21f6b5bbf14cb2f8c83c4dc7dc62b3a669c9fe98c14
-size 653985
+oid sha256:ecdf99c6725de81d832c439ba68f3eb5b6af935d9acafd6081fce23c1c5c2f71
+size 653222
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png
index 8dee64314a..f64833740d 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4114501817bdf9d848295200329e8bdad1faf8813e15c4dd1584b4704ad86257
-size 152841
+oid sha256:bcd82ed26ee738929a901f7af749fcfcbdb7aa9a25df9ec44381fb7dc587c3e9
+size 152621
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png
index 8dee64314a..f64833740d 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4114501817bdf9d848295200329e8bdad1faf8813e15c4dd1584b4704ad86257
-size 152841
+oid sha256:bcd82ed26ee738929a901f7af749fcfcbdb7aa9a25df9ec44381fb7dc587c3e9
+size 152621
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
index 58b74c9bb6..1911849f0f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43823bc89b1096036300978c254ee00d9350b5396fb89529d6fe5c4e508736c9
-size 4355294
+oid sha256:459e32145d3a3c0e6530a8d963ef0007ddcf0af54f4ec5706ee5e8e84aaac039
+size 4368758
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
index 32c22f4289..2239cb058c 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70d0a226f3411985ce84a5c41ca08b9360594a9856bbcb68def4256fd97b267b
-size 585143
+oid sha256:f0eed1034d9e04a7e4c9b1f07e23ff84e40638fae8ea87940761d93261b53a97
+size 585106
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
index f981340a12..c93278409a 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e6233c7a9ef25e5b93080a07e7953ec81fc671f90c685150bb6678181c61882
-size 458674
+oid sha256:7e9bdb322c7be9aa1bbfd56081c4fce81b70307d2d3811392e7684c75885edee
+size 458817
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png
index e3bd1ff292..40a4698574 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log_segmented.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4d2924e399c736b07bd78986f9d8551516ef681b6269a99ae625563a06857bb
-size 60815
+oid sha256:c4c46f68b28723ee02a5a2a036a892ac2b9019c5a0cd47e30ac8266aeab524f1
+size 60584
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png
index 0bf02f7209..edb4bd3881 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8ff715f995e7e109653c1c2a774d1ffd0219c5db50c8ac797fac07383c756d6
-size 168384
+oid sha256:f8cb4bf2a4bb246d71fa84df978cadbcb7a8f2b086b5af4bcc1a2293020e7826
+size 168385
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png
index de0e3afaee..ad64e1e62f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f8077db8b79861f25368b51286b461d02583fd8286c7f31a8060b4ec426f5aa
-size 65189
+oid sha256:72bb2a86c7cf6d40be525a2e4306f9a38aa77285e2b917e82c97595cf0ca74e8
+size 65238
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
index 2a950f0384..5e0a6b765c 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:910e6af7c83a8547da3dadb888fe56aae9d63dc7880f7266b79487d760c0b413
-size 181207
+oid sha256:0f8d13823d02601c62d73029cf5810c84ff168c18a8874d1ed3f09eb8bb05b6b
+size 182499
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_confirmation.png b/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_confirmation.png
index 75886eb070..e5208e132e 100644
--- a/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_confirmation.png
+++ b/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_confirmation.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4aa0be167eb33245214d96ef7600850427b6731266ef519ce834a21b350df902
-size 47130
+oid sha256:97072d2cf7b3cd0398d6ea8e5861270497d06b6ed4e06ab742aa89212c7778eb
+size 10597
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_loaded.png b/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_loaded.png
index caf82d6ea0..c05fff14f1 100644
--- a/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_loaded.png
+++ b/tests/UI/expected-screenshots/UsersManager_adminuser_all_users_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c174e83a6962b03153bf97d317be57f5fa7c9484f469cfc5ba5e118bb4b999b2
-size 42226
+oid sha256:cc08fd22a867ba3828fcde2d3781248aec47f6508b18be7d2018072e3e74210d
+size 42222
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_form_opened.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_form_opened.png
index 41ca3809d2..87967776b8 100644
--- a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_form_opened.png
+++ b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_form_opened.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a72f0e1a92562692654bb8c2e16b612bf9fcaa00a4010b0cf177fb5165a2d91
-size 39955
+oid sha256:d561b2f17e151f307821e74da065338e461baa83ede9c91df9768c1460287f5c
+size 39951
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_no_user_entered.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_no_user_entered.png
index d9842e000a..fee085772c 100644
--- a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_no_user_entered.png
+++ b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_no_user_entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8fd5f8b99c2f9e9bbc2c839e800515b54f5777ea6c833b0434de23f150bafb00
-size 46254
+oid sha256:5c2d3e2f2c873dbe3f60762d2196e1b66a0a2f4c3306eff1935f7adc3a78cb76
+size 46250
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_already_has_access.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_already_has_access.png
index b4769fedcf..85da96fb78 100644
--- a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_already_has_access.png
+++ b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_already_has_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6bab06ec6ed696401270ccf58550a1ddcc0ed7323e75609efcfbc36c4fe6f20f
-size 46934
+oid sha256:8336379dcee96be3274623c80f16aa557989f065f0332a5c4cd03eef1a5eb5e1
+size 46929
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_not_found.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_not_found.png
index 7f8a6cc127..e0c866cbb3 100644
--- a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_not_found.png
+++ b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_user_not_found.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88e726226b2011e06ff3be132bbacca995bb6a31c84726bf6100c33fdd5e05b6
-size 48741
+oid sha256:d3acf56e7913ef7bb19e60e830a519aaac0d303cf68fbb509144fe9d81857369
+size 48738
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_email.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_email.png
index cd382805fc..e6baef5592 100644
--- a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_email.png
+++ b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_email.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccc51a7de2ac12d7fa4146d5d63d48a33ec4df69811321b615a0ba9623a68fcb
-size 42101
+oid sha256:350b46ec5da2063ca01a3237c588d532e033ba1a166248f8139592c07511e286
+size 42100
diff --git a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_login.png b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_login.png
index daf4dca7d2..7a4a74ae31 100644
--- a/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_login.png
+++ b/tests/UI/expected-screenshots/UsersManager_adminuser_give_view_access_via_login.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce32c8d6d8f319d2073f8bd71e5553f7dd8bf833e2f5fac98843f8f667e97876
-size 39390
+oid sha256:dadd30a4b9cf9a53593991c42e18646c87d37c0574233ea0666c41450a23272b
+size 39387
diff --git a/tests/UI/expected-screenshots/UsersManager_loaded_as_admin.png b/tests/UI/expected-screenshots/UsersManager_loaded_as_admin.png
index 07de2887a8..58fec92f9f 100644
--- a/tests/UI/expected-screenshots/UsersManager_loaded_as_admin.png
+++ b/tests/UI/expected-screenshots/UsersManager_loaded_as_admin.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d92de89d497f5218d176557ecf0946ba1a650c1e361116fb0758cbb4979fa706
-size 36703
+oid sha256:132884c03ff9f671a725051f882dc920d6ce4009f0519f0195ffd74fffa60d34
+size 36701
diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
index 88313f60e3..12f6598ec8 100644
--- a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
+++ b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7579b4d9bcf75eb18d9aadb91541a716087088ca4dc2f2485a0bda294356e08
-size 71508
+oid sha256:3626bb618a90a91d947232d6cc8b7038138b12a41e5e8d89ab66c0549cf52976
+size 71118
diff --git a/tests/UI/specs/Dashboard_spec.js b/tests/UI/specs/Dashboard_spec.js
index 25d0f743f3..429101e95b 100644
--- a/tests/UI/specs/Dashboard_spec.js
+++ b/tests/UI/specs/Dashboard_spec.js
@@ -218,7 +218,7 @@ describe("Dashboard", function () {
         }, done);
     });
 
-    it.skip("should not fail when default widget selection changed", function (done) {
+    it("should not fail when default widget selection changed", function (done) {
         expect.screenshot("default_widget_selection_changed").to.be.capture(function (page) {
             page.load(url);
             page.click('.dashboard-manager .title');
@@ -227,19 +227,19 @@ describe("Dashboard", function () {
         }, done);
     });
 
-    it.skip("should create new dashboard with new default widget selection when create dashboard process completed", function (done) {
+    it("should create new dashboard with new default widget selection when create dashboard process completed", function (done) {
         expect.screenshot("create_new").to.be.capture(function (page) {
             page.click('.dashboard-manager .title');
             page.click('li[data-action=createDashboard]');
             page.sendKeys('#createDashboardName:visible', 'newdash2');
             page.click('.modal.open .modal-footer a:contains(Ok)');
-            // toggle map widget to prevent failures
-            page.mouseMove('#widgetUserCountryMapvisitorMap .widgetTop', 3000);
-            page.click('#widgetUserCountryMapvisitorMap #minimise');
         }, done);
     });
 
     it("should load segmented dashboard", function (done) {
+
+        removeAllExtraDashboards(function(){});
+
         expect.screenshot("segmented").to.be.capture(function (page) {
             page.load(url + '&segment=' + encodeURIComponent("browserCode==FF"), 5000);
         }, done);
diff --git a/tests/UI/specs/QuickAccess_spec.js b/tests/UI/specs/QuickAccess_spec.js
index ff7493a704..805ab021f6 100644
--- a/tests/UI/specs/QuickAccess_spec.js
+++ b/tests/UI/specs/QuickAccess_spec.js
@@ -8,7 +8,6 @@
  */
 
 describe("QuickAccess", function () {
-    this.retries(3);
 
     var selectorToCapture = ".quick-access,.quick-access .dropdown";
 
diff --git a/tests/UI/specs/SiteSelector_spec.js b/tests/UI/specs/SiteSelector_spec.js
index 8ee2c71e0b..83c8e4045a 100644
--- a/tests/UI/specs/SiteSelector_spec.js
+++ b/tests/UI/specs/SiteSelector_spec.js
@@ -39,11 +39,9 @@ describe("SiteSelector", function () {
         }, done);
     });
 
-    // Test is skipped as it randomly fails http://builds-artifacts.piwik.org/ui-tests.master/2295.1/screenshot-diffs/diffviewer.html
-    it.skip("should search again when second character typed into search input", function (done) {
+    it("should search again when second character typed into search input", function (done) {
         expect.screenshot("search_two_chars").to.be.captureSelector(selectorToCapture, function (page) {
             page.sendKeys(".websiteSearch", "st");
-            page.wait(3000);
         }, done);
     });
 
diff --git a/tests/UI/specs/UsersManager_spec.js b/tests/UI/specs/UsersManager_spec.js
index 1c88dbd917..9fcb49c464 100644
--- a/tests/UI/specs/UsersManager_spec.js
+++ b/tests/UI/specs/UsersManager_spec.js
@@ -101,10 +101,10 @@ describe("UsersManager", function () {
     });
 
     it("should ask for confirmation when all sites selected", function (done) {
-        assertScreenshotEquals("adminuser_all_users_confirmation", done, function (page) {
+        expect.screenshot("adminuser_all_users_confirmation").to.be.captureSelector('.modal.open', function (page) {
             openGiveAccessForm(page);
             setLoginOrEmailForGiveAccessForm(page, 'login5@example.com');
             submitGiveAccessForm(page);
-        });
+        }, done);
     });
 });
\ No newline at end of file