diff --git a/MainDemo.Wpf/ComboBoxes.xaml b/MainDemo.Wpf/ComboBoxes.xaml
index e28f24cbf8..cf7d5c00ad 100644
--- a/MainDemo.Wpf/ComboBoxes.xaml
+++ b/MainDemo.Wpf/ComboBoxes.xaml
@@ -311,6 +311,21 @@
                     </ComboBox.SelectedItem>
                 </ComboBox>
             </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay
+                UniqueKey="comboboxes_helpertext_filled_combobox"
+                HorizontalAlignment="Left">
+
+                <ComboBox
+                    Style="{StaticResource MaterialDesignFilledComboBox}" 
+                    materialDesign:HintAssist.Hint="With helper text"
+                    materialDesign:HintAssist.HelperText="Helper text"
+                    Width="256">
+                    <ComboBoxItem Content="Item 1"/>
+                    <ComboBoxItem Content="Item 2"/>
+                    <ComboBoxItem Content="Item 3"/>
+                </ComboBox>
+            </smtx:XamlDisplay>
         </StackPanel>
 
         <TextBlock
@@ -375,6 +390,21 @@
                     </ComboBox.SelectedItem>
                 </ComboBox>
             </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay
+                UniqueKey="comboboxes_helpertext_outlined_combobox"
+                HorizontalAlignment="Left">
+
+                <ComboBox
+                    Style="{StaticResource MaterialDesignOutlinedComboBox}" 
+                    materialDesign:HintAssist.Hint="With helper text"
+                    materialDesign:HintAssist.HelperText="Helper text"
+                    Width="256">
+                    <ComboBoxItem Content="Item 1"/>
+                    <ComboBoxItem Content="Item 2"/>
+                    <ComboBoxItem Content="Item 3"/>
+                </ComboBox>
+            </smtx:XamlDisplay>
         </StackPanel>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/MainDemo.Wpf/Fields.xaml b/MainDemo.Wpf/Fields.xaml
index 5d381fb0d3..6d93d23ea2 100644
--- a/MainDemo.Wpf/Fields.xaml
+++ b/MainDemo.Wpf/Fields.xaml
@@ -302,6 +302,7 @@
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
 
             <Grid.Resources>
@@ -377,6 +378,17 @@
                         materialDesign:HintAssist.Hint="Password"/>
                 </StackPanel>
             </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay
+                Grid.Row="1"
+                Grid.Column="4"
+                UniqueKey="passwordFilled1"
+                VerticalAlignment="Bottom">
+                <PasswordBox
+                        Style="{StaticResource MaterialDesignFilledPasswordBox}"
+                        materialDesign:HintAssist.Hint="Password"
+                        materialDesign:HintAssist.HelperText="Helper text"/>
+            </smtx:XamlDisplay>
         </Grid>
 
         <Grid Margin="0 48 0 0">
@@ -389,6 +401,7 @@
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
 
             <Grid.Resources>
@@ -470,6 +483,17 @@
                         materialDesign:HintAssist.Hint="Password"/>
                 </StackPanel>
             </smtx:XamlDisplay>
+
+            <smtx:XamlDisplay
+                Grid.Row="1"
+                Grid.Column="4"
+                UniqueKey="passwordOutlined1"
+                Margin="0 34 0 0">
+                <PasswordBox
+                        Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
+                        materialDesign:HintAssist.Hint="Password"
+                        materialDesign:HintAssist.HelperText="Helper text"/>
+            </smtx:XamlDisplay>
         </Grid>
 
         <Grid
diff --git a/MainDemo.Wpf/Pickers.xaml b/MainDemo.Wpf/Pickers.xaml
index d87b2b3e98..1a2e4c2b69 100644
--- a/MainDemo.Wpf/Pickers.xaml
+++ b/MainDemo.Wpf/Pickers.xaml
@@ -184,6 +184,7 @@
                         <DatePicker
                             Width="140"
                             materialDesign:HintAssist.Hint="Pick Date"
+                            materialDesign:HintAssist.HelperText="Helper text"
                             Style="{StaticResource MaterialDesignFilledDatePicker}"/>
                     </smtx:XamlDisplay>
 
