diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index 8dc947c298..256212eaf1 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -2,22 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.TextBoxPage">
   <StackPanel Orientation="Vertical" Spacing="4">
-    <StackPanel.Styles>
-      <Style Selector="TextBox.InnerRight">
-        <Setter Property="InnerRightContent">
-          <Template>
-            <Button Content="Clear" Command="{Binding $parent[TextBox].Clear}" />
-          </Template>
-        </Setter>
-      </Style>
-      <Style Selector="TextBox.InnerLeft">
-        <Setter Property="InnerLeftContent">
-          <Template>
-            <Button Content="Clear" Command="{Binding $parent[TextBox].Clear}" />
-          </Template>
-        </Setter>
-      </Style>
-    </StackPanel.Styles>
     <TextBlock Classes="h1">TextBox</TextBlock>
     <TextBlock Classes="h2">A control into which the user can input text</TextBlock>
 
@@ -36,6 +20,7 @@
 
         <TextBox Width="200"
                  Watermark="Password Box"
+                 Classes="showPasswordButton"
                  UseFloatingWatermark="True"
                  PasswordChar="*"
                  Text="Password" />
@@ -54,8 +39,8 @@
         <TextBox AcceptsReturn="True" Width="200" Height="125"
                  Text="Multiline TextBox with no TextWrapping.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
         
-        <TextBox Classes="InnerLeft" Text="Inner Left Content" Width="200" FontWeight="Normal" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
-        <TextBox Classes="InnerRight" Text="Inner Right Content" Width="200" FontWeight="Normal" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
+        <TextBox Classes="leftClearButton" Text="Inner Left Content" Width="200" FontWeight="Normal" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
+        <TextBox Classes="rightClearButton" Text="Inner Right Content" Width="200" FontWeight="Normal" FontStyle="Normal" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
       </StackPanel>
         <StackPanel Orientation="Vertical" Spacing="8">
             <TextBlock Classes="h2">resm fonts</TextBlock>
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index ef33ac19f6..1cd7e11564 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -14,8 +14,8 @@ namespace Avalonia.Controls.Presenters
                 o => o.CaretIndex,
                 (o, v) => o.CaretIndex = v);
 
-        public static readonly StyledProperty<bool> ShowPasswordCharProperty =
-            AvaloniaProperty.Register<TextPresenter, bool>(nameof(ShowPasswordChar), true);
+        public static readonly StyledProperty<bool> ShowPasswordTextProperty =
+            AvaloniaProperty.Register<TextPresenter, bool>(nameof(ShowPasswordText));
 
         public static readonly StyledProperty<char> PasswordCharProperty =
             AvaloniaProperty.Register<TextPresenter, char>(nameof(PasswordChar));
@@ -78,7 +78,7 @@ namespace Avalonia.Controls.Presenters
         static TextPresenter()
         {
             AffectsRender<TextPresenter>(SelectionBrushProperty);
-            AffectsMeasure<TextPresenter>(TextProperty, PasswordCharProperty, ShowPasswordCharProperty, 
+            AffectsMeasure<TextPresenter>(TextProperty, PasswordCharProperty, ShowPasswordTextProperty, 
                 TextAlignmentProperty, TextWrappingProperty, TextBlock.FontSizeProperty,
                 TextBlock.FontStyleProperty, TextBlock.FontWeightProperty, TextBlock.FontFamilyProperty);
 
@@ -87,7 +87,7 @@ namespace Avalonia.Controls.Presenters
                 TextBlock.FontSizeProperty.Changed, TextBlock.FontStyleProperty.Changed, 
                 TextBlock.FontWeightProperty.Changed, TextBlock.FontFamilyProperty.Changed,
                 SelectionStartProperty.Changed, SelectionEndProperty.Changed,
-                SelectionForegroundBrushProperty.Changed, PasswordCharProperty.Changed, ShowPasswordCharProperty.Changed
+                SelectionForegroundBrushProperty.Changed, PasswordCharProperty.Changed, ShowPasswordTextProperty.Changed
             ).AddClassHandler<TextPresenter>((x, _) => x.InvalidateFormattedText());
 
             CaretIndexProperty.Changed.AddClassHandler<TextPresenter>((x, e) => x.CaretIndexChanged((int)e.NewValue));
@@ -213,10 +213,10 @@ namespace Avalonia.Controls.Presenters
             set => SetValue(PasswordCharProperty, value);
         }
 
