diff --git a/src/MaterialDesignDemo.Shared/Examples/NumericUpDown/BasicUsageExample.xaml b/src/MaterialDesignDemo.Shared/Examples/NumericUpDown/BasicUsageExample.xaml
index 4a69b691f8..a6903799df 100644
--- a/src/MaterialDesignDemo.Shared/Examples/NumericUpDown/BasicUsageExample.xaml
+++ b/src/MaterialDesignDemo.Shared/Examples/NumericUpDown/BasicUsageExample.xaml
@@ -30,7 +30,7 @@
         <StackPanel Margin="8">
           <TextBlock Text="Floating" />
           <smtx:XamlDisplay UniqueKey="NumericUpDown_BasicUsage_2">
-            <materialDesign:NumericUpDown Width="150" Style="{StaticResource MaterialDesignFloatingHintNumericUpDown}" />
+            <materialDesign:NumericUpDown Width="150" materialDesign:HintAssist.Hint="Hint" Style="{StaticResource MaterialDesignFloatingHintNumericUpDown}" />
           </smtx:XamlDisplay>
 
         </StackPanel>
diff --git a/src/MaterialDesignThemes.Wpf/TextFieldAssist.cs b/src/MaterialDesignThemes.Wpf/TextFieldAssist.cs
index 2a26e8529d..c33dd96df7 100644
--- a/src/MaterialDesignThemes.Wpf/TextFieldAssist.cs
+++ b/src/MaterialDesignThemes.Wpf/TextFieldAssist.cs
@@ -434,6 +434,14 @@ public static void SetTextBoxIsMultiLine(DependencyObject element, bool value)
     public static bool GetTextBoxIsMultiLine(DependencyObject element)
         => (bool)element.GetValue(TextBoxIsMultiLineProperty);
 
+    internal static DependencyObject? GetTrailingContent(DependencyObject obj)
+        => (DependencyObject?)obj.GetValue(TrailingContentProperty);
+
+    internal static void SetTrailingContent(DependencyObject obj, DependencyObject? value) => obj.SetValue(TrailingContentProperty, value);
+
+    internal static readonly DependencyProperty TrailingContentProperty =
+        DependencyProperty.RegisterAttached("TrailingContent", typeof(DependencyObject), typeof(TextFieldAssist), new PropertyMetadata(null));
+
     #region Methods
 
     private static void IncludeSpellingSuggestionsChanged(DependencyObject element, DependencyPropertyChangedEventArgs e)
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.NumericUpDown.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.NumericUpDown.xaml
index 7f3ec12a90..bbaf7730a6 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.NumericUpDown.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.NumericUpDown.xaml
@@ -13,7 +13,7 @@
          TargetType="{x:Type ButtonBase}"
          BasedOn="{StaticResource MaterialDesignFlatButton}">
     <Setter Property="Focusable" Value="False" />
-    <Setter Property="Height" Value="18" />
+    <Setter Property="Height" Value="17" />
     <Setter Property="Padding" Value="0" />
     <Setter Property="VerticalAlignment" Value="Center" />
   </Style>
@@ -47,77 +47,72 @@
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type wpf:UpDownBase}">
           <ControlTemplate.Resources>
-            <converters:ThicknessCloneConverter x:Key="PartButtonMarginConverter"
-                                                CloneEdges="Top,Right,Bottom"
-                                                FixedLeft="0" />
             <converters:NonDefaultThicknessConverter x:Key="OutlinedBorderInactiveThicknessConverter" DefaultThickness="{x:Static wpf:Constants.DefaultOutlinedBorderInactiveThickness}" />
             <converters:NonDefaultThicknessConverter x:Key="OutlinedBorderActiveThicknessConverter" DefaultThickness="{x:Static wpf:Constants.DefaultOutlinedBorderActiveThickness}" />
           </ControlTemplate.Resources>
