diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
index 1bbf15c..3fac229 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
@@ -7,6 +7,7 @@
   xmlns:local="clr-namespace:ModpackUpdater.Apps.Manager.Ui"
   xmlns:manager="clr-namespace:ModpackUpdater.Apps.Manager"
   xmlns:vm="clr-namespace:ModpackUpdater.Apps.Manager.Ui.Models"
+  xmlns:controls="https://git.pilzinsel64.de/pilz-framework/pilz"
   mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
   x:Class="ModpackUpdater.Apps.Manager.Ui.MainWindow"
   x:DataType="vm:MainWindowViewModel"
@@ -35,6 +36,7 @@
       </Menu.Items>
     </Menu>
     
+    <!-- Tree view -->
     <Grid
       x:Name="GridMain"
       Grid.Row="1"
@@ -77,11 +79,13 @@
         </ScrollViewer>
       </StackPanel>
       
+      <!-- List editor -->
       <StackPanel
         Grid.Column="1"
         Margin="3"
         Spacing="6">
       
+        <!-- Header -->
         <ContentControl
           Content="{Binding SelectedTreeNode}">
         
@@ -93,14 +97,22 @@
                 Orientation="Horizontal"
                 Spacing="6">
         
-                <Menu>
-                  <Menu.Items>
-                    <MenuItem x:Name="MenuItemAddAction" Header="Create" Click="MenuItemAddAction_OnClick"/>
-                    <MenuItem x:Name="MenuItemRemoveAction" Header="Remove" Click="MenuItemRemoveAction_OnClick"/>
-                  </Menu.Items>
-                </Menu>
+                <controls:ImageButton
+                  x:Name="ButtonAddAction"
+                  Text="Add"
+                  ImageSource="{x:Static local:MainWindow.ButtonImageAddAction}"
+                  Background="Transparent"
+                  Click="ButtonAddAction_OnClick"/>
+                
+                <controls:ImageButton
+                  x:Name="ButtonRemoveAction"
+                  Text="Remove"
+                  ImageSource="{x:Static local:MainWindow.ButtonImageRemoveAction}"
+                  Background="Transparent"
+                  Click="ButtonRemoveAction_OnClick"/>
         
                 <TextBox
+                  Width="100"
                   Text="{Binding Version}"/>
         
                 <CheckBox
@@ -114,6 +126,7 @@
           </ContentControl.DataTemplates>
         </ContentControl>
 
+        <!-- DataGrid -->
         <DataGrid
           x:Name="DataGridActions"
           VerticalAlignment="Stretch"
@@ -145,6 +158,7 @@
         </DataGrid>
       </StackPanel>
 
+      <!-- Action editor -->
       <ScrollViewer
         x:Name="ScrollViewerInstallAction"
         Grid.Column="2"
diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
index aaa49ec..01e1385 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Media;
 using ModpackUpdater.Apps.Manager.Api;
 using ModpackUpdater.Apps.Manager.Api.Model;
 using ModpackUpdater.Apps.Manager.Api.Plugins.Features;
@@ -15,6 +16,9 @@ namespace ModpackUpdater.Apps.Manager.Ui;
 public partial class MainWindow : Window, IMainApi
 {
     private WorkspaceFeature? wsFeature;
+
+    public static IImage? ButtonImageAddAction => AppGlobals.Symbols.GetImageSource(AppSymbols.add);
+    public static IImage? ButtonImageRemoveAction => AppGlobals.Symbols.GetImageSource(AppSymbols.remove);
     
     public MainWindowViewModel Model { get; } = new();
     Window IMainApi.MainWindow => this;
@@ -149,4 +153,14 @@ public partial class MainWindow : Window, IMainApi
     {
         // ...
     }
+
+    private void ButtonAddAction_OnClick(object? sender, RoutedEventArgs e)
+    {
+        throw new NotImplementedException();
+    }
+
+    private void ButtonRemoveAction_OnClick(object? sender, RoutedEventArgs e)
+    {
+        throw new NotImplementedException();
+    }
 }
\ No newline at end of file