diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextEmpty.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextEmpty.png
index 16eaad2b1aac..644cd8e1b9af 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextEmpty.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextEmpty.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextPresent.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextPresent.png
index c33099e75103..7bb1ebbfae06 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextPresent.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ClearButtonVisiblityButton_TextPresent.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/PlaceholderWithClearButtonVisible.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/PlaceholderWithClearButtonVisible.png
index b7f1aa9f3db6..37592b2dcd4e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/PlaceholderWithClearButtonVisible.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/PlaceholderWithClearButtonVisible.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenFontFamily.png
index 2335703dd51c..78d7220e6a2e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenFontFamily.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenMaxLengthSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenMaxLengthSet.png
index 29c360172ba6..58bb9943f519 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenMaxLengthSet.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyCharacterSpacingWhenMaxLengthSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png
index 4cd7376f32cc..84eebad4f348 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png
index 6d0661ce5d68..65bc9e83e21f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedVertically.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedVertically.png
index cda25852ab2a..7e26d026b51d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedVertically.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearButtonVisiblityWhenTextAlignedVertically.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearVisiblityButtonWhenTextColorChanged.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearVisiblityButtonWhenTextColorChanged.png
index 432bdd463b72..81435daaa2e3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearVisiblityButtonWhenTextColorChanged.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyClearVisiblityButtonWhenTextColorChanged.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenFlowDirectionSet.png
index c4145fd469c2..31a6f0790b24 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderColorSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderColorSet.png
index 59d01ca1beab..bbecf50d11b3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderColorSet.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderColorSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderTextSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderTextSet.png
index af0b1a2a64ce..fd1edac0ad69 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderTextSet.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntryControlWhenPlaceholderTextSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntry_WithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntry_WithShadow.png
index 37f2d297e0a2..a06baba58524 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntry_WithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyEntry_WithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png
index 67afb8aa613d..aff0cc00798c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
index 694075902c73..701886501213 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnCharacterSpacing.png
index cc0cac4a995b..17ba0341cac6 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnHorizontalTextAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnHorizontalTextAlignment.png
index bf5970fdbd26..cab164a9653a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnHorizontalTextAlignment.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnHorizontalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnVerticalTextAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnVerticalTextAlignment.png
index 7d64cf56b103..4a2654c2c8b9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnVerticalTextAlignment.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordBasedOnVerticalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenFontSizeSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenFontSizeSet.png
index a60efe8eaae8..65636c2aa7df 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenFontSizeSet.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenFontSizeSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenMaxLenghtSetValue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenMaxLenghtSetValue.png
index 15a095fb2abb..3f6e309d3012 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenMaxLenghtSetValue.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyIsPasswordWhenMaxLenghtSetValue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWhenFlowDirectionSet.png
index b4d7c7dbe80b..89b233430383 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithCharacterSpacing.png
index 724c326fbc03..356078bf135b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithCharacterSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontAttributes.png
index 1af1e8ad0685..2d57353c231b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontAttributes.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontFamily.png
index f6ade1047e66..f543f5391d94 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontFamily.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontSize.png
index 3732ab052bfd..c528180e2628 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithHorizontalAlignment.png
index 3a670917e8e4..63aecc1cd5d0 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithHorizontalAlignment.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithPasswordTrue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithPasswordTrue.png
index b6b45bbb8f39..13b9552fbf5b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithPasswordTrue.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithPasswordTrue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithShadow.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithShadow.png
index 38d514355fbe..608ed01948d5 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithShadow.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithVerticalAlignment.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithVerticalAlignment.png
index 5eddbf395e65..d7071fc6cbc3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithVerticalAlignment.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyPlaceholderWithVerticalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedHorizontally.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedHorizontally.png
index 34d048b358dc..953462d95e1b 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedHorizontally.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedVertically.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedVertically.png
index 03b60a6da528..c67e38dc84fe 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedVertically.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenAlingnedVertically.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenCharacterSpacingSetValues.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenCharacterSpacingSetValues.png
index 848f172c35d3..cbf7d35d00fe 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenCharacterSpacingSetValues.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenCharacterSpacingSetValues.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenClearButtonVisibleSetNever.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenClearButtonVisibleSetNever.png
index 03cd241b9ec8..d8871e637de3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenClearButtonVisibleSetNever.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenClearButtonVisibleSetNever.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontAttributesSet.png
index 7cbf5f8f8ce1..2a74072f938a 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontAttributesSet.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontFamilySetValue.png
index 589548813bb3..29d69deccf7c 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontFamilySetValue.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontSizeSetCorrectly.png
index 516de1791f27..6a4b69c38755 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontSizeSetCorrectly.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenIsPasswordTrueOrFalse.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenIsPasswordTrueOrFalse.png
index 1d528daf5870..0e8e09c22cdf 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenIsPasswordTrueOrFalse.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenIsPasswordTrueOrFalse.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenKeyboardTypeSet.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenKeyboardTypeSet.png
index 2c59ee8bc528..de621671452f 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenKeyboardTypeSet.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenKeyboardTypeSet.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenTextColorSetCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenTextColorSetCorrectly.png
index 335e441cac49..61e8158037e5 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenTextColorSetCorrectly.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTextWhenTextColorSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png
index 7a5d6239288b..73b59c865a21 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
index ca14466bb74a..d4d883d65840 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
@@ -4,13 +4,14 @@
              x:DataType="local:EntryViewModel"
              x:Class="Maui.Controls.Sample.EntryControlMainPage">
        <VerticalStackLayout Padding="20"
-                    Spacing="8">
+                            Spacing="8">
               <Label Text="Entry Control"
