diff --git a/src/library/Uno.Cupertino/Styles/Controls/Button.xaml b/src/library/Uno.Cupertino/Styles/Controls/Button.xaml
index 6c4f17a28..e1f1cba3a 100644
--- a/src/library/Uno.Cupertino/Styles/Controls/Button.xaml
+++ b/src/library/Uno.Cupertino/Styles/Controls/Button.xaml
@@ -99,12 +99,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FocusedOverlay.Opacity"
-												Value="{StaticResource CupertinoFocusedOpacity}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused">
 									<VisualState.Setters>
@@ -222,12 +217,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FocusedOverlay.Opacity"
-												Value="{StaticResource CupertinoFocusedOpacity}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused">
 									<VisualState.Setters>
diff --git a/src/library/Uno.Cupertino/Styles/Controls/CheckBox.xaml b/src/library/Uno.Cupertino/Styles/Controls/CheckBox.xaml
index 4b1ad8a76..a9d064f5d 100644
--- a/src/library/Uno.Cupertino/Styles/Controls/CheckBox.xaml
+++ b/src/library/Uno.Cupertino/Styles/Controls/CheckBox.xaml
@@ -240,12 +240,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FocusRing.Opacity"
-												Value="{StaticResource CupertinoFocusedOpacity}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
diff --git a/src/library/Uno.Cupertino/Styles/Controls/RadioButton.xaml b/src/library/Uno.Cupertino/Styles/Controls/RadioButton.xaml
index aa1ac51a4..ae302a214 100644
--- a/src/library/Uno.Cupertino/Styles/Controls/RadioButton.xaml
+++ b/src/library/Uno.Cupertino/Styles/Controls/RadioButton.xaml
@@ -94,12 +94,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FocusRing.Opacity"
-												Value="{StaticResource CupertinoFocusedOpacity}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
diff --git a/src/library/Uno.Material/Styles/Controls/Button.xaml b/src/library/Uno.Material/Styles/Controls/Button.xaml
index 2d8fb2859..9fab9cbe4 100644
--- a/src/library/Uno.Material/Styles/Controls/Button.xaml
+++ b/src/library/Uno.Material/Styles/Controls/Button.xaml
@@ -113,12 +113,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FocusedOverlay.Opacity"
-												Value="{StaticResource MaterialFocusedOpacity}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused"/>
 
 								<VisualState x:Name="Unfocused">
 									<VisualState.Setters>
@@ -291,12 +286,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FocusedOverlay.Opacity"
-												Value="{StaticResource MaterialFocusedOpacity}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused">
 									<VisualState.Setters>
@@ -468,12 +458,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="Unfocused">
-									<VisualState.Setters>
-										<Setter Target="FocusedOverlay.Opacity"
-												Value="0" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
diff --git a/src/library/Uno.Material/Styles/Controls/CheckBox.xaml b/src/library/Uno.Material/Styles/Controls/CheckBox.xaml
index eb1aefab1..a9424b7e9 100644
--- a/src/library/Uno.Material/Styles/Controls/CheckBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/CheckBox.xaml
@@ -441,12 +441,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FocusRing.Opacity"
-												Value="{StaticResource MaterialFocusedOpacity}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
diff --git a/src/library/Uno.Material/Styles/Controls/FloatingActionButton.xaml b/src/library/Uno.Material/Styles/Controls/FloatingActionButton.xaml
index f12e38b79..9deedcbf0 100644
--- a/src/library/Uno.Material/Styles/Controls/FloatingActionButton.xaml
+++ b/src/library/Uno.Material/Styles/Controls/FloatingActionButton.xaml
@@ -159,12 +159,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FabFocusBorder.Background"
-												Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
@@ -311,12 +306,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FabFocusBorder.Background"
-												Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
diff --git a/src/library/Uno.Material/Styles/Controls/RadioButton.xaml b/src/library/Uno.Material/Styles/Controls/RadioButton.xaml
index a3aa07e4d..cd12c5d31 100644
--- a/src/library/Uno.Material/Styles/Controls/RadioButton.xaml
+++ b/src/library/Uno.Material/Styles/Controls/RadioButton.xaml
@@ -171,12 +171,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FocusRing.Opacity"
-												Value="{StaticResource MaterialFocusedOpacity}" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused" />
 							</VisualStateGroup>
diff --git a/src/library/Uno.Material/Styles/Controls/ToggleButton.xaml b/src/library/Uno.Material/Styles/Controls/ToggleButton.xaml
index 62b30e77a..1f99075b5 100644
--- a/src/library/Uno.Material/Styles/Controls/ToggleButton.xaml
+++ b/src/library/Uno.Material/Styles/Controls/ToggleButton.xaml
@@ -117,12 +117,9 @@
 												Value="1" />
 									</VisualState.Setters>
 								</VisualState>
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FocusedOverlay.Opacity"
-												Value="1" />
-									</VisualState.Setters>
-								</VisualState>
+								
+								<VisualState x:Name="PointerFocused" />
+
 								<VisualState x:Name="Unfocused">
 									<VisualState.Setters>
 										<Setter Target="FocusedOverlay.Opacity"
diff --git a/src/library/Uno.Material/Styles/Controls/ToggleSwitch.xaml b/src/library/Uno.Material/Styles/Controls/ToggleSwitch.xaml
index 33c8bfe13..3366fbba5 100644
--- a/src/library/Uno.Material/Styles/Controls/ToggleSwitch.xaml
+++ b/src/library/Uno.Material/Styles/Controls/ToggleSwitch.xaml
@@ -109,14 +109,7 @@
 									</VisualState.Setters>
 								</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="SwitchKnobOnShadow.Opacity"
-												Value="0.2" />
-										<Setter Target="SwitchKnobOffShadow.Opacity"
-												Value="0.2" />
-									</VisualState.Setters>
-								</VisualState>
+								<VisualState x:Name="PointerFocused" />
 
 								<VisualState x:Name="Unfocused">
 									<VisualState.Setters>