diff --git a/src/Avalonia.Themes.Fluent/TextBox.xaml b/src/Avalonia.Themes.Fluent/TextBox.xaml
index 0fe5f9061f..d73704f64c 100644
--- a/src/Avalonia.Themes.Fluent/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/TextBox.xaml
@@ -11,16 +11,10 @@
   
   <Styles.Resources>
     <Thickness x:Key="TextBoxTopHeaderMargin">0,0,0,4</Thickness>
-    <StreamGeometry x:Key="TextBoxClearButton">M1169 1024l879 -879l-145 -145l-879 879l-879 -879l-145 145l879 879l-879 879l145 145l879 -879l879 879l145 -145z</StreamGeometry>
-    <DrawingGroup x:Key="EyeShowRegular">
-      <GeometryDrawing Brush="Transparent" Geometry="M0,0 24,0 24,24 0,24" />
-      <GeometryDrawing Brush="White" Geometry="M12,9.0046246 C14.209139,9.0046246 16,10.7954856 16,13.0046246 C16,15.2137636 14.209139,17.0046246 12,17.0046246 C9.790861,17.0046246 8,15.2137636 8,13.0046246 C8,10.7954856 9.790861,9.0046246 12,9.0046246 Z M12,10.5046246 C10.6192881,10.5046246 9.5,11.6239127 9.5,13.0046246 C9.5,14.3853365 10.6192881,15.5046246 12,15.5046246 C13.3807119,15.5046246 14.5,14.3853365 14.5,13.0046246 C14.5,11.6239127 13.3807119,10.5046246 12,10.5046246 Z M12,5.5 C16.613512,5.5 20.5960869,8.65000641 21.7011157,13.0643865 C21.8017,13.4662019 21.557504,13.8734775 21.1556885,13.9740618 C20.7538731,14.0746462 20.3465976,13.8304502 20.2460132,13.4286347 C19.3071259,9.67795854 15.9213644,7 12,7 C8.07693257,7 4.69009765,9.68026417 3.75285786,13.4331499 C3.65249525,13.8350208 3.24535455,14.0794416 2.84348365,13.979079 C2.44161275,13.8787164 2.19719198,13.4715757 2.29755459,13.0697048 C3.4006459,8.65271806 7.38448293,5.5 12,5.5 Z" />
-    </DrawingGroup>
-    <DrawingGroup x:Key="EyeHideRegular">
-      <GeometryDrawing Brush="Transparent" Geometry="M0,0 24,0 24,24 0,24" />
-      <GeometryDrawing Brush="White" Geometry="M2.21967 2.21967C1.9534 2.48594 1.9292 2.9026 2.14705 3.19621L2.21967 3.28033L6.25424 7.3149C4.33225 8.66437 2.89577 10.6799 2.29888 13.0644C2.1983 13.4662 2.4425 13.8735 2.84431 13.9741C3.24613 14.0746 3.6534 13.8305 3.75399 13.4286C4.28346 11.3135 5.59112 9.53947 7.33416 8.39452L9.14379 10.2043C8.43628 10.9258 8 11.9143 8 13.0046C8 15.2138 9.79086 17.0046 12 17.0046C13.0904 17.0046 14.0788 16.5683 14.8004 15.8608L20.7197 21.7803C21.0126 22.0732 21.4874 22.0732 21.7803 21.7803C22.0466 21.5141 22.0708 21.0974 21.8529 20.8038L21.7803 20.7197L15.6668 14.6055L15.668 14.604L14.4679 13.4061L11.598 10.5368L11.6 10.536L8.71877 7.65782L8.72 7.656L7.58672 6.52549L3.28033 2.21967C2.98744 1.92678 2.51256 1.92678 2.21967 2.21967ZM10.2041 11.2655L13.7392 14.8006C13.2892 15.2364 12.6759 15.5046 12 15.5046C10.6193 15.5046 9.5 14.3853 9.5 13.0046C9.5 12.3287 9.76824 11.7154 10.2041 11.2655ZM12 5.5C10.9997 5.5 10.0291 5.64807 9.11109 5.925L10.3481 7.16119C10.8839 7.05532 11.4364 7 12 7C15.9231 7 19.3099 9.68026 20.2471 13.4332C20.3475 13.835 20.7546 14.0794 21.1565 13.9791C21.5584 13.8787 21.8028 13.4716 21.7024 13.0697C20.5994 8.65272 16.6155 5.5 12 5.5ZM12.1947 9.00928L15.996 12.81C15.8942 10.7531 14.2472 9.10764 12.1947 9.00928Z" />
-    </DrawingGroup>
+    <StreamGeometry x:Key="TextBoxClearButtonData">M 11.416016,10 20,1.4160156 18.583984,0 10,8.5839846 1.4160156,0 0,1.4160156 8.5839844,10 0,18.583985 1.4160156,20 10,11.416015 18.583984,20 20,18.583985 Z</StreamGeometry>
+    <StreamGeometry x:Key="PasswordBoxRevealButtonData">m10.051 7.0032c2.215 0 4.0105 1.7901 4.0105 3.9984s-1.7956 3.9984-4.0105 3.9984c-2.215 0-4.0105-1.7901-4.0105-3.9984s1.7956-3.9984 4.0105-3.9984zm0 1.4994c-1.3844 0-2.5066 1.1188-2.5066 2.499s1.1222 2.499 2.5066 2.499 2.5066-1.1188 2.5066-2.499-1.1222-2.499-2.5066-2.499zm0-5.0026c4.6257 0 8.6188 3.1487 9.7267 7.5613 0.10085 0.40165-0.14399 0.80877-0.54686 0.90931-0.40288 0.10054-0.81122-0.14355-0.91208-0.54521-0.94136-3.7492-4.3361-6.4261-8.2678-6.4261-3.9334 0-7.3292 2.6792-8.2689 6.4306-0.10063 0.40171-0.50884 0.64603-0.91177 0.54571s-0.648-0.5073-0.54737-0.90901c1.106-4.4152 5.1003-7.5667 9.728-7.5667z</StreamGeometry>
   </Styles.Resources>
