diff --git a/demo/Ursa.Demo/Pages/AvatarDemo.axaml b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
index c3046c3..e401bfc 100644
--- a/demo/Ursa.Demo/Pages/AvatarDemo.axaml
+++ b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
@@ -93,5 +93,11 @@
                 </u:Avatar.HoverMask>
             </u:Avatar>
         </StackPanel>
+        <StackPanel Orientation="Horizontal" Spacing="8">
+            <u:Avatar Content="AS" />
+            <u:Avatar Content="Semi" Gap="4" />
+            <u:Avatar Content="Semi" Gap="10" />
+        </StackPanel>
+
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Avatar.axaml b/src/Ursa.Themes.Semi/Controls/Avatar.axaml
index 4fe9705..b8cfc97 100644
--- a/src/Ursa.Themes.Semi/Controls/Avatar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Avatar.axaml
@@ -3,12 +3,20 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
     xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa">
-    <converters:DivideByTwoConverter x:Key="DivideByTwoConverter" />
+    <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" />
+        </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="Width" Value="{DynamicResource AvatarMediumWidth}" />
         <Setter Property="Height" Value="{Binding $self.Width}" />
         <Setter Property="Cursor" Value="Hand" />
@@ -24,14 +32,20 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}"
-                            Background="{TemplateBinding Background}" />
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            IsVisible="{TemplateBinding Source, Converter={x:Static ObjectConverters.IsNull}}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Content="{TemplateBinding Content}"
-                            HorizontalContentAlignment="Center"
-                            VerticalContentAlignment="Center" />
+                            Background="{TemplateBinding Background}">
+                        </Border>
+                        <Viewbox
+                            Margin="{TemplateBinding Gap, Converter={StaticResource DoubleToThicknessConverter}}"
+                            StretchDirection="DownOnly">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                IsVisible="{TemplateBinding Source, Converter={x:Static ObjectConverters.IsNull}}"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center" />
+                        </Viewbox>
                         <Image Source="{TemplateBinding Source}" />
                         <ContentPresenter
                             Name="PART_HoverMask"
diff --git a/src/Ursa/Controls/Avatar/Avatar.cs b/src/Ursa/Controls/Avatar/Avatar.cs
index 43aaf71..e3c77e5 100644
--- a/src/Ursa/Controls/Avatar/Avatar.cs
+++ b/src/Ursa/Controls/Avatar/Avatar.cs
@@ -7,12 +7,21 @@ 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/DivideByTwoConverter.cs b/src/Ursa/Converters/DoubleToThicknessConverter.cs
similarity index 72%
rename from src/Ursa/Converters/DivideByTwoConverter.cs
rename to src/Ursa/Converters/DoubleToThicknessConverter.cs
index 15c2aa3..6ac248b 100644
--- a/src/Ursa/Converters/DivideByTwoConverter.cs
+++ b/src/Ursa/Converters/DoubleToThicknessConverter.cs
@@ -1,18 +1,19 @@
 using System.Globalization;
+using Avalonia;
 using Avalonia.Data.Converters;
 
 namespace Ursa.Converters;
 
-public class DivideByTwoConverter : IValueConverter
+public class DoubleToThicknessConverter : IValueConverter
 {
     public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         if (value is double d)
         {
-            return d / 2;
+            return new Thickness(d, 0);
         }
 
-        return value;
+        return AvaloniaProperty.UnsetValue;
     }
 
     public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)