diff --git a/src/MainDemo.Wpf/Buttons.xaml b/src/MainDemo.Wpf/Buttons.xaml
index 887b0a4c95..7702f7878e 100644
--- a/src/MainDemo.Wpf/Buttons.xaml
+++ b/src/MainDemo.Wpf/Buttons.xaml
@@ -570,7 +570,7 @@
                     Command="{Binding DismissCommand}"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                     Style="{StaticResource MaterialDesignRaisedButton}"
-                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <StackPanel Orientation="Horizontal">
                 <TextBlock Text="DISMISS" />
                 <materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -579,7 +579,7 @@
 
             <TextBlock VerticalAlignment="Center"
                        Text="{Binding DemoRestartCountdownText}"
-                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
+                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
           </Grid>
         </smtx:XamlDisplay>
 
@@ -604,7 +604,7 @@
                     Command="{Binding DismissCommand}"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                     Style="{StaticResource MaterialDesignOutlinedButton}"
-                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <StackPanel Orientation="Horizontal">
                 <TextBlock Text="DISMISS" />
                 <materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -613,7 +613,7 @@
 
             <TextBlock VerticalAlignment="Center"
                        Text="{Binding DemoRestartCountdownText}"
-                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
+                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
           </Grid>
         </smtx:XamlDisplay>
 
@@ -638,7 +638,7 @@
                     Command="{Binding DismissCommand}"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                     Style="{StaticResource MaterialDesignFlatButton}"
-                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <StackPanel Orientation="Horizontal">
                 <TextBlock Text="DISMISS" />
                 <materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -647,7 +647,7 @@
 
             <TextBlock VerticalAlignment="Center"
                        Text="{Binding DemoRestartCountdownText}"
-                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
+                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
           </Grid>
         </smtx:XamlDisplay>
 
diff --git a/src/MainDemo.Wpf/ColorTool.xaml b/src/MainDemo.Wpf/ColorTool.xaml
index d004f239fc..e5c14dc92e 100644
--- a/src/MainDemo.Wpf/ColorTool.xaml
+++ b/src/MainDemo.Wpf/ColorTool.xaml
@@ -481,7 +481,7 @@
         </UniformGrid>
 
         <Grid DockPanel.Dock="Left">