+
   <Style Selector="TextBox">
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
@@ -168,15 +162,11 @@
     <Setter Property="Cursor" Value="IBeam" />
   </Style>
 
-  <Style Selector="TextBox.revealPasswordButton">
+  <Style Selector="TextBox.revealPasswordButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
     <Setter Property="InnerRightContent">
       <Template>
-        <ToggleButton IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}">
-          <Panel Width="16" Height="16">
-            <DrawingPresenter Drawing="{DynamicResource EyeShowRegular}" IsVisible="{Binding $parent[TextBox].RevealPassword}"/>
-            <DrawingPresenter Drawing="{DynamicResource EyeHideRegular}" IsVisible="{Binding !$parent[TextBox].RevealPassword}"/>
-          </Panel>
-        </ToggleButton>
+        <ToggleButton Classes="PasswordBoxRevealButton"
+                      IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}" />
       </Template>
     </Setter>
   </Style>
@@ -190,20 +180,36 @@
     </Setter>
   </Style>
 
+  <Style Selector="ToggleButton.PasswordBoxRevealButton">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border x:Name="PART_ButtonLayoutBorder"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <Path x:Name="PART_GlyphElement"
+                  Data="{StaticResource PasswordBoxRevealButtonData}"
+                  Height="10"
+                  Width="12"
+                  Stretch="Uniform"
+                  VerticalAlignment="Center"
+                  HorizontalAlignment="Center" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
   <Style Selector="Button.TextBoxClearButton">
-    <Setter Property="MinWidth" Value="34" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="Button">
           <Border x:Name="PART_ButtonLayoutBorder"
-                  BorderThickness="{TemplateBinding BorderThickness}">      
+                  BorderThickness="{TemplateBinding BorderThickness}">
             <Path x:Name="PART_GlyphElement"
-                  Data="{StaticResource TextBoxClearButton}"
+                  Data="{StaticResource TextBoxClearButtonData}"
                   Height="10"
                   Width="10"
-                  Stretch="UniformToFill"
+                  Stretch="Uniform"
                   VerticalAlignment="Center"
                   HorizontalAlignment="Center"/>
           </Border>
