diff --git a/doc/styles/TextBox.md b/doc/styles/TextBox.md
index 5379ad4f1..b0daf6a92 100644
--- a/doc/styles/TextBox.md
+++ b/doc/styles/TextBox.md
@@ -15,75 +15,75 @@ IsDefaultStyle\*: Styles in this column will be set as the default implicit styl
 
 ## Lightweight Styling
 
-| Key                                                 | Type              | Value                         |
-| --------------------------------------------------- | ----------------- | ----------------------------- |
-| `TextBoxDeleteButtonForeground`                     | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `TextBoxDeleteButtonForegroundPointerOver`          | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `TextBoxDeleteButtonForegroundPressed`              | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `TextBoxDeleteButtonForegroundDisabled`             | `SolidColorBrush` | `OnSurfaceLowBrush`           |
-| `TextBoxLeadingIconForeground`                      | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `TextBoxLeadingIconForegroundDisabled`              | `SolidColorBrush` | `OnSurfaceLowBrush`           |
-| `FilledTextBoxBackground`                           | `SolidColorBrush` | `SurfaceVariantBrush`         |
-| `FilledTextBoxBackgroundPointerOver`                | `SolidColorBrush` | `OnSurfaceVariantHoverBrush`  |
-| `FilledTextBoxBackgroundFocused`                    | `SolidColorBrush` | `SurfaceVariantBrush`         |
-| `FilledTextBoxBackgroundDisabled`                   | `SolidColorBrush` | `OnSurfaceDisabledBrush`      |
-| `FilledTextBoxBorderBrush`                          | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `FilledTextBoxBorderBrushPointerOver`               | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `FilledTextBoxBorderBrushFocused`                   | `SolidColorBrush` | `PrimaryBrush`                |
-| `FilledTextBoxBorderBrushDisabled`                  | `SolidColorBrush` | `OnSurfaceDisabledBrush`      |
-| `FilledTextBoxDeleteButtonForeground`               | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `FilledTextBoxDeleteButtonForegroundPointerOver`    | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `FilledTextBoxDeleteButtonForegroundFocused`        | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `FilledTextBoxDeleteButtonForegroundDisabled`       | `SolidColorBrush` | `OnSurfaceLowBrush`           |
-| `FilledTextBoxForeground`                           | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `FilledTextBoxForegroundPointerOver`                | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `FilledTextBoxForegroundFocused`                    | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `FilledTextBoxForegroundDisabled`                   | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `FilledTextBoxForegroundOpacityDisabled`            | `Double`          | `LowOpacity`                  |
-| `FilledTextBoxPlaceholderForeground`                | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `FilledTextBoxPlaceholderForegroundPointerOver`     | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `FilledTextBoxPlaceholderForegroundFocused`         | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `FilledTextBoxPlaceholderForegroundDisabled`        | `SolidColorBrush` | `OnSurfaceLowBrush`           |
-| `FilledTextBoxHeaderForeground`                     | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `FilledTextBoxHeaderForegroundPointerOver`          | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `FilledTextBoxHeaderForegroundFocused`              | `SolidColorBrush` | `PrimaryBrush`                |
-| `FilledTextBoxHeaderForegroundDisabled`             | `SolidColorBrush` | `OnSurfaceLowBrush`           |
-| `OutlinedTextBoxBorderBrush`                        | `SolidColorBrush` | `OutlineBrush`                |
-| `OutlinedTextBoxBorderBrushPointerOver`             | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `OutlinedTextBoxBorderBrushFocused`                 | `SolidColorBrush` | `PrimaryBrush`                |
-| `OutlinedTextBoxBorderBrushDisabled`                | `SolidColorBrush` | `OnSurfaceDisabledBrush`      |
-| `OutlinedTextBoxForeground`                         | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `OutlinedTextBoxForegroundPointerOver`              | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `OutlinedTextBoxForegroundFocused`                  | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `OutlinedTextBoxForegroundDisabled`                 | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `OutlinedTextBoxForegroundOpacityDisabled`          | `Double`          | `LowOpacity`                  |
-| `OutlinedTextBoxPlaceholderForeground`              | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `OutlinedTextBoxPlaceholderForegroundPointerOver`   | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `OutlinedTextBoxPlaceholderForegroundFocused`       | `SolidColorBrush` | `OnSurfaceBrush`              |
-| `OutlinedTextBoxPlaceholderForegroundDisabled`      | `SolidColorBrush` | `OnSurfaceLowBrush`           |
-| `OutlinedTextBoxHeaderForeground`                   | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `OutlinedTextBoxHeaderForegroundPointerOver`        | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
-| `OutlinedTextBoxHeaderForegroundFocused`            | `SolidColorBrush` | `PrimaryBrush`                |
-| `OutlinedTextBoxHeaderForegroundDisabled`           | `SolidColorBrush` | `OnSurfaceLowBrush`           |
-| `OutlinedTextBoxFontFamily`                         | `FontFamily`      | `MaterialMediumFontFamily`    |
-| `OutlinedTextBoxFontWeight`                         | `String`          | `BodyLargeFontWeight`         |
-| `OutlinedTextBoxFontSize`                           | `Double`          | `BodyLargeFontSize`           |
-| `OutlinedTextBoxCharacterSpacing`                   | `Int32`           | `BodyLargeCharacterSpacing`   |
-| `FilledTextBoxFontFamily`                           | `FontFamily`      | `MaterialMediumFontFamily`    |
-| `FilledTextBoxFontWeight`                           | `String`          | `BodyLargeFontWeight`         |
-| `FilledTextBoxFontSize`                             | `Double`          | `BodyLargeFontSize`           |
-| `FilledTextBoxCharacterSpacing`                     | `Int32`           | `BodyLargeCharacterSpacing`   |
-| `FilledTextBoxBorderThicknessNormal`                | `Double`          | `TextBoxOutlinedStrokeHeight` |
-| `FilledTextBoxBorderThicknessFocused`               | `Double`          | `TextBoxFocusStrokeWidth`     |
-| `MaterialTextBoxClearGlyphWidth`                    | `Double`          | 20                            |
-| `MaterialTextBoxClearGlyphHeight`                   | `Double`          | 20                            |
-| `MaterialFilledTextBoxCornerRadius`                 | `CornerRadius`    | 4,4,0,0                       |
-| `MaterialFilledTextBoxPadding`                      | `Thickness`       | 16,7                          |
-| `MaterialFilledTextBoxMinHeight`                    | `Double`          | 58                            |
-| `MaterialFilledTextBoxBorderHeightFocused`          | `Double`          | 2                             |
-| `MaterialOutlinedTextBoxBorderThickness`            | `Double`          | 1                             |
-| `MaterialOutlinedTextBoxCornerRadius`               | `CornerRadius`    | 4                             |
-| `MaterialOutlinedTextBoxPadding`                    | `Thickness`       | 8                             |
-| `MaterialOutlinedTextBoxMinHeight`                  | `Double`          | 56                            |
-| `MaterialOutlinedTextBoxBorderThicknessFocused`     | `Double`          | 2                             |
-| `MaterialOutlinedTextBoxBorderThicknessPointerOver` | `Double`          | 2                             |
+| Key                                               | Type              | Value                         |
+| ------------------------------------------------- | ----------------- | ----------------------------- |
+| `TextBoxDeleteButtonForeground`                   | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `TextBoxDeleteButtonForegroundPointerOver`        | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `TextBoxDeleteButtonForegroundPressed`            | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `TextBoxDeleteButtonForegroundDisabled`           | `SolidColorBrush` | `OnSurfaceLowBrush`           |
+| `TextBoxLeadingIconForeground`                    | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `TextBoxLeadingIconForegroundDisabled`            | `SolidColorBrush` | `OnSurfaceLowBrush`           |
+| `FilledTextBoxBackground`                         | `SolidColorBrush` | `SurfaceVariantBrush`         |
+| `FilledTextBoxBackgroundPointerOver`              | `SolidColorBrush` | `OnSurfaceVariantHoverBrush`  |
+| `FilledTextBoxBackgroundFocused`                  | `SolidColorBrush` | `SurfaceVariantBrush`         |
+| `FilledTextBoxBackgroundDisabled`                 | `SolidColorBrush` | `OnSurfaceDisabledBrush`      |
+| `FilledTextBoxBorderBrush`                        | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `FilledTextBoxBorderBrushPointerOver`             | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `FilledTextBoxBorderBrushFocused`                 | `SolidColorBrush` | `PrimaryBrush`                |
+| `FilledTextBoxBorderBrushDisabled`                | `SolidColorBrush` | `OnSurfaceDisabledBrush`      |
+| `FilledTextBoxDeleteButtonForeground`             | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `FilledTextBoxDeleteButtonForegroundPointerOver`  | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `FilledTextBoxDeleteButtonForegroundFocused`      | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `FilledTextBoxDeleteButtonForegroundDisabled`     | `SolidColorBrush` | `OnSurfaceLowBrush`           |
+| `FilledTextBoxForeground`                         | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `FilledTextBoxForegroundPointerOver`              | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `FilledTextBoxForegroundFocused`                  | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `FilledTextBoxForegroundDisabled`                 | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `FilledTextBoxForegroundOpacityDisabled`          | `Double`          | `LowOpacity`                  |
+| `FilledTextBoxPlaceholderForeground`              | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `FilledTextBoxPlaceholderForegroundPointerOver`   | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `FilledTextBoxPlaceholderForegroundFocused`       | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `FilledTextBoxPlaceholderForegroundDisabled`      | `SolidColorBrush` | `OnSurfaceLowBrush`           |
+| `FilledTextBoxHeaderForeground`                   | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `FilledTextBoxHeaderForegroundPointerOver`        | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `FilledTextBoxHeaderForegroundFocused`            | `SolidColorBrush` | `PrimaryBrush`                |
+| `FilledTextBoxHeaderForegroundDisabled`           | `SolidColorBrush` | `OnSurfaceLowBrush`           |
+| `OutlinedTextBoxBorderBrush`                      | `SolidColorBrush` | `OutlineBrush`                |
+| `OutlinedTextBoxBorderBrushPointerOver`           | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `OutlinedTextBoxBorderBrushFocused`               | `SolidColorBrush` | `PrimaryBrush`                |
+| `OutlinedTextBoxBorderBrushDisabled`              | `SolidColorBrush` | `OnSurfaceDisabledBrush`      |
+| `OutlinedTextBoxForeground`                       | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `OutlinedTextBoxForegroundPointerOver`            | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `OutlinedTextBoxForegroundFocused`                | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `OutlinedTextBoxForegroundDisabled`               | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `OutlinedTextBoxForegroundOpacityDisabled`        | `Double`          | `LowOpacity`                  |
+| `OutlinedTextBoxPlaceholderForeground`            | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `OutlinedTextBoxPlaceholderForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `OutlinedTextBoxPlaceholderForegroundFocused`     | `SolidColorBrush` | `OnSurfaceBrush`              |
+| `OutlinedTextBoxPlaceholderForegroundDisabled`    | `SolidColorBrush` | `OnSurfaceLowBrush`           |
+| `OutlinedTextBoxHeaderForeground`                 | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `OutlinedTextBoxHeaderForegroundPointerOver`      | `SolidColorBrush` | `OnSurfaceVariantBrush`       |
+| `OutlinedTextBoxHeaderForegroundFocused`          | `SolidColorBrush` | `PrimaryBrush`                |
+| `OutlinedTextBoxHeaderForegroundDisabled`         | `SolidColorBrush` | `OnSurfaceLowBrush`           |
+| `OutlinedTextBoxFontFamily`                       | `FontFamily`      | `MaterialMediumFontFamily`    |
+| `OutlinedTextBoxFontWeight`                       | `String`          | `BodyLargeFontWeight`         |
+| `OutlinedTextBoxFontSize`                         | `Double`          | `BodyLargeFontSize`           |
+| `OutlinedTextBoxCharacterSpacing`                 | `Int32`           | `BodyLargeCharacterSpacing`   |
+| `FilledTextBoxFontFamily`                         | `FontFamily`      | `MaterialMediumFontFamily`    |
+| `FilledTextBoxFontWeight`                         | `String`          | `BodyLargeFontWeight`         |
+| `FilledTextBoxFontSize`                           | `Double`          | `BodyLargeFontSize`           |
+| `FilledTextBoxCharacterSpacing`                   | `Int32`           | `BodyLargeCharacterSpacing`   |
+| `FilledTextBoxBorderThicknessNormal`              | `Double`          | `TextBoxOutlinedStrokeHeight` |
+| `FilledTextBoxBorderThicknessFocused`             | `Double`          | `TextBoxFocusStrokeWidth`     |
+| `TextBoxClearGlyphWidth`                          | `Double`          | 20                            |
+| `TextBoxClearGlyphHeight`                         | `Double`          | 20                            |
+| `FilledTextBoxCornerRadius`                       | `CornerRadius`    | 4,4,0,0                       |
+| `FilledTextBoxPadding`                            | `Thickness`       | 16,7                          |
+| `FilledTextBoxMinHeight`                          | `Double`          | 58                            |
+| `FilledTextBoxBorderHeightFocused`                | `Double`          | 2                             |
+| `OutlinedTextBoxBorderThickness`                  | `Double`          | 1                             |
+| `OutlinedTextBoxCornerRadius`                     | `CornerRadius`    | 4                             |
+| `OutlinedTextBoxPadding`                          | `Thickness`       | 8                             |
+| `OutlinedTextBoxMinHeight`                        | `Double`          | 56                            |
+| `OutlinedTextBoxBorderThicknessFocused`           | `Double`          | 2                             |
+| `OutlinedTextBoxBorderThicknessPointerOver`       | `Double`          | 2                             |
diff --git a/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml
index 2fc993bee..4bade437a 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/TextBox.xaml
@@ -109,25 +109,25 @@
 			<!--#endregion-->
 
 			<!--#region Delete Button Style-->
-			<x:Double x:Key="MaterialTextBoxClearGlyphWidth">20</x:Double>
-			<x:Double x:Key="MaterialTextBoxClearGlyphHeight">20</x:Double>
+			<x:Double x:Key="TextBoxClearGlyphWidth">20</x:Double>
+			<x:Double x:Key="TextBoxClearGlyphHeight">20</x:Double>
 			<!--#endregion-->
 
 			<!--#region Filled TextBox Style-->
-			<CornerRadius x:Key="MaterialFilledTextBoxCornerRadius">4,4,0,0</CornerRadius>
-			<macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,7</macos:Thickness>
-			<not_macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,8</not_macos:Thickness>
-			<x:Double x:Key="MaterialFilledTextBoxMinHeight">58</x:Double>
-			<x:Double x:Key="MaterialFilledTextBoxBorderHeightFocused">2</x:Double>
+			<CornerRadius x:Key="FilledTextBoxCornerRadius">4,4,0,0</CornerRadius>
+			<macos:Thickness x:Key="FilledTextBoxPadding">16,7</macos:Thickness>
+			<not_macos:Thickness x:Key="FilledTextBoxPadding">16,8</not_macos:Thickness>
+			<x:Double x:Key="FilledTextBoxMinHeight">58</x:Double>
+			<x:Double x:Key="FilledTextBoxBorderHeightFocused">2</x:Double>
 			<!--#endregion-->
 
 			<!--#region Outlined TextBox Style-->
-			<x:Double x:Key="MaterialOutlinedTextBoxBorderThickness">1</x:Double>
-			<CornerRadius x:Key="MaterialOutlinedTextBoxCornerRadius">4</CornerRadius>
-			<Thickness x:Key="MaterialOutlinedTextBoxPadding">8</Thickness>
-			<x:Double x:Key="MaterialOutlinedTextBoxMinHeight">56</x:Double>
-			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessFocused">2</x:Double>
-			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessPointerOver">2</x:Double>
+			<x:Double x:Key="OutlinedTextBoxBorderThickness">1</x:Double>
+			<CornerRadius x:Key="OutlinedTextBoxCornerRadius">4</CornerRadius>
+			<Thickness x:Key="OutlinedTextBoxPadding">8</Thickness>
+			<x:Double x:Key="OutlinedTextBoxMinHeight">56</x:Double>
+			<x:Double x:Key="OutlinedTextBoxBorderThicknessFocused">2</x:Double>
+			<x:Double x:Key="OutlinedTextBoxBorderThicknessPointerOver">2</x:Double>
 			<!--#endregion-->
 		</ResourceDictionary>
 
@@ -217,25 +217,25 @@
 			<!--#endregion-->
 
 			<!--#region Delete Button Style-->
-			<x:Double x:Key="MaterialTextBoxClearGlyphWidth">20</x:Double>
-			<x:Double x:Key="MaterialTextBoxClearGlyphHeight">20</x:Double>
+			<x:Double x:Key="TextBoxClearGlyphWidth">20</x:Double>
+			<x:Double x:Key="TextBoxClearGlyphHeight">20</x:Double>
 			<!--#endregion-->
 
 			<!--#region Filled TextBox Style-->
-			<CornerRadius x:Key="MaterialFilledTextBoxCornerRadius">4,4,0,0</CornerRadius>
-			<macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,7</macos:Thickness>
-			<not_macos:Thickness x:Key="MaterialFilledTextBoxPadding">16,8</not_macos:Thickness>
-			<x:Double x:Key="MaterialFilledTextBoxMinHeight">58</x:Double>
-			<x:Double x:Key="MaterialFilledTextBoxBorderHeightFocused">2</x:Double>
+			<CornerRadius x:Key="FilledTextBoxCornerRadius">4,4,0,0</CornerRadius>
+			<macos:Thickness x:Key="FilledTextBoxPadding">16,7</macos:Thickness>
+			<not_macos:Thickness x:Key="FilledTextBoxPadding">16,8</not_macos:Thickness>
+			<x:Double x:Key="FilledTextBoxMinHeight">58</x:Double>
+			<x:Double x:Key="FilledTextBoxBorderHeightFocused">2</x:Double>
 			<!--#endregion-->
 
 			<!--#region Outlined TextBox Style-->
-			<x:Double x:Key="MaterialOutlinedTextBoxBorderThickness">1</x:Double>
-			<CornerRadius x:Key="MaterialOutlinedTextBoxCornerRadius">4</CornerRadius>
-			<Thickness x:Key="MaterialOutlinedTextBoxPadding">8</Thickness>
-			<x:Double x:Key="MaterialOutlinedTextBoxMinHeight">56</x:Double>
-			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessFocused">2</x:Double>
-			<x:Double x:Key="MaterialOutlinedTextBoxBorderThicknessPointerOver">2</x:Double>
+			<x:Double x:Key="OutlinedTextBoxBorderThickness">1</x:Double>
+			<CornerRadius x:Key="OutlinedTextBoxCornerRadius">4</CornerRadius>
+			<Thickness x:Key="OutlinedTextBoxPadding">8</Thickness>
+			<x:Double x:Key="OutlinedTextBoxMinHeight">56</x:Double>
+			<x:Double x:Key="OutlinedTextBoxBorderThicknessFocused">2</x:Double>
+			<x:Double x:Key="OutlinedTextBoxBorderThicknessPointerOver">2</x:Double>
 			<!--#endregion-->
 		</ResourceDictionary>
 	</ResourceDictionary.ThemeDictionaries>
@@ -270,7 +270,7 @@
 											   NoHeaderAndNoPlaceholderValue="1" />
 
 	<!-- Path Data -->
-	<x:String x:Key="MaterialTextBoxClearGlyphData">M14.9482 6.46442L13.534 5.05021L9.99849 8.58574L6.46296 5.05021L5.04874 6.46442L8.58428 9.99995L5.04874 13.5355L6.46296 14.9497L9.99849 11.4142L13.534 14.9497L14.9482 13.5355L11.4127 9.99995L14.9482 6.46442ZM17.0696 2.92889C13.1663 -0.974342 6.83065 -0.974342 2.92742 2.92889C-0.975807 6.83212 -0.975807 13.1678 2.92742 17.071C6.83065 20.9743 13.1663 20.9743 17.0696 17.071C20.9728 13.1678 20.9728 6.83212 17.0696 2.92889ZM4.34164 15.6568C1.22329 12.5385 1.22329 7.46144 4.34164 4.3431C7.45998 1.22476 12.537 1.22476 15.6553 4.3431C18.7737 7.46144 18.7737 12.5385 15.6553 15.6568C12.537 18.7752 7.45998 18.7752 4.34164 15.6568Z</x:String>
+	<x:String x:Key="TextBoxClearGlyphData">M14.9482 6.46442L13.534 5.05021L9.99849 8.58574L6.46296 5.05021L5.04874 6.46442L8.58428 9.99995L5.04874 13.5355L6.46296 14.9497L9.99849 11.4142L13.534 14.9497L14.9482 13.5355L11.4127 9.99995L14.9482 6.46442ZM17.0696 2.92889C13.1663 -0.974342 6.83065 -0.974342 2.92742 2.92889C-0.975807 6.83212 -0.975807 13.1678 2.92742 17.071C6.83065 20.9743 13.1663 20.9743 17.0696 17.071C20.9728 13.1678 20.9728 6.83212 17.0696 2.92889ZM4.34164 15.6568C1.22329 12.5385 1.22329 7.46144 4.34164 4.3431C7.45998 1.22476 12.537 1.22476 15.6553 4.3431C18.7737 7.46144 18.7737 12.5385 15.6553 15.6568C12.537 18.7752 7.45998 18.7752 4.34164 15.6568Z</x:String>
 
 
 	<Style x:Key="MaterialDeleteButtonStyle"
@@ -304,13 +304,13 @@
 						</VisualStateManager.VisualStateGroups>
 
 						<Path x:Name="GlyphElement"
-							  Data="{ThemeResource MaterialTextBoxClearGlyphData}"
+							  Data="{ThemeResource TextBoxClearGlyphData}"
 							  Fill="{TemplateBinding Foreground}"
 							  VerticalAlignment="Center"
 							  HorizontalAlignment="Center"
 							  Stretch="Uniform"
-							  Width="{ThemeResource MaterialTextBoxClearGlyphWidth}"
-							  Height="{ThemeResource MaterialTextBoxClearGlyphHeight}"
+							  Width="{ThemeResource TextBoxClearGlyphWidth}"
+							  Height="{ThemeResource TextBoxClearGlyphHeight}"
 							  AutomationProperties.AccessibilityView="Raw" />
 					</Grid>
 				</ControlTemplate>
@@ -326,7 +326,7 @@
 		<Setter Property="BorderBrush" Value="{ThemeResource FilledTextBoxBorderBrush}" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="CornerRadius" Value="{ThemeResource MaterialFilledTextBoxCornerRadius}" />
+		<Setter Property="CornerRadius" Value="{ThemeResource FilledTextBoxCornerRadius}" />
 
 		<!-- Start: Body Large Typo -->
 		<Setter Property="FontFamily" Value="{ThemeResource FilledTextBoxFontFamily}" />
@@ -336,11 +336,11 @@
 		<!-- End: Body Large Typo -->
 
 		<macos:Setter Property="Padding"
-					  Value="{ThemeResource MaterialFilledTextBoxPadding}" />
+					  Value="{ThemeResource FilledTextBoxPadding}" />
 		<not_macos:Setter Property="Padding"
-						  Value="{ThemeResource MaterialFilledTextBoxPadding}" />
+						  Value="{ThemeResource FilledTextBoxPadding}" />
 
-		<Setter Property="MinHeight" Value="{ThemeResource MaterialFilledTextBoxMinHeight}" />
+		<Setter Property="MinHeight" Value="{ThemeResource FilledTextBoxMinHeight}" />
 
 		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
 		<Setter Property="ut:ControlExtensions.Icon" Value="{x:Null}" />
@@ -389,7 +389,7 @@
 									<VisualState.Setters>
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource FilledTextBoxPlaceholderForegroundFocused}" />
 										<Setter Target="HeaderElement.Foreground" Value="{ThemeResource FilledTextBoxHeaderForegroundFocused}" />
-										<Setter Target="NormalBorder.Height" Value="{ThemeResource MaterialFilledTextBoxBorderHeightFocused}" />
+										<Setter Target="NormalBorder.Height" Value="{ThemeResource FilledTextBoxBorderHeightFocused}" />
 										<Setter Target="NormalBorder.Fill" Value="{ThemeResource FilledTextBoxBorderBrushFocused}" />
 										<Setter Target="Root.Background" Value="{ThemeResource FilledTextBoxBackgroundFocused}" />
 										<Setter Target="ContentElement.Foreground" Value="{ThemeResource FilledTextBoxForegroundFocused}" />
@@ -639,8 +639,8 @@
 		<Setter Property="Foreground" Value="{ThemeResource OutlinedTextBoxForeground}" />
 		<Setter Property="PlaceholderForeground" Value="{ThemeResource OutlinedTextBoxPlaceholderForeground}" />
 		<Setter Property="BorderBrush" Value="{ThemeResource OutlinedTextBoxBorderBrush}" />
-		<Setter Property="BorderThickness" Value="{ThemeResource MaterialOutlinedTextBoxBorderThickness}" />
-		<Setter Property="CornerRadius" Value="{ThemeResource MaterialOutlinedTextBoxCornerRadius}" />
+		<Setter Property="BorderThickness" Value="{ThemeResource OutlinedTextBoxBorderThickness}" />
+		<Setter Property="CornerRadius" Value="{ThemeResource OutlinedTextBoxCornerRadius}" />
 
 		<!-- Start: Body Large Typo -->
 		<Setter Property="FontFamily" Value="{ThemeResource OutlinedTextBoxFontFamily}" />
@@ -652,8 +652,8 @@
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 
-		<Setter Property="Padding" Value="{ThemeResource MaterialOutlinedTextBoxPadding}" />
-		<Setter Property="MinHeight" Value="{ThemeResource MaterialOutlinedTextBoxMinHeight}" />
+		<Setter Property="Padding" Value="{ThemeResource OutlinedTextBoxPadding}" />
+		<Setter Property="MinHeight" Value="{ThemeResource OutlinedTextBoxMinHeight}" />
 
 		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
 		<Setter Property="ut:ControlExtensions.Icon" Value="{x:Null}" />
@@ -672,7 +672,7 @@
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedTextBoxPlaceholderForegroundPointerOver}" />
 										<Setter Target="HeaderElement.Foreground" Value="{ThemeResource OutlinedTextBoxHeaderForegroundPointerOver}" />
 										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedTextBoxBorderBrushPointerOver}" />
-										<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource MaterialOutlinedTextBoxBorderThicknessPointerOver}" />
+										<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource OutlinedTextBoxBorderThicknessPointerOver}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed" />
@@ -693,7 +693,7 @@
 										<Setter Target="PlaceholderElement.Foreground" Value="{ThemeResource OutlinedTextBoxPlaceholderForegroundFocused}" />
 										<Setter Target="HeaderElement.Foreground" Value="{ThemeResource OutlinedTextBoxHeaderForegroundFocused}" />
 										<Setter Target="BorderBorder.BorderBrush" Value="{ThemeResource OutlinedTextBoxBorderBrushFocused}" />
-										<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource MaterialOutlinedTextBoxBorderThicknessFocused}" />
+										<Setter Target="BorderBorder.BorderThickness" Value="{ThemeResource OutlinedTextBoxBorderThicknessFocused}" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
index 8cc55ff7f..cc1b2f6e0 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/TextBox.cs
@@ -1,4 +1,4 @@
-using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
@@ -142,14 +142,14 @@ public static partial class BorderBrush
 
 				public static partial class BorderThickness
 				{
-					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThickness")]
-					public static ThemeResourceKey<double> Default => new("MaterialOutlinedTextBoxBorderThickness");
+					[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxBorderThickness")]
+					public static ThemeResourceKey<double> Default => new("OutlinedTextBoxBorderThickness");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThicknessPointerOver")]
-					public static ThemeResourceKey<double> PointerOver => new("MaterialOutlinedTextBoxBorderThicknessPointerOver");
+					[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxBorderThicknessPointerOver")]
+					public static ThemeResourceKey<double> PointerOver => new("OutlinedTextBoxBorderThicknessPointerOver");
 
-					[ResourceKeyDefinition(typeof(double), "MaterialOutlinedTextBoxBorderThicknessFocused")]
-					public static ThemeResourceKey<double> Focused => new("MaterialOutlinedTextBoxBorderThicknessFocused");
+					[ResourceKeyDefinition(typeof(double), "OutlinedTextBoxBorderThicknessFocused")]
+					public static ThemeResourceKey<double> Focused => new("OutlinedTextBoxBorderThicknessFocused");
 				}
 
 				public static partial class Foreground