-          <Border CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}">
-            <Grid>
-              <TextBox x:Name="PART_TextBox"
-                       Background="{TemplateBinding Background}"
-                       Padding="{TemplateBinding Padding}"
-                       VerticalAlignment="Stretch"
-                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                       internal:InternalTextFieldAssist.IsMouseOver="{TemplateBinding IsMouseOver}"
-                       wpf:HintAssist.Background="{TemplateBinding wpf:HintAssist.Background}"
-                       wpf:HintAssist.FloatingOffset="{TemplateBinding wpf:HintAssist.FloatingOffset}"
-                       wpf:HintAssist.FloatingScale="{TemplateBinding wpf:HintAssist.FloatingScale}"
-                       wpf:HintAssist.FontFamily="{TemplateBinding wpf:HintAssist.FontFamily}"
-                       wpf:HintAssist.Foreground="{TemplateBinding wpf:HintAssist.Foreground}"
-                       wpf:HintAssist.HelperTextStyle="{TemplateBinding wpf:HintAssist.HelperTextStyle}"
-                       wpf:HintAssist.Hint="{TemplateBinding wpf:HintAssist.Hint}"
-                       wpf:HintAssist.HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                       wpf:HintAssist.HintPaddingBrush="{TemplateBinding wpf:HintAssist.HintPaddingBrush}"
-                       wpf:HintAssist.IsFloating="{TemplateBinding wpf:HintAssist.IsFloating}"
-                       wpf:TextFieldAssist.DecorationVisibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}"
-                       wpf:TextFieldAssist.HasClearButton="{TemplateBinding wpf:TextFieldAssist.HasClearButton}"
-                       wpf:TextFieldAssist.HasFilledTextField="{TemplateBinding wpf:TextFieldAssist.HasFilledTextField}"
-                       wpf:TextFieldAssist.HasLeadingIcon="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon}"
-                       wpf:TextFieldAssist.HasOutlinedTextField="{TemplateBinding wpf:TextFieldAssist.HasOutlinedTextField}"
-                       wpf:TextFieldAssist.HasTrailingIcon="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon}"
-                       wpf:TextFieldAssist.IconVerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
-                       wpf:TextFieldAssist.LeadingIcon="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
-                       wpf:TextFieldAssist.LeadingIconSize="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
-                       wpf:TextFieldAssist.NewSpecHighlightingEnabled="{TemplateBinding wpf:TextFieldAssist.NewSpecHighlightingEnabled}"
-                       wpf:TextFieldAssist.OutlinedBorderActiveThickness="{TemplateBinding wpf:TextFieldAssist.OutlinedBorderActiveThickness}"
-                       wpf:TextFieldAssist.PrefixText="{TemplateBinding wpf:TextFieldAssist.PrefixText}"
-                       wpf:TextFieldAssist.PrefixTextHintBehavior="{TemplateBinding wpf:TextFieldAssist.PrefixTextHintBehavior}"
-                       wpf:TextFieldAssist.PrefixTextVisibility="{TemplateBinding wpf:TextFieldAssist.PrefixTextVisibility}"
-                       wpf:TextFieldAssist.RippleOnFocusEnabled="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled}"
-                       wpf:TextFieldAssist.SuffixText="{TemplateBinding wpf:TextFieldAssist.SuffixText}"
-                       wpf:TextFieldAssist.SuffixTextHintBehavior="{TemplateBinding wpf:TextFieldAssist.SuffixTextHintBehavior}"
-                       wpf:TextFieldAssist.SuffixTextVisibility="{TemplateBinding wpf:TextFieldAssist.SuffixTextVisibility}"
-                       wpf:TextFieldAssist.TextBoxViewMargin="{TemplateBinding wpf:TextFieldAssist.TextBoxViewMargin}"
-                       wpf:TextFieldAssist.TextBoxViewVerticalAlignment="{TemplateBinding wpf:TextFieldAssist.TextBoxViewVerticalAlignment}"
-                       wpf:TextFieldAssist.TextFieldCornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
-                       wpf:TextFieldAssist.TrailingIcon="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
-                       wpf:TextFieldAssist.TrailingIconSize="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
-                       wpf:TextFieldAssist.UnderlineBrush="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}"
-                       wpf:TextFieldAssist.UnderlineCornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       Focusable="{TemplateBinding Focusable}"
-                       Style="{DynamicResource NestedTextBoxStyle}" />
-
-              <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Background="Transparent">
+          <TextBox x:Name="PART_TextBox"
+                   Padding="{TemplateBinding Padding}"
+                   VerticalAlignment="Stretch"
+                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                   internal:InternalTextFieldAssist.IsMouseOver="{TemplateBinding IsMouseOver}"
+                   wpf:HintAssist.Background="{TemplateBinding wpf:HintAssist.Background}"
+                   wpf:HintAssist.FloatingOffset="{TemplateBinding wpf:HintAssist.FloatingOffset}"
+                   wpf:HintAssist.FloatingScale="{TemplateBinding wpf:HintAssist.FloatingScale}"
+                   wpf:HintAssist.FontFamily="{TemplateBinding wpf:HintAssist.FontFamily}"
+                   wpf:HintAssist.Foreground="{TemplateBinding wpf:HintAssist.Foreground}"
+                   wpf:HintAssist.HelperTextStyle="{TemplateBinding wpf:HintAssist.HelperTextStyle}"
+                   wpf:HintAssist.Hint="{TemplateBinding wpf:HintAssist.Hint}"
+                   wpf:HintAssist.HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                   wpf:HintAssist.HintPaddingBrush="{TemplateBinding wpf:HintAssist.HintPaddingBrush}"
+                   wpf:HintAssist.IsFloating="{TemplateBinding wpf:HintAssist.IsFloating}"
+                   wpf:TextFieldAssist.DecorationVisibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}"
+                   wpf:TextFieldAssist.HasClearButton="{TemplateBinding wpf:TextFieldAssist.HasClearButton}"
+                   wpf:TextFieldAssist.HasFilledTextField="{TemplateBinding wpf:TextFieldAssist.HasFilledTextField}"
+                   wpf:TextFieldAssist.HasLeadingIcon="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon}"
+                   wpf:TextFieldAssist.HasOutlinedTextField="{TemplateBinding wpf:TextFieldAssist.HasOutlinedTextField}"
+                   wpf:TextFieldAssist.HasTrailingIcon="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon}"
+                   wpf:TextFieldAssist.IconVerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
+                   wpf:TextFieldAssist.LeadingIcon="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
+                   wpf:TextFieldAssist.LeadingIconSize="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
+                   wpf:TextFieldAssist.NewSpecHighlightingEnabled="{TemplateBinding wpf:TextFieldAssist.NewSpecHighlightingEnabled}"
+                   wpf:TextFieldAssist.OutlinedBorderActiveThickness="{TemplateBinding wpf:TextFieldAssist.OutlinedBorderActiveThickness}"
+                   wpf:TextFieldAssist.PrefixText="{TemplateBinding wpf:TextFieldAssist.PrefixText}"
+                   wpf:TextFieldAssist.PrefixTextHintBehavior="{TemplateBinding wpf:TextFieldAssist.PrefixTextHintBehavior}"
+                   wpf:TextFieldAssist.PrefixTextVisibility="{TemplateBinding wpf:TextFieldAssist.PrefixTextVisibility}"
+                   wpf:TextFieldAssist.RippleOnFocusEnabled="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled}"
+                   wpf:TextFieldAssist.SuffixText="{TemplateBinding wpf:TextFieldAssist.SuffixText}"
+                   wpf:TextFieldAssist.SuffixTextHintBehavior="{TemplateBinding wpf:TextFieldAssist.SuffixTextHintBehavior}"
+                   wpf:TextFieldAssist.SuffixTextVisibility="{TemplateBinding wpf:TextFieldAssist.SuffixTextVisibility}"
+                   wpf:TextFieldAssist.TextBoxViewMargin="{TemplateBinding wpf:TextFieldAssist.TextBoxViewMargin}"
+                   wpf:TextFieldAssist.TextBoxViewVerticalAlignment="{TemplateBinding wpf:TextFieldAssist.TextBoxViewVerticalAlignment}"
+                   wpf:TextFieldAssist.TextFieldCornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
+                   wpf:TextFieldAssist.TrailingIcon="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
+                   wpf:TextFieldAssist.TrailingIconSize="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
+                   wpf:TextFieldAssist.UnderlineBrush="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}"
+                   wpf:TextFieldAssist.UnderlineCornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
+                   Background="{TemplateBinding Background}"
+                   BorderBrush="{TemplateBinding BorderBrush}"
+                   BorderThickness="{TemplateBinding BorderThickness}"
+                   Focusable="{TemplateBinding Focusable}"
+                   Style="{DynamicResource NestedTextBoxStyle}">
+            <wpf:TextFieldAssist.TrailingContent>
+              <StackPanel HorizontalAlignment="Right"
+                          Background="Transparent"
+                          Orientation="Horizontal">
                 <RepeatButton x:Name="PART_DecreaseButton"