@@ -194,6 +195,7 @@
                         <DatePicker
                             Width="140"
                             materialDesign:HintAssist.Hint="Pick Date"
+                            materialDesign:HintAssist.HelperText="Helper text"
                             Style="{StaticResource MaterialDesignOutlinedDatePicker}"/>
                     </smtx:XamlDisplay>
                 </StackPanel>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
index ebfcd4bf36..ff4ac30442 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
@@ -416,6 +416,7 @@
                     CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
                     Background="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}" />
                 <Canvas
+                    x:Name="HelperTextWrapper"
                     VerticalAlignment="Bottom">
                     <TextBlock
                         Canvas.Top="2"
@@ -535,6 +536,10 @@
             </Grid>
         </AdornerDecorator>
         <ControlTemplate.Triggers>
+            <Trigger Property="wpf:TextFieldAssist.HasFilledTextField" Value="True">
+                <Setter Property="Padding" Value="16 8 12 8" />
+                <Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
+            </Trigger>
             <Trigger
                 Property="wpf:TextFieldAssist.HasOutlinedTextField"
                 Value="True">
@@ -606,6 +611,7 @@
                         </MultiBinding>
                     </Setter.Value>
                 </Setter>
+                <Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
             </Trigger>
             <Trigger
                 Property="IsEditable"
@@ -1360,6 +1366,7 @@
     </Style>
 
     <Style x:Key="MaterialDesignFilledComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource MaterialDesignFloatingHintComboBox}">
+        <Setter Property="wpf:TextFieldAssist.HasFilledTextField" Value="True"/>
         <Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4,4,0,0" />
         <Setter Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="True"/>
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
index 88bc4194a8..46393085d7 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
@@ -213,7 +213,7 @@
                             Visibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}"
                             CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
                             Background="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}" />
-                        <Canvas VerticalAlignment="Bottom">
+                        <Canvas x:Name="HelperTextWrapper" VerticalAlignment="Bottom">
                             <TextBlock
                                 Canvas.Top="2"
                                 FontSize="{TemplateBinding wpf:HintAssist.HelperTextFontSize}"
@@ -258,14 +258,15 @@
                             </Setter>
                         </MultiTrigger>
                         <Trigger Property="wpf:TextFieldAssist.HasFilledTextField" Value="True">
-                            <Setter Property="Padding" Value="16 8" />
+                            <Setter Property="Padding" Value="16 8 12 8" />
                             <Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
+                            <Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
                         </Trigger>
                         <Trigger Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True">
                             <Setter Property="VerticalContentAlignment" Value="Top" />
                             <Setter Property="BorderThickness" Value="1" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
-                            <Setter Property="Padding" Value="16" />
+                            <Setter Property="Padding" Value="16 16 12 16" />
                             <Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
                             <Setter TargetName="HintWrapper" Property="Opacity"
@@ -281,6 +282,7 @@
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
+                            <Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
index 0e596774d6..c3afc10215 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -158,7 +158,7 @@
                             Background="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}"
                             CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
                             Visibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}" />
-                        <Canvas VerticalAlignment="Bottom">
+                        <Canvas x:Name="HelperTextWrapper" VerticalAlignment="Bottom">
                             <TextBlock
                                 Canvas.Top="2"
                                 MaxWidth="{Binding ActualWidth, ElementName=border}"
@@ -251,15 +251,16 @@
                             </Setter>
                         </MultiTrigger>
                         <Trigger Property="wpf:TextFieldAssist.HasFilledTextField" Value="True">
-                            <Setter Property="Padding" Value="16,8" />
+                            <Setter Property="Padding" Value="16 8 12 8" />
                             <Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
                             <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMarginEmbedded}" />
+                            <Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
                         </Trigger>
                         <Trigger Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True">
                             <Setter Property="VerticalContentAlignment" Value="Top" />
                             <Setter Property="BorderThickness" Value="1" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
-                            <Setter Property="Padding" Value="16" />
+                            <Setter Property="Padding" Value="16 16 12 16" />
                             <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMarginEmbedded}" />
                             <Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
@@ -275,6 +276,7 @@
                                     </MultiBinding>
                                 </Setter.Value>
                             </Setter>
+                            <Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>