diff --git a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_drag_to_middle.png b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_drag_to_middle.png
index 959e5b1f3..97c8e668b 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_drag_to_middle.png and b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_drag_to_middle.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_given_element_dragged_to_the_second_position_when_dragged_back_then_first_element_is_visible_1.png b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_given_element_dragged_to_the_second_position_when_dragged_back_then_first_element_is_visible_1.png
index 0f10e00c3..c3e76de7b 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_given_element_dragged_to_the_second_position_when_dragged_back_then_first_element_is_visible_1.png and b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_given_element_dragged_to_the_second_position_when_dragged_back_then_first_element_is_visible_1.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_given_element_dragged_to_the_second_position_when_dragged_back_then_first_element_is_visible_2.png b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_given_element_dragged_to_the_second_position_when_dragged_back_then_first_element_is_visible_2.png
index 48095b68b..688a0204a 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_given_element_dragged_to_the_second_position_when_dragged_back_then_first_element_is_visible_2.png and b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_given_element_dragged_to_the_second_position_when_dragged_back_then_first_element_is_visible_2.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_drag_past_maximum_value_then_second_at_maximum_value_is_visible.png b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_drag_past_maximum_value_then_second_at_maximum_value_is_visible.png
index 9db3040e3..c7d718d90 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_drag_past_maximum_value_then_second_at_maximum_value_is_visible.png and b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_drag_past_maximum_value_then_second_at_maximum_value_is_visible.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_released_after_threshold_snaps_to_destination.png b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_released_after_threshold_snaps_to_destination.png
index 48095b68b..688a0204a 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_released_after_threshold_snaps_to_destination.png and b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_released_after_threshold_snaps_to_destination.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_released_before_threshold_snaps_to_origin.png b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_released_before_threshold_snaps_to_origin.png
index 48095b68b..688a0204a 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_released_before_threshold_snaps_to_origin.png and b/appyx-components/internal/test-drive/android/screenshots/GesturesTest_when_released_before_threshold_snaps_to_origin.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_all_at_once.png b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_all_at_once.png
index 98da05d24..b1b464b6b 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_all_at_once.png and b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_all_at_once.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_one_segment.png b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_one_segment.png
index be735f6d9..201836f3c 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_one_segment.png and b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_one_segment.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_sequential.png b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_sequential.png
index b4577c37f..1f275a87c 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_sequential.png and b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_basic_behaviour_sequential.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_when_keyframe_is_running_then_possible_to_enqueue_more_operations.png b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_when_keyframe_is_running_then_possible_to_enqueue_more_operations.png
index efa54fcd3..a09aae1ef 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_when_keyframe_is_running_then_possible_to_enqueue_more_operations.png and b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_when_keyframe_is_running_then_possible_to_enqueue_more_operations.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_when_passing_segment_threshold_then_no_artefacts.png b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_when_passing_segment_threshold_then_no_artefacts.png
index 9db3040e3..c7d718d90 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_when_passing_segment_threshold_then_no_artefacts.png and b/appyx-components/internal/test-drive/android/screenshots/KeyframesTest_when_passing_segment_threshold_then_no_artefacts.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/KeyframesToUpdateTest_when_in_segment_interrupt_with_update.png b/appyx-components/internal/test-drive/android/screenshots/KeyframesToUpdateTest_when_in_segment_interrupt_with_update.png
index 0874b85a4..644a98ead 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/KeyframesToUpdateTest_when_in_segment_interrupt_with_update.png and b/appyx-components/internal/test-drive/android/screenshots/KeyframesToUpdateTest_when_in_segment_interrupt_with_update.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/UpdateTest_basic_behaviour_multiple.png b/appyx-components/internal/test-drive/android/screenshots/UpdateTest_basic_behaviour_multiple.png
index 583973461..c9faab2dd 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/UpdateTest_basic_behaviour_multiple.png and b/appyx-components/internal/test-drive/android/screenshots/UpdateTest_basic_behaviour_multiple.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/UpdateTest_basic_behaviour_one_update.png b/appyx-components/internal/test-drive/android/screenshots/UpdateTest_basic_behaviour_one_update.png
index ae8d87053..330edd04e 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/UpdateTest_basic_behaviour_one_update.png and b/appyx-components/internal/test-drive/android/screenshots/UpdateTest_basic_behaviour_one_update.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/UpdateToKeyframesTest_when_animation_settles_go_back_to_keyframe_mode.png b/appyx-components/internal/test-drive/android/screenshots/UpdateToKeyframesTest_when_animation_settles_go_back_to_keyframe_mode.png
index 5ee895f2d..f0768483b 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/UpdateToKeyframesTest_when_animation_settles_go_back_to_keyframe_mode.png and b/appyx-components/internal/test-drive/android/screenshots/UpdateToKeyframesTest_when_animation_settles_go_back_to_keyframe_mode.png differ
diff --git a/appyx-components/internal/test-drive/android/screenshots/UpdateToKeyframesTest_when_update_not_settled_keyframe_is_update.png b/appyx-components/internal/test-drive/android/screenshots/UpdateToKeyframesTest_when_update_not_settled_keyframe_is_update.png
index 911ef305d..421eb24ab 100644
Binary files a/appyx-components/internal/test-drive/android/screenshots/UpdateToKeyframesTest_when_update_not_settled_keyframe_is_update.png and b/appyx-components/internal/test-drive/android/screenshots/UpdateToKeyframesTest_when_update_not_settled_keyframe_is_update.png differ
diff --git a/appyx-components/stable/spotlight/android/screenshots/SpotlightGeometryTest_perform_gesture_slide.png b/appyx-components/stable/spotlight/android/screenshots/SpotlightGeometryTest_perform_gesture_slide.png
deleted file mode 100644
index c2d6ac129..000000000
Binary files a/appyx-components/stable/spotlight/android/screenshots/SpotlightGeometryTest_perform_gesture_slide.png and /dev/null differ
diff --git a/appyx-components/stable/spotlight/android/screenshots/SpotlightGeometryTest_when_keyframe_operation_then_scroll_using_geometry.png b/appyx-components/stable/spotlight/android/screenshots/SpotlightGeometryTest_when_keyframe_operation_then_scroll_using_geometry.png
deleted file mode 100644
index 8cb95a3dd..000000000
Binary files a/appyx-components/stable/spotlight/android/screenshots/SpotlightGeometryTest_when_keyframe_operation_then_scroll_using_geometry.png and /dev/null differ
diff --git a/appyx-components/stable/spotlight/android/screenshots/SpotlightGeometryTest_when_update__operation_then_scroll_using_geometry.png b/appyx-components/stable/spotlight/android/screenshots/SpotlightGeometryTest_when_update__operation_then_scroll_using_geometry.png
deleted file mode 100644
index 9482d6765..000000000
Binary files a/appyx-components/stable/spotlight/android/screenshots/SpotlightGeometryTest_when_update__operation_then_scroll_using_geometry.png and /dev/null differ
diff --git a/appyx-components/stable/spotlight/android/screenshots/SpotlightViewpointTest_when_keyframe_operation_then_scroll_using_viewpoint.png b/appyx-components/stable/spotlight/android/screenshots/SpotlightViewpointTest_when_keyframe_operation_then_scroll_using_viewpoint.png
new file mode 100644
index 000000000..1b5958eb2
Binary files /dev/null and b/appyx-components/stable/spotlight/android/screenshots/SpotlightViewpointTest_when_keyframe_operation_then_scroll_using_viewpoint.png differ
diff --git a/appyx-components/stable/spotlight/android/screenshots/SpotlightViewpointTest_when_update__operation_then_scroll_using_viewpoint.png b/appyx-components/stable/spotlight/android/screenshots/SpotlightViewpointTest_when_update__operation_then_scroll_using_viewpoint.png
new file mode 100644
index 000000000..5452671bf
Binary files /dev/null and b/appyx-components/stable/spotlight/android/screenshots/SpotlightViewpointTest_when_update__operation_then_scroll_using_viewpoint.png differ