-                            Margin="{TemplateBinding Padding, Converter={StaticResource PartButtonMarginConverter}}"
-                            Content="{TemplateBinding DecreaseContent}"
-                            Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}"
-                            Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                            Style="{DynamicResource NestedNumericUpDownButtonsStyle}" />
+                              Content="{TemplateBinding DecreaseContent}"
+                              Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}"
+                              Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                              Style="{DynamicResource NestedNumericUpDownButtonsStyle}" />
                 <RepeatButton x:Name="PART_IncreaseButton"
-                            Margin="{TemplateBinding Padding, Converter={StaticResource PartButtonMarginConverter}}"
-                            Content="{TemplateBinding IncreaseContent}"
-                            Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}"
-                            Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                            Style="{DynamicResource NestedNumericUpDownButtonsStyle}" />
+                              Content="{TemplateBinding IncreaseContent}"
+                              Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}"
+                              Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                              Style="{DynamicResource NestedNumericUpDownButtonsStyle}" />
               </StackPanel>
-            </Grid>
-          </Border>
+            </wpf:TextFieldAssist.TrailingContent>
+          </TextBox>
           <ControlTemplate.Triggers>
             <!-- PART_Button hovering -->
             <MultiTrigger>
@@ -178,16 +173,16 @@
          BasedOn="{StaticResource MaterialDesignFloatingHintUpDownBase}" />
 
   <Style x:Key="MaterialDesignFloatingHintDecimalUpDown"
-       TargetType="{x:Type wpf:DecimalUpDown}"
-       BasedOn="{StaticResource MaterialDesignFloatingHintUpDownBase}" />
+         TargetType="{x:Type wpf:DecimalUpDown}"
+         BasedOn="{StaticResource MaterialDesignFloatingHintUpDownBase}" />
 
   <Style x:Key="MaterialDesignFloatingHintLongUpDown"
-       TargetType="{x:Type wpf:LongUpDown}"
-       BasedOn="{StaticResource MaterialDesignFloatingHintUpDownBase}" />
+         TargetType="{x:Type wpf:LongUpDown}"
+         BasedOn="{StaticResource MaterialDesignFloatingHintUpDownBase}" />
 
   <Style x:Key="MaterialDesignFloatingHintDoubleUpDown"
-       TargetType="{x:Type wpf:DoubleUpDown}"
-       BasedOn="{StaticResource MaterialDesignFloatingHintUpDownBase}" />
+         TargetType="{x:Type wpf:DoubleUpDown}"
+         BasedOn="{StaticResource MaterialDesignFloatingHintUpDownBase}" />
 
   <Style x:Key="MaterialDesignFilledUpDownBase"
          TargetType="{x:Type wpf:UpDownBase}"
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
index 670cb90621..09472bf46d 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+                    xmlns:behaviors="clr-namespace:MaterialDesignThemes.Wpf.Behaviors"
+                    xmlns:behaviorsInternal="clr-namespace:MaterialDesignThemes.Wpf.Behaviors.Internal"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
                     xmlns:convertersInternal="clr-namespace:MaterialDesignThemes.Wpf.Converters.Internal"
                     xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal"
