diff --git a/src/Controls/src/Core/Shapes/Shape.cs b/src/Controls/src/Core/Shapes/Shape.cs
index ee00cfdb4992..89b85173fba7 100644
--- a/src/Controls/src/Core/Shapes/Shape.cs
+++ b/src/Controls/src/Core/Shapes/Shape.cs
@@ -132,6 +132,11 @@ public double StrokeThickness
get { return (double)GetValue(StrokeThicknessProperty); }
}
+ ///
+ /// Returns the effective stroke thickness: when a is set, otherwise 0.
+ ///
+ internal double EffectiveStrokeThickness => Stroke is not null ? StrokeThickness : 0;
+
///
/// Gets or sets the collection of values that specify the pattern of dashes and gaps in the shape's outline. This is a bindable property.
///
@@ -317,10 +322,17 @@ internal void TransformPathForBounds(PathF path, Graphics.Rect viewBounds)
// since default GetBoundsByFlattening(0.001) returns incorrect results for curves
RectF pathBounds = path.GetBoundsByFlattening(1);
- viewBounds.X += StrokeThickness / 2;
- viewBounds.Y += StrokeThickness / 2;
- viewBounds.Width -= StrokeThickness;
- viewBounds.Height -= StrokeThickness;
+ // Only apply stroke inset if there is an actual stroke.
+ // For shapes with no stroke shrinking the bounds by StrokeThickness was
+ // effectively collapsing very small heights into a barely visible line.
+ var strokeThickness = EffectiveStrokeThickness;
+ if (strokeThickness > 0)
+ {
+ viewBounds.X += strokeThickness / 2;
+ viewBounds.Y += strokeThickness / 2;
+ viewBounds.Width -= strokeThickness;
+ viewBounds.Height -= strokeThickness;
+ }
Matrix3x2 transform;
@@ -456,8 +468,8 @@ protected override Size MeasureOverride(double widthConstraint, double heightCon
result.Height = boundsByFlattening.Height;
result.Width = boundsByFlattening.Width;
- widthConstraint -= StrokeThickness;
- heightConstraint -= StrokeThickness;
+ widthConstraint -= EffectiveStrokeThickness;
+ heightConstraint -= EffectiveStrokeThickness;
double scaleX = widthConstraint / result.Width;
double scaleY = heightConstraint / result.Height;
@@ -505,8 +517,8 @@ protected override Size MeasureOverride(double widthConstraint, double heightCon
break;
}
- result.Height += StrokeThickness;
- result.Width += StrokeThickness;
+ result.Height += EffectiveStrokeThickness;
+ result.Width += EffectiveStrokeThickness;
return result;
}
diff --git a/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs b/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs
index 5f80c1e639c3..f9eebdc822b9 100644
--- a/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs
@@ -142,25 +142,34 @@ public async Task RoundedRectangleBorderLayoutIsCorrect()
var colors = new Color[16];
int index = 0;
- // To calculate the x and y offsets (from the center) for a 45-45-90 triangle, we can use the radius as the hypotenuse
- // which means that the x and y offsets would be radius / sqrt(2).
+ // To calculate the x and y offsets (from the corner) for the 45° point on a circular arc,
+ // use the formula: offset = radius - radius / sqrt(2).
var xy = radius - (radius / Math.Sqrt(2));
+ // The inner stroke edge follows a concentric arc with radius (radius - strokeThickness).
+ // At 45°, the inner edge offset from the corner is: radius - (radius - strokeThickness) / sqrt(2).
+ // Note: this is NOT outerXY + strokeThickness, because the stroke width is measured radially
+ // (perpendicular to the arc), not linearly along both X and Y axes.
+ var innerXY = radius - ((radius - strokeThickness) / Math.Sqrt(2));
+
for (int i = 0; i < corners.Length; i++)
{
int xdir = i == 0 || i == 2 ? 1 : -1;
int ydir = i == 0 || i == 1 ? 1 : -1;
- // This marks the outside edge of the rounded corner.
+ // This marks the outside edge of the rounded corner (path line at 45°).
var outerX = corners[i].X + (xdir * xy);
var outerY = corners[i].Y + (ydir * xy);
- // Add stroke thickness to find the inner edge of the rounded corner.
- var innerX = outerX + (xdir * strokeThickness);
- var innerY = outerY + (ydir * strokeThickness);
+ // Inner edge of the stroke at 45° (concentric arc).
+ var innerX = corners[i].X + (xdir * innerXY);
+ var innerY = corners[i].Y + (ydir * innerXY);
- // Verify that the color outside of the rounded corner is the parent's color (White)
- points[index] = new Point(outerX - (xdir * 0.25), outerY - (ydir * 0.25));
+ // Verify that the color outside of the rounded corner is the parent's color (White).
+ // Use 1.5dp margin (not 0.25) to stay clear of antialiasing at the stroke edge:
+ // at density=2 the stroke outer edge is at ~11.7px, and 0.25dp gives only ~0.7px
+ // clearance — inside the 1px antialiasing blend zone, causing intermittent failures.
+ points[index] = new Point(outerX - (xdir * 1.5), outerY - (ydir * 1.5));
colors[index] = Colors.White;
index++;
@@ -173,8 +182,11 @@ public async Task RoundedRectangleBorderLayoutIsCorrect()
colors[index] = stroke;
index++;
- // Verify that the background color starts where we'd expect it to start
- points[index] = new Point(innerX + (xdir * 0.25), innerY + (ydir * 0.25));
+ // Verify that the background color starts where we'd expect it to start.
+ // Use 1.5dp margin to stay clear of antialiasing at the inner stroke edge:
+ // on iOS @1x context (1pt=1px), innerX+0.25 gives only ~0.14px clearance from the
+ // 9.858pt inner edge — inside the antialiasing blend zone (near-zero tolerance on iOS).
+ points[index] = new Point(innerX + (xdir * 1.5), innerY + (ydir * 1.5));
colors[index] = border.BackgroundColor;
index++;
}
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundFrameResizesFastAndCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundFrameResizesFastAndCorrectly.png
index 31af1edd724e..da330f332a8f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundFrameResizesFastAndCorrectly.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundFrameResizesFastAndCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundFrameResizesFastAndCorrectlySizeChanged.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundFrameResizesFastAndCorrectlySizeChanged.png
index 62adb95749c8..9a05bd8d3894 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundFrameResizesFastAndCorrectlySizeChanged.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundFrameResizesFastAndCorrectlySizeChanged.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundGradientsShouldRenderCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundGradientsShouldRenderCorrectly.png
index 845147249838..a3277497d2ca 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundGradientsShouldRenderCorrectly.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BackgroundGradientsShouldRenderCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BindingOnStrokeShapeWithRadius.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BindingOnStrokeShapeWithRadius.png
index c6bc292532e8..f2c418c3853e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BindingOnStrokeShapeWithRadius.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BindingOnStrokeShapeWithRadius.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BindingOnStrokeShapeWithoutRadius.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BindingOnStrokeShapeWithoutRadius.png
index fe0ee61feb27..39cb6ab0e3c2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BindingOnStrokeShapeWithoutRadius.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BindingOnStrokeShapeWithoutRadius.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderBackgroundSizeUpdatesWhenRotatingScreen.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderBackgroundSizeUpdatesWhenRotatingScreen.png
index 8638b74ced8d..4ecb7637b874 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderBackgroundSizeUpdatesWhenRotatingScreen.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderBackgroundSizeUpdatesWhenRotatingScreen.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderRoundRectangleWithImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderRoundRectangleWithImage.png
index 8ec27ad9871b..fa63fefe9ff1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderRoundRectangleWithImage.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderRoundRectangleWithImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png
index ddf7e4d9e950..ea592c9487b0 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_Shadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_Shadow.png
index 4c554749e050..02ca2c001473 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_Shadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Border_Shadow.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..7e34af603782 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..c75b566ea475 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..79e9089d9c98 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/CollectionViewGroupFooterTemplateShouldNotCrash.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewGroupFooterTemplateShouldNotCrash.png
index 9798be138500..11e552b25842 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewGroupFooterTemplateShouldNotCrash.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CollectionViewGroupFooterTemplateShouldNotCrash.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..bd25f8c05230 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..0086b82d592b 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/FirstCustomPageWithIconImageChanged.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithIconImageChanged.png
index 7c9a414727db..4ec98a32d6d2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithIconImageChanged.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FirstCustomPageWithIconImageChanged.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FooterWithEmptyCVShouldHaveCorrectSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FooterWithEmptyCVShouldHaveCorrectSize.png
index eea0182c7703..dd18f679bb58 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FooterWithEmptyCVShouldHaveCorrectSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/FooterWithEmptyCVShouldHaveCorrectSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderAndFooterShouldBeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderAndFooterShouldBeVisible.png
index 58063c4f345c..c86fc59d1436 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderAndFooterShouldBeVisible.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HeaderAndFooterShouldBeVisible.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..28b5211ae074 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..b1b509350a1d 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..13f66c1945fa 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..1b41a1cdf1f9 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_Height.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_Height.png
index d2bdedbde13e..e1a94d1f6421 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_Height.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_HeightAndWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_HeightAndWidth.png
index f4e37313c132..9d73e79d117d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_HeightAndWidth.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..16047b0e0853 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/HorizontalStackLayout_Spacing_With_Width.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_Width.png
index 6f1da6cf41c6..8e7382787496 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_Width.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/HorizontalStackLayout_Spacing_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/IndicatorWithTemplateShouldBeVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/IndicatorWithTemplateShouldBeVisible.png
index c76d68402953..36c14171cf14 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/IndicatorWithTemplateShouldBeVisible.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/IndicatorWithTemplateShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue22606_SetHeightTo200.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue22606_SetHeightTo200.png
index adeca3d3f732..53a0900e30f9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue22606_SetHeightTo200.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue22606_SetHeightTo200.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue22606_SetHeightTo500.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue22606_SetHeightTo500.png
index 11a377c7b69d..8dfe662b662b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue22606_SetHeightTo500.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue22606_SetHeightTo500.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..4fbf1593847a 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..1aacf5ec60ad 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..ac99cac09595 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..ea3191b76cec 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..f5121f721abd 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..50cf27699994 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/LinearGradientBrushShouldWork.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LinearGradientBrushShouldWork.png
index 4aa00ec98b87..5347b6b39924 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LinearGradientBrushShouldWork.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LinearGradientBrushShouldWork.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LinearGradientShouldHaveTheSameTopColorAsBackground.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LinearGradientShouldHaveTheSameTopColorAsBackground.png
index 222bdd20b599..b47a8df6460e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LinearGradientShouldHaveTheSameTopColorAsBackground.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LinearGradientShouldHaveTheSameTopColorAsBackground.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButtonUpdateValueInsideBorderNo.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButtonUpdateValueInsideBorderNo.png
index ebfef4a5b63c..48244090d69a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButtonUpdateValueInsideBorderNo.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButtonUpdateValueInsideBorderNo.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButtonWithValueChangeSelected.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButtonWithValueChangeSelected.png
index 3093c37c6dff..e07c4cd4ab5c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButtonWithValueChangeSelected.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RadioButtonWithValueChangeSelected.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RemoveShadowRuntime.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RemoveShadowRuntime.png
index d6b7d0b460e3..b385f1f5ea36 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RemoveShadowRuntime.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RemoveShadowRuntime.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SecondCustomPageWithBackgroundColorChanged.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SecondCustomPageWithBackgroundColorChanged.png
index 994ea71ffea6..a765aa351314 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SecondCustomPageWithBackgroundColorChanged.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SecondCustomPageWithBackgroundColorChanged.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SelectionShouldNotMovedToTopWithGroupedCollection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SelectionShouldNotMovedToTopWithGroupedCollection.png
index 83f332f30b2c..0f8100f5d32a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SelectionShouldNotMovedToTopWithGroupedCollection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SelectionShouldNotMovedToTopWithGroupedCollection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowAddClip.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowAddClip.png
index a7a837860956..7accf7caf941 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowAddClip.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowAddClip.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..2af5c42d98fe 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/ShadowUpdateColor1.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowUpdateColor1.png
index dab6e81bec10..d1d7b361da0a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowUpdateColor1.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowUpdateColor1.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowUpdateColor2.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowUpdateColor2.png
index 4e4cc5e255ec..56660c99a8bd 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowUpdateColor2.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowUpdateColor2.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png
index 65c559b15b35..677c0e3f5fb8 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_ChangeFlowDirection_RTL_VerifyScreenshot.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetColor.png
index a4daa272eddf..615701ede1ad 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png
index a99f8c4021be..fbe60edc431b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetEnabledStateToFalse_VerifyScreenshot.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetOffset_PositiveValues.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetOffset_PositiveValues.png
index 4f021f0c6d53..dae3184d4fbb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetOffset_PositiveValues.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetOffset_PositiveValues.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetRadius_Zero.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetRadius_Zero.png
index f343be885cba..ce34fe6a2cac 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetRadius_Zero.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Shadow_SetRadius_Zero.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShapeBackgroundColorChanges.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShapeBackgroundColorChanges.png
index d48f00db2200..74860c781ccd 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShapeBackgroundColorChanges.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShapeBackgroundColorChanges.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png
index 381ef9c919bf..7f891a39216e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png
index 4f0a26bcbd5e..e8b34cc8a97e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_Shell.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_Shell.png
index 010b6b918aaf..bc005c3da022 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_Shell.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_Shell.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..c7f0f512a2a8 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..a1903e50df9c 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..6a9409ef3d44 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_Pane2SizeIncrease.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/TwoPaneView_Pane2SizeIncrease.png
index ffc5e68d4d6a..7874d7921d6a 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..bee6ac087a53 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..94d83b336a0a 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..3707135612cc 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..23e6f17f0dee 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..6236fd12c10b 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..115866cd0b05 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/UpdateSizeOnlyWhenStrokeExists.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/UpdateSizeOnlyWhenStrokeExists.png
new file mode 100644
index 000000000000..2335ea084011
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/UpdateSizeOnlyWhenStrokeExists.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBorderWithStrokeDashArray.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBorderWithStrokeDashArray.png
index 42f4f0dc96d7..91baca0bb062 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBorderWithStrokeDashArray.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyBorderWithStrokeDashArray.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFontImageWithFontColorGreen.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFontImageWithFontColorGreen.png
index 6e07c2ca3b90..7d21694f652d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFontImageWithFontColorGreen.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFontImageWithFontColorGreen.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFontImageWithFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFontImageWithFontSize.png
index ddf86446ef9b..c72852d6edba 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFontImageWithFontSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyFontImageWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromFile.png
index 05f2610aa8a1..7fe04da739cc 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png
index c8973180c6e1..5b9bea92184f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromStream.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromStream.png
index 2ce7510e5eeb..4e9c1354b9e3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromUri.png
index f06f486c8257..0e5f41609f68 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromFile.png
index c6635bc47ffa..e1370a9f9d5c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png
index 133f59a9e0c2..f710a4bcaa12 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromStream.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromStream.png
index f30eadc01c60..a54caf3bd0fb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromUri.png
index 97bbca1c8d99..9f13b804617c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_AspectFitWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromFile.png
index e38b5aac179d..8007a5422ff0 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromFontImage.png
index 07c2db165115..0b9b9ea0aa9c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromStream.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromStream.png
index 2983b6be6b55..5c988a64c967 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromUri.png
index ea4f90b9c5ad..00c62434d08a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_CenterWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromFile.png
index 264d5e691848..010acf4e4af1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromFontImage.png
index d96296e22793..2d2c60dd191a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromStream.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromStream.png
index 5815e8c9c580..5d5e4446996c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromUri.png
index bf551303659e..e65b262c7a06 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageAspect_FillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageFlowDirectionRTL.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageFlowDirectionRTL.png
index f70318ff5deb..c500cc4101fe 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageFlowDirectionRTL.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageFlowDirectionRTL.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageWithShadow.png
index db24b17cb3eb..3a833d486ace 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyImageWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColor.png
index ebf61e23e31c..c5afa1579091 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWhenItemsAdded.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWhenItemsAdded.png
index 50d65486a838..a21a54608661 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWhenItemsAdded.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWhenItemsAdded.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithFlowDirection.png
index d41ea792ceb0..5120f42ea318 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorShape.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorShape.png
index 3416168873e6..417626efd8f1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorShape.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorShape.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorSize.png
index aec7a5d69123..628175d3ac60 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalse.png
index 42b86b537eb2..4ab9faae3bde 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalse.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png
index 9537ba25413d..2d55eedc9ecb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleWithIndicatorSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleWithIndicatorSize.png
index 505c15205d18..acac5dbcb7df 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleWithIndicatorSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleWithIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShape.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShape.png
index 1e64a2a81617..7532ad3bb68c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShape.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShape.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithFlowDirection.png
index c50f5e33341d..9dd69959ed12 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithHideSingle.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithHideSingle.png
index 0193437024ff..4422a73b1053 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithHideSingle.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithHideSingle.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithMaximumVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithMaximumVisible.png
index a59b4810c132..5cc70c9fcf31 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithMaximumVisible.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithMaximumVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithPosition.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithPosition.png
index ad009efa5b3a..c8f307ff80f2 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithPosition.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithPosition.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithShadow.png
index 718fb63d11d8..90bcc1dea7f0 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithFlowDirection.png
index 843c3713b731..b4273c49d2eb 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithIndicatorShape.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithIndicatorShape.png
index d6bb0d3aa181..5b50a852b00e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithIndicatorShape.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithIndicatorShape.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithMaximumVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithMaximumVisible.png
index 48d96c0d5707..036628ce6e8c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithMaximumVisible.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithMaximumVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithShadow.png
index f0b2c6971532..92d53c7adae1 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_FlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_FlowDirection.png
index c47e3293a688..f7a5bf44e680 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_FlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_FlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_HideSingle.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_HideSingle.png
index 12ec734b9460..811479e2186c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_HideSingle.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_HideSingle.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_IsVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_IsVisible.png
index 70fb0f0039d3..153fa63f1b17 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_IsVisible.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_IsVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_MaximumVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_MaximumVisible.png
index fd1f6cbd5cba..372393fa6b56 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_MaximumVisible.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_MaximumVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_Shadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_Shadow.png
index 4e906140cf3a..3ad1874043e8 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_Shadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_Shadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColor.png
index 8ae34f7de861..631456efe683 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWhenItemsChanged.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWhenItemsChanged.png
index cfdda484e097..b937c5fb48ca 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWhenItemsChanged.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWhenItemsChanged.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithFlowDirection.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithFlowDirection.png
index 18d0da16354e..b80d50fba57a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithFlowDirection.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorColor.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorColor.png
index f80e9d98bcd9..87975362d615 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorColor.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorShape.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorShape.png
index 2d310d9d0cac..8d10deb22308 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorShape.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorShape.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorSize.png
index b5159f14610e..d9a552e54dfd 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithPosition.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithPosition.png
index ac1086835721..00bdd9a6dae0 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithPosition.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColorWithPosition.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorSize.png
index eeb7fb3c4195..41aee4e68bf3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorSize.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..a2512962d00d 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..1e7270bbf9c9 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..fae20ada8ff8 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..1f44a7e3f23e 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..9afb2be4fd39 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..d1407cff578f 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..a59e64e87be2 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..dfbba76735a7 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.HostApp/Issues/Issue31330.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue31330.cs
new file mode 100644
index 000000000000..a809ac37bea6
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue31330.cs
@@ -0,0 +1,108 @@
+using Microsoft.Maui.Controls.Shapes;
+using Microsoft.Maui.Layouts;
+
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 31330, "Rectangle renders as thin line instead of filled shape for small height values", PlatformAffected.Android | PlatformAffected.iOS)]
+public class Issue31330 : ContentPage
+{
+ public Issue31330()
+ {
+ var scrollView = new ScrollView();
+ var grid = new Grid
+ {
+ BackgroundColor = Colors.LightGray,
+ RowSpacing = 10,
+ };
+
+ grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+ grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+ grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+ grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Star });
+
+ // Instructions
+ var instructions = new Label
+ {
+ Text = "Test passes if:\n1. Green BoxView (height 1.2) is visible as a filled rectangle\n2. Blue Rectangle (height 1.2) is visible as a filled rectangle (not a thin line)\n3. Both should have similar appearance",
+ FontAttributes = FontAttributes.Bold,
+ AutomationId = "Instructions"
+ };
+ Grid.SetRow(instructions, 0);
+ grid.Children.Add(instructions);
+
+ // BoxView with small height (reference for correct rendering)
+ var boxViewLabel = new Label { Text = "BoxView (height 1.2):" };
+ Grid.SetRow(boxViewLabel, 1);
+ grid.Children.Add(boxViewLabel);
+
+ var boxView = new BoxView
+ {
+ Color = Colors.Green,
+ WidthRequest = 50,
+ HeightRequest = 1.2,
+ HorizontalOptions = LayoutOptions.Start,
+ VerticalOptions = LayoutOptions.Start,
+ AutomationId = "TestBoxView"
+ };
+ Grid.SetRow(boxView, 1);
+ grid.Children.Add(boxView);
+
+ // Rectangle with small height (should render like BoxView, not as a line)
+ var rectangleLabel = new Label { Text = "Rectangle (height 1.2, Fill only, no Stroke):" };
+ Grid.SetRow(rectangleLabel, 2);
+ grid.Children.Add(rectangleLabel);
+
+ var rectangle = new Rectangle
+ {
+ WidthRequest = 50,
+ HeightRequest = 1.2,
+ Fill = Colors.Blue,
+ Stroke = null, // Explicitly no stroke
+ HorizontalOptions = LayoutOptions.Start,
+ VerticalOptions = LayoutOptions.Start,
+ AutomationId = "TestRectangle"
+ };
+ Grid.SetRow(rectangle, 2);
+ grid.Children.Add(rectangle);
+
+ // AbsoluteLayout test (from original issue report)
+ var absoluteLayout = new AbsoluteLayout();
+ Grid.SetRow(absoluteLayout, 3);
+ grid.Children.Add(absoluteLayout);
+
+ double shapeWidth = 20;
+ double shapeHeight = 1.2;
+ double shapeY = 10;
+
+ // BoxView in AbsoluteLayout (reference)
+ var absBoxView = new BoxView
+ {
+ BackgroundColor = Colors.Green
+ };
+ AbsoluteLayout.SetLayoutBounds(absBoxView, new Rect(
+ 0,
+ shapeY,
+ shapeWidth,
+ shapeHeight
+ ));
+ AbsoluteLayout.SetLayoutFlags(absBoxView, AbsoluteLayoutFlags.None);
+ absoluteLayout.Children.Add(absBoxView);
+
+ // Rectangle in AbsoluteLayout (should match BoxView appearance)
+ var absRectangle = new Rectangle
+ {
+ Fill = Colors.Blue
+ };
+ AbsoluteLayout.SetLayoutBounds(absRectangle, new Rect(
+ 30,
+ shapeY,
+ shapeWidth,
+ shapeHeight
+ ));
+ AbsoluteLayout.SetLayoutFlags(absRectangle, AbsoluteLayoutFlags.None);
+ absoluteLayout.Children.Add(absRectangle);
+
+ scrollView.Content = grid;
+ Content = scrollView;
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BackgroundFrameResizesFastAndCorrectly.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BackgroundFrameResizesFastAndCorrectly.png
index a20550c25759..0951b993c273 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BackgroundFrameResizesFastAndCorrectly.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BackgroundFrameResizesFastAndCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BackgroundFrameResizesFastAndCorrectlySizeChanged.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BackgroundFrameResizesFastAndCorrectlySizeChanged.png
index 780e59d12589..f6ffc358430e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BackgroundFrameResizesFastAndCorrectlySizeChanged.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BackgroundFrameResizesFastAndCorrectlySizeChanged.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BindingOnStrokeShapeWithRadius.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BindingOnStrokeShapeWithRadius.png
index 34a38de52c79..45df9b57467d 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BindingOnStrokeShapeWithRadius.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BindingOnStrokeShapeWithRadius.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BindingOnStrokeShapeWithoutRadius.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BindingOnStrokeShapeWithoutRadius.png
index ca42c7bb269b..d2ef71943346 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BindingOnStrokeShapeWithoutRadius.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BindingOnStrokeShapeWithoutRadius.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png
index a610d9ee74de..eafe99d2605b 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Border_StrokeColorWithStrokeShape_RoundRectangle.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Border_StrokeColorWithStrokeShape_RoundRectangle.png
index c0b7c3b132ea..ce876f96a60f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Border_StrokeColorWithStrokeShape_RoundRectangle.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Border_StrokeColorWithStrokeShape_RoundRectangle.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Border_StrokeColorWithStrokeThickness.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Border_StrokeColorWithStrokeThickness.png
index 0760a01410a0..0ed8650fac4f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Border_StrokeColorWithStrokeThickness.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Border_StrokeColorWithStrokeThickness.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CollectionViewGroupFooterTemplateShouldNotCrash.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CollectionViewGroupFooterTemplateShouldNotCrash.png
index d2d8668049a2..25292e5ce475 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CollectionViewGroupFooterTemplateShouldNotCrash.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/CollectionViewGroupFooterTemplateShouldNotCrash.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithBackgroundColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithBackgroundColor.png
index b0c87ae6110c..1708234b0476 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithBackgroundColor.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithFlowDirection.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithFlowDirection.png
index 30ca98f1d4cd..fa68ff3f88f8 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithFlowDirection.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithIconImageChanged.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithIconImageChanged.png
index 11089e46e599..97084435c70e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithIconImageChanged.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FirstCustomPageWithIconImageChanged.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FooterWithEmptyCVShouldHaveCorrectSize.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FooterWithEmptyCVShouldHaveCorrectSize.png
index 5caf8805e298..597e59aa17eb 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FooterWithEmptyCVShouldHaveCorrectSize.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/FooterWithEmptyCVShouldHaveCorrectSize.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HeaderAndFooterShouldBeVisible.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HeaderAndFooterShouldBeVisible.png
index b86338703d2a..068a16555b8a 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HeaderAndFooterShouldBeVisible.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HeaderAndFooterShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection.png
index 64155c652d2e..14d4222d8dc0 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_Height.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_Height.png
index df325cce9e3b..80f6e138483d 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_Height.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png
index ecf7f9f1413d..bb95793b7396 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_Width.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_Width.png
index 0a27da73c1dc..2e1d1fb9f1eb 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_Width.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_RTLFlowDirection_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_Height.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_Height.png
index 10d3718f1366..4429810c861d 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_Height.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_HeightAndWidth.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_HeightAndWidth.png
index 52f39fec60d0..c4ed9871dcd3 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_RTL.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_RTL.png
index 774e360faad7..ddab6fb6fd57 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_RTL.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_RTL.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_Width.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_Width.png
index 6f7001830f4d..b682a20d6935 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_Width.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/HorizontalStackLayout_Spacing_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue22606_SetHeightTo200.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue22606_SetHeightTo200.png
index 20cd59fba849..94beaa17acb4 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue22606_SetHeightTo200.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue22606_SetHeightTo200.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue22606_SetHeightTo500.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue22606_SetHeightTo500.png
index eed64b771dee..b5e46f28c1ac 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue22606_SetHeightTo500.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/Issue22606_SetHeightTo500.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..cd7b53c952b0 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..c98da47b6d94 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..9754e36e9fa9 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..abc6b8fe761a 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..2fbcc907eceb 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..739d43a0fb67 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/LinearGradientBrushShouldWork.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/LinearGradientBrushShouldWork.png
index 87637093bdae..de23c150248d 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/LinearGradientBrushShouldWork.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/LinearGradientBrushShouldWork.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RadioButton_SetBorderWidthAndCornerRadius_VerifyVisualState.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RadioButton_SetBorderWidthAndCornerRadius_VerifyVisualState.png
index f6a3ea5acafa..fdc51b32a56f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RadioButton_SetBorderWidthAndCornerRadius_VerifyVisualState.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/RadioButton_SetBorderWidthAndCornerRadius_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SecondCustomPageWithBackgroundColorChanged.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SecondCustomPageWithBackgroundColorChanged.png
index 416c9905d606..3a06b6c55496 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SecondCustomPageWithBackgroundColorChanged.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SecondCustomPageWithBackgroundColorChanged.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShadowShouldUpdate.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShadowShouldUpdate.png
index d943906c13cf..93ac08b4407e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShadowShouldUpdate.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShadowShouldUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShapeBackgroundColorChanges.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShapeBackgroundColorChanges.png
index 00914861865d..f8fcc3c30625 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShapeBackgroundColorChanges.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShapeBackgroundColorChanges.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/UpdateSizeOnlyWhenStrokeExists.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/UpdateSizeOnlyWhenStrokeExists.png
new file mode 100644
index 000000000000..67589cc56bcc
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/UpdateSizeOnlyWhenStrokeExists.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyBorderWithStrokeDashArray.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyBorderWithStrokeDashArray.png
index abbc9d19c3b7..42afb60e9db3 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyBorderWithStrokeDashArray.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyBorderWithStrokeDashArray.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyFontImageWithFontColorGreen.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyFontImageWithFontColorGreen.png
index 631ed4839caf..df279073ff4c 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyFontImageWithFontColorGreen.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyFontImageWithFontColorGreen.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyFontImageWithFontSize.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyFontImageWithFontSize.png
index a525df50fe21..84591e1675f3 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyFontImageWithFontSize.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyFontImageWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromFile.png
index 204b38089043..9860397e6a9e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png
index c3f89a6636d5..ead052d4554b 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromStream.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromStream.png
index 8950c33ddf0e..69dc81d6de54 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromUri.png
index 65dc51b8d156..87542eeb3d12 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromFile.png
index 24d541cc38f1..572ab573e42f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png
index e21f217802c5..0061c95d2a24 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromStream.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromStream.png
index 207394521312..535bfad78009 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromUri.png
index 181bb75c811e..3dc2e62da343 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_AspectFitWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromFile.png
index ecd92c8edd90..43df3976e2a4 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromFontImage.png
index 2470aa5aeebc..32693d3c75ac 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromStream.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromStream.png
index 99b5b83f004e..61b4597db5cf 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromUri.png
index befcba0d7fd1..897335021d8e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_CenterWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromFile.png
index 4939f85063f5..39b89c1d5239 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromFontImage.png
index 2e7c04c63c8a..787fa630bda2 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromStream.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromStream.png
index f8f8608f2923..4277e525dc84 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromUri.png
index 0b434b1ab366..62296135bc2e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageAspect_FillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageFlowDirectionRTL.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageFlowDirectionRTL.png
index 23922a8592c3..965fbb378883 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageFlowDirectionRTL.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageFlowDirectionRTL.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageWithShadow.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageWithShadow.png
index 278d3c0b9bb5..99dda9db0d87 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageWithShadow.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyImageWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection.png
index 0ba81df0cd91..583b7fe31172 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_Height.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_Height.png
index abba4c5ab948..b123255d24c0 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_Height.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png
index 55921e6bc384..62db2294462f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_Width.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_Width.png
index 84c909d0a2ac..1bd4cb82ace3 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_Width.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_RTLFlowDirection_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_Height.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_Height.png
index 00f6efc66de5..e0f842587d86 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_Height.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_HeightAndWidth.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_HeightAndWidth.png
index baba65465c78..116e321c43ae 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_RTL.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_RTL.png
index cb54d3dd1f6b..2e2430505cb0 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_RTL.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_RTL.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_Width.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_Width.png
index fc76fa19abb4..677f677f7f40 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_Width.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerticalStackLayout_Spacing_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31330.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31330.cs
new file mode 100644
index 000000000000..8cc0a9cc4ae7
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31330.cs
@@ -0,0 +1,21 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue31330 : _IssuesUITest
+{
+ public Issue31330(TestDevice testDevice) : base(testDevice)
+ {
+ }
+ public override string Issue => "Rectangle renders as thin line instead of filled shape for small height values";
+
+ [Test]
+ [Category(UITestCategories.Shape)]
+ public void UpdateSizeOnlyWhenStrokeExists()
+ {
+ App.WaitForElement("TestBoxView");
+ VerifyScreenshot();
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BackgroundFrameResizesFastAndCorrectlySizeChanged.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BackgroundFrameResizesFastAndCorrectlySizeChanged.png
index e524310edfe5..870aa1a6c50a 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BackgroundFrameResizesFastAndCorrectlySizeChanged.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BackgroundFrameResizesFastAndCorrectlySizeChanged.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BindingOnStrokeShapeWithRadius.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BindingOnStrokeShapeWithRadius.png
index 0a69049b34f9..bf221469a99f 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BindingOnStrokeShapeWithRadius.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BindingOnStrokeShapeWithRadius.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BindingOnStrokeShapeWithoutRadius.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BindingOnStrokeShapeWithoutRadius.png
index 2d6b4a246f14..f5e8e646e427 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BindingOnStrokeShapeWithoutRadius.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BindingOnStrokeShapeWithoutRadius.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderRoundRectangleWithImage.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderRoundRectangleWithImage.png
index ff3503d8d73a..1e0e039791e6 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderRoundRectangleWithImage.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderRoundRectangleWithImage.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png
index 7e1b455f0a3e..68a71516edaf 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithDashArrayAndOffset.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithDashArrayAndOffset.png
index 6465cf6f2cd9..1b2eab0e12cd 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithDashArrayAndOffset.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithDashArrayAndOffset.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithStrokeShape_RoundRectangle.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithStrokeShape_RoundRectangle.png
index c98e3055af7f..5ba26798f93d 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithStrokeShape_RoundRectangle.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithStrokeShape_RoundRectangle.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithStrokeThickness.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithStrokeThickness.png
index d57c52cd548c..9cb47ef5c022 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithStrokeThickness.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Border_StrokeColorWithStrokeThickness.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/CollectionViewGroupFooterTemplateShouldNotCrash.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/CollectionViewGroupFooterTemplateShouldNotCrash.png
index 0ba9f8ef83f0..a8ad6f94c918 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/CollectionViewGroupFooterTemplateShouldNotCrash.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/CollectionViewGroupFooterTemplateShouldNotCrash.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithBackgroundColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithBackgroundColor.png
index d63e1bb4d431..3d846e4e2b88 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithBackgroundColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithFlowDirection.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithFlowDirection.png
index 5e573c5c8123..75db73d2475a 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithFlowDirection.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithIconImageChanged.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithIconImageChanged.png
index e1cb596ddc5c..3d1a8a887544 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithIconImageChanged.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FirstCustomPageWithIconImageChanged.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FooterWithEmptyCVShouldHaveCorrectSize.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FooterWithEmptyCVShouldHaveCorrectSize.png
index 196b931050bc..33ed295ac95e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FooterWithEmptyCVShouldHaveCorrectSize.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/FooterWithEmptyCVShouldHaveCorrectSize.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HeaderAndFooterShouldBeVisible.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HeaderAndFooterShouldBeVisible.png
index 9079c7417db0..65774dc223ef 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HeaderAndFooterShouldBeVisible.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HeaderAndFooterShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection.png
index 58ed65e50275..385dabdff5be 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_Height.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_Height.png
index c04592068180..50d717fdb0b5 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_Height.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png
index 2bc8653fffbf..55107c18f28a 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_Width.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_Width.png
index ec37ea3ce5a2..c5810df75b3e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_Width.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_RTLFlowDirection_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_Height.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_Height.png
index db934f647476..88c9dfa6d624 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_Height.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_HeightAndWidth.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_HeightAndWidth.png
index 3cdd54d68eec..e11ce24e9ef8 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_RTL.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_RTL.png
index a21ebf08e446..de0ba0e7b31c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_RTL.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_RTL.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_Width.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_Width.png
index 5fabfe634408..ea5391ee6113 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_Width.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/HorizontalStackLayout_Spacing_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue22606_SetHeightTo200.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue22606_SetHeightTo200.png
index 051e37200c33..6a39471cbc53 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue22606_SetHeightTo200.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue22606_SetHeightTo200.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue22606_SetHeightTo500.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue22606_SetHeightTo500.png
index f04d9d7d7fee..0e7d1087e85c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue22606_SetHeightTo500.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue22606_SetHeightTo500.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..ec1c7f15af23 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..ac6d4941cdee 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..86a9d49bb069 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..4ab5f86f5d44 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..cc1722f3f55a 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..c8eb2f9bfc9f 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/ShadowShouldUpdate.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowShouldUpdate.png
index f7b7a927abe4..1c3626747796 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowShouldUpdate.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowShouldUpdate.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShapeBackgroundColorChanges.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShapeBackgroundColorChanges.png
index 6e66181a0dd5..07b213a30c8f 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShapeBackgroundColorChanges.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShapeBackgroundColorChanges.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyBorderWithStrokeDashArray.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyBorderWithStrokeDashArray.png
index c375c152e5b0..12bacd68d1c8 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyBorderWithStrokeDashArray.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyBorderWithStrokeDashArray.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyFontImageWithFontColorGreen.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyFontImageWithFontColorGreen.png
index cc9112dbc518..6017c7709824 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyFontImageWithFontColorGreen.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyFontImageWithFontColorGreen.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromFile.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromFile.png
index 7dd872efa099..c8ec294e38fe 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png
index a220bd3b8c95..4ecfb225d618 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromStream.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromStream.png
index a4469d0110d3..98fd1fa4f9a4 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromUri.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromUri.png
index e84a8e4cac43..c7d601d10860 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_AspectFitWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromFile.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromFile.png
index 16ddf8edf46d..1ac881f52b3b 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromFontImage.png
index 7b3fe6c29e86..3110db238efe 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromUri.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromUri.png
index 64c650e07733..860de2e0feb3 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_CenterWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromFile.png
index ab0ca2050e68..fb29e3cd1dee 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromFontImage.png
index f282b7821de8..2500ffd07b59 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromStream.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromStream.png
index 6e470fe245b0..b6a1e8f66748 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromUri.png
index e8fc9eb1d200..cb21cbc0d3fe 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageAspect_FillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageFlowDirectionRTL.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageFlowDirectionRTL.png
index af32e17bc19f..df7dec66aea9 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageFlowDirectionRTL.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyImageFlowDirectionRTL.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColor.png
index 9b179caac6e9..ace66dfc971f 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWhenItemsAdded.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWhenItemsAdded.png
index 193cce016177..303b3ea57ab2 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWhenItemsAdded.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWhenItemsAdded.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithFlowDirection.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithFlowDirection.png
index f1dff83c9c90..8ffa375da182 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithFlowDirection.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithIndicatorShape.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithIndicatorShape.png
index 8c97fe493aca..8e1378dd0ae2 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithIndicatorShape.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithIndicatorShape.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithIndicatorSize.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithIndicatorSize.png
index aacafcbd1899..ababde16e1c2 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithIndicatorSize.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorColorWithIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleIsFalse.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleIsFalse.png
index 92718b34eddb..dbd68da72ec8 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleIsFalse.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleIsFalse.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png
index 369cb64b6de0..cfe2f5b0360f 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleWithIndicatorSize.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleWithIndicatorSize.png
index d676c1a00c05..799ff5f687f0 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleWithIndicatorSize.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorHideSingleWithIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShape.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShape.png
index 281ef9b529ba..6dcd3ea03500 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShape.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShape.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithFlowDirection.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithFlowDirection.png
index 98964a730bc0..501b8079619a 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithFlowDirection.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithHideSingle.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithHideSingle.png
index 4a7b2990ce65..33080428a1e5 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithHideSingle.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithHideSingle.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithMaximumVisible.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithMaximumVisible.png
index 68530d815ef3..60bd7da33797 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithMaximumVisible.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorShapeWithMaximumVisible.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithFlowDirection.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithFlowDirection.png
index bfa6f7001bb9..cc2a48b4c802 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithFlowDirection.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithIndicatorShape.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithIndicatorShape.png
index 3ffdd7314b13..978239c866c3 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithIndicatorShape.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithIndicatorShape.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithMaximumVisible.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithMaximumVisible.png
index 0ec1be0bb389..926f51319036 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithMaximumVisible.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorSizeWithMaximumVisible.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_FlowDirection.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_FlowDirection.png
index 9dc7fcbd88d8..2e8154d50ef2 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_FlowDirection.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_FlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_HideSingle.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_HideSingle.png
index ead4ccbb3093..67209db97c57 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_HideSingle.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_HideSingle.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_IsVisible.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_IsVisible.png
index b5e5ea7e1f7a..a562be030d1c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_IsVisible.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_IsVisible.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_MaximumVisible.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_MaximumVisible.png
index 577b435c2c85..7bd57118b588 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_MaximumVisible.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIndicatorView_MaximumVisible.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColor.png
index a9f2668639e4..6cbf4925c447 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithFlowDirection.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithFlowDirection.png
index 83dbcf22cdde..dcfe85a99ffa 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithFlowDirection.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorColor.png
index 3e094838a780..e915a341ea1e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorShape.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorShape.png
index 3253ca21164f..9cbd99fb5237 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorShape.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorShape.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorSize.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorSize.png
index 6678031537dd..cf2ee9eb388e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorSize.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorColorWithIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorSize.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorSize.png
index 4e89eea3d157..39294ca7d65c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorSize.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifySelectedIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection.png
index 8ac2e806c098..8a4e21eb8687 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_Height.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_Height.png
index 1842e78015f8..299e6ad9799f 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_Height.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png
index 4f591d3c6960..6a479b51d473 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_Width.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_Width.png
index 9e3088140e01..2914382af429 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_Width.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_RTLFlowDirection_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_Height.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_Height.png
index f4f44301ae96..8cd0445c085e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_Height.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_HeightAndWidth.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_HeightAndWidth.png
index 31daebab418b..0f67079ca61a 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_RTL.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_RTL.png
index 0d63d2a23f08..a37caa7360ce 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_RTL.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_RTL.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_Width.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_Width.png
index e68a645feb51..2c5fc7878846 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_Width.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerticalStackLayout_Spacing_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/AccessibilityTraitsSetCorrectlyNone.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/AccessibilityTraitsSetCorrectlyNone.png
index 8fe5ba1d9497..c5a841939585 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/AccessibilityTraitsSetCorrectlyNone.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/AccessibilityTraitsSetCorrectlyNone.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/AccessibilityTraitsSetCorrectlySingle.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/AccessibilityTraitsSetCorrectlySingle.png
index fb7328937ff8..4879a564d2ec 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/AccessibilityTraitsSetCorrectlySingle.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/AccessibilityTraitsSetCorrectlySingle.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BackgroundFrameResizesFastAndCorrectly.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BackgroundFrameResizesFastAndCorrectly.png
index 2d8ade3afda6..97f034d58e36 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BackgroundFrameResizesFastAndCorrectly.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BackgroundFrameResizesFastAndCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BackgroundFrameResizesFastAndCorrectlySizeChanged.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BackgroundFrameResizesFastAndCorrectlySizeChanged.png
index f141b7c82307..0927624a9275 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BackgroundFrameResizesFastAndCorrectlySizeChanged.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BackgroundFrameResizesFastAndCorrectlySizeChanged.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BindingOnStrokeShapeWithRadius.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BindingOnStrokeShapeWithRadius.png
index d05df452f98b..ad0d7859aa8f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BindingOnStrokeShapeWithRadius.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BindingOnStrokeShapeWithRadius.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BindingOnStrokeShapeWithoutRadius.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BindingOnStrokeShapeWithoutRadius.png
index 3ffdc423191f..dcb8858c87a1 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BindingOnStrokeShapeWithoutRadius.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BindingOnStrokeShapeWithoutRadius.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderBackgroundSizeUpdatesWhenRotatingScreen.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderBackgroundSizeUpdatesWhenRotatingScreen.png
index 71e8faea33ea..4e0c8cb7ddd2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderBackgroundSizeUpdatesWhenRotatingScreen.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderBackgroundSizeUpdatesWhenRotatingScreen.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderRoundRectangleWithImage.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderRoundRectangleWithImage.png
index 5c2b24bf4433..b1603e4f615e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderRoundRectangleWithImage.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderRoundRectangleWithImage.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png
index e712f1b095d7..1a8a07855100 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_Shadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_Shadow.png
index 79b95741e920..2a5d9c75a573 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_Shadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_Shadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeShape_RoundRectangle.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeShape_RoundRectangle.png
index 7521825c1eb4..2442ef8b7e31 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeShape_RoundRectangle.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeShape_RoundRectangle.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeThickness.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeThickness.png
index f5c87a998f5a..6bed232888ea 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeThickness.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeThickness.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewGroupFooterTemplateShouldNotCrash.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewGroupFooterTemplateShouldNotCrash.png
index 730131d82ece..1f9da9004a6e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewGroupFooterTemplateShouldNotCrash.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewGroupFooterTemplateShouldNotCrash.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntrySelectionLengthRuntimeUpdate.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntrySelectionLengthRuntimeUpdate.png
index de4bf99185eb..8eb9ce19e68e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntrySelectionLengthRuntimeUpdate.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntrySelectionLengthRuntimeUpdate.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithBackgroundColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithBackgroundColor.png
index aebd0a0557b0..885411cea2de 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithBackgroundColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithBackgroundColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithFlowDirection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithFlowDirection.png
index 0d8abc2dba98..28807613a9e3 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithFlowDirection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithIconImageChanged.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithIconImageChanged.png
index f6b9528418e7..91cb5bdd40f7 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithIconImageChanged.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FirstCustomPageWithIconImageChanged.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FooterWithEmptyCVShouldHaveCorrectSize.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FooterWithEmptyCVShouldHaveCorrectSize.png
index e6983f6dfed0..1ede62189ab3 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FooterWithEmptyCVShouldHaveCorrectSize.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FooterWithEmptyCVShouldHaveCorrectSize.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HeaderAndFooterShouldBeVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HeaderAndFooterShouldBeVisible.png
index f57254fe934f..c6f3fd7c9065 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HeaderAndFooterShouldBeVisible.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HeaderAndFooterShouldBeVisible.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection.png
index 31b55e873133..55ba8bc433ac 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_Height.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_Height.png
index d1409500d7aa..0beeb6310f3b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_Height.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png
index 11a21f9627a1..e2067e4721db 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_Width.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_Width.png
index ab6e122cc031..a7c300fb1e05 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_Width.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_RTLFlowDirection_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_Height.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_Height.png
index 50961a23bb93..3129359d4350 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_Height.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_HeightAndWidth.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_HeightAndWidth.png
index 62088f9760ca..aa4e229872f4 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_RTL.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_RTL.png
index 64848a2557c9..accd98949ab4 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_RTL.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_RTL.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_Width.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_Width.png
index 8412f2bae4cc..f61e74db5707 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_Width.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalStackLayout_Spacing_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22606_SetHeightTo200.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22606_SetHeightTo200.png
index 891f15a83a80..b41813d99f62 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22606_SetHeightTo200.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22606_SetHeightTo200.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22606_SetHeightTo500.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22606_SetHeightTo500.png
index 61d8376458f3..b8f348c8eeeb 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22606_SetHeightTo500.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22606_SetHeightTo500.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test.png
index 2378279e20ae..6712cbb59876 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_1.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_1.png
index c55644d1554f..ec1cb4071f76 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_1.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_1.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_2.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_2.png
index 4c533bbf33f1..989f68d4adcb 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_2.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_2.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_3.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_3.png
index addafac769ec..34d2befebdf9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_3.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_3.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_4.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_4.png
index 4932ff0af3b9..5b8df5bf2018 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_4.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_4.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_5.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_5.png
index 428158cc17ca..76f54948ac08 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_5.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue24414Test_5.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LinearGradientBrushShouldWork.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LinearGradientBrushShouldWork.png
index cc9a36a1697a..561c58ecb9a4 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LinearGradientBrushShouldWork.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LinearGradientBrushShouldWork.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LinearGradientShouldHaveTheSameTopColorAsBackground.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LinearGradientShouldHaveTheSameTopColorAsBackground.png
index 0aea88d39b41..3bc894f10661 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LinearGradientShouldHaveTheSameTopColorAsBackground.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LinearGradientShouldHaveTheSameTopColorAsBackground.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PageShouldNotScroll.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PageShouldNotScroll.png
index b89623cd4003..2fb3bdc33b1e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PageShouldNotScroll.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PageShouldNotScroll.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButton_SetBorderWidthAndCornerRadius_VerifyVisualState.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButton_SetBorderWidthAndCornerRadius_VerifyVisualState.png
index 40c2b1639099..7a45488d7a44 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButton_SetBorderWidthAndCornerRadius_VerifyVisualState.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButton_SetBorderWidthAndCornerRadius_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButton_SetTextColorAndBorderColor_VerifyVisualState.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButton_SetTextColorAndBorderColor_VerifyVisualState.png
index 59d38e9ce157..ba3463866bd9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButton_SetTextColorAndBorderColor_VerifyVisualState.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButton_SetTextColorAndBorderColor_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SecondCustomPageWithBackgroundColorChanged.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SecondCustomPageWithBackgroundColorChanged.png
index 2288c640e429..7066a306743c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SecondCustomPageWithBackgroundColorChanged.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SecondCustomPageWithBackgroundColorChanged.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SelectionShouldNotMovedToTopWithGroupedCollection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SelectionShouldNotMovedToTopWithGroupedCollection.png
index f4fd695fc922..02e28e4bf0ee 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SelectionShouldNotMovedToTopWithGroupedCollection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SelectionShouldNotMovedToTopWithGroupedCollection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowAddClip.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowAddClip.png
index 5873ccf0e622..876b2d13f756 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowAddClip.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowAddClip.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowRemoveClip.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowRemoveClip.png
index e7b0c859b6cf..67d9928be6e9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowRemoveClip.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowRemoveClip.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowShouldUpdate.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowShouldUpdate.png
index 2f7efc997e23..2076abb16b22 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowShouldUpdate.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowShouldUpdate.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowUpdateColor1.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowUpdateColor1.png
index 767bf779560a..83cb8c0bc236 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowUpdateColor1.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowUpdateColor1.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowUpdateColor2.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowUpdateColor2.png
index fc609f5974eb..ebdbb425fe93 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowUpdateColor2.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowUpdateColor2.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_AddClip_VerifyShadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_AddClip_VerifyShadow.png
index ffa6822adca5..d9d8762cfb31 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_AddClip_VerifyShadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_AddClip_VerifyShadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetColor.png
index 23ec0ee0c15e..0a04af4aa484 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOffset_PositiveValues.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOffset_PositiveValues.png
index 82d98895c858..28397671ee9e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOffset_PositiveValues.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOffset_PositiveValues.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOffset_Zero.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOffset_Zero.png
index b2e38bcc2a89..fa78f2f88476 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOffset_Zero.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOffset_Zero.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOpacity.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOpacity.png
index a7fa022f847b..c06c2ffacfb4 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOpacity.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Shadow_SetOpacity.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShapeBackgroundColorChanges.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShapeBackgroundColorChanges.png
index a6820389bb8c..6b7f18a2b826 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShapeBackgroundColorChanges.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShapeBackgroundColorChanges.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png
index 675127f3e136..6c9bd47a62e1 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png
index a9adfe5d3e5a..14678b0149a4 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_Shell.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_Shell.png
index 1f789721e023..c1ae97d2725a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_Shell.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_Shell.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1Priority.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1Priority.png
index da1388e385a1..00bb6728843e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1Priority.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1Priority.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1SizeIncrease.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1SizeIncrease.png
index 5718627a9d47..685f04d94738 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1SizeIncrease.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1SizeIncrease.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1SizeIncrease_WithWideMode.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1SizeIncrease_WithWideMode.png
index 3e92381f0779..f571c2838828 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1SizeIncrease_WithWideMode.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane1SizeIncrease_WithWideMode.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane2SizeIncrease.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane2SizeIncrease.png
index 1ba1f4429e14..5e759a774662 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane2SizeIncrease.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane2SizeIncrease.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane2SizeIncrease_WithWideMode.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane2SizeIncrease_WithWideMode.png
index e3761c79cecb..86918f8e81bb 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane2SizeIncrease_WithWideMode.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_Pane2SizeIncrease_WithWideMode.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_RTLFlowDirection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_RTLFlowDirection.png
index 20abc0e1a9ac..7f36143d0cec 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_RTLFlowDirection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_ShadowWithWideMode.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_ShadowWithWideMode.png
index a89990a3c4f4..3f74909e4800 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_ShadowWithWideMode.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_ShadowWithWideMode.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_TallMode.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_TallMode.png
index 1cc20a4eeb11..a43de15d1292 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_TallMode.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_TallMode.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_WideMode.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_WideMode.png
index 7e849a59900b..fa92dd59fd53 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_WideMode.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_WideMode.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_ZIsShadowEnabled.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_ZIsShadowEnabled.png
index 238a730a46e4..2c4fc8b7dac2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_ZIsShadowEnabled.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TwoPaneView_ZIsShadowEnabled.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateSizeOnlyWhenStrokeExists.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateSizeOnlyWhenStrokeExists.png
new file mode 100644
index 000000000000..bf6a9aecbaf8
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateSizeOnlyWhenStrokeExists.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyBorderWithStrokeDashArray.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyBorderWithStrokeDashArray.png
index 4d643496cd84..e6967187c7d6 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyBorderWithStrokeDashArray.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyBorderWithStrokeDashArray.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyFontImageWithFontColorGreen.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyFontImageWithFontColorGreen.png
index 81695b75ff53..e990aac90c33 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyFontImageWithFontColorGreen.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyFontImageWithFontColorGreen.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyFontImageWithFontSize.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyFontImageWithFontSize.png
index c72dba914c38..69e320e4c47b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyFontImageWithFontSize.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyFontImageWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromFile.png
index 4fc5d9282164..47c5e803ae3a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png
index 703db5dbfd49..ffc439f17787 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromStream.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromStream.png
index 9b6f770474bc..4b479b2e8940 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromUri.png
index ce5e1a8928eb..1390fd87b74d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromFile.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromFile.png
index e3ce7035d1ff..3b3dce390142 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png
index bf647c340532..7c23a14b24cb 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromStream.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromStream.png
index 71f6d96ccf57..cb510ca53373 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromUri.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromUri.png
index f2836ce6b9f6..2bcc1216c476 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_AspectFitWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromFile.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromFile.png
index 8641be5d7529..35bd64b8da4b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromFontImage.png
index fca843bdcf9c..91ff6c622c59 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromStream.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromStream.png
index 578e32cc8708..d6219570f3bc 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromUri.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromUri.png
index 11b4ef6e9d2a..6eff748ea23d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_CenterWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromFile.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromFile.png
index efac2ea24a51..fedbb59a550b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromFile.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromFile.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromFontImage.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromFontImage.png
index 67885511a4dd..e7948f664894 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromFontImage.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromFontImage.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromStream.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromStream.png
index 0b17f10f7402..6b94ada4d9dc 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromStream.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromStream.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromUri.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromUri.png
index 78048254d9da..2508abb96460 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromUri.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageAspect_FillWithImageSourceFromUri.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageFlowDirectionRTL.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageFlowDirectionRTL.png
index 45f15116911e..3edac4efcfe4 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageFlowDirectionRTL.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageFlowDirectionRTL.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageWithShadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageWithShadow.png
index 7e2c2971b85b..61562b01451e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageWithShadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyImageWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColor.png
index e87aa65935a0..ceb4541b62a8 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWhenItemsAdded.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWhenItemsAdded.png
index f886224c23fc..a3f74cf22ba2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWhenItemsAdded.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWhenItemsAdded.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWithFlowDirection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWithFlowDirection.png
index a4683efef9ed..cc7898dbf914 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWithFlowDirection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWithIndicatorSize.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWithIndicatorSize.png
index 5551e58234cf..8d022ea10c12 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWithIndicatorSize.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorColorWithIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleIsFalse.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleIsFalse.png
index c0499f05b0c0..4fdc7eada40d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleIsFalse.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleIsFalse.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png
index b78af4aa26db..2165c4415335 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleWithIndicatorSize.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleWithIndicatorSize.png
index a2896a69e93c..705bf7ce231b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleWithIndicatorSize.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorHideSingleWithIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorSizeWithFlowDirection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorSizeWithFlowDirection.png
index 7cca2225ee79..e2d3f8bc721a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorSizeWithFlowDirection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorSizeWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorSizeWithMaximumVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorSizeWithMaximumVisible.png
index a667e093b91f..84a77d73fbd0 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorSizeWithMaximumVisible.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorSizeWithMaximumVisible.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_FlowDirection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_FlowDirection.png
index 67f0f9d42801..fb0aa3d83e2e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_FlowDirection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_FlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_HideSingle.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_HideSingle.png
index baf4a6a6f787..38a0b3a13c23 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_HideSingle.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_HideSingle.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_IsVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_IsVisible.png
index b8e8b2e3fe4d..a78c13135937 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_IsVisible.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_IsVisible.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_MaximumVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_MaximumVisible.png
index 3eebde4f04f5..0d7281ad3adb 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_MaximumVisible.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_MaximumVisible.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_Shadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_Shadow.png
index 536d102ae636..610a0bb6cf74 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_Shadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyIndicatorView_Shadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColor.png
index e14fee440b56..603858b566e5 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithFlowDirection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithFlowDirection.png
index 60c68a5cd6bc..ba3beca27676 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithFlowDirection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithIndicatorColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithIndicatorColor.png
index 0ffba4a1c7fc..62ac5bb581d0 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithIndicatorColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithIndicatorColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithIndicatorSize.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithIndicatorSize.png
index 7f1eac81679f..d881d8c4fc9d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithIndicatorSize.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySelectedIndicatorColorWithIndicatorSize.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection.png
index 3de43aa8a5ef..163021f38ea0 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_Height.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_Height.png
index 8b05df1a5fae..54a94d316915 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_Height.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png
index e73e87ae7998..7909705021d8 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_Width.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_Width.png
index 9ff7d82b7c0e..345b264a2de5 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_Width.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_RTLFlowDirection_With_Width.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_Height.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_Height.png
index a82aa6fcce7b..a05b32d7c2c5 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_Height.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_Height.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_HeightAndWidth.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_HeightAndWidth.png
index eb29eb4ea558..3cd099486bdd 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_HeightAndWidth.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_HeightAndWidth.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_RTL.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_RTL.png
index 1315a16a38a5..d17fc3d621d8 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_RTL.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_RTL.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_Width.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_Width.png
index 4f04ee5d97f3..de7f8de11dc2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_Width.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerticalStackLayout_Spacing_With_Width.png differ