-          <Grid Visibility="{Binding IsChecked, ElementName=CustomPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+          <Grid Visibility="{Binding IsChecked, ElementName=CustomPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="160" />
               <ColumnDefinition />
@@ -501,7 +501,7 @@
                                         Color="{Binding SelectedColor, Delay=25}" />
           </Grid>
 
-          <StackPanel Visibility="{Binding IsChecked, ElementName=MdPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+          <StackPanel Visibility="{Binding IsChecked, ElementName=MdPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
             <StackPanel Orientation="Horizontal">
               <StackPanel.Resources>
                 <Style TargetType="TextBlock">
diff --git a/src/MainDemo.Wpf/Fields.xaml b/src/MainDemo.Wpf/Fields.xaml
index e32f67d448..432e141ac0 100644
--- a/src/MainDemo.Wpf/Fields.xaml
+++ b/src/MainDemo.Wpf/Fields.xaml
@@ -259,7 +259,7 @@
 
           <TextBox VerticalAlignment="Top"
                    materialDesign:HintAssist.Hint="This is a limited text area"
-                   materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignFilledTextBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
+                   materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignFilledTextBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
                    MaxLength="40"
                    Style="{StaticResource MaterialDesignFilledTextBox}"
                    TextWrapping="Wrap" />
@@ -283,7 +283,7 @@
 
           <PasswordBox materialDesign:HintAssist.HelperText="Helper text"
                        materialDesign:HintAssist.Hint="Password"
-                       materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignFilledPasswordBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
+                       materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignFilledPasswordBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
                        Style="{StaticResource MaterialDesignFilledPasswordBox}" />
         </StackPanel>
       </smtx:XamlDisplay>
@@ -356,7 +356,7 @@
           <TextBox Height="100"
                    VerticalAlignment="Top"
                    materialDesign:HintAssist.Hint="This is a limited text area"
-                   materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedTextBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
+                   materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedTextBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
                    MaxLength="40"
                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
                    TextWrapping="Wrap"
diff --git a/src/MainDemo.Wpf/Pickers.xaml b/src/MainDemo.Wpf/Pickers.xaml
index bd356b269e..a48b8bd3ca 100644
--- a/src/MainDemo.Wpf/Pickers.xaml
+++ b/src/MainDemo.Wpf/Pickers.xaml
@@ -229,7 +229,7 @@
                   HorizontalAlignment="Left"
                   VerticalAlignment="Top"
                   UniqueKey="pickers_15">
-          <materialDesign:TimePicker ClockButtonVisibility="{Binding IsChecked, ElementName=IsClockButtonVisible, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
+          <materialDesign:TimePicker ClockButtonVisibility="{Binding IsChecked, ElementName=IsClockButtonVisible, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
                              Width="100"
                              Is24Hours="True" />
         </smtx:XamlDisplay>
diff --git a/src/MainDemo.Wpf/SmartHint.xaml b/src/MainDemo.Wpf/SmartHint.xaml
index 936e9f94e5..33067aeb13 100644
--- a/src/MainDemo.Wpf/SmartHint.xaml
+++ b/src/MainDemo.Wpf/SmartHint.xaml
@@ -1036,7 +1036,7 @@
               <Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
               <Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
               <Setter Property="MaxLength" Value="{Binding MaxLength}" />
-              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
+              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
             </Style>
           </Grid.Resources>
           <Grid.ColumnDefinitions>
@@ -1096,7 +1096,7 @@
               <Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
               <Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
               <Setter Property="MaxLength" Value="{Binding MaxLength}" />
-              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
+              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
             </Style>
           </Grid.Resources>
           <Grid.ColumnDefinitions>
@@ -1157,7 +1157,7 @@
               <Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
               <Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
               <Setter Property="MaxLength" Value="{Binding MaxLength}" />
-              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
+              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
             </Style>
           </Grid.Resources>
           <Grid.ColumnDefinitions>
@@ -1227,7 +1227,7 @@
               <Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
               <Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
               <Setter Property="MaxLength" Value="{Binding MaxLength}" />
-              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
+              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
             </Style>
           </Grid.Resources>
           <Grid.ColumnDefinitions>
@@ -1288,7 +1288,7 @@
               <Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
               <Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
               <Setter Property="MaxLength" Value="{Binding MaxLength}" />
-              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
+              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
             </Style>
           </Grid.Resources>
           <Grid.ColumnDefinitions>
@@ -1350,7 +1350,7 @@
               <Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
               <Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
               <Setter Property="MaxLength" Value="{Binding MaxLength}" />
-              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
+              <Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
             </Style>
           </Grid.Resources>
           <Grid.ColumnDefinitions>
diff --git a/src/MaterialDesign3.Demo.Wpf/Buttons.xaml b/src/MaterialDesign3.Demo.Wpf/Buttons.xaml
index 6f2c37c032..2109cc52f7 100644
--- a/src/MaterialDesign3.Demo.Wpf/Buttons.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/Buttons.xaml
@@ -602,7 +602,7 @@
                     Command="{Binding DismissCommand}"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                     Style="{StaticResource MaterialDesignRaisedButton}"
-                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <StackPanel Orientation="Horizontal">
                 <TextBlock Text="DISMISS" />
                 <materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -611,7 +611,7 @@
 
             <TextBlock VerticalAlignment="Center"
                        Text="{Binding DemoRestartCountdownText}"
-                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
+                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
           </Grid>
         </smtx:XamlDisplay>
 
@@ -636,7 +636,7 @@
                     Command="{Binding DismissCommand}"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                     Style="{StaticResource MaterialDesignOutlinedButton}"
-                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <StackPanel Orientation="Horizontal">
                 <TextBlock Text="DISMISS" />
                 <materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -645,7 +645,7 @@
 
             <TextBlock VerticalAlignment="Center"
                        Text="{Binding DemoRestartCountdownText}"
-                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
+                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
           </Grid>
         </smtx:XamlDisplay>
 
@@ -670,7 +670,7 @@
                     Command="{Binding DismissCommand}"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                     Style="{StaticResource MaterialDesignFlatButton}"
-                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <StackPanel Orientation="Horizontal">
                 <TextBlock Text="DISMISS" />
                 <materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -679,7 +679,7 @@
 
             <TextBlock VerticalAlignment="Center"
                        Text="{Binding DemoRestartCountdownText}"
-                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
+                       Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
           </Grid>
         </smtx:XamlDisplay>
 
diff --git a/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml b/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
index 9f75d92ff5..a2c3e807ec 100644
--- a/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
@@ -480,7 +480,7 @@
         </UniformGrid>
 
         <Grid DockPanel.Dock="Left">
-          <Grid Visibility="{Binding IsChecked, ElementName=CustomPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+          <Grid Visibility="{Binding IsChecked, ElementName=CustomPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="160" />
               <ColumnDefinition />
@@ -501,7 +501,7 @@
                                         Color="{Binding SelectedColor, Delay=25}" />
           </Grid>
 
-          <StackPanel Visibility="{Binding IsChecked, ElementName=MdPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
+          <StackPanel Visibility="{Binding IsChecked, ElementName=MdPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
             <StackPanel Orientation="Horizontal">
               <StackPanel.Resources>
                 <Style TargetType="TextBlock">
diff --git a/src/MaterialDesign3.Demo.Wpf/Fields.xaml b/src/MaterialDesign3.Demo.Wpf/Fields.xaml
index 2fab7330b3..6bcfd37bc6 100644
--- a/src/MaterialDesign3.Demo.Wpf/Fields.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/Fields.xaml
@@ -354,7 +354,7 @@
           <TextBox Height="100"
                    VerticalAlignment="Top"
                    materialDesign:HintAssist.Hint="This is a limited text area"
-                   materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedPasswordFieldTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
+                   materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedPasswordFieldTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
                    MaxLength="40"
                    Style="{StaticResource MaterialDesignOutlinedTextBox}"
                    TextWrapping="Wrap"
diff --git a/src/MaterialDesignThemes.Wpf/Converters/BooleanToVisibilityConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/BooleanToVisibilityConverter.cs
index 29700943fd..4b63b33a04 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/BooleanToVisibilityConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/BooleanToVisibilityConverter.cs
@@ -2,9 +2,12 @@
 
 public sealed class BooleanToVisibilityConverter : BooleanConverter<Visibility>
 {
-    public static readonly BooleanToVisibilityConverter Instance = new();
-    public static readonly BooleanToVisibilityConverter InverseInstance = new() { FalseValue = Visibility.Visible, TrueValue = Visibility.Hidden };
+    public static readonly BooleanToVisibilityConverter CollapsedInstance = new() { FalseValue = Visibility.Collapsed, TrueValue = Visibility.Visible };
+    public static readonly BooleanToVisibilityConverter NotCollapsedInstance = new() { FalseValue = Visibility.Visible, TrueValue = Visibility.Collapsed };
 
+    public static readonly BooleanToVisibilityConverter HiddenInstance = new() { FalseValue = Visibility.Hidden, TrueValue = Visibility.Visible };
+    public static readonly BooleanToVisibilityConverter NotHiddenInstance = new() { FalseValue = Visibility.Visible, TrueValue = Visibility.Hidden };
+    
     public BooleanToVisibilityConverter() :
         base(Visibility.Visible, Visibility.Collapsed)
     { }
diff --git a/src/MaterialDesignThemes.Wpf/Converters/InvertBooleanConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/InvertBooleanConverter.cs
index 858ec06d84..2d5bc4e8f2 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/InvertBooleanConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/InvertBooleanConverter.cs
@@ -1,8 +1,9 @@
 namespace MaterialDesignThemes.Wpf.Converters;
 
-public class InvertBooleanConverter : BooleanConverter<bool>
+public sealed class InvertBooleanConverter : BooleanConverter<bool>
 {
     public static readonly InvertBooleanConverter Instance = new();
+
     public InvertBooleanConverter()
         : base(false, true)
     {
diff --git a/src/MaterialDesignThemes.Wpf/Converters/NullableToVisibilityConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/NullableToVisibilityConverter.cs
index 8468824837..c4a9943312 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/NullableToVisibilityConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/NullableToVisibilityConverter.cs
@@ -5,8 +5,11 @@ namespace MaterialDesignThemes.Wpf.Converters;
 
 public class NullableToVisibilityConverter : IValueConverter
 {
-    public static readonly NullableToVisibilityConverter Instance = new();
-    public static readonly NullableToVisibilityConverter InverseInstance = new() { NullValue = Visibility.Visible, NotNullValue = Visibility.Hidden };
+    public static readonly NullableToVisibilityConverter CollapsedInstance = new() { NullValue = Visibility.Collapsed, NotNullValue = Visibility.Visible };
+    public static readonly NullableToVisibilityConverter NotCollapsedInstance = new() { NullValue = Visibility.Visible, NotNullValue = Visibility.Collapsed };
+
+    public static readonly NullableToVisibilityConverter HiddenInstance = new() { NullValue = Visibility.Hidden, NotNullValue = Visibility.Visible };
+    public static readonly NullableToVisibilityConverter NotHiddenInstance = new() { NullValue = Visibility.Visible, NotNullValue = Visibility.Hidden };
 
     public Visibility NullValue { get; set; } = Visibility.Collapsed;
     public Visibility NotNullValue { get; set; } = Visibility.Visible;
diff --git a/src/MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs
index e7c08e0365..395695e260 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs
@@ -5,8 +5,8 @@ namespace MaterialDesignThemes.Wpf.Converters;
 
 public class TextFieldHintVisibilityConverter : IValueConverter
 {
-    public static readonly TextFieldHintVisibilityConverter Instance = new();
-    public static readonly TextFieldHintVisibilityConverter StringIsEmptyInstance = new() { IsEmptyValue = Visibility.Collapsed, IsNotEmptyValue = Visibility.Visible};
+    public static readonly TextFieldHintVisibilityConverter IsNotEmptyInstance = new();
+    public static readonly TextFieldHintVisibilityConverter IsEmptyInstance = new() { IsEmptyValue = Visibility.Collapsed, IsNotEmptyValue = Visibility.Visible};
 
     public Visibility IsEmptyValue { get; set; } = Visibility.Visible;
     public Visibility IsNotEmptyValue { get; set; } = Visibility.Hidden;
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml
index 87836b64cd..ce94fdb964 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml
@@ -75,7 +75,7 @@
             Background="{DynamicResource MaterialDesign.Brush.TextBox.HoverBackground}"
             CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
             RenderTransformOrigin="0.5,0.5"
-            Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+            Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <Border.RenderTransform>
                 <ScaleTransform x:Name="RippleOnFocusScaleTransform" ScaleX="0" ScaleY="0" />
               </Border.RenderTransform>
@@ -111,7 +111,7 @@
                         VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
                         Kind="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
                         Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                        Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                        Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
                   <TextBlock x:Name="PrefixTextBlock"
                      Grid.Column="1"
@@ -224,7 +224,7 @@
                         VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
                         Kind="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
                         Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                        Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                        Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
                   <Button x:Name="PART_ClearButton"
                   Grid.Column="5"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Badged.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Badged.xaml
index 7b26736fdf..e3682d0d33 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Badged.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Badged.xaml
@@ -52,7 +52,7 @@
                     RenderTransformOrigin=".5,.5"
                     TextElement.FontSize="11"
                     TextElement.FontWeight="DemiBold"
-                    Visibility="{TemplateBinding IsBadgeSet, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{TemplateBinding IsBadgeSet, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <Border.Resources>
                 <Style TargetType="wpf:PackIcon">
                   <Setter Property="Height" Value="12" />
@@ -178,7 +178,7 @@
                     RenderTransformOrigin=".5,.5"
                     TextElement.FontSize="11"
                     TextElement.FontWeight="DemiBold"
-                    Visibility="{TemplateBinding IsBadgeSet, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{TemplateBinding IsBadgeSet, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <Border.RenderTransform>
                 <ScaleTransform ScaleX="1" ScaleY="1" />
               </Border.RenderTransform>
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
index b683458245..6a9258124a 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
@@ -64,7 +64,7 @@
                              Minimum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Minimum)}"
                              Opacity="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Opacity)}"
                              Style="{DynamicResource MaterialDesignLinearProgressBar}"
-                             Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}"
+                             Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}"
                              Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Value)}">
                   <ProgressBar.Clip>
                     <MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
@@ -195,7 +195,7 @@
                          Minimum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Minimum)}"
                          Opacity="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Opacity)}"
                          Style="{DynamicResource MaterialDesignLinearProgressBar}"
