381 files changed, 49 insertions, 428 deletions

diff --git a/bom/pom.xml b/bom/pom.xml
index 1a86838570..85113573c1 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -18,7 +18,7 @@
 
     <properties>
         <vaadin.spring.version>3.0.0</vaadin.spring.version>
-        <vaadin.testbench.version>5.1.1</vaadin.testbench.version>
+        <vaadin.testbench.version>5.1.2</vaadin.testbench.version>
         <vaadin.cdi.version>3.0.0</vaadin.cdi.version>
         <vaadin.context-menu.version>2.0.0</vaadin.context-menu.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index 93c01248b8..6695fd12f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <sonar.issuesReport.html.enable>true</sonar.issuesReport.html.enable>
 
         <vaadin.icons.version>3.0.1</vaadin.icons.version>
-        <vaadin.testbench.version>5.1.1</vaadin.testbench.version>
+        <vaadin.testbench.version>5.1.2</vaadin.testbench.version>
     </properties>
 
     <pluginRepositories>
diff --git a/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_ANY_Chrome__TableTooManyColumnsTest-testDropdownTable.png b/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_ANY_Chrome__init.png
index df895a3082..df895a3082 100755
--- a/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_ANY_Chrome__TableTooManyColumnsTest-testDropdownTable.png
+++ b/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_ANY_Chrome__init.png
diff --git a/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_ANY_Firefox__TableTooManyColumnsTest-testDropdownTable.png b/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_ANY_Firefox__init.png
index f23bbc3059..f23bbc3059 100644
--- a/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_ANY_Firefox__TableTooManyColumnsTest-testDropdownTable.png
+++ b/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_ANY_Firefox__init.png
diff --git a/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_Windows_InternetExplorer_11_TableTooManyColumnsTest-testDropdownTable.png b/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_Windows_InternetExplorer_11_init.png
index f7534f7cd7..f7534f7cd7 100755
--- a/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_Windows_InternetExplorer_11_TableTooManyColumnsTest-testDropdownTable.png
+++ b/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_Windows_InternetExplorer_11_init.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__base_default.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___base_default.png
index f6f1a3f67b..f6f1a3f67b 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__base_default.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___base_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__base_html.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___base_html.png
index 7c75c85e73..7c75c85e73 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__base_html.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___base_html.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__chameleon_default.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___chameleon_default.png
index a2f820871c..a2f820871c 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__chameleon_default.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___chameleon_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__chameleon_html.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___chameleon_html.png
index 3bb6f86c5f..3bb6f86c5f 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__chameleon_html.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___chameleon_html.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__reindeer_default.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___reindeer_default.png
index 41e1ab3753..41e1ab3753 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__reindeer_default.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___reindeer_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__reindeer_html.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___reindeer_html.png
index 2852790904..2852790904 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__reindeer_html.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___reindeer_html.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__runo_default.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___runo_default.png
index fe3ff45dec..fe3ff45dec 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__runo_default.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___runo_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__runo_html.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___runo_html.png
index 7dcb669b82..7dcb669b82 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__runo_html.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___runo_html.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__valo_default.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___valo_default.png
index 2eade6a8c5..2eade6a8c5 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__valo_default.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___valo_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__valo_html.png b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___valo_html.png
index 5b1a8e8c98..5b1a8e8c98 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome__valo_html.png
+++ b/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_ANY_Chrome___valo_html.png
diff --git a/uitest/reference-screenshots/UploadTitleWithTooltipTest-testDropdownTable_ANY_Chrome__UploadTitleWithTooltipTest-testDropdownTable.png b/uitest/reference-screenshots/UploadTitleWithTooltipTest-testDropdownTable_ANY_Chrome__init.png
index 9e6492e3dc..9e6492e3dc 100755
--- a/uitest/reference-screenshots/UploadTitleWithTooltipTest-testDropdownTable_ANY_Chrome__UploadTitleWithTooltipTest-testDropdownTable.png
+++ b/uitest/reference-screenshots/UploadTitleWithTooltipTest-testDropdownTable_ANY_Chrome__init.png
diff --git a/uitest/reference-screenshots/AccordionClipsContentTest-testAccordionClipsContent_LINUX_PhantomJS_1_button-clicked.png b/uitest/reference-screenshots/phantomjs/AccordionClipsContentTest-testAccordionClipsContent_LINUX_PhantomJS_1_button-clicked.png
index 61f5cc2b9b..61f5cc2b9b 100755
--- a/uitest/reference-screenshots/AccordionClipsContentTest-testAccordionClipsContent_LINUX_PhantomJS_1_button-clicked.png
+++ b/uitest/reference-screenshots/phantomjs/AccordionClipsContentTest-testAccordionClipsContent_LINUX_PhantomJS_1_button-clicked.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
index f1535cd15c..f1535cd15c 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
index a77875a4f9..a77875a4f9 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
index 9ccf7e5854..9ccf7e5854 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
index 3a10b81720..3a10b81720 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
index c3f0f1061a..c3f0f1061a 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
index e573ed5a05..e573ed5a05 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
index 6977d83a46..6977d83a46 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
index 944a0339dd..944a0339dd 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_forms.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
index 31aef7b9ba..31aef7b9ba 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_labels.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
index 089db96b96..089db96b96 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
index 3579918ad9..3579918ad9 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
index 05a6e2e63a..05a6e2e63a 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
index 4d099e7837..4d099e7837 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
index 61023fd8e7..61023fd8e7 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
index a3bfee7668..a3bfee7668 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
index 11e8f3ea70..11e8f3ea70 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
index dbaee6c17c..dbaee6c17c 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
index 4bcc721279..4bcc721279 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
index d5422c3c04..d5422c3c04 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
index 0f15a4cd47..0f15a4cd47 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
index 6ee29f2d5b..6ee29f2d5b 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
index 771e9252c9..771e9252c9 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
index e1909b8398..e1909b8398 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
index 71bb700889..71bb700889 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
index 539ff25f6e..539ff25f6e 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
index c8372871ba..c8372871ba 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
index 6b2a25217f..6b2a25217f 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
index b247ae776c..b247ae776c 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_trees.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
index 6eac39d115..6eac39d115 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
index c41044bfa6..c41044bfa6 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
diff --git a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
index 5d8394aabe..5d8394aabe 100755
--- a/uitest/reference-screenshots/BaseThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
+++ b/uitest/reference-screenshots/phantomjs/BaseThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
diff --git a/uitest/reference-screenshots/BasicCrudGridEditorRowTest-lookAndFeel_LINUX_PhantomJS_1_editorrow.png b/uitest/reference-screenshots/phantomjs/BasicCrudGridEditorRowTest-lookAndFeel_LINUX_PhantomJS_1_editorrow.png
index 611f8de419..611f8de419 100644
--- a/uitest/reference-screenshots/BasicCrudGridEditorRowTest-lookAndFeel_LINUX_PhantomJS_1_editorrow.png
+++ b/uitest/reference-screenshots/phantomjs/BasicCrudGridEditorRowTest-lookAndFeel_LINUX_PhantomJS_1_editorrow.png
diff --git a/uitest/reference-screenshots/BasicCrudGridEditorRowTest-lookAndFeel_LINUX_PhantomJS_1_grid.png b/uitest/reference-screenshots/phantomjs/BasicCrudGridEditorRowTest-lookAndFeel_LINUX_PhantomJS_1_grid.png
index 254b8f34cc..254b8f34cc 100644
--- a/uitest/reference-screenshots/BasicCrudGridEditorRowTest-lookAndFeel_LINUX_PhantomJS_1_grid.png
+++ b/uitest/reference-screenshots/phantomjs/BasicCrudGridEditorRowTest-lookAndFeel_LINUX_PhantomJS_1_grid.png
diff --git a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_critical.png b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_critical.png
index 80ac237178..80ac237178 100644
--- a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_critical.png
+++ b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_critical.png
diff --git a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_error.png b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_error.png
index 76b20f1e50..76b20f1e50 100644
--- a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_error.png
+++ b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_error.png
diff --git a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_info.png b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_info.png
index 502fda77f5..502fda77f5 100644
--- a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_info.png
+++ b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_info.png
diff --git a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_system.png b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_system.png
index 1723241a1e..1723241a1e 100644
--- a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_system.png
+++ b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_system.png
diff --git a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_warning.png b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_warning.png
index 91cf131995..91cf131995 100644
--- a/uitest/reference-screenshots/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_warning.png
+++ b/uitest/reference-screenshots/phantomjs/BinderValidatorErrorLevelTest-testErrorLevelStyleNames_LINUX_PhantomJS_1_warning.png
diff --git a/uitest/reference-screenshots/BottomComponentScrollsUpTest-windowScrollTest_LINUX_PhantomJS_1_window.png b/uitest/reference-screenshots/phantomjs/BottomComponentScrollsUpTest-windowScrollTest_LINUX_PhantomJS_1_window.png
index 3f87eedd11..3f87eedd11 100644
--- a/uitest/reference-screenshots/BottomComponentScrollsUpTest-windowScrollTest_LINUX_PhantomJS_1_window.png
+++ b/uitest/reference-screenshots/phantomjs/BottomComponentScrollsUpTest-windowScrollTest_LINUX_PhantomJS_1_window.png
diff --git a/uitest/reference-screenshots/BrowserFrameDoubleScrollbarsTest-testWindowRepositioning_LINUX_PhantomJS_1_BrowserFrameDoubleScrollbars.png b/uitest/reference-screenshots/phantomjs/BrowserFrameDoubleScrollbarsTest-testWindowRepositioning_LINUX_PhantomJS_1_BrowserFrameDoubleScrollbars.png
index 66c785554c..66c785554c 100755
--- a/uitest/reference-screenshots/BrowserFrameDoubleScrollbarsTest-testWindowRepositioning_LINUX_PhantomJS_1_BrowserFrameDoubleScrollbars.png
+++ b/uitest/reference-screenshots/phantomjs/BrowserFrameDoubleScrollbarsTest-testWindowRepositioning_LINUX_PhantomJS_1_BrowserFrameDoubleScrollbars.png
diff --git a/uitest/reference-screenshots/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_alternative_text.png b/uitest/reference-screenshots/phantomjs/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_alternative_text.png
index df9a270e99..df9a270e99 100644
--- a/uitest/reference-screenshots/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_alternative_text.png
+++ b/uitest/reference-screenshots/phantomjs/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_alternative_text.png
diff --git a/uitest/reference-screenshots/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_hello.png b/uitest/reference-screenshots/phantomjs/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_hello.png
index b85ee248fa..b85ee248fa 100755
--- a/uitest/reference-screenshots/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_hello.png
+++ b/uitest/reference-screenshots/phantomjs/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_hello.png
diff --git a/uitest/reference-screenshots/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_initial.png b/uitest/reference-screenshots/phantomjs/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_initial.png
index 996c3433ae..996c3433ae 100755
--- a/uitest/reference-screenshots/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_initial.png
+++ b/uitest/reference-screenshots/phantomjs/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_initial.png
diff --git a/uitest/reference-screenshots/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_lorem.png b/uitest/reference-screenshots/phantomjs/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_lorem.png
index 0802089c76..0802089c76 100755
--- a/uitest/reference-screenshots/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_lorem.png
+++ b/uitest/reference-screenshots/phantomjs/BrowserFrameIsVisibleTest-testBrowserFrameDisplaysFiles_LINUX_PhantomJS_1_show_lorem.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
index 1bdb22e9ee..1bdb22e9ee 100755
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
index 8bbc717fa7..8bbc717fa7 100755
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
index e726f3a652..e726f3a652 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
index 66e0857b2a..66e0857b2a 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
index 372caf35ba..372caf35ba 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
index e29d80bff6..e29d80bff6 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
index 1f0cb814f1..1f0cb814f1 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
index 2cf92e4693..2cf92e4693 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_forms.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
index edd1118e59..edd1118e59 100755
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_labels.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
index a9ddfa24fd..a9ddfa24fd 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
index 867964a1e5..867964a1e5 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
index 2a811b594a..2a811b594a 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
index 01a9e0812b..01a9e0812b 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
index c36e80d8d1..c36e80d8d1 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
index 500a673692..500a673692 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
index 667a846964..667a846964 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
index 586562995d..586562995d 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
index 4a4c00ee0a..4a4c00ee0a 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
index a0331e313a..a0331e313a 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
index e0b4365f0c..e0b4365f0c 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
index 2d51bed567..2d51bed567 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
index 96ebb0af49..96ebb0af49 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
index 9b3faf3cd4..9b3faf3cd4 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-opaque.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-opaque.png
index 9b3faf3cd4..9b3faf3cd4 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-opaque.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-opaque.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
index db394788d9..db394788d9 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
index 7c9df65a47..7c9df65a47 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
index 40369b623e..40369b623e 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
index 9664a9552b..9664a9552b 100755
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
index 2f1f43ebeb..2f1f43ebeb 100755
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_trees.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
index 6f8709f927..6f8709f927 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
index 0226c0fcbb..0226c0fcbb 100644
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
diff --git a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
index 80f1f58e47..80f1f58e47 100755
--- a/uitest/reference-screenshots/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
+++ b/uitest/reference-screenshots/phantomjs/ChameleonThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
diff --git a/uitest/reference-screenshots/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col1-col2-col3.png b/uitest/reference-screenshots/phantomjs/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col1-col2-col3.png
index 47d9f0bb0d..47d9f0bb0d 100644
--- a/uitest/reference-screenshots/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col1-col2-col3.png
+++ b/uitest/reference-screenshots/phantomjs/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col1-col2-col3.png
diff --git a/uitest/reference-screenshots/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col1-col3.png b/uitest/reference-screenshots/phantomjs/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col1-col3.png
index 2f130c8647..2f130c8647 100644
--- a/uitest/reference-screenshots/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col1-col3.png
+++ b/uitest/reference-screenshots/phantomjs/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col1-col3.png
diff --git a/uitest/reference-screenshots/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col2-col3.png b/uitest/reference-screenshots/phantomjs/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col2-col3.png
index 03425135d4..03425135d4 100644
--- a/uitest/reference-screenshots/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col2-col3.png
+++ b/uitest/reference-screenshots/phantomjs/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col2-col3.png
diff --git a/uitest/reference-screenshots/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col3.png b/uitest/reference-screenshots/phantomjs/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col3.png
index c76e41061c..c76e41061c 100644
--- a/uitest/reference-screenshots/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col3.png
+++ b/uitest/reference-screenshots/phantomjs/ColumnCollapsingAndColumnExpansionTest-expandCorrectlyAfterCollapse_LINUX_PhantomJS_1_col3.png
diff --git a/uitest/reference-screenshots/ComboBoxBorderTest-testComboBoxArrow_LINUX_PhantomJS_1_arrow.png b/uitest/reference-screenshots/phantomjs/ComboBoxBorderTest-testComboBoxArrow_LINUX_PhantomJS_1_arrow.png
index b239ee0dea..b239ee0dea 100755
--- a/uitest/reference-screenshots/ComboBoxBorderTest-testComboBoxArrow_LINUX_PhantomJS_1_arrow.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxBorderTest-testComboBoxArrow_LINUX_PhantomJS_1_arrow.png
diff --git a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_classresource.png b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_classresource.png
index a957fabd40..a957fabd40 100644
--- a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_classresource.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_classresource.png
diff --git a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_fi-au-selected.png b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_fi-au-selected.png
index c00d0a0191..c00d0a0191 100644
--- a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_fi-au-selected.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_fi-au-selected.png
diff --git a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_fi-hu-selected.png b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_fi-hu-selected.png
index 8161a0b13e..8161a0b13e 100644
--- a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_fi-hu-selected.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_fi-hu-selected.png
diff --git a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_first-combobox-open.png b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_first-combobox-open.png
index 2bdd53efd9..2bdd53efd9 100644
--- a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_first-combobox-open.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_first-combobox-open.png
diff --git a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_second-combobox-open.png b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_second-combobox-open.png
index 77e2d83f96..77e2d83f96 100644
--- a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_second-combobox-open.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_second-combobox-open.png
diff --git a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_third-combobox-open.png b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_third-combobox-open.png
index 6e8d972046..6e8d972046 100644
--- a/uitest/reference-screenshots/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_third-combobox-open.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxItemIconTest-testIconsInComboBox_LINUX_PhantomJS_1_third-combobox-open.png
diff --git a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-page1.png b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-page1.png
index 0d08ab4740..0d08ab4740 100755
--- a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-page1.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-page1.png
diff --git a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-page2.png b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-page2.png
index 72c6a58a92..72c6a58a92 100755
--- a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-page2.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-page2.png
diff --git a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-selected-1-3-5-9.png b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-selected-1-3-5-9.png
index f67ac58c68..f67ac58c68 100755
--- a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-selected-1-3-5-9.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-16x16-selected-1-3-5-9.png
diff --git a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-32x32-page2.png b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-32x32-page2.png
index 763c76f369..763c76f369 100755
--- a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-32x32-page2.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-32x32-page2.png
diff --git a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-64x64-page1-highlight-first.png b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-64x64-page1-highlight-first.png
index a1b01cc99a..a1b01cc99a 100755
--- a/uitest/reference-screenshots/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-64x64-page1-highlight-first.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxLargeIconsTest-testComboBoxIcons_LINUX_PhantomJS_1_icons-64x64-page1-highlight-first.png
diff --git a/uitest/reference-screenshots/ComboBoxVaadinIconsTest-testComboBoxIconRendering_LINUX_PhantomJS_1_paperplane.png b/uitest/reference-screenshots/phantomjs/ComboBoxVaadinIconsTest-testComboBoxIconRendering_LINUX_PhantomJS_1_paperplane.png
index 943f3b7501..943f3b7501 100644
--- a/uitest/reference-screenshots/ComboBoxVaadinIconsTest-testComboBoxIconRendering_LINUX_PhantomJS_1_paperplane.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxVaadinIconsTest-testComboBoxIconRendering_LINUX_PhantomJS_1_paperplane.png
diff --git a/uitest/reference-screenshots/ComboBoxVaadinIconsTest-testComboBoxIconRendering_LINUX_PhantomJS_1_popup.png b/uitest/reference-screenshots/phantomjs/ComboBoxVaadinIconsTest-testComboBoxIconRendering_LINUX_PhantomJS_1_popup.png
index 1114dc791f..1114dc791f 100644
--- a/uitest/reference-screenshots/ComboBoxVaadinIconsTest-testComboBoxIconRendering_LINUX_PhantomJS_1_popup.png
+++ b/uitest/reference-screenshots/phantomjs/ComboBoxVaadinIconsTest-testComboBoxIconRendering_LINUX_PhantomJS_1_popup.png
diff --git a/uitest/reference-screenshots/ComboboxScrollableWindowTest-testWindowScrollbars_LINUX_PhantomJS_1_combobox-open.png b/uitest/reference-screenshots/phantomjs/ComboboxScrollableWindowTest-testWindowScrollbars_LINUX_PhantomJS_1_combobox-open.png
index 612af88ed5..612af88ed5 100644
--- a/uitest/reference-screenshots/ComboboxScrollableWindowTest-testWindowScrollbars_LINUX_PhantomJS_1_combobox-open.png
+++ b/uitest/reference-screenshots/phantomjs/ComboboxScrollableWindowTest-testWindowScrollbars_LINUX_PhantomJS_1_combobox-open.png
diff --git a/uitest/reference-screenshots/ComboboxSelectedItemTextTest-testComboboxNonEditable_LINUX_PhantomJS_1_LongComboboxItemSelectedNonEditable.png b/uitest/reference-screenshots/phantomjs/ComboboxSelectedItemTextTest-testComboboxNonEditable_LINUX_PhantomJS_1_LongComboboxItemSelectedNonEditable.png
index 021ed4eb0c..021ed4eb0c 100644
--- a/uitest/reference-screenshots/ComboboxSelectedItemTextTest-testComboboxNonEditable_LINUX_PhantomJS_1_LongComboboxItemSelectedNonEditable.png
+++ b/uitest/reference-screenshots/phantomjs/ComboboxSelectedItemTextTest-testComboboxNonEditable_LINUX_PhantomJS_1_LongComboboxItemSelectedNonEditable.png
diff --git a/uitest/reference-screenshots/ComboboxSelectedItemTextTest-testCombobox_LINUX_PhantomJS_1_LongComboboxItemSelectedEditable.png b/uitest/reference-screenshots/phantomjs/ComboboxSelectedItemTextTest-testCombobox_LINUX_PhantomJS_1_LongComboboxItemSelectedEditable.png
index 6f87abf6a4..6f87abf6a4 100644
--- a/uitest/reference-screenshots/ComboboxSelectedItemTextTest-testCombobox_LINUX_PhantomJS_1_LongComboboxItemSelectedEditable.png
+++ b/uitest/reference-screenshots/phantomjs/ComboboxSelectedItemTextTest-testCombobox_LINUX_PhantomJS_1_LongComboboxItemSelectedEditable.png
diff --git a/uitest/reference-screenshots/CustomFieldSizeTest-checkScreenshot_LINUX_PhantomJS_1_size.png b/uitest/reference-screenshots/phantomjs/CustomFieldSizeTest-checkScreenshot_LINUX_PhantomJS_1_size.png
index 99ac36e4f4..99ac36e4f4 100644
--- a/uitest/reference-screenshots/CustomFieldSizeTest-checkScreenshot_LINUX_PhantomJS_1_size.png
+++ b/uitest/reference-screenshots/phantomjs/CustomFieldSizeTest-checkScreenshot_LINUX_PhantomJS_1_size.png
diff --git a/uitest/reference-screenshots/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_initial-date.png b/uitest/reference-screenshots/phantomjs/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_initial-date.png
index 2df7757550..2df7757550 100644
--- a/uitest/reference-screenshots/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_initial-date.png
+++ b/uitest/reference-screenshots/phantomjs/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_initial-date.png
diff --git a/uitest/reference-screenshots/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readonly-date.png b/uitest/reference-screenshots/phantomjs/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readonly-date.png
index 2df7757550..2df7757550 100644
--- a/uitest/reference-screenshots/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readonly-date.png
+++ b/uitest/reference-screenshots/phantomjs/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readonly-date.png
diff --git a/uitest/reference-screenshots/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readwrite-popup-date.png b/uitest/reference-screenshots/phantomjs/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readwrite-popup-date.png
index 81dc1e3459..81dc1e3459 100644
--- a/uitest/reference-screenshots/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readwrite-popup-date.png
+++ b/uitest/reference-screenshots/phantomjs/DateFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readwrite-popup-date.png
diff --git a/uitest/reference-screenshots/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_initial-date.png b/uitest/reference-screenshots/phantomjs/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_initial-date.png
index 29cc972d51..29cc972d51 100644
--- a/uitest/reference-screenshots/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_initial-date.png
+++ b/uitest/reference-screenshots/phantomjs/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_initial-date.png
diff --git a/uitest/reference-screenshots/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readonly-date.png b/uitest/reference-screenshots/phantomjs/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readonly-date.png
index 29cc972d51..29cc972d51 100644
--- a/uitest/reference-screenshots/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readonly-date.png
+++ b/uitest/reference-screenshots/phantomjs/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readonly-date.png
diff --git a/uitest/reference-screenshots/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readwrite-popup-date.png b/uitest/reference-screenshots/phantomjs/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readwrite-popup-date.png
index c51903b9e1..c51903b9e1 100644
--- a/uitest/reference-screenshots/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readwrite-popup-date.png
+++ b/uitest/reference-screenshots/phantomjs/DateTimeFieldReadOnlyTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_readwrite-popup-date.png
diff --git a/uitest/reference-screenshots/DisabledMenuBarItemTest-disabledMenuItemShouldHaveOpacity_LINUX_PhantomJS_1_transparent.png b/uitest/reference-screenshots/phantomjs/DisabledMenuBarItemTest-disabledMenuItemShouldHaveOpacity_LINUX_PhantomJS_1_transparent.png
index 7281aec7f8..7281aec7f8 100644
--- a/uitest/reference-screenshots/DisabledMenuBarItemTest-disabledMenuItemShouldHaveOpacity_LINUX_PhantomJS_1_transparent.png
+++ b/uitest/reference-screenshots/phantomjs/DisabledMenuBarItemTest-disabledMenuItemShouldHaveOpacity_LINUX_PhantomJS_1_transparent.png
diff --git a/uitest/reference-screenshots/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeCOMPONENT.png b/uitest/reference-screenshots/phantomjs/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeCOMPONENT.png
index a540023d51..a540023d51 100644
--- a/uitest/reference-screenshots/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeCOMPONENT.png
+++ b/uitest/reference-screenshots/phantomjs/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeCOMPONENT.png
diff --git a/uitest/reference-screenshots/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeCOMPONENT_OTHER.png b/uitest/reference-screenshots/phantomjs/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeCOMPONENT_OTHER.png
index f5e5ec54ac..f5e5ec54ac 100644
--- a/uitest/reference-screenshots/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeCOMPONENT_OTHER.png
+++ b/uitest/reference-screenshots/phantomjs/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeCOMPONENT_OTHER.png
diff --git a/uitest/reference-screenshots/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeWRAPPER.png b/uitest/reference-screenshots/phantomjs/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeWRAPPER.png
index e880a32fdb..e880a32fdb 100644
--- a/uitest/reference-screenshots/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeWRAPPER.png
+++ b/uitest/reference-screenshots/phantomjs/DragStartModesTest-testDragStartModes_LINUX_PhantomJS_1_dragImageModeWRAPPER.png
diff --git a/uitest/reference-screenshots/EditableModeChangeTest-testNotification_LINUX_PhantomJS_1_selection.png b/uitest/reference-screenshots/phantomjs/EditableModeChangeTest-testNotification_LINUX_PhantomJS_1_selection.png
index cdaa97105c..cdaa97105c 100644
--- a/uitest/reference-screenshots/EditableModeChangeTest-testNotification_LINUX_PhantomJS_1_selection.png
+++ b/uitest/reference-screenshots/phantomjs/EditableModeChangeTest-testNotification_LINUX_PhantomJS_1_selection.png
diff --git a/uitest/reference-screenshots/EmptyTabSheetTest-emptyTabSheet_LINUX_PhantomJS_1_empty.png b/uitest/reference-screenshots/phantomjs/EmptyTabSheetTest-emptyTabSheet_LINUX_PhantomJS_1_empty.png
index d8210b1605..d8210b1605 100644
--- a/uitest/reference-screenshots/EmptyTabSheetTest-emptyTabSheet_LINUX_PhantomJS_1_empty.png
+++ b/uitest/reference-screenshots/phantomjs/EmptyTabSheetTest-emptyTabSheet_LINUX_PhantomJS_1_empty.png
diff --git a/uitest/reference-screenshots/FontIconsTest-checkScreenshot_LINUX_PhantomJS_1_allVaadinIcons.png b/uitest/reference-screenshots/phantomjs/FontIconsTest-checkScreenshot_LINUX_PhantomJS_1_allVaadinIcons.png
index b896fb6063..b896fb6063 100755
--- a/uitest/reference-screenshots/FontIconsTest-checkScreenshot_LINUX_PhantomJS_1_allVaadinIcons.png
+++ b/uitest/reference-screenshots/phantomjs/FontIconsTest-checkScreenshot_LINUX_PhantomJS_1_allVaadinIcons.png
diff --git a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-a.png b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-a.png
index 51a97e2de6..51a97e2de6 100755
--- a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-a.png
+++ b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-a.png
diff --git a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-b.png b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-b.png
index 51a97e2de6..51a97e2de6 100755
--- a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-b.png
+++ b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-b.png
diff --git a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-c.png b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-c.png
index 51a97e2de6..51a97e2de6 100755
--- a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-c.png
+++ b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col2-col3-c.png
diff --git a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col3.png b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col3.png
index e4b4a8b883..e4b4a8b883 100755
--- a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col3.png
+++ b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_footer-col1-col3.png
diff --git a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_initial.png
index 51a97e2de6..51a97e2de6 100755
--- a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_no-footer.png b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_no-footer.png
index 14598de94b..14598de94b 100755
--- a/uitest/reference-screenshots/FooterTest-testFooter_LINUX_PhantomJS_1_no-footer.png
+++ b/uitest/reference-screenshots/phantomjs/FooterTest-testFooter_LINUX_PhantomJS_1_no-footer.png
diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png
index c27e323027..c27e323027 100644
--- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png
+++ b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png
diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png
index 78f2ea07eb..78f2ea07eb 100644
--- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png
index 20949de205..20949de205 100644
--- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png
+++ b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png
diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png
index fb9af9dc82..fb9af9dc82 100644
--- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png
+++ b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png
diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png
index 1b315fc0bb..1b315fc0bb 100644
--- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png
+++ b/uitest/reference-screenshots/phantomjs/GridAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png
diff --git a/uitest/reference-screenshots/GridAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png b/uitest/reference-screenshots/phantomjs/GridAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png
index c712049346..c712049346 100755
--- a/uitest/reference-screenshots/GridAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png
+++ b/uitest/reference-screenshots/phantomjs/GridAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png
diff --git a/uitest/reference-screenshots/GridCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png b/uitest/reference-screenshots/phantomjs/GridCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png
index 560ebb46b6..560ebb46b6 100644
--- a/uitest/reference-screenshots/GridCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png
+++ b/uitest/reference-screenshots/phantomjs/GridCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png
diff --git a/uitest/reference-screenshots/GridColumnAutoWidthClientTest-testColumnsRenderCorrectly_LINUX_PhantomJS_1_grid-v8-initialRender.png b/uitest/reference-screenshots/phantomjs/GridColumnAutoWidthClientTest-testColumnsRenderCorrectly_LINUX_PhantomJS_1_grid-v8-initialRender.png
index 652490eb53..652490eb53 100755
--- a/uitest/reference-screenshots/GridColumnAutoWidthClientTest-testColumnsRenderCorrectly_LINUX_PhantomJS_1_grid-v8-initialRender.png
+++ b/uitest/reference-screenshots/phantomjs/GridColumnAutoWidthClientTest-testColumnsRenderCorrectly_LINUX_PhantomJS_1_grid-v8-initialRender.png
diff --git a/uitest/reference-screenshots/GridColumnAutoWidthServerTest-testColumnsRenderCorrectly_LINUX_PhantomJS_1_grid-v8-initialRender.png b/uitest/reference-screenshots/phantomjs/GridColumnAutoWidthServerTest-testColumnsRenderCorrectly_LINUX_PhantomJS_1_grid-v8-initialRender.png
index 4fffc31203..4fffc31203 100644
--- a/uitest/reference-screenshots/GridColumnAutoWidthServerTest-testColumnsRenderCorrectly_LINUX_PhantomJS_1_grid-v8-initialRender.png
+++ b/uitest/reference-screenshots/phantomjs/GridColumnAutoWidthServerTest-testColumnsRenderCorrectly_LINUX_PhantomJS_1_grid-v8-initialRender.png
diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png
index 7a96f2d433..7a96f2d433 100644
--- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png
index 579fc5cca2..579fc5cca2 100644
--- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png
+++ b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png
diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png
index 474273682c..474273682c 100644
--- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png
+++ b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png
diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png
index b6c593c7dd..b6c593c7dd 100644
--- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png
+++ b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png
diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png
index a0842df28e..a0842df28e 100644
--- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png
+++ b/uitest/reference-screenshots/phantomjs/GridComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png
diff --git a/uitest/reference-screenshots/GridDisabledTest-disabledGrid_LINUX_PhantomJS_1_disabled.png b/uitest/reference-screenshots/phantomjs/GridDisabledTest-disabledGrid_LINUX_PhantomJS_1_disabled.png
index 36528b02e0..36528b02e0 100755
--- a/uitest/reference-screenshots/GridDisabledTest-disabledGrid_LINUX_PhantomJS_1_disabled.png
+++ b/uitest/reference-screenshots/phantomjs/GridDisabledTest-disabledGrid_LINUX_PhantomJS_1_disabled.png
diff --git a/uitest/reference-screenshots/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_LINUX_PhantomJS_1_noscroll.png b/uitest/reference-screenshots/phantomjs/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_LINUX_PhantomJS_1_noscroll.png
index 8c92cb222d..8c92cb222d 100755
--- a/uitest/reference-screenshots/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_LINUX_PhantomJS_1_noscroll.png
+++ b/uitest/reference-screenshots/phantomjs/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_LINUX_PhantomJS_1_noscroll.png
diff --git a/uitest/reference-screenshots/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_LINUX_PhantomJS_1_scrolled.png b/uitest/reference-screenshots/phantomjs/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_LINUX_PhantomJS_1_scrolled.png
index 863ad7dbbf..863ad7dbbf 100755
--- a/uitest/reference-screenshots/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_LINUX_PhantomJS_1_scrolled.png
+++ b/uitest/reference-screenshots/phantomjs/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_LINUX_PhantomJS_1_scrolled.png
diff --git a/uitest/reference-screenshots/GridIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png b/uitest/reference-screenshots/phantomjs/GridIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png
index 333dd31aff..333dd31aff 100755
--- a/uitest/reference-screenshots/GridIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png
+++ b/uitest/reference-screenshots/phantomjs/GridIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png
diff --git a/uitest/reference-screenshots/GridLayoutCaptionAlignmentTest-testCaptionAlignments_LINUX_PhantomJS_1_gridlayout-caption-alignment.png b/uitest/reference-screenshots/phantomjs/GridLayoutCaptionAlignmentTest-testCaptionAlignments_LINUX_PhantomJS_1_gridlayout-caption-alignment.png
index aafc61523d..aafc61523d 100755
--- a/uitest/reference-screenshots/GridLayoutCaptionAlignmentTest-testCaptionAlignments_LINUX_PhantomJS_1_gridlayout-caption-alignment.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutCaptionAlignmentTest-testCaptionAlignments_LINUX_PhantomJS_1_gridlayout-caption-alignment.png
diff --git a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png b/uitest/reference-screenshots/phantomjs/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png
index 3591f35c54..3591f35c54 100644
--- a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png
diff --git a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png b/uitest/reference-screenshots/phantomjs/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png
index bcc84cd6cd..bcc84cd6cd 100644
--- a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png
diff --git a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png b/uitest/reference-screenshots/phantomjs/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png
index 4378047739..4378047739 100644
--- a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png
diff --git a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png
index 401ee92b72..401ee92b72 100644
--- a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/GridLayoutFractionalSizeAndAlignmentTest-ensureNoScrollbarsWithAlignBottomRight_LINUX_PhantomJS_1_noscrollbars.png b/uitest/reference-screenshots/phantomjs/GridLayoutFractionalSizeAndAlignmentTest-ensureNoScrollbarsWithAlignBottomRight_LINUX_PhantomJS_1_noscrollbars.png
index 96e8fc6493..96e8fc6493 100644
--- a/uitest/reference-screenshots/GridLayoutFractionalSizeAndAlignmentTest-ensureNoScrollbarsWithAlignBottomRight_LINUX_PhantomJS_1_noscrollbars.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutFractionalSizeAndAlignmentTest-ensureNoScrollbarsWithAlignBottomRight_LINUX_PhantomJS_1_noscrollbars.png
diff --git a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png
index e10621edad..e10621edad 100644
--- a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png b/uitest/reference-screenshots/phantomjs/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png
index 0d41fe5c5f..0d41fe5c5f 100644
--- a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png
diff --git a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png b/uitest/reference-screenshots/phantomjs/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png
index 4e2c8e9677..4e2c8e9677 100644
--- a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png
diff --git a/uitest/reference-screenshots/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_all-left.png b/uitest/reference-screenshots/phantomjs/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_all-left.png
index 2a11da73c7..2a11da73c7 100644
--- a/uitest/reference-screenshots/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_all-left.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_all-left.png
diff --git a/uitest/reference-screenshots/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-button-right.png b/uitest/reference-screenshots/phantomjs/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-button-right.png
index 0f27ba4bd9..0f27ba4bd9 100644
--- a/uitest/reference-screenshots/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-button-right.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-button-right.png
diff --git a/uitest/reference-screenshots/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-button-textfield-right.png b/uitest/reference-screenshots/phantomjs/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-button-textfield-right.png
index 950d17fc61..950d17fc61 100644
--- a/uitest/reference-screenshots/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-button-textfield-right.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-button-textfield-right.png
diff --git a/uitest/reference-screenshots/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-right.png b/uitest/reference-screenshots/phantomjs/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-right.png
index e01a7b0563..e01a7b0563 100644
--- a/uitest/reference-screenshots/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-right.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutMoveComponentTest-componentsShouldMoveRight_LINUX_PhantomJS_1_label-right.png
diff --git a/uitest/reference-screenshots/GridLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png b/uitest/reference-screenshots/phantomjs/GridLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png
index ac61872f65..ac61872f65 100644
--- a/uitest/reference-screenshots/GridLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png
diff --git a/uitest/reference-screenshots/GridLayoutRequiredIndicatorLocationTest-testScreenshotMatches_LINUX_PhantomJS_1_indicators.png b/uitest/reference-screenshots/phantomjs/GridLayoutRequiredIndicatorLocationTest-testScreenshotMatches_LINUX_PhantomJS_1_indicators.png
index 3583df8522..3583df8522 100644
--- a/uitest/reference-screenshots/GridLayoutRequiredIndicatorLocationTest-testScreenshotMatches_LINUX_PhantomJS_1_indicators.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutRequiredIndicatorLocationTest-testScreenshotMatches_LINUX_PhantomJS_1_indicators.png
diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png
index 7a96f2d433..7a96f2d433 100644
--- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png
index 579fc5cca2..579fc5cca2 100644
--- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png
diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png
index 85e2064e31..85e2064e31 100644
--- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png
diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png
index 9478506faa..9478506faa 100644
--- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png
diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png
index 24995b8ced..24995b8ced 100644
--- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png
diff --git a/uitest/reference-screenshots/GridLayoutWidthChangeTest-layoutIsReduced_LINUX_PhantomJS_1_buttonMoved.png b/uitest/reference-screenshots/phantomjs/GridLayoutWidthChangeTest-layoutIsReduced_LINUX_PhantomJS_1_buttonMoved.png
index e077be4cd2..e077be4cd2 100755
--- a/uitest/reference-screenshots/GridLayoutWidthChangeTest-layoutIsReduced_LINUX_PhantomJS_1_buttonMoved.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutWidthChangeTest-layoutIsReduced_LINUX_PhantomJS_1_buttonMoved.png
diff --git a/uitest/reference-screenshots/GridLayoutWidthChangeTest-layoutIsReduced_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/GridLayoutWidthChangeTest-layoutIsReduced_LINUX_PhantomJS_1_initial.png
index ae24d2abad..ae24d2abad 100755
--- a/uitest/reference-screenshots/GridLayoutWidthChangeTest-layoutIsReduced_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/GridLayoutWidthChangeTest-layoutIsReduced_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png
index 22a59fa0c1..22a59fa0c1 100644
--- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png
+++ b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png
diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png
index b1659faf45..b1659faf45 100644
--- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png
index 1c144e5368..1c144e5368 100644
--- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png
+++ b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png
diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png
index be275f5ed5..be275f5ed5 100644
--- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png
+++ b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png
diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png
index 8ba62ce206..8ba62ce206 100644
--- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png
+++ b/uitest/reference-screenshots/phantomjs/HAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png
diff --git a/uitest/reference-screenshots/HAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png b/uitest/reference-screenshots/phantomjs/HAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png
index 0c875add50..0c875add50 100644
--- a/uitest/reference-screenshots/HAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png
+++ b/uitest/reference-screenshots/phantomjs/HAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png
diff --git a/uitest/reference-screenshots/HCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png b/uitest/reference-screenshots/phantomjs/HCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png
index 2ba626a824..2ba626a824 100644
--- a/uitest/reference-screenshots/HCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png
+++ b/uitest/reference-screenshots/phantomjs/HCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png
diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png
index 47d9ac0b26..47d9ac0b26 100644
--- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png
index 044159a46c..044159a46c 100644
--- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png
+++ b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png
diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png
index 75d3b6f047..75d3b6f047 100644
--- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png
+++ b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png
diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png
index 3cf2c66f17..3cf2c66f17 100644
--- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png
+++ b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png
diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png
index 7756e3272a..7756e3272a 100644
--- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png
+++ b/uitest/reference-screenshots/phantomjs/HComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png
diff --git a/uitest/reference-screenshots/HIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png b/uitest/reference-screenshots/phantomjs/HIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png
index ed76668569..ed76668569 100644
--- a/uitest/reference-screenshots/HIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png
+++ b/uitest/reference-screenshots/phantomjs/HIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png
diff --git a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png b/uitest/reference-screenshots/phantomjs/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png
index f8f42cdcc4..f8f42cdcc4 100644
--- a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png
diff --git a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png b/uitest/reference-screenshots/phantomjs/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png
index b8b807c079..b8b807c079 100644
--- a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png
diff --git a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png b/uitest/reference-screenshots/phantomjs/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png
index f8f1aab088..f8f1aab088 100644
--- a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png
diff --git a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png
index f8f1aab088..f8f1aab088 100644
--- a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png
index 4455bec651..4455bec651 100644
--- a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png b/uitest/reference-screenshots/phantomjs/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png
index 0cab101e55..0cab101e55 100644
--- a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png
diff --git a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png b/uitest/reference-screenshots/phantomjs/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png
index 3cdd15c551..3cdd15c551 100644
--- a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png
diff --git a/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png b/uitest/reference-screenshots/phantomjs/HLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png
index 9bdafeff0f..9bdafeff0f 100644
--- a/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png
diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png
index 47d9ac0b26..47d9ac0b26 100644
--- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png
index 044159a46c..044159a46c 100644
--- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png
diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png
index 75d3b6f047..75d3b6f047 100644
--- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png
diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png
index 3cf2c66f17..3cf2c66f17 100644
--- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png
diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png
index 7756e3272a..7756e3272a 100644
--- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png
+++ b/uitest/reference-screenshots/phantomjs/HLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png
diff --git a/uitest/reference-screenshots/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-asc-died-at-age.png b/uitest/reference-screenshots/phantomjs/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-asc-died-at-age.png
index cdce78908e..cdce78908e 100755
--- a/uitest/reference-screenshots/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-asc-died-at-age.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-asc-died-at-age.png
diff --git a/uitest/reference-screenshots/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-asc-name.png b/uitest/reference-screenshots/phantomjs/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-asc-name.png
index 39e1a5edb6..39e1a5edb6 100755
--- a/uitest/reference-screenshots/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-asc-name.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-asc-name.png
diff --git a/uitest/reference-screenshots/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-desc-died-at-age.png b/uitest/reference-screenshots/phantomjs/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-desc-died-at-age.png
index 3cac34a294..3cac34a294 100755
--- a/uitest/reference-screenshots/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-desc-died-at-age.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-desc-died-at-age.png
diff --git a/uitest/reference-screenshots/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-desc-name.png b/uitest/reference-screenshots/phantomjs/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-desc-name.png
index c6b594f4f6..c6b594f4f6 100755
--- a/uitest/reference-screenshots/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-desc-name.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderPositionWhenSortingTest-testFooter_LINUX_PhantomJS_1_sort-desc-name.png
diff --git a/uitest/reference-screenshots/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_100pct-no-scrollbar-second.png b/uitest/reference-screenshots/phantomjs/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_100pct-no-scrollbar-second.png
index 82cee0518e..82cee0518e 100755
--- a/uitest/reference-screenshots/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_100pct-no-scrollbar-second.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_100pct-no-scrollbar-second.png
diff --git a/uitest/reference-screenshots/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_100pct-no-scrollbar.png b/uitest/reference-screenshots/phantomjs/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_100pct-no-scrollbar.png
index 82cee0518e..82cee0518e 100755
--- a/uitest/reference-screenshots/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_100pct-no-scrollbar.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_100pct-no-scrollbar.png
diff --git a/uitest/reference-screenshots/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_300px-scrolled-right.png b/uitest/reference-screenshots/phantomjs/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_300px-scrolled-right.png
index a181f4c193..a181f4c193 100755
--- a/uitest/reference-screenshots/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_300px-scrolled-right.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderSyncOnScrollTest-testFooter_LINUX_PhantomJS_1_300px-scrolled-right.png
diff --git a/uitest/reference-screenshots/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerHidden.png b/uitest/reference-screenshots/phantomjs/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerHidden.png
index 4a4497bfd7..4a4497bfd7 100755
--- a/uitest/reference-screenshots/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerHidden.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerHidden.png
diff --git a/uitest/reference-screenshots/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerVisible.png b/uitest/reference-screenshots/phantomjs/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerVisible.png
index beeb4e741d..beeb4e741d 100755
--- a/uitest/reference-screenshots/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerVisible.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerVisible.png
diff --git a/uitest/reference-screenshots/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerVisible2.png b/uitest/reference-screenshots/phantomjs/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerVisible2.png
index beeb4e741d..beeb4e741d 100755
--- a/uitest/reference-screenshots/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerVisible2.png
+++ b/uitest/reference-screenshots/phantomjs/HeaderUpdateWhenNoRowsTest-testFooter_LINUX_PhantomJS_1_headerVisible2.png
diff --git a/uitest/reference-screenshots/LabelModesTest-testLabelModes_LINUX_PhantomJS_1_labelmodes.png b/uitest/reference-screenshots/phantomjs/LabelModesTest-testLabelModes_LINUX_PhantomJS_1_labelmodes.png
index e574db8f92..e574db8f92 100755
--- a/uitest/reference-screenshots/LabelModesTest-testLabelModes_LINUX_PhantomJS_1_labelmodes.png
+++ b/uitest/reference-screenshots/phantomjs/LabelModesTest-testLabelModes_LINUX_PhantomJS_1_labelmodes.png
diff --git a/uitest/reference-screenshots/LabelTooltipTest-testLabelToolTipChameleonTheme_LINUX_PhantomJS_1_tooltipVisible.png b/uitest/reference-screenshots/phantomjs/LabelTooltipTest-testLabelToolTipChameleonTheme_LINUX_PhantomJS_1_tooltipVisible.png
index 885b5a5837..885b5a5837 100644
--- a/uitest/reference-screenshots/LabelTooltipTest-testLabelToolTipChameleonTheme_LINUX_PhantomJS_1_tooltipVisible.png
+++ b/uitest/reference-screenshots/phantomjs/LabelTooltipTest-testLabelToolTipChameleonTheme_LINUX_PhantomJS_1_tooltipVisible.png
diff --git a/uitest/reference-screenshots/LabelTooltipTest-testLabelToolTipRunoTheme_LINUX_PhantomJS_1_tooltipVisible.png b/uitest/reference-screenshots/phantomjs/LabelTooltipTest-testLabelToolTipRunoTheme_LINUX_PhantomJS_1_tooltipVisible.png
index 55e2c4eb6f..55e2c4eb6f 100755
--- a/uitest/reference-screenshots/LabelTooltipTest-testLabelToolTipRunoTheme_LINUX_PhantomJS_1_tooltipVisible.png
+++ b/uitest/reference-screenshots/phantomjs/LabelTooltipTest-testLabelToolTipRunoTheme_LINUX_PhantomJS_1_tooltipVisible.png
diff --git a/uitest/reference-screenshots/LabelTooltipTest-testLabelTooltip_LINUX_PhantomJS_1_tooltipVisible.png b/uitest/reference-screenshots/phantomjs/LabelTooltipTest-testLabelTooltip_LINUX_PhantomJS_1_tooltipVisible.png
index 739a6528e6..739a6528e6 100644
--- a/uitest/reference-screenshots/LabelTooltipTest-testLabelTooltip_LINUX_PhantomJS_1_tooltipVisible.png
+++ b/uitest/reference-screenshots/phantomjs/LabelTooltipTest-testLabelTooltip_LINUX_PhantomJS_1_tooltipVisible.png
diff --git a/uitest/reference-screenshots/LayoutComponentGroupTest-renderedWithoutRoundedBordersInTheMiddle_LINUX_PhantomJS_1_buttongroups.png b/uitest/reference-screenshots/phantomjs/LayoutComponentGroupTest-renderedWithoutRoundedBordersInTheMiddle_LINUX_PhantomJS_1_buttongroups.png
index f8b1dcf7f5..f8b1dcf7f5 100755
--- a/uitest/reference-screenshots/LayoutComponentGroupTest-renderedWithoutRoundedBordersInTheMiddle_LINUX_PhantomJS_1_buttongroups.png
+++ b/uitest/reference-screenshots/phantomjs/LayoutComponentGroupTest-renderedWithoutRoundedBordersInTheMiddle_LINUX_PhantomJS_1_buttongroups.png
diff --git a/uitest/reference-screenshots/MinimalWidthColumnsTest-testFor1pxDifference_LINUX_PhantomJS_1_onepixdifference.png b/uitest/reference-screenshots/phantomjs/MinimalWidthColumnsTest-testFor1pxDifference_LINUX_PhantomJS_1_onepixdifference.png
index e6d7bcc78b..e6d7bcc78b 100644
--- a/uitest/reference-screenshots/MinimalWidthColumnsTest-testFor1pxDifference_LINUX_PhantomJS_1_onepixdifference.png
+++ b/uitest/reference-screenshots/phantomjs/MinimalWidthColumnsTest-testFor1pxDifference_LINUX_PhantomJS_1_onepixdifference.png
diff --git a/uitest/reference-screenshots/MoveComponentsFromGridLayoutToInnerLayoutTest-buttonIsMovedInsideInnerLayout_LINUX_PhantomJS_1_buttonClicked.png b/uitest/reference-screenshots/phantomjs/MoveComponentsFromGridLayoutToInnerLayoutTest-buttonIsMovedInsideInnerLayout_LINUX_PhantomJS_1_buttonClicked.png
index 588b2053b0..588b2053b0 100644
--- a/uitest/reference-screenshots/MoveComponentsFromGridLayoutToInnerLayoutTest-buttonIsMovedInsideInnerLayout_LINUX_PhantomJS_1_buttonClicked.png
+++ b/uitest/reference-screenshots/phantomjs/MoveComponentsFromGridLayoutToInnerLayoutTest-buttonIsMovedInsideInnerLayout_LINUX_PhantomJS_1_buttonClicked.png
diff --git a/uitest/reference-screenshots/MoveToTopTest-testBringToFrontViaHeader_LINUX_PhantomJS_1_first-window-over-second.png b/uitest/reference-screenshots/phantomjs/MoveToTopTest-testBringToFrontViaHeader_LINUX_PhantomJS_1_first-window-over-second.png
index 2473dd0a7b..2473dd0a7b 100644
--- a/uitest/reference-screenshots/MoveToTopTest-testBringToFrontViaHeader_LINUX_PhantomJS_1_first-window-over-second.png
+++ b/uitest/reference-screenshots/phantomjs/MoveToTopTest-testBringToFrontViaHeader_LINUX_PhantomJS_1_first-window-over-second.png
diff --git a/uitest/reference-screenshots/MoveToTopTest-testBringToFrontViaHeader_LINUX_PhantomJS_1_second-window-over-first.png b/uitest/reference-screenshots/phantomjs/MoveToTopTest-testBringToFrontViaHeader_LINUX_PhantomJS_1_second-window-over-first.png
index 17ed714181..17ed714181 100644
--- a/uitest/reference-screenshots/MoveToTopTest-testBringToFrontViaHeader_LINUX_PhantomJS_1_second-window-over-first.png
+++ b/uitest/reference-screenshots/phantomjs/MoveToTopTest-testBringToFrontViaHeader_LINUX_PhantomJS_1_second-window-over-first.png
diff --git a/uitest/reference-screenshots/PopupDateFieldStatesTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_dateFieldStates.png b/uitest/reference-screenshots/phantomjs/PopupDateFieldStatesTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_dateFieldStates.png
index e7e39efa94..e7e39efa94 100644
--- a/uitest/reference-screenshots/PopupDateFieldStatesTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_dateFieldStates.png
+++ b/uitest/reference-screenshots/phantomjs/PopupDateFieldStatesTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_dateFieldStates.png
diff --git a/uitest/reference-screenshots/PopupDateTimeFieldStatesTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_dateFieldStates.png b/uitest/reference-screenshots/phantomjs/PopupDateTimeFieldStatesTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_dateFieldStates.png
index 046fe95c7d..046fe95c7d 100644
--- a/uitest/reference-screenshots/PopupDateTimeFieldStatesTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_dateFieldStates.png
+++ b/uitest/reference-screenshots/phantomjs/PopupDateTimeFieldStatesTest-readOnlyDateFieldPopupShouldNotOpen_LINUX_PhantomJS_1_dateFieldStates.png
diff --git a/uitest/reference-screenshots/PopupViewAndFragmentTest-changeFragmentAndOpenPopupView_LINUX_PhantomJS_1_changedFragment.png b/uitest/reference-screenshots/phantomjs/PopupViewAndFragmentTest-changeFragmentAndOpenPopupView_LINUX_PhantomJS_1_changedFragment.png
index 1f9e200a18..1f9e200a18 100644
--- a/uitest/reference-screenshots/PopupViewAndFragmentTest-changeFragmentAndOpenPopupView_LINUX_PhantomJS_1_changedFragment.png
+++ b/uitest/reference-screenshots/phantomjs/PopupViewAndFragmentTest-changeFragmentAndOpenPopupView_LINUX_PhantomJS_1_changedFragment.png
diff --git a/uitest/reference-screenshots/ProgressBarStaticReindeerTest-compareScreenshot_LINUX_PhantomJS_1_screen.png b/uitest/reference-screenshots/phantomjs/ProgressBarStaticReindeerTest-compareScreenshot_LINUX_PhantomJS_1_screen.png
index a0b94444a2..a0b94444a2 100644
--- a/uitest/reference-screenshots/ProgressBarStaticReindeerTest-compareScreenshot_LINUX_PhantomJS_1_screen.png
+++ b/uitest/reference-screenshots/phantomjs/ProgressBarStaticReindeerTest-compareScreenshot_LINUX_PhantomJS_1_screen.png
diff --git a/uitest/reference-screenshots/ProgressBarStaticRunoTest-compareScreenshot_LINUX_PhantomJS_1_screen.png b/uitest/reference-screenshots/phantomjs/ProgressBarStaticRunoTest-compareScreenshot_LINUX_PhantomJS_1_screen.png
index 56ab3a425d..56ab3a425d 100644
--- a/uitest/reference-screenshots/ProgressBarStaticRunoTest-compareScreenshot_LINUX_PhantomJS_1_screen.png
+++ b/uitest/reference-screenshots/phantomjs/ProgressBarStaticRunoTest-compareScreenshot_LINUX_PhantomJS_1_screen.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
index 183edc6d68..183edc6d68 100755
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
index bac584009c..bac584009c 100755
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
index 7f3dfd7279..7f3dfd7279 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
index 1d6bb85df7..1d6bb85df7 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
index d99eaa1365..d99eaa1365 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
index e1432a7520..e1432a7520 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
index c2c28caa13..c2c28caa13 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
index 38b955f2f0..38b955f2f0 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_forms.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
index d58855fa9e..d58855fa9e 100755
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_labels.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
index add95d6faa..add95d6faa 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
index ff3463b81e..ff3463b81e 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
index 48125ca919..48125ca919 100755
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
index b1a9a2748f..b1a9a2748f 100755
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
index 183f6cadcf..183f6cadcf 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
index 2f9460e22e..2f9460e22e 100755
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
index 2ffff0ca7a..2ffff0ca7a 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
index e0a06bff33..e0a06bff33 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
index 141997b2e1..141997b2e1 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
index 9d2c02e7dc..9d2c02e7dc 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
index 015e53c620..015e53c620 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
index 8225de28f5..8225de28f5 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
index 61d79d3d32..61d79d3d32 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-black.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-black.png
index b0ae6d4fca..b0ae6d4fca 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-black.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-black.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
index a2b08c93c3..a2b08c93c3 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-light.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-light.png
index 64d75e1644..64d75e1644 100755
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-light.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-light.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
index ca0740fd98..ca0740fd98 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
index a0dcb21a83..a0dcb21a83 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
index 355bc64b9e..355bc64b9e 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
index faf93405ec..faf93405ec 100755
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
index 6848b3e8b6..6848b3e8b6 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_trees.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
index 8981cf342e..8981cf342e 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
index 0cd0ca1a28..0cd0ca1a28 100644
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
diff --git a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
index 0acd3987a2..0acd3987a2 100755
--- a/uitest/reference-screenshots/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
+++ b/uitest/reference-screenshots/phantomjs/ReindeerThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
diff --git a/uitest/reference-screenshots/ResponsiveLayoutUpdateTest-testWidthAndHeightRanges_LINUX_PhantomJS_1_large.png b/uitest/reference-screenshots/phantomjs/ResponsiveLayoutUpdateTest-testWidthAndHeightRanges_LINUX_PhantomJS_1_large.png
index fd836f5bde..fd836f5bde 100644
--- a/uitest/reference-screenshots/ResponsiveLayoutUpdateTest-testWidthAndHeightRanges_LINUX_PhantomJS_1_large.png
+++ b/uitest/reference-screenshots/phantomjs/ResponsiveLayoutUpdateTest-testWidthAndHeightRanges_LINUX_PhantomJS_1_large.png
diff --git a/uitest/reference-screenshots/ResponsiveLayoutUpdateTest-testWidthAndHeightRanges_LINUX_PhantomJS_1_small.png b/uitest/reference-screenshots/phantomjs/ResponsiveLayoutUpdateTest-testWidthAndHeightRanges_LINUX_PhantomJS_1_small.png
index da1652109d..da1652109d 100644
--- a/uitest/reference-screenshots/ResponsiveLayoutUpdateTest-testWidthAndHeightRanges_LINUX_PhantomJS_1_small.png
+++ b/uitest/reference-screenshots/phantomjs/ResponsiveLayoutUpdateTest-testWidthAndHeightRanges_LINUX_PhantomJS_1_small.png
diff --git a/uitest/reference-screenshots/ResponsiveStylesTest-testValoMenuResponsiveHover_LINUX_PhantomJS_1_collapsedMenu.png b/uitest/reference-screenshots/phantomjs/ResponsiveStylesTest-testValoMenuResponsiveHover_LINUX_PhantomJS_1_collapsedMenu.png
index 2ec0c8e3af..2ec0c8e3af 100755
--- a/uitest/reference-screenshots/ResponsiveStylesTest-testValoMenuResponsiveHover_LINUX_PhantomJS_1_collapsedMenu.png
+++ b/uitest/reference-screenshots/phantomjs/ResponsiveStylesTest-testValoMenuResponsiveHover_LINUX_PhantomJS_1_collapsedMenu.png
diff --git a/uitest/reference-screenshots/ResponsiveStylesTest-testValoMenuResponsiveHover_LINUX_PhantomJS_1_expandedMenu.png b/uitest/reference-screenshots/phantomjs/ResponsiveStylesTest-testValoMenuResponsiveHover_LINUX_PhantomJS_1_expandedMenu.png
index 3a79461fed..3a79461fed 100755
--- a/uitest/reference-screenshots/ResponsiveStylesTest-testValoMenuResponsiveHover_LINUX_PhantomJS_1_expandedMenu.png
+++ b/uitest/reference-screenshots/phantomjs/ResponsiveStylesTest-testValoMenuResponsiveHover_LINUX_PhantomJS_1_expandedMenu.png
diff --git a/uitest/reference-screenshots/ResponsiveStylesTest-testValoMenuResponsiveParentSize_LINUX_PhantomJS_1_defaultMenuWidths.png b/uitest/reference-screenshots/phantomjs/ResponsiveStylesTest-testValoMenuResponsiveParentSize_LINUX_PhantomJS_1_defaultMenuWidths.png
index f5d4f79ae7..f5d4f79ae7 100755
--- a/uitest/reference-screenshots/ResponsiveStylesTest-testValoMenuResponsiveParentSize_LINUX_PhantomJS_1_defaultMenuWidths.png
+++ b/uitest/reference-screenshots/phantomjs/ResponsiveStylesTest-testValoMenuResponsiveParentSize_LINUX_PhantomJS_1_defaultMenuWidths.png
diff --git a/uitest/reference-screenshots/ResponsiveUITest-testResizingSplitPanelReflowsLayout_LINUX_PhantomJS_1_responsive.png b/uitest/reference-screenshots/phantomjs/ResponsiveUITest-testResizingSplitPanelReflowsLayout_LINUX_PhantomJS_1_responsive.png
index 4a1e2188f5..4a1e2188f5 100644
--- a/uitest/reference-screenshots/ResponsiveUITest-testResizingSplitPanelReflowsLayout_LINUX_PhantomJS_1_responsive.png
+++ b/uitest/reference-screenshots/phantomjs/ResponsiveUITest-testResizingSplitPanelReflowsLayout_LINUX_PhantomJS_1_responsive.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
index e3dedc53e7..e3dedc53e7 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_accordions.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
index 871dec905d..871dec905d 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_buttons.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
index 93a2ce055d..93a2ce055d 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-first-popup.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
index 7bc42c50c7..7bc42c50c7 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-fourth-popup.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
index 891dbd638c..891dbd638c 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-second-popup.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
index 5b0ca1459b..5b0ca1459b 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates-third-popup.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
index 8b55ffff87..8b55ffff87 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_dates.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
index cf6e7346a5..cf6e7346a5 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_embedded.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_forms.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
index f76c5fcd0b..f76c5fcd0b 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_forms.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_labels.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
index 744d9c447d..744d9c447d 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_labels.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
index 517179b33b..517179b33b 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_layouts.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
index 5a6c11448f..5a6c11448f 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-error.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
index 14c7e29337..14c7e29337 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-humanized.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
index 2c5da62598..2c5da62598 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-tray.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
index 1f3929f27a..1f3929f27a 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_notification-warning.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
index 0aa7246821..0aa7246821 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-fifth-open.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
index c172afeda4..c172afeda4 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-first-open.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
index d23d97a6fb..d23d97a6fb 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-fourth-open.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
index a13067e575..a13067e575 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-second-open.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
index 11b2b67936..11b2b67936 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects-third-open.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
index 9bc746ea4e..9bc746ea4e 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_selects.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
index d4e6c51fb5..d4e6c51fb5 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_sliders.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
index 6222907133..6222907133 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-default.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-dialog.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-dialog.png
index 671c5dfb3c..671c5dfb3c 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-dialog.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_subwindow-dialog.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
index 12016ea5e0..12016ea5e0 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables-collapsemenu.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
index b9a5874c25..b9a5874c25 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables-contextmenu.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
index 6056f51039..6056f51039 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tables.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
index 9a325de6c4..9a325de6c4 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_tabsheets.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
index aaf5417279..aaf5417279 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_textfields.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_trees.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
index 160e5c8399..160e5c8399 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_trees.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
index 52b89b94fe..52b89b94fe 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_treetable.png
diff --git a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
index 94fa4d1eb8..94fa4d1eb8 100755
--- a/uitest/reference-screenshots/RunoThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
+++ b/uitest/reference-screenshots/phantomjs/RunoThemeTest-testTheme_LINUX_PhantomJS_1_uploads.png
diff --git a/uitest/reference-screenshots/ScrollingBodyElementWithModalOpenedTest-testWindowScrollbars_LINUX_PhantomJS_1_init.png b/uitest/reference-screenshots/phantomjs/ScrollingBodyElementWithModalOpenedTest-testWindowScrollbars_LINUX_PhantomJS_1_init.png
index b592e536d6..b592e536d6 100644
--- a/uitest/reference-screenshots/ScrollingBodyElementWithModalOpenedTest-testWindowScrollbars_LINUX_PhantomJS_1_init.png
+++ b/uitest/reference-screenshots/phantomjs/ScrollingBodyElementWithModalOpenedTest-testWindowScrollbars_LINUX_PhantomJS_1_init.png
diff --git a/uitest/reference-screenshots/SplitPanelStyleLeakTest-checkScreenshot_LINUX_PhantomJS_1_all.png b/uitest/reference-screenshots/phantomjs/SplitPanelStyleLeakTest-checkScreenshot_LINUX_PhantomJS_1_all.png
index 99de818598..99de818598 100644
--- a/uitest/reference-screenshots/SplitPanelStyleLeakTest-checkScreenshot_LINUX_PhantomJS_1_all.png
+++ b/uitest/reference-screenshots/phantomjs/SplitPanelStyleLeakTest-checkScreenshot_LINUX_PhantomJS_1_all.png
diff --git a/uitest/reference-screenshots/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_initial-tab1.png b/uitest/reference-screenshots/phantomjs/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_initial-tab1.png
index 4594ac4ec6..4594ac4ec6 100644
--- a/uitest/reference-screenshots/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_initial-tab1.png
+++ b/uitest/reference-screenshots/phantomjs/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_initial-tab1.png
diff --git a/uitest/reference-screenshots/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_select-tab1.png b/uitest/reference-screenshots/phantomjs/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_select-tab1.png
index 4594ac4ec6..4594ac4ec6 100644
--- a/uitest/reference-screenshots/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_select-tab1.png
+++ b/uitest/reference-screenshots/phantomjs/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_select-tab1.png
diff --git a/uitest/reference-screenshots/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_select-tab2.png b/uitest/reference-screenshots/phantomjs/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_select-tab2.png
index 7c09f756c4..7c09f756c4 100644
--- a/uitest/reference-screenshots/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_select-tab2.png
+++ b/uitest/reference-screenshots/phantomjs/SubWindowWithUndefinedHeightTest-testUndefinedWindowSizeUpdate_LINUX_PhantomJS_1_select-tab2.png
diff --git a/uitest/reference-screenshots/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-init.png b/uitest/reference-screenshots/phantomjs/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-init.png
index fd46e9db07..fd46e9db07 100644
--- a/uitest/reference-screenshots/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-init.png
+++ b/uitest/reference-screenshots/phantomjs/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-init.png
diff --git a/uitest/reference-screenshots/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-restored.png b/uitest/reference-screenshots/phantomjs/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-restored.png
index fd46e9db07..fd46e9db07 100644
--- a/uitest/reference-screenshots/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-restored.png
+++ b/uitest/reference-screenshots/phantomjs/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-restored.png
diff --git a/uitest/reference-screenshots/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-undefined.png b/uitest/reference-screenshots/phantomjs/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-undefined.png
index 88b74a7cd7..88b74a7cd7 100644
--- a/uitest/reference-screenshots/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-undefined.png
+++ b/uitest/reference-screenshots/phantomjs/TabBarWidthTest-testWidths_LINUX_PhantomJS_1_tab-bar-width-undefined.png
diff --git a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_click-tab-8.png b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_click-tab-8.png
index 22691f78e5..22691f78e5 100644
--- a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_click-tab-8.png
+++ b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_click-tab-8.png
diff --git a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_scrolled-left-to-tab-1.png b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_scrolled-left-to-tab-1.png
index 3e7f320c15..3e7f320c15 100644
--- a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_scrolled-left-to-tab-1.png
+++ b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_scrolled-left-to-tab-1.png
diff --git a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_scrolled-right-to-tab-12.png b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_scrolled-right-to-tab-12.png
index 1d7087d63a..1d7087d63a 100644
--- a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_scrolled-right-to-tab-12.png
+++ b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_scrolled-right-to-tab-12.png
diff --git a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_skip-disabled-to-tab5.png b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_skip-disabled-to-tab5.png
index da6a14118f..da6a14118f 100644
--- a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_skip-disabled-to-tab5.png
+++ b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_skip-disabled-to-tab5.png
diff --git a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_tab-9.png b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_tab-9.png
index 7dfd4281ed..7dfd4281ed 100644
--- a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_tab-9.png
+++ b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_tab-9.png
diff --git a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_tab2.png b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_tab2.png
index 175d04da04..175d04da04 100644
--- a/uitest/reference-screenshots/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_tab2.png
+++ b/uitest/reference-screenshots/phantomjs/TabKeyboardNavigationTest-testFocus_LINUX_PhantomJS_1_tab2.png
diff --git a/uitest/reference-screenshots/TabSheetFocusingTest-addAndFocusTabs_LINUX_PhantomJS_1_tabsAdded.png b/uitest/reference-screenshots/phantomjs/TabSheetFocusingTest-addAndFocusTabs_LINUX_PhantomJS_1_tabsAdded.png
index 50ea28a943..50ea28a943 100644
--- a/uitest/reference-screenshots/TabSheetFocusingTest-addAndFocusTabs_LINUX_PhantomJS_1_tabsAdded.png
+++ b/uitest/reference-screenshots/phantomjs/TabSheetFocusingTest-addAndFocusTabs_LINUX_PhantomJS_1_tabsAdded.png
diff --git a/uitest/reference-screenshots/TableChildMeasurementHintTest-testCacheSize_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/TableChildMeasurementHintTest-testCacheSize_LINUX_PhantomJS_1_initial.png
index 5419f304cd..5419f304cd 100644
--- a/uitest/reference-screenshots/TableChildMeasurementHintTest-testCacheSize_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/TableChildMeasurementHintTest-testCacheSize_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/TableDropIndicatorValoTest-indicator_LINUX_PhantomJS_1_indicator.png b/uitest/reference-screenshots/phantomjs/TableDropIndicatorValoTest-indicator_LINUX_PhantomJS_1_indicator.png
index 1cf2860e6d..1cf2860e6d 100644
--- a/uitest/reference-screenshots/TableDropIndicatorValoTest-indicator_LINUX_PhantomJS_1_indicator.png
+++ b/uitest/reference-screenshots/phantomjs/TableDropIndicatorValoTest-indicator_LINUX_PhantomJS_1_indicator.png
diff --git a/uitest/reference-screenshots/TableRowHeight2Test-testRowHeights_LINUX_PhantomJS_1_after.png b/uitest/reference-screenshots/phantomjs/TableRowHeight2Test-testRowHeights_LINUX_PhantomJS_1_after.png
index 73d0bbb0a3..73d0bbb0a3 100755
--- a/uitest/reference-screenshots/TableRowHeight2Test-testRowHeights_LINUX_PhantomJS_1_after.png
+++ b/uitest/reference-screenshots/phantomjs/TableRowHeight2Test-testRowHeights_LINUX_PhantomJS_1_after.png
diff --git a/uitest/reference-screenshots/TableRowHeight2Test-testRowHeights_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/TableRowHeight2Test-testRowHeights_LINUX_PhantomJS_1_initial.png
index 73d0bbb0a3..73d0bbb0a3 100755
--- a/uitest/reference-screenshots/TableRowHeight2Test-testRowHeights_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/TableRowHeight2Test-testRowHeights_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/TableScrollsOnSelectionTest-tableIsNotScrolledOnSelect_LINUX_PhantomJS_1_scrolled-down.png b/uitest/reference-screenshots/phantomjs/TableScrollsOnSelectionTest-tableIsNotScrolledOnSelect_LINUX_PhantomJS_1_scrolled-down.png
index e04f76f45c..e04f76f45c 100644
--- a/uitest/reference-screenshots/TableScrollsOnSelectionTest-tableIsNotScrolledOnSelect_LINUX_PhantomJS_1_scrolled-down.png
+++ b/uitest/reference-screenshots/phantomjs/TableScrollsOnSelectionTest-tableIsNotScrolledOnSelect_LINUX_PhantomJS_1_scrolled-down.png
diff --git a/uitest/reference-screenshots/TableSortIndicatorTest-ascendingIndicatorIsShown_LINUX_PhantomJS_1_ascending.png b/uitest/reference-screenshots/phantomjs/TableSortIndicatorTest-ascendingIndicatorIsShown_LINUX_PhantomJS_1_ascending.png
index 8857c9a101..8857c9a101 100644
--- a/uitest/reference-screenshots/TableSortIndicatorTest-ascendingIndicatorIsShown_LINUX_PhantomJS_1_ascending.png
+++ b/uitest/reference-screenshots/phantomjs/TableSortIndicatorTest-ascendingIndicatorIsShown_LINUX_PhantomJS_1_ascending.png
diff --git a/uitest/reference-screenshots/TableSortIndicatorTest-descendingIndicatorIsShown_LINUX_PhantomJS_1_descending.png b/uitest/reference-screenshots/phantomjs/TableSortIndicatorTest-descendingIndicatorIsShown_LINUX_PhantomJS_1_descending.png
index 9f559df768..9f559df768 100644
--- a/uitest/reference-screenshots/TableSortIndicatorTest-descendingIndicatorIsShown_LINUX_PhantomJS_1_descending.png
+++ b/uitest/reference-screenshots/phantomjs/TableSortIndicatorTest-descendingIndicatorIsShown_LINUX_PhantomJS_1_descending.png
diff --git a/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_LINUX_PhantomJS_1_TableTooManyColumnsTest-testDropdownTable.png b/uitest/reference-screenshots/phantomjs/TableTooManyColumnsTest-testDropdownTable_LINUX_PhantomJS_1_init.png
index 8a469e5927..8a469e5927 100644
--- a/uitest/reference-screenshots/TableTooManyColumnsTest-testDropdownTable_LINUX_PhantomJS_1_TableTooManyColumnsTest-testDropdownTable.png
+++ b/uitest/reference-screenshots/phantomjs/TableTooManyColumnsTest-testDropdownTable_LINUX_PhantomJS_1_init.png
diff --git a/uitest/reference-screenshots/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_first.png b/uitest/reference-screenshots/phantomjs/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_first.png
index cb5cc3dfa6..cb5cc3dfa6 100755
--- a/uitest/reference-screenshots/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_first.png
+++ b/uitest/reference-screenshots/phantomjs/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_first.png
diff --git a/uitest/reference-screenshots/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_first2.png b/uitest/reference-screenshots/phantomjs/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_first2.png
index cb5cc3dfa6..cb5cc3dfa6 100755
--- a/uitest/reference-screenshots/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_first2.png
+++ b/uitest/reference-screenshots/phantomjs/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_first2.png
diff --git a/uitest/reference-screenshots/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_second.png b/uitest/reference-screenshots/phantomjs/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_second.png
index a4bc5d9e11..a4bc5d9e11 100755
--- a/uitest/reference-screenshots/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_second.png
+++ b/uitest/reference-screenshots/phantomjs/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_second.png
diff --git a/uitest/reference-screenshots/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_second2.png b/uitest/reference-screenshots/phantomjs/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_second2.png
index a4bc5d9e11..a4bc5d9e11 100755
--- a/uitest/reference-screenshots/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_second2.png
+++ b/uitest/reference-screenshots/phantomjs/TableVisibleColumnsUpdateTest-testFooter_LINUX_PhantomJS_1_second2.png
diff --git a/uitest/reference-screenshots/TableWithEmptyCaptionTest-testEmptyCaption_LINUX_PhantomJS_1_table-empty-caption.png b/uitest/reference-screenshots/phantomjs/TableWithEmptyCaptionTest-testEmptyCaption_LINUX_PhantomJS_1_table-empty-caption.png
index 9c60ff24cf..9c60ff24cf 100644
--- a/uitest/reference-screenshots/TableWithEmptyCaptionTest-testEmptyCaption_LINUX_PhantomJS_1_table-empty-caption.png
+++ b/uitest/reference-screenshots/phantomjs/TableWithEmptyCaptionTest-testEmptyCaption_LINUX_PhantomJS_1_table-empty-caption.png
diff --git a/uitest/reference-screenshots/TabsheetNotEnoughHorizontalSpaceTest-testThatTabScrollButtonsAreRenderedCorrectly_LINUX_PhantomJS_1_init.png b/uitest/reference-screenshots/phantomjs/TabsheetNotEnoughHorizontalSpaceTest-testThatTabScrollButtonsAreRenderedCorrectly_LINUX_PhantomJS_1_init.png
index 793f01f93e..793f01f93e 100644
--- a/uitest/reference-screenshots/TabsheetNotEnoughHorizontalSpaceTest-testThatTabScrollButtonsAreRenderedCorrectly_LINUX_PhantomJS_1_init.png
+++ b/uitest/reference-screenshots/phantomjs/TabsheetNotEnoughHorizontalSpaceTest-testThatTabScrollButtonsAreRenderedCorrectly_LINUX_PhantomJS_1_init.png
diff --git a/uitest/reference-screenshots/TestTooSmallSubwindowSizeTest-testSubwindowStyles_LINUX_PhantomJS_1_initial_state.png b/uitest/reference-screenshots/phantomjs/TestTooSmallSubwindowSizeTest-testSubwindowStyles_LINUX_PhantomJS_1_initial_state.png
index b64b1adcfb..b64b1adcfb 100644
--- a/uitest/reference-screenshots/TestTooSmallSubwindowSizeTest-testSubwindowStyles_LINUX_PhantomJS_1_initial_state.png
+++ b/uitest/reference-screenshots/phantomjs/TestTooSmallSubwindowSizeTest-testSubwindowStyles_LINUX_PhantomJS_1_initial_state.png
diff --git a/uitest/reference-screenshots/TextFieldRelativeWidthTest-testWidth_LINUX_PhantomJS_1_after.png b/uitest/reference-screenshots/phantomjs/TextFieldRelativeWidthTest-testWidth_LINUX_PhantomJS_1_after.png
index 6762418327..6762418327 100644
--- a/uitest/reference-screenshots/TextFieldRelativeWidthTest-testWidth_LINUX_PhantomJS_1_after.png
+++ b/uitest/reference-screenshots/phantomjs/TextFieldRelativeWidthTest-testWidth_LINUX_PhantomJS_1_after.png
diff --git a/uitest/reference-screenshots/TextFieldRelativeWidthTest-testWidth_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/TextFieldRelativeWidthTest-testWidth_LINUX_PhantomJS_1_initial.png
index 6c4a0c9fa7..6c4a0c9fa7 100644
--- a/uitest/reference-screenshots/TextFieldRelativeWidthTest-testWidth_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/TextFieldRelativeWidthTest-testWidth_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/TextFieldTruncatesUnderscoresInModalDialogsTest-testWindowRepositioning_LINUX_PhantomJS_1_init.png b/uitest/reference-screenshots/phantomjs/TextFieldTruncatesUnderscoresInModalDialogsTest-testWindowRepositioning_LINUX_PhantomJS_1_init.png
index 0202240548..0202240548 100644
--- a/uitest/reference-screenshots/TextFieldTruncatesUnderscoresInModalDialogsTest-testWindowRepositioning_LINUX_PhantomJS_1_init.png
+++ b/uitest/reference-screenshots/phantomjs/TextFieldTruncatesUnderscoresInModalDialogsTest-testWindowRepositioning_LINUX_PhantomJS_1_init.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_base_default.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__base_default.png
index 10df6aaa96..10df6aaa96 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_base_default.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__base_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_base_html.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__base_html.png
index e651f9a422..e651f9a422 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_base_html.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__base_html.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_chameleon_default.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__chameleon_default.png
index 5345f0d12c..5345f0d12c 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_chameleon_default.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__chameleon_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_chameleon_html.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__chameleon_html.png
index 1a290d8f79..1a290d8f79 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_chameleon_html.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__chameleon_html.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_reindeer_default.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__reindeer_default.png
index 266e63a193..266e63a193 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_reindeer_default.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__reindeer_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_reindeer_html.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__reindeer_html.png
index 0ab78b70fd..0ab78b70fd 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_reindeer_html.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__reindeer_html.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_runo_default.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__runo_default.png
index aa128c7b76..aa128c7b76 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_runo_default.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__runo_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_runo_html.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__runo_html.png
index b6f6a346f6..b6f6a346f6 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_runo_html.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__runo_html.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_valo_default.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__valo_default.png
index 6a4cea3ebc..6a4cea3ebc 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_valo_default.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__valo_default.png
diff --git a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_valo_html.png b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__valo_html.png
index f2f72c6c9f..f2f72c6c9f 100755
--- a/uitest/reference-screenshots/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1_valo_html.png
+++ b/uitest/reference-screenshots/phantomjs/TooltipStylingTest-tooltipStyling_LINUX_PhantomJS_1__valo_html.png
diff --git a/uitest/reference-screenshots/TreeTablePartialUpdatesPageLength0Test-testExpanding_LINUX_PhantomJS_1_bottom.png b/uitest/reference-screenshots/phantomjs/TreeTablePartialUpdatesPageLength0Test-testExpanding_LINUX_PhantomJS_1_bottom.png
index 5e131877ed..5e131877ed 100644
--- a/uitest/reference-screenshots/TreeTablePartialUpdatesPageLength0Test-testExpanding_LINUX_PhantomJS_1_bottom.png
+++ b/uitest/reference-screenshots/phantomjs/TreeTablePartialUpdatesPageLength0Test-testExpanding_LINUX_PhantomJS_1_bottom.png
diff --git a/uitest/reference-screenshots/TreeTablePartialUpdatesTest-testLongScroll_LINUX_PhantomJS_1_bottom.png b/uitest/reference-screenshots/phantomjs/TreeTablePartialUpdatesTest-testLongScroll_LINUX_PhantomJS_1_bottom.png
index 400f09cffb..400f09cffb 100644
--- a/uitest/reference-screenshots/TreeTablePartialUpdatesTest-testLongScroll_LINUX_PhantomJS_1_bottom.png
+++ b/uitest/reference-screenshots/phantomjs/TreeTablePartialUpdatesTest-testLongScroll_LINUX_PhantomJS_1_bottom.png
diff --git a/uitest/reference-screenshots/TreeTablePartialUpdatesTest-testNegativeArraySize_LINUX_PhantomJS_1_bottom.png b/uitest/reference-screenshots/phantomjs/TreeTablePartialUpdatesTest-testNegativeArraySize_LINUX_PhantomJS_1_bottom.png
index 400f09cffb..400f09cffb 100644
--- a/uitest/reference-screenshots/TreeTablePartialUpdatesTest-testNegativeArraySize_LINUX_PhantomJS_1_bottom.png
+++ b/uitest/reference-screenshots/phantomjs/TreeTablePartialUpdatesTest-testNegativeArraySize_LINUX_PhantomJS_1_bottom.png
diff --git a/uitest/reference-screenshots/TreeTableRowIconsTest-checkScreenshot_LINUX_PhantomJS_1_TreeTableRowIcons.png b/uitest/reference-screenshots/phantomjs/TreeTableRowIconsTest-checkScreenshot_LINUX_PhantomJS_1_TreeTableRowIcons.png
index 0101c4473d..0101c4473d 100755
--- a/uitest/reference-screenshots/TreeTableRowIconsTest-checkScreenshot_LINUX_PhantomJS_1_TreeTableRowIcons.png
+++ b/uitest/reference-screenshots/phantomjs/TreeTableRowIconsTest-checkScreenshot_LINUX_PhantomJS_1_TreeTableRowIcons.png
diff --git a/uitest/reference-screenshots/UndefinedSizeScrollbarsTest-testNoScrollbars_LINUX_PhantomJS_1_noscrollbars.png b/uitest/reference-screenshots/phantomjs/UndefinedSizeScrollbarsTest-testNoScrollbars_LINUX_PhantomJS_1_noscrollbars.png
index 478cdecbe2..478cdecbe2 100644
--- a/uitest/reference-screenshots/UndefinedSizeScrollbarsTest-testNoScrollbars_LINUX_PhantomJS_1_noscrollbars.png
+++ b/uitest/reference-screenshots/phantomjs/UndefinedSizeScrollbarsTest-testNoScrollbars_LINUX_PhantomJS_1_noscrollbars.png
diff --git a/uitest/reference-screenshots/UniformGridLayoutUITest-collapsed_LINUX_PhantomJS_1_collapsed.png b/uitest/reference-screenshots/phantomjs/UniformGridLayoutUITest-collapsed_LINUX_PhantomJS_1_collapsed.png
index 02c33eb804..02c33eb804 100755
--- a/uitest/reference-screenshots/UniformGridLayoutUITest-collapsed_LINUX_PhantomJS_1_collapsed.png
+++ b/uitest/reference-screenshots/phantomjs/UniformGridLayoutUITest-collapsed_LINUX_PhantomJS_1_collapsed.png
diff --git a/uitest/reference-screenshots/UniformGridLayoutUITest-noncollapsed_LINUX_PhantomJS_1_noncollapsed.png b/uitest/reference-screenshots/phantomjs/UniformGridLayoutUITest-noncollapsed_LINUX_PhantomJS_1_noncollapsed.png
index 4a167fb072..4a167fb072 100755
--- a/uitest/reference-screenshots/UniformGridLayoutUITest-noncollapsed_LINUX_PhantomJS_1_noncollapsed.png
+++ b/uitest/reference-screenshots/phantomjs/UniformGridLayoutUITest-noncollapsed_LINUX_PhantomJS_1_noncollapsed.png
diff --git a/uitest/reference-screenshots/UploadTitleWithTooltipTest-testDropdownTable_LINUX_PhantomJS_1_UploadTitleWithTooltipTest-testDropdownTable.png b/uitest/reference-screenshots/phantomjs/UploadTitleWithTooltipTest-testDropdownTable_LINUX_PhantomJS_1_init.png
index e73e41148f..e73e41148f 100755
--- a/uitest/reference-screenshots/UploadTitleWithTooltipTest-testDropdownTable_LINUX_PhantomJS_1_UploadTitleWithTooltipTest-testDropdownTable.png
+++ b/uitest/reference-screenshots/phantomjs/UploadTitleWithTooltipTest-testDropdownTable_LINUX_PhantomJS_1_init.png
diff --git a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png
index f34d4142c6..f34d4142c6 100644
--- a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png
+++ b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_add.png
diff --git a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png
index 8fdeab57f5..8fdeab57f5 100644
--- a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png
index f36661506c..f36661506c 100644
--- a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png
+++ b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_move.png
diff --git a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png
index acffda6b2e..acffda6b2e 100644
--- a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png
+++ b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_remove.png
diff --git a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png
index 1d5ebe1c96..1d5ebe1c96 100644
--- a/uitest/reference-screenshots/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png
+++ b/uitest/reference-screenshots/phantomjs/VAddReplaceMoveTest-LayoutAlignment_LINUX_PhantomJS_1_replace.png
diff --git a/uitest/reference-screenshots/VAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png b/uitest/reference-screenshots/phantomjs/VAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png
index a23cc0d92f..a23cc0d92f 100644
--- a/uitest/reference-screenshots/VAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png
+++ b/uitest/reference-screenshots/phantomjs/VAlignmentTest-layoutAlignment_LINUX_PhantomJS_1_alignment.png
diff --git a/uitest/reference-screenshots/VCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png b/uitest/reference-screenshots/phantomjs/VCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png
index ffeea1be2e..ffeea1be2e 100644
--- a/uitest/reference-screenshots/VCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png
+++ b/uitest/reference-screenshots/phantomjs/VCaptionTest-LayoutCaption_LINUX_PhantomJS_1_caption.png
diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png
index d3424a727c..d3424a727c 100644
--- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png
index 2b9f19bfc9..2b9f19bfc9 100644
--- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png
+++ b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize100Percent.png
diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png
index 5963f94375..5963f94375 100644
--- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png
+++ b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize350px.png
diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png
index b90e3f4106..b90e3f4106 100644
--- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png
+++ b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize75Percent.png
diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png
index f3c24f12d9..f3c24f12d9 100644
--- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png
+++ b/uitest/reference-screenshots/phantomjs/VComponentSizingTest-ComponentSizing_LINUX_PhantomJS_1_setSize_-1px.png
diff --git a/uitest/reference-screenshots/VIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png b/uitest/reference-screenshots/phantomjs/VIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png
index 3b11e7c03e..3b11e7c03e 100644
--- a/uitest/reference-screenshots/VIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png
+++ b/uitest/reference-screenshots/phantomjs/VIconTest-LayoutIcon_LINUX_PhantomJS_1_icon.png
diff --git a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png b/uitest/reference-screenshots/phantomjs/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png
index e9b344751a..e9b344751a 100644
--- a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_100_0.png
diff --git a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png b/uitest/reference-screenshots/phantomjs/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png
index 849eb173e5..849eb173e5 100644
--- a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_25_75.png
diff --git a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png b/uitest/reference-screenshots/phantomjs/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png
index d72798d456..d72798d456 100644
--- a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_expand_50_50.png
diff --git a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png
index d72798d456..d72798d456 100644
--- a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutExpandTest-LayoutExpand_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png
index db9d36ec00..db9d36ec00 100644
--- a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png b/uitest/reference-screenshots/phantomjs/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png
index 571989b9f1..571989b9f1 100644
--- a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnSpaceOff.png
diff --git a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png b/uitest/reference-screenshots/phantomjs/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png
index 4f6ba58d5e..4f6ba58d5e 100644
--- a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png
diff --git a/uitest/reference-screenshots/VLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png b/uitest/reference-screenshots/phantomjs/VLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png
index a55fdbe5cf..a55fdbe5cf 100644
--- a/uitest/reference-screenshots/VLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutRegErrorTest-LayoutRegError_LINUX_PhantomJS_1_RegError.png
diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png
index d3424a727c..d3424a727c 100644
--- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_initial.png
diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png
index 2b9f19bfc9..2b9f19bfc9 100644
--- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize100Percent.png
diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png
index 5963f94375..5963f94375 100644
--- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png
diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png
index b90e3f4106..b90e3f4106 100644
--- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize75Percent.png
diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png
index f3c24f12d9..f3c24f12d9 100644
--- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png
+++ b/uitest/reference-screenshots/phantomjs/VLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize_-1px.png
diff --git a/uitest/reference-screenshots/VaadinIconSetTest-checkScreenshot_changeIcon_LINUX_PhantomJS_1_allVaadinIcons-switch.png b/uitest/reference-screenshots/phantomjs/VaadinIconSetTest-checkScreenshot_changeIcon_LINUX_PhantomJS_1_allVaadinIcons-switch.png
index 43552679d7..43552679d7 100644
--- a/uitest/reference-screenshots/VaadinIconSetTest-checkScreenshot_changeIcon_LINUX_PhantomJS_1_allVaadinIcons-switch.png
+++ b/uitest/reference-screenshots/phantomjs/VaadinIconSetTest-checkScreenshot_changeIcon_LINUX_PhantomJS_1_allVaadinIcons-switch.png
diff --git a/uitest/reference-screenshots/VaadinIconSetTest-checkScreenshot_initial_LINUX_PhantomJS_1_allVaadinIcons.png b/uitest/reference-screenshots/phantomjs/VaadinIconSetTest-checkScreenshot_initial_LINUX_PhantomJS_1_allVaadinIcons.png
index 898796aab8..898796aab8 100755
--- a/uitest/reference-screenshots/VaadinIconSetTest-checkScreenshot_initial_LINUX_PhantomJS_1_allVaadinIcons.png
+++ b/uitest/reference-screenshots/phantomjs/VaadinIconSetTest-checkScreenshot_initial_LINUX_PhantomJS_1_allVaadinIcons.png
diff --git a/uitest/reference-screenshots/WindowWithIconTest-testWindowWithIcon_LINUX_PhantomJS_1_icon-rendered-properly.png b/uitest/reference-screenshots/phantomjs/WindowWithIconTest-testWindowWithIcon_LINUX_PhantomJS_1_icon-rendered-properly.png
index 08a3f780ca..08a3f780ca 100755
--- a/uitest/reference-screenshots/WindowWithIconTest-testWindowWithIcon_LINUX_PhantomJS_1_icon-rendered-properly.png
+++ b/uitest/reference-screenshots/phantomjs/WindowWithIconTest-testWindowWithIcon_LINUX_PhantomJS_1_icon-rendered-properly.png
diff --git a/uitest/reference-screenshots/WindowZIndexTest-removingUpdatesZIndices_LINUX_PhantomJS_1_stacked.png b/uitest/reference-screenshots/phantomjs/WindowZIndexTest-removingUpdatesZIndices_LINUX_PhantomJS_1_stacked.png
index f405d2fcbf..f405d2fcbf 100644
--- a/uitest/reference-screenshots/WindowZIndexTest-removingUpdatesZIndices_LINUX_PhantomJS_1_stacked.png
+++ b/uitest/reference-screenshots/phantomjs/WindowZIndexTest-removingUpdatesZIndices_LINUX_PhantomJS_1_stacked.png
diff --git a/uitest/reference-screenshots/WindowZIndexTest-removingUpdatesZIndices_LINUX_PhantomJS_1_win4-on-top.png b/uitest/reference-screenshots/phantomjs/WindowZIndexTest-removingUpdatesZIndices_LINUX_PhantomJS_1_win4-on-top.png
index acf405ed00..acf405ed00 100644
--- a/uitest/reference-screenshots/WindowZIndexTest-removingUpdatesZIndices_LINUX_PhantomJS_1_win4-on-top.png
+++ b/uitest/reference-screenshots/phantomjs/WindowZIndexTest-removingUpdatesZIndices_LINUX_PhantomJS_1_win4-on-top.png
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java
index f5e078ab9f..cd28863d2d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java
@@ -25,7 +25,7 @@ public class TableTooManyColumnsTest extends MultiBrowserTest {
         TestBenchElementCommands scrollable = testBenchElement(menu);
         scrollable.scroll(3000);
 
-        compareScreen(getScreenshotBaseName());
+        compareScreen("init");
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
index 250bfca8e6..be61634c28 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
@@ -33,7 +33,7 @@ public class UploadTitleWithTooltipTest extends TooltipTest {
 
         checkTooltip(input, "tooltip");
 
-        compareScreen(getScreenshotBaseName());
+        compareScreen("init");
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
index a18573fc04..5e6f866b7f 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -25,6 +25,7 @@ import org.apache.http.HttpResponse;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicHttpEntityEnclosingRequest;
 import org.junit.Rule;
+import org.junit.rules.ExternalResource;
 import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
@@ -45,7 +46,6 @@ import org.openqa.selenium.remote.HttpCommandExecutor;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
 
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.UIProvider;
@@ -87,6 +87,17 @@ public abstract class AbstractTB3Test extends ParallelTest {
     @Rule
     public TestName testName = new TestName();
 
+    /*
+     * Rule for closing the application after test is done.
+     */
+    @Rule
+    public ExternalResource rule = new ExternalResource() {
+        @Override
+        protected void after() {
+            closeApplication();
+        }
+    };
+
     /**
      * Height of the screenshots we want to capture
      */
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 9a14fccb4a..455930bd14 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -1,25 +1,17 @@
 package com.vaadin.tests.tb3;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestRule;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-import org.openqa.selenium.Platform;
+import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
-import com.vaadin.testbench.Parameters;
-import com.vaadin.testbench.ScreenshotOnFailureRule;
+import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.screenshot.ImageFileUtil;
 
 /**
@@ -30,59 +22,32 @@ import com.vaadin.testbench.screenshot.ImageFileUtil;
  */
 public abstract class ScreenshotTB3Test extends AbstractTB3Test {
 
-    @Rule
-    public ScreenshotOnFailureRule screenshotOnFailure = new ScreenshotOnFailureRule(
-            this, true) {
-
-        @Override
-        protected void failed(Throwable throwable, Description description) {
-            super.failed(throwable, description);
-            closeApplication();
-        }
-
-        @Override
-        protected void succeeded(Description description) {
-            super.succeeded(description);
-            closeApplication();
-        }
-
-        @Override
-        protected File getErrorScreenshotFile(Description description) {
-            return ImageFileUtil
-                    .getErrorScreenshotFile(getScreenshotFailureName());
-        };
-    };
-
-    private String screenshotBaseName;
-
-    @Rule
-    public TestRule watcher = new TestWatcher() {
-
-        @Override
-        protected void starting(org.junit.runner.Description description) {
-            Class<?> testClass = description.getTestClass();
-            // Runner adds [BrowserName] which we do not want to use in the
-            // screenshot name
-            String testMethod = description.getMethodName();
-            testMethod = testMethod.replaceAll("\\[.*\\]", "");
-
-            String className = testClass.getSimpleName();
-            screenshotBaseName = className + "-" + testMethod;
-        }
-    };
-
     /**
      * Contains a list of screenshot identifiers for which
      * {@link #compareScreen(String)} has failed during the test
      */
-    private List<String> screenshotFailures;
+    private List<String> screenshotFailures = new ArrayList<>();
 
-    /**
-     * Defines TestBench screen comparison parameters before each test run
-     */
-    @Before
-    public void setupScreenComparisonParameters() {
-        screenshotFailures = new ArrayList<>();
+    @Override
+    public void setDriver(WebDriver driver) {
+        super.setDriver(driver);
+
+        // After setting up the driver, we can set the reference name generator.
+        String testClassName = getClass().getSimpleName();
+        testBench().setReferenceNameGenerator((identifier, capabilities) -> {
+            // Make sure error screenshot directory exists.
+            String browserFolder = capabilities.getBrowserName().toLowerCase()
+                    .replaceAll(" ", "");
+            Paths.get(ImageFileUtil.getScreenshotErrorDirectory(),
+                    browserFolder).toFile().mkdirs();
+            return Paths
+                    .get(browserFolder,
+                            String.format("%s-%s%s", testClassName,
+                                    testName.getMethodName().replace('[', '_')
+                                            .replace(']', '_'),
+                                    identifier))
+                    .toString();
+        });
     }
 
     /**
@@ -100,213 +65,20 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
      * @throws IOException
      */
     protected void compareScreen(String identifier) throws IOException {
-        compareScreen(null, identifier);
+        if (!testBench().compareScreen(identifier)) {
+            screenshotFailures.add(testBench().getReferenceNameGenerator()
+                    .generateName(identifier,
+                            ((HasCapabilities) getDriver()).getCapabilities()));
+        }
     }
 
     protected void compareScreen(WebElement element, String identifier)
             throws IOException {
-        if (identifier == null || identifier.isEmpty()) {
-            throw new IllegalArgumentException(
-                    "Empty identifier not supported");
-        }
-
-        File mainReference = getScreenshotReferenceFile(identifier);
-
-        List<File> referenceFiles = findReferenceAndAlternatives(mainReference);
-        List<File> failedReferenceFiles = new ArrayList<>();
-
-        for (File referenceFile : referenceFiles) {
-            boolean match = false;
-            if (element == null) {
-                // Full screen
-                match = testBench(driver).compareScreen(referenceFile);
-            } else {
-                // Only the element
-                match = customTestBench.compareScreen(element, referenceFile);
-            }
-            if (match) {
-                // There might be failure files because of retries in TestBench.
-                deleteFailureFiles(getErrorFileFromReference(referenceFile));
-                break;
-            } else {
-                failedReferenceFiles.add(referenceFile);
-            }
-        }
-
-        File referenceToKeep = null;
-        if (failedReferenceFiles.size() == referenceFiles.size()) {
-            // Ensure we use the correct browser version (e.g. if running IE11
-            // and only an IE 10 reference was available, then mainReference
-            // will be for IE 10, not 11)
-            String originalName = getScreenshotReferenceName(identifier);
-            File exactVersionFile = new File(originalName);
-
-            if (!exactVersionFile.equals(mainReference)) {
-                // Rename png+html to have the correct version
-                File correctPng = getErrorFileFromReference(exactVersionFile);
-                File producedPng = getErrorFileFromReference(mainReference);
-                File correctHtml = htmlFromPng(correctPng);
-                File producedHtml = htmlFromPng(producedPng);
-
-                producedPng.renameTo(correctPng);
-                producedHtml.renameTo(correctHtml);
-                referenceToKeep = exactVersionFile;
-                screenshotFailures.add(exactVersionFile.getName());
-            } else {
-                // All comparisons failed, keep the main error image + HTML
-                screenshotFailures.add(mainReference.getName());
-                referenceToKeep = mainReference;
-            }
-        }
-
-        // Remove all PNG/HTML files we no longer need (failed alternative
-        // references or all error files (PNG/HTML) if comparison succeeded)
-        for (File failedAlternative : failedReferenceFiles) {
-            File failurePng = getErrorFileFromReference(failedAlternative);
-            if (failedAlternative != referenceToKeep) {
-                // Delete png + HTML
-                deleteFailureFiles(failurePng);
-            }
-        }
-        if (referenceToKeep != null) {
-            File errorPng = getErrorFileFromReference(referenceToKeep);
-            enableAutoswitch(new File(errorPng.getParentFile(),
-                    errorPng.getName() + ".html"));
-        }
-    }
-
-    private CustomTestBenchCommandExecutor customTestBench = null;
-
-    @Override
-    public void setDriver(WebDriver driver) {
-        super.setDriver(driver);
-
-        // Set custom command executor
-        customTestBench = new CustomTestBenchCommandExecutor(getDriver());
-    }
-
-    private void enableAutoswitch(File htmlFile)
-            throws FileNotFoundException, IOException {
-        if (htmlFile == null || !htmlFile.exists()) {
-            return;
+        if (!((TestBenchElement) element).compareScreen(identifier)) {
+            screenshotFailures.add(testBench().getReferenceNameGenerator()
+                    .generateName(identifier,
+                            ((HasCapabilities) getDriver()).getCapabilities()));
         }
-
-        String html = FileUtils.readFileToString(htmlFile);
-
-        html = html.replace("body onclick=\"",
-                "body onclick=\"clearInterval(autoSwitch);");
-        html = html.replace("</script>",
-                ";autoSwitch=setInterval(switchImage,500);</script>");
-
-        FileUtils.writeStringToFile(htmlFile, html);
-    }
-
-    private void deleteFailureFiles(File failurePng) {
-        File failureHtml = htmlFromPng(failurePng);
-
-        failurePng.delete();
-        failureHtml.delete();
-    }
-
-    /**
-     * Returns a new File which points to a .html file instead of the given .png
-     * file
-     *
-     * @param png
-     * @return
-     */
-    private static File htmlFromPng(File png) {
-        return new File(png.getParentFile(),
-                png.getName().replaceAll("\\.png$", ".png.html"));
-    }
-
-    /**
-     *
-     * @param referenceFile
-     *            The reference image file (in the directory defined by
-     *            {@link #getScreenshotReferenceDirectory()})
-     * @return the file name of the file generated in the directory defined by
-     *         {@link #getScreenshotErrorDirectory()} if comparison with the
-     *         given reference image fails.
-     */
-    private File getErrorFileFromReference(File referenceFile) {
-
-        String absolutePath = referenceFile.getAbsolutePath();
-        String screenshotReferenceDirectory = Parameters
-                .getScreenshotReferenceDirectory();
-        String screenshotErrorDirectory = Parameters
-                .getScreenshotErrorDirectory();
-        // We throw an exception to safeguard against accidental reference
-        // deletion. See (#14446)
-        if (!absolutePath.contains(screenshotReferenceDirectory)) {
-            throw new IllegalStateException(
-                    "Reference screenshot not in reference directory. Screenshot path: '"
-                            + absolutePath + "', directory path: '"
-                            + screenshotReferenceDirectory + "'");
-        }
-        return new File(absolutePath.replace(screenshotReferenceDirectory,
-                screenshotErrorDirectory));
-    }
-
-    /**
-     * Finds alternative references for the given files
-     *
-     * @param reference
-     * @return all references which should be considered when comparing with the
-     *         given files, including the given reference
-     */
-    private List<File> findReferenceAndAlternatives(File reference) {
-        List<File> files = new ArrayList<>();
-        files.add(reference);
-
-        File screenshotDir = reference.getParentFile();
-        String name = reference.getName();
-        // Remove ".png"
-        String nameBase = name.substring(0, name.length() - 4);
-        for (int i = 1;; i++) {
-            File file = new File(screenshotDir, nameBase + "_" + i + ".png");
-            if (file.exists()) {
-                files.add(file);
-            } else {
-                break;
-            }
-        }
-
-        return files;
-    }
-
-    /**
-     * @param testName
-     * @return the reference file name to use for the given browser, as
-     *         described by {@literal capabilities}, and identifier
-     */
-    private File getScreenshotReferenceFile(String identifier) {
-        DesiredCapabilities capabilities = getDesiredCapabilities();
-
-        String originalName = getScreenshotReferenceName(identifier);
-        File exactVersionFile = new File(originalName);
-        if (exactVersionFile.exists()) {
-            return exactVersionFile;
-        }
-
-        String browserVersion = capabilities.getVersion();
-
-        // compare against screenshots for this version and older
-        // default such that if no particular version is requested, compare with
-        // any version
-        int maxVersion = 100;
-        if (browserVersion.matches("\\d+")) {
-            maxVersion = Integer.parseInt(browserVersion);
-        }
-        for (int version = maxVersion; version > 0; version--) {
-            String fileName = getScreenshotReferenceName(identifier, version);
-            File oldVersionFile = new File(fileName);
-            if (oldVersionFile.exists()) {
-                return oldVersionFile;
-            }
-        }
-
-        return exactVersionFile;
     }
 
     /**
@@ -323,167 +95,5 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
                     "The following screenshots did not match the reference: "
                             + screenshotFailures.toString());
         }
-
-    }
-
-    /**
-     * @return the name of a "failure" image which is stored in the folder
-     *         defined by {@link #getScreenshotErrorDirectory()} when the test
-     *         fails
-     */
-    private String getScreenshotFailureName() {
-        return getScreenshotBaseName() + "_" + getUniqueIdentifier(null, null)
-                + "-failure.png";
-    }
-
-    /**
-     * @return the base name used for screenshots. This is the first part of the
-     *         screenshot file name, typically created as "testclass-testmethod"
-     */
-    public String getScreenshotBaseName() {
-        return screenshotBaseName;
-    }
-
-    /**
-     * Returns the name of the reference file based on the given parameters.
-     *
-     * @param testName
-     * @param capabilities
-     * @param identifier
-     * @return the full path of the reference
-     */
-    private String getScreenshotReferenceName(String identifier) {
-        return getScreenshotReferenceName(identifier, null);
-    }
-
-    /**
-     * Returns the name of the reference file based on the given parameters.
-     * This method takes in a {@code versionOverride} parameter to find a
-     * specific version in the reference name. If the {@link Platform} defined
-     * in the {@link DesiredCapabilities} is {@code ANY}, this method will
-     * attempt different platforms in the reference file names if needed.
-     *
-     * @param identifier
-     * @param versionOverride
-     * @return the full path of the reference
-     */
-    private String getScreenshotReferenceName(String identifier,
-            Integer versionOverride) {
-        String fileName = getScreenshotReferenceName(identifier,
-                versionOverride, null);
-        File refFile = new File(fileName);
-        if (!refFile.exists()
-                && getDesiredCapabilities().getPlatform() == Platform.ANY) {
-            for (Platform p : Platform.values()) {
-                String tmpName = getScreenshotReferenceName(identifier,
-                        versionOverride, p);
-                if (new File(tmpName).exists()) {
-                    return tmpName;
-                }
-            }
-        }
-        return fileName;
-    }
-
-    /**
-     * Returns the name of the reference file based on the given parameters.This
-     * method takes in {@code versionOverride} and {@code platformOverride}
-     * parameters.
-     *
-     * @param identifier
-     * @param versionOverride
-     * @param platformOverride
-     * @return the full path of the reference
-     */
-    private String getScreenshotReferenceName(String identifier,
-            Integer versionOverride, Platform platformOverride) {
-        return Parameters.getScreenshotReferenceDirectory() + File.separator
-                + getScreenshotBaseName() + "_"
-                + getUniqueIdentifier(versionOverride, platformOverride) + "_"
-                + identifier + ".png";
-    }
-
-    private String getUniqueIdentifier(Integer versionOverride,
-            Platform platformOverride) {
-        String testNameAndParameters = testName.getMethodName();
-        // runTest-wildfly9-nginx[Windows_Firefox_24][/buffering/demo][valo]
-
-        String parameters = testNameAndParameters.substring(
-                testNameAndParameters.indexOf("[") + 1,
-                testNameAndParameters.length() - 1);
-        // Windows_Firefox_24][/buffering/demo][valo
-
-        parameters = parameters.replace("][", "_");
-        // Windows_Firefox_24_/buffering/demo_valo
-
-        parameters = parameters.replace("/", "");
-        // Windows_Firefox_24_bufferingdemo_valo
-
-        if (versionOverride != null) {
-            // Windows_Firefox_17_bufferingdemo_valo
-            int indexOfBrowser = parameters.indexOf("_") + 1;
-            parameters = parameters.substring(0, indexOfBrowser)
-                    + parameters.substring(indexOfBrowser).replaceFirst(
-                            "_" + getDesiredCapabilities().getVersion(),
-                            "_" + versionOverride);
-        }
-
-        if (platformOverride != null) {
-            // LINUX_Firefox_17_bufferingdemo_valo
-            parameters = getPlatformName(platformOverride)
-                    + parameters.substring(parameters.indexOf("_"));
-        }
-
-        return parameters;
-    }
-
-    private String getPlatformName(Platform platform) {
-        switch (platform) {
-        case WINDOWS:
-            // Reference file names have Windows instead of WINDOWS
-            return "Windows";
-        default:
-            return platform.name();
-        }
-    }
-
-    /**
-     * Returns the base name of the screenshot in the error directory. This is a
-     * name so that all files matching {@link #getScreenshotErrorBaseName()}*
-     * are owned by this test instance (taking into account
-     * {@link #getDesiredCapabilities()}) and can safely be removed before
-     * running this test.
-     */
-    private String getScreenshotErrorBaseName() {
-        return getScreenshotReferenceName("dummy", null)
-                .replace(Parameters.getScreenshotReferenceDirectory(),
-                        Parameters.getScreenshotErrorDirectory())
-                .replace("_dummy.png", "");
-    }
-
-    /**
-     * Removes any old screenshots related to this test from the errors
-     * directory before running the test
-     */
-    @Before
-    public void cleanErrorDirectory() {
-        // Remove any screenshots for this test from the error directory
-        // before running it. Leave unrelated files as-is
-        File errorDirectory = new File(
-                Parameters.getScreenshotErrorDirectory());
-
-        // Create errors directory if it does not exist
-        if (!errorDirectory.exists()) {
-            errorDirectory.mkdirs();
-        }
-
-        final String errorBase = getScreenshotErrorBaseName();
-        File[] files = errorDirectory.listFiles(pathname -> {
-            String thisFile = pathname.getAbsolutePath();
-            return thisFile.startsWith(errorBase);
-        });
-        for (File f : files) {
-            f.delete();
-        }
     }
 }