-                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
-                    xmlns:behaviors="clr-namespace:MaterialDesignThemes.Wpf.Behaviors"
-                    xmlns:behaviorsInternal="clr-namespace:MaterialDesignThemes.Wpf.Behaviors.Internal"
-                    xmlns:b="http://schemas.microsoft.com/xaml/behaviors">
+                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
@@ -32,7 +32,7 @@
           <Binding Converter="{x:Static converters:StringLengthValueConverter.Instance}"
                    Path="Text"
                    RelativeSource="{RelativeSource FindAncestor,
-                                                 AncestorType=TextBoxBase}" />
+                                                   AncestorType=TextBoxBase}" />
           <Binding Path="MaxLength" RelativeSource="{RelativeSource FindAncestor, AncestorType=TextBoxBase}" />
         </MultiBinding>
       </Setter.Value>
@@ -47,14 +47,18 @@
       <converters:TextFieldPrefixTextVisibilityConverter x:Key="PrefixSuffixTextVisibilityConverter" HiddenState="Collapsed" />
       <converters:BooleanToDashStyleConverter x:Key="BooleanToDashStyleConverter" TrueValue="{x:Static DashStyles.Solid}" />
       <converters:ThicknessCloneConverter x:Key="HelperTextMarginConverter" CloneEdges="Left,Right" />
-      <converters:MathConverter x:Key="DivisionConverter" Operation="Divide" Offset="1.5" />
-      <converters:ThicknessCloneConverter x:Key="ThicknessCloneConverter" CloneEdges="All" AdditionalOffsetBottom="-1" />
+      <converters:MathConverter x:Key="DivisionConverter"
+                                Operation="Divide"
+                                Offset="1.5" />
+      <converters:ThicknessCloneConverter x:Key="ThicknessCloneConverter"
+                                          AdditionalOffsetBottom="-1"
+                                          CloneEdges="All" />
       <convertersInternal:TextBoxHorizontalScrollBarMarginConverter x:Key="TextBoxHorizontalScrollBarMarginConverter" />
       <convertersInternal:TextBoxHorizontalScrollBarWidthConverter x:Key="TextBoxHorizontalScrollBarWidthConverter" />
     </Style.Resources>
+    <Setter Property="AllowDrop" Value="true" />
 
     <Setter Property="AutomationProperties.Name" Value="{Binding Path=(wpf:HintAssist.Hint), RelativeSource={RelativeSource Self}, Converter={x:Static convertersInternal:AutomationPropertiesNameConverter.Instance}}" />
-    <Setter Property="AllowDrop" Value="true" />
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.TextBox.Border}" />
     <Setter Property="BorderThickness" Value="0,0,0,1" />
@@ -63,7 +67,6 @@
     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
     <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), FallbackValue=Black}" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
     <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
     <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
     <Setter Property="SelectionBrush" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
@@ -142,98 +145,103 @@
                   </Grid.RowDefinitions>
 
                   <Grid x:Name="ContentGrid"
-                      MinHeight="16"
-                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
+                        MinHeight="16"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="*" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
 
-                  <wpf:PackIcon x:Name="LeadingPackIcon"
-                                Grid.Column="0"
-                                Width="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
-                                Height="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
-                                Margin="0,0,6,0"
-                                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.CollapsedInstance}}" />
+                    <wpf:PackIcon x:Name="LeadingPackIcon"
+                                  Grid.Column="0"
+                                  Width="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
+                                  Height="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
+                                  Margin="0,0,6,0"
+                                  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.CollapsedInstance}}" />
 
                     <ScrollViewer x:Name="PART_ContentHost"
-                                Grid.Column="2"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Panel.ZIndex="1"
-                                wpf:ScrollViewerAssist.IgnorePadding="True"
-                                Cursor="{TemplateBinding Cursor, Converter={x:Static converters:CursorConverter.IBeamInstance}}"
-                                Focusable="False"
-                                HorizontalScrollBarVisibility="Hidden"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
-                                VerticalScrollBarVisibility="Hidden">
+                                  Grid.Column="2"
+                                  HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Center"
+                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  Panel.ZIndex="1"
+                                  wpf:ScrollViewerAssist.IgnorePadding="True"
+                                  Cursor="{TemplateBinding Cursor, Converter={x:Static converters:CursorConverter.IBeamInstance}}"
+                                  Focusable="False"
+                                  HorizontalScrollBarVisibility="Hidden"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                  UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
+                                  VerticalScrollBarVisibility="Hidden">
                       <b:Interaction.Behaviors>
                         <behaviorsInternal:TextBoxHorizontalScrollBarBehavior TargetScrollBar="{Binding ElementName=CustomScrollBar}" TargetScrollBarVisibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=HorizontalScrollBarVisibility}" />
                       </b:Interaction.Behaviors>
                     </ScrollViewer>
 
                     <wpf:SmartHint x:Name="Hint"