-                         Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}"
+                         Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}"
                          Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Value)}">
               <ProgressBar.Clip>
                 <MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
@@ -353,7 +353,7 @@
                          Minimum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Minimum)}"
                          Opacity="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Opacity)}"
                          Style="{DynamicResource MaterialDesignLinearProgressBar}"
-                         Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}"
+                         Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}"
                          Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Value)}">
               <ProgressBar.Clip>
                 <MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
@@ -516,7 +516,7 @@
                          Opacity="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Opacity)}"
                          RenderTransformOrigin=".5, .5"
                          Style="{DynamicResource MaterialDesignCircularProgressBar}"
-                         Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}"
+                         Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}"
                          Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Value)}">
               <ProgressBar.RenderTransform>
                 <TransformGroup>
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Calendar.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Calendar.xaml
index 9dc11473b3..c9d8698e69 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Calendar.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Calendar.xaml
@@ -479,7 +479,7 @@
                         FontWeight="Bold"
                         Foreground="{TemplateBinding wpf:CalendarAssist.HeaderForeground}"
                         Template="{StaticResource HeaderButtonTemplate}"
-                        Visibility="{TemplateBinding wpf:CalendarAssist.IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                        Visibility="{TemplateBinding wpf:CalendarAssist.IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
                 <TextBlock x:Name="CurrentDateTextBlock"
                            Grid.Row="1"
                            Grid.Column="1"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Chip.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Chip.xaml
index c410001aa3..976de9e786 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Chip.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Chip.xaml
@@ -41,7 +41,7 @@
                                             Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:Chip}, Path=IconForeground}"
                                             FontSize="17"
                                             FontWeight="Regular"