-                     FontSize="20" Margin="0,0,0,50"
+                     FontSize="20"
+                     Margin="0,0,0,50"
                      HorizontalOptions="Center"/>
 
-              <local:UITestEntry x:Name="EntryControl" 
-                                 IsCursorVisible="False"  
+              <local:UITestEntry x:Name="EntryControl"
+                                 IsCursorVisible="False"
                                  Text="{Binding Text}"
                                  Placeholder="{Binding Placeholder}"
                                  PlaceholderColor="{Binding PlaceholderColor}"
@@ -47,7 +48,13 @@
 
               <Grid HeightRequest="130"/>
 
-              <Grid ColumnSpacing="10" Margin="0,10,0,10">
+              <Button Text="Options"
+                      FontSize="11"
+                      Clicked="NavigateToOptionsPage_Clicked"
+                      AutomationId="OptionsButton"/>
+
+              <Grid ColumnSpacing="10"
+                    Margin="0,10,0,10">
                      <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
@@ -56,38 +63,38 @@
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
                      </Grid.ColumnDefinitions>
-                     
+
                      <!-- Row 1: Labels -->
-                     <Label Text="Selection Length:" 
-                               FontSize="11" 
-                               Grid.Row="0" 
-                               Grid.Column="0"/>
+                     <Label Text="Selection Length:"
+                            FontSize="11"
+                            Grid.Row="0"
+                            Grid.Column="0"/>
                      <Label Text="Cursor position:"
-                               FontSize="11" 
-                               Grid.Row="0" 
-                               Grid.Column="1"/>
-                     
+                            FontSize="11"
+                            Grid.Row="0"
+                            Grid.Column="1"/>
+
                      <!-- Row 2: Entries -->
                      <local:UITestEntry x:Name="SelectionLengthEntry"
-                                                    Text="{Binding SelectionLength}"
-                                                    AutomationId="SelectionLengthEntry"
-                                                    IsCursorVisible="False"
-                                                    TextChanged="SelectionLength_Clicked"
-                                                    Grid.Row="1"
-                                                    Grid.Column="0"/>
+                                        Text="{Binding SelectionLength}"
+                                        AutomationId="SelectionLengthEntry"
+                                        IsCursorVisible="False"
+                                        TextChanged="SelectionLength_Clicked"
+                                        Grid.Row="1"
+                                        Grid.Column="0"/>
                      <local:UITestEntry x:Name="CursorPositionEntry"
-                                                    Text="{Binding CursorPosition}"
-                                                    AutomationId="CursorPositionEntry"
-                                                    IsCursorVisible="False"
-                                                    Grid.Row="1"
-                                                    Grid.Column="1"/>
+                                        Text="{Binding CursorPosition}"
+                                        AutomationId="CursorPositionEntry"
+                                        IsCursorVisible="False"
+                                        Grid.Row="1"
+                                        Grid.Column="1"/>
               </Grid>
 
               <Button Text="Update Cursor Selection"
                       FontSize="11"
                       Clicked="OnUpdateCursorAndSelectionClicked"
                       AutomationId="UpdateCursorAndSelectionButton"/>
-              
+
               <Label Text="Events:"
                      FontSize="11"/>
               <Label x:Name="TextChangedLabel"
@@ -107,9 +114,4 @@
                      AutomationId="UnfocusedLabel"
                      FontSize="11"/>
        </VerticalStackLayout>
-
-       <ContentPage.ToolbarItems>
-              <ToolbarItem Text="Options"
-                           Clicked="NavigateToOptionsPage_Clicked"></ToolbarItem>
-       </ContentPage.ToolbarItems>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml
index 8b8bc8678a90..d2e5c2838de4 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml
@@ -3,49 +3,45 @@
              xmlns:local="clr-namespace:Maui.Controls.Sample"
              x:DataType="local:EntryViewModel"
              x:Class="Maui.Controls.Sample.EntryOptionsPage">
-       <ContentPage.ToolbarItems>
-              <ToolbarItem Text="Apply"
-                           Clicked="ApplyButton_Clicked"
-                           AutomationId="Apply"/>
-       </ContentPage.ToolbarItems>
        <Grid Padding="2"
              ColumnDefinitions="*, *"
              RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
              ColumnSpacing="8">
-              <!-- Left Column: Entry property toggles and settings -->
-              <VerticalStackLayout Grid.Column="0">
+              <VerticalStackLayout Grid.ColumnSpan="2"
+                                   Grid.Row="1">
+                     <!-- Add Apply buttons below the grid -->
+                     <Button Text="Apply"
+                             FontSize="14"
+                             Clicked="ApplyButton_Clicked"
+                             AutomationId="ApplyButton"/>
+              </VerticalStackLayout>
+              <!-- Left Column: Editor property toggles and settings -->
+              <VerticalStackLayout Grid.Column="0"
+                                   Grid.Row="2">
                      <!-- Text -->
                      <HorizontalStackLayout>
                             <Label Text="Text:"
-                                   FontSize="11"
+                                   FontSize="10"
                                    VerticalTextAlignment="Center"/>
                             <Entry x:Name="TextEntry"
                                    Text="{Binding Text}"
+                                   FontSize="10"
                                    TextChanged="Entry_TextChanged"
                                    AutomationId="TextEntryChanged"
                                    WidthRequest="100"/>
                      </HorizontalStackLayout>
