diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml b/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml
index 3b6cc99..eef96dc 100644
--- a/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml
@@ -1,30 +1,29 @@
-<Button xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        HorizontalContentAlignment="Center"
-        VerticalContentAlignment="Center"
-        x:Class="Pilz.UI.AvaloniaUI.Controls.ImageButton">
-    
+<Button
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:symbols="clr-namespace:Pilz.UI.Symbols;assembly=Pilz.UI"
+  mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+  HorizontalContentAlignment="Center"
+  VerticalContentAlignment="Center"
+  x:Class="Pilz.UI.AvaloniaUI.Controls.ImageButton">
+
   <StackPanel
     Orientation="Horizontal"
     HorizontalAlignment="Center"
     VerticalAlignment="Center"
-  >
-    
+    Spacing="6">
+
     <Image
       x:Name="ButtonImage"
-      Margin="0, 0, 0, 6"
       VerticalAlignment="Center"
-      Width="16"
-      Height="16"
-      IsVisible="False"
-    />
-    
+      Width="{x:Static symbols:SymbolGlobals.DefaultImageSmallSize}"
+      Height="{x:Static symbols:SymbolGlobals.DefaultImageSmallSize}"
+      IsVisible="False"/>
+
     <TextBlock
       x:Name="ButtonText"
-      VerticalAlignment="Center"
-    />
+      VerticalAlignment="Center"/>
   </StackPanel>
-</Button>
+</Button>
\ No newline at end of file
diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml.cs b/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml.cs
index 95ab83a..cc25abd 100644
--- a/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml.cs
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml.cs
@@ -41,7 +41,7 @@ public partial class ImageButton : Button
         set => ButtonImage.Height = value;
     }
 
-    public double ImageQuadSize
+    public double ImageWeight
     {
         get => ButtonImage.Width;
         set => ButtonImage.Width = ButtonImage.Height = value;
diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageDropDownButton.axaml b/Pilz.UI.AvaloniaUI/Controls/ImageDropDownButton.axaml
new file mode 100644
index 0000000..997800d
--- /dev/null
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageDropDownButton.axaml
@@ -0,0 +1,29 @@
+<DropDownButton
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:symbols="clr-namespace:Pilz.UI.Symbols;assembly=Pilz.UI"
+  mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+  HorizontalContentAlignment="Center"
+  VerticalContentAlignment="Center"
+  x:Class="Pilz.UI.AvaloniaUI.Controls.ImageDropDownButton">
+
+  <StackPanel
+    Orientation="Horizontal"
+    HorizontalAlignment="Center"
+    VerticalAlignment="Center"
+    Spacing="6">
+
+    <Image
+      x:Name="ButtonImage"
+      VerticalAlignment="Center"
+      Width="{x:Static symbols:SymbolGlobals.DefaultImageSmallSize}"
+      Height="{x:Static symbols:SymbolGlobals.DefaultImageSmallSize}"
+      IsVisible="False"/>
+
+    <TextBlock
+      x:Name="ButtonText"
+      VerticalAlignment="Center"/>
+  </StackPanel>
+</DropDownButton>
\ No newline at end of file
diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageDropDownButton.axaml.cs b/Pilz.UI.AvaloniaUI/Controls/ImageDropDownButton.axaml.cs
new file mode 100644
index 0000000..186a865
--- /dev/null
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageDropDownButton.axaml.cs
@@ -0,0 +1,59 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+
+namespace Pilz.UI.AvaloniaUI.Controls;
+
+public partial class ImageDropDownButton : DropDownButton
+{
+    protected override Type StyleKeyOverride => typeof(SplitButton);
+
+    public ImageDropDownButton()
+    {
+        InitializeComponent();
+    }
+
+    public string? Text
+    {
+        get => ButtonText.Text;
+        set => ButtonText.Text = value;
+    }
+
+    public IImage? ImageSource
+    {
+        get => ButtonImage.Source;
+        set
+        {
+            ButtonImage.Source = value;
+            ButtonImage.IsVisible = value != null;
+        }
+    }
+
+    public double ImageWidth
+    {
+        get => ButtonImage.Width;
+        set => ButtonImage.Width = value;
+    }
+
+    public double ImageHeight
+    {
+        get => ButtonImage.Height;
+        set => ButtonImage.Height = value;
+    }
+
+    public double ImageWeight
+    {
+        get => ButtonImage.Width;
+        set => ButtonImage.Width = ButtonImage.Height = value;
+    }
+
+    public Size ImageSize
+    {
+        get => new(ButtonImage.Width, ButtonImage.Height);
+        set
+        {
+            ButtonImage.Width = value.Width;
+            ButtonImage.Height = value.Height;
+        }
+    }
+}
diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml b/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml
index d86ad4d..0d8c79b 100644
--- a/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml
@@ -1,30 +1,29 @@
-<SplitButton xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        HorizontalContentAlignment="Center"
-        VerticalContentAlignment="Center"
-        x:Class="Pilz.UI.AvaloniaUI.Controls.ImageSplitButton">
-    
+<SplitButton
+  xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:symbols="clr-namespace:Pilz.UI.Symbols;assembly=Pilz.UI"
+  mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+  HorizontalContentAlignment="Center"
+  VerticalContentAlignment="Center"
+  x:Class="Pilz.UI.AvaloniaUI.Controls.ImageSplitButton">
+
   <StackPanel
     Orientation="Horizontal"
     HorizontalAlignment="Center"
     VerticalAlignment="Center"
-  >
-    
+    Spacing="6">
+
     <Image
       x:Name="ButtonImage"
-      Margin="0, 0, 0, 6"
       VerticalAlignment="Center"
-      Width="16"
-      Height="16"
-      IsVisible="False"
-    />
-    
+      Width="{x:Static symbols:SymbolGlobals.DefaultImageSmallSize}"
+      Height="{x:Static symbols:SymbolGlobals.DefaultImageSmallSize}"
+      IsVisible="False"/>
+
     <TextBlock
       x:Name="ButtonText"
-      VerticalAlignment="Center"
-    />
+      VerticalAlignment="Center"/>
   </StackPanel>
-</SplitButton>
+</SplitButton>
\ No newline at end of file
diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml.cs b/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml.cs
index c30d0e7..7ed3ea1 100644
--- a/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml.cs
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml.cs
@@ -41,7 +41,7 @@ public partial class ImageSplitButton : SplitButton
         set => ButtonImage.Height = value;
     }
 
