diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml b/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml
index 88cbb61..648d0f4 100644
--- a/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml
@@ -9,17 +9,20 @@
     Orientation="Horizontal"
     HorizontalAlignment="Center"
     VerticalAlignment="Center"
-    Spacing="6"
-    >
+  >
+    
     <Image
+      x:Name="ButtonImage"
+      Margin="0, 0, 0, 6"
       VerticalAlignment="Center"
       Width="16"
       Height="16"
-      x:Name="ButtonImage"
-      />
+      IsVisible="False"
+    />
+    
     <TextBlock
-      VerticalAlignment="Center"
       x:Name="ButtonText"
-      />
+      VerticalAlignment="Center"
+    />
   </StackPanel>
 </Button>
diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml.cs b/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml.cs
index a367da3..95ab83a 100644
--- a/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml.cs
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageButton.axaml.cs
@@ -22,7 +22,11 @@ public partial class ImageButton : Button
     public IImage? ImageSource
     {
         get => ButtonImage.Source;
-        set => ButtonImage.Source = value;
+        set
+        {
+            ButtonImage.Source = value;
+            ButtonImage.IsVisible = value != null;
+        }
     }
 
     public double ImageWidth
diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml b/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml
index 49e8839..23e0421 100644
--- a/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml
@@ -9,17 +9,20 @@
     Orientation="Horizontal"
     HorizontalAlignment="Center"
     VerticalAlignment="Center"
-    Spacing="6"
-    >
+  >
+    
     <Image
+      x:Name="ButtonImage"
+      Margin="0, 0, 0, 6"
       VerticalAlignment="Center"
       Width="16"
       Height="16"
-      x:Name="ButtonImage"
-      />
+      IsVisible="False"
+    />
+    
     <TextBlock
-      VerticalAlignment="Center"
       x:Name="ButtonText"
-      />
+      VerticalAlignment="Center"
+    />
   </StackPanel>
 </SplitButton>
diff --git a/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml.cs b/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml.cs
index 9517de2..c30d0e7 100644
--- a/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml.cs
+++ b/Pilz.UI.AvaloniaUI/Controls/ImageSplitButton.axaml.cs
@@ -22,7 +22,11 @@ public partial class ImageSplitButton : SplitButton
     public IImage? ImageSource
     {
         get => ButtonImage.Source;
-        set => ButtonImage.Source = value;
+        set
+        {
+            ButtonImage.Source = value;
+            ButtonImage.IsVisible = value != null;
+        }
     }
 
     public double ImageWidth
diff --git a/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml b/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml
index ede3ff0..275601e 100644
--- a/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml
+++ b/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml
@@ -5,13 +5,19 @@
              xmlns:controls="https://git.pilzinsel64.de/pilz-framework/pilz"
              xmlns:dialogs="clr-namespace:Pilz.UI.AvaloniaUI.Dialogs"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             HorizontalAlignment="Stretch"
+             VerticalAlignment="Stretch"
              x:Class="Pilz.UI.AvaloniaUI.Dialogs.AvaloniaFlyoutBase">
     
-    <StackPanel Orientation="Vertical">
+    <Grid
+        ColumnDefinitions="*"
+        RowDefinitions="Auto,*,Auto"
+        >
         
         <!-- StackPanel: Header -->
         <StackPanel
             x:Name="StackPanelHeader"
+            Grid.Row="0"
             Orientation="Horizontal"
             HorizontalAlignment="Stretch"
             Margin="3"
@@ -33,6 +39,7 @@
         
         <!-- Panel: Content -->
         <ContentPresenter
+            Grid.Row="1"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
             Margin="3"
@@ -42,6 +49,7 @@
         <!-- StackPanel: Footer -->
         <Grid
             x:Name="StackPanelFooter"
+            Grid.Row="2"
             RowDefinitions="Auto"
             ColumnDefinitions="*,Auto,Auto"
             HorizontalAlignment="Stretch"
@@ -74,5 +82,5 @@
                 Click="ButtonCancel_OnClick"
             />
         </Grid>
-    </StackPanel>
+    </Grid>
 </UserControl>
diff --git a/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj b/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj
index 9d7d44d..28f39bd 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.0</Version>
+    <Version>1.2.2</Version>
   </PropertyGroup>
 
   <ItemGroup>