-                                 Grid.Column="1"
-                                 Grid.ColumnSpan="3"
-                                 VerticalAlignment="Center"
-                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                 FloatingOffset="{TemplateBinding wpf:HintAssist.FloatingOffset}"
-                                 FloatingScale="{TemplateBinding wpf:HintAssist.FloatingScale}"
-                                 FontFamily="{TemplateBinding wpf:HintAssist.FontFamily}"
-                                 FontSize="{TemplateBinding FontSize}"
-                                 HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
-                                 HintProxy="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static converters:HintProxyFabricConverter.Instance}}"
-                                 UseFloating="{TemplateBinding wpf:HintAssist.IsFloating}"
-                                 FloatingTarget="{Binding ElementName=PART_ContentHost}"
-                                 HintHost="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                 wpf:HintAssist.Background="{TemplateBinding wpf:HintAssist.Background}"
-                                 wpf:HintAssist.HintPaddingBrush="{TemplateBinding wpf:HintAssist.HintPaddingBrush}">
-                    <wpf:SmartHint.InitialHorizontalOffset>
-                      <MultiBinding Converter="{x:Static converters:FloatingHintInitialHorizontalOffsetConverter.Instance}">
-                        <Binding ElementName="PrefixTextBlock" Path="ActualWidth" />
-                        <Binding ElementName="PrefixTextBlock" Path="Margin" />
-                        <Binding ElementName="SuffixTextBlock" Path="ActualWidth" />
-                        <Binding ElementName="SuffixTextBlock" Path="Margin" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.PrefixTextVisibility)" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.SuffixTextVisibility)" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.PrefixTextHintBehavior)" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.SuffixTextHintBehavior)" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HorizontalContentAlignment" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="IsReadOnly" Converter="{x:Static converters:InvertBooleanConverter.Instance}" />
-                      </MultiBinding>
-                    </wpf:SmartHint.InitialHorizontalOffset>
-                    <wpf:SmartHint.Margin>
-                      <MultiBinding Converter="{x:Static converters:FloatingHintMarginConverter.Instance}">
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:HintAssist.IsFloating)" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="IsKeyboardFocusWithin" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="IsReadOnly" Converter="{x:Static converters:InvertBooleanConverter.Instance}" />
-                        <Binding ElementName="PrefixTextBlock" Path="ActualWidth" />
-                        <Binding ElementName="PrefixTextBlock" Path="Margin" />
-                        <Binding ElementName="SuffixTextBlock" Path="ActualWidth" />
-                        <Binding ElementName="SuffixTextBlock" Path="Margin" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.PrefixTextVisibility)" />
-                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.SuffixTextVisibility)" />
-                      </MultiBinding>
-                    </wpf:SmartHint.Margin>
-                    <wpf:SmartHint.Hint>
-                      <Border x:Name="HintBackgroundBorder"
-                              Background="{TemplateBinding wpf:HintAssist.Background}"
-                              CornerRadius="2">
-                        <ContentPresenter x:Name="HintWrapper" Content="{TemplateBinding wpf:HintAssist.Hint}" />
-                      </Border>
-                    </wpf:SmartHint.Hint>
-                  </wpf:SmartHint>
+                                   Grid.Column="1"
+                                   Grid.ColumnSpan="3"
+                                   VerticalAlignment="Center"
+                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   wpf:HintAssist.Background="{TemplateBinding wpf:HintAssist.Background}"
+                                   wpf:HintAssist.HintPaddingBrush="{TemplateBinding wpf:HintAssist.HintPaddingBrush}"
+                                   FloatingOffset="{TemplateBinding wpf:HintAssist.FloatingOffset}"
+                                   FloatingScale="{TemplateBinding wpf:HintAssist.FloatingScale}"
+                                   FloatingTarget="{Binding ElementName=PART_ContentHost}"
+                                   FontFamily="{TemplateBinding wpf:HintAssist.FontFamily}"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   HintHost="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                   HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                                   HintProxy="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static converters:HintProxyFabricConverter.Instance}}"
+                                   UseFloating="{TemplateBinding wpf:HintAssist.IsFloating}">
+                      <wpf:SmartHint.InitialHorizontalOffset>
+                        <MultiBinding Converter="{x:Static converters:FloatingHintInitialHorizontalOffsetConverter.Instance}">
+                          <Binding ElementName="PrefixTextBlock" Path="ActualWidth" />
+                          <Binding ElementName="PrefixTextBlock" Path="Margin" />
+                          <Binding ElementName="SuffixTextBlock" Path="ActualWidth" />
+                          <Binding ElementName="SuffixTextBlock" Path="Margin" />
+                          <Binding Path="(wpf:TextFieldAssist.PrefixTextVisibility)" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Path="(wpf:TextFieldAssist.SuffixTextVisibility)" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Path="(wpf:TextFieldAssist.PrefixTextHintBehavior)" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Path="(wpf:TextFieldAssist.SuffixTextHintBehavior)" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Path="HorizontalContentAlignment" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Converter="{x:Static converters:InvertBooleanConverter.Instance}"
+                                   Path="IsReadOnly"
+                                   RelativeSource="{RelativeSource TemplatedParent}" />
+                        </MultiBinding>
+                      </wpf:SmartHint.InitialHorizontalOffset>
+                      <wpf:SmartHint.Margin>
+                        <MultiBinding Converter="{x:Static converters:FloatingHintMarginConverter.Instance}">
+                          <Binding Path="(wpf:HintAssist.IsFloating)" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Path="IsKeyboardFocusWithin" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Converter="{x:Static converters:InvertBooleanConverter.Instance}"
+                                   Path="IsReadOnly"
+                                   RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding ElementName="PrefixTextBlock" Path="ActualWidth" />
+                          <Binding ElementName="PrefixTextBlock" Path="Margin" />
+                          <Binding ElementName="SuffixTextBlock" Path="ActualWidth" />
+                          <Binding ElementName="SuffixTextBlock" Path="Margin" />
+                          <Binding Path="(wpf:TextFieldAssist.PrefixTextVisibility)" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Path="(wpf:TextFieldAssist.SuffixTextVisibility)" RelativeSource="{RelativeSource TemplatedParent}" />
+                        </MultiBinding>
+                      </wpf:SmartHint.Margin>
+                      <wpf:SmartHint.Hint>
+                        <Border x:Name="HintBackgroundBorder"
+                                Background="{TemplateBinding wpf:HintAssist.Background}"
+                                CornerRadius="2">
+                          <ContentPresenter x:Name="HintWrapper" Content="{TemplateBinding wpf:HintAssist.Hint}" />
+                        </Border>
+                      </wpf:SmartHint.Hint>
+                    </wpf:SmartHint>
 
                     <TextBlock x:Name="PrefixTextBlock"
                                Grid.Column="1"