-    public double ImageQuadSize
+    public double ImageWeight
     {
         get => ButtonImage.Width;
         set => ButtonImage.Width = ButtonImage.Height = value;
diff --git a/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml b/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml
index 275601e..bbadf6d 100644
--- a/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml
+++ b/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml
@@ -28,6 +28,7 @@
                 x:Name="ImageTitle"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
+                Width="16"
             />
             
             <TextBlock
diff --git a/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj b/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj
index 7b35a1c..a29f4dd 100644
--- a/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj
+++ b/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.2.8</Version>
+    <Version>1.2.9</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,6 +24,10 @@
     <Compile Update="Controls\ImageSplitButton.axaml.cs">
       <DependentUpon>ImageSplitButton.axaml</DependentUpon>
     </Compile>
+    <Compile Update="Controls\ImageDropDownButton.axaml.cs">
+      <DependentUpon>ImageDropDownButton.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
 
 </Project>
diff --git a/Pilz.UI/Pilz.UI.csproj b/Pilz.UI/Pilz.UI.csproj
index 5d0cf6e..e8dc162 100644
--- a/Pilz.UI/Pilz.UI.csproj
+++ b/Pilz.UI/Pilz.UI.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>3.1.1</Version>
+    <Version>3.1.2</Version>
   </PropertyGroup>
   
 </Project>
diff --git a/Pilz.UI/Symbols/BaseSymbolFactory.cs b/Pilz.UI/Symbols/BaseSymbolFactory.cs
index 29a33f9..4fef8c4 100644
--- a/Pilz.UI/Symbols/BaseSymbolFactory.cs
+++ b/Pilz.UI/Symbols/BaseSymbolFactory.cs
@@ -13,9 +13,9 @@ public abstract class BaseSymbolFactory<TSymbols> : IBaseSymbolFactory<TSymbols>
         return size switch
         {
             SymbolSize.Default => Size.Empty,
-            SymbolSize.Small => new Size(16, 16),
-            SymbolSize.Medium => new Size(20, 20),
-            SymbolSize.Large => new Size(32, 32),
+            SymbolSize.Small => new Size(SymbolGlobals.DefaultImageSmallSize, SymbolGlobals.DefaultImageSmallSize),
+            SymbolSize.Medium => new Size(SymbolGlobals.DefaultImageMediumSize, SymbolGlobals.DefaultImageMediumSize),
+            SymbolSize.Large => new Size(SymbolGlobals.DefaultImageLargeSize, SymbolGlobals.DefaultImageLargeSize),
             _ => new Size((int)size, (int)size),
         };
     }
diff --git a/Pilz.UI/Symbols/SymbolGlobals.cs b/Pilz.UI/Symbols/SymbolGlobals.cs
new file mode 100644
index 0000000..b732183
--- /dev/null
+++ b/Pilz.UI/Symbols/SymbolGlobals.cs
@@ -0,0 +1,8 @@
+namespace Pilz.UI.Symbols;
+
+public static class SymbolGlobals
+{
+    public static int DefaultImageSmallSize { get;} = 16;
+    public static int DefaultImageMediumSize { get;} = 20;
+    public static int DefaultImageLargeSize { get;} = 32;
+}
\ No newline at end of file
diff --git a/Pilz.UI/Symbols/SymbolSize.cs b/Pilz.UI/Symbols/SymbolSize.cs
index 85efff1..caefe93 100644
--- a/Pilz.UI/Symbols/SymbolSize.cs
+++ b/Pilz.UI/Symbols/SymbolSize.cs
@@ -8,17 +8,14 @@ public enum SymbolSize
     Default,
     /// <summary>
     /// Resizes the symbol to 16 x 16 pixels.
-    /// <br/><b>Deprecated!</b> This is just present due legacy reasons. Use <see cref="x16"/> instead.
     /// </summary>
     Small,
     /// <summary>
     /// Resizes the symbol to 20 x 20 pixels.
-    /// <br/><b>Deprecated!</b> This is just present due legacy reasons. Use <see cref="x20"/> instead.
     /// </summary>
     Medium,
     /// <summary>
     /// Resizes the symbol to 32 x 32 pixels.
-    /// <br/><b>Deprecated!</b> This is just present due legacy reasons. Use <see cref="x32"/> instead.
     /// </summary>
     Large,
     /// <summary>