diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index db487ef76b..224264b51d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -235,7 +235,8 @@
       <Setter Property="InnerRightContent">
         <Template>
           <ToggleButton Theme="{StaticResource FluentTextBoxToggleButton}"
-                        IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}">
+                        IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"
+                        ClipToBounds="True">
             <Panel>
               <PathIcon Data="{StaticResource PasswordBoxRevealButtonData}"
                         Height="8" Width="12"
@@ -253,7 +254,8 @@
       <Setter Property="InnerRightContent">
         <Template>
           <Button Theme="{StaticResource FluentTextBoxButton}"
-                  Command="{Binding $parent[TextBox].Clear}">
+                  Command="{Binding $parent[TextBox].Clear}"
+                  ClipToBounds="True">
             <PathIcon Data="{StaticResource TextBoxClearButtonData}" Height="10" Width="10"/>
           </Button>
         </Template>
diff --git a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
index 0bcb425ca9..8428e3aae7 100644
--- a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
@@ -192,7 +192,8 @@
         <Template>
           <Button Command="{Binding $parent[TextBox].Clear}"
                   Focusable="False"
-                  Theme="{StaticResource SimpleTextBoxClearButtonTheme}" />
+                  Theme="{StaticResource SimpleTextBoxClearButtonTheme}" 
+                  ClipToBounds="True" />
         </Template>
       </Setter>
     </Style>
@@ -212,7 +213,8 @@
             <ToggleButton Background="Transparent"
                           Focusable="False"
                           IsChecked="{Binding $parent[TextBox].RevealPassword, Mode=TwoWay}"
-                          Theme="{StaticResource SimplePasswordBoxRevealButtonTheme}" />
+                          Theme="{StaticResource SimplePasswordBoxRevealButtonTheme}"
+                          ClipToBounds="True" />
           </Panel>
         </Template>
       </Setter>