-                                            Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:Chip}, Path=Icon, Converter={x:Static converters:NullableToVisibilityConverter.Instance}}"
+                                            Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:Chip}, Path=Icon, Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}}"
                                             VerticalAlignment="Center"
                                             VerticalContentAlignment="Center"
                                             HorizontalContentAlignment="Center"
@@ -105,7 +105,7 @@
                             FontWeight="Regular"
                             Foreground="{TemplateBinding IconForeground}"
                             IsTabStop="False"
-                            Visibility="{TemplateBinding Icon, Converter={x:Static converters:NullableToVisibilityConverter.Instance}}">
+                            Visibility="{TemplateBinding Icon, Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}}">
               <ContentControl.Clip>
                 <EllipseGeometry Center="16,16"
                                  RadiusX="16"
@@ -137,7 +137,7 @@
                     Margin="-6,0,8,0"
                     VerticalAlignment="Center"
                     ToolTip="{TemplateBinding DeleteToolTip}"
-                    Visibility="{TemplateBinding IsDeletable, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{TemplateBinding IsDeletable, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <Button.Template>
                 <ControlTemplate>
                   <Grid>
@@ -230,7 +230,7 @@
                             FontWeight="Regular"
                             Foreground="{TemplateBinding IconForeground}"
                             IsTabStop="False"
