diff --git a/src/Controls/src/Core/ContentPage/ContentPage.cs b/src/Controls/src/Core/ContentPage/ContentPage.cs
index ea735114c594..b2b6bc267586 100644
--- a/src/Controls/src/Core/ContentPage/ContentPage.cs
+++ b/src/Controls/src/Core/ContentPage/ContentPage.cs
@@ -181,7 +181,7 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 			}
 
 
-			#if IOS || MACCATALYST
+#if IOS || MACCATALYST
 
 			// Developer hasn't set SafeAreaEdges, fall back to legacy IgnoreSafeArea behavior
 			var ignoreSafeArea = ((ISafeAreaView)this).IgnoreSafeArea;
@@ -194,12 +194,12 @@ SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
 				return SafeAreaRegions.Container; // If legacy says "don't ignore", return Container
 			}
 
-			#else
-			
-			// By default on android it was never edge to edge so we set this to container by default
-			return SafeAreaRegions.Container;
+#else
 
-			#endif
+			// Default to None (edge-to-edge) for consistent behavior across all platforms
+			return SafeAreaRegions.None;
+
+#endif
 		}
 
 		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
diff --git a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
index a7ae17748e6e..ad0e8f1e5b65 100644
--- a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
+++ b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
@@ -272,16 +272,16 @@ public void ContentView_GetSafeAreaRegionsForEdge_DefaultsToNoneWhenNoPropertySe
 		[Fact]
 		public void Page_GetSafeAreaRegionsForEdge_DefaultsToNoneForContentPage()
 		{
-			var page = new ContentPage(); // ContentPage defaults to SafeAreaRegions.None on iOS (IgnoreSafeArea = true)
+			var page = new ContentPage(); // ContentPage defaults to SafeAreaRegions.None (edge-to-edge)
 
-			// ContentPage has special logic - defaults to SafeAreaRegions.None (edge-to-edge) on iOS
+			// ContentPage default is now None (edge-to-edge) for consistency across platforms
 			var safeAreaView2 = (ISafeAreaView2)page;
 
-			// only iOS defaults to "None" for ContentPage so we are just validating that the default is container
-			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0));
-			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1));
-			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2));
-			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3));
+			// Default is now "None" for all edges when user hasn't set anything
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3));
 		}
 
 		// Tests based on existing iOS safe area usage patterns
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png
index 4428cf1b1e63..1c5b45610a9e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CarouselViewItemShouldScaleProperly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CarouselViewItemShouldScaleProperly.png
index a1edb212f527..297fcd81dd48 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CarouselViewItemShouldScaleProperly.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/CarouselViewItemShouldScaleProperly.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Stepper_ChangeFlowDirection_RTL_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Stepper_ChangeFlowDirection_RTL_VerifyVisualState.png
index 4834c3caed21..651ebcf9aaf7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Stepper_ChangeFlowDirection_RTL_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Stepper_ChangeFlowDirection_RTL_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Border/BorderControlsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Border/BorderControlsPage.xaml
index efcfc9720788..b8e8dbe67087 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Border/BorderControlsPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Border/BorderControlsPage.xaml
@@ -4,7 +4,8 @@
              xmlns:local="clr-namespace:Maui.Controls.Sample"
              x:DataType="local:BorderViewModel"
              x:Class="Maui.Controls.Sample.BorderControlMainPage"
-             Title="ControlsPage">
+             Title="ControlsPage"
+             SafeAreaEdges="Container">
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="Options"
                      Clicked="NavigateToOptionsPage_Clicked"
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CarouselView/CarouselViewControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CarouselView/CarouselViewControlPage.xaml
index 7ab6b78ff727..57c20d209ae6 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CarouselView/CarouselViewControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CarouselView/CarouselViewControlPage.xaml
@@ -1,6 +1,7 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:Maui.Controls.Sample"
+             SafeAreaEdges="Container"
              x:Class="Maui.Controls.Sample.CarouselViewControlPage"
              Title="CarouselViewControlPage">
 
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/HeaderFooter/CollectionViewHeaderPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/HeaderFooter/CollectionViewHeaderPage.xaml
index 7dafb9698b9c..db461e3c4382 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/HeaderFooter/CollectionViewHeaderPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/HeaderFooter/CollectionViewHeaderPage.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:Maui.Controls.Sample"
              x:Class="Maui.Controls.Sample.CollectionViewHeaderPage"
+             SafeAreaEdges="Container"
              Title="CollectionViewFeature">
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="Options"
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ContentPage/ContentPageControlpage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ContentPage/ContentPageControlpage.xaml.cs
index 2181d720a18e..46d6b032fb10 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ContentPage/ContentPageControlpage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/ContentPage/ContentPageControlpage.xaml.cs
@@ -18,6 +18,7 @@ public partial class ContentPageControlMainPage : ContentPage
 	public ContentPageControlMainPage(ContentPageViewModel viewModel)
 	{
 		InitializeComponent();
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		_viewModel = viewModel;
 		BindingContext = _viewModel;
 	}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
index d4d883d65840..8d10cac8a98b 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
@@ -2,6 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:Maui.Controls.Sample"
              x:DataType="local:EntryViewModel"
+             SafeAreaEdges="Container"
              x:Class="Maui.Controls.Sample.EntryControlMainPage">
        <VerticalStackLayout Padding="20"
                             Spacing="8">
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperFeaturePage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperFeaturePage.xaml
index fc92f4df2342..d347ac7dab38 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperFeaturePage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperFeaturePage.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:Maui.Controls.Sample"
              x:Class="Maui.Controls.Sample.StepperFeaturePage"
-             Title="StepperFeature">
+             Title="StepperFeature"
+             SafeAreaEdges="Container">
 
   <ContentPage.ToolbarItems>
     <ToolbarItem Text="Apply"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla30166.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla30166.cs
