Updated browser versions and screenshots, test tweaks for stability. (#12271)

89 files changed, 21 insertions, 7 deletions

diff --git a/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-error.png b/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-error.png
index 70fced7498..d6d55e85e1 100755
--- a/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-error.png
+++ b/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-error.png
diff --git a/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-tray.png b/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-tray.png
index b4c5bfc067..3d58f88ff0 100755
--- a/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-tray.png
+++ b/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-tray.png
diff --git a/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-warning.png b/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-warning.png
index 75b3a539b2..9ff189238b 100755
--- a/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-warning.png
+++ b/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__notification-warning.png
diff --git a/uitest/reference-screenshots/chrome/ChameleonThemeTest-testTheme_ANY_Chrome__labels.png b/uitest/reference-screenshots/chrome/ChameleonThemeTest-testTheme_ANY_Chrome__labels.png
index 20fc1e6b89..05a5b738f8 100755
--- a/uitest/reference-screenshots/chrome/ChameleonThemeTest-testTheme_ANY_Chrome__labels.png
+++ b/uitest/reference-screenshots/chrome/ChameleonThemeTest-testTheme_ANY_Chrome__labels.png
diff --git a/uitest/reference-screenshots/chrome/ChameleonThemeTest-testTheme_ANY_Chrome__labels_1.png b/uitest/reference-screenshots/chrome/ChameleonThemeTest-testTheme_ANY_Chrome__labels_1.png
new file mode 100644
index 0000000000..b6ba590598
--- /dev/null
+++ b/uitest/reference-screenshots/chrome/ChameleonThemeTest-testTheme_ANY_Chrome__labels_1.png
diff --git a/uitest/reference-screenshots/chrome/GridSidebarThemeTest-testValoDark_ANY_Chrome__tests-valo-dark-SidebarOpen.png b/uitest/reference-screenshots/chrome/GridSidebarThemeTest-testValoDark_ANY_Chrome__tests-valo-dark-SidebarOpen.png
index 51433d01b7..167b4545a6 100644
--- a/uitest/reference-screenshots/chrome/GridSidebarThemeTest-testValoDark_ANY_Chrome__tests-valo-dark-SidebarOpen.png
+++ b/uitest/reference-screenshots/chrome/GridSidebarThemeTest-testValoDark_ANY_Chrome__tests-valo-dark-SidebarOpen.png
diff --git a/uitest/reference-screenshots/chrome/GridSidebarThemeTest-testValoDark_ANY_Chrome__tests-valo-dark-SidebarOpen_1.png b/uitest/reference-screenshots/chrome/GridSidebarThemeTest-testValoDark_ANY_Chrome__tests-valo-dark-SidebarOpen_1.png
new file mode 100644
index 0000000000..51433d01b7
--- /dev/null
+++ b/uitest/reference-screenshots/chrome/GridSidebarThemeTest-testValoDark_ANY_Chrome__tests-valo-dark-SidebarOpen_1.png
diff --git a/uitest/reference-screenshots/chrome/ReindeerThemeTest-testTheme_ANY_Chrome__labels_1.png b/uitest/reference-screenshots/chrome/ReindeerThemeTest-testTheme_ANY_Chrome__labels_1.png
new file mode 100644
index 0000000000..3cd8918e09
--- /dev/null
+++ b/uitest/reference-screenshots/chrome/ReindeerThemeTest-testTheme_ANY_Chrome__labels_1.png
diff --git a/uitest/reference-screenshots/firefox/AccordionClipsContentTest-testAccordionClipsContent_ANY_Firefox__button-clicked.png b/uitest/reference-screenshots/firefox/AccordionClipsContentTest-testAccordionClipsContent_ANY_Firefox__button-clicked.png
index 9857376504..7e450319a9 100755
--- a/uitest/reference-screenshots/firefox/AccordionClipsContentTest-testAccordionClipsContent_ANY_Firefox__button-clicked.png
+++ b/uitest/reference-screenshots/firefox/AccordionClipsContentTest-testAccordionClipsContent_ANY_Firefox__button-clicked.png
diff --git a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-first-popup.png b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-first-popup.png
index 658ba894e8..d5adb13db5 100644
--- a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-first-popup.png
+++ b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-first-popup.png
diff --git a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-fourth-popup.png b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-fourth-popup.png
index 4ecb18b5cd..b62c729710 100644
--- a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-fourth-popup.png
+++ b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-fourth-popup.png
diff --git a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-second-popup.png b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-second-popup.png
index 33099fd18c..26a8e6074c 100644
--- a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-second-popup.png
+++ b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-second-popup.png
diff --git a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-third-popup.png b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-third-popup.png
index ff2f248bbf..b4299eb7cb 100644
--- a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-third-popup.png
+++ b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates-third-popup.png
diff --git a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates.png b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates.png
index 0d8310882c..1acbafd429 100644
--- a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates.png
+++ b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__dates.png
diff --git a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__textfields.png b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__textfields.png
index e3e4e59d08..bcdbdfb71c 100644
--- a/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__textfields.png
+++ b/uitest/reference-screenshots/firefox/BaseThemeTest-testTheme_ANY_Firefox__textfields.png
diff --git a/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__labels.png b/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__labels.png
index 33e1688e79..8bc019e826 100644
--- a/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__labels.png
+++ b/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__labels.png
diff --git a/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__labels_1.png b/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__labels_1.png
new file mode 100644
index 0000000000..33e1688e79
--- /dev/null
+++ b/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__labels_1.png
diff --git a/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__textfields.png b/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__textfields.png
index bdef075202..bcb8069957 100644
--- a/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__textfields.png
+++ b/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__textfields.png
diff --git a/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__uploads.png b/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__uploads.png
index cd5b73151f..54d298c6ae 100644
--- a/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__uploads.png
+++ b/uitest/reference-screenshots/firefox/ChameleonThemeTest-testTheme_ANY_Firefox__uploads.png
diff --git a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-page1.png b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-page1.png
index 217128508c..c662a1826f 100644
--- a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-page1.png
+++ b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-page1.png
diff --git a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-page2.png b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-page2.png
index 2bfbc2e3a2..3949812390 100644
--- a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-page2.png
+++ b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-page2.png
diff --git a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-selected-1-3-5-9.png b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-selected-1-3-5-9.png
index 04383d41e2..a00221d36e 100644
--- a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-selected-1-3-5-9.png
+++ b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-16x16-selected-1-3-5-9.png
diff --git a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-32x32-page2.png b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-32x32-page2.png
index f3d84c4ccd..da9f6e36b5 100644
--- a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-32x32-page2.png
+++ b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-32x32-page2.png
diff --git a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-64x64-page1-highlight-first.png b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-64x64-page1-highlight-first.png
index 6dfa27e1af..fdd8758f65 100755
--- a/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-64x64-page1-highlight-first.png
+++ b/uitest/reference-screenshots/firefox/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Firefox__icons-64x64-page1-highlight-first.png
diff --git a/uitest/reference-screenshots/firefox/FontIconsTest-checkScreenshot_ANY_Firefox__allVaadinIcons.png b/uitest/reference-screenshots/firefox/FontIconsTest-checkScreenshot_ANY_Firefox__allVaadinIcons.png
index cb5c730365..f970fdb8cb 100644
--- a/uitest/reference-screenshots/firefox/FontIconsTest-checkScreenshot_ANY_Firefox__allVaadinIcons.png
+++ b/uitest/reference-screenshots/firefox/FontIconsTest-checkScreenshot_ANY_Firefox__allVaadinIcons.png
diff --git a/uitest/reference-screenshots/firefox/GridIconTest-LayoutIcon_ANY_Firefox__icon.png b/uitest/reference-screenshots/firefox/GridIconTest-LayoutIcon_ANY_Firefox__icon.png
index 493e0fc0f2..daa24cc13f 100644
--- a/uitest/reference-screenshots/firefox/GridIconTest-LayoutIcon_ANY_Firefox__icon.png
+++ b/uitest/reference-screenshots/firefox/GridIconTest-LayoutIcon_ANY_Firefox__icon.png
diff --git a/uitest/reference-screenshots/firefox/GridLayoutRegErrorTest-LayoutRegError_ANY_Firefox__RegError.png b/uitest/reference-screenshots/firefox/GridLayoutRegErrorTest-LayoutRegError_ANY_Firefox__RegError.png
index 00d70a81bc..ddc609515e 100644
--- a/uitest/reference-screenshots/firefox/GridLayoutRegErrorTest-LayoutRegError_ANY_Firefox__RegError.png
+++ b/uitest/reference-screenshots/firefox/GridLayoutRegErrorTest-LayoutRegError_ANY_Firefox__RegError.png
diff --git a/uitest/reference-screenshots/firefox/GridLayoutRegErrorTest-LayoutRegError_ANY_Firefox__RegError_1.png b/uitest/reference-screenshots/firefox/GridLayoutRegErrorTest-LayoutRegError_ANY_Firefox__RegError_1.png
new file mode 100644
index 0000000000..fc59677b49
--- /dev/null
+++ b/uitest/reference-screenshots/firefox/GridLayoutRegErrorTest-LayoutRegError_ANY_Firefox__RegError_1.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_initial.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_initial.png
index 877047351b..196ef32b9d 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_initial.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_initial.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_one-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_one-invalid.png
index c7daacaec6..e22ae82f07 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_one-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_one-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_two-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_two-invalid.png
index 53e5ecac42..2cf9254c72 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_two-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___base_two-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_initial.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_initial.png
index 30007ab42b..401fbccb9c 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_initial.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_initial.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_one-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_one-invalid.png
index 02fc838eb3..fdbf14aadd 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_one-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_one-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_two-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_two-invalid.png
index 75d9c1c116..e5678f3ce2 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_two-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___chameleon_two-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_initial.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_initial.png
index 3df37176bf..7e3ac41199 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_initial.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_initial.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_one-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_one-invalid.png
index b4b97b7973..683a61ce16 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_one-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_one-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_two-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_two-invalid.png
index 62bcddd015..6bb07a7f24 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_two-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___reindeer_two-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_initial.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_initial.png
index 3222806bd9..5531710a85 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_initial.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_initial.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_one-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_one-invalid.png
index e16992d48c..888c312334 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_one-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_one-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_two-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_two-invalid.png
index 70a8d73b6a..e408ceceeb 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_two-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___runo_two-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_initial.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_initial.png
index 8b0d99132e..305ad2ba3c 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_initial.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_initial.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_one-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_one-invalid.png
index 85d1e6a6a5..edd65b0bc5 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_one-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_one-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_two-invalid.png b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_two-invalid.png
index ad1e8923ae..fac1139352 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_two-invalid.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-editor_ANY_Firefox___valo_two-invalid.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___base_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___base_basic.png
index ef878fc72e..c43ebaa889 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___base_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___base_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___chameleon_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___chameleon_basic.png
index f658e14393..e38f295757 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___chameleon_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___chameleon_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___reindeer_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___reindeer_basic.png
index 6c62fae200..07461b71a7 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___reindeer_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___reindeer_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___runo_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___runo_basic.png
index 837dfe01a7..1c98afddbf 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___runo_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___runo_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___valo_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___valo_basic.png
index bba4fce600..7a7bb74b2b 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___valo_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-grid_ANY_Firefox___valo_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_additional-header.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_additional-header.png
index 7c8430b2a7..2d8bb77f27 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_additional-header.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_additional-header.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_basic.png
index f73e25eade..1c55b83e5e 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_sorted-age.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_sorted-age.png
index 118d4fcac6..2f7d3be22b 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_sorted-age.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_sorted-age.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_sorted-last-name.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_sorted-last-name.png
index 8409551e0e..d2261d7522 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_sorted-last-name.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___base_sorted-last-name.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_additional-header.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_additional-header.png
index 7ebd1a2aa5..d31e5f7a6c 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_additional-header.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_additional-header.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_basic.png
index 2e5f93831e..5a13d5e683 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_sorted-age.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_sorted-age.png
index 077e25b702..3f7d4360ee 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_sorted-age.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_sorted-age.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_sorted-last-name.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_sorted-last-name.png
index 41491e6835..cea3b9de6d 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_sorted-last-name.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___chameleon_sorted-last-name.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_additional-header.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_additional-header.png
index fab4498813..fc3527067e 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_additional-header.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_additional-header.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_basic.png
index 1de047d220..7436225ed8 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_sorted-age.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_sorted-age.png
index ff58913558..37de777e95 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_sorted-age.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_sorted-age.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_sorted-last-name.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_sorted-last-name.png
index 48a03eba50..90e71e72e3 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_sorted-last-name.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___reindeer_sorted-last-name.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_additional-header.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_additional-header.png
index 98abb2482e..a2f149223d 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_additional-header.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_additional-header.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_basic.png
index 0c60559671..f224296cf4 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_sorted-age.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_sorted-age.png
index 462f6131d7..b69abdb1b8 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_sorted-age.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_sorted-age.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_sorted-last-name.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_sorted-last-name.png
index 1a7cebc72d..74fdbb84c7 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_sorted-last-name.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___runo_sorted-last-name.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_additional-header.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_additional-header.png
index b396a1d034..f48e651301 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_additional-header.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_additional-header.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_basic.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_basic.png
index acccf2cbd6..0d94840fc1 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_basic.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_basic.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_sorted-age.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_sorted-age.png
index 8fa2bc7670..d42d370a81 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_sorted-age.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_sorted-age.png
diff --git a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_sorted-last-name.png b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_sorted-last-name.png
index 6f2166b489..28bbbad0ef 100644
--- a/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_sorted-last-name.png
+++ b/uitest/reference-screenshots/firefox/GridThemeUITest-headerAndFooter_ANY_Firefox___valo_sorted-last-name.png
diff --git a/uitest/reference-screenshots/firefox/ProgressBarStaticRunoTest-compareScreenshot_ANY_Firefox__screen.png b/uitest/reference-screenshots/firefox/ProgressBarStaticRunoTest-compareScreenshot_ANY_Firefox__screen.png
index 56ab3a425d..e02aa4dabb 100644
--- a/uitest/reference-screenshots/firefox/ProgressBarStaticRunoTest-compareScreenshot_ANY_Firefox__screen.png
+++ b/uitest/reference-screenshots/firefox/ProgressBarStaticRunoTest-compareScreenshot_ANY_Firefox__screen.png
diff --git a/uitest/reference-screenshots/firefox/ProgressBarStaticRunoTest-compareScreenshot_ANY_Firefox__screen_1.png b/uitest/reference-screenshots/firefox/ProgressBarStaticRunoTest-compareScreenshot_ANY_Firefox__screen_1.png
new file mode 100644
index 0000000000..56ab3a425d
--- /dev/null
+++ b/uitest/reference-screenshots/firefox/ProgressBarStaticRunoTest-compareScreenshot_ANY_Firefox__screen_1.png
diff --git a/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__labels.png b/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__labels.png
index ac05090981..ea1d5a3022 100644
--- a/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__labels.png
+++ b/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__labels.png
diff --git a/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__labels_1.png b/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__labels_1.png
new file mode 100644
index 0000000000..ac05090981
--- /dev/null
+++ b/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__labels_1.png
diff --git a/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__textfields.png b/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__textfields.png
index 93477a92c5..9296593d88 100644
--- a/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__textfields.png
+++ b/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__textfields.png
diff --git a/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__uploads.png b/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__uploads.png
index 012e66382c..98a0f9dded 100644
--- a/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__uploads.png
+++ b/uitest/reference-screenshots/firefox/ReindeerThemeTest-testTheme_ANY_Firefox__uploads.png
diff --git a/uitest/reference-screenshots/firefox/ResponsiveStylesTest-testValoMenuResponsiveHover_ANY_Firefox__expandedMenu.png b/uitest/reference-screenshots/firefox/ResponsiveStylesTest-testValoMenuResponsiveHover_ANY_Firefox__expandedMenu.png
index 86038e39cb..e9aeb3383d 100644
--- a/uitest/reference-screenshots/firefox/ResponsiveStylesTest-testValoMenuResponsiveHover_ANY_Firefox__expandedMenu.png
+++ b/uitest/reference-screenshots/firefox/ResponsiveStylesTest-testValoMenuResponsiveHover_ANY_Firefox__expandedMenu.png
diff --git a/uitest/reference-screenshots/firefox/ResponsiveStylesTest-testValoMenuResponsiveHover_ANY_Firefox__expandedMenu_1.png b/uitest/reference-screenshots/firefox/ResponsiveStylesTest-testValoMenuResponsiveHover_ANY_Firefox__expandedMenu_1.png
new file mode 100644
index 0000000000..f9a9e12970
--- /dev/null
+++ b/uitest/reference-screenshots/firefox/ResponsiveStylesTest-testValoMenuResponsiveHover_ANY_Firefox__expandedMenu_1.png
diff --git a/uitest/reference-screenshots/firefox/RunoThemeTest-testTheme_ANY_Firefox__labels_1.png b/uitest/reference-screenshots/firefox/RunoThemeTest-testTheme_ANY_Firefox__labels_1.png
new file mode 100644
index 0000000000..14efa57d14
--- /dev/null
+++ b/uitest/reference-screenshots/firefox/RunoThemeTest-testTheme_ANY_Firefox__labels_1.png
diff --git a/uitest/reference-screenshots/firefox/RunoThemeTest-testTheme_ANY_Firefox__textfields.png b/uitest/reference-screenshots/firefox/RunoThemeTest-testTheme_ANY_Firefox__textfields.png
index 92a921a4fa..d7c6e5de41 100644
--- a/uitest/reference-screenshots/firefox/RunoThemeTest-testTheme_ANY_Firefox__textfields.png
+++ b/uitest/reference-screenshots/firefox/RunoThemeTest-testTheme_ANY_Firefox__textfields.png
diff --git a/uitest/reference-screenshots/firefox/TableContextMenuAndIconsTest-tableContextMenuWithIcons_ANY_Firefox__large-icon.png b/uitest/reference-screenshots/firefox/TableContextMenuAndIconsTest-tableContextMenuWithIcons_ANY_Firefox__large-icon.png
index 12a5a6ed3a..629e084ebe 100644
--- a/uitest/reference-screenshots/firefox/TableContextMenuAndIconsTest-tableContextMenuWithIcons_ANY_Firefox__large-icon.png
+++ b/uitest/reference-screenshots/firefox/TableContextMenuAndIconsTest-tableContextMenuWithIcons_ANY_Firefox__large-icon.png
diff --git a/uitest/reference-screenshots/firefox/VaadinIconSetTest-checkScreenshot_changeIcon_ANY_Firefox__allVaadinIcons-switch.png b/uitest/reference-screenshots/firefox/VaadinIconSetTest-checkScreenshot_changeIcon_ANY_Firefox__allVaadinIcons-switch.png
index 9b1942bb14..c0ba7c27fe 100644
--- a/uitest/reference-screenshots/firefox/VaadinIconSetTest-checkScreenshot_changeIcon_ANY_Firefox__allVaadinIcons-switch.png
+++ b/uitest/reference-screenshots/firefox/VaadinIconSetTest-checkScreenshot_changeIcon_ANY_Firefox__allVaadinIcons-switch.png
diff --git a/uitest/reference-screenshots/firefox/VaadinIconSetTest-checkScreenshot_initial_ANY_Firefox__allVaadinIcons.png b/uitest/reference-screenshots/firefox/VaadinIconSetTest-checkScreenshot_initial_ANY_Firefox__allVaadinIcons.png
index 0979a7ec90..776a8de856 100644
--- a/uitest/reference-screenshots/firefox/VaadinIconSetTest-checkScreenshot_initial_ANY_Firefox__allVaadinIcons.png
+++ b/uitest/reference-screenshots/firefox/VaadinIconSetTest-checkScreenshot_initial_ANY_Firefox__allVaadinIcons.png
diff --git a/uitest/reference-screenshots/firefox/ValoThemeUITest-buttonsLinks_ANY_Firefox__buttonsLinks_with_disabled.png b/uitest/reference-screenshots/firefox/ValoThemeUITest-buttonsLinks_ANY_Firefox__buttonsLinks_with_disabled.png
index 2ef5f547ab..4f8a1892ea 100644
--- a/uitest/reference-screenshots/firefox/ValoThemeUITest-buttonsLinks_ANY_Firefox__buttonsLinks_with_disabled.png
+++ b/uitest/reference-screenshots/firefox/ValoThemeUITest-buttonsLinks_ANY_Firefox__buttonsLinks_with_disabled.png
diff --git a/uitest/reference-screenshots/firefox/ValoThemeUITest-common_ANY_Firefox__common.png b/uitest/reference-screenshots/firefox/ValoThemeUITest-common_ANY_Firefox__common.png
index 949b82c8ef..d761507eb2 100644
--- a/uitest/reference-screenshots/firefox/ValoThemeUITest-common_ANY_Firefox__common.png
+++ b/uitest/reference-screenshots/firefox/ValoThemeUITest-common_ANY_Firefox__common.png
diff --git a/uitest/reference-screenshots/firefox/ValoThemeUITest-textFields_ANY_Firefox__textFields.png b/uitest/reference-screenshots/firefox/ValoThemeUITest-textFields_ANY_Firefox__textFields.png
index e331ec964d..7b5125ff40 100644
--- a/uitest/reference-screenshots/firefox/ValoThemeUITest-textFields_ANY_Firefox__textFields.png
+++ b/uitest/reference-screenshots/firefox/ValoThemeUITest-textFields_ANY_Firefox__textFields.png
diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
index 1d668a289a..4a83e78ddd 100644
--- a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -25,10 +25,10 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
             // Chrome version does not necessarily match the desired version
             // because of auto updates...
             browserIdentifier = getExpectedUserAgentString(
-                    getDesiredCapabilities()) + "89";
+                    getDesiredCapabilities()) + "90";
         } else if (BrowserUtil.isFirefox(getDesiredCapabilities())) {
             browserIdentifier = getExpectedUserAgentString(
-                    getDesiredCapabilities()) + "81";
+                    getDesiredCapabilities()) + "88";
         } else {
             browserIdentifier = getExpectedUserAgentString(desiredCapabilities)
                     + desiredCapabilities.getVersion();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
index bdaaf56d4c..63ab353d81 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
@@ -62,7 +62,7 @@ public class GridResizeHiddenColumnTest extends MultiBrowserTest {
         // Click on "Last Name" menu item
         action.click(visibilityToggle).perform();
         waitUntilLoadingIndicatorNotVisible();
-        sleep(100); // wait for layouting
+        sleep(200); // wait for layouting
 
         // Check if column "Last Name" is visible
         headerCells = grid.getHeaderCells(0);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
index a88fc47f6d..1824ba086b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
@@ -18,14 +18,23 @@ public class MenuBarNavigationMouseTest extends MultiBrowserTest {
     public void testMenuBarMouseNavigation() throws Exception {
         openTestURL();
         MenuBarElement menuBar = $(MenuBarElement.class).first();
-        menuBar.clickItem("File", "Export..", "As PDF...");
+
+        // clicks separated to different calls for more informative errors
+        menuBar.clickItem("File");
+        menuBar.clickItem("Export..");
+        menuBar.clickItem("As PDF...");
         assertEquals("1. MenuItem File/Export../As PDF... selected",
                 getLogRow(0));
-        menuBar.clickItem("Edit", "Copy");
+
+        menuBar.clickItem("Edit");
+        menuBar.clickItem("Copy");
         assertEquals("2. MenuItem Edit/Copy selected", getLogRow(0));
+
         menuBar.clickItem("Help");
         assertEquals("3. MenuItem Help selected", getLogRow(0));
-        menuBar.clickItem("File", "Exit");
+
+        menuBar.clickItem("File");
+        menuBar.clickItem("Exit");
         assertEquals("4. MenuItem File/Exit selected", getLogRow(0));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java
index 4881f1b98c..ccb5f10df2 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java
@@ -82,7 +82,7 @@ public class GridThemeUITest extends MultiBrowserThemeTest {
     private void selectPage(String string) {
         $(NativeSelectElement.class).id("page").selectByText(string);
         grid = $(GridElement.class).first();
-
+        waitUntilLoadingIndicatorNotVisible();
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java
index 0ddf80e2e0..094a0bb4d1 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java
@@ -3,6 +3,7 @@ package com.vaadin.v7.tests.components.grid.basicfeatures.server;
 import java.io.IOException;
 
 import org.junit.Test;
+import org.openqa.selenium.By;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
@@ -27,9 +28,12 @@ public class GridSidebarThemeTest extends GridBasicFeaturesTest {
 
     private void runTestSequence(String theme) throws IOException {
         openTestURL("theme=" + theme);
+        waitUntilLoadingIndicatorNotVisible();
 
         compareScreen(theme + "-SidebarClosed");
         getSidebarOpenButton().click();
+        waitForElementPresent(By.className("v-grid-sidebar-content"));
+        sleep(100); // wait for animations to finish
 
         compareScreen(theme + "-SidebarOpen");
 
@@ -55,6 +59,7 @@ public class GridSidebarThemeTest extends GridBasicFeaturesTest {
         compareScreen(theme + "-OnMouseOverHiddenToggle");
 
         getSidebarOpenButton().click();
+        waitForElementNotPresent(By.className("v-grid-sidebar-content"));
 
         compareScreen(theme + "-SidebarClosed2");
     }