-                            Visibility="{TemplateBinding Icon, Converter={x:Static converters:NullableToVisibilityConverter.Instance}}">
+                            Visibility="{TemplateBinding Icon, Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}}">
               <ContentControl.Clip>
                 <EllipseGeometry Center="16,16"
                                  RadiusX="16"
@@ -262,7 +262,7 @@
                     Margin="-6,0,8,0"
                     VerticalAlignment="Center"
                     ToolTip="{TemplateBinding DeleteToolTip}"
-                    Visibility="{TemplateBinding IsDeletable, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{TemplateBinding IsDeletable, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <Button.Template>
                 <ControlTemplate>
                   <Grid>
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
index 737b129c61..116583e896 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Clock.xaml
@@ -619,7 +619,7 @@
                       Margin="0,0,0,12"
                       Background="{DynamicResource MaterialDesign.Brush.Primary}"
                       CornerRadius="2 2 0 0"
-                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                 <StackPanel x:Name="TimeReadoutStackPanel"
                             Margin="24"
                             HorizontalAlignment="Right"
@@ -1380,7 +1380,7 @@
 
               <Border Margin="0,0,0,36"
                       HorizontalAlignment="Center"
-                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                 <StackPanel Orientation="Horizontal">
                   <StackPanel x:Name="TimeReadoutStackPanel"
                               HorizontalAlignment="Right"
@@ -2202,7 +2202,7 @@
 
               <Border Margin="0,0,0,36"
                       HorizontalAlignment="Center"
-                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                 <StackPanel Orientation="Horizontal">
                   <StackPanel x:Name="TimeReadoutStackPanel"
                               HorizontalAlignment="Right"
@@ -3014,7 +3014,7 @@
 
               <Border Margin="0,0,52,0"
                       VerticalAlignment="Center"
-                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                 <StackPanel>
                   <StackPanel x:Name="TimeReadoutStackPanel"
                               HorizontalAlignment="Right"
@@ -3838,7 +3838,7 @@
 
               <Border Margin="0,0,52,0"
                       VerticalAlignment="Center"
-                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                      Visibility="{TemplateBinding IsHeaderVisible, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                 <StackPanel>
                   <StackPanel x:Name="TimeReadoutStackPanel"
                               HorizontalAlignment="Right"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
