diff --git a/src/library/Uno.Material/Styles/Application/Common/Converters.xaml b/src/library/Uno.Material/Styles/Application/Common/Converters.xaml
index abc785eb3..2c3b90773 100644
--- a/src/library/Uno.Material/Styles/Application/Common/Converters.xaml
+++ b/src/library/Uno.Material/Styles/Application/Common/Converters.xaml
@@ -36,6 +36,10 @@
NotNullValue="Visible"
NullValue="Collapsed" />
+
+
diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml
index 6c1f19859..9d598b920 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml
@@ -457,9 +457,6 @@
-
-
-
@@ -473,9 +470,9 @@
-
+
-
+
@@ -484,9 +481,9 @@
-
+
-
+
@@ -495,19 +492,21 @@
-
+
-
+
+
+
-
+
-
+
@@ -515,9 +514,9 @@
-
+
-
+
@@ -526,9 +525,9 @@
-
+
-
+
@@ -537,9 +536,9 @@
-
+
-
+
@@ -605,11 +604,11 @@
+ Opacity="0"/>
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml
index c8046e860..810edc992 100644
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml
+++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml
@@ -127,7 +127,7 @@
-
+
@@ -137,6 +137,20 @@
+
+
+
+
+
+
+
+
+
+
+