-                     <!-- Font Size -->
-                     <HorizontalStackLayout>
-                            <Label Text="Font Size:"
-                                   FontSize="11"
-                                   VerticalTextAlignment="Center"/>
-                            <Entry x:Name="FontSizeEntry"
-                                   Text="{Binding FontSize}"
-                                   TextChanged="FontSizeEntry_TextChanged"
-                                   AutomationId="FontSizeEntry"
-                                   WidthRequest="100"/>
-                     </HorizontalStackLayout>
                      <!-- Horizontal Alignment -->
                      <Label Text="Horizontal Alignment:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <Button Text="Start"
                                     AutomationId="HStart"
+                                    FontSize="10"
                                     Clicked="HorizontalAlignmentButton_Clicked"/>
                             <Button Text="Center"
                                     AutomationId="HCenter"
+                                    FontSize="10"
                                     Clicked="HorizontalAlignmentButton_Clicked"/>
                             <Button Text="End"
                                     AutomationId="HEnd"
@@ -53,352 +49,388 @@
                      </HorizontalStackLayout>
                      <!-- Vertical Alignment -->
                      <Label Text="Vertical Alignment:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <Button Text="Start"
                                     AutomationId="VStart"
+                                    FontSize="10"
                                     Clicked="VerticalAlignmentButton_Clicked"/>
                             <Button Text="Center"
                                     AutomationId="VCenter"
+                                    FontSize="10"
                                     Clicked="VerticalAlignmentButton_Clicked"/>
                             <Button Text="End"
                                     AutomationId="VEnd"
+                                    FontSize="10"
                                     Clicked="VerticalAlignmentButton_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- IsPassword -->
                      <Label Text="IsPassword:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <RadioButton x:Name="IsPasswordTrue"
                                          Content="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="Password"
                                          AutomationId="PasswordTrue"
                                          CheckedChanged="IsPasswordTrueOrFalse_Clicked"/>
                             <RadioButton x:Name="IsPasswordFalse"
                                          IsChecked="True"
                                          Content="False"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="Password"
                                          AutomationId="PasswordFalse"
                                          CheckedChanged="IsPasswordTrueOrFalse_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- IsReadOnly -->
                      <Label Text="IsReadOnly:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <RadioButton x:Name="IsReadOnlyTrue"
                                          Content="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="ReadOnly"
                                          AutomationId="ReadOnlyTrue"
                                          CheckedChanged="IsReadOnlyTrueOrFalse_Clicked"/>
                             <RadioButton x:Name="IsReadOnlyFalse"
                                          IsChecked="True"
                                          Content="False"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="ReadOnly"
                                          AutomationId="ReadOnlyFalse"
                                          CheckedChanged="IsReadOnlyTrueOrFalse_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- IsTextPredictionEnabled -->
                      <Label Text="IsTextPredictionEnabled:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <RadioButton x:Name="IsTextPredictionEnabledTrue"
                                          Content="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="TextPrediction"
                                          AutomationId="TextPredictionTrue"
                                          CheckedChanged="IsTextPredictionEnabledTrueOrFalse_Clicked"/>
                             <RadioButton x:Name="IsTextPredictionEnabledFalse"
                                          Content="False"
                                          IsChecked="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="TextPrediction"
                                          AutomationId="TextPredictionFalse"
                                          CheckedChanged="IsTextPredictionEnabledTrueOrFalse_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- IsSpellCheckEnabled -->
                      <Label Text="IsSpellCheckEnabled:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <RadioButton x:Name="IsSpellCheckEnabledTrue"
                                          Content="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="SpellCheck"
                                          AutomationId="SpellCheckTrue"
                                          CheckedChanged="IsSpellCheckEnabledTrueOrFalse_Clicked"/>
                             <RadioButton x:Name="IsSpellCheckEnabledFalse"
                                          Content="False"
                                          IsChecked="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="SpellCheck"
                                          AutomationId="SpellCheckFalse"
                                          CheckedChanged="IsSpellCheckEnabledTrueOrFalse_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- Flow Direction -->
                      <Label Text="Flow Direction:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout Spacing="1">
                             <RadioButton x:Name="FlowDirectionLeftToRight"
                                          Content="LTR"
                                          GroupName="FlowDirection"
                                          IsChecked="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          VerticalOptions="Center"
                                          AutomationId="FlowDirectionLeftToRight"
                                          CheckedChanged="FlowDirection_CheckedChanged"/>
                             <RadioButton x:Name="FlowDirectionRightToLeft"
                                          Content="RTL"
                                          GroupName="FlowDirection"
-                                         FontSize="11"
+                                         FontSize="10"
                                          VerticalOptions="Center"
                                          AutomationId="FlowDirectionRightToLeft"
                                          CheckedChanged="FlowDirection_CheckedChanged"/>
                      </HorizontalStackLayout>
                      <!-- IsVisible -->
                      <Label Text="IsVisible:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <RadioButton x:Name="IsVisibleTrue"
                                          Content="True"
                                          IsChecked="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="Visible"
                                          AutomationId="VisibleTrue"
                                          CheckedChanged="IsVisibleTrueOrFalse_Clicked"/>
                             <RadioButton x:Name="IsVisibleFalse"
                                          Content="False"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="Visible"
                                          AutomationId="VisibleFalse"
                                          CheckedChanged="IsVisibleTrueOrFalse_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- IsEnabled -->
                      <Label Text="IsEnabled:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <RadioButton x:Name="IsEnabledTrue"
                                          Content="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          IsChecked="True"
                                          GroupName="Enabled"
                                          AutomationId="EnabledTrue"
                                          CheckedChanged="IsEnabledTrueOrFalse_Clicked"/>
                             <RadioButton x:Name="IsEnabledFalse"
                                          Content="False"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="Enabled"
                                          AutomationId="EnabledFalse"
                                          CheckedChanged="IsEnabledTrueOrFalse_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- Clear Button Visibility -->
                      <Label Text="Clear Button Visibility:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <RadioButton x:Name="ClearButtonWhileEditing"
                                          Content="While Editing"
                                          IsChecked="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="ClearButtonVisibility"
                                          AutomationId="ClearButtonWhileEditing"
                                          CheckedChanged="ClearButtonVisibility_CheckedChanged"/>
                             <RadioButton x:Name="ClearButtonNever"
                                          Content="Never"