-        public bool ShowPasswordChar
+        public bool ShowPasswordText
         {
-            get => GetValue(ShowPasswordCharProperty);
-            set => SetValue(ShowPasswordCharProperty, value);
+            get => GetValue(ShowPasswordTextProperty);
+            set => SetValue(ShowPasswordTextProperty, value);
         }
 
         public IBrush SelectionBrush
@@ -435,7 +435,7 @@ namespace Avalonia.Controls.Presenters
 
             var text = Text;
 
-            if (PasswordChar != default(char) && ShowPasswordChar)
+            if (PasswordChar != default(char) && !ShowPasswordText)
             {
                 result = CreateFormattedTextInternal(_constraint, new string(PasswordChar, text?.Length ?? 0));
             }
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 08e4e923f5..489937147f 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -101,8 +101,8 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<object> InnerRightContentProperty =
             AvaloniaProperty.Register<TextBox, object>(nameof(InnerRightContent));
 
-        public static readonly StyledProperty<bool> ShowPasswordCharProperty =
-            AvaloniaProperty.Register<TextBox, bool>(nameof(ShowPasswordChar));
+        public static readonly StyledProperty<bool> ShowPasswordTextProperty =
+            AvaloniaProperty.Register<TextBox, bool>(nameof(ShowPasswordText));
 
         struct UndoRedoState : IEquatable<UndoRedoState>
         {
@@ -347,10 +347,10 @@ namespace Avalonia.Controls
             set { SetValue(InnerRightContentProperty, value); }
         }
 
-        public bool ShowPasswordChar
+        public bool ShowPasswordText
         {
-            get { return GetValue(ShowPasswordCharProperty); }
-            set { SetValue(ShowPasswordCharProperty, value); }
+            get { return GetValue(ShowPasswordTextProperty); }
+            set { SetValue(ShowPasswordTextProperty, value); }
         }
 
         public TextWrapping TextWrapping
diff --git a/src/Avalonia.Themes.Fluent/TextBox.xaml b/src/Avalonia.Themes.Fluent/TextBox.xaml
index 0735b83014..3b66e7f09e 100644
--- a/src/Avalonia.Themes.Fluent/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/TextBox.xaml
@@ -1,6 +1,14 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Styles.Resources>
     <Thickness x:Key="TextBoxTopHeaderMargin">0,0,0,4</Thickness>
+    <DrawingGroup x:Key="eye_show_regular">
+      <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="eye_hide_regular">
+      <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>
   </Styles.Resources>
   <Style Selector="TextBox">
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
@@ -79,7 +87,7 @@
                                       TextAlignment="{TemplateBinding TextAlignment}"
                                       TextWrapping="{TemplateBinding TextWrapping}"
                                       PasswordChar="{TemplateBinding PasswordChar}"
-                                      ShowPasswordChar="{TemplateBinding ShowPasswordChar}"
+                                      ShowPasswordText="{TemplateBinding ShowPasswordText}"
                                       SelectionBrush="{TemplateBinding SelectionBrush}"
                                       SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
                                       CaretBrush="{TemplateBinding CaretBrush}"
@@ -151,12 +159,33 @@
     <Setter Property="Cursor" Value="IBeam" />
   </Style>
 
-  <Style Selector="TextBox.revealPasswordButton">
+  <Style Selector="TextBox.showPasswordButton">
     <Setter Property="InnerRightContent">
       <Template>
-        <ToggleButton Content="ToggleButton" IsChecked="{Binding $parent[TextBox].ShowPasswordChar, Mode=TwoWay}"/>
+        <ToggleButton IsChecked="{Binding $parent[TextBox].ShowPasswordText, Mode=TwoWay}">
+          <Panel Width="16" Height="16">
+            <DrawingPresenter Drawing="{DynamicResource eye_show_regular}" IsVisible="{Binding $parent[TextBox].ShowPasswordText}"/>
+            <DrawingPresenter Drawing="{DynamicResource eye_hide_regular}" IsVisible="{Binding !$parent[TextBox].ShowPasswordText}"/>
+          </Panel>
+        </ToggleButton>
       </Template>
     </Setter>
-  </Style> 
+  </Style>
+
+  <Style Selector="TextBox.leftClearButton">
+    <Setter Property="InnerLeftContent">
+      <Template>
+        <Button Content="Clear" Command="{Binding $parent[TextBox].Clear}" />
+      </Template>
+    </Setter>
+  </Style>
+
+  <Style Selector="TextBox.rightClearButton">
+    <Setter Property="InnerRightContent">
+      <Template>
+        <Button Content="Clear" Command="{Binding $parent[TextBox].Clear}" />
+      </Template>
+    </Setter>
+  </Style>
 
 </Styles>