@@ -248,7 +256,9 @@
                           <Binding Path="(wpf:TextFieldAssist.PrefixText)" RelativeSource="{RelativeSource TemplatedParent}" />
                           <Binding Path="(wpf:TextFieldAssist.PrefixTextVisibility)" RelativeSource="{RelativeSource TemplatedParent}" />
                           <Binding Path="IsKeyboardFocusWithin" RelativeSource="{RelativeSource TemplatedParent}" />
-                          <Binding Path="IsReadOnly" RelativeSource="{RelativeSource TemplatedParent}" Converter="{x:Static converters:InvertBooleanConverter.Instance}" />
+                          <Binding Converter="{x:Static converters:InvertBooleanConverter.Instance}"
+                                   Path="IsReadOnly"
+                                   RelativeSource="{RelativeSource TemplatedParent}" />
                         </MultiBinding>
                       </TextBlock.Visibility>
                     </TextBlock>
@@ -266,7 +276,9 @@
                           <Binding Path="(wpf:TextFieldAssist.SuffixText)" RelativeSource="{RelativeSource TemplatedParent}" />
                           <Binding Path="(wpf:TextFieldAssist.SuffixTextVisibility)" RelativeSource="{RelativeSource TemplatedParent}" />
                           <Binding Path="IsKeyboardFocusWithin" RelativeSource="{RelativeSource TemplatedParent}" />
-                          <Binding Path="IsReadOnly" RelativeSource="{RelativeSource TemplatedParent}" Converter="{x:Static converters:InvertBooleanConverter.Instance}" />
+                          <Binding Converter="{x:Static converters:InvertBooleanConverter.Instance}"
+                                   Path="IsReadOnly"
+                                   RelativeSource="{RelativeSource TemplatedParent}" />
                         </MultiBinding>
                       </TextBlock.Visibility>
                     </TextBlock>
@@ -283,14 +295,14 @@
 
                     <Button x:Name="PART_ClearButton"
                             Grid.Column="5"
-                            Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
                             Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
-                            Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                            Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
                             Padding="2,0,0,0"
+                            VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
                             Command="{x:Static internal:ClearText.ClearCommand}"
                             Focusable="False"
                             Foreground="{TemplateBinding Foreground}"
-                            VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
+                            Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                             Style="{StaticResource MaterialDesignToolButton}">
                       <Button.Visibility>
                         <MultiBinding Converter="{StaticResource ClearButtonVisibilityConverter}">
@@ -299,11 +311,14 @@
                         </MultiBinding>
                       </Button.Visibility>
                       <wpf:PackIcon x:Name="ClearButtonIcon"
-                                    Margin="0"
-                                    Kind="CloseCircle"
+                                    Width="auto"
                                     Height="auto"
-                                    Width="auto" />
+                                    Margin="0"
+                                    Kind="CloseCircle" />
                     </Button>
+
+                    <ContentPresenter Grid.Column="6"
+                                      Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TextFieldAssist.TrailingContent)}" />
                   </Grid>
                   <ScrollBar x:Name="CustomScrollBar"
                              Grid.Row="1"
@@ -340,11 +355,10 @@
                            CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
                            Visibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}" />
 
-            <Canvas VerticalAlignment="Bottom"
-                    IsHitTestVisible="False">
+            <Canvas VerticalAlignment="Bottom" IsHitTestVisible="False">
               <Border Canvas.Top="2"
-                      Padding="{TemplateBinding Padding, Converter={StaticResource HelperTextMarginConverter}}"
-                      Width="{Binding ActualWidth, ElementName=OuterBorder}">
+                      Width="{Binding ActualWidth, ElementName=OuterBorder}"
+                      Padding="{TemplateBinding Padding, Converter={StaticResource HelperTextMarginConverter}}">
                 <Grid x:Name="FooterGrid">
                   <Grid.ColumnDefinitions>
                     <ColumnDefinition />
@@ -397,8 +411,8 @@
                 <Condition Property="wpf:HintAssist.IsFloating" Value="True" />
                 <Condition Property="IsKeyboardFocused" Value="True" />
               </MultiTrigger.Conditions>
-              <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
               <Setter TargetName="Hint" Property="Foreground" Value="{Binding Path=(wpf:HintAssist.Foreground), RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
             </MultiTrigger>
 
             <!-- Character counter -->
@@ -416,11 +430,11 @@
 
             <!-- Outlined text field -->
             <Trigger Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True">
