diff --git a/src/library/Uno.Material/Styles/Controls/Button.xaml b/src/library/Uno.Material/Styles/Controls/Button.xaml
index 50688545a..cb1bcad64 100644
--- a/src/library/Uno.Material/Styles/Controls/Button.xaml
+++ b/src/library/Uno.Material/Styles/Controls/Button.xaml
@@ -53,6 +53,10 @@
 		<Setter Property="UseSystemFocusVisuals"
 				Value="True" />
 
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="Button">
@@ -221,6 +225,10 @@
 		<Setter Property="UseSystemFocusVisuals"
 				Value="True" />
 
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="Button">
@@ -389,6 +397,11 @@
 				Value="{ThemeResource MaterialButtonFontSize}" />
 		<Setter Property="UseSystemFocusVisuals"
 				Value="True" />
+
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="Button">
diff --git a/src/library/Uno.Material/Styles/Controls/ComboBox.xaml b/src/library/Uno.Material/Styles/Controls/ComboBox.xaml
index 1f46250bd..a5e70a699 100644
--- a/src/library/Uno.Material/Styles/Controls/ComboBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/ComboBox.xaml
@@ -247,6 +247,10 @@
 		<xamarin:Setter Property="uno:ComboBox.DropDownPreferredPlacement"
 						Value="Below" />
 
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="ItemsPanel">
 			<Setter.Value>
 				<ItemsPanelTemplate>
diff --git a/src/library/Uno.Material/Styles/Controls/FloatingActionButton.xaml b/src/library/Uno.Material/Styles/Controls/FloatingActionButton.xaml
index d9570e5bf..6a99b1516 100644
--- a/src/library/Uno.Material/Styles/Controls/FloatingActionButton.xaml
+++ b/src/library/Uno.Material/Styles/Controls/FloatingActionButton.xaml
@@ -75,6 +75,10 @@
 		<Setter Property="Padding"
 				Value="{StaticResource MaterialFabLargePadding}" />
 
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="Button">
@@ -223,6 +227,10 @@
 		<Setter Property="Padding"
 				Value="{StaticResource MaterialFabSmallPadding}" />
 
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="Button">
diff --git a/src/library/Uno.Material/Styles/Controls/PasswordBox.xaml b/src/library/Uno.Material/Styles/Controls/PasswordBox.xaml
index 9632b5ad4..b81745421 100644
--- a/src/library/Uno.Material/Styles/Controls/PasswordBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/PasswordBox.xaml
@@ -71,6 +71,10 @@
 		<Setter Property="MinHeight"
 				Value="50" />
 
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="PasswordBox">
@@ -268,6 +272,10 @@
 		<Setter Property="MinHeight"
 				Value="50" />
 
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="PasswordBox">
diff --git a/src/library/Uno.Material/Styles/Controls/TextBox.xaml b/src/library/Uno.Material/Styles/Controls/TextBox.xaml
index 528873a9a..987399367 100644
--- a/src/library/Uno.Material/Styles/Controls/TextBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/TextBox.xaml
@@ -84,6 +84,10 @@
 		<Setter Property="MinHeight"
 				Value="50" />
 
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TextBox">
@@ -285,6 +289,10 @@
 		<Setter Property="MinHeight"
 				Value="50" />
 
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.Icon"
+				Value="{x:Null}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TextBox">
diff --git a/src/library/Uno.Material/Styles/Controls/ToggleButton.xaml b/src/library/Uno.Material/Styles/Controls/ToggleButton.xaml
index 1976848a2..a7ecd075c 100644
--- a/src/library/Uno.Material/Styles/Controls/ToggleButton.xaml
+++ b/src/library/Uno.Material/Styles/Controls/ToggleButton.xaml
@@ -193,6 +193,11 @@
 				Value="Center" />
 		<Setter Property="VerticalContentAlignment"
 				Value="Center" />
+
+		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
+		<Setter Property="um:ControlExtensions.AlternateContent"
+				Value="{x:Null}" />
+		
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToggleButton">