diff --git a/src/Controls/samples/Controls.Sample/AppResources.xaml b/src/Controls/samples/Controls.Sample/AppResources.xaml
index 0f9802c039a6..285daba58a89 100644
--- a/src/Controls/samples/Controls.Sample/AppResources.xaml
+++ b/src/Controls/samples/Controls.Sample/AppResources.xaml
@@ -41,7 +41,7 @@
-
+
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewRenderer.cs
index 64454cd24d67..c5c4457bc502 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewRenderer.cs
@@ -107,7 +107,7 @@ protected override void OnElementChanged(ElementChangedEventArgs e)
ItemTemplate = (Microsoft.UI.Xaml.DataTemplate)WApp.Current.Resources["CellTemplate"],
HeaderTemplate = (Microsoft.UI.Xaml.DataTemplate)WApp.Current.Resources["View"],
FooterTemplate = (Microsoft.UI.Xaml.DataTemplate)WApp.Current.Resources["View"],
- ItemContainerStyle = (Microsoft.UI.Xaml.Style)WApp.Current.Resources["FormsListViewItem"],
+ ItemContainerStyle = (Microsoft.UI.Xaml.Style)WApp.Current.Resources["MauiListViewItem"],
GroupStyleSelector = (GroupStyleSelector)WApp.Current.Resources["ListViewGroupSelector"]
};
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewStyles.xaml b/src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewStyles.xaml
index e6209e44625a..31f3050f4ac6 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewStyles.xaml
+++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewStyles.xaml
@@ -146,48 +146,19 @@
-
-
+
diff --git a/src/Controls/src/Core/Compatibility/Handlers/TableView/Windows/TableViewRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/TableView/Windows/TableViewRenderer.cs
index df651720c2f9..db13ef2384bd 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/TableView/Windows/TableViewRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/TableView/Windows/TableViewRenderer.cs
@@ -37,7 +37,7 @@ protected override void OnElementChanged(ElementChangedEventArgs e)
SetNativeControl(new Microsoft.UI.Xaml.Controls.ListView
{
- ItemContainerStyle = (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["FormsListViewItem"],
+ ItemContainerStyle = (Microsoft.UI.Xaml.Style)Microsoft.UI.Xaml.Application.Current.Resources["MauiListViewItem"],
ItemTemplate = (Microsoft.UI.Xaml.DataTemplate)Microsoft.UI.Xaml.Application.Current.Resources["CellTemplate"],
GroupStyle = { new GroupStyle { HidesIfEmpty = false, HeaderTemplate = (Microsoft.UI.Xaml.DataTemplate)Microsoft.UI.Xaml.Application.Current.Resources["TableSection"] } },
HeaderTemplate = (Microsoft.UI.Xaml.DataTemplate)Microsoft.UI.Xaml.Application.Current.Resources["TableRoot"],