diff --git a/Material.Avalonia.Demo/Pages/ComboBoxesDemo.axaml b/Material.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
index 9e045c1f..ffe7ce07 100644
--- a/Material.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
+++ b/Material.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:showMeTheXaml="clr-namespace:ShowMeTheXaml;assembly=ShowMeTheXaml.Avalonia"
-             xmlns:assist="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
+             xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
              xmlns:system="clr-namespace:System;assembly=System.Runtime"
              xmlns:generic="using:System.Collections.Generic"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
@@ -46,7 +46,7 @@
             </ComboBox>
           </showMeTheXaml:XamlDisplay>
           <showMeTheXaml:XamlDisplay UniqueId="ComboBoxes3">
-            <ComboBox Theme="{StaticResource MaterialOutlineComboBox}" assist:ComboBoxAssist.Label="ComboBox">
+            <ComboBox Theme="{StaticResource MaterialOutlineComboBox}" assists:ComboBoxAssist.Label="ComboBox">
               <ComboBoxItem>Item 1</ComboBoxItem>
               <ComboBoxItem>Item 2</ComboBoxItem>
               <ComboBoxItem>Item 3</ComboBoxItem>
@@ -54,7 +54,7 @@
             </ComboBox>
           </showMeTheXaml:XamlDisplay>
           <showMeTheXaml:XamlDisplay UniqueId="ComboBoxesDense">
-            <ComboBox Theme="{StaticResource MaterialOutlineComboBox}" assist:ComboBoxAssist.Label="ComboBoxDense"
+            <ComboBox Theme="{StaticResource MaterialOutlineComboBox}" assists:ComboBoxAssist.Label="ComboBoxDense"
                       Classes="dense">
               <ComboBoxItem>Item 1</ComboBoxItem>
               <ComboBoxItem>Item 2</ComboBoxItem>
@@ -100,7 +100,7 @@
             </AutoCompleteBox>
           </showMeTheXaml:XamlDisplay>
           <showMeTheXaml:XamlDisplay UniqueId="AutoCompleteBoxes1">
-            <AutoCompleteBox Watermark="Select a Item">
+            <AutoCompleteBox assists:TextFieldAssist.Label="Countries" assists:AutoCompleteBoxAssist.UseFloatingWatermark="True" Watermark="Select a Item">
               <AutoCompleteBox.ItemsSource>
                 <generic:List x:TypeArguments="x:String">
                   <sys:String>Alabama</sys:String>
@@ -116,7 +116,7 @@
             </AutoCompleteBox>
           </showMeTheXaml:XamlDisplay>
           <showMeTheXaml:XamlDisplay UniqueId="AutoCompleteBoxes2">
-            <AutoCompleteBox Theme="{StaticResource MaterialFilledAutoCompleteBox}" Watermark="Select a Item">
+            <AutoCompleteBox assists:TextFieldAssist.Label="Countries" assists:AutoCompleteBoxAssist.UseFloatingWatermark="True" Theme="{StaticResource MaterialFilledAutoCompleteBox}" Watermark="Select a Item">
               <AutoCompleteBox.ItemsSource>
                 <generic:List x:TypeArguments="x:String">
                   <sys:String>Alabama</sys:String>
diff --git a/Material.Styles/Assists/AutoCompleteBoxAssist.cs b/Material.Styles/Assists/AutoCompleteBoxAssist.cs
new file mode 100644
index 00000000..716b8635
--- /dev/null
+++ b/Material.Styles/Assists/AutoCompleteBoxAssist.cs
@@ -0,0 +1,16 @@
+using Avalonia;
+using Avalonia.Controls;
+
+namespace Material.Styles.Assists {
+    public static class AutoCompleteBoxAssist {
+        public static readonly AttachedProperty<bool> UseFloatingWatermarkProperty =
+            AvaloniaProperty.RegisterAttached<AutoCompleteBox, bool>(
+                "UseFloatingWatermark", typeof(AutoCompleteBox), false);
+
+        public static void SetUseFloatingWatermark(AvaloniaObject element, bool value) =>
+            element.SetValue(UseFloatingWatermarkProperty, value);
+
+        public static bool GetUseFloatingWatermark(AvaloniaObject element) =>
+            element.GetValue(UseFloatingWatermarkProperty);
+    }
+}
\ No newline at end of file
diff --git a/Material.Styles/Resources/Themes/AutoCompleteBox.axaml b/Material.Styles/Resources/Themes/AutoCompleteBox.axaml
index d1750e7b..45797309 100644
--- a/Material.Styles/Resources/Themes/AutoCompleteBox.axaml
+++ b/Material.Styles/Resources/Themes/AutoCompleteBox.axaml
@@ -1,11 +1,7 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:assists="clr-namespace:Material.Styles.Assists;assembly=Material.Styles">
   <ControlTheme x:Key="MaterialAutoCompleteBox" TargetType="AutoCompleteBox">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="{DynamicResource MaterialTextBoxBorderBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Padding" Value="4" />
-    <Setter Property="Margin" Value="4" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
@@ -14,9 +10,12 @@
                    BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
                    CornerRadius="{TemplateBinding CornerRadius}"
+                   InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                   InnerRightContent="{TemplateBinding InnerRightContent}"
                    Padding="{TemplateBinding Padding}"
-                   Margin="{TemplateBinding Margin}"
+                   UseFloatingWatermark="{TemplateBinding assists:AutoCompleteBoxAssist.UseFloatingWatermark}"
                    Watermark="{TemplateBinding Watermark}"
+                   assists:TextFieldAssist.Label="{TemplateBinding assists:TextFieldAssist.Label}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
 
           <Popup Name="PART_Popup"
@@ -46,29 +45,22 @@
   <ControlTheme x:Key="MaterialFilledAutoCompleteBox"
                 BasedOn="{StaticResource MaterialAutoCompleteBox}"
                 TargetType="AutoCompleteBox">
-    <Setter Property="Background" Value="{DynamicResource MaterialTextFieldBoxBackgroundBrush}" />
     <Setter Property="CornerRadius" Value="4,4,0,0" />
-    <Setter Property="Padding" Value="16,8" />
+
+    <Style Selector="^ /template/ TextBox#PART_TextBox">
+      <Setter Property="Theme" Value="{DynamicResource FilledTextBox}" />
+    </Style>
+
+    <Style Selector="^:pointerover">
+      <Setter Property="Background" Value="{DynamicResource MaterialTextFieldBoxHoverBackgroundBrush}" />
+    </Style>
   </ControlTheme>
 
   <ControlTheme x:Key="MaterialOutlineAutoCompleteBox"
                 BasedOn="{StaticResource MaterialAutoCompleteBox}"
                 TargetType="AutoCompleteBox">
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource MaterialTextBoxBorderBrush}" />
-    <Setter Property="CornerRadius" Value="4" />
-    <Setter Property="Padding" Value="16,8" />
-
-    <Style Selector="^">
-      <Setter Property="BorderThickness" Value="1" />
-    </Style>
-
-    <Style Selector="^:focus-within">
-      <Setter Property="BorderBrush" Value="{DynamicResource MaterialPrimaryMidBrush}" />
-      <Setter Property="BorderThickness" Value="2" />
-      <Style Selector="^ /template/ TextBlock#floatingWatermark">
-        <Setter Property="Foreground" Value="{DynamicResource MaterialPrimaryMidBrush}" />
-      </Style>
+    <Style Selector="^ /template/ TextBox#PART_TextBox">
+      <Setter Property="Theme" Value="{DynamicResource OutlineTextBox}" />
     </Style>
   </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file