-              <Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
-              <Setter TargetName="Hint" Property="FloatingTarget" Value="{Binding ElementName=OuterBorder}" />
               <Setter TargetName="Hint" Property="FloatingAlignment" Value="Center" />
               <Setter TargetName="Hint" Property="FloatingMargin" Value="4,0" />
+              <Setter TargetName="Hint" Property="FloatingTarget" Value="{Binding ElementName=OuterBorder}" />
               <Setter TargetName="Hint" Property="InitialVerticalOffset" Value="{Binding ElementName=Hint, Path=ActualHeight, Converter={StaticResource DivisionConverter}, ConverterParameter=2}" />
+              <Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
             </Trigger>
             <MultiTrigger>
               <MultiTrigger.Conditions>
@@ -437,21 +451,21 @@
                 <Condition Property="IsEnabled" Value="False" />
                 <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="False" />
               </MultiTrigger.Conditions>
+              <Setter TargetName="ContentGrid" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
               <Setter TargetName="OuterBorder" Property="BorderBrush" Value="Transparent" />
-              <Setter TargetName="OuterBorder" Property="wpf:BottomDashedLineAdorner.IsAttached" Value="True" />
               <Setter TargetName="OuterBorder" Property="wpf:BottomDashedLineAdorner.DashStyle" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:TextFieldAssist.HasFilledTextField), Converter={StaticResource BooleanToDashStyleConverter}}" />
-              <Setter TargetName="ContentGrid" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
+              <Setter TargetName="OuterBorder" Property="wpf:BottomDashedLineAdorner.IsAttached" Value="True" />
             </MultiTrigger>
             <MultiTrigger>
               <MultiTrigger.Conditions>
                 <Condition Property="IsEnabled" Value="False" />
                 <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
               </MultiTrigger.Conditions>
-              <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.TextBox.OutlineInactiveBorder}" />
-              <Setter TargetName="PART_ContentHost" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
               <Setter TargetName="HintWrapper" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
-              <Setter TargetName="PART_ClearButton" Property="Opacity" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:HintAssist.HintOpacity), Converter={x:Static converters:MathConverter.MultiplyInstance}, ConverterParameter={x:Static wpf:Constants.TextBoxNotEnabledOpacity}}" />
               <Setter TargetName="LeadingPackIcon" Property="Opacity" Value="{Binding ElementName=PART_ClearButton, Path=Opacity}" />
+              <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.TextBox.OutlineInactiveBorder}" />
+              <Setter TargetName="PART_ClearButton" Property="Opacity" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:HintAssist.HintOpacity), Converter={x:Static converters:MathConverter.MultiplyInstance}, ConverterParameter={x:Static wpf:Constants.TextBoxNotEnabledOpacity}}" />
+              <Setter TargetName="PART_ContentHost" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
               <Setter TargetName="PrefixTextBlock" Property="Opacity" Value="{Binding ElementName=PART_ClearButton, Path=Opacity}" />
               <Setter TargetName="SuffixTextBlock" Property="Opacity" Value="{Binding ElementName=PART_ClearButton, Path=Opacity}" />
               <Setter TargetName="TrailingPackIcon" Property="Opacity" Value="{Binding ElementName=PART_ClearButton, Path=Opacity}" />
@@ -459,8 +473,8 @@
 
             <!-- IsKeyboardFocused -->
             <Trigger Property="IsKeyboardFocused" Value="True">
-              <Setter TargetName="HintWrapper" Property="Opacity" Value="1" />
               <Setter Property="BorderBrush" Value="{Binding Path=(wpf:TextFieldAssist.UnderlineBrush), RelativeSource={RelativeSource Self}}" />
+              <Setter TargetName="HintWrapper" Property="Opacity" Value="1" />
               <Setter TargetName="Underline" Property="IsActive" Value="True" />
             </Trigger>
             <MultiTrigger>
@@ -470,8 +484,6 @@
                 <Condition Property="wpf:ValidationAssist.HasError" Value="False" />
                 <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
               </MultiTrigger.Conditions>