-                                         FontSize="11"
+                                         FontSize="10"
                                          GroupName="ClearButtonVisibility"
                                          AutomationId="ClearButtonNever"
                                          CheckedChanged="ClearButtonVisibility_CheckedChanged"/>
                      </HorizontalStackLayout>
                      <!-- Font Attributes -->
                      <Label Text="Font Attributes:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <RadioButton Content="None"
                                          x:Name="FontAttributesNone"
                                          GroupName="FontAttributes"
                                          IsChecked="True"
-                                         FontSize="11"
+                                         FontSize="10"
                                          AutomationId="FontAttributesNone"
                                          CheckedChanged="FontAttributes_CheckedChanged"/>
                             <RadioButton Content="Bold"
                                          x:Name="FontAttributesBold"
                                          GroupName="FontAttributes"
-                                         FontSize="11"
+                                         FontSize="10"
                                          AutomationId="FontAttributesBold"
                                          CheckedChanged="FontAttributes_CheckedChanged"/>
                             <RadioButton Content="Italic"
                                          x:Name="FontAttributesItalic"
                                          GroupName="FontAttributes"
-                                         FontSize="11"
+                                         FontSize="10"
                                          AutomationId="FontAttributesItalic"
                                          CheckedChanged="FontAttributes_CheckedChanged"/>
                      </HorizontalStackLayout>
               </VerticalStackLayout>
               <!-- Right Column: Color, spacing, keyboard, and other settings -->
-              <VerticalStackLayout Grid.Column="1">
+              <VerticalStackLayout Grid.Column="1"
+                                   Grid.Row="2">
                      <!-- Text Color -->
                      <Label Text="Text Color:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <Button Text="Black"
                                     BackgroundColor="Black"
                                     TextColor="White"
                                     AutomationId="TextColorBlack"
+                                    FontSize="10"
                                     Clicked="TextColorButton_Clicked"/>
                             <Button Text="Red"
                                     BackgroundColor="Red"
                                     TextColor="White"
+                                    FontSize="10"
                                     AutomationId="TextColorRed"
                                     Clicked="TextColorButton_Clicked"/>
                             <Button Text="Blue"
                                     BackgroundColor="Blue"
                                     TextColor="White"
+                                    FontSize="10"
                                     AutomationId="TextColorBlue"
                                     Clicked="TextColorButton_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- Placeholder Color -->
                      <Label Text="Placeholder Color:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <HorizontalStackLayout
                             Spacing="1">
                             <Button Text="Grey"
                                     BackgroundColor="Grey"
                                     TextColor="White"
+                                    FontSize="10"
                                     AutomationId="PlaceholderColorGrey"
                                     Clicked="PlaceholderColorButton_Clicked"/>
                             <Button Text="Red"
                                     BackgroundColor="Red"
                                     TextColor="White"
+                                    FontSize="10"
                                     AutomationId="PlaceholderColorRed"
                                     Clicked="PlaceholderColorButton_Clicked"/>
                             <Button Text="Blue"
                                     BackgroundColor="Blue"
                                     TextColor="White"
+                                    FontSize="10"
                                     AutomationId="PlaceholderColorBlue"
                                     Clicked="PlaceholderColorButton_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- Character Spacing -->
                      <HorizontalStackLayout>
                             <Label Text="Character Spacing:"
-                                   FontSize="11"
+                                   FontSize="10"
                                    VerticalTextAlignment="Center"/>
                             <Entry x:Name="CharacterSpacingEntry"
                                    Text="{Binding CharacterSpacing}"
                                    AutomationId="CharacterSpacing"
+                                   FontSize="10"
                                    TextChanged="CharacterSpacing_TextChanged"
                                    WidthRequest="100"/>
                      </HorizontalStackLayout>
                      <!-- ReturnType -->
                      <Label Text="ReturnType"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <VerticalStackLayout
                             Spacing="1">
                             <HorizontalStackLayout
                                    Spacing="1">
                                    <Button Text="Default"
                                            AutomationId="Default"
+                                           FontSize="10"
                                            Clicked="ReturnTypeButton_Clicked"/>
                                    <Button Text="Next"
                                            AutomationId="Next"
+                                           FontSize="10"
                                            Clicked="ReturnTypeButton_Clicked"/>
                                    <Button Text="Send"
                                            AutomationId="Send"
+                                           FontSize="10"
                                            Clicked="ReturnTypeButton_Clicked"/>
                             </HorizontalStackLayout>
                             <HorizontalStackLayout
                                    Spacing="1">
                                    <Button Text="Go"
                                            AutomationId="Go"
+                                           FontSize="10"
                                            Clicked="ReturnTypeButton_Clicked"/>
                                    <Button Text="Search"
+                                           FontSize="10"
                                            AutomationId="Search"
                                            Clicked="ReturnTypeButton_Clicked"/>
                                    <Button Text="Done"
                                            AutomationId="Done"
+                                           FontSize="10"
                                            Clicked="ReturnTypeButton_Clicked"/>
                             </HorizontalStackLayout>
                      </VerticalStackLayout>
                      <!-- Max Length -->
                      <HorizontalStackLayout>
                             <Label Text="Max Length:"
-                                   FontSize="11"
+                                   FontSize="10"
                                    VerticalTextAlignment="Center"/>
                             <Entry x:Name="MaxLengthEntry"
                                    Text="{Binding MaxLength}"
                                    AutomationId="MaxLength"
