diff --git a/src/IconPacks.Avalonia.Core/PackIconControlBase.xaml b/src/IconPacks.Avalonia.Core/PackIconControlBase.xaml
index 2a078ab..632d2c7 100644
--- a/src/IconPacks.Avalonia.Core/PackIconControlBase.xaml
+++ b/src/IconPacks.Avalonia.Core/PackIconControlBase.xaml
@@ -1,30 +1,31 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:iconPacks="urn:iconpacks-avalonia"
-                    xmlns:converter="clr-namespace:IconPacks.Avalonia.Converter;assembly=IconPacks.Avalonia.Core"
                     x:ClassModifier="internal">
 
     <ControlTemplate x:Key="IconPacks.Avalonia.PackIconControlBase.Template" TargetType="iconPacks:PackIconControlBase">
-        <Grid>
-            <Border Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}" />
-            <Grid x:Name="PART_InnerGrid"
-                  Margin="{TemplateBinding BorderThickness}">
-                <Viewbox x:Name="PART_ViewBox"
-                         Margin="{TemplateBinding Padding}">
+        <Border CornerRadius="{TemplateBinding CornerRadius}"
+                ClipToBounds="{TemplateBinding ClipToBounds}"
+                Padding="{TemplateBinding Padding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid x:Name="PART_InnerGrid">
+                <Viewbox x:Name="PART_ViewBox">
                     <Path x:Name="PART_IconPath"
-                          Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={x:Static converter:NullToDoNothingValueConverter.Instance}}"
+                          Fill="{TemplateBinding Foreground}"
+                          Data="{TemplateBinding Data}"
                           Stretch="Uniform"
                           UseLayoutRounding="False" />
                 </Viewbox>
             </Grid>
-        </Grid>
+        </Border>
     </ControlTemplate>
 
     <ControlTheme x:Key="IconPacks.Avalonia.PackIconControlBase.Theme" TargetType="iconPacks:PackIconControlBase">
         <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
         <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
+        <Setter Property="ClipToBounds" Value="True" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="FlowDirection" Value="LeftToRight" />
         <Setter Property="Padding" Value="0" />