-              <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{Binding Path=(wpf:TextFieldAssist.UnderlineBrush), RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter TargetName="OuterBorder" Property="BorderThickness" Value="{Binding Path=(wpf:TextFieldAssist.OutlinedBorderActiveThickness), RelativeSource={RelativeSource TemplatedParent}}" />
               <Setter TargetName="ContentGrid" Property="Margin">
                 <Setter.Value>
                   <MultiBinding Converter="{x:Static converters:OutlinedStyleActiveBorderMarginCompensationConverter.Instance}">
@@ -480,6 +492,8 @@
                   </MultiBinding>
                 </Setter.Value>
               </Setter>
+              <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{Binding Path=(wpf:TextFieldAssist.UnderlineBrush), RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter TargetName="OuterBorder" Property="BorderThickness" Value="{Binding Path=(wpf:TextFieldAssist.OutlinedBorderActiveThickness), RelativeSource={RelativeSource TemplatedParent}}" />
             </MultiTrigger>
 
             <!-- IsMouseOver -->
@@ -521,7 +535,6 @@
                 <Condition Property="wpf:ValidationAssist.HasError" Value="False" />
                 <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
               </MultiTrigger.Conditions>
-              <Setter TargetName="OuterBorder" Property="BorderThickness" Value="{Binding Path=(wpf:TextFieldAssist.OutlinedBorderActiveThickness), RelativeSource={RelativeSource TemplatedParent}}" />
               <Setter TargetName="ContentGrid" Property="Margin">
                 <Setter.Value>
                   <MultiBinding Converter="{x:Static converters:OutlinedStyleActiveBorderMarginCompensationConverter.Instance}">
@@ -530,6 +543,7 @@
                   </MultiBinding>
                 </Setter.Value>
               </Setter>
+              <Setter TargetName="OuterBorder" Property="BorderThickness" Value="{Binding Path=(wpf:TextFieldAssist.OutlinedBorderActiveThickness), RelativeSource={RelativeSource TemplatedParent}}" />
             </MultiTrigger>
             <MultiTrigger>
               <MultiTrigger.Conditions>
@@ -560,7 +574,7 @@
                   <MultiBinding Converter="{x:Static converters:FloatingHintInitialVerticalOffsetConverter.Instance}">
                     <Binding ElementName="PART_ContentHost" Path="ActualHeight" />
                     <Binding ElementName="Hint" Path="ActualHeight" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.TextBoxLineCount)" />
+                    <Binding Path="(wpf:TextFieldAssist.TextBoxLineCount)" RelativeSource="{RelativeSource TemplatedParent}" />
                   </MultiBinding>
                 </Setter.Value>
               </Setter>
@@ -576,17 +590,15 @@
 
             <!-- Validation.HasError -->
             <Trigger Property="Validation.HasError" Value="true">
+              <Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.ValidationError}" />
               <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.ValidationError}" />
               <Setter TargetName="Underline" Property="Background" Value="{DynamicResource MaterialDesign.Brush.ValidationError}" />
-              <Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.ValidationError}" />
             </Trigger>
             <MultiTrigger>
               <MultiTrigger.Conditions>
                 <Condition Property="Validation.HasError" Value="True" />
                 <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
               </MultiTrigger.Conditions>
-              <Setter TargetName="FooterGrid" Property="Margin" Value="0,0,1,0" />
-              <Setter TargetName="OuterBorder" Property="BorderThickness" Value="{Binding Path=(wpf:TextFieldAssist.OutlinedBorderActiveThickness), RelativeSource={RelativeSource TemplatedParent}}" />
               <Setter TargetName="ContentGrid" Property="Margin">
                 <Setter.Value>
                   <MultiBinding Converter="{x:Static converters:OutlinedStyleActiveBorderMarginCompensationConverter.Instance}">
@@ -595,20 +607,20 @@
                   </MultiBinding>
                 </Setter.Value>
               </Setter>
+              <Setter TargetName="FooterGrid" Property="Margin" Value="0,0,1,0" />
+              <Setter TargetName="OuterBorder" Property="BorderThickness" Value="{Binding Path=(wpf:TextFieldAssist.OutlinedBorderActiveThickness), RelativeSource={RelativeSource TemplatedParent}}" />
             </MultiTrigger>
             <!-- ValidationAssist.HasError (when TextBox is nested inside another control) -->
             <Trigger Property="wpf:ValidationAssist.HasError" Value="true">
+              <Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.ValidationError}" />
               <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.ValidationError}" />
               <Setter TargetName="Underline" Property="Background" Value="{DynamicResource MaterialDesign.Brush.ValidationError}" />
-              <Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.ValidationError}" />
             </Trigger>
             <MultiTrigger>
               <MultiTrigger.Conditions>
                 <Condition Property="wpf:ValidationAssist.HasError" Value="True" />
                 <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
               </MultiTrigger.Conditions>
-              <Setter TargetName="FooterGrid" Property="Margin" Value="0,0,1,0" />
-              <Setter TargetName="OuterBorder" Property="BorderThickness" Value="{Binding Path=(wpf:TextFieldAssist.OutlinedBorderActiveThickness), RelativeSource={RelativeSource TemplatedParent}}" />
               <Setter TargetName="ContentGrid" Property="Margin">
                 <Setter.Value>
                   <MultiBinding Converter="{x:Static converters:OutlinedStyleActiveBorderMarginCompensationConverter.Instance}">
@@ -617,12 +629,15 @@
                   </MultiBinding>
                 </Setter.Value>
               </Setter>
+              <Setter TargetName="FooterGrid" Property="Margin" Value="0,0,1,0" />
+              <Setter TargetName="OuterBorder" Property="BorderThickness" Value="{Binding Path=(wpf:TextFieldAssist.OutlinedBorderActiveThickness), RelativeSource={RelativeSource TemplatedParent}}" />
             </MultiTrigger>
           </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
     <Setter Property="Validation.ErrorTemplate" Value="{StaticResource MaterialDesignValidationErrorTemplate}" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
     <Setter Property="internal:ClearText.HandlesClearCommand" Value="True" />
     <Setter Property="wpf:HintAssist.Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
     <Setter Property="wpf:HintAssist.HelperTextStyle" Value="{StaticResource MaterialDesignHelperTextBlock}" />
@@ -651,8 +666,8 @@
   <Style x:Key="MaterialDesignFloatingHintTextBox"
          TargetType="{x:Type TextBox}"
          BasedOn="{StaticResource MaterialDesignTextBox}">
-    <Setter Property="wpf:HintAssist.IsFloating" Value="True" />
     <Setter Property="Padding" Value="{x:Static wpf:Constants.FloatingTextBoxDefaultPadding}" />
+    <Setter Property="wpf:HintAssist.IsFloating" Value="True" />
   </Style>
 
   <Style x:Key="MaterialDesignFilledTextBox"