index 941c0b2922d6..d0e3106148c1 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla30166.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla30166.cs
@@ -14,6 +14,7 @@ public MainPage()
 			{
 				Navigation.PushAsync(new ContentPage
 				{
+					SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container),
 					Content = new Button
 					{
 						AutomationId = "PushModal",
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla30935.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla30935.cs
index 3d9ad116d687..35997e08696e 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla30935.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla30935.cs
@@ -8,6 +8,7 @@ public class Bugzilla30935 : TestContentPage
 		protected override void Init()
 		{
 			_entry = new Entry { AutomationId = "entry" };
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			// Initialize ui here instead of ctor
 			Content = new StackLayout
 			{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla31255.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla31255.cs
index 3d27f3692892..238d5a8abf5e 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla31255.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla31255.cs
@@ -21,7 +21,7 @@ public MainPage()
 					Text = "Page 1",
 					AutomationId = "MauiLabel"
 				});
-
+				SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 				Content = stack;
 
 			}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla43663.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla43663.cs
index d2f5ee5aa91b..5f31b0ff3c2b 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla43663.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla43663.cs
@@ -47,6 +47,7 @@ protected override void Init()
 		};
 
 		var modalPage = new ContentPage();
+		modalPage.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		modalPage.Content = new StackLayout
 		{
 			Children =
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla44476.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla44476.cs
index 10efe6ea79e5..11cc2455dac5 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla44476.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla44476.cs
@@ -13,6 +13,7 @@ public class MainPage : ContentPage
 			public MainPage()
 			{
 				BackgroundColor = Colors.Maroon;
+				SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 #pragma warning disable CS0618 // Type or member is obsolete
 				Navigation.PushAsync(new FlyoutPage
 				{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla57317.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla57317.cs
index 98962b426902..6bf88a5fdd60 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla57317.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla57317.cs
@@ -23,6 +23,7 @@ protected override void Init()
 		switchCell.ContextActions.Add(menuItem);
 		tableSection.Add(switchCell);
 		tableView.Root.Add(tableSection);
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Content = tableView;
 	}
 }
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla59580.cs b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla59580.cs
index a46f88830ff4..e28bbf2c5630 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla59580.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Bugzilla/Bugzilla59580.cs
@@ -26,6 +26,7 @@ protected override void Init()
 		switchCell.ContextActions.Add(menuItem);
 		tableSection.Add(switchCell);
 		tableView.Root.Add(tableSection);
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Content = tableView;
 	}
 }
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewRemoveAt.cs b/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewRemoveAt.cs
index 28ed14136812..eff893dd4076 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewRemoveAt.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/CarouselViewRemoveAt.cs
@@ -107,6 +107,7 @@ public CarouselViewRemoveAt()
 			grd.Children.Add(_carousel);
 			grd.Children.Add(btn);
 			grd.Children.Add(btnAdd);
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			Content = grd;
 #pragma warning disable CS0618 // Type or member is obsolete
 			MessagingCenter.Instance.Subscribe<Page>(this, "DeleteMe", Callback);
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/ContextActionCellTest.cs b/src/Controls/tests/TestCases.HostApp/Issues/ContextActionCellTest.cs
index e8f6ce5f61b5..52c9f3ca39f7 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/ContextActionCellTest.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/ContextActionCellTest.cs
@@ -8,6 +8,7 @@ public class ContextActionCellTest : TestContentPage
 
 	protected override void Init()
 	{
+		this.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		dataSection = new TableSection {
 			new TextCell{ Text = "Text Cell", ContextActions = { new MenuItem{ Text = "Save" } } },
 			new TextCell{ Text = "Text Cell 1" },
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/HiddenCollectionViewBind.cs b/src/Controls/tests/TestCases.HostApp/Issues/HiddenCollectionViewBind.cs
index 7b8335e5f1ae..16ed7f31b30c 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/HiddenCollectionViewBind.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/HiddenCollectionViewBind.cs
@@ -8,6 +8,7 @@ public class HiddenCollectionViewBind : ContentPage
 
 		public HiddenCollectionViewBind()
 		{
+			this.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			var cv = new CollectionView
 			{
 				IsVisible = false,
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15253.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue15253.cs
index 39794c7768fb..208fe6491f7a 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue15253.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15253.cs
@@ -9,6 +9,7 @@ public class Issue15253 : ContentPage
 	ObservableCollection<Model15253> Items;
 	public Issue15253()
 	{
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Items = new ObservableCollection<Model15253>();
 		Items.Add(new Model15253 { Name = "one", AutomationId = "15253One" });
 		Items.Add(new Model15253 { Name = "two", AutomationId = "15253Two" });
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue16787.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue16787.cs
index d94ad6c85a23..7125d4190e88 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue16787.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue16787.cs
@@ -35,7 +35,7 @@ protected override void Init()
 					Text = "The value below this label should be a 1. That's how many times the BindingContext has changed on the Templated element"
 				}
 			};
-
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			Content = cv;
 		}
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue17283.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue17283.xaml
index a0adb5ddcbb2..98b8d2ca4aa6 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue17283.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue17283.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-              x:Class="Maui.Controls.Sample.Issues.Issue17283">
+              x:Class="Maui.Controls.Sample.Issues.Issue17283"
+              SafeAreaEdges="Container">
 
   <VerticalStackLayout Padding="30,0"
                          Spacing="25"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue17400.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue17400.xaml
index f3f6f679de2e..135250ac6a78 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue17400.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue17400.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue17400"
              xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues"
-             Title="Issue 17400">
+             Title="Issue 17400"
+             SafeAreaEdges="Container">
     <Grid
         Padding="30,0"
         VerticalOptions="Center"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue17884.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue17884.xaml
index 835f8c186991..f580acd746bc 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue17884.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue17884.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Maui.Controls.Sample.Issues.Issue17884">
+             x:Class="Maui.Controls.Sample.Issues.Issue17884"
+             SafeAreaEdges="Container">
   <Label Text="CHAT MISSING_WORD"
          TextColor="Black"
          AutomationId="StubLabel"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18443.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue18443.xaml
index 4284c41ab3a4..51fb6eaf19c7 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue18443.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18443.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Maui.Controls.Sample.Issues.Issue18443">
+             x:Class="Maui.Controls.Sample.Issues.Issue18443"
+             SafeAreaEdges="Container">
 
   <Entry AutomationId="entry" x:Name="MauiEntry" Text="Microsoft Maui Entry" SelectionLength="5"  HeightRequest="75" Margin="{OnPlatform iOS=20}"></Entry>
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue1906.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue1906.cs
index 55c9989bf454..ae7a997a4ecb 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue1906.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue1906.cs
@@ -15,7 +15,7 @@ public MainPage()
 				{
 					await DisplayAlertAsync("Long Message", "Start - kajsd;lfkjals;kddfjkl;asdadjsf;lkasjdfl;kasjdf;lkajsd;flkjasd;flkjasd;lkdfjkakls;dfjkl;asdjfkl;asdjfl;kasdjadsfkl;asjdfl;kajadjs;flkjasdl;fklf;jas;dlkjf;alskdjdfakl;sddfjsakls;djfjl;aksdadfjsl;kasdjadsfl;kasdadfjskl;asjdfl;kasdjfl;kasdjfl;kasjdfl;kasjdfkl;asjdfl;kasjdfl;kasjdfl;kasjdfkl;ajsdl;kfkl;jsadkl;fjklasl;dkfjals;kdfjals;kdjfals;kdfalksjdflkajsd;lkfjasl;dkdfjk;alskdjdfjal;skjdfl;askjdfl;aksjdfakl;sdjfkl;asjdfkl;asjdfl;kajsdfl;kajsdfl;kajsdl;ffkl;jasdl;kkl;dfjadls;kdfjkals;kdjkadfsal;ksdjdfal;skddfjal;skdfjal;skdjfal;ksdfjakls;djdfakls;dfjl;askdfjal;skdjfakls;dfjkajsd;lfkjals;kddfjkl;asdadjsf;lkasjdfl;kasjdf;lkajsd;flkjasd;flkjasd;lkdfjkakls;dfjkl;asdjfkl;asdjfl;kasdjadsfkl;asjdfl;kajadjs;flkjasdl;fklf;jas;dlkjf;alskdjdfakl;sddfjsakls;djfjl;aksdadfjsl;kasdjadsfl;kasdadfjskl;asjdfl;kasdjfl;kasdjfl;kasjdfl;kasjdfkl;asjdfl;kasjdfl;kasjdfl;kasjdfkl;ajsdl;kfkl;jsadkl;fjklasl;dkfjals;kdfjals;kdjfals;kdfalksjdflkajsd;lkfjasl;dkdfjk;alskdjdfjal;skjdfl;askjdfl;aksjdfakl;sdjfkl;asjdfkl;asjdfl;kajsdfl;kajsdfl;kajsdl;ffkl;jasdl;kkl;dfjadls;kdfjkals;kdjkadfsal;ksdjdfal;skddfjal;skdfjal;skdjfal;ksdfjakls;djdfakls;dfjl;askdfjal;skdjfakls;dfjkajsd;lfkjals;kddfjkl;asdadjsf;lkasjdfl;kasjdf;lkajsd;flkjasd;flkjasd;lkdfjkakls;dfjkl;asdjfkl;asdjfl;kasdjadsfkl;asjdfl;kajadjs;flkjasdl;fklf;jas;dlkjf;alskdjdfakl;sddfjsakls;djfjl;aksdadfjsl;kasdjadsfl;kasdadfjskl;asjdfl;kasdjfl;kasdjfl;kasjdfl;kasjdfkl;asjdfl;kasjdfl;kasjdfl;kasjdfkl;ajsdl;kfkl;jsadkl;fjklasl;dkfjals;kdfjals;kdjfals;kdfalksjdflkajsd;lkfjasl;dkdfjk;alskdjdfjal;skjdfl;askjdfl;aksjdfakl;sdjfkl;asjdfkl;asjdfl;kajsdfl;kajsdfl;kajsdl;ffkl;jasdl;kkl;dfjadls;kdfjkals;kdjkadfsal;ksdjdfal;skddfjal;skdfjal;skdjfal;ksdfjakls;djdfakls;dfjl;askdfjal;skdjfakls;dfjkajsd;lfkjals;kddfjkl;asdadjsf;lkasjdfl;kasjdf;lkajsd;flkjasd;flkjasd;lkdfjkakls;dfjkl;asdjfkl;asdjfl;kasdjadsfkl;asjdfl;kajadjs;flkjasdl;fklf;jas;dlkjf;alskdjdfakl;sddfjsakls;djfjl;aksdadfjsl;kasdjadsfl;kasdadfjskl;asjdfl;kasdjfl;kasdjfl;kasjdfl;kasjdfkl;asjdfl;kasjdfl;kasjdfl;kasjdfkl;ajsdl;kfkl;jsadkl;fjklasl;dkfjals;kdfjals;kdjfals;kdfalksjdflkajsd;lkfjasl;dkdfjk;alskdjdfjal;skjdfl;askjdfl;aksjdfakl;sdjfkl;asjdfkl;asjdfl;kajsdfl;kajsdfl;kajsdl;ffkl;jasdl;kkl;dfjadls;kdfjkals;kdjkadfsal;ksdjdfal;skddfjal;skdfjal;skdjfal;ksdfjakls;djdfakls;dfjl;askdfjal;skdjfakls;dfjkajsd;lfkjals;kddfjkl;asdadjsf;lkasjdfl;kasjdf;lkajsd;flkjasd;flkjasd;lkdfjkakls;dfjkl;asdjfkl;asdjfl;kasdjadsfkl;asjdfl;kajadjs;flkjasdl;fklf;jas;dlkjf;alskdjdfakl;sddfjsakls;djfjl;aksdadfjsl;kasdjadsfl;kasdadfjskl;asjdfl;kasdjfl;kasdjfl;kasjdfl;kasjdfkl;asjdfl;kasjdfl;kasjdfl;kasjdfkl;ajsdl;kfkl;jsadkl;fjklasl;dkfjals;kdfjals;kdjfals;kdfalksjdflkajsd;lkfjasl;dkdfjk;alskdjdfjal;skjdfl;askjdfl;aksjdfakl;sdjfkl;asjdfkl;asjdfl;kajsdfl;kajsdfl;kajsdl;ffkl;jasdl;kkl;dfjadls;kdfjkals;kdjkadfsal;ksdjdfal;skddfjal;skdfjal;skdjfal;ksdfjakls;djdfakls;dfjl;askdfjal;skdjfakls;dfjkajsd;lfkjals;kddfjkl;asdadjsf;lkasjdfl;kasjdf;lkajsd;flkjasd;flkjasd;lkdfjkakls;dfjkl;asdjfkl;asdjfl;kasdjadsfkl;asjdfl;kajadjs;flkjasdl;fklf;jas;dlkjf;alskdjdfakl;sddfjsakls;djfjl;aksdadfjsl;kasdjadsfl;kasdadfjskl;asjdfl;kasdjfl;kasdjfl;kasjdfl;kasjdfkl;asjdfl;kasjdfl;kasjdfl;kasjdfkl;ajsdl;kfkl;jsadkl;fjklasl;dkfjals;kdfjals;kdjfals;kdfalksjdflkajsd;lkfjasl;dkdfjk;alskdjdfjal;skjdfl;askjdfl;aksjdfakl;sdjfkl;asjdfkl;asjdfl;kajsdfl;kajsdfl;kajsdl;ffkl;jasdl;kkl;dfjadls;kdfjkals;kdjkadfsal;ksdjdfal;skddfjal;skdfjal;skdjfal;ksdfjakls;djdfakls;dfjl;askdfjal;skdjfakls;dfjkajsd;lfkjals;kddfjkl;asdadjsf;lkasjdfl;kasjdf;lkajsd;flkjasd;flkjasd;lkdfjkakls;dfjkl;asdjfkl;asdjfl;kasdjadsfkl;asjdfl;kajadjs;flkjasdl;fklf;jas;dlkjf;alskdjdfakl;sddfjsakls;djfjl;aksdadfjsl;kasdjadsfl;kasdadfjskl;asjdfl;kasdjfl;kasdjfl;kasjdfl;kasjdfkl;asjdfl;kasjdfl;kasjdfl;kasjdfkl;ajsdl;kfkl;jsadkl;fjklasl;dkfjals;kdfjals;kdjfals;kdfalksjdflkajsd;lkfjasl;dkdfjk;alskdjdfjal;skjdfl;askjdfl;aksjdfakl;sdjfkl;asjdfkl;asjdfl;kajsdfl;kajsdfl;kajsdl;ffkl;jasdl;kkl;dfjadls;kdfjkals;kdjkadfsal;ksdjdfal;skddfjal;skdfjal;skdjfal;ksdfjakls;djdfakls;dfjl;askdfjal;skdjfakls;dfjkajsd;lfkjals;kddfjkl;asdadjsf;lkasjdfl;kasjdf;lkajsd;flkjasd;flkjasd;lkdfjkakls;dfjkl;asdjfkl;asdjfl;kasdjadsfkl;asjdfl;kajadjs;flkjasdl;fklf;jas;dlkjf;alskdjdfakl;sddfjsakls;djfjl;aksdadfjsl;kasdjadsfl;kasdadfjskl;asjdfl;kasdjfl;kasdjfl;kasjdfl;kasjdfkl;asjdfl;kasjdfl;kasjdfl;kasjdfkl;ajsdl;kfkl;jsadkl;fjklasl;dkfjals;kdfjals;kdjfals;kdfalksjdflkajsd;lkfjasl;dkdfjk;alskdjdfjal;skjdfl;askjdfl;aksjdfakl;sdjfkl;asjdfkl;asjdfl;kajsdfl;kajsdfl;kajsdl;ffkl;jasdl;kkl;dfjadls;kdfjkals;kdjkadfsal;ksdjdfal;skddfjal;skdfjal;skdjfal;ksdfjakls;djdfakls;dfjl;askdfjal;skdjfakls;dfjkajsd;lfkjals;kddfjkl;asdadjsf;lkasjdfl;kasjdf;lkajsd;flkjasd;flkjasd;lkdfjkakls;dfjkl;asdjfkl;asdjfl;kasdjadsfkl;asjdfl;kajadjs;flkjasdl;fklf;jas;dlkjf;alskdjdfakl;sddfjsakls;djfjl;aksdadfjsl;kasdjadsfl;kasdadfjskl;asjdfl;kasdjfl;kasdjfl;kasjdfl;kasjdfkl;asjdfl;kasjdfl;kasjdfl;kasjdfkl;ajsdl;kfkl;jsadkl;fjklasl;dkfjals;kdfjals;kdjfals;kdfalksjdflkajsd;lkfjasl;dkdfjk;alskdjdfjal;skjdfl;askjdfl;aksjdfakl;sdjfkl;asjdfkl;asjdfl;kajsdfl;kajsdfl;kajsdl;ffkl;jasdl;kkl;dfjadls;kdfjkals;kdjkadfsal;ksdjdfal;skddfjal;skdfjal;skdjfal;ksdfjakls;djdfakls;dfjl;askdfjal;skdjfakls;dfj - End", "Ok", "Cancel");
 				};
-
+				SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 				Content = btn;
 			}
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue19191.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue19191.xaml
index e0648c308b26..4181f3fd0e62 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue19191.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue19191.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue19191"
-             Title="Issue19191">
+             Title="Issue19191"
+             SafeAreaEdges="Container">
     <Picker TitleColor="Red"
             AutomationId="picker"
             Title="This is a picker"/>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue19496.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue19496.cs
index ed230d70a105..4af72115b171 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue19496.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue19496.cs
@@ -18,6 +18,7 @@ protected override void Init()
 			};
 
 			ContentPage contentPage = new ContentPage();
+			contentPage.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 
 			contentPage.Content = new Button()
 			{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue20250.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue20250.cs
index f9334ee9a185..7ef8f2318bbe 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue20250.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue20250.cs
@@ -22,6 +22,7 @@ class Issue20250ContentPage : ContentPage
 	{
 		public Issue20250ContentPage()
 		{
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			Shell.SetSearchHandler(this, new SearchHandler
 			{
 				AutomationId = "searchHandler",
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue20439.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue20439.xaml
index 5213dd5a635a..cc77ddf390f8 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue20439.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue20439.xaml
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Shell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Maui.Controls.Sample.Issues.Issue20439"
-             xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
+       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+       x:Class="Maui.Controls.Sample.Issues.Issue20439"
+       xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
     <ShellContent
-            Title="Home">
-            <ContentPage>
-                <StackLayout VerticalOptions="Center">
-                    <Entry AutomationId="entry" Text="Tap here"/>
-                    <Button AutomationId="button" Text="Open the input page" Clicked="Button_Clicked"/>
-                </StackLayout>
-            </ContentPage>
-        </ShellContent>
+        Title="Home">
+        <ContentPage SafeAreaEdges="Container">
+            <StackLayout VerticalOptions="Center">
+                <Entry AutomationId="entry"
+                        Text="Tap here"/>
+                <Button AutomationId="button"
+                        Text="Open the input page"
+                        Clicked="Button_Clicked"/>
+            </StackLayout>
+        </ContentPage>
+    </ShellContent>
 
-        <ShellContent
-            Title="Text input page">
-            <ContentPage>
-                   <Editor VerticalOptions="Center"
-                           AutomationId="editor"
-                           HeightRequest="100"
-                           Text="Potential auto correcting words: -- :-) ... omw \n" />
-            </ContentPage>
-        </ShellContent>
+    <ShellContent
+        Title="Text input page">
+        <ContentPage SafeAreaEdges="Container">
+            <Editor VerticalOptions="Center"
+                    AutomationId="editor"
+                    HeightRequest="100"
+                    Text="Potential auto correcting words: -- :-) ... omw \n"/>
+        </ContentPage>
+    </ShellContent>
 </Shell>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21173.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21173.xaml
index 150da2f79c90..bf41db6aac6a 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21173.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21173.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue21173"
-             Title="Issue21173">
+             Title="Issue21173"
+             SafeAreaEdges="Container">
 
     <StackLayout Spacing="10" VerticalOptions="Center">
         <Border WidthRequest="100"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22042.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22042.xaml
index e1bef70c51a4..07dc6a43c6e2 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue22042.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22042.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue22042"
-             Title="Issue22042">
+             Title="Issue22042"
+             SafeAreaEdges="Container">
 
     <ContentPage.Resources>
         <RadialGradientBrush x:Key="PurpleGradiant"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml
index 6ae3c2fac3bd..2f5dca88b362 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue22306"
-             Title="Issue22306">
+             Title="Issue22306"
+             SafeAreaEdges="Container">
     <Grid RowSpacing="5" AutomationId="TopGrid">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" x:Name="RowAbove"/>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22750.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22750.xaml
index 2f34c231fdb1..35774bfa6f9f 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue22750.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22750.xaml
@@ -3,7 +3,8 @@
   xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
   x:Class="Maui.Controls.Sample.Issues.Issue22750"
-  xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
+  xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues"
+  SafeAreaEdges="Container">
   <Border 
     Padding="15,10,0,0">
     <Border.Shadow>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue23488.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue23488.xaml
index d0a2a84c6a40..cc8d9bc1475d 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue23488.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue23488.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Maui.Controls.Sample.Issues.Issue23488">
+             x:Class="Maui.Controls.Sample.Issues.Issue23488"
+             SafeAreaEdges="Container">
 
   <StackLayout HorizontalOptions="Center"
                VerticalOptions="Center">
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24516.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue24516.xaml
index df0e9042cec7..430d572794d0 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue24516.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24516.xaml
@@ -2,7 +2,8 @@
 <ContentPage
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Maui.Controls.Sample.Issues.Issue24516">
+    x:Class="Maui.Controls.Sample.Issues.Issue24516"
+    SafeAreaEdges="Container">
 
   <StackLayout Spacing="20" 
                VerticalOptions="Center" 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25468.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25468.xaml
index 6dba97351fd7..20bac203898c 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25468.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25468.xaml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             SafeAreaEdges="Container"
              x:Class="Maui.Controls.Sample.Issues.Issue25468">
   <CollectionView
     VerticalScrollBarVisibility="Always"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25912.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25912.xaml
index c60b25a1ee4d..5b11099f4d57 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25912.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25912.xaml
@@ -2,7 +2,8 @@
 <controls:TestContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
 			 xmlns:controls="clr-namespace:Maui.Controls.Sample.Issues"
-             x:Class="Maui.Controls.Sample.Issues.Issue25912MainPage">
+             x:Class="Maui.Controls.Sample.Issues.Issue25912MainPage"
+			 SafeAreaEdges="Container">
 
 			 <ContentPage.ToolbarItems>
 				<ToolbarItem x:Name="toolbarItem" IconImageSource="{FontImage Glyph='+',Color=Red,Size=30}"/>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25943.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25943.xaml
index 1789b45f0217..a779f855563a 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25943.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25943.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue25943"
-             xmlns:controls="clr-namespace:Maui.Controls.Sample.Issues" 
+             SafeAreaEdges="Container"
+             xmlns:controls="clr-namespace:Maui.Controls.Sample.Issues"
              x:DataType="controls:_25943MainPageViewModel">
   <VerticalStackLayout Padding="30,0" Spacing="25">
     <DatePicker HorizontalOptions="Center" VerticalOptions="Center"  AutomationId="DatePicker" Date="{Binding Date}" MaximumDate="{Binding MaxDate}" MinimumDate="{Binding MinDate}"></DatePicker>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26662.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue26662.xaml.cs
index e826e9862453..27e95ef6547a 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue26662.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26662.xaml.cs
@@ -14,6 +14,7 @@ public class Issue26662Tab1 : ContentPage
 	{
 		public Issue26662Tab1()
 		{
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			//If no FontImageSource color is given, tab icon should be applied based on the SelectedTabColor and UnselectedTabColor.
 			IconImageSource = new FontImageSource
 			{
@@ -55,6 +56,7 @@ public class Issue26662Tab2 : ContentPage
 	{
 		public Issue26662Tab2()
 		{
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			//The FontImageSource color is given. So, the tab icon color should be applied based solely on the given color, regardless of the selected tab or unselected tab color.
 			IconImageSource = new FontImageSource
 			{
@@ -84,7 +86,7 @@ public class Issue26662Tab3 : ContentPage
 	{
 		public Issue26662Tab3()
 		{
-			//The FontImageSource color is given. So, the icon color should be applied based solely on the given color, regardless of the selected tab or unselected tab color.
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			IconImageSource = new FontImageSource
 			{
 				FontFamily = "Ion",
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue27474.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue27474.cs
index ee6d6f074475..d41431d72cd1 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue27474.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue27474.cs
@@ -5,6 +5,7 @@ public class Issue27474 : ContentPage
 {
 	public Issue27474()
 	{
+		this.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Content = new Picker
 		{
 			AutomationId = "Picker",
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue27519.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue27519.cs
index 804f8c7933ab..a019d96c96ab 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue27519.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue27519.cs
@@ -5,6 +5,7 @@ public class Issue27519 : ContentPage
 	{
 		public Issue27519()
 		{
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			var items = new List<string>
 			{
 				"1: First", "2: Second", "3: Third", "4: Fourth", "5: Fifth" ,
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue27803.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue27803.xaml
index 5511a5d62d86..37d4e2b6a1a1 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue27803.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue27803.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue27803"
-             Title="Issue27803">
+             Title="Issue27803"
+             SafeAreaEdges="Container">
     <VerticalStackLayout VerticalOptions="Center"
                          HorizontalOptions="Center"
                          Spacing="20">
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28634.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28634.cs
index 3397fa26a9bf..bf07b52bd030 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28634.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28634.cs
@@ -22,7 +22,7 @@ class Issue28634ContentPage : ContentPage
 	{
 		public Issue28634ContentPage()
 		{
-
+			this.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			var searchHandler = new SearchHandler
 			{
 				Placeholder = "Type a fruit name to search",
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28838.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28838.cs
index b27de8c93f56..49665d19a37b 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28838.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28838.cs
@@ -19,6 +19,7 @@ public class Issue28838Tab1 : ContentPage
 {
 	public Issue28838Tab1()
 	{
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Title = "Tab 1";
 		var verticalStackLayout = new VerticalStackLayout
 		{
@@ -40,6 +41,7 @@ public class Issue28838Tab2 : ContentPage
 {
 	public Issue28838Tab2()
 	{
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Title = "Tab 2";
 		var verticalStackLayout = new VerticalStackLayout
 		{
@@ -59,6 +61,7 @@ public class Issue28838Tab3 : ContentPage
 {
 	public Issue28838Tab3()
 	{
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Title = "Tab 3";
 		var verticalStackLayout = new VerticalStackLayout
 		{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue29086.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue29086.xaml
index 186c22ca4ba9..270cbaeeed2e 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue29086.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue29086.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Name="Self"
-             x:Class="Maui.Controls.Sample.Issues.Issue29086">
+             x:Class="Maui.Controls.Sample.Issues.Issue29086"
+             SafeAreaEdges="Container">
     <CollectionView ItemsSource="{Binding Numbers}"
                     Margin="60">
         <CollectionView.ItemTemplate>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue29109.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue29109.cs
index c3390766e59c..5c88825b84d6 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue29109.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue29109.cs
@@ -59,6 +59,7 @@ public Issue29109Tab1()
 
 		};
 		Content = verticalStackLayout;
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 	}
 }
 
@@ -89,6 +90,7 @@ public Issue29109Tab2()
 					}
 		};
 		Content = verticalStackLayout;
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 	}
 }
 public class Issue29109Tab3 : ContentPage
@@ -118,5 +120,6 @@ public Issue29109Tab3()
 					}
 		};
 		Content = verticalStackLayout;
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 	}
 }
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue29499.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue29499.cs
index b9fab65f1411..fbe5c3bb0252 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue29499.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue29499.cs
@@ -13,6 +13,7 @@ public class Issue29499Page : ContentPage
 	{
 		public Issue29499Page()
 		{
+			this.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			SetForegroundColor(this, Colors.Red);
 			ToolbarItems.Add(new ToolbarItem { Text = "Item1", Order = ToolbarItemOrder.Secondary });
 			ToolbarItems.Add(new ToolbarItem { Text = "Item2", Order = ToolbarItemOrder.Secondary });
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue29609.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue29609.cs
index e47375326049..5ca96540d776 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue29609.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue29609.cs
@@ -8,6 +8,7 @@ public class Issue29609 : ContentPage
 	Issue29609_ViewModel ViewModel;
 	public Issue29609()
 	{
+		this.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		ViewModel = new Issue29609_ViewModel();
 		BindingContext = ViewModel;
 		var stack = new StackLayout
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue29661.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue29661.cs
index c0fb21b19198..6af9701f1a67 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue29661.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue29661.cs
@@ -7,6 +7,7 @@ public class Issue29661 : ContentPage
 {
 	public Issue29661()
 	{
+		this.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		var label = new Label
 		{
 			Text = "Test for Border with StrokeDashArray",
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue7371.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue7371.cs
index 2331af36006c..76e1c2a05456 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue7371.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue7371.cs
@@ -6,6 +6,7 @@ public class Issue7371 : TestContentPage
 		ListView ListView => Content as ListView;
 		protected override void Init()
 		{
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			Content = new ListView();
 		}
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8004.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue8004.cs
index 188a6dcf6d4d..572d15f712b7 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8004.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8004.cs
@@ -47,7 +47,7 @@ protected override void Init()
 			grid.Children.Add(label);
 			grid.Children.Add(_boxView);
 			grid.Children.Add(button);
-
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			Content = grid;
 		}
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8295.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue8295.xaml
index c9fe766e7dda..79b13b5365e0 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8295.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8295.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue8295_ContentPage"
-             x:Name="MPage">
+             x:Name="MPage"
+             SafeAreaEdges="Container">
 
   <ContentPage.ToolbarItems>
     <ToolbarItem Text="Edit">
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue935.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue935.cs
index b99cd4e740ec..14e6ee01a178 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue935.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue935.cs
@@ -58,7 +58,7 @@ protected override void Init()
 				ItemTemplate = cellTemplate,
 				ItemsSource = items
 			};
-
+			SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 			Content = list;
 		}
 	}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issues18111.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issues18111.xaml
index 0339054e0af8..06164e20f808 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issues18111.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issues18111.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              Title="Issue 18111"
-             x:Class="Maui.Controls.Sample.Issues.Issue18111">
+             x:Class="Maui.Controls.Sample.Issues.Issue18111"
+             SafeAreaEdges="Container">
     <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center" Spacing="20">
         <Slider
             AutomationId="WaitForSliderControl"
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/SwipeViewUITest.cs b/src/Controls/tests/TestCases.HostApp/Issues/SwipeViewUITest.cs
index 2d22c54ff27a..04b051db7538 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/SwipeViewUITest.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/SwipeViewUITest.cs
@@ -5,6 +5,7 @@ public partial class SwipeViewUITest : ContentPage
 {
 	public SwipeViewUITest()
 	{
+		this.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 
 		SwipeItem favoriteSwipeItem = new SwipeItem
 		{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue13203.cs b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue13203.cs
index bb3b582e59d3..44e2f208f3a7 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue13203.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue13203.cs
@@ -23,7 +23,7 @@ protected override void Init()
 
 		var source = new List<Item> { new Item { Text = Success } };
 		cv.ItemsSource = source;
-
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Content = cv;
 
 		Appearing += (sender, args) => { cv.IsVisible = true; };
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1323.cs b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1323.cs
index afc5c89b4136..d3873a9970be 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1323.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1323.cs
@@ -10,7 +10,7 @@ protected override void Init()
 		BarTextColor = Color.FromArgb("#ffffff");
 		BackgroundColor = Color.FromArgb("#61a60e");
 
-		var page = new ContentPage { Title = "Page 1", Content = new Button { Text = "Pop", Command = new Command(async () => await Navigation.PopModalAsync()) } };
+		var page = new ContentPage { SafeAreaEdges = new (SafeAreaRegions.Container), Title = "Page 1", Content = new Button { Text = "Pop", Command = new Command(async () => await Navigation.PopModalAsync()) } };
 		var page2 = new ContentPage { Title = "Page 2" };
 		var page3 = new ContentPage { Title = "Page 3" };
 		var page4 = new ContentPage { Title = "Page 4" };
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1414.cs b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1414.cs
index 58f1d33471ff..42bdfb3ef75e 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1414.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue1414.cs
@@ -55,7 +55,7 @@ protected override void Init()
 
 			tableView.Root.Add(section);
 		}
-
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Content = tableView;
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue21728.xaml b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue21728.xaml
index 09fac4d85cef..a6471c1abcdf 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue21728.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue21728.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue21728"
-             xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
+             xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues"
+			 SafeAreaEdges="Container">
   <CollectionView x:Name="collectionview" AutomationId="collectionview" ItemsLayout="VerticalGrid, 2">
 		<CollectionView.ItemTemplate>
 			<DataTemplate>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue2927.cs b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue2927.cs
index b15b1c1f18b6..6ef47d69b134 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue2927.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue2927.cs
@@ -52,7 +52,7 @@ protected override void Init()
 			var obj = (Issue2927Cell)e.Item;
 			obj.NumberOfTimesTapped += 1;
 		};
-
+		SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 		Content = listView;
 	}
 }
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue8186.cs b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue8186.cs
index b6a7f798ad51..67c1420eee1b 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue8186.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue8186.cs
@@ -25,6 +25,7 @@ protected override void Init()
 						{
 							Navigation.PushAsync(new ContentPage()
 							{
+								SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container),
 								Content = new Button()
 								{
 									Text = "Pop Page",
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue9711.xaml b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue9711.xaml
index b58c1b43cbb2..7316e708d2e7 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue9711.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/XFIssue/Issue9711.xaml
@@ -2,10 +2,10 @@
 
 <controls:TestContentPage
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:controls="clr-namespace:Maui.Controls.Sample.Issues"
-             x:Class="Maui.Controls.Sample.Issues.Issue9711"
-             >
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:Maui.Controls.Sample.Issues"
+    SafeAreaEdges="Container"
+    x:Class="Maui.Controls.Sample.Issues.Issue9711">
     <ListView x:Name="TestListView"
               IsGroupingEnabled="True"
               CachingStrategy="RecycleElement"
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderColorShouldChange.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderColorShouldChange.png
index 109a53770f54..418dbfa64a22 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderColorShouldChange.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderColorShouldChange.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png
index 82f656d7fd78..e712f1b095d7 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWithRoundRectangleShouldRoundCornersOfContentWithinIt.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_PaddingWithContent_Label.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_PaddingWithContent_Label.png
index e898c404d397..b1efad8590b3 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_PaddingWithContent_Label.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_PaddingWithContent_Label.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_Shadow.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_Shadow.png
index 0787eda6f9d6..ab1c7f962c1b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_Shadow.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_Shadow.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithPaddingAndContent_Image.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithPaddingAndContent_Image.png
index 98c41cb8f2a3..22a1bc09f98a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithPaddingAndContent_Image.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithPaddingAndContent_Image.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeShape_RoundRectangle.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeShape_RoundRectangle.png
index 31e9c4367962..84574135ae9b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeShape_RoundRectangle.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeShape_RoundRectangle.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeThickness.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeThickness.png
index ab0056651039..d1b988b92957 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeThickness.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeColorWithStrokeThickness.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeShapeWithStrokeThickness_Ellipse.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeShapeWithStrokeThickness_Ellipse.png
index 9c573041d664..9f74023e10bf 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeShapeWithStrokeThickness_Ellipse.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Border_StrokeShapeWithStrokeThickness_Ellipse.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla30166Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla30166Test.png
index e75e5b307fdd..b8af8cf8269b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla30166Test.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Bugzilla30166Test.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CarouselViewShouldScrollToRightPosition.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CarouselViewShouldScrollToRightPosition.png
index 45e7f245e4bf..434ad2893ccc 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CarouselViewShouldScrollToRightPosition.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CarouselViewShouldScrollToRightPosition.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewSingleItemAlignmentWithFooter.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewSingleItemAlignmentWithFooter.png
index 722bc7f8fd48..f96983b30bc8 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewSingleItemAlignmentWithFooter.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CollectionViewSingleItemAlignmentWithFooter.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ContentPage_zContent.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ContentPage_zContent.png
index 586016cc4665..1bcb5300cd4a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ContentPage_zContent.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ContentPage_zContent.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DatePickerTextColorShouldUpdate.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DatePickerTextColorShouldUpdate.png
index 225f8bf4653d..b482c88f82b7 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DatePickerTextColorShouldUpdate.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DatePickerTextColorShouldUpdate.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DefaultSelectedTabTextColorShouldApplyProperly.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DefaultSelectedTabTextColorShouldApplyProperly.png
index a5cee42cd6f8..00df91885519 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DefaultSelectedTabTextColorShouldApplyProperly.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DefaultSelectedTabTextColorShouldApplyProperly.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DynamicFontImageSourceColorShouldApplyOnTabIcon.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DynamicFontImageSourceColorShouldApplyOnTabIcon.png
index fa73caac7e77..4d0248d52872 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DynamicFontImageSourceColorShouldApplyOnTabIcon.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/DynamicFontImageSourceColorShouldApplyOnTabIcon.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntrySelectionLengthRuntimeUpdate.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntrySelectionLengthRuntimeUpdate.png
index 2fd47a29511d..b1c60e7d1b5c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntrySelectionLengthRuntimeUpdate.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntrySelectionLengthRuntimeUpdate.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FlyoutItemTextShouldDisplayProperly.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FlyoutItemTextShouldDisplayProperly.png
index 6920e5a77a5b..7c5f887586c2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FlyoutItemTextShouldDisplayProperly.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FlyoutItemTextShouldDisplayProperly.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FontImageSourceColorShouldApplyOnTabIcon.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FontImageSourceColorShouldApplyOnTabIcon.png
index 9f0f9b0c6915..5ffea2ef2f3f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FontImageSourceColorShouldApplyOnTabIcon.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/FontImageSourceColorShouldApplyOnTabIcon.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalScrollBarShouldHideOnNever.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalScrollBarShouldHideOnNever.png
index c4c925f0d653..fb99a9ee0f74 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalScrollBarShouldHideOnNever.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/HorizontalScrollBarShouldHideOnNever.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue1323Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue1323Test.png
index 9917bac091a3..100e3b9ef0ea 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue1323Test.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue1323Test.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LabelHyperlinkUnderlineColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LabelHyperlinkUnderlineColor.png
index d843d7ca66f3..b51a4cb6f7d8 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LabelHyperlinkUnderlineColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LabelHyperlinkUnderlineColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButtonUpdateValueInsideBorderNo.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButtonUpdateValueInsideBorderNo.png
index ba0b32a2d2fa..1a5c051b5e00 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButtonUpdateValueInsideBorderNo.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButtonUpdateValueInsideBorderNo.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButtonUpdateValueInsideBorderYes.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButtonUpdateValueInsideBorderYes.png
index a262847a7f77..cf3242bdbf0f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButtonUpdateValueInsideBorderYes.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/RadioButtonUpdateValueInsideBorderYes.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks.png
index e40fec8812fa..66ee5a17177a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SwipeViewShouldNotClose.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SwipeViewShouldNotClose.png
index 204123af97bd..93a7d720c285 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SwipeViewShouldNotClose.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SwipeViewShouldNotClose.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarItemFontIconSourceChangesAtRunTime.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarItemFontIconSourceChangesAtRunTime.png
index eaa73b9bec5c..52db50ccfb44 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarItemFontIconSourceChangesAtRunTime.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ToolbarItemFontIconSourceChangesAtRunTime.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyBorderWithStrokeDashArray.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyBorderWithStrokeDashArray.png
index 5f1f72430763..4d643496cd84 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyBorderWithStrokeDashArray.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyBorderWithStrokeDashArray.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLabelTextColorWhenResettingFromFormattedText.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLabelTextColorWhenResettingFromFormattedText.png
index b893a93f7d09..fae4a3e5f54d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLabelTextColorWhenResettingFromFormattedText.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyLabelTextColorWhenResettingFromFormattedText.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySearchHandlerClearPlaceholderIconColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySearchHandlerClearPlaceholderIconColor.png
index df515fd55ce5..a1854e8ec2de 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySearchHandlerClearPlaceholderIconColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySearchHandlerClearPlaceholderIconColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySearchHandlerPlaceholderText.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySearchHandlerPlaceholderText.png
index 3de7d7a381ec..1cf58e1c6748 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySearchHandlerPlaceholderText.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySearchHandlerPlaceholderText.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySpacingAffectsItemSize.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySpacingAffectsItemSize.png
index 53557ac910b6..1e605d6a92f2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySpacingAffectsItemSize.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySpacingAffectsItemSize.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySwipeViewApperance.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySwipeViewApperance.png
index a30e162afb0c..6dd0af8f2463 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySwipeViewApperance.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifySwipeViewApperance.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextIsNotMissing.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextIsNotMissing.png
index e9f6079f7db2..9cf319b6cccc 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextIsNotMissing.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextIsNotMissing.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarItemIconColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarItemIconColor.png
index ff3cc6c1166c..d0a9f672e61b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarItemIconColor.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarItemIconColor.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/WebViewShouldNotMirrored.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/WebViewShouldNotMirrored.png
index 2601c2ffb60b..2e05a1b747fb 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/WebViewShouldNotMirrored.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/WebViewShouldNotMirrored.png differ
diff --git a/src/Core/src/Platform/Android/SafeAreaExtensions.cs b/src/Core/src/Platform/Android/SafeAreaExtensions.cs
index 06a5b982d9aa..5c029196975a 100644
--- a/src/Core/src/Platform/Android/SafeAreaExtensions.cs
+++ b/src/Core/src/Platform/Android/SafeAreaExtensions.cs
@@ -9,12 +9,12 @@ namespace Microsoft.Maui.Platform;
 internal static class SafeAreaExtensions
 {
     internal static ISafeAreaView2? GetSafeAreaView2(object? layout) =>
-                layout switch
-                {
-                    ISafeAreaView2 sav2 => sav2,
-                    IElementHandler { VirtualView: ISafeAreaView2 virtualSav2 } => virtualSav2,
-                    _ => null
-                };
+        layout switch
+        {
+            ISafeAreaView2 sav2 => sav2,
+            IElementHandler { VirtualView: ISafeAreaView2 virtualSav2 } => virtualSav2,
+            _ => null
+        };
 
     internal static ISafeAreaView? GetSafeAreaView(object? layout) =>
         layout switch
@@ -52,6 +52,7 @@ internal static SafeAreaRegions GetSafeAreaRegionForEdge(int edge, ICrossPlatfor
 
         var layout = crossPlatformLayout;
         var safeAreaView2 = GetSafeAreaView2(layout);
+        var margins = (safeAreaView2 as IView)?.Margin ?? Thickness.Zero;
 
         if (safeAreaView2 is not null)
         {
@@ -82,7 +83,10 @@ internal static SafeAreaRegions GetSafeAreaRegionForEdge(int edge, ICrossPlatfor
             // Check intersection with view bounds to determine which edges actually need padding
             // If we don't have any tracked views yet we will find the first view to pad
             // in order to limit duplicate measures
-            if ((view.MeasuredHeight > 0 && view.MeasuredWidth > 0) || !hasTrackedViews)
+            var viewWidth = view.Width > 0 ? view.Width : view.MeasuredWidth;
+            var viewHeight = view.Height > 0 ? view.Height : view.MeasuredHeight;
+
+            if ((viewHeight > 0 && viewWidth > 0) || !hasTrackedViews)
             {
                 if (left == 0 && right == 0 && top == 0 && bottom == 0)
                 {
@@ -95,8 +99,22 @@ internal static SafeAreaRegions GetSafeAreaRegionForEdge(int edge, ICrossPlatfor
                 view.GetLocationOnScreen(viewLocation);
                 var viewLeft = viewLocation[0];
                 var viewTop = viewLocation[1];
-                var viewRight = viewLeft + view.MeasuredWidth;
-                var viewBottom = viewTop + view.MeasuredHeight;
+                var viewRight = viewLeft + viewWidth;
+                var viewBottom = viewTop + viewHeight;
+
+                // Adjust for view's position relative to parent (including margins) to calculate
+                // safe area insets relative to the parent's position, not the view's visual position.
+                // This ensures margins and safe area insets are additive rather than overlapping.
+                // For example: 20px margin + 30px safe area = 50px total offset
+                // We only take the margins into account if the Width and Height are set
+                // If the Width and Height aren't set it means the layout pass hasn't happen yet
+                if (view.Width > 0 && view.Height > 0)
+                {
+                    viewTop = Math.Max(0, viewTop - (int)context.ToPixels(margins.Top));
+                    viewLeft = Math.Max(0, viewLeft - (int)context.ToPixels(margins.Left));
+                    viewRight += (int)context.ToPixels(margins.Right);
+                    viewBottom += (int)context.ToPixels(margins.Bottom);
+                }
 
                 // Get actual screen dimensions (including system UI)
                 var windowManager = context.GetSystemService(Context.WindowService) as IWindowManager;
@@ -118,7 +136,7 @@ internal static SafeAreaRegions GetSafeAreaRegionForEdge(int edge, ICrossPlatfor
                     }
                     else
                     {
-                        if (view.MeasuredHeight > 0 || hasTrackedViews)
+                        if (viewHeight > 0 || hasTrackedViews)
                             top = 0;
                     }
 
@@ -133,7 +151,7 @@ internal static SafeAreaRegions GetSafeAreaRegionForEdge(int edge, ICrossPlatfor
                     {
                         // if the view height is zero because it hasn't done the first pass
                         // and we don't have any tracked views yet then we will apply the bottom inset
-                        if (view.MeasuredHeight > 0 || hasTrackedViews)
+                        if (viewHeight > 0 || hasTrackedViews)
                             bottom = 0;
                     }
 
@@ -145,7 +163,7 @@ internal static SafeAreaRegions GetSafeAreaRegionForEdge(int edge, ICrossPlatfor
                     }
                     else
                     {
-                        if (view.MeasuredWidth > 0 || hasTrackedViews)
+                        if (viewWidth > 0 || hasTrackedViews)
                             left = 0;
                     }
 
@@ -158,7 +176,7 @@ internal static SafeAreaRegions GetSafeAreaRegionForEdge(int edge, ICrossPlatfor
                     }
                     else
                     {
-                        if (view.MeasuredWidth > 0 || hasTrackedViews)
+                        if (viewWidth > 0 || hasTrackedViews)
                             right = 0;
                     }
                 }