index 0c0e7f8536..bd56d8c73e 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
@@ -343,7 +343,7 @@
                             VerticalAlignment="Center"
                             Kind="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
                             Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                            Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                            Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
               <TextBlock x:Name="PrefixTextBlock"
                          Grid.Column="1"
@@ -466,7 +466,7 @@
                             VerticalAlignment="Center"
                             Kind="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
                             Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                            Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                            Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
               <Button x:Name="PART_ClearButton"
                       Grid.Column="5"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml
index 7de5341813..161e0d4013 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml
@@ -165,7 +165,7 @@
                             Grid.Column="0"
                             MaxWidth="{TemplateBinding ActualWidth}"
                             Background="{TemplateBinding wpf:ValidationAssist.Background}"
-                            Visibility="{TemplateBinding Validation.HasError, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                            Visibility="{TemplateBinding Validation.HasError, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                       <ItemsControl ItemsSource="{TemplateBinding Validation.Errors}">
                         <ItemsControl.ItemTemplate>
                           <DataTemplate DataType="ValidationError">
@@ -318,7 +318,7 @@
                                                 IsTabStop="False"
                                                 ListSortDirection="{TemplateBinding SortDirection}"
                                                 Opacity="0.45"
-                                                Visibility="{Binding CanUserSortColumns, RelativeSource={RelativeSource AncestorType=DataGrid}, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                                                Visibility="{Binding CanUserSortColumns, RelativeSource={RelativeSource AncestorType=DataGrid}, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
                 <ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                   RecognizesAccessKey="True"
                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
@@ -382,7 +382,7 @@
                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                 <Control SnapsToDevicePixels="false"
                          Template="{Binding ValidationErrorTemplate, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
-                         Visibility="{Binding (Validation.HasError), Converter={x:Static converters:BooleanToVisibilityConverter.Instance}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
+                         Visibility="{Binding (Validation.HasError), Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
               </StackPanel>
             </Border>
             <Thumb x:Name="PART_TopHeaderGripper"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
index 3824d1c663..21b71ad276 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
@@ -150,7 +150,7 @@
                                Foreground="{TemplateBinding Foreground}"
                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                Text="{TemplateBinding InputGestureText}"
-                               Visibility="{TemplateBinding InputGestureText, Converter={x:Static converters:TextFieldHintVisibilityConverter.StringIsEmptyInstance}}" />
+                               Visibility="{TemplateBinding InputGestureText, Converter={x:Static converters:TextFieldHintVisibilityConverter.IsEmptyInstance}}" />
                   </Grid>
                   <Grid x:Name="SubBlock"
                         Grid.Column="2"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
index ab600c519f..38365c2cfc 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -117,7 +117,7 @@
                     Background="{DynamicResource MaterialDesign.Brush.PasswordBox.HoverBackground}"
                     CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
                     RenderTransformOrigin="0.5,0.5"
-                    Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <Border.RenderTransform>
                 <ScaleTransform x:Name="RippleOnFocusScaleTransform" ScaleX="0" ScaleY="0" />
               </Border.RenderTransform>
@@ -153,7 +153,7 @@
                                 VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
                                 Kind="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
                                 Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
                   <TextBlock x:Name="PrefixTextBlock"
                              Grid.Column="1"
@@ -266,7 +266,7 @@
                                 VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
                                 Kind="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
                                 Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
                   <Button x:Name="PART_ClearButton"
                           Foreground="{TemplateBinding Foreground}"
@@ -703,7 +703,7 @@
                     Background="{DynamicResource MaterialDesign.Brush.PasswordBox.HoverBackground}"
                     CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
                     RenderTransformOrigin="0.5,0.5"
-                    Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <Border.RenderTransform>
                 <ScaleTransform x:Name="RippleOnFocusScaleTransform" ScaleX="0" ScaleY="0" />
               </Border.RenderTransform>
@@ -740,7 +740,7 @@
                                 VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
                                 Kind="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
                                 Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
                   <TextBlock x:Name="PrefixTextBlock"
                              Grid.Column="1"
@@ -779,7 +779,7 @@
                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                   UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
                                   VerticalScrollBarVisibility="Hidden"
-                                  Visibility="{Binding ElementName=PasswordContentGrid, Path=(wpf:PasswordBoxAssist.IsPasswordRevealed), Converter={x:Static converters:BooleanToVisibilityConverter.InverseInstance}}"
+                                  Visibility="{Binding ElementName=PasswordContentGrid, Path=(wpf:PasswordBoxAssist.IsPasswordRevealed), Converter={x:Static converters:BooleanToVisibilityConverter.NotCollapsedInstance}}"
                                   wpf:ScrollViewerAssist.BubbleVerticalScroll="True"/>
 
                     <TextBox x:Name="RevealPasswordTextBox"
@@ -797,7 +797,7 @@
                              Style="{StaticResource MaterialDesignRawTextBox}"
                              Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:PasswordBoxAssist.Password), UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
                              UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
-                             Visibility="{Binding ElementName=PasswordContentGrid, Path=(wpf:PasswordBoxAssist.IsPasswordRevealed), Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                             Visibility="{Binding ElementName=PasswordContentGrid, Path=(wpf:PasswordBoxAssist.IsPasswordRevealed), Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                       <behaviors:Interaction.Behaviors>
                         <internalbehaviors:PasswordBoxRevealTextBoxBehavior PasswordBox="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
                       </behaviors:Interaction.Behaviors>
@@ -894,7 +894,7 @@
                                 VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
                                 Kind="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
                                 Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
                   <Button x:Name="PART_ClearButton"
                           Grid.Column="6"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
index 33ddc481ef..2ad8ac983a 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
@@ -376,20 +376,20 @@
                                 ContentTemplate="{TemplateBinding ToggleContentTemplate}"
                                 ContentTemplateSelector="{TemplateBinding ToggleContentTemplateSelector}"
                                 Focusable="False"
-                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={x:Static converters:NullableToVisibilityConverter.InverseInstance}}" />
+                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={x:Static converters:NullableToVisibilityConverter.NotCollapsedInstance}}" />
                 <ContentControl x:Name="ExplicitToggleContent"
                                 Content="{TemplateBinding ToggleContent}"
                                 ContentTemplate="{TemplateBinding ToggleContentTemplate}"
                                 ContentTemplateSelector="{TemplateBinding ToggleContentTemplateSelector}"
                                 Focusable="False"