@@ -212,31 +218,52 @@
     </Setter>
   </Style>
 
-  <Style Selector="Button.TextBoxClearButton /template/ Border#PART_ButtonLayoutBorder">
+  <!-- TextBox.Button Normal State -->
+  <Style Selector="Button.TextBoxClearButton, ToggleButton.PasswordBoxRevealButton">
+    <Setter Property="MinWidth" Value="34" />
+    <Setter Property="Width" Value="{Binding $self.Bounds.Height}"/>
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />    
+  </Style>
+  <Style Selector="Button.TextBoxClearButton /template/ Border#PART_ButtonLayoutBorder,
+                   ToggleButton.PasswordBoxRevealButton /template/ Border#PART_ButtonLayoutBorder">
     <Setter Property="Background" Value="{DynamicResource TextControlButtonBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrush}" />
   </Style>
-  <Style Selector="Button.TextBoxClearButton /template/ Path#PART_GlyphElement">
+  <Style Selector="Button.TextBoxClearButton /template/ Path#PART_GlyphElement,
+                   ToggleButton.PasswordBoxRevealButton /template/ Path#PART_GlyphElement">
     <Setter Property="Fill" Value="{DynamicResource TextControlButtonForeground}" />
   </Style>
 
-  <Style Selector="Button.TextBoxClearButton:pointerover /template/ Border#PART_ButtonLayoutBorder">
+  <!-- TextBox.Button PointerOver State -->
+  <Style Selector="Button.TextBoxClearButton:pointerover /template/ Border#PART_ButtonLayoutBorder,
+                   ToggleButton.PasswordBoxRevealButton:pointerover /template/ Border#PART_ButtonLayoutBorder">
     <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
   </Style>
-  <Style Selector="Button.TextBoxClearButton:pointerover /template/ Path#PART_GlyphElement">
+  <Style Selector="Button.TextBoxClearButton:pointerover /template/ Path#PART_GlyphElement,
+                   ToggleButton.PasswordBoxRevealButton:pointerover /template/ Path#PART_GlyphElement">
     <Setter Property="Fill" Value="{DynamicResource TextControlButtonForegroundPointerOver}" />
   </Style>
 
-  <Style Selector="Button.TextBoxClearButton:pressed /template/ Border#PART_ButtonLayoutBorder">
+  <!-- TextBox.Button Pressed State -->
+  <Style Selector="Button.TextBoxClearButton:pressed /template/ Border#PART_ButtonLayoutBorder,
+                   ToggleButton.PasswordBoxRevealButton:pressed /template/ Border#PART_ButtonLayoutBorder,
+                   ToggleButton.PasswordBoxRevealButton:checked /template/ Border#PART_ButtonLayoutBorder,
+                   ToggleButton.PasswordBoxRevealButton:indeterminate /template/ Border#PART_ButtonLayoutBorder">
     <Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
   </Style>
-  <Style Selector="Button.TextBoxClearButton:pressed /template/ Path#PART_GlyphElement">
+  <Style Selector="Button.TextBoxClearButton:pressed /template/ Path#PART_GlyphElement,
+                   ToggleButton.PasswordBoxRevealButton:pressed /template/ Path#PART_GlyphElement,
+                   ToggleButton.PasswordBoxRevealButton:checked /template/ Path#PART_GlyphElement,
+                   ToggleButton.PasswordBoxRevealButton:indeterminate /template/ Path#PART_GlyphElement">
     <Setter Property="Fill" Value="{DynamicResource TextControlButtonForegroundPressed}" />
   </Style>
 
-  <Style Selector="Button.TextBoxClearButton:disabled /template/ Border#PART_ButtonLayoutBorder">
+  <!-- TextBox.Button Disabled State -->
+  <Style Selector="Button.TextBoxClearButton:disabled /template/ Border#PART_ButtonLayoutBorder,
+                   ToggleButton.PasswordBoxRevealButton:disabled /template/ Border#PART_ButtonLayoutBorder">
     <Setter Property="Opacity" Value="0" />
   </Style>