-                                   FontSize="11"
+                                   FontSize="10"
                                    TextChanged="MaxLengthButton_Clicked"
                                    WidthRequest="100"/>
                      </HorizontalStackLayout>
                      <!-- Keyboard -->
                      <Label Text="Keyboard:"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <VerticalStackLayout
                             Spacing="1">
                             <HorizontalStackLayout
                                    Spacing="1">
                                    <Button Text="Default"
                                            AutomationId="Default"
+                                           FontSize="10"
                                            Clicked="KeyboardButton_Clicked"/>
                                    <Button Text="Chat"
                                            AutomationId="Chat"
+                                           FontSize="10"
                                            Clicked="KeyboardButton_Clicked"/>
                                    <Button Text="Url"
                                            AutomationId="Url"
+                                           FontSize="10"
                                            Clicked="KeyboardButton_Clicked"/>
                             </HorizontalStackLayout>
                             <HorizontalStackLayout
                                    Spacing="1">
                                    <Button Text="Email"
                                            AutomationId="Email"
+                                           FontSize="10"
                                            Clicked="KeyboardButton_Clicked"/>
                                    <Button Text="Numeric"
                                            AutomationId="Numeric"
+                                           FontSize="10"
                                            Clicked="KeyboardButton_Clicked"/>
                             </HorizontalStackLayout>
                             <HorizontalStackLayout
                                    Spacing="1">
                                    <Button Text="Telephone"
                                            AutomationId="Telephone"
+                                           FontSize="10"
                                            Clicked="KeyboardButton_Clicked"/>
                                    <Button Text="Text"
                                            AutomationId="Text"
+                                           FontSize="10"
                                            Clicked="KeyboardButton_Clicked"/>
                             </HorizontalStackLayout>
                      </VerticalStackLayout>
+                     <!-- Font Size -->
+                     <HorizontalStackLayout>
+                            <Label Text="Font Size:"
+                                   FontSize="10"
+                                   VerticalTextAlignment="Center"/>
+                            <Entry x:Name="FontSizeEntry"
+                                   Text="{Binding FontSize}"
+                                   FontSize="10"
+                                   TextChanged="FontSizeEntry_TextChanged"
+                                   AutomationId="FontSizeEntry"
+                                   WidthRequest="100"/>
+                     </HorizontalStackLayout>
                      <!-- Font Family -->
                      <HorizontalStackLayout>
                             <Label Text="Font Family:"
-                                   FontSize="11"
+                                   FontSize="10"
                                    VerticalTextAlignment="Center"/>
                             <Entry x:Name="FontFamilyEntry"
                                    Text="{Binding FontFamily}"
                                    AutomationId="FontFamily"
-                                   FontSize="11"
+                                   FontSize="10"
                                    TextChanged="FontFamilyEntry_TextChanged"
                                    WidthRequest="100"/>
                      </HorizontalStackLayout>
                      <!-- Placeholder -->
                      <HorizontalStackLayout>
                             <Label Text="Placeholder:"
-                                   FontSize="11"
+                                   FontSize="10"
                                    VerticalTextAlignment="Center"/>
                             <Entry x:Name="PlaceholderEntry"
                                    Text="{Binding Placeholder}"
                                    AutomationId="PlaceholderText"
-                                   FontSize="11"
+                                   FontSize="10"
                                    TextChanged="PlaceholderEntry_TextChanged"
                                    WidthRequest="80"/>
                      </HorizontalStackLayout>
@@ -408,24 +440,25 @@
                                    IsChecked="{Binding HasShadow}"
                                    AutomationId="ShadowCheckBox"/>
                             <Label Text="Has Shadow"
+                                   FontSize="10"
                                    VerticalOptions="Center"/>
                      </HorizontalStackLayout>
                      <!-- TextTransform -->
                      <Label Text="TextTransform"
-                            FontSize="11"/>
+                            FontSize="10"/>
                      <VerticalStackLayout>
                             <HorizontalStackLayout Spacing="1">
                                    <RadioButton Content="Default"
                                                 x:Name="TextTransformDefault"
                                                 GroupName="TextTransform"
-                                                FontSize="11"
+                                                FontSize="10"
                                                 IsChecked="True"
                                                 AutomationId="TextTransformDefault"
                                                 CheckedChanged="TextTransform_CheckedChanged"/>
                                    <RadioButton Content="Lowercase"
                                                 x:Name="TextTransformLowercase"
                                                 GroupName="TextTransform"
-                                                FontSize="11"
+                                                FontSize="10"
                                                 AutomationId="TextTransformLowercase"
                                                 CheckedChanged="TextTransform_CheckedChanged"/>
                             </HorizontalStackLayout>
@@ -433,7 +466,7 @@
                                    <RadioButton Content="Uppercase"
                                                 x:Name="TextTransformUppercase"
                                                 GroupName="TextTransform"