-                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={x:Static converters:NullableToVisibilityConverter.Instance}}" />
+                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}}" />
                 <ContentControl x:Name="ExplicitToggleCheckedContent"
                                 Content="{TemplateBinding ToggleCheckedContent}"
                                 ContentTemplate="{TemplateBinding ToggleCheckedContentTemplate}"
                                 Focusable="False"
                                 Opacity="0"
                                 RenderTransformOrigin=".5,.5"
-                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={x:Static converters:NullableToVisibilityConverter.Instance}}">
+                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}}">
                   <ContentControl.RenderTransform>
                     <RotateTransform Angle="-45" />
                   </ContentControl.RenderTransform>
@@ -420,7 +420,7 @@
                                 Content="{TemplateBinding PopupContent}"
                                 ContentTemplate="{TemplateBinding PopupContentTemplate}"
                                 Opacity="0"
-                                Visibility="{TemplateBinding IsEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                                Visibility="{TemplateBinding IsEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                   <ContentControl.Resources>
                     <ResourceDictionary>
                       <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource MaterialDesignToolTip}">
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
index 408e1200dc..d3ca59802a 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
@@ -297,7 +297,7 @@
                          Minimum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Minimum)}"
                          Opacity="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Opacity)}"
                          Style="{DynamicResource MaterialDesignLinearProgressBar}"
-                         Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}"
+                         Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndicatorVisible), Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}"
                          Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Value)}" />
             <Border Margin="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
               <wpf:Ripple x:Name="contentPresenter"
@@ -471,7 +471,7 @@
                       BorderBrush="{DynamicResource MaterialDesign.Brush.RadioButton.Checked}"
                       BorderThickness="0"
                       Opacity="0"
