diff --git a/src/Controls/src/Core/View/View.cs b/src/Controls/src/Core/View/View.cs
index 181665d4b69e..e8eb9888861b 100644
--- a/src/Controls/src/Core/View/View.cs
+++ b/src/Controls/src/Core/View/View.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Maui.Controls
/// This is the base class for and most of the controls.
/// Because ultimately inherits from , application developers can use the Model-View-ViewModel architecture, as well as XAML, to develop portable user interfaces.
///
- public partial class View : VisualElement, IViewController, IGestureController, IGestureRecognizers, IView, IPropertyMapperView, IHotReloadableView, IControlsView
+ public partial class View : VisualElement, IViewController, IGestureController, IGestureRecognizers, IView, IPropertyMapperView, IHotReloadableView, IControlsView, IViewWithWindow
{
protected internal IGestureController GestureController => this;
@@ -287,6 +287,7 @@ bool ValidateGesture(IGestureRecognizer gesture)
Thickness IView.Margin => Margin;
partial void HandlerChangedPartial();
GestureManager _gestureManager;
+ IWindow? IViewWithWindow.Window => Window;
private protected override void OnHandlerChangedCore()
{
diff --git a/src/Controls/tests/DeviceTests/Elements/View/ViewTests.Android.cs b/src/Controls/tests/DeviceTests/Elements/View/ViewTests.Android.cs
index 1b1a8bfc0ca2..392d1a557c55 100644
--- a/src/Controls/tests/DeviceTests/Elements/View/ViewTests.Android.cs
+++ b/src/Controls/tests/DeviceTests/Elements/View/ViewTests.Android.cs
@@ -16,6 +16,7 @@
using Microsoft.Maui.Platform;
using Xunit;
using Xunit.Sdk;
+using Microsoft.Maui.Devices;
namespace Microsoft.Maui.DeviceTests
{
@@ -81,8 +82,7 @@ await CreateHandlerAndAddToWindow(grid, (LayoutHandler handler) =>
// This fails sometimes due to the way we arrange the content based on coordinates instead of size
// Assert.Equal(expectedWidth, pxFrame.Width);
- Assert.True(pxFrame.Left == lastRight);
-
+ Assert.True(pxFrame.Left == lastRight, $"ColumnCount: {columnCount} Expected Left {lastRight} but got {pxFrame.Left} for child {i} Device Info: {DeviceDisplay.Current.MainDisplayInfo}");
lastRight = pxFrame.Right;
}
});
diff --git a/src/Controls/tests/DeviceTests/Stubs/WindowHandlerStub.Android.cs b/src/Controls/tests/DeviceTests/Stubs/WindowHandlerStub.Android.cs
index 34666b2b8364..aa3fd413c90d 100644
--- a/src/Controls/tests/DeviceTests/Stubs/WindowHandlerStub.Android.cs
+++ b/src/Controls/tests/DeviceTests/Stubs/WindowHandlerStub.Android.cs
@@ -17,6 +17,11 @@ public class WindowHandlerStub : ElementHandler, IWindowHand
[nameof(IWindow.Content)] = MapContent
};
+ public static CommandMapper CommandMapper = new(ElementCommandMapper)
+ {
+ [nameof(IWindow.RequestDisplayDensity)] = WindowHandler.MapRequestDisplayDensity,
+ };
+
public AView PlatformViewUnderTest { get; private set; }
void UpdateContent()
@@ -50,7 +55,7 @@ protected override void DisconnectHandler(AActivity platformView)
}
public WindowHandlerStub()
- : base(WindowMapper)
+ : base(WindowMapper, CommandMapper)
{
}
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlyMultiple.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlyMultiple.png
index eaa2d1c40c8d..59ffd720a937 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlyMultiple.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlyMultiple.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlyNone.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlyNone.png
index fb150b2a7eae..e136e1d386cc 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlyNone.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlyNone.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlySingle.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlySingle.png
index 8ea8c6b6cb91..1cd5047db227 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlySingle.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/AccessibilityTraitsSetCorrectlySingle.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png
index b559fb45eac4..a0db669d5660 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png
index 06e6dcb97e8b..5ecb43debb24 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipNull_NoCrash.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipNull_NoCrash.png
index 4657a302f690..e255cec472fe 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipNull_NoCrash.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipNull_NoCrash.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithNestedContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithNestedContent.png
index 7a39d95392b9..edec2f4d4a39 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithNestedContent.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithNestedContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithRotation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithRotation.png
index f1bbd0ac154f..7ffd20c942de 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithRotation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithRotation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithRotationAndScale.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithRotationAndScale.png
index a6a93d0c9278..b77c3ad2e13f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithRotationAndScale.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithRotationAndScale.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithShadow.png
index ac8467495961..3c0399e8579b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeColorBlue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeColorBlue.png
index f8fc58540653..9c9b06b02c4e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeColorBlue.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeColorBlue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeColorGreen.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeColorGreen.png
index faae13b57760..a1c00094a24c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeColorGreen.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeColorGreen.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeShapeRoundRectangle.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeShapeRoundRectangle.png
index 11e4d0541ec4..e7453b2813bb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeShapeRoundRectangle.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeShapeRoundRectangle.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeThickness.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeThickness.png
index 7f9bf35ecc87..a8621533b7ee 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeThickness.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_ClipWithStrokeThickness.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithContent_Button.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithContent_Button.png
index b0e1526301c8..81ce3a628b86 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithContent_Button.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithContent_Button.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithDashArrayAndOffset.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithDashArrayAndOffset.png
index 9322ab56fb36..74e58c267368 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithDashArrayAndOffset.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithDashArrayAndOffset.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithStrokeShape_RoundRectangle.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithStrokeShape_RoundRectangle.png
index 6f9e23ba6998..0de44e068bde 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithStrokeShape_RoundRectangle.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithStrokeShape_RoundRectangle.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithStrokeThickness.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithStrokeThickness.png
index 69734c76263c..2dd07319764f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithStrokeThickness.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeColorWithStrokeThickness.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeDashArrayWithStrokeColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeDashArrayWithStrokeColor.png
index 482e8d0bf50d..7e86f0122350 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeDashArrayWithStrokeColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeDashArrayWithStrokeColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeGradientBrush.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeGradientBrush.png
index d754e38db83e..9c250b1af710 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeGradientBrush.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_StrokeGradientBrush.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BoxView_ClipWithColorGreen.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BoxView_ClipWithColorGreen.png
index 287a47c82102..e2bf8374913c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BoxView_ClipWithColorGreen.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BoxView_ClipWithColorGreen.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Button_ClipWithImageSource.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Button_ClipWithImageSource.png
index 7c822f2c9062..fa1af8aac184 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Button_ClipWithImageSource.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Button_ClipWithImageSource.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png
index 1c5b45610a9e..1b2008aad0c4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png
index 711fa530c132..8f81fe099bbf 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CarouselViewShouldRenderCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CarouselViewShouldRenderCorrectly.png
index 38d36f30bb96..5138c8e3a2e1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CarouselViewShouldRenderCorrectly.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CarouselViewShouldRenderCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewMeasureFirstItem.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewMeasureFirstItem.png
index 57053630bc6e..eada1caa87b3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewMeasureFirstItem.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewMeasureFirstItem.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewShouldChangeItemsLayout.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewShouldChangeItemsLayout.png
index 74922ffd3a7c..d8eee2450a64 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewShouldChangeItemsLayout.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewShouldChangeItemsLayout.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipNull_NoCrash.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipNull_NoCrash.png
index fd1a43363a61..df43358ca97b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipNull_NoCrash.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipNull_NoCrash.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithEllipseGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithEllipseGeometry.png
index 2669b578e125..58f5f86380ed 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithEllipseGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithEllipseGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithNestedClippedContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithNestedClippedContent.png
index 230ae52972ba..9049a2e16368 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithNestedClippedContent.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithNestedClippedContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithRectangleGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithRectangleGeometry.png
index 7c45c3281911..481a54670fa3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithRectangleGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithRectangleGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithRoundRectangleGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithRoundRectangleGeometry.png
index 41e8720174ad..7c51715e5c5f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithRoundRectangleGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithRoundRectangleGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithShadow.png
index 9a715861e41c..4d010dae106a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentView_ClipWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithBackgroundColor.png
index f199b34dd739..35ac1ee5203f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithBackgroundColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithFlowDirection.png
index 36a576ba3a35..389a3e7943da 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithShadow.png
index 46b245fbc838..e24394da9a5c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/DefaultContentWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithBackgroundColor.png
index 8a4d4bad537d..8f46d1bf1f9f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithBackgroundColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithFlowDirection.png
index b73bfd9fd02a..288ac2a87597 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayoutWithBindableLayoutDisplaysLabels.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayoutWithBindableLayoutDisplaysLabels.png
index aa042e655a97..5066f956fd2e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayoutWithBindableLayoutDisplaysLabels.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayoutWithBindableLayoutDisplaysLabels.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignItemsCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignItemsCenter.png
index e6759b99a74b..3f5c419f5afd 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignItemsCenter.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignItemsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignItemsEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignItemsEnd.png
index de38200b8795..211afbd9dcb7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignItemsEnd.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignItemsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignSelfEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignSelfEnd.png
index 31a39d2a410f..b1de3158b2b1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignSelfEnd.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_AlignSelfEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisAuto_DirectionColumnReverse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisAuto_DirectionColumnReverse.png
index 689402a3571a..ccb00c076802 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisAuto_DirectionColumnReverse.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisAuto_DirectionColumnReverse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisFixed_DirectionColumnReverse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisFixed_DirectionColumnReverse.png
index b5c7faaa33f0..9bad72061f8d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisFixed_DirectionColumnReverse.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisFixed_DirectionColumnReverse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisPercentage_DirectionColumnReverse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisPercentage_DirectionColumnReverse.png
index 0e4595df780d..19c2741d6dda 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisPercentage_DirectionColumnReverse.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_BasisPercentage_DirectionColumnReverse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_DirectionColumnReverse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_DirectionColumnReverse.png
index 258a6d0e68d9..16f320d10697 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_DirectionColumnReverse.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_DirectionColumnReverse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentCenter.png
index ff4de5cec974..a584d5d57a4e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentCenter.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentEnd.png
index 0ccc26c3f6b0..2f06ee0a4425 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentEnd.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceAround.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceAround.png
index 5fd0ee8a7d54..d5dcc3eee0bd 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceAround.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceAround.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceBetween.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceBetween.png
index 376ca2d1d241..d9ec77ca4668 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceBetween.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceBetween.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceEvenly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceEvenly.png
index 63e6f527e902..64477aed0610 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceEvenly.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapAlignContentSpaceEvenly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentCenter.png
index a0183d82a541..a5725fb96f15 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentCenter.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentStart.png
index c21a1a8c6eb5..eca4eb554cce 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentStart.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentStretch.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentStretch.png
index 9f963d656311..4f832fe51686 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentStretch.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FlexLayout_SetWrapReverseAlignContentStretch.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FooterShouldBeRemovedWhenSetToNull.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FooterShouldBeRemovedWhenSetToNull.png
index d355bf043be7..bcf51091c180 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FooterShouldBeRemovedWhenSetToNull.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FooterShouldBeRemovedWhenSetToNull.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterGridWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterGridWorks.png
index 5735d443afe2..40bdc6db4322 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterGridWorks.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterGridWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterTemplateWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterTemplateWorks.png
index cb1e3dff6dfe..7f820b3a0b97 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterTemplateWorks.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterTemplateWorks.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderShouldBeRemovedWhenSetToNull.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderShouldBeRemovedWhenSetToNull.png
index 30d9defd2692..9ccb056923ff 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderShouldBeRemovedWhenSetToNull.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderShouldBeRemovedWhenSetToNull.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection.png
index a186afd196ab..eb54f10abad2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_Height.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_Height.png
index 0d6568300a3f..d78d30b52b72 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_Height.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png
index 6038806a5536..71ac2a156f1c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_Width.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_Width.png
index 2daef113a359..b44384b88f0e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_Width.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_RTLFlowDirection_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_RTL.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_RTL.png
index 9fb23e17f0e1..a0a4bfdd4f37 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_RTL.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_RTL.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_Aspect_State_Fill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_Aspect_State_Fill.png
index 06b9b13cf32e..72333cc2fbac 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_Aspect_State_Fill.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_Aspect_State_Fill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderColor_WithBackground.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderColor_WithBackground.png
index 81f4b3a5f167..083aad76ae27 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderColor_WithBackground.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderColor_WithBackground.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderWidth_WithBackground.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderWidth_WithBackground.png
index 23096c338710..85a4e8e10389 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderWidth_WithBackground.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderWidth_WithBackground.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_Padding_Removed.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_Padding_Removed.png
index 527cd4020f12..f2fd6606f62e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_Padding_Removed.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_Padding_Removed.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithEllipseGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithEllipseGeometry.png
index 60402389e054..32f9abaeaae1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithEllipseGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithEllipseGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithRectangleGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithRectangleGeometry.png
index c0a84e0e1dad..10eb14f68802 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithRectangleGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithRectangleGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithRoundRectangleGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithRoundRectangleGeometry.png
index 700388de0b31..9040a82631a0 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithRoundRectangleGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithRoundRectangleGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithScale.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithScale.png
index 504c26a6a860..a19f87a93430 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithScale.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithScale.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithShadow.png
index cabc5e3d7036..120231e87e61 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButton_ClipWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipNull_NoCrash.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipNull_NoCrash.png
index f82464a58d97..0bf4991f988c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipNull_NoCrash.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipNull_NoCrash.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithArcSegmentPath.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithArcSegmentPath.png
index 1881a925059c..8b07901a73ef 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithArcSegmentPath.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithArcSegmentPath.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithBezierSegmentPath.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithBezierSegmentPath.png
index 7d5641edb58e..e0697112c155 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithBezierSegmentPath.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithBezierSegmentPath.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithComplexPolyBezierAndRotation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithComplexPolyBezierAndRotation.png
index af0dc92a5d78..df012ad47807 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithComplexPolyBezierAndRotation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithComplexPolyBezierAndRotation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithComplexPolyLineGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithComplexPolyLineGeometry.png
index 7feb4d57b5a3..49c76a9de5b6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithComplexPolyLineGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithComplexPolyLineGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithEllipseGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithEllipseGeometry.png
index 01448b4a1e38..1c83fe6ac78e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithEllipseGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithEllipseGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithGeometryGroup.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithGeometryGroup.png
index c7f3f106b0e0..526722b63899 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithGeometryGroup.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithGeometryGroup.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithLineSegmentPath.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithLineSegmentPath.png
index ea5f38258d59..7057a4a88802 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithLineSegmentPath.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithLineSegmentPath.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyBezierSegmentPath.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyBezierSegmentPath.png
index 0c6f6be6087f..d5b19f45b64f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyBezierSegmentPath.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyBezierSegmentPath.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyLineSegmentPath.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyLineSegmentPath.png
index 73e936f87aaa..b6b64fe49d71 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyLineSegmentPath.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyLineSegmentPath.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyQuadraticBezierSegmentPath.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyQuadraticBezierSegmentPath.png
index af88b8f5cf72..bf1210b5988b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyQuadraticBezierSegmentPath.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithPolyQuadraticBezierSegmentPath.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithQuadraticBezierSegmentPath.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithQuadraticBezierSegmentPath.png
index f22e92fe41e0..f42f5229ea64 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithQuadraticBezierSegmentPath.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithQuadraticBezierSegmentPath.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRectangleGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRectangleGeometry.png
index 6e334db05733..d6c98f0898f5 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRectangleGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRectangleGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRotation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRotation.png
index cba8914bc4ac..38b7f8967f9e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRotation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRotation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRoundRectangleGeometry.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRoundRectangleGeometry.png
index a752a9a59ca9..0651b46d43b9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRoundRectangleGeometry.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithRoundRectangleGeometry.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithScale.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithScale.png
index 0f5f4f893d44..2e347fe45410 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithScale.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Image_ClipWithScale.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test.png
index 1f3ca951928b..f5d1fab28175 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_1.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_1.png
index 87e0b8f27731..a70fee74cbbd 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_1.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_1.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_2.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_2.png
index 2c3b7e0b3cc7..b3a1a332e22b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_2.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_2.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_3.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_3.png
index 088f43d811c1..b2dd4b022ece 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_3.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_3.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_4.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_4.png
index 4e4d91dbf6b7..ee848563f3d5 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_4.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_4.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_5.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_5.png
index 9b2e44b9da18..bc2f7d9c1f67 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_5.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue24414Test_5.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ItemImageSourceShouldBeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ItemImageSourceShouldBeVisible.png
index 34fe4a3ec89b..ed26af336578 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ItemImageSourceShouldBeVisible.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ItemImageSourceShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithDifferentFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithDifferentFontSize.png
index 72f607cfd82c..19bb9813d2ff 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithDifferentFontSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithDifferentFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithFormattedText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithFormattedText.png
index e781a4885c9f..057f4ead1b86 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithFormattedText.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithFormattedText.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithLongText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithLongText.png
index 0f4a8ac73744..70431d84bc5a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithLongText.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithLongText.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithRotation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithRotation.png
index 402323206bb9..a8ab76f061ce 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithRotation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Label_ClipWithRotation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LayoutShouldBeCorrectOnFirstNavigation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LayoutShouldBeCorrectOnFirstNavigation.png
index 94c9b3f38387..38b1fbaa9585 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LayoutShouldBeCorrectOnFirstNavigation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LayoutShouldBeCorrectOnFirstNavigation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SelectItem_VerifySelectedItem.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SelectItem_VerifySelectedItem.png
index c88cbf95f701..0066b40bd223 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SelectItem_VerifySelectedItem.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SelectItem_VerifySelectedItem.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetCharacterSpacingAndTitle_VerifyBoth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetCharacterSpacingAndTitle_VerifyBoth.png
index 78e29726dc0c..6594a93523ef 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetCharacterSpacingAndTitle_VerifyBoth.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetCharacterSpacingAndTitle_VerifyBoth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetCharacterSpacing_VerifyCharacterSpacingLabel.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetCharacterSpacing_VerifyCharacterSpacingLabel.png
index acf4f1984e1b..511261f06e54 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetCharacterSpacing_VerifyCharacterSpacingLabel.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetCharacterSpacing_VerifyCharacterSpacingLabel.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFlowDirectionRTLAndTitle_VerifyFlowDirectionAndTitle.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFlowDirectionRTLAndTitle_VerifyFlowDirectionAndTitle.png
index e3f01741fc10..b74a24af6557 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFlowDirectionRTLAndTitle_VerifyFlowDirectionAndTitle.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFlowDirectionRTLAndTitle_VerifyFlowDirectionAndTitle.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png
index 71a7ad68ab07..b7b4624ad9bc 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png
index 41cd16df9e03..ba3697bf1e85 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png
index bf72765387fd..f479a0b94332 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png
index 11cdff160fb1..34c8953c4f68 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png
index ba60d54f35a8..beae8affec1b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetHorizontalTextAlignmentEndAndTitle_VerifyTitleAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetHorizontalTextAlignmentEndAndTitle_VerifyTitleAlignment.png
index f80f0f23b85d..f79e0dc249e7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetHorizontalTextAlignmentEndAndTitle_VerifyTitleAlignment.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetHorizontalTextAlignmentEndAndTitle_VerifyTitleAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetIsEnabledFalse_VerifyPickerDisabled.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetIsEnabledFalse_VerifyPickerDisabled.png
index 28c4600c6208..67d501deeaa6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetIsEnabledFalse_VerifyPickerDisabled.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetIsEnabledFalse_VerifyPickerDisabled.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png
index 230f3bbb3e5b..3faaca3a2d2d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetSelectedItem_VerifySelectedItemLabel.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetSelectedItem_VerifySelectedItemLabel.png
index d5d040646c3e..ed565362cba5 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetSelectedItem_VerifySelectedItemLabel.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetSelectedItem_VerifySelectedItemLabel.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetShadow_VerifyShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetShadow_VerifyShadow.png
index fd4c592f0ff9..40e0acc129dd 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetShadow_VerifyShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetShadow_VerifyShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTextColorRed_VerifyTextColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTextColorRed_VerifyTextColor.png
index 310c42b72d81..23fd2c0e6c44 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTextColorRed_VerifyTextColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTextColorRed_VerifyTextColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleColorOrange_VerifyTitleColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleColorOrange_VerifyTitleColor.png
index ca6167486351..d5af7843bf12 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleColorOrange_VerifyTitleColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleColorOrange_VerifyTitleColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontAttributeBold_VerifyTitleAndFontAttribute.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontAttributeBold_VerifyTitleAndFontAttribute.png
index 32a78d4e320f..7866f03dcf18 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontAttributeBold_VerifyTitleAndFontAttribute.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontAttributeBold_VerifyTitleAndFontAttribute.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontFamilyDokdo_VerifyTitleAndFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontFamilyDokdo_VerifyTitleAndFontFamily.png
index 0ee67933d4ac..5897b82ae201 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontFamilyDokdo_VerifyTitleAndFontFamily.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontFamilyDokdo_VerifyTitleAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontSize_VerifyTitleAndFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontSize_VerifyTitleAndFontSize.png
index bc2b4454d2da..61039e4bd377 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontSize_VerifyTitleAndFontSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitleWithFontSize_VerifyTitleAndFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitle_VerifyTitleLabel.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitle_VerifyTitleLabel.png
index 895d4d46b820..b0c37cb8351c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitle_VerifyTitleLabel.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetTitle_VerifyTitleLabel.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png
index d36753aa5bbb..526c4942eba3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetVerticalTextAlignmentEndAndTitle_VerifyTitleAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetVerticalTextAlignmentEndAndTitle_VerifyTitleAlignment.png
index e1a93788ca98..f98ef19087d6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetVerticalTextAlignmentEndAndTitle_VerifyTitleAlignment.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_SetVerticalTextAlignmentEndAndTitle_VerifyTitleAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_Validate_VerifyLabels.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_Validate_VerifyLabels.png
index ce2ff76c659f..ac76a0439046 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_Validate_VerifyLabels.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Picker_Validate_VerifyLabels.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png
index eabaebcfa9aa..ab44d066cca8 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ProgressToMethod_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ProgressToMethod_VerifyVisualState.png
index 9a9dca36f9ce..f103c06d6f94 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ProgressToMethod_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ProgressToMethod_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetIsVisibleFalse_VerifyLabel.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetIsVisibleFalse_VerifyLabel.png
index 963ab68d353b..89e3a0f54b48 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetIsVisibleFalse_VerifyLabel.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetIsVisibleFalse_VerifyLabel.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png
index 20a7224b79a3..f163a9adbf44 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressNegativeValue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressNegativeValue.png
index bb6ce2ad7e95..0d459f44ee69 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressNegativeValue.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressNegativeValue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressOutOfRange.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressOutOfRange.png
index 56a926d8c3d6..0d4bf76e7a54 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressOutOfRange.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_SetProgressOutOfRange.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ToggleShadow_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ToggleShadow_VerifyVisualState.png
index 569b095a27cf..78ef7a1115e6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ToggleShadow_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ProgressBar_ToggleShadow_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_Checking_Default_Configuration_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_Checking_Default_Configuration_VerifyVisualState.png
index 7b347219b7ac..5113711789ba 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_Checking_Default_Configuration_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_Checking_Default_Configuration_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png
index 7cf311715f76..0979ccb6b5c8 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_FlowDirectionAndContent_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_FlowDirectionAndContent_VerifyVisualState.png
index 0204567f86c6..7d9cf5537f68 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_FlowDirectionAndContent_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_FlowDirectionAndContent_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndCharacterSpacing_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndCharacterSpacing_VerifyVisualState.png
index fca4c05e893e..0529d868881d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndCharacterSpacing_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndCharacterSpacing_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndFontAttributes_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndFontAttributes_VerifyVisualState.png
index 3211ef3a01f6..1bc5e69eb750 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndFontAttributes_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndFontAttributes_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndFontSize_VerifyVisualState.png
index ad0adc862045..25756799ab20 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndFontSize_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndTextColor_VerifyVisualState.png
index f9b1ab0ca841..05d527e02367 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndTextColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetContentAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontAttributesAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontAttributesAndTextColor_VerifyVisualState.png
index 4f05c29b4639..3b608fcfb935 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontAttributesAndTextColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontAttributesAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontFamilyAndFontAttributes_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontFamilyAndFontAttributes_VerifyVisualState.png
index f44b4f510ea8..fad61a61f236 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontFamilyAndFontAttributes_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontFamilyAndFontAttributes_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontFamilyAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontFamilyAndFontSize_VerifyVisualState.png
index 749bfa6f47f1..9583e0178ea9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontFamilyAndFontSize_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontFamilyAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontSizeAndFontAttributes_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontSizeAndFontAttributes_VerifyVisualState.png
index 706129dfbf39..c3fde44362ef 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontSizeAndFontAttributes_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButton_SetFontSizeAndFontAttributes_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_InitialState_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_InitialState_VerifyVisualState.png
index 43ca4ba1168f..48b420e1b376 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_InitialState_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_InitialState_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetCancelButtonAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetCancelButtonAndTextColor_VerifyVisualState.png
index 3c9e553161d9..4436fa70202f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetCancelButtonAndTextColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetCancelButtonAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndFontFamily_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndFontFamily_VerifyVisualState.png
index dc81ac3a3cfb..e856fa3ef424 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndFontFamily_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndFontFamily_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndFontSize_VerifyVisualState.png
index fde1177a03ed..32b884864684 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndFontSize_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png
index 61e933602632..074487e408dc 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndPlaceholderText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndTextTransform_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndTextTransform_VerifyVisualState.png
index 50fde26253c2..ae9270be330b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndTextTransform_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndTextTransform_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndText_VerifyVisualState.png
index e4463c486c9d..5c6ce7438e69 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndText_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontAttributesAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndFontSize_VerifyVisualState.png
index 83e248e5fdfd..b09fed3ced5c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndFontSize_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png
index 58c2155919d1..9a37899f530e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndPlaceholder_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndText_VerifyVisualState.png
index 39712f03ec0f..23eca4553d53 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndText_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontFamilyAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontSizeAndPlaceholder_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontSizeAndPlaceholder_VerifyVisualState.png
index a817e82c79b1..1b312c04a73c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontSizeAndPlaceholder_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontSizeAndPlaceholder_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontSizeAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontSizeAndText_VerifyVisualState.png
index 15c4fab3c9cf..0872d8415916 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontSizeAndText_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetFontSizeAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png
index 5c23cc616256..fc81c8448910 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndPlaceholder_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndText_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndText_VerifyVisualState.png
index df7124979cc7..ba4544fa4fec 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndText_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndText_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndVerticalTextAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndVerticalTextAlignment_VerifyVisualState.png
index e1925384fafe..228334e584fb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndVerticalTextAlignment_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetHorizontalTextAlignmentAndVerticalTextAlignment_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndCharacterSpacing_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndCharacterSpacing_VerifyVisualState.png
index d770b041b51f..a9d28bd3e89b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndCharacterSpacing_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndCharacterSpacing_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png
index 6831aa875dca..38bdf021f167 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndPlaceholderColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png
index cdbcd1d46f09..f5917b1d40ce 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderAndVerticalTextAlignment_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png
index db7973e16340..d9555732ce6c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetPlaceholderColorAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetShadow_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetShadow_VerifyVisualState.png
index dad29e269603..3074f54db635 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetShadow_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetShadow_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetTextAndCharacterSpacing_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetTextAndCharacterSpacing_VerifyVisualState.png
index b18ae188ed6c..08aa01c70459 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetTextAndCharacterSpacing_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetTextAndCharacterSpacing_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetTextAndVerticalTextAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetTextAndVerticalTextAlignment_VerifyVisualState.png
index f791aab0d7be..b1320042eef4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetTextAndVerticalTextAlignment_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchBar_SetTextAndVerticalTextAlignment_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SecondCustomPageWithFlowDirectionChanged.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SecondCustomPageWithFlowDirectionChanged.png
index 15607f0a5276..6c7d60ffe0dd 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SecondCustomPageWithFlowDirectionChanged.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SecondCustomPageWithFlowDirectionChanged.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowShouldUpdate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowShouldUpdate.png
index bf06839abe91..7abf446854f9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowShouldUpdate.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowShouldUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShellPages_VerifyForegroundColorResetForBackButton.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShellPages_VerifyForegroundColorResetForBackButton.png
index 2ab99f2e7e72..990ba0c1f4be 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShellPages_VerifyForegroundColorResetForBackButton.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShellPages_VerifyForegroundColorResetForBackButton.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldDisplayLabelWithoutBeingCroppedInsideBorder.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldDisplayLabelWithoutBeingCroppedInsideBorder.png
new file mode 100644
index 000000000000..ad4da8eabdcf
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShouldDisplayLabelWithoutBeingCroppedInsideBorder.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TestDynamicItemTemplateChangeInCarouselView.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TestDynamicItemTemplateChangeInCarouselView.png
index 6754a9a1abcc..797f16e79075 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TestDynamicItemTemplateChangeInCarouselView.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TestDynamicItemTemplateChangeInCarouselView.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_ModifyOldTimeAndNewTime_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_ModifyOldTimeAndNewTime_VerifyVisualState.png
index b5f338c2804b..6a623ba2b4f6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_ModifyOldTimeAndNewTime_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_ModifyOldTimeAndNewTime_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_OldTimeAndNewTime_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_OldTimeAndNewTime_VerifyVisualState.png
index 77e35b68d983..c61056b8427c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_OldTimeAndNewTime_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_OldTimeAndNewTime_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_arEG_VerifyTimeFormat.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_arEG_VerifyTimeFormat.png
index aa8f25a7a9d6..fac60a0fde1f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_arEG_VerifyTimeFormat.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_arEG_VerifyTimeFormat.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_enUS_VerifyTimeFormat.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_enUS_VerifyTimeFormat.png
index 85925a513d93..359f2414933c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_enUS_VerifyTimeFormat.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_enUS_VerifyTimeFormat.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_jaJP_VerifyTimeFormat.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_jaJP_VerifyTimeFormat.png
index 2601e090c235..56c0d85b4a8f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_jaJP_VerifyTimeFormat.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetCulture_jaJP_VerifyTimeFormat.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png
index 0c2ab81bf00b..f1610caa66c7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFontSize_VerifyVisualState.png
index b5640e4cc8b2..225990cd405a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFontSize_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png
index 29b75bc42221..0157007fb261 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontFamilyAndFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontFamilyAndFontSize_VerifyVisualState.png
index 2569b97c55e0..bee2b7d6b32b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontFamilyAndFontSize_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontFamilyAndFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png
index 40f196738120..5db4b0b953d2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png
index 028c1693c792..b273baf4be1d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormatTAndTime_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormatTAndTime_VerifyVisualState.png
index 5e1675b22546..aa868cdea160 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormatTAndTime_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormatTAndTime_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontAttributes_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontAttributes_VerifyVisualState.png
index d191fb1f3e5f..d02ea9c7f78a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontAttributes_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontAttributes_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontFamily_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontFamily_VerifyVisualState.png
index 86e687a9a39b..901bf11e5580 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontFamily_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontFamily_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontSize_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontSize_VerifyVisualState.png
index 8b3a6e69d0ea..e63b11dff2e3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontSize_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_T_WithFontSize_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_t_AndTime_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_t_AndTime_VerifyVisualState.png
index 715fc7c16587..8470f8467107 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_t_AndTime_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetFormat_t_AndTime_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetShadow_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetShadow_VerifyVisualState.png
index 048a359fc7d3..bd87f5fefbef 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetShadow_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetShadow_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndCharacterSpacing_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndCharacterSpacing_VerifyVisualState.png
index c29c1dc1c963..4cbe499a1723 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndCharacterSpacing_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndCharacterSpacing_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png
index 3a4e0b8be437..ffd737979d47 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndTextColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndTextColor_VerifyVisualState.png
index 7367c2250397..402b1e723ec0 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndTextColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TimePicker_SetTimeAndTextColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarItemFontColorDynamicUpdate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarItemFontColorDynamicUpdate.png
index 2bae9b2f9188..ce9f53bdb7d4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarItemFontColorDynamicUpdate.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarItemFontColorDynamicUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarTextColorOnInteraction.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarTextColorOnInteraction.png
index 6f9e6072a5dc..bc398bc413b1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarTextColorOnInteraction.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarTextColorOnInteraction.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1Priority.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1Priority.png
index f61e6cf0188e..2c557625c97f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1Priority.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1Priority.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1SizeIncrease.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1SizeIncrease.png
index 2fff0fd493ad..11f2d970ac4d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1SizeIncrease.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1SizeIncrease.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1SizeIncrease_WithWideMode.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1SizeIncrease_WithWideMode.png
index a477f12686f0..53aefcf685ed 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1SizeIncrease_WithWideMode.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane1SizeIncrease_WithWideMode.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2Priority.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2Priority.png
index e8b4f59d6525..2480c70995df 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2Priority.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2Priority.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2SizeIncrease.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2SizeIncrease.png
index ffc5e68d4d6a..66635facb540 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2SizeIncrease.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2SizeIncrease.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2SizeIncrease_WithWideMode.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2SizeIncrease_WithWideMode.png
index c39067772b8b..51a3045e623a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2SizeIncrease_WithWideMode.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2SizeIncrease_WithWideMode.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_RTLFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_RTLFlowDirection.png
index a65141ebc338..e3cbdb2c32d2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_RTLFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_ShadowWithWideMode.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_ShadowWithWideMode.png
index bdfe4723040a..6e5803443c68 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_ShadowWithWideMode.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_ShadowWithWideMode.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_TallMode.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_TallMode.png
index af9ef76f5723..91da78617bf3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_TallMode.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_TallMode.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_WideMode.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_WideMode.png
index ee155586977b..1574279d46c2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_WideMode.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_WideMode.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_ZIsShadowEnabled.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_ZIsShadowEnabled.png
index dfe18cb149cf..08d24234174c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_ZIsShadowEnabled.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_ZIsShadowEnabled.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAbsoluteLayout_LayoutBounds.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAbsoluteLayout_LayoutBounds.png
index 6f936bd5497e..67facdf43cb7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAbsoluteLayout_LayoutBounds.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAbsoluteLayout_LayoutBounds.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAddLinearGradientStop.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAddLinearGradientStop.png
index 191854a6c516..5e08e55f2730 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAddLinearGradientStop.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAddLinearGradientStop.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAddRadialGradientStop.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAddRadialGradientStop.png
index 6a8509f8344e..ff78c1680d89 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAddRadialGradientStop.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyAddRadialGradientStop.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterLinearGradientBrush.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterLinearGradientBrush.png
index 2c7b9f61a916..4e7d8553b1d1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterLinearGradientBrush.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterLinearGradientBrush.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterRadialGradientBrush.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterRadialGradientBrush.png
index 8f348d75df8d..a197da6ccab9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterRadialGradientBrush.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterRadialGradientBrush.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterSolidColorBrush.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterSolidColorBrush.png
index 856f5d456bd9..29df929df31e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterSolidColorBrush.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBackgroundWithAlterSolidColorBrush.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCustomEmptyViewDisplaysCorrectly_WithRightToLeftFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCustomEmptyViewDisplaysCorrectly_WithRightToLeftFlowDirection.png
index e44c984803fe..0a81cdd9d0b4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCustomEmptyViewDisplaysCorrectly_WithRightToLeftFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCustomEmptyViewDisplaysCorrectly_WithRightToLeftFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEmptyViewTemplateDisplaysCorrectly_WithRightToLeftFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEmptyViewTemplateDisplaysCorrectly_WithRightToLeftFlowDirection.png
index 4eb961807915..029b371d3cf6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEmptyViewTemplateDisplaysCorrectly_WithRightToLeftFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEmptyViewTemplateDisplaysCorrectly_WithRightToLeftFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png
index 49345851694c..84874d4c3ab5 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalList.png
index a5763c0bce88..b817d93b0cf6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHorizontalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHorizontalGrid.png
index 32e74f31fc61..a1faf6ea513e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHorizontalGrid.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHorizontalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHorizontalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHorizontalList.png
index 2096469c1f88..cf47fae3bf74 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHorizontalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithHorizontalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalGrid.png
index a7f1418ca2b7..c8015d8fe85c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalGrid.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalList.png
index ba1a835c7551..b2982b6428eb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalGrid.png
index 3fa19695dc8a..5cd41c2e924d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalGrid.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalList.png
index 2be2fe972775..419604e50b5b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png
index 68225672b83f..b7a7b1c90213 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalList.png
index 4189143eccec..dc05e9df2fd6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalGrid.png
index 141c38d6adfe..e16a9300f2fe 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalGrid.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalList.png
index 9f142714a519..9e18508d3b86 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHorizontalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHorizontalGrid.png
index 471b20192245..41326ca0a093 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHorizontalGrid.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHorizontalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHorizontalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHorizontalList.png
index 8245ca0f999f..297baa31b152 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHorizontalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithHorizontalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalGrid.png
index f7879f20130c..46b54c43fd23 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalGrid.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalList.png
index 5905cac48d2f..f57de65f8647 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFill.png
index d9417a57656c..98eb468cb2ed 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFill.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png
index af5abfb089e6..b9b4848cd9b9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFillWithWidthRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenter.png
index 5945cdd0c4e4..b0a1b42bfbbb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenter.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png
index dd78644f5a67..aa223e8353d2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEnd.png
index 99ccfc37732c..ab0687302034 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEnd.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png
index 0a8f52d72a22..9d67f09b0b47 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFill.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFill.png
index f7548150bc48..867f9d4312fd 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFill.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFill.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png
index f1287c2574e3..50ee065922c4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStart.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStart.png
index 72a5fb099fd9..d794b1d0a2aa 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStart.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStart.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png
index 313ff7695d96..9328451f14f3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_ColumnSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_ColumnSpacing.png
index 804120919be8..6ec57484c563 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_ColumnSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_ColumnSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_NestedGrid.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_NestedGrid.png
index c65f1cb35d22..b54aa7e761f7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_NestedGrid.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_NestedGrid.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_RowSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_RowSpacing.png
index 6496261713e2..32874fc3bba2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_RowSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_RowSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_RowSpan.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_RowSpan.png
index e9c1bd6aabc9..dbf7a2aeb4be 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_RowSpan.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_RowSpan.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn.png
index 1a6d1d340a15..492ecb97dbc6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumnSpacingAndPadding.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumnSpacingAndPadding.png
index c6ed7410aa73..ffbbfc0bfb34 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumnSpacingAndPadding.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumnSpacingAndPadding.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn_SetColumnSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn_SetColumnSpacing.png
index 9aea29ae5b99..58ba79eb2d18 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn_SetColumnSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn_SetColumnSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn_SetRowSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn_SetRowSpacing.png
index c2a023037bdf..def49b550dff 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn_SetRowSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetColumn_SetRowSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetPaddingAndBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetPaddingAndBackgroundColor.png
index 0af3a810e4d2..4ed2923a55a7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetPaddingAndBackgroundColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetPaddingAndBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRowAndColumn_BackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRowAndColumn_BackgroundColor.png
index fe896e7c2037..7d6b9c2aed95 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRowAndColumn_BackgroundColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRowAndColumn_BackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRowSpacingAndPadding.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRowSpacingAndPadding.png
index 0928e5960dd7..99d964cfe3b3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRowSpacingAndPadding.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRowSpacingAndPadding.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRow_SetColumnSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRow_SetColumnSpacing.png
index aeb6184bdbe3..711af3fb35dc 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRow_SetColumnSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRow_SetColumnSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRow_SetRowSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRow_SetRowSpacing.png
index 5a9dcd1c9e30..2f199ef9dc7d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRow_SetRowSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyGrid_SetRow_SetRowSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHybridWebViewWithFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHybridWebViewWithFlowDirection.png
index eb69604c7b17..2dbc463953ae 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHybridWebViewWithFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHybridWebViewWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHybridWebViewWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHybridWebViewWithShadow.png
index 42eae3728b01..a000e7990323 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHybridWebViewWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHybridWebViewWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png
index 0c81dbafa7b1..cb372c783831 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLayoutWithOrientationHorizontal_VerticalOptionsEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundAndShadowAndStroke.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundAndShadowAndStroke.png
index dce5605276c5..d9299b6e7277 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundAndShadowAndStroke.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundAndShadowAndStroke.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundAndStartPoint.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundAndStartPoint.png
index 5a508cf87bb7..d713d3921cc6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundAndStartPoint.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundAndStartPoint.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundColor.png
index 65a5222f6219..4b701714f898 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithOpacity.png
index 622e10e7bbf6..4501f74723ca 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithOpacity.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithShadow.png
index e89d91f7cab1..c2a70de3a4b6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithShadowAndOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithShadowAndOpacity.png
index 176341dbe032..53be3b97332d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithShadowAndOpacity.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithShadowAndOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStroke.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStroke.png
index 69a5731365d0..b2d69a2c6f34 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStroke.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStroke.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndEndPoint.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndEndPoint.png
index b53591cc6d14..2149f670eccb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndEndPoint.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndEndPoint.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndOpacity.png
index 353ed235d775..cc52e6d24ece 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndOpacity.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndStartPoint.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndStartPoint.png
index b28541cfa254..43b3ddbbdc2c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndStartPoint.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLinearGradientBrushWithStrokeAndStartPoint.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsGroupedListWhenMultipleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsGroupedListWhenMultipleModePreSelection.png
index 68a753f7c549..cca0f1503e9f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsGroupedListWhenMultipleModePreSelection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsGroupedListWhenMultipleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsGroupedListWhenSingleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsGroupedListWhenSingleModePreSelection.png
index ba3fcf379002..a8b139477739 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsGroupedListWhenSingleModePreSelection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsGroupedListWhenSingleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsObservableCollectionWhenMultipleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsObservableCollectionWhenMultipleModePreSelection.png
index 47779b9ce011..63b154b2255f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsObservableCollectionWhenMultipleModePreSelection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsObservableCollectionWhenMultipleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsObservableCollectionWhenSingleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsObservableCollectionWhenSingleModePreSelection.png
index db74780c6a48..0f951c8349b6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsObservableCollectionWhenSingleModePreSelection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyModelItemsObservableCollectionWhenSingleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndCenter.png
index 546f5ae4a27b..80ac250ca0e3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndCenter.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndRadius.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndRadius.png
index 6b235bbc0834..75d48df0e252 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndRadius.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndRadius.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndShadowAndStroke.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndShadowAndStroke.png
index 733086b24a02..ad0e0cab178d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndShadowAndStroke.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundAndShadowAndStroke.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundColor.png
index 5844609595d6..37806d4de5c2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithOpacity.png
index 833ffc934747..6ecf9d301aa9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithOpacity.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithShadow.png
index 4b992118736e..e301f172fcc0 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithShadowAndOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithShadowAndOpacity.png
index a7c3b880855f..f19b148dd598 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithShadowAndOpacity.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithShadowAndOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStroke.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStroke.png
index 3e9849ac2509..6e8fac97c6d4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStroke.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStroke.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndCenter.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndCenter.png
index 2ee5906a1f3f..7dda16cce3ca 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndCenter.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndCenter.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndOpacity.png
index 76e7429bb0f9..ffb2baa29284 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndOpacity.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndRadius.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndRadius.png
index 059cfe12d489..637347ded899 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndRadius.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRadialGradientBrushWithStrokeAndRadius.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRemoveLinearGradientStop.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRemoveLinearGradientStop.png
index cab785d4e7ff..cc35bbde6c04 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRemoveLinearGradientStop.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRemoveLinearGradientStop.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRemoveRadialGradientStop.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRemoveRadialGradientStop.png
index 8c5873ddb766..adb0d4f28bfe 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRemoveRadialGradientStop.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyRemoveRadialGradientStop.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContentWhenOrientationHorizontal.png
index bf30ef61d71f..87fd7a8834ba 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContentWhenOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndAbsoluteLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndEditorContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndEditorContentWhenOrientationHorizontal.png
index 34b2f0f2ea44..c2c10da6327a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndEditorContentWhenOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndEditorContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndGridContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndGridContentWhenOrientationHorizontal.png
index d77e3da12597..a43730534fb9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndGridContentWhenOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndGridContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndHorizontalLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndHorizontalLayoutContentWhenOrientationHorizontal.png
index 436fb1424832..b1a8f04e46b5 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndHorizontalLayoutContentWhenOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndHorizontalLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndOrientationHorizontal.png
index 1d279d35d140..3b6c3d1121a3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionCenterAndOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEnd.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEnd.png
index 63d834e15862..092334a494e3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEnd.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEnd.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContent.png
index aa04105b032c..b1aaed7dbc52 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContent.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContentWhenOrientationHorizontal.png
index a66cc9f26141..737dfb82cbfe 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContentWhenOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndAbsoluteLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndEditorContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndEditorContent.png
index fa6a3237b920..f653b928eb4e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndEditorContent.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndEditorContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndEditorContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndEditorContentWhenOrientationHorizontal.png
index 6d50a41dfb49..0cda7d086f3f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndEditorContentWhenOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndEditorContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndGridContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndGridContent.png
index a741cb52ee8b..46ab2c21250e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndGridContent.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndGridContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndGridContentWhenOrientationHorizontal.png
index 42fbadea0961..3d2eca6bd6a3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndGridContentWhenOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndGridContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndHorizontalLayoutContentWhenOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndHorizontalLayoutContentWhenOrientationHorizontal.png
index 773b4d1a2036..37d2bae88255 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndHorizontalLayoutContentWhenOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndHorizontalLayoutContentWhenOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndOrientationHorizontal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndOrientationHorizontal.png
index 98f48b511713..0ce90355e211 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndOrientationHorizontal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndOrientationHorizontal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndVerticalLayoutContent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndVerticalLayoutContent.png
index f56caf14c302..05c3159342a4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndVerticalLayoutContent.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyScrollViewWithScrollToPositionEndAndVerticalLayoutContent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithHorizontalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithHorizontalList.png
index 9c1253e4ca62..993e42e462f6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithHorizontalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithHorizontalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithVerticalList.png
index e110bac9d5d5..3f653b7cc8fb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithVerticalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWhithItemsSourceGroupList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWhithItemsSourceGroupList.png
index 54489ac506f5..adaa49c94994 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWhithItemsSourceGroupList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWhithItemsSourceGroupList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithHorizontalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithHorizontalList.png
index 316cdc52f6d8..2f47ae840ce2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithHorizontalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithHorizontalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithVerticalList.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithVerticalList.png
index 4b21b7baf413..53d9b6fdf9e7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithVerticalList.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithVerticalList.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyShellMenuItemsAlignedInRTL.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyShellMenuItemsAlignedInRTL.png
index db4bcfe2e519..a0ccfbf69cf9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyShellMenuItemsAlignedInRTL.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyShellMenuItemsAlignedInRTL.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidBrushColorWithShadowAndOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidBrushColorWithShadowAndOpacity.png
index 5bc138f118cd..193038f2802a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidBrushColorWithShadowAndOpacity.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidBrushColorWithShadowAndOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidBrushColorWithStrokeAndOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidBrushColorWithStrokeAndOpacity.png
index 3e94fc11d817..585c04f02da0 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidBrushColorWithStrokeAndOpacity.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidBrushColorWithStrokeAndOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColor.png
index 148d5d3f851f..6b5aa8964ec9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColorAndShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColorAndShadow.png
index c2c518db8156..8d72257fa8ea 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColorAndShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColorAndShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColorAndShadowAndStroke.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColorAndShadowAndStroke.png
index 6dd658f96dd2..8898925fcb17 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColorAndShadowAndStroke.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithBackgroundColorAndShadowAndStroke.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithOpacity.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithOpacity.png
index 9124ffb49035..c85141d2c771 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithOpacity.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithOpacity.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithShadow.png
index cdecec362f7f..f84bcc8ce663 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithStroke.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithStroke.png
index 34288cc5a7ef..b7e662e93198 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithStroke.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySolidColorBrushWithStroke.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsGroupedListWhenMultipleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsGroupedListWhenMultipleModePreSelection.png
index 09082fed69c8..a50471110834 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsGroupedListWhenMultipleModePreSelection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsGroupedListWhenMultipleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsObservableCollectionWhenMultipleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsObservableCollectionWhenMultipleModePreSelection.png
index ef5fa5e1482b..fd14a496683e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsObservableCollectionWhenMultipleModePreSelection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsObservableCollectionWhenMultipleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsObservableCollectionWhenSingleModePreSelection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsObservableCollectionWhenSingleModePreSelection.png
index 7c36d8d3356b..e51239ae12e1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsObservableCollectionWhenSingleModePreSelection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyStringItemsObservableCollectionWhenSingleModePreSelection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithCollectionViewContentAndFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithCollectionViewContentAndFlowDirection.png
index 0348f7ee30e7..a0ed16b7a916 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithCollectionViewContentAndFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithCollectionViewContentAndFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndBackgroundColor.png
index fedd58c07f64..539f260d847b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndBackgroundColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndFlowDirection.png
index e82e6c1d7830..a9b620e213c5 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndShadow.png
index 404155abb32f..4d41ec049685 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithImageContentAndShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndBackgroundColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndBackgroundColor.png
index a7cf60d35842..93cdc5b1397c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndBackgroundColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndFlowDirection.png
index 8cde2e43cebb..e4856233b806 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndShadow.png
index 3f79f3fd0285..fe8f8e5571ac 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySwipeViewWithLabelContentAndShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVSM_Label_InitialState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVSM_Label_InitialState.png
index e5488865bd57..5f766095717c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVSM_Label_InitialState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVSM_Label_InitialState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVSM_Label_Reset.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVSM_Label_Reset.png
index 3cfd850b5634..08773c40be81 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVSM_Label_Reset.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVSM_Label_Reset.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalGridCollectionViewLTRToRTLToggleShouldWork.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalGridCollectionViewLTRToRTLToggleShouldWork.png
index 3806ef0a7c2d..d6bddb32c552 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalGridCollectionViewLTRToRTLToggleShouldWork.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalGridCollectionViewLTRToRTLToggleShouldWork.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalGridCollectionViewRTLColumnMirroringShouldWork.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalGridCollectionViewRTLColumnMirroringShouldWork.png
index 0f123badb407..f0be7c999eb8 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalGridCollectionViewRTLColumnMirroringShouldWork.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalGridCollectionViewRTLColumnMirroringShouldWork.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection.png
index 305f99918098..cda406d4eadf 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_Height.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_Height.png
index eb7bd7a3779d..9ad280aad67f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_Height.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png
index 0af96cbf9dc6..5f2c12b7bb6a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_Width.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_Width.png
index 1ca714627acd..7d6f8e2e5709 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_Width.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_RTLFlowDirection_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_Height.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_Height.png
index 1c3b2be0615d..76b0f12cc124 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_Height.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_HeightAndWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_HeightAndWidth.png
index aa1f323eb4a2..e2c422c30b35 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_RTL.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_RTL.png
index 9e62b107fa7e..4f045c983a96 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_RTL.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_RTL.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_Width.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_Width.png
index 5a7bf61ec903..48380e341395 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_Width.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerticalStackLayout_Spacing_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorXWithAnchorY.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorXWithAnchorY.png
index e519fcae893c..11faaae5d4af 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorXWithAnchorY.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorXWithAnchorY.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorX_ScaleYWithRotation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorX_ScaleYWithRotation.png
index f4e5ff84430e..8536c59e3c28 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorX_ScaleYWithRotation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorX_ScaleYWithRotation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorY_ScaleWithRotationY.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorY_ScaleWithRotationY.png
index 0826a9d128df..cd2b398c37ae 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorY_ScaleWithRotationY.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorY_ScaleWithRotationY.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorY_ScaleXWithRotationX.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorY_ScaleXWithRotationX.png
index 6b7158f4dc9a..f76a98dc6228 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorY_ScaleXWithRotationX.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_AnchorY_ScaleXWithRotationX.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_IsVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_IsVisible.png
index 57b7678bb108..f6ccd490af8d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_IsVisible.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_IsVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_Rotation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_Rotation.png
index 6d32086162cd..c3c5d4da3bff 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_Rotation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_Rotation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationWithRotationX.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationWithRotationX.png
index a775c7d53700..8bef4ce9cf8d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationWithRotationX.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationWithRotationX.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationWithScale.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationWithScale.png
index 14fc64d1f03e..464091c14a92 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationWithScale.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationWithScale.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationX.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationX.png
index b0df27b9cd3f..b85477d1975d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationX.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationX.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationXWithRotationY.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationXWithRotationY.png
index 847dc5bc5b29..3d4c74b43c89 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationXWithRotationY.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationXWithRotationY.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationXWithScaleX.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationXWithScaleX.png
index c5aec058d13e..bb5b55bc7f2d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationXWithScaleX.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationXWithScaleX.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationY.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationY.png
index 0d69216763fb..6f188b086991 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationY.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationY.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationYWithScaleY.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationYWithScaleY.png
index 9363e5670342..4b154f14ece6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationYWithScaleY.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_RotationYWithScaleY.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_Scale.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_Scale.png
index 26fe2ba11998..fd351a79848a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_Scale.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_Scale.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleWithAnchorXAndRotationY.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleWithAnchorXAndRotationY.png
index bae42fcf15c9..521e933725f6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleWithAnchorXAndRotationY.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleWithAnchorXAndRotationY.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleX.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleX.png
index ec3d06f5ca12..e8b814f8a5c4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleX.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleX.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleXWithAnchorYAndRotationY.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleXWithAnchorYAndRotationY.png
index 8e49240f49a9..d1dfe1801eb4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleXWithAnchorYAndRotationY.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleXWithAnchorYAndRotationY.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleY.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleY.png
index 6a89d6fcd71a..3f948757bb10 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleY.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleY.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleYWithAnchorXAndRotationY.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleYWithAnchorXAndRotationY.png
index ad07a2087ab1..f3518a43a0e9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleYWithAnchorXAndRotationY.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VisualTransform_ScaleYWithAnchorXAndRotationY.png differ
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28117.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28117.cs
new file mode 100644
index 000000000000..3f6c8e6a04ef
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28117.cs
@@ -0,0 +1,31 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28117, "Label text is cropped inside the border control with a specific padding value on certain Android devices", PlatformAffected.Android)]
+public class Issue28117 : ContentPage
+{
+ public Issue28117()
+ {
+ Content = new VerticalStackLayout
+ {
+ WidthRequest = 350,
+ Children =
+ {
+ new Border()
+ {
+ Padding = new Thickness(70.89827027958738, 0, 0, 0),
+ Margin = new Thickness(10),
+ StrokeThickness = 1,
+ Stroke = Colors.Black,
+ Content =
+ new Label
+ {
+ AutomationId = "Label",
+ FontFamily = "OpenSansRegular",
+ FontSize = 16,
+ Text = "At any time, but not later than one month before the expiration date"
+ }
+ },
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png
index 1bf5c444d03e..3f1f4e3be5be 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CheckBox_SetIsCheckedAndColor_VerifyVisualState.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CheckBox_SetIsCheckedAndColor_VerifyVisualState.png
index 0896111bb74a..aeaa53ec32b1 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CheckBox_SetIsCheckedAndColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CheckBox_SetIsCheckedAndColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CollectionViewMeasureFirstItem.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CollectionViewMeasureFirstItem.png
index 743a7f704247..82c613edecaf 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CollectionViewMeasureFirstItem.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CollectionViewMeasureFirstItem.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FooterShouldBeRemovedWhenSetToNull.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FooterShouldBeRemovedWhenSetToNull.png
index 0969e143cc18..3927d9545137 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FooterShouldBeRemovedWhenSetToNull.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FooterShouldBeRemovedWhenSetToNull.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_EllipseDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_EllipseDrawable_VerifyTypeAndRendering.png
index e9fcf2e399af..730a55faf72f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_EllipseDrawable_VerifyTypeAndRendering.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_EllipseDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_ImageDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_ImageDrawable_VerifyTypeAndRendering.png
index acf96c5e9e78..bd83a5d3cdee 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_ImageDrawable_VerifyTypeAndRendering.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_ImageDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_InvalidateButton_ChangesColorAndLogsEvent.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_InvalidateButton_ChangesColorAndLogsEvent.png
index 74b6b98d8da0..448489ad42b9 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_InvalidateButton_ChangesColorAndLogsEvent.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_InvalidateButton_ChangesColorAndLogsEvent.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_LineDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_LineDrawable_VerifyTypeAndRendering.png
index 5d3e3645f207..5fac44268161 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_LineDrawable_VerifyTypeAndRendering.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_LineDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetInvalidShadowProperties_VerifyGracefulHandling.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetInvalidShadowProperties_VerifyGracefulHandling.png
index 3e713eefb130..57ba882e9c68 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetInvalidShadowProperties_VerifyGracefulHandling.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetInvalidShadowProperties_VerifyGracefulHandling.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetShadowProperties_VerifyVisualState.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetShadowProperties_VerifyVisualState.png
index cb9e63e800e7..59aa2568434c 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetShadowProperties_VerifyVisualState.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetShadowProperties_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetVisibilityToTrue_VerifyVisibleState.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetVisibilityToTrue_VerifyVisibleState.png
index 19f391fd9798..9c5465c68601 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetVisibilityToTrue_VerifyVisibleState.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SetVisibilityToTrue_VerifyVisibleState.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SquareDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SquareDrawable_VerifyTypeAndRendering.png
index 8b4addb1dbe3..81c941f77a2c 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SquareDrawable_VerifyTypeAndRendering.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_SquareDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_StringDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_StringDrawable_VerifyTypeAndRendering.png
index 77efea26ca5e..c3f16f1bc824 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_StringDrawable_VerifyTypeAndRendering.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_StringDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TransparentEllipseDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TransparentEllipseDrawable_VerifyTypeAndRendering.png
index 043ff1411afa..fa9e8f5250b0 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TransparentEllipseDrawable_VerifyTypeAndRendering.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TransparentEllipseDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TriangleDrawable_VerifyTypeAndRendering.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TriangleDrawable_VerifyTypeAndRendering.png
index 25f3155794f2..23345203786f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TriangleDrawable_VerifyTypeAndRendering.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TriangleDrawable_VerifyTypeAndRendering.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TriangleWithCustomDimensions_VerifyState.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TriangleWithCustomDimensions_VerifyState.png
index 10d26014484b..d7efc9bf9fbb 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TriangleWithCustomDimensions_VerifyState.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GraphicsView_TriangleWithCustomDimensions_VerifyState.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GroupedCollectionViewItems.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GroupedCollectionViewItems.png
index 8913e14007ec..b111f9ca1fb9 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GroupedCollectionViewItems.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/GroupedCollectionViewItems.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HeaderShouldBeRemovedWhenSetToNull.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HeaderShouldBeRemovedWhenSetToNull.png
index eb15c3d2f384..ed76b27661f4 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HeaderShouldBeRemovedWhenSetToNull.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HeaderShouldBeRemovedWhenSetToNull.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test.png
index ce289bfa1d73..29075be554df 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_1.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_1.png
index d6659fc64f19..ffa34ad0fbf8 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_1.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_1.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_2.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_2.png
index b10e0d6a0fcf..eb40263ad628 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_2.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_2.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_3.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_3.png
index de5229748ab4..04f38d5e0092 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_3.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_3.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_4.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_4.png
index f95a38abad4f..6e865b6b2e65 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_4.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_4.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_5.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_5.png
index e90e89066dff..b59f43155c6c 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_5.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue24414Test_5.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue2775Test.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue2775Test.png
index 515a2de96110..46f55ebcd397 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue2775Test.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue2775Test.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue3342Test.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue3342Test.png
index d8e812069888..732add68c2d8 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue3342Test.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue3342Test.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png
index c0a622c6ec94..d7084e5e25d3 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png
index f09c82033cf9..d16785073c78 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png
index 45f89a14f760..bc6668060091 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png
index c9cc6acaa170..44e94a30de01 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png
index 5eb2c14b7bb2..4a91f20ce578 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png
index 2da5a44dadbf..a5e84c2ececb 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetSelectedItem_VerifySelectedItemLabel.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetSelectedItem_VerifySelectedItemLabel.png
index 104e38219e7c..985198c791da 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetSelectedItem_VerifySelectedItemLabel.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetSelectedItem_VerifySelectedItemLabel.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetTextColorRed_VerifyTextColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetTextColorRed_VerifyTextColor.png
index bb9a0398983c..67d166096987 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetTextColorRed_VerifyTextColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetTextColorRed_VerifyTextColor.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png
index 2f5d38e5713e..438ba659dfb0 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RefreshView_SetShadow_VerifyShadowApplied.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RefreshView_SetShadow_VerifyShadowApplied.png
index b1aa4a7cd664..881e165c06ba 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RefreshView_SetShadow_VerifyShadowApplied.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RefreshView_SetShadow_VerifyShadowApplied.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RemoveHeaderFooterAtRuntime.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RemoveHeaderFooterAtRuntime.png
index cf6f8eea260b..c8322c915f21 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RemoveHeaderFooterAtRuntime.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RemoveHeaderFooterAtRuntime.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_IsVisibleFalse.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_IsVisibleFalse.png
index e287f759d71e..15a8ea5eef0e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_IsVisibleFalse.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_IsVisibleFalse.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_IsVisibleTrue.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_IsVisibleTrue.png
index 06d51c8069bd..15ecea48b4a1 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_IsVisibleTrue.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_IsVisibleTrue.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_ShowTitleView.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_ShowTitleView.png
index 134635b588ec..574cb543cb5b 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_ShowTitleView.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_ShowTitleView.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_ShowTitleViewHidden.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_ShowTitleViewHidden.png
index d6a32a5a4791..8155fe862ec3 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_ShowTitleViewHidden.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellPages_ShowTitleViewHidden.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TimePicker_SetShadow_VerifyVisualState.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TimePicker_SetShadow_VerifyVisualState.png
index 1e7721bf5e58..99f5908f6f67 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TimePicker_SetShadow_VerifyVisualState.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TimePicker_SetShadow_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png
index 3e7e69f25567..986d90c32207 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_BackgroundColor_WithGrid.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_BackgroundColor_WithGrid.png
index bb289058ff6e..084c8d2ffd8f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_BackgroundColor_WithGrid.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_BackgroundColor_WithGrid.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_ForegroundColor_WithBackgroundColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_ForegroundColor_WithBackgroundColor.png
index 99f286b59033..91f6df02d40c 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_ForegroundColor_WithBackgroundColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_ForegroundColor_WithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_ForegroundColor_WithGrid.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_ForegroundColor_WithGrid.png
index deae85bef404..0eacf220808e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_ForegroundColor_WithGrid.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_ForegroundColor_WithGrid.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithBackgroundColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithBackgroundColor.png
index e56847cc7cc2..a4175646b142 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithBackgroundColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithForegroundColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithForegroundColor.png
index 46acfb916ae5..643897d25ed3 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithForegroundColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithForegroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithSearchBar.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithSearchBar.png
index 5b3998fed2a7..af99144cb152 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithSearchBar.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithSearchBar.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithTrailingContentAndLeadingContent.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithTrailingContentAndLeadingContent.png
index 299cd27bd821..f65f8a53f8b6 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithTrailingContentAndLeadingContent.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Icon_WithTrailingContentAndLeadingContent.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_IsVisible.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_IsVisible.png
index 1cc137175d7b..7e631cf1826d 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_IsVisible.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_IsVisible.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_Entry.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_Entry.png
index 601b3f88bc5a..e7db933ddd7e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_Entry.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_Entry.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithBackgroundColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithBackgroundColor.png
index b1f58c210f54..125848c38dd3 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithBackgroundColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithGrid.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithGrid.png
index bf241aa2e869..e1278d6749b7 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithGrid.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithGrid.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithHorizontalStackLayout.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithHorizontalStackLayout.png
index af2d5c88b18b..f8c3ed4509d8 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithHorizontalStackLayout.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithHorizontalStackLayout.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithSearchBar.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithSearchBar.png
index 1b386650afaf..7893891beca0 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithSearchBar.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TitleAndSubTitle_WithSearchBar.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithBackgroundColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithBackgroundColor.png
index 1e700ad3fc7b..f7a21e496147 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithBackgroundColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithGrid.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithGrid.png
index 0b5252ee7c69..45cc16cee4de 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithGrid.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithGrid.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithHorizontalStackLayout.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithHorizontalStackLayout.png
index 0d5c76204b28..4b5d6db63636 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithHorizontalStackLayout.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithHorizontalStackLayout.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithSearchBar.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithSearchBar.png
index 1cbc40180e2a..86a375f03a5a 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithSearchBar.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithSearchBar.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithTitleAndSubtitle.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithTitleAndSubtitle.png
index 2be79d32887f..e91429537859 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithTitleAndSubtitle.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_TrailingContentAndLeadingContent_WithTitleAndSubtitle.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Window.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Window.png
index 2cd446e83a5a..314998407045 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Window.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/TitleBar_Window.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_NestedGrid.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_NestedGrid.png
index 3a8e512d5590..0890f82802fc 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_NestedGrid.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_NestedGrid.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetColumn_SetColumnSpacing.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetColumn_SetColumnSpacing.png
index d44badf95dc3..26f062edd58b 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetColumn_SetColumnSpacing.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetColumn_SetColumnSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRow.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRow.png
index 848995851bcb..865b9205cc9c 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRow.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRow.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRowAndColumn_BackgroundColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRowAndColumn_BackgroundColor.png
index eb2d6b760a3b..7cfe14cfb301 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRowAndColumn_BackgroundColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRowAndColumn_BackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRow_SetColumnSpacing.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRow_SetColumnSpacing.png
index 91d05cce8ffc..65158a4c9b5d 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRow_SetColumnSpacing.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyGrid_SetRow_SetColumnSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28117.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28117.cs
new file mode 100644
index 000000000000..80f97aed8ac9
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28117.cs
@@ -0,0 +1,22 @@
+#if !MACCATALYST // On Mac platform, Label does not wrap properly when a width request is set https://github.com/dotnet/maui/issues/15559
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue28117 : _IssuesUITest
+{
+ public Issue28117(TestDevice device) : base(device) { }
+
+ public override string Issue => "Label text is cropped inside the border control with a specific padding value on certain Android devices";
+
+ [Test]
+ [Category(UITestCategories.Border)]
+ public void ShouldDisplayLabelWithoutBeingCroppedInsideBorder()
+ {
+ App.WaitForElement("Label");
+ VerifyScreenshot();
+ }
+}
+#endif
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png
index 0dc14fee6a57..7f6881497e95 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue15330Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue15330Test.png
index 09b56a6bc1a9..42eb147602c3 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue15330Test.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue15330Test.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test.png
index ce34198d8db2..cde79199dba5 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_1.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_1.png
index e08752071342..778960f6a5ca 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_1.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_1.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_2.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_2.png
index 04cd284815b2..a4f2ab6e2e77 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_2.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_2.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_3.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_3.png
index d1e2a05207aa..917442071f8b 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_3.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_3.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_4.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_4.png
index f126c18a2e5a..8d4a6256dc3e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_4.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_4.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_5.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_5.png
index b92a3b3e3a17..3164a2856c68 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_5.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue24414Test_5.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue2775Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue2775Test.png
index 5e73e13e53f0..00ebce85cba8 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue2775Test.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue2775Test.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png
index 0b4762be6ad5..cc8f536ad361 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ChangeFlowDirection_RTL_VerifyLabel.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ProgressToMethod_VerifyVisualState.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ProgressToMethod_VerifyVisualState.png
index b261d579b66f..92e4c39459c0 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ProgressToMethod_VerifyVisualState.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ProgressToMethod_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetIsVisibleFalse_VerifyLabel.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetIsVisibleFalse_VerifyLabel.png
index 71ca09b1b93c..708ff9645bbe 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetIsVisibleFalse_VerifyLabel.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetIsVisibleFalse_VerifyLabel.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png
index 5561ee67878a..4191502838a9 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetProgressColorAndBackgroundColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetProgressNegativeValue.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetProgressNegativeValue.png
index 7b8127ee3f9c..d612f7236739 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetProgressNegativeValue.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_SetProgressNegativeValue.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ToggleShadow_VerifyVisualState.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ToggleShadow_VerifyVisualState.png
index 4af293477769..9761cf847bf7 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ToggleShadow_VerifyVisualState.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ProgressBar_ToggleShadow_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowUpdateColor1.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowUpdateColor1.png
index 543109229249..f4cc0017b871 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowUpdateColor1.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowUpdateColor1.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowUpdateColor2.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowUpdateColor2.png
index 3a56beaa2e5e..da60a274fa5e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowUpdateColor2.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowUpdateColor2.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png
index 34f01b19874f..3977a89fdd6a 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetColor.png
index 09a2923dd9e2..778c412e0e77 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png
index 016845d85467..6373d2f3a0ed 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOffset_PositiveValues.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOffset_PositiveValues.png
index 8eee1efc1af8..8ecfa02811fd 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOffset_PositiveValues.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOffset_PositiveValues.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOffset_Zero.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOffset_Zero.png
index 0a4cdc8bcb63..41c4efb167b2 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOffset_Zero.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOffset_Zero.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOpacity.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOpacity.png
index 4c707b275b58..33255e6c1010 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOpacity.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOpacity.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOpacity_Zero.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOpacity_Zero.png
index b5fb0acbbbca..4bec2ee61dad 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOpacity_Zero.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetOpacity_Zero.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetRadius.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetRadius.png
index d98ba02801cb..d66738c39886 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetRadius.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetRadius.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetRadius_Zero.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetRadius_Zero.png
index 15e4fc077f0f..118e61eed949 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetRadius_Zero.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetRadius_Zero.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetVisibilityToFalse_VerifyScreenshot.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetVisibilityToFalse_VerifyScreenshot.png
index c2a18d6566c1..8363295d2930 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetVisibilityToFalse_VerifyScreenshot.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Shadow_SetVisibilityToFalse_VerifyScreenshot.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_FlowDirectionRTL.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_FlowDirectionRTL.png
index 31ab40e67e9d..a8a3418a5f32 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_FlowDirectionRTL.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_FlowDirectionRTL.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColor.png
index 994447b573b4..036fc8fcd4fd 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColorAndTitleColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColorAndTitleColor.png
index f1b8745d6e6f..6b4bd941b539 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColorAndTitleColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColorAndTitleColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColorAndUnselectedColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColorAndUnselectedColor.png
index eb3c13859924..8e2c1c10a427 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColorAndUnselectedColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ForegroundColorAndUnselectedColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_IsVisibleFalse.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_IsVisibleFalse.png
index 41f07703d1b6..50568055c29e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_IsVisibleFalse.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_IsVisibleFalse.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_IsVisibleTrue.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_IsVisibleTrue.png
index 4cb3d15ce08c..02ed2a942acc 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_IsVisibleTrue.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_IsVisibleTrue.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_NavBarVisibilityHide.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_NavBarVisibilityHide.png
index a6e3382c8efc..0e9dcb7f72ad 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_NavBarVisibilityHide.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_NavBarVisibilityHide.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_NavBarVisibilityShow.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_NavBarVisibilityShow.png
index e81cc2c335fd..99d2acefb9bf 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_NavBarVisibilityShow.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_NavBarVisibilityShow.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ShowTitleView.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ShowTitleView.png
index b9b2ee28aa43..09dc05395f37 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ShowTitleView.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ShowTitleView.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ShowTitleViewHidden.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ShowTitleViewHidden.png
index d6a2e5192d78..1f1066de852f 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ShowTitleViewHidden.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_ShowTitleViewHidden.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_TitleColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_TitleColor.png
index d664a8c6c4e7..7994e81ae2a4 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_TitleColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_TitleColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_UnselectedColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_UnselectedColor.png
index a78baeec347e..579a765a6da0 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_UnselectedColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellPages_UnselectedColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_NestedGrid.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_NestedGrid.png
index 546af313c720..b05192d3b99d 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_NestedGrid.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_NestedGrid.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetColumn_SetColumnSpacing.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetColumn_SetColumnSpacing.png
index 4cb38c3a5432..04718d53b9d9 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetColumn_SetColumnSpacing.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetColumn_SetColumnSpacing.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRow.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRow.png
index 8933f96c609c..056dc0b8bdcd 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRow.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRow.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRowAndColumn_BackgroundColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRowAndColumn_BackgroundColor.png
index 936db8be5110..834b5564cbbe 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRowAndColumn_BackgroundColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRowAndColumn_BackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRow_SetColumnSpacing.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRow_SetColumnSpacing.png
index 871877ac51c9..47414e029a2d 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRow_SetColumnSpacing.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyGrid_SetRow_SetColumnSpacing.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHybridWebViewWithShadow.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHybridWebViewWithShadow.png
index d6d004214a50..ed4a9bf9ec90 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHybridWebViewWithShadow.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHybridWebViewWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png
index 95daedfd5527..e4e6c25c9ead 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionEndAndGridContent.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionEndAndGridContent.png
index 45e7669ac392..beb596b75672 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionEndAndGridContent.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionEndAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png
index 34f58b62bbdc..fd8df49de259 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionStartAndGridContent.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionStartAndGridContent.png
index 978d48d87524..027e1353f7be 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionStartAndGridContent.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyScrollViewWithScrollToPositionStartAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png
index 852a40272265..7208893bab1c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgBlue.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgBlue.png
index fd7ed113f917..d25b1a131185 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgBlue.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgBlue.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgLinear.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgLinear.png
index a30ec1ea3fa8..531feb994396 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgLinear.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgLinear.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgRadial.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgRadial.png
index 7b1ad157b96d..6516c0f84699 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgRadial.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgRadial.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgRed.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgRed.png
index 73392e52e64e..fd3122d2c702 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgRed.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarBgRed.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarTextBlack.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarTextBlack.png
index 60bd9dcf3277..0027182d6cfe 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarTextBlack.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarTextBlack.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarTextWhite.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarTextWhite.png
index bb1bbd6a2b28..ce199b52ff8a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarTextWhite.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/BarTextWhite.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Bugzilla36802Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Bugzilla36802Test.png
index 4b01a48822a7..bdace8a30e9c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Bugzilla36802Test.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Bugzilla36802Test.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png
index be7ef7357fdd..d70bfcce52fa 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/CollectionViewShouldChangeItemsLayout.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/CollectionViewShouldChangeItemsLayout.png
index 43a85edb5d4a..17e0f1c79a97 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/CollectionViewShouldChangeItemsLayout.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/CollectionViewShouldChangeItemsLayout.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/FlexLayoutWithBindableLayoutDisplaysLabels.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/FlexLayoutWithBindableLayoutDisplaysLabels.png
index 16c078a46d2b..444605e2a1b2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/FlexLayoutWithBindableLayoutDisplaysLabels.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/FlexLayoutWithBindableLayoutDisplaysLabels.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test.png
index 2378279e20ae..42cd595425dd 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_1.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_1.png
index c55644d1554f..94cc0fd2f60e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_1.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_1.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_2.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_2.png
index 4c533bbf33f1..5eec435a2900 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_2.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_2.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_3.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_3.png
index addafac769ec..a5d981b460ee 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_3.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_3.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_4.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_4.png
index 4932ff0af3b9..d8580898bc5d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_4.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_4.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_5.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_5.png
index 428158cc17ca..ae4806dabd01 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_5.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue24414Test_5.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue2775Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue2775Test.png
index 06ba81d0ad96..7cfaf408c458 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue2775Test.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Issue2775Test.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/NavBarHidden.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/NavBarHidden.png
index ae195286051a..acf3eb6430ca 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/NavBarHidden.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/NavBarHidden.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/NavBarVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/NavBarVisible.png
index 7823b753bb35..9e6ec3696b5b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/NavBarVisible.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/NavBarVisible.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetCharacterSpacing_VerifyCharacterSpacingLabel.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetCharacterSpacing_VerifyCharacterSpacingLabel.png
index b1f253a07015..749cf3c1a67d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetCharacterSpacing_VerifyCharacterSpacingLabel.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetCharacterSpacing_VerifyCharacterSpacingLabel.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png
index 6fbf295f4787..03596896c893 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFlowDirectionRTL_VerifyFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png
index ad44fc622100..0b53e58227c1 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontAttributesItalicAndFontFamilyDokdo_VerifyFontAttributesAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png
index dee1275d9d06..4186c7e51b5e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontSizeAndFontAttributesBold_VerifyFontSizeAndAttributes.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png
index 5be631e81e88..609babad6d82 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetFontSizeAndFontFamilyDokdo_VerifyFontSizeAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png
index 7c46ba823952..8db52f50af2f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetHorizontalTextAlignmentAndSelectedItem_VerifySelectedItem.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetIsEnabledFalse_VerifyPickerDisabled.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetIsEnabledFalse_VerifyPickerDisabled.png
index b55c86cc5e24..93e14fda777f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetIsEnabledFalse_VerifyPickerDisabled.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetIsEnabledFalse_VerifyPickerDisabled.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png
index 20b38f6bc424..8afaa65ea33c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetSelectedIndex_VerifySelectedIndexAndItem.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetSelectedItem_VerifySelectedItemLabel.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetSelectedItem_VerifySelectedItemLabel.png
index 24e2bd9d2818..741ac1f4a224 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetSelectedItem_VerifySelectedItemLabel.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetSelectedItem_VerifySelectedItemLabel.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetShadow_VerifyShadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetShadow_VerifyShadow.png
index 3ad295ee2901..188fcdd7cce1 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetShadow_VerifyShadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetShadow_VerifyShadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetTextColorRed_VerifyTextColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetTextColorRed_VerifyTextColor.png
index 2307268eb735..eae446f30601 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetTextColorRed_VerifyTextColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetTextColorRed_VerifyTextColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png
index d5192adc4632..86f107bde353 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_SetVerticalTextAlignmentAndSelectedItem_VerifySelectedItem.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_Validate_VerifyLabels.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_Validate_VerifyLabels.png
index 3fdf214bdfcc..ec7ce0ed0da9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_Validate_VerifyLabels.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Picker_Validate_VerifyLabels.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ProgressBar_ProgressToMethod_VerifyVisualState.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ProgressBar_ProgressToMethod_VerifyVisualState.png
index 605147bcd719..b7b7affcfa2f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ProgressBar_ProgressToMethod_VerifyVisualState.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ProgressBar_ProgressToMethod_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ProgressBar_SetProgressOutOfRange.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ProgressBar_SetProgressOutOfRange.png
index ac78bc6aca47..a089b34bdae9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ProgressBar_SetProgressOutOfRange.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ProgressBar_SetProgressOutOfRange.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png
index 125e54a31384..0b4509ea6d78 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/RadioButton_Checking_Initial_Configuration_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/RefreshView_SetShadow_VerifyShadowApplied.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/RefreshView_SetShadow_VerifyShadowApplied.png
index 8ad4bd198b61..9f85aa20a5a6 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/RefreshView_SetShadow_VerifyShadowApplied.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/RefreshView_SetShadow_VerifyShadowApplied.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ResizeCarouselViewKeepsIndex.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ResizeCarouselViewKeepsIndex.png
index 56293805689f..b35993f019f5 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ResizeCarouselViewKeepsIndex.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ResizeCarouselViewKeepsIndex.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShadowShouldUpdate.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShadowShouldUpdate.png
index 2f7efc997e23..580e6d4a4c3c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShadowShouldUpdate.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShadowShouldUpdate.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ForegroundColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ForegroundColor.png
index f9dfc31a1713..a15d5bc8b7fd 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ForegroundColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ForegroundColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ForegroundColorAndTitleColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ForegroundColorAndTitleColor.png
index 83be011e8671..b5119d237d34 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ForegroundColorAndTitleColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ForegroundColorAndTitleColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_IsVisibleFalse.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_IsVisibleFalse.png
index 90eaab2d2843..ca696c849b91 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_IsVisibleFalse.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_IsVisibleFalse.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_IsVisibleTrue.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_IsVisibleTrue.png
index 54cabbb7b033..3da714fa8bfb 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_IsVisibleTrue.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_IsVisibleTrue.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ShowTitleView.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ShowTitleView.png
index d3ee2578a7b0..e5c3283b69e8 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ShowTitleView.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ShowTitleView.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ShowTitleViewHidden.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ShowTitleViewHidden.png
index 683750cda7b2..02a4ebcd9934 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ShowTitleViewHidden.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_ShowTitleViewHidden.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_TitleColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_TitleColor.png
index 0eaf99946ee0..3d71e6c6c657 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_TitleColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ShellPages_TitleColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Slider_SetVisibilityToFalse_VerifyVisualState.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Slider_SetVisibilityToFalse_VerifyVisualState.png
index fea100d399f4..3e82d959a385 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Slider_SetVisibilityToFalse_VerifyVisualState.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/Slider_SetVisibilityToFalse_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png
index 41cdaf37955b..bbbbd701ee0b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png
index 7837e4c469d9..053ec2048396 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png
index b41c497abdf9..06686acc3084 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TimePicker_SetFontSizeAndFormat_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleIcon_Add_Visual.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleIcon_Add_Visual.png
index d8b192e99fa0..d0b48c5836e9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleIcon_Add_Visual.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleIcon_Add_Visual.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleIcon_AddingTwice_DoesNotDuplicate.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleIcon_AddingTwice_DoesNotDuplicate.png
index 86a693f68d09..b7e144f75752 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleIcon_AddingTwice_DoesNotDuplicate.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleIcon_AddingTwice_DoesNotDuplicate.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleViewApplied.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleViewApplied.png
index 3b2670a40563..58b23a425890 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleViewApplied.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleViewApplied.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleViewCleared.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleViewCleared.png
index 0684041858a0..ac28eee37d73 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleViewCleared.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/TitleViewCleared.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyCollectionViewItemsAfterScrolling.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyCollectionViewItemsAfterScrolling.png
index 6a91b6276f95..b7e94c4056e1 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyCollectionViewItemsAfterScrolling.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyCollectionViewItemsAfterScrolling.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetColumn_SetColumnSpacing.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetColumn_SetColumnSpacing.png
index 0b0d5285e25c..db3d1569848c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetColumn_SetColumnSpacing.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetColumn_SetColumnSpacing.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetRowAndColumn_BackgroundColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetRowAndColumn_BackgroundColor.png
index 8629e73f2e09..9993a33ac952 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetRowAndColumn_BackgroundColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetRowAndColumn_BackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetRow_SetColumnSpacing.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetRow_SetColumnSpacing.png
index ed074007574a..f206cd69b544 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetRow_SetColumnSpacing.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyGrid_SetRow_SetColumnSpacing.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyHybridWebViewWithShadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyHybridWebViewWithShadow.png
index 31ae043089cb..8fdcf341b299 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyHybridWebViewWithShadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyHybridWebViewWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png
index cb573400c0fd..11cfd3cf58b2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionCenterAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionEndAndGridContent.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionEndAndGridContent.png
index c3f5e4389e2e..f2d166b2e629 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionEndAndGridContent.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionEndAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png
index be9e26b4f861..3d6ce8c9211d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionMakeVisibleAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionStartAndGridContent.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionStartAndGridContent.png
index 7b5112e35835..0aba0d5a29d7 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionStartAndGridContent.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyScrollViewWithScrollToPositionStartAndGridContent.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTabBarIconIsLoaded.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTabBarIconIsLoaded.png
index e789a338c02f..020b2b1e75b2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTabBarIconIsLoaded.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTabBarIconIsLoaded.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_InitialState.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_InitialState.png
index 6dccff7117b4..d6af28e7907f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_InitialState.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_InitialState.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Normal.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Normal.png
index 9b13f789d02e..95885e1729dd 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Normal.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Normal.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Reset.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Reset.png
index 1c5469771f86..e230d2f7c4ef 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Reset.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Reset.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Selected.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Selected.png
index e58c378a56aa..327920199885 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Selected.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Selected.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Selected_Multiple.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Selected_Multiple.png
index 7e1a3851f862..4040ab53a338 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Selected_Multiple.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyVSM_CollectionView_Selected_Multiple.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyWebViewWithShadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyWebViewWithShadow.png
index f5278f57e748..f3f184401495 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyWebViewWithShadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyWebViewWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorXWithAnchorY.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorXWithAnchorY.png
index 15902a0f9498..73e44f7453ea 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorXWithAnchorY.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorXWithAnchorY.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorX_ScaleYWithRotation.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorX_ScaleYWithRotation.png
index 5c44f0f91e7c..a3b98e496c91 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorX_ScaleYWithRotation.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorX_ScaleYWithRotation.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorY_ScaleWithRotationY.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorY_ScaleWithRotationY.png
index 65b8cd880430..f4a257c0bbd7 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorY_ScaleWithRotationY.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorY_ScaleWithRotationY.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorY_ScaleXWithRotationX.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorY_ScaleXWithRotationX.png
index 045bbc25ef53..a8e12a69af77 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorY_ScaleXWithRotationX.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_AnchorY_ScaleXWithRotationX.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_IsVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_IsVisible.png
index 7f00270f8118..9861333c5ec1 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_IsVisible.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_IsVisible.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_Rotation.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_Rotation.png
index e175a96895cd..9bad4ab33038 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_Rotation.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_Rotation.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationWithRotationX.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationWithRotationX.png
index 6b5439b69af5..c2ae0f82230c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationWithRotationX.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationWithRotationX.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationWithScale.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationWithScale.png
index d5954f587e6c..780056ef2963 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationWithScale.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationWithScale.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationX.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationX.png
index 73c3b7f3a58a..4000d5d8dae9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationX.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationX.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationXWithRotationY.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationXWithRotationY.png
index 7ead17c92ecb..5f86e0a4dd52 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationXWithRotationY.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationXWithRotationY.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationXWithScaleX.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationXWithScaleX.png
index 1364592afbd2..bc161ce3e169 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationXWithScaleX.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationXWithScaleX.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationY.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationY.png
index 1e85a7eb0df7..765e0de42112 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationY.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationY.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationYWithScaleY.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationYWithScaleY.png
index 667915ebd091..c5cb025feff2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationYWithScaleY.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_RotationYWithScaleY.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_Scale.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_Scale.png
index 9f213578a078..6b823087e424 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_Scale.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_Scale.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleWithAnchorXAndRotationY.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleWithAnchorXAndRotationY.png
index 38392f36842f..ec94b7a09c8e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleWithAnchorXAndRotationY.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleWithAnchorXAndRotationY.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleX.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleX.png
index 5194573473c4..d3ae58174709 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleX.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleX.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleXWithAnchorYAndRotationY.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleXWithAnchorYAndRotationY.png
index 765d3781d99f..0ced358b8451 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleXWithAnchorYAndRotationY.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleXWithAnchorYAndRotationY.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleY.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleY.png
index 1a0fcaf2570c..e30ed3889178 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleY.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleY.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleYWithAnchorXAndRotationY.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleYWithAnchorXAndRotationY.png
index 5044b9cb1ded..37258f2acecb 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleYWithAnchorXAndRotationY.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VisualTransform_ScaleYWithAnchorXAndRotationY.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShouldDisplayLabelWithoutBeingCroppedInsideBorder.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShouldDisplayLabelWithoutBeingCroppedInsideBorder.png
new file mode 100644
index 000000000000..169f774f9a84
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShouldDisplayLabelWithoutBeingCroppedInsideBorder.png differ
diff --git a/src/Core/src/IViewWithWindow.cs b/src/Core/src/IViewWithWindow.cs
new file mode 100644
index 000000000000..c730208ef20b
--- /dev/null
+++ b/src/Core/src/IViewWithWindow.cs
@@ -0,0 +1,15 @@
+namespace Microsoft.Maui
+{
+ ///
+ /// Internal interface for views that can provide access to their window.
+ /// This enables dependency injection for testing scenarios.
+ ///
+ // TODO Delete this in NET10 and just add it with a default implementation to IView
+ internal interface IViewWithWindow
+ {
+ ///
+ /// Gets the window associated with this view.
+ ///
+ IWindow? Window { get; }
+ }
+}
\ No newline at end of file
diff --git a/src/Core/src/Layouts/DensityValue.cs b/src/Core/src/Layouts/DensityValue.cs
new file mode 100644
index 000000000000..28ce0a151b09
--- /dev/null
+++ b/src/Core/src/Layouts/DensityValue.cs
@@ -0,0 +1,271 @@
+using System;
+
+namespace Microsoft.Maui.Layouts
+{
+ ///
+ /// Represents a value that tracks both density-independent (dp) and physical pixel values
+ /// to enable precise pixel-aware layout calculations.
+ ///
+ internal readonly struct DensityValue : IEquatable
+ {
+ private const double Epsilon = 0.00001;
+
+ ///
+ /// Gets the raw pixel value without rounding.
+ ///
+ public double RawPx { get; }
+
+ ///
+ /// Gets the display density factor.
+ ///
+ public double Density { get; }
+
+ ///
+ /// Gets the value in density-independent pixels (dp).
+ ///
+ public double Dp
+ {
+ get
+ {
+ // Handle default case where Density is 0
+ if (Math.Abs(Density) < Epsilon)
+ {
+ return RawPx; // Treat as 1.0 density
+ }
+
+ return Math.Abs(Density - 1.0) < Epsilon ? RawPx : RawPx / Density;
+ }
+ }
+
+
+
+ ///
+ /// Initializes a new instance of the DensityValue struct.
+ ///
+ /// The value in density-independent pixels.
+ /// The display density factor.
+ public DensityValue(double dp, double density)
+ {
+ // When density is 1.0, store the dp value directly as RawPx to avoid any precision loss
+ if (Math.Abs(density - 1.0) < Epsilon)
+ {
+ RawPx = dp;
+ }
+ else
+ {
+ RawPx = dp * density;
+ }
+ Density = density;
+ }
+
+ ///
+ /// Initializes a new instance of the DensityValue struct with default density of 1.0.
+ ///
+ /// The value in density-independent pixels.
+ public DensityValue(double value) : this(value, 1.0)
+ {
+ }
+
+ ///
+ /// Private constructor for internal use.
+ ///
+ private DensityValue(double rawPx, double density, bool fromPixels)
+ {
+ RawPx = rawPx;
+ Density = density;
+ }
+
+ ///
+ /// Creates a DensityValue from a pixel value and density.
+ ///
+ /// The pixel value.
+ /// The display density factor.
+ /// A DensityValue representing the equivalent dp value.
+ public static DensityValue FromPixels(double pixels, double density)
+ {
+ return new DensityValue(pixels, density, true);
+ }
+
+ ///
+ /// Adds two DensityValue instances.
+ ///
+ public static DensityValue operator +(DensityValue left, DensityValue right)
+ {
+ // If both have density 1.0, we can safely add them
+ if (Math.Abs(left.Density - 1.0) < Epsilon && Math.Abs(right.Density - 1.0) < Epsilon)
+ {
+ return new DensityValue(left.RawPx + right.RawPx, 1.0);
+ }
+
+ // If densities are the same, add them
+ if (Math.Abs(left.Density - right.Density) < Epsilon)
+ {
+ return DensityValue.FromPixels(left.RawPx + right.RawPx, left.Density);
+ }
+
+ // If one has density 1.0 and the other doesn't, treat the 1.0 density value as having the same density as the other
+ if (Math.Abs(left.Density - 1.0) < Epsilon)
+ {
+ return DensityValue.FromPixels(left.RawPx + right.RawPx, right.Density);
+ }
+
+ if (Math.Abs(right.Density - 1.0) < Epsilon)
+ {
+ return DensityValue.FromPixels(left.RawPx + right.RawPx, left.Density);
+ }
+
+ throw new ArgumentException("Cannot add DensityValues with different densities.");
+ }
+
+ ///
+ /// Subtracts two DensityValue instances.
+ ///
+ public static DensityValue operator -(DensityValue left, DensityValue right)
+ {
+ // If both have density 1.0, we can safely subtract them
+ if (Math.Abs(left.Density - 1.0) < Epsilon && Math.Abs(right.Density - 1.0) < Epsilon)
+ {
+ return new DensityValue(left.RawPx - right.RawPx, 1.0);
+ }
+
+ // If densities are the same, subtract them
+ if (Math.Abs(left.Density - right.Density) < Epsilon)
+ {
+ return DensityValue.FromPixels(left.RawPx - right.RawPx, left.Density);
+ }
+
+ // If one has density 1.0 and the other doesn't, treat the 1.0 density value as having the same density as the other
+ if (Math.Abs(left.Density - 1.0) < Epsilon)
+ {
+ return DensityValue.FromPixels(left.RawPx - right.RawPx, right.Density);
+ }
+
+ if (Math.Abs(right.Density - 1.0) < Epsilon)
+ {
+ return DensityValue.FromPixels(left.RawPx - right.RawPx, left.Density);
+ }
+
+ throw new ArgumentException("Cannot subtract DensityValues with different densities.");
+ }
+
+ ///
+ /// Multiplies a DensityValue by a scalar.
+ ///
+ public static DensityValue operator *(DensityValue value, double scalar)
+ {
+ return DensityValue.FromPixels(value.RawPx * scalar, value.Density);
+ }
+
+ ///
+ /// Multiplies a DensityValue by a scalar.
+ ///
+ public static DensityValue operator *(double scalar, DensityValue value)
+ {
+ return value * scalar;
+ }
+
+ ///
+ /// Divides a DensityValue by a scalar.
+ ///
+ public static DensityValue operator /(DensityValue value, double scalar)
+ {
+ return DensityValue.FromPixels(value.RawPx / scalar, value.Density);
+ }
+
+ ///
+ /// Implicitly converts a DensityValue to its dp value.
+ ///
+ public static implicit operator double(DensityValue value)
+ {
+ return value.Dp;
+ }
+
+ ///
+ /// Implicitly converts a double to a DensityValue with density 1.0.
+ ///
+ public static implicit operator DensityValue(double value)
+ {
+ return new DensityValue(value, 1.0);
+ }
+
+ ///
+ /// Distributes a total pixel amount across multiple DensityValue instances,
+ /// accumulating rounding errors and applying them to the final elements.
+ /// This implements Android's approach of assigning remainder pixels to the last element.
+ ///
+ /// The total pixels to distribute.
+ /// The display density.
+ /// The relative portions for each element.
+ /// An array of pixel values that sum exactly to totalPixels.
+ public static int[] DistributePixels(double totalPixels, double density, double[] portions)
+ {
+ if (portions.Length == 0)
+ return Array.Empty();
+
+ var totalPortions = 0.0;
+ foreach (var portion in portions)
+ {
+ totalPortions += portion;
+ }
+
+ if (totalPortions <= 0)
+ return new int[portions.Length]; // All zeros
+
+ var result = new int[portions.Length];
+ var targetTotal = (int)Math.Floor(totalPixels);
+ var assignedTotal = 0;
+
+ // Calculate ideal pixels per portion
+ var idealPixelsPerUnit = totalPixels / totalPortions;
+
+ // Assign pixels to all elements using floor
+ for (int i = 0; i < portions.Length; i++)
+ {
+ var idealPixels = idealPixelsPerUnit * portions[i];
+ result[i] = (int)Math.Floor(idealPixels);
+ assignedTotal += result[i];
+ }
+
+ // Distribute remaining pixels from right to left (as requested in review)
+ var remainingPixels = targetTotal - assignedTotal;
+ for (int i = portions.Length - 1; i >= 0 && remainingPixels > 0; i--)
+ {
+ result[i]++;
+ remainingPixels--;
+ }
+
+ return result;
+ }
+
+ public bool Equals(DensityValue other)
+ {
+ return Math.Abs(RawPx - other.RawPx) < Epsilon &&
+ Math.Abs(Density - other.Density) < Epsilon;
+ }
+
+ public override bool Equals(object? obj)
+ {
+ return obj is DensityValue other && Equals(other);
+ }
+
+ public override int GetHashCode()
+ {
+ return (RawPx, Density).GetHashCode();
+ }
+
+ public static bool operator ==(DensityValue left, DensityValue right)
+ {
+ return left.Equals(right);
+ }
+
+ public static bool operator !=(DensityValue left, DensityValue right)
+ {
+ return !left.Equals(right);
+ }
+
+ public override string ToString()
+ {
+ return $"{RawPx:F2}px ({Dp:F2}dp @ {Density:F2}x)";
+ }
+ }
+}
diff --git a/src/Core/src/Layouts/GridLayoutManager.cs b/src/Core/src/Layouts/GridLayoutManager.cs
index 42076d6829ce..4b29a66988ec 100644
--- a/src/Core/src/Layouts/GridLayoutManager.cs
+++ b/src/Core/src/Layouts/GridLayoutManager.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
+using System.Linq;
using Microsoft.Maui.Graphics;
using Microsoft.Maui.Primitives;
@@ -265,12 +266,12 @@ public Rect GetCellBoundsFor(IView view, double xOffset, double yOffset)
for (int n = firstColumn; n < lastColumn; n++)
{
- width += _columns[n].Size;
+ width += _columns[n].Size.Dp;
}
for (int n = firstRow; n < lastRow; n++)
{
- height += _rows[n].Size;
+ height += _rows[n].Size.Dp;
}
// Account for any space between spanned rows/columns
@@ -340,7 +341,7 @@ static double SumDefinitions(Definition[] definitions, double spacing, bool mini
for (int n = 0; n < definitions.Length; n++)
{
- sum += minimize ? definitions[n].MinimumSize : definitions[n].Size;
+ sum += minimize ? definitions[n].MinimumSize.Dp : definitions[n].Size.Dp;
if (n > 0)
{
@@ -393,7 +394,7 @@ void FirstMeasurePass()
bool treatCellHeightAsAuto = TreatCellHeightAsAuto(cell);
bool treatCellWidthAsAuto = TreatCellWidthAsAuto(cell);
- if (double.IsNaN(cell.MeasureHeight) || double.IsNaN(cell.MeasureWidth))
+ if (double.IsNaN(cell.MeasureHeight.Dp) || double.IsNaN(cell.MeasureWidth.Dp))
{
// We still have some unknown measure constraints (* rows/columns that need to have
// the Auto measurements settled before we can measure them). So mark this cell for the
@@ -403,7 +404,7 @@ void FirstMeasurePass()
continue;
}
- var measure = MeasureCell(cell, cell.MeasureWidth, cell.MeasureHeight);
+ var measure = MeasureCell(cell, cell.MeasureWidth.Dp, cell.MeasureHeight.Dp);
if (treatCellWidthAsAuto)
{
@@ -443,7 +444,7 @@ void SecondMeasurePass()
double width = 0;
double height = 0;
- if (double.IsInfinity(cell.MeasureHeight))
+ if (double.IsInfinity(cell.MeasureHeight.Dp))
{
height = double.PositiveInfinity;
}
@@ -451,12 +452,12 @@ void SecondMeasurePass()
{
for (int n = cell.Row; n < cell.Row + cell.RowSpan; n++)
{
- height += _rows[n].Size;
+ height += _rows[n].Size.Dp;
}
height += _rowSpacing * (cell.RowSpan > 0 ? cell.RowSpan - 1 : 0);
}
- if (double.IsInfinity(cell.MeasureWidth))
+ if (double.IsInfinity(cell.MeasureWidth.Dp))
{
width = double.PositiveInfinity;
}
@@ -464,7 +465,7 @@ void SecondMeasurePass()
{
for (int n = cell.Column; n < cell.Column + cell.ColumnSpan; n++)
{
- width += _columns[n].Size;
+ width += _columns[n].Size.Dp;
}
width += _columnSpacing * (cell.ColumnSpan > 0 ? cell.ColumnSpan - 1 : 0);
}
@@ -541,7 +542,7 @@ static void ResolveSpan(Definition[] definitions, int start, int length, double
// Determine how large the spanned area currently is
for (int n = start; n < end; n++)
{
- currentSize += definitions[n].Size;
+ currentSize += definitions[n].Size.Dp;
if (n > start)
{
@@ -592,7 +593,7 @@ double LeftEdgeOfColumn(int column)
for (int n = 0; n < column; n++)
{
- left += _columns[n].Size;
+ left += _columns[n].Size.Dp;
left += _columnSpacing;
}
@@ -605,7 +606,7 @@ double TopEdgeOfRow(int row)
for (int n = 0; n < row; n++)
{
- top += _rows[n].Size;
+ top += _rows[n].Size.Dp;
top += _rowSpacing;
}
@@ -694,7 +695,7 @@ void ResolveStarRows(double heightConstraint)
foreach (var cell in _cells)
{
- if (double.IsNaN(cell.MeasureHeight))
+ if (double.IsNaN(cell.MeasureHeight.Dp))
{
UpdateKnownMeasureHeight(cell);
}
@@ -762,7 +763,7 @@ static void DetermineMinimumStarSizesInSpan(double spaceNeeded, Definition[] def
{
if (definitions[n].IsAbsolute || definitions[n].IsAuto)
{
- spaceNeeded -= definitions[n].Size;
+ spaceNeeded -= definitions[n].Size.Dp;
}
}
@@ -843,7 +844,7 @@ static void MinimizeStars(Definition[] defs)
}
}
- static void ExpandStarDefinitions(Definition[] definitions, double targetSize, double currentSize, double spacing, double starCount, bool limitStarSizes)
+ void ExpandStarDefinitions(Definition[] definitions, double targetSize, double currentSize, double spacing, double starCount, bool limitStarSizes)
{
// Figure out what the star value should be at this size
var starSize = ComputeStarSizeForTarget(targetSize, definitions, spacing, starCount);
@@ -856,8 +857,11 @@ static void ExpandStarDefinitions(Definition[] definitions, double targetSize, d
EnsureSizeLimit(definitions, starSize);
}
+ // Get density for pixel-perfect distribution
+ var density = GetDensity();
+
// Inflate the stars so that we fill up the space at this size
- ExpandStars(targetSize, currentSize, definitions, starSize, starCount);
+ ExpandStars(targetSize, currentSize, definitions, starSize, starCount, density);
}
static void EnsureSizeLimit(Definition[] definitions, double starSize)
@@ -892,7 +896,7 @@ static double ComputeStarSizeForTarget(double targetSize, Definition[] defs, dou
return (targetSize - sum) / starCount;
}
- static void ExpandStars(double targetSize, double currentSize, Definition[] defs, double targetStarSize, double starCount)
+ static void ExpandStars(double targetSize, double currentSize, Definition[] defs, double targetStarSize, double starCount, double density)
{
Debug.Assert(starCount > 0, "Assume that the caller has already checked for the existence of star rows/columns before using this.");
@@ -925,12 +929,14 @@ static void ExpandStars(double targetSize, double currentSize, Definition[] defs
// targetStarSize, that means we have enough room to expand all of our star rows/columns
// to their full size.
- foreach (var definition in defs)
+ var starDefinitions = defs.Where(d => d.IsStar).ToArray();
+ var portions = starDefinitions.Select(d => targetStarSize * d.GridLength.Value).ToArray();
+ var totalPixels = portions.Sum() * density;
+ var pixelAllocations = DensityValue.DistributePixels(totalPixels, density, portions);
+
+ for (int i = 0; i < starDefinitions.Length; i++)
{
- if (definition.IsStar)
- {
- definition.Size = targetStarSize * definition.GridLength.Value;
- }
+ starDefinitions[i].Size = DensityValue.FromPixels(pixelAllocations[i], density);
}
return;
@@ -953,27 +959,50 @@ static void ExpandStars(double targetSize, double currentSize, Definition[] defs
}
}
- foreach (var definition in defs)
+ // Use density-aware distribution for pixel-perfect proportional allocation
+ var proportionalStarDefinitions = defs.Where(d => d.IsStar).ToArray();
+ var proportionalPortions = new double[proportionalStarDefinitions.Length];
+
+ for (int i = 0; i < proportionalStarDefinitions.Length; i++)
{
- if (definition.IsStar)
+ var definition = proportionalStarDefinitions[i];
+ double fullTargetSize = targetStarSize * definition.GridLength.Value;
+
+ if (definition.MinimumSize < fullTargetSize)
{
- // Skip the star rows/columns whose minimums are at or higher than the target sizes
- double fullTargetSize = targetStarSize * definition.GridLength.Value;
+ var scale = (fullTargetSize - definition.MinimumSize) / totaldiff;
+ var portion = scale * availableSpace;
+ proportionalPortions[i] = definition.MinimumSize + portion;
+ }
+ else
+ {
+ proportionalPortions[i] = definition.MinimumSize;
+ }
+ }
- if (definition.MinimumSize < fullTargetSize)
- {
- // Figure out how small this definition is relative to the total difference,
- // and use that to determine how much of the available space this definition gets
+ var proportionalTotalPixels = proportionalPortions.Sum() * density;
+ var proportionalPixelAllocations = DensityValue.DistributePixels(proportionalTotalPixels, density, proportionalPortions);
+
+ for (int i = 0; i < proportionalStarDefinitions.Length; i++)
+ {
+ proportionalStarDefinitions[i].Size = DensityValue.FromPixels(proportionalPixelAllocations[i], density);
+ }
+ }
- // The goal is to have the definitions expand proportionate to their deficit from
- // their full target sizes
- var scale = (fullTargetSize - definition.MinimumSize) / totaldiff;
- var portion = scale * availableSpace;
- definition.Size = definition.MinimumSize + portion;
- }
- }
+ ///
+ /// Gets the display density for density-aware calculations.
+ ///
+ /// The display density, or 1.0 if not available.
+ double GetDensity()
+ {
+ // Try to get density from the grid view if it implements IViewWithWindow
+ if (_grid is IViewWithWindow viewWithWindow && viewWithWindow.Window != null)
+ {
+ return viewWithWindow.Window.RequestDisplayDensity();
}
+
+ return 1.0;
}
static bool AnyAuto(Definition[] definitions)
@@ -1014,7 +1043,7 @@ void UpdateKnownMeasureWidth(Cell cell)
double measureWidth = 0;
for (int column = cell.Column; column < cell.Column + cell.ColumnSpan; column++)
{
- measureWidth += _columns[column].Size;
+ measureWidth += _columns[column].Size.Dp;
if (column > cell.Column)
{
@@ -1030,7 +1059,7 @@ void UpdateKnownMeasureHeight(Cell cell)
double measureHeight = 0;
for (int row = cell.Row; row < cell.Row + cell.RowSpan; row++)
{
- measureHeight += _rows[row].Size;
+ measureHeight += _rows[row].Size.Dp;
if (row > cell.Row)
{
@@ -1138,8 +1167,8 @@ class Cell
public int Column { get; }
public int RowSpan { get; }
public int ColumnSpan { get; }
- public double MeasureWidth { get; set; } = double.NaN;
- public double MeasureHeight { get; set; } = double.NaN;
+ public DensityValue MeasureWidth { get; set; } = new DensityValue(double.NaN);
+ public DensityValue MeasureHeight { get; set; } = new DensityValue(double.NaN);
public bool NeedsSecondPass { get; set; }
///
@@ -1199,12 +1228,12 @@ static GridLengthType ToGridLengthType(GridUnitType gridUnitType)
class Definition
{
readonly GridLength _gridLength;
- private double _size;
+ private DensityValue _size;
///
/// The current size of this definition
///
- public double Size
+ public DensityValue Size
{
get => _size;
set
@@ -1222,11 +1251,11 @@ public double Size
/// For absolute and auto definitions, this is the same as Size
/// For star definitions, this is the minimum size which can contain the contents of the row/column
///
- public double MinimumSize { get; set; }
+ public DensityValue MinimumSize { get; set; }
- public void Update(double size)
+ public void Update(DensityValue size)
{
- if (size > Size)
+ if (size.RawPx > Size.RawPx)
{
Size = size;
}
@@ -1240,13 +1269,19 @@ public void Update(double size)
public Definition(GridLength gridLength)
{
+ _gridLength = gridLength;
+
if (gridLength.IsAbsolute)
{
Size = gridLength.Value;
}
-
- _gridLength = gridLength;
+ else
+ {
+ // For auto and star, start with size 0
+ Size = new DensityValue(0.0);
+ MinimumSize = new DensityValue(0.0);
+ }
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/ContextExtensions.cs b/src/Core/src/Platform/Android/ContextExtensions.cs
index c2967afe1335..4cc145901be7 100644
--- a/src/Core/src/Platform/Android/ContextExtensions.cs
+++ b/src/Core/src/Platform/Android/ContextExtensions.cs
@@ -135,12 +135,14 @@ internal static (int left, int top, int right, int bottom) ToPixels(this View vi
public static (int left, int top, int right, int bottom) ToPixels(this Context context, Graphics.Rect rectangle)
{
+ var left = (int)context.ToPixels(rectangle.Left);
+ var top = (int)context.ToPixels(rectangle.Top);
return
(
- (int)context.ToPixels(rectangle.Left),
- (int)context.ToPixels(rectangle.Top),
- (int)context.ToPixels(rectangle.Right),
- (int)context.ToPixels(rectangle.Bottom)
+ left,
+ top,
+ left + (int)context.ToPixels(rectangle.Width),
+ top + (int)context.ToPixels(rectangle.Height)
);
}
diff --git a/src/Core/src/Platform/ElementExtensions.cs b/src/Core/src/Platform/ElementExtensions.cs
index a76988c5afba..afd06e83879d 100644
--- a/src/Core/src/Platform/ElementExtensions.cs
+++ b/src/Core/src/Platform/ElementExtensions.cs
@@ -167,6 +167,10 @@ public static void SetWindowHandler(this PlatformWindow platformWindow, IWindow
#if WINDOWS || IOS || ANDROID || TIZEN
internal static IWindow GetWindow(this IElement element) =>
+ (element as IViewWithWindow)?.Window ??
+#if !TIZEN
+ (element as IView)?.GetHostedWindow() ??
+#endif
element.Handler?.MauiContext?.GetPlatformWindow()?.GetWindow() ??
throw new InvalidOperationException("IWindow not found");
#endif
diff --git a/src/Core/tests/UnitTests/Layouts/GridLayoutManagerDensityTest.cs b/src/Core/tests/UnitTests/Layouts/GridLayoutManagerDensityTest.cs
new file mode 100644
index 000000000000..d181683fee70
--- /dev/null
+++ b/src/Core/tests/UnitTests/Layouts/GridLayoutManagerDensityTest.cs
@@ -0,0 +1,173 @@
+using System;
+using Xunit;
+using Microsoft.Maui.Layouts;
+
+namespace Microsoft.Maui.UnitTests.Layouts
+{
+ [Category(TestCategory.Layout)]
+ public class GridLayoutManagerDensityTests
+ {
+ [Fact]
+ public void DensityValue_ThreeEqualColumns_WithRemainder()
+ {
+ // Scenario 1: 293.4dp across 3 columns at density 2.625
+ var totalDp = 293.4;
+ var density = 2.625;
+ var totalPixels = totalDp * density; // 770.175px
+ var portions = new double[] { 1.0, 1.0, 1.0 }; // Equal star sizing
+
+ var result = DensityValue.DistributePixels(totalPixels, density, portions);
+
+ // Expected with right-to-left distribution: [256, 257, 257] = 770px
+ Assert.Equal(3, result.Length);
+ Assert.Equal(256, result[0]);
+ Assert.Equal(257, result[1]);
+ Assert.Equal(257, result[2]);
+
+ var total = result[0] + result[1] + result[2];
+ Assert.Equal(770, total);
+
+ // Verify this is better than naive division
+ var naiveSize = (int)Math.Round(totalPixels / 3); // 257
+ var naiveTotal = naiveSize * 3; // 771 - too much!
+ Assert.True(total < naiveTotal, "DensityValue should provide more accurate allocation than naive rounding");
+ }
+
+ [Fact]
+ public void DensityValue_ThreeEqualColumns_PerfectDivision()
+ {
+ // Scenario 2: 290dp across 3 columns at density 3.0 (perfect case)
+ var totalDp = 290.0;
+ var density = 3.0;
+ var totalPixels = totalDp * density; // 870.0px
+ var portions = new double[] { 1.0, 1.0, 1.0 };
+
+ var result = DensityValue.DistributePixels(totalPixels, density, portions);
+
+ // Perfect division case
+ Assert.Equal(3, result.Length);
+ Assert.Equal(290, result[0]);
+ Assert.Equal(290, result[1]);
+ Assert.Equal(290, result[2]);
+
+ var total = result[0] + result[1] + result[2];
+ Assert.Equal(870, total);
+ }
+
+ [Fact]
+ public void DensityValue_FourEqualColumns_WithRemainder()
+ {
+ // Scenario 3: 300dp across 4 columns at density 2.625
+ var totalDp = 300.0;
+ var density = 2.625;
+ var totalPixels = totalDp * density; // 787.5px
+ var portions = new double[] { 1.0, 1.0, 1.0, 1.0 };
+
+ var result = DensityValue.DistributePixels(totalPixels, density, portions);
+
+ // Expected with right-to-left distribution: [196, 197, 197, 197] = 787px
+ Assert.Equal(4, result.Length);
+ Assert.Equal(196, result[0]);
+ Assert.Equal(197, result[1]);
+ Assert.Equal(197, result[2]);
+ Assert.Equal(197, result[3]);
+
+ var total = result[0] + result[1] + result[2] + result[3];
+ Assert.Equal(787, total);
+ }
+
+ [Fact]
+ public void DensityValue_WeightedStarSizing_PerfectDivision()
+ {
+ // Test weighted star sizing: 2*, 1*, 2* across 500 pixels
+ var totalPixels = 500.0;
+ var density = 2.0;
+ var portions = new double[] { 2.0, 1.0, 2.0 }; // 2*, 1*, 2*
+
+ var result = DensityValue.DistributePixels(totalPixels, density, portions);
+
+ // Total weight = 5, so distribution should be:
+ // First: 500 * (2/5) = 200 pixels
+ // Second: 500 * (1/5) = 100 pixels
+ // Third: 500 * (2/5) = 200 pixels
+ Assert.Equal(3, result.Length);
+ Assert.Equal(200, result[0]);
+ Assert.Equal(100, result[1]);
+ Assert.Equal(200, result[2]);
+
+ var total = result[0] + result[1] + result[2];
+ Assert.Equal(500, total);
+ }
+
+ [Fact]
+ public void DensityValue_WeightedStarSizing_WithRounding()
+ {
+ // Test weighted star sizing with rounding: 3*, 2*, 3* across 333 pixels
+ var totalPixels = 333.0;
+ var density = 1.5;
+ var portions = new double[] { 3.0, 2.0, 3.0 }; // 3*, 2*, 3*
+
+ var result = DensityValue.DistributePixels(totalPixels, density, portions);
+
+ // Total weight = 8, with right-to-left distribution:
+ // portions[0]=3: floor(333 * 3/8) = floor(124.875) = 124
+ // portions[1]=2: floor(333 * 2/8) = floor(83.25) = 83
+ // portions[2]=3: floor(333 * 3/8) = floor(124.875) = 124
+ // Total assigned: 124+83+124 = 331, remainder: 333-331 = 2
+ // Right-to-left: portions[2] gets +1, portions[1] gets +1
+ // Final: [124, 84, 125]
+ Assert.Equal(3, result.Length);
+ Assert.Equal(124, result[0]);
+ Assert.Equal(84, result[1]);
+ Assert.Equal(125, result[2]);
+
+ var total = result[0] + result[1] + result[2];
+ Assert.Equal(333, total);
+ }
+
+ [Theory]
+ [InlineData(100.0, 1.0, new double[] { 1, 1, 1, 1 }, 25)] // Perfect division
+ [InlineData(101.0, 1.0, new double[] { 1, 1, 1, 1 }, 25)] // 1 pixel remainder
+ [InlineData(103.0, 1.0, new double[] { 1, 1, 1, 1 }, 25)] // 3 pixel remainder
+ public void DensityValue_RemainderPixels_Distribution(double totalPixels, double density, double[] portions, int expectedBase)
+ {
+ var result = DensityValue.DistributePixels(totalPixels, density, portions);
+
+ // With right-to-left distribution, we expect different behavior:
+ if (totalPixels == 103.0)
+ {
+ // 103/4 = 25.75, floor=25 each, remainder=3
+ // Right-to-left: [25, 26, 26, 26]
+ Assert.Equal(25, result[0]);
+ Assert.Equal(26, result[1]);
+ Assert.Equal(26, result[2]);
+ Assert.Equal(26, result[3]);
+ }
+ else if (totalPixels == 101.0)
+ {
+ // 101/4 = 25.25, floor=25 each, remainder=1
+ // Right-to-left: [25, 25, 25, 26]
+ Assert.Equal(25, result[0]);
+ Assert.Equal(25, result[1]);
+ Assert.Equal(25, result[2]);
+ Assert.Equal(26, result[3]);
+ }
+ else
+ {
+ // 100/4 = 25 exactly, no remainder
+ for (int i = 0; i < result.Length; i++)
+ {
+ Assert.Equal(expectedBase, result[i]);
+ }
+ }
+
+ // Total should match exactly
+ var total = 0;
+ foreach (var value in result)
+ {
+ total += value;
+ }
+ Assert.Equal((int)Math.Round(totalPixels), total);
+ }
+ }
+}
\ No newline at end of file