diff --git a/demo/Ursa.Demo/Pages/AvatarDemo.axaml b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
index e401bfc..1524a7d 100644
--- a/demo/Ursa.Demo/Pages/AvatarDemo.axaml
+++ b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
@@ -95,8 +95,8 @@
         </StackPanel>
         <StackPanel Orientation="Horizontal" Spacing="8">
             <u:Avatar Content="AS" />
-            <u:Avatar Content="Semi" Gap="4" />
-            <u:Avatar Content="Semi" Gap="10" />
+            <u:Avatar Content="Semi" Padding="4" />
+            <u:Avatar Content="Semi" Padding="10" />
         </StackPanel>
 
     </StackPanel>
diff --git a/src/Ursa.Themes.Semi/Controls/Avatar.axaml b/src/Ursa.Themes.Semi/Controls/Avatar.axaml
index b8cfc97..68a9b78 100644
--- a/src/Ursa.Themes.Semi/Controls/Avatar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Avatar.axaml
@@ -1,22 +1,20 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:u="https://irihi.tech/ursa"
-    xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa">
+    xmlns:u="https://irihi.tech/ursa">
     <Design.PreviewWith>
         <StackPanel Margin="20" Orientation="Horizontal" Spacing="8">
             <u:Avatar Content="AS" />
-            <u:Avatar Content="Semi" Gap="4" />
-            <u:Avatar Content="Semi" Gap="10" />
+            <u:Avatar Content="Semi" Padding="4" />
+            <u:Avatar Content="Semi" Padding="10" />
         </StackPanel>
     </Design.PreviewWith>
-    <converters:DoubleToThicknessConverter x:Key="DoubleToThicknessConverter" />
     <ControlTheme x:Key="{x:Type u:Avatar}" TargetType="{x:Type u:Avatar}">
         <Setter Property="Foreground" Value="{DynamicResource AvatarForeground}" />
         <Setter Property="Background" Value="{DynamicResource AvatarGreyBackground}" />
         <Setter Property="FontSize" Value="{DynamicResource AvatarMediumFontSize}" />
         <Setter Property="FontWeight" Value="{DynamicResource AvatarFontWeight}" />
-        <Setter Property="Gap" Value="3" />
+        <Setter Property="Padding" Value="3" />
         <Setter Property="Width" Value="{DynamicResource AvatarMediumWidth}" />
         <Setter Property="Height" Value="{Binding $self.Width}" />
         <Setter Property="Cursor" Value="Hand" />
@@ -32,10 +30,9 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}"
-                            Background="{TemplateBinding Background}">
-                        </Border>
+                            Background="{TemplateBinding Background}" />
                         <Viewbox
-                            Margin="{TemplateBinding Gap, Converter={StaticResource DoubleToThicknessConverter}}"
+                            Margin="{TemplateBinding Padding}"
                             StretchDirection="DownOnly">
                             <ContentPresenter
                                 Name="PART_ContentPresenter"
diff --git a/src/Ursa/Controls/Avatar/Avatar.cs b/src/Ursa/Controls/Avatar/Avatar.cs
index e3c77e5..43aaf71 100644
--- a/src/Ursa/Controls/Avatar/Avatar.cs
+++ b/src/Ursa/Controls/Avatar/Avatar.cs
@@ -7,21 +7,12 @@ namespace Ursa.Controls;
 
 public class Avatar : Button
 {
-    public static readonly StyledProperty<double> GapProperty = AvaloniaProperty.Register<Avatar, double>(
-        nameof(Gap));
-
     public static readonly StyledProperty<IImage?> SourceProperty = AvaloniaProperty.Register<Avatar, IImage?>(
         nameof(Source));
 
     public static readonly StyledProperty<object?> HoverMaskProperty = AvaloniaProperty.Register<Avatar, object?>(
         nameof(HoverMask));
 
-    public double Gap
-    {
-        get => GetValue(GapProperty);
-        set => SetValue(GapProperty, value);
-    }
-
     [ExcludeFromCodeCoverage]
     public IImage? Source
     {
diff --git a/src/Ursa/Converters/DoubleToThicknessConverter.cs b/src/Ursa/Converters/DoubleToThicknessConverter.cs
deleted file mode 100644
index 6ac248b..0000000
--- a/src/Ursa/Converters/DoubleToThicknessConverter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Globalization;
-using Avalonia;
-using Avalonia.Data.Converters;
-
-namespace Ursa.Converters;
-
-public class DoubleToThicknessConverter : IValueConverter
-{
-    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (value is double d)
-        {
-            return new Thickness(d, 0);
-        }
-
-        return AvaloniaProperty.UnsetValue;
-    }
-
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-}
\ No newline at end of file