-                                                FontSize="11"
+                                                FontSize="10"
                                                 AutomationId="TextTransformUppercase"
                                                 CheckedChanged="TextTransform_CheckedChanged"/>
                             </HorizontalStackLayout>
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ClearButtonVisiblityButton_TextEmpty.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ClearButtonVisiblityButton_TextEmpty.png
index 9447ed8dd79a..025e0a87b8b5 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ClearButtonVisiblityButton_TextEmpty.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ClearButtonVisiblityButton_TextEmpty.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ClearButtonVisiblityButton_TextPresent.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ClearButtonVisiblityButton_TextPresent.png
index 04e03536606e..691987662af7 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ClearButtonVisiblityButton_TextPresent.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ClearButtonVisiblityButton_TextPresent.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/PlaceholderWithClearButtonVisible.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/PlaceholderWithClearButtonVisible.png
index 67c459a1293e..615c9826d759 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/PlaceholderWithClearButtonVisible.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/PlaceholderWithClearButtonVisible.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyCharacterSpacingWhenFontFamily.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyCharacterSpacingWhenFontFamily.png
index c757de6f900b..ca2ccc5ef239 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyCharacterSpacingWhenFontFamily.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyCharacterSpacingWhenFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyCharacterSpacingWhenMaxLengthSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyCharacterSpacingWhenMaxLengthSet.png
index 4964c6df0b51..dc8b94cb26eb 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyCharacterSpacingWhenMaxLengthSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyCharacterSpacingWhenMaxLengthSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png
index dc45efe55a13..ee0c7aa80a91 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png
index 66a8443a17e8..f1856fe44ef4 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png
index 476f97874a00..99057fc6ea5b 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenTextAlignedVertically.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenTextAlignedVertically.png
index 5981d4069dea..e33ed7fdc4bc 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenTextAlignedVertically.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearButtonVisiblityWhenTextAlignedVertically.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearVisiblityButtonWhenTextColorChanged.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearVisiblityButtonWhenTextColorChanged.png
index 0ff357627167..caf5c55a16ae 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearVisiblityButtonWhenTextColorChanged.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyClearVisiblityButtonWhenTextColorChanged.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenFlowDirectionSet.png
index b73d41febd7a..85320c318c10 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenPlaceholderColorSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenPlaceholderColorSet.png
index 3aea2c251108..4a8692637605 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenPlaceholderColorSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenPlaceholderColorSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenPlaceholderTextSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenPlaceholderTextSet.png
index 763ea54d393b..4fa427fee977 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenPlaceholderTextSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntryControlWhenPlaceholderTextSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntry_WithShadow.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntry_WithShadow.png
index 1d9d15f020a2..562cdf465df4 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntry_WithShadow.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyEntry_WithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png
index e90d42215628..3879dec722f5 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
index 411e213258b6..c5f5456ff6b1 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnCharacterSpacing.png
index ac36fe21b64e..383a56c43940 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnHorizontalTextAlignment.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnHorizontalTextAlignment.png
index 0b68241d0662..16f761b307c9 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnHorizontalTextAlignment.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnHorizontalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnVerticalTextAlignment.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnVerticalTextAlignment.png
index 5cc52fbf5ccb..0e9e6f37abdf 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnVerticalTextAlignment.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordBasedOnVerticalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenFontSizeSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenFontSizeSet.png
index b54654809a05..eba41099fd57 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenFontSizeSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenFontSizeSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenMaxLenghtSetValue.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenMaxLenghtSetValue.png
index c1957f80d1a6..cfed820ae64d 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenMaxLenghtSetValue.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenMaxLenghtSetValue.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWhenFlowDirectionSet.png
index 68444c7955a3..736fbbdf9968 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithCharacterSpacing.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithCharacterSpacing.png
index e115b9cfd56b..5148ec9b37da 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithCharacterSpacing.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontAttributes.png
index 3cbec0584847..e526d34b3129 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontAttributes.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontFamily.png
index 2c4b92b752ac..912165f60a37 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontFamily.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontSize.png
index 53331b487fce..0a10ea63f0ad 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontSize.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithHorizontalAlignment.png
index e157c2259364..2ca5e1578bcb 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithHorizontalAlignment.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithPasswordTrue.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithPasswordTrue.png
index 8a741d160787..6c73f0cc984b 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithPasswordTrue.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithPasswordTrue.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithShadow.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithShadow.png
index 47b62ec96ba7..5c68cb16fc94 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithShadow.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithVerticalAlignment.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithVerticalAlignment.png
index ff9e72b160c3..4192932bc357 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithVerticalAlignment.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithVerticalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedHorizontally.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedHorizontally.png
index df5ebe294a0f..023eefdc5b66 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedHorizontally.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedVertically.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedVertically.png
index 1d8999c111db..2fc16402250d 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedVertically.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedVertically.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenCharacterSpacingSetValues.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenCharacterSpacingSetValues.png
index 501946421f95..f96338c0caed 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenCharacterSpacingSetValues.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenCharacterSpacingSetValues.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenClearButtonVisibleSetNever.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenClearButtonVisibleSetNever.png
index 7aa34c76fd29..1eebeeb39b05 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenClearButtonVisibleSetNever.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenClearButtonVisibleSetNever.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontAttributesSet.png
index 019244febc69..c8eecb6fefef 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontAttributesSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontFamilySetValue.png
index 8884953b30c5..0a47395b7f02 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontFamilySetValue.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontSizeSetCorrectly.png
index 26a61899095b..67f146c9571e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontSizeSetCorrectly.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenIsPasswordTrueOrFalse.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenIsPasswordTrueOrFalse.png
index d9ea8da73526..ded74403fd82 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenIsPasswordTrueOrFalse.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenIsPasswordTrueOrFalse.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenTextColorSetCorrectly.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenTextColorSetCorrectly.png
index bbd90aaad2f0..551736f08660 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenTextColorSetCorrectly.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenTextColorSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png
index 0e014cff5de7..4745c2ee1d34 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
index 208e3993f2b2..745b8e07edb1 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
@@ -16,7 +16,7 @@ public class EntryFeatureTests : UITest
 #elif WINDOWS
 	private const int CropBottomValue = 400;
 #else
-	private const int CropBottomValue = 360;		
+	private const int CropBottomValue = 360;
 #endif
 
 	public EntryFeatureTests(TestDevice device)
