diff --git a/src/Semi.Avalonia/Controls/NumericUpDown.axaml b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
index eab646d..300bce6 100644
--- a/src/Semi.Avalonia/Controls/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
@@ -18,8 +18,6 @@
                     ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
                     <TextBox
                         Name="PART_TextBox"
-                        MinWidth="0"
-                        Padding="{TemplateBinding Padding}"
                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                         AcceptsReturn="False"
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 3814b11..ecde692 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -88,12 +88,14 @@
                     <Grid ColumnDefinitions="Auto,*,Auto, Auto, Auto">
                         <ContentPresenter
                             Grid.Column="0"
-                            Padding="{DynamicResource TextBoxInnerContentPadding}"
+                            Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
                             VerticalAlignment="Center"
                             Content="{TemplateBinding InnerLeftContent}"
-                            Foreground="{DynamicResource TextBoxInnerForeground}" />
+                            Foreground="{DynamicResource TextBoxInnerForeground}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
                         <ScrollViewer
                             Grid.Column="1"
+                            Margin="{TemplateBinding Padding}"
                             AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
                             HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
                             IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
@@ -144,10 +146,11 @@
                             Theme="{StaticResource InputToggleButton}" />
                         <ContentPresenter
                             Grid.Column="4"
-                            Padding="{DynamicResource TextBoxInnerContentPadding}"
+                            Padding="{DynamicResource TextBoxInnerRightContentPadding}"
                             VerticalAlignment="Center"
                             Content="{TemplateBinding InnerRightContent}"
-                            Foreground="{DynamicResource TextBoxInnerForeground}" />
+                            Foreground="{DynamicResource TextBoxInnerForeground}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
                     </Grid>
                 </Border>
             </ControlTemplate>
diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
index 6f1a2d4..1f8f813 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
@@ -38,7 +38,8 @@
     <CornerRadius x:Key="TextBoxPrefixContentCornerRadius">0 3 3 0</CornerRadius>
     <CornerRadius x:Key="TextBoxBothContentCornerRadius">0 0 0 0</CornerRadius>
 
-    <Thickness x:Key="TextBoxInnerContentPadding">8 0</Thickness>
+    <Thickness x:Key="TextBoxInnerLeftContentPadding">8 0 0 0</Thickness>
+    <Thickness x:Key="TextBoxInnerRightContentPadding">0 0 8 0</Thickness>
     <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
     <Thickness x:Key="TextBoxBorderThickness">1</Thickness>