diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/BitmapIcon.cs b/Toolkit.UI.Controls.Avalonia/IconElement/BitmapIcon.cs
index 9cce9da..2540449 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/BitmapIcon.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/BitmapIcon.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class BitmapIcon : FluentAvalonia.UI.Controls.BitmapIcon
-{
-}
\ No newline at end of file
+public class BitmapIcon : FluentAvalonia.UI.Controls.BitmapIcon;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/BitmapIconSource.cs b/Toolkit.UI.Controls.Avalonia/IconElement/BitmapIconSource.cs
index 7a547d5..99a330d 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/BitmapIconSource.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/BitmapIconSource.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class BitmapIconSource : FluentAvalonia.UI.Controls.BitmapIconSource
-{
-}
\ No newline at end of file
+public class BitmapIconSource : FluentAvalonia.UI.Controls.BitmapIconSource;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/ContentIconSource.cs b/Toolkit.UI.Controls.Avalonia/IconElement/ContentIconSource.cs
deleted file mode 100644
index 0eff083..0000000
--- a/Toolkit.UI.Controls.Avalonia/IconElement/ContentIconSource.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Avalonia;
-using Avalonia.Controls.Templates;
-using Avalonia.Metadata;
-
-namespace Toolkit.UI.Controls.Avalonia;
-
-public class ContentIconSource : FluentAvalonia.UI.Controls.IconSource
-{
-    public static readonly StyledProperty<object?> ContentProperty =
-        AvaloniaProperty.Register<ContentIconSource, object?>("Content");
-
-    public static readonly StyledProperty<IDataTemplate?> ContentTemplateProperty =
-        AvaloniaProperty.Register<ContentIconSource, IDataTemplate?>("ContentTemplate");
-
-    [Content]
-    public object? Content
-    {
-        get => GetValue(ContentProperty);
-        set => SetValue(ContentProperty, value);
-    }
-
-    public IDataTemplate? IconTemplate
-    {
-        get => GetValue(ContentTemplateProperty);
-        set => SetValue(ContentTemplateProperty, value);
-    }
-}
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/FAIconElement.cs b/Toolkit.UI.Controls.Avalonia/IconElement/FAIconElement.cs
index bf2175a..d4c84f1 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/FAIconElement.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/FAIconElement.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class FAIconElement : FluentAvalonia.UI.Controls.FAIconElement
-{
-}
\ No newline at end of file
+public class FAIconElement : FluentAvalonia.UI.Controls.FAIconElement;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/FAPathIcon.cs b/Toolkit.UI.Controls.Avalonia/IconElement/FAPathIcon.cs
index 6237d31..0902e5c 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/FAPathIcon.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/FAPathIcon.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class FAPathIcon : FluentAvalonia.UI.Controls.FAPathIcon
-{
-}
\ No newline at end of file
+public class FAPathIcon : FluentAvalonia.UI.Controls.FAPathIcon;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/FontIcon.cs b/Toolkit.UI.Controls.Avalonia/IconElement/FontIcon.cs
index e918d58..7ec2aac 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/FontIcon.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/FontIcon.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class FontIcon : FluentAvalonia.UI.Controls.FontIcon
-{
-}
\ No newline at end of file
+public class FontIcon : FluentAvalonia.UI.Controls.FontIcon;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/FontIconSource.cs b/Toolkit.UI.Controls.Avalonia/IconElement/FontIconSource.cs
index 45cfc8d..3c0024a 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/FontIconSource.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/FontIconSource.cs
@@ -1,6 +1,3 @@
-namespace Kromek.UI.Avalonia.Controls
-{
-    public class FontIconSource : FluentAvalonia.UI.Controls.FontIconSource
-    {
-    }
-}
\ No newline at end of file
+namespace Toolkit.UI.Controls.Avalonia;
+
+public class FontIconSource : FluentAvalonia.UI.Controls.FontIconSource;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/IconHelper.cs b/Toolkit.UI.Controls.Avalonia/IconElement/IconHelper.cs
deleted file mode 100644
index 17254b7..0000000
--- a/Toolkit.UI.Controls.Avalonia/IconElement/IconHelper.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-
-namespace Toolkit.UI.Controls.Avalonia;
-
-public class IconHelper
-{
-    private static MethodInfo? invoker;
-
-    public static FluentAvalonia.UI.Controls.FAIconElement? CreateIconElement(FluentAvalonia.UI.Controls.IconSource source)
-    {
-        if (source is ContentIconSource contentIconSource)
-        {
-            ContentIcon contentIcon = new()
-            {
-                [!ContentIcon.ContentProperty] = contentIconSource[!ContentIconSource.ContentProperty],
-                [!ContentIcon.ContentTemplateProperty] = contentIconSource[!ContentIconSource.ContentTemplateProperty],
-            };
-
-            return contentIcon;
-        }
-        else
-        {
-            if (invoker == null)
-            {
-                Type? iconHelpersType = Type.GetType("FluentAvalonia.UI.Controls.IconHelpers,FluentAvalonia");
-                if (iconHelpersType?.GetMethod("CreateFromUnknown", BindingFlags.Public | BindingFlags.Static) is MethodInfo createFromUnknown)
-                {
-                    invoker = createFromUnknown;
-                }
-            }
-
-            return (FluentAvalonia.UI.Controls.FAIconElement?)invoker?.Invoke(null, new object[] { source });
-        }
-    }
-}
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/ImageIcon.cs b/Toolkit.UI.Controls.Avalonia/IconElement/ImageIcon.cs
index 35af302..74fb2bd 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/ImageIcon.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/ImageIcon.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class ImageIcon : FluentAvalonia.UI.Controls.ImageIcon
-{
-}
\ No newline at end of file
+public class ImageIcon : FluentAvalonia.UI.Controls.ImageIcon;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/ImageIconSource.cs b/Toolkit.UI.Controls.Avalonia/IconElement/ImageIconSource.cs
index 421058b..bf90333 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/ImageIconSource.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/ImageIconSource.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class ImageIconSource : FluentAvalonia.UI.Controls.ImageIconSource
-{
-}
\ No newline at end of file
+public class ImageIconSource : FluentAvalonia.UI.Controls.ImageIconSource;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/PathIconSource.cs b/Toolkit.UI.Controls.Avalonia/IconElement/PathIconSource.cs
index 354c5ec..08235cb 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/PathIconSource.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/PathIconSource.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class PathIconSource : FluentAvalonia.UI.Controls.PathIconSource
-{
-}
\ No newline at end of file
+public class PathIconSource : FluentAvalonia.UI.Controls.PathIconSource;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/SymbolIcon.cs b/Toolkit.UI.Controls.Avalonia/IconElement/SymbolIcon.cs
index a28b406..a38d420 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/SymbolIcon.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/SymbolIcon.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class SymbolIcon : FluentAvalonia.UI.Controls.SymbolIcon
-{
-}
\ No newline at end of file
+public class SymbolIcon : FluentAvalonia.UI.Controls.SymbolIcon;
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/IconElement/SymbolIconSource.cs b/Toolkit.UI.Controls.Avalonia/IconElement/SymbolIconSource.cs
index 757fc89..32f1e57 100644
--- a/Toolkit.UI.Controls.Avalonia/IconElement/SymbolIconSource.cs
+++ b/Toolkit.UI.Controls.Avalonia/IconElement/SymbolIconSource.cs
@@ -1,5 +1,3 @@
 namespace Toolkit.UI.Controls.Avalonia;
 
-public class SymbolIconSource : FluentAvalonia.UI.Controls.SymbolIconSource
-{
-}
\ No newline at end of file
+public class SymbolIconSource : FluentAvalonia.UI.Controls.SymbolIconSource;
\ No newline at end of file