@@ -88,7 +88,11 @@ public void VerifyEntryUnfocusedEvent()
 	public void VerifyClearButtonVisiblityWhenTextPresentOrEmpty()
 	{
 		Exception? exception = null;
-		App.WaitForElement("Entry Control");
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
+		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandlingOrSetException(ref exception, "ClearButtonVisiblityButton_TextPresent");
 		App.WaitForElement("TestEntry");
@@ -799,11 +803,11 @@ public void VerifyEntryControlWhenPlaceholderColorSet()
 		App.Tap("Options");
 		App.WaitForElement("PlaceholderColorRed");
 		App.Tap("PlaceholderColorRed");
+		App.WaitForElement("TextEntryChanged");
+		App.ClearText("TextEntryChanged");
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
-		App.ClearText("TestEntry");
-		App.DismissKeyboard();
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -906,6 +910,7 @@ public void VerifyPlaceholderWithPasswordTrue()
 		App.Tap("PasswordTrue");
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
+		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ClearButtonVisiblityButton_TextEmpty.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ClearButtonVisiblityButton_TextEmpty.png
index 3c4967040a1d..eb1f9206557c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ClearButtonVisiblityButton_TextEmpty.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ClearButtonVisiblityButton_TextEmpty.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ClearButtonVisiblityButton_TextPresent.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ClearButtonVisiblityButton_TextPresent.png
index ebdf2f9fa78e..1223382e1819 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ClearButtonVisiblityButton_TextPresent.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ClearButtonVisiblityButton_TextPresent.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/PlaceholderWithClearButtonVisible.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/PlaceholderWithClearButtonVisible.png
index 923892b1cd04..2b3553186565 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/PlaceholderWithClearButtonVisible.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/PlaceholderWithClearButtonVisible.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenFontFamily.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenFontFamily.png
index 5ce37218ca86..61dfdba42504 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenFontFamily.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenMaxLengthSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenMaxLengthSet.png
index 1122571ca2cf..668573839066 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenMaxLengthSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenMaxLengthSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png
index cde8c69a34df..148dec76a325 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png
index 360d690f17f7..e178d76d94a9 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png
index 397a0ace47b1..71ee69d28ed4 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenTextAlignedVertically.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenTextAlignedVertically.png
index 27731fa6f54b..ad9062408e71 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenTextAlignedVertically.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearButtonVisiblityWhenTextAlignedVertically.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearVisiblityButtonWhenTextColorChanged.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearVisiblityButtonWhenTextColorChanged.png
index 1c6c384bb196..e95a7cdfa327 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearVisiblityButtonWhenTextColorChanged.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyClearVisiblityButtonWhenTextColorChanged.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenFlowDirectionSet.png
index 1eb1f0473118..e4dbfc6aa247 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenPlaceholderColorSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenPlaceholderColorSet.png
index cc4dc382fca1..66b1e5122781 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenPlaceholderColorSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenPlaceholderColorSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenPlaceholderTextSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenPlaceholderTextSet.png
index 81cb8b3f74a6..761fd5304c4e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenPlaceholderTextSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenPlaceholderTextSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png
index dc58784fac16..efe06d3f160c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
index db07a04191bd..8789f0bb4675 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnCharacterSpacing.png
index 4492e5bff9b9..62591e1a8220 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnHorizontalTextAlignment.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnHorizontalTextAlignment.png
index 9bb715479043..67f6a4ecb3e0 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnHorizontalTextAlignment.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnHorizontalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnVerticalTextAlignment.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnVerticalTextAlignment.png
index b83ed3d5c168..93134a26c686 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnVerticalTextAlignment.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnVerticalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenFontSizeSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenFontSizeSet.png
index 1cdc99b1e3d1..ad0ac91422f4 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenFontSizeSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenFontSizeSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenMaxLenghtSetValue.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenMaxLenghtSetValue.png
index a03d4f788412..ddc9f78e84f1 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenMaxLenghtSetValue.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenMaxLenghtSetValue.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWhenFlowDirectionSet.png
index 72f728abf454..7e8c75533820 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontAttributes.png
index cee03169de02..1d92fb8c6204 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontAttributes.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontFamily.png
index c82426f76e44..76b51d964014 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontFamily.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontSize.png
index e823520105f3..07bb19d6a231 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontSize.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithHorizontalAlignment.png
index e07c13c62aca..b50fcac56ea5 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithHorizontalAlignment.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithPasswordTrue.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithPasswordTrue.png
index 3a7e4a706f88..c41e6b20b00d 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithPasswordTrue.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithPasswordTrue.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithVerticalAlignment.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithVerticalAlignment.png
index 9bf548123d1e..a48b3b19f01d 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithVerticalAlignment.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithVerticalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedHorizontally.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedHorizontally.png
index 5df211eaa421..6125c30cc296 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedHorizontally.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedVertically.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedVertically.png
index b7cc436590b3..5cd95a9a99ed 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedVertically.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedVertically.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenCharacterSpacingSetValues.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenCharacterSpacingSetValues.png
index 80f80fc36794..42615b1f9bb5 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenCharacterSpacingSetValues.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenCharacterSpacingSetValues.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenClearButtonVisibleSetNever.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenClearButtonVisibleSetNever.png
index c329be97bccb..9565fa613f5c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenClearButtonVisibleSetNever.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenClearButtonVisibleSetNever.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontAttributesSet.png
index 35fd733be6e2..26ee1d545e8a 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontAttributesSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontFamilySetValue.png
index 0584136c1cb4..dc41fc74227b 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontFamilySetValue.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontSizeSetCorrectly.png
index 0db3c3d8404a..edd6cac95100 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontSizeSetCorrectly.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenIsPasswordTrueOrFalse.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenIsPasswordTrueOrFalse.png
index 262482fcb47f..283b757052cb 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenIsPasswordTrueOrFalse.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenIsPasswordTrueOrFalse.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenTextColorSetCorrectly.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenTextColorSetCorrectly.png
index 8e87a0053789..c35f7b10c36d 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenTextColorSetCorrectly.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenTextColorSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png
index e9b39056b085..1d4e0e7558cc 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextEmpty.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextEmpty.png
index b1b22b33d80d..f0188bcb6bbd 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextEmpty.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextEmpty.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextPresent.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextPresent.png
index fcb42a9cee78..3f5498933e74 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextPresent.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextPresent.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PlaceholderWithClearButtonVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PlaceholderWithClearButtonVisible.png
index 48b8534f06f2..cfb877e9d67f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PlaceholderWithClearButtonVisible.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PlaceholderWithClearButtonVisible.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyCharacterSpacingWhenFontFamily.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyCharacterSpacingWhenFontFamily.png
index a0c1faefd58e..8482480c0e9d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyCharacterSpacingWhenFontFamily.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyCharacterSpacingWhenFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyCharacterSpacingWhenMaxLengthSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyCharacterSpacingWhenMaxLengthSet.png
index f3f84be7119b..811a4433ce0a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyCharacterSpacingWhenMaxLengthSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyCharacterSpacingWhenMaxLengthSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png
index b10babef425d..40ed3073ef30 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisibilityWhenIsReadOnlyTrue.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png
index cb34010da221..983d8edf2283 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisiblityWhenTextAlignedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisiblityWhenTextAlignedVertically.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisiblityWhenTextAlignedVertically.png
index 380bd98fef43..6926d1969238 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisiblityWhenTextAlignedVertically.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearButtonVisiblityWhenTextAlignedVertically.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearVisiblityButtonWhenTextColorChanged.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearVisiblityButtonWhenTextColorChanged.png
index 153f72e88847..f4c1863b853f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearVisiblityButtonWhenTextColorChanged.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearVisiblityButtonWhenTextColorChanged.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenFlowDirectionSet.png
index 0e97425b76dc..0b6e05363474 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenPlaceholderColorSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenPlaceholderColorSet.png
index ad20164bd0dc..be8f47b5bcb2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenPlaceholderColorSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenPlaceholderColorSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenPlaceholderTextSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenPlaceholderTextSet.png
index 698a6d3a9ad1..6279848fee75 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenPlaceholderTextSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntryControlWhenPlaceholderTextSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntry_WithShadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntry_WithShadow.png
index 7d11ad844ca2..062158dc2721 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntry_WithShadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyEntry_WithShadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png
index 19e067ee0358..edc6457e3409 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
index 8257114a589b..0eaffb29fbbc 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWhenFlowDirectionSet.png
index 5a959d3e70aa..b2f2f066b84a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithCharacterSpacing.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithCharacterSpacing.png
index d240c3a97d09..6cd2bb046fc9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithCharacterSpacing.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontAttributes.png
index 373d97df88b6..346e93680b26 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontAttributes.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontFamily.png
index cb24e3ac9425..dd8654576064 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontFamily.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontSize.png
index df630b553c96..4af66e4ca877 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontSize.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithHorizontalAlignment.png
index 3d4bb5d2a534..77d1d7e88b2f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithHorizontalAlignment.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithPasswordTrue.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithPasswordTrue.png
index a1361994902d..1ab5b1d753a0 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithPasswordTrue.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithPasswordTrue.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithShadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithShadow.png
index ec8efda441c6..d100bd1f86da 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithShadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithShadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithVerticalAlignment.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithVerticalAlignment.png
index 7c20e26b87b9..85bceff1d4f9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithVerticalAlignment.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithVerticalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenAlingnedHorizontally.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenAlingnedHorizontally.png
index b3f63b69a9bc..c68dbac97feb 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenAlingnedHorizontally.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenAlingnedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenAlingnedVertically.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenAlingnedVertically.png
index 8f80cd1f1bf3..04b411c63d2f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenAlingnedVertically.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenAlingnedVertically.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenCharacterSpacingSetValues.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenCharacterSpacingSetValues.png
index e5ec2bbff5fd..89c2c46c3d53 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenCharacterSpacingSetValues.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenCharacterSpacingSetValues.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenClearButtonVisibleSetNever.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenClearButtonVisibleSetNever.png
index 4ec866d4cb2b..75b1e9602c27 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenClearButtonVisibleSetNever.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenClearButtonVisibleSetNever.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontAttributesSet.png
index 59017c3e9f8b..7b36e9780bbe 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontAttributesSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontFamilySetValue.png
index 3bce5718e4cd..cb9d160a91d7 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontFamilySetValue.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontSizeSetCorrectly.png
index cedbf0c23bd3..e25ecef34666 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontSizeSetCorrectly.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenKeyboardTypeSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenKeyboardTypeSet.png
index a9f8a4587761..96b5837a77f8 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenKeyboardTypeSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenKeyboardTypeSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenReturnTypeSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenReturnTypeSet.png
index 3d481719779f..0011d2802ed1 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenReturnTypeSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenReturnTypeSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenTextColorSetCorrectly.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenTextColorSetCorrectly.png
index 27936b5f8839..28dcbdd57b08 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenTextColorSetCorrectly.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenTextColorSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png
index 7ffdf2def9f7..dbce4f9fbd5f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyVerticalTextAlignmentBasedOnCharacterSpacing.png differ