-                      Visibility="{TemplateBinding IsChecked, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                      Visibility="{TemplateBinding IsChecked, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
             </Grid>
           </Border>
           <ControlTemplate.Triggers>
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml
index b1143a240d..fc8c5560c9 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml
@@ -72,7 +72,7 @@
                             IsHitTestVisible="False"
                             IsTabStop="False"
                             Opacity="{TemplateBinding HintOpacity}"
-                            Visibility="{TemplateBinding UseFloating, Converter={x:Static converters:BooleanToVisibilityConverter.InverseInstance}}" />
+                            Visibility="{TemplateBinding UseFloating, Converter={x:Static converters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
@@ -179,7 +179,7 @@
                                     IsTabStop="False"
                                     Opacity="{TemplateBinding HintOpacity}"
                                     RenderTransformOrigin="0,0"
-                                    Visibility="{TemplateBinding UseFloating, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                                    Visibility="{TemplateBinding UseFloating, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
                       
                       <ContentControl.Margin>
                         <MultiBinding Converter="{x:Static converters:FloatingHintTextBlockMarginConverter.Instance}">
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Snackbar.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Snackbar.xaml
index 5eea991fc4..fb44b4b7b4 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Snackbar.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Snackbar.xaml
@@ -89,7 +89,7 @@
                     ContentTemplate="{TemplateBinding ActionContentTemplate}"
                     ContentTemplateSelector="{TemplateBinding ActionContentTemplateSelector}"
                     Style="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type wpf:Snackbar}}, Path=ActionButtonStyle}"
-                    Visibility="{TemplateBinding ActionContent, Converter={x:Static converters:NullableToVisibilityConverter.Instance}}">
+                    Visibility="{TemplateBinding ActionContent, Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}}">
               <DockPanel.Dock>
                 <MultiBinding Converter="{x:Static converters:SnackbarActionButtonPlacementModeConverter.Instance}">
                   <Binding Path="ActionButtonPlacement" RelativeSource="{RelativeSource AncestorType={x:Type wpf:Snackbar}}" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
index 02c00fcb1f..1093037f9b 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
@@ -113,7 +113,7 @@
                     Background="{DynamicResource MaterialDesign.Brush.TextBox.HoverBackground}"
                     CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
                     RenderTransformOrigin="0.5,0.5"
-                    Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}">
+                    Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
               <Border.RenderTransform>
                 <ScaleTransform x:Name="RippleOnFocusScaleTransform" ScaleX="0" ScaleY="0" />
               </Border.RenderTransform>
@@ -149,7 +149,7 @@
                                 VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
                                 Kind="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
                                 Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
                   <TextBlock x:Name="PrefixTextBlock"
                              Grid.Column="1"
@@ -262,7 +262,7 @@
                                 VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
                                 Kind="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
                                 Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
                   <Button x:Name="PART_ClearButton"
                           Grid.Column="5"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
index d7ca7502a3..c2f8a0afa4 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeListView.xaml
@@ -213,10 +213,10 @@
                             Visibility="Collapsed" />
           </Grid>
           <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplate), Converter={x:Static converters:NullableToVisibilityConverter.Instance}, Mode=OneWay}" Value="Visible">
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplate), Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}, Mode=OneWay}" Value="Visible">
               <Setter TargetName="AdditionalContentControl" Property="Visibility" Value="Visible" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplateSelector), Converter={x:Static converters:NullableToVisibilityConverter.Instance}, Mode=OneWay}" Value="Visible">
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplateSelector), Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}, Mode=OneWay}" Value="Visible">
               <Setter TargetName="AdditionalContentControl" Property="Visibility" Value="Visible" />
             </DataTrigger>
             <Trigger Property="HasItems" Value="false">
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeView.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeView.xaml
index 2800ad3969..644d3a6f18 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeView.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeView.xaml
@@ -358,10 +358,10 @@
             </StackPanel>
           </Grid>
           <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplate), Converter={x:Static converters:NullableToVisibilityConverter.Instance}, Mode=OneWay}" Value="Visible">
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplate), Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}, Mode=OneWay}" Value="Visible">
               <Setter TargetName="AdditionalContentControl" Property="Visibility" Value="Visible" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplateSelector), Converter={x:Static converters:NullableToVisibilityConverter.Instance}, Mode=OneWay}" Value="Visible">
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:TreeViewAssist.AdditionalTemplateSelector), Converter={x:Static converters:NullableToVisibilityConverter.CollapsedInstance}, Mode=OneWay}" Value="Visible">
               <Setter TargetName="AdditionalContentControl" Property="Visibility" Value="Visible" />
             </DataTrigger>
             <Trigger Property="HasItems" Value="false">
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml
index 9b9611974b..43ace0c281 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml
@@ -94,7 +94,7 @@
           <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.UsePopup)}" Value="False" />
         </MultiDataTrigger.Conditions>
         <MultiDataTrigger.Setters>
-          <Setter TargetName="DefaultErrorViewer" Property="Visibility" Value="{Binding ElementName=Placeholder, Path=AdornedElement.IsKeyboardFocusWithin, Mode=OneWay, Converter={x:Static converters:BooleanToVisibilityConverter.Instance}}" />
+          <Setter TargetName="DefaultErrorViewer" Property="Visibility" Value="{Binding ElementName=Placeholder, Path=AdornedElement.IsKeyboardFocusWithin, Mode=OneWay, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
         </MultiDataTrigger.Setters>
       </MultiDataTrigger>