diff --git a/container/testdata/doctabs/desktop/change_content_change_hidden.xml b/container/testdata/doctabs/desktop/change_content_change_hidden.xml
index 1e55451e19..b1e86d557e 100644
--- a/container/testdata/doctabs/desktop/change_content_change_hidden.xml
+++ b/container/testdata/doctabs/desktop/change_content_change_hidden.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/change_content_change_visible.xml b/container/testdata/doctabs/desktop/change_content_change_visible.xml
index 1e55451e19..b1e86d557e 100644
--- a/container/testdata/doctabs/desktop/change_content_change_visible.xml
+++ b/container/testdata/doctabs/desktop/change_content_change_visible.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/change_content_initial.xml b/container/testdata/doctabs/desktop/change_content_initial.xml
index b359c92c0f..a61b402fc3 100644
--- a/container/testdata/doctabs/desktop/change_content_initial.xml
+++ b/container/testdata/doctabs/desktop/change_content_initial.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/change_label_change_selected.xml b/container/testdata/doctabs/desktop/change_label_change_selected.xml
index cc09a703b6..b47e516426 100644
--- a/container/testdata/doctabs/desktop/change_label_change_selected.xml
+++ b/container/testdata/doctabs/desktop/change_label_change_selected.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/change_label_change_unselected.xml b/container/testdata/doctabs/desktop/change_label_change_unselected.xml
index d957098bfe..1f364b2f51 100644
--- a/container/testdata/doctabs/desktop/change_label_change_unselected.xml
+++ b/container/testdata/doctabs/desktop/change_label_change_unselected.xml
@@ -11,6 +11,14 @@
New 2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/change_label_initial.xml b/container/testdata/doctabs/desktop/change_label_initial.xml
index b359c92c0f..a61b402fc3 100644
--- a/container/testdata/doctabs/desktop/change_label_initial.xml
+++ b/container/testdata/doctabs/desktop/change_label_initial.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml b/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml
index 9778934b25..028c27a500 100644
--- a/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml
+++ b/container/testdata/doctabs/desktop/dynamic_appended_another_three.xml
@@ -17,6 +17,14 @@
Test5
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/hover_all_tabs.xml b/container/testdata/doctabs/desktop/hover_all_tabs.xml
index 314b2f6cee..bb8b21d13f 100644
--- a/container/testdata/doctabs/desktop/hover_all_tabs.xml
+++ b/container/testdata/doctabs/desktop/hover_all_tabs.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/hover_create_tab.xml b/container/testdata/doctabs/desktop/hover_create_tab.xml
index a1500a7e90..6fa4e967e0 100644
--- a/container/testdata/doctabs/desktop/hover_create_tab.xml
+++ b/container/testdata/doctabs/desktop/hover_create_tab.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/hover_first.xml b/container/testdata/doctabs/desktop/hover_first.xml
index 4be6a11db7..9acfbec647 100644
--- a/container/testdata/doctabs/desktop/hover_first.xml
+++ b/container/testdata/doctabs/desktop/hover_first.xml
@@ -15,6 +15,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/hover_first_close.xml b/container/testdata/doctabs/desktop/hover_first_close.xml
index a1500a7e90..6fa4e967e0 100644
--- a/container/testdata/doctabs/desktop/hover_first_close.xml
+++ b/container/testdata/doctabs/desktop/hover_first_close.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/hover_none.xml b/container/testdata/doctabs/desktop/hover_none.xml
index 682a7007bc..9cb5cb7ea6 100644
--- a/container/testdata/doctabs/desktop/hover_none.xml
+++ b/container/testdata/doctabs/desktop/hover_none.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/hover_second.xml b/container/testdata/doctabs/desktop/hover_second.xml
index a1500a7e90..6fa4e967e0 100644
--- a/container/testdata/doctabs/desktop/hover_second.xml
+++ b/container/testdata/doctabs/desktop/hover_second.xml
@@ -11,6 +11,14 @@
Test2
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/single_custom_theme.png b/container/testdata/doctabs/desktop/single_custom_theme.png
index 7197ee627c..6d5ae8beda 100644
Binary files a/container/testdata/doctabs/desktop/single_custom_theme.png and b/container/testdata/doctabs/desktop/single_custom_theme.png differ
diff --git a/container/testdata/doctabs/desktop/tab_location_bottom.xml b/container/testdata/doctabs/desktop/tab_location_bottom.xml
index 754e403fa7..96ba300583 100644
--- a/container/testdata/doctabs/desktop/tab_location_bottom.xml
+++ b/container/testdata/doctabs/desktop/tab_location_bottom.xml
@@ -14,6 +14,14 @@
Test3
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/tab_location_leading.xml b/container/testdata/doctabs/desktop/tab_location_leading.xml
index 241e0d0999..f0eb4c9211 100644
--- a/container/testdata/doctabs/desktop/tab_location_leading.xml
+++ b/container/testdata/doctabs/desktop/tab_location_leading.xml
@@ -14,6 +14,14 @@
Test3
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/tab_location_top.xml b/container/testdata/doctabs/desktop/tab_location_top.xml
index 7bea301c58..438035a270 100644
--- a/container/testdata/doctabs/desktop/tab_location_top.xml
+++ b/container/testdata/doctabs/desktop/tab_location_top.xml
@@ -14,6 +14,14 @@
Test3
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/tab_location_trailing.xml b/container/testdata/doctabs/desktop/tab_location_trailing.xml
index afb835ef7e..a3d0ce21df 100644
--- a/container/testdata/doctabs/desktop/tab_location_trailing.xml
+++ b/container/testdata/doctabs/desktop/tab_location_trailing.xml
@@ -14,6 +14,14 @@
Test3
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/tapped_all_tabs.xml b/container/testdata/doctabs/desktop/tapped_all_tabs.xml
index 4b43f9313e..fefd67ccbc 100644
--- a/container/testdata/doctabs/desktop/tapped_all_tabs.xml
+++ b/container/testdata/doctabs/desktop/tapped_all_tabs.xml
@@ -17,6 +17,14 @@
Another
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/tapped_create_tab.xml b/container/testdata/doctabs/desktop/tapped_create_tab.xml
index 4973166839..cc69c4bba9 100644
--- a/container/testdata/doctabs/desktop/tapped_create_tab.xml
+++ b/container/testdata/doctabs/desktop/tapped_create_tab.xml
@@ -17,6 +17,14 @@
Another
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/tapped_first_selected.xml b/container/testdata/doctabs/desktop/tapped_first_selected.xml
index 57c1125896..9f84d19235 100644
--- a/container/testdata/doctabs/desktop/tapped_first_selected.xml
+++ b/container/testdata/doctabs/desktop/tapped_first_selected.xml
@@ -14,6 +14,14 @@
Test3
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/tapped_second_selected.xml b/container/testdata/doctabs/desktop/tapped_second_selected.xml
index 4f7353cd9d..d6690b0149 100644
--- a/container/testdata/doctabs/desktop/tapped_second_selected.xml
+++ b/container/testdata/doctabs/desktop/tapped_second_selected.xml
@@ -14,6 +14,14 @@
Test3
+
+
+
+
+
+
+
+
diff --git a/container/testdata/doctabs/desktop/tapped_third_selected.xml b/container/testdata/doctabs/desktop/tapped_third_selected.xml
index 8de614f68d..0258e9a724 100644
--- a/container/testdata/doctabs/desktop/tapped_third_selected.xml
+++ b/container/testdata/doctabs/desktop/tapped_third_selected.xml
@@ -14,6 +14,14 @@
Test3
+
+
+
+
+
+
+
+
diff --git a/internal/driver/glfw/testdata/windows_hover_object.xml b/internal/driver/glfw/testdata/windows_hover_object.xml
index f976ba37bb..2ca1c21160 100644
--- a/internal/driver/glfw/testdata/windows_hover_object.xml
+++ b/internal/driver/glfw/testdata/windows_hover_object.xml
@@ -1,36 +1,35 @@
-