diff --git a/doc/styles/TextBox.md b/doc/styles/TextBox.md
index f0fda5cdb..66bfba144 100644
--- a/doc/styles/TextBox.md
+++ b/doc/styles/TextBox.md
@@ -75,6 +75,7 @@ IsDefaultStyle\*: Styles in this column will be set as the default implicit styl
 | `FilledTextBoxCharacterSpacing`                   | `Int32`           | `BodyLargeCharacterSpacing`   |
 | `FilledTextBoxBorderThicknessNormal`              | `Double`          | `TextBoxOutlinedStrokeHeight` |
 | `FilledTextBoxBorderThicknessFocused`             | `Double`          | `TextBoxFocusStrokeWidth`     |
+| `FilledTextBoxBorderHeightPointerOver`            | `Double`          | 2                             |
 | `MaterialTextBoxClearGlyphWidth`                  | `Double`          | 20                            |
 | `MaterialTextBoxClearGlyphHeight`                 | `Double`          | 20                            |
 | `MaterialFilledTextBoxCornerRadius`               | `CornerRadius`    | 4,4,0,0                       |
@@ -87,3 +88,7 @@ IsDefaultStyle\*: Styles in this column will be set as the default implicit styl
 | `MaterialOutlinedTextBoxMinHeight`                | `Double`          | 56                            |
 | `MaterialOutlinedTextBoxBorderPadding`            | `Thickness`       | 1                             |
 | `MaterialOutlinedTextBoxBorderThicknessFocused`   | `Double`          | 2                             |
+| `MaterialOutlinedTextBoxPaddingFocused`           | `Thickness`       | 0                             |
+| `MaterialOutlinedTextBoxPaddingPointerOver`       | `Thickness`       | 0                             |
+| `MaterialOutlinedTextBoxBorderThicknessPointerOver`| `Double`         | 2                             |
+| `MaterialFilledTextBoxBorderHeightNormal`         | `Double`          | 1                             |
diff --git a/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml
index 819230927..8fec55bcb 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml
@@ -82,6 +82,7 @@
 
 			<StaticResource x:Key="FilledTextBoxDeleteButtonForeground" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="FilledTextBoxDeleteButtonForegroundPointerOver" ResourceKey="OnSurfaceVariantBrush" />
+			<x:Double x:Key="FilledTextBoxBorderHeightPointerOver">2</x:Double>
 			<StaticResource x:Key="FilledTextBoxDeleteButtonForegroundFocused" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="FilledTextBoxDeleteButtonForegroundDisabled" ResourceKey="OnSurfaceLowBrush" />
 
@@ -162,6 +163,9 @@
 			<x:Double x:Key="MaterialOutlinedTextBoxMinHeight">56</x:Double>
 			<Thickness x:Key="MaterialOutlinedTextBoxBorderPadding">1</Thickness>
 			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessFocused">2</x:Double>
+			<Thickness x:Key="MaterialOutlinedTextBoxPaddingFocused">0</Thickness>
+			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessPointerOver">2</x:Double>
+			<Thickness x:Key="MaterialOutlinedTextBoxPaddingPointerOver">0</Thickness>
 			<!--#endregion-->
 		</ResourceDictionary>
 
@@ -191,6 +195,7 @@
 
 			<StaticResource x:Key="FilledTextBoxDeleteButtonForeground" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="FilledTextBoxDeleteButtonForegroundPointerOver" ResourceKey="OnSurfaceVariantBrush" />
+			<x:Double x:Key="FilledTextBoxBorderHeightPointerOver">2</x:Double>
 			<StaticResource x:Key="FilledTextBoxDeleteButtonForegroundFocused" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="FilledTextBoxDeleteButtonForegroundDisabled" ResourceKey="OnSurfaceLowBrush" />
 
@@ -271,6 +276,9 @@
 			<x:Double x:Key="MaterialOutlinedTextBoxMinHeight">56</x:Double>
 			<Thickness x:Key="MaterialOutlinedTextBoxBorderPadding">1</Thickness>
 			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessFocused">2</x:Double>
+			<Thickness x:Key="MaterialOutlinedTextBoxPaddingFocused">0</Thickness>
+			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessPointerOver">2</x:Double>
+			<Thickness x:Key="MaterialOutlinedTextBoxPaddingPointerOver">0</Thickness>
 			<!--#endregion-->
 		</ResourceDictionary>
 	</ResourceDictionary.ThemeDictionaries>
@@ -366,7 +374,7 @@
 										<Setter Target="HeaderElement.Foreground" Value="{ThemeResource FilledTextBoxHeaderForegroundPointerOver}" />
 										<Setter Target="ContentElement.Foreground" Value="{ThemeResource FilledTextBoxForegroundPointerOver}" />
 										<Setter Target="DeleteButton.Foreground" Value="{ThemeResource FilledTextBoxDeleteButtonForegroundPointerOver}" />
-										<Setter Target="NormalBorder.Height" Value="2" />
+										<Setter Target="NormalBorder.Height" Value="{ThemeResource FilledTextBoxBorderHeightPointerOver}" />
 									</VisualState.Setters>
 								</VisualState>
 
@@ -682,8 +690,8 @@
 										<Setter Target="ContentElement.Foreground" Value="{ThemeResource OutlinedTextBoxForegroundPointerOver}" />
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedTextBoxPlaceholderForegroundPointerOver}" />
 										<Setter Target="HeaderElement.Foreground" Value="{ThemeResource OutlinedTextBoxHeaderForegroundPointerOver}" />
-										<Setter Target="RootBorder.BorderThickness" Value="2" />
-										<Setter Target="RootBorder.Padding" Value="0" />
+										<Setter Target="RootBorder.BorderThickness" Value="{ThemeResource MaterialOutlinedTextBoxBorderThicknessPointerOver}" />
+										<Setter Target="RootBorder.Padding" Value="{ThemeResource MaterialOutlinedTextBoxPaddingPointerOver}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed" />
@@ -708,7 +716,7 @@
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedTextBoxPlaceholderForegroundFocused}" />
 										<Setter Target="HeaderElement.Foreground" Value="{ThemeResource OutlinedTextBoxHeaderForegroundFocused}" />
 										<Setter Target="RootBorder.BorderThickness" Value="{ThemeResource MaterialOutlinedTextBoxBorderThicknessFocused}" />
-										<Setter Target="RootBorder.Padding" Value="0" />
+										<Setter Target="RootBorder.Padding" Value="{ThemeResource MaterialOutlinedTextBoxPaddingFocused}" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>