diff --git a/imagecatalog/AvaloniaApp.axaml b/imagecatalog/AvaloniaApp.axaml
index fe06efa..97bd721 100644
--- a/imagecatalog/AvaloniaApp.axaml
+++ b/imagecatalog/AvaloniaApp.axaml
@@ -1,8 +1,38 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ImageCatalog_2.AvaloniaApp">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="AppWindowBackgroundBrush">#F3F5F8</SolidColorBrush>
+                    <SolidColorBrush x:Key="AppSurfaceBackgroundBrush">#FFFFFF</SolidColorBrush>
+                    <SolidColorBrush x:Key="AppControlBackgroundBrush">#F7F8FA</SolidColorBrush>
+                    <SolidColorBrush x:Key="AppControlBackgroundBrushPointerOver">#EEF2F6</SolidColorBrush>
+                    <SolidColorBrush x:Key="AppBorderBrush">#D2D8E0</SolidColorBrush>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <SolidColorBrush x:Key="AppWindowBackgroundBrush">#1B2027</SolidColorBrush>
+                    <SolidColorBrush x:Key="AppSurfaceBackgroundBrush">#242A33</SolidColorBrush>
+                    <SolidColorBrush x:Key="AppControlBackgroundBrush">#2D343F</SolidColorBrush>
+                    <SolidColorBrush x:Key="AppControlBackgroundBrushPointerOver">#38414E</SolidColorBrush>
+                    <SolidColorBrush x:Key="AppBorderBrush">#4B5563</SolidColorBrush>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+
     <Application.Styles>
-        <FluentTheme />
+        <FluentTheme DensityStyle="Compact" />
+
+        <Style Selector="Window">
+            <Setter Property="Background" Value="{DynamicResource AppWindowBackgroundBrush}" />
+        </Style>
+
+        <Style Selector="Border">
+            <Setter Property="Background" Value="{DynamicResource AppSurfaceBackgroundBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}" />
+        </Style>
 
         <!-- Compact default styles to reduce padding/margins for a denser UI -->
         <Style Selector="TabItem">
@@ -23,31 +53,51 @@
         </Style>
 
         <Style Selector="TextBox">
-            <Setter Property="Padding" Value="4" />
-            <Setter Property="Margin" Value="4,0,0,0" />
+            <Setter Property="Padding" Value="8,4" />
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="MinHeight" Value="30" />
+            <Setter Property="Background" Value="{DynamicResource AppControlBackgroundBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}" />
         </Style>
 
         <Style Selector="Button">
-            <Setter Property="Padding" Value="6,4" />
-            <Setter Property="Margin" Value="4,0,0,0" />
+            <Setter Property="Padding" Value="10,4" />
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="MinHeight" Value="30" />
+            <Setter Property="Background" Value="{DynamicResource AppControlBackgroundBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}" />
+        </Style>
+
+        <Style Selector="Button:pointerover">
+            <Setter Property="Background" Value="{DynamicResource AppControlBackgroundBrushPointerOver}" />
+        </Style>
+
+        <Style Selector="ComboBox">
+            <Setter Property="MinHeight" Value="30" />
+            <Setter Property="Background" Value="{DynamicResource AppControlBackgroundBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}" />
         </Style>
 
         <Style Selector="CheckBox">
-            <Setter Property="Margin" Value="0,2,0,0" />
+            <Setter Property="Margin" Value="0,1,0,0" />
             <Setter Property="Padding" Value="2,0" />
         </Style>
 
         <Style Selector="RadioButton">
-            <Setter Property="Margin" Value="0,2,0,0" />
+            <Setter Property="Margin" Value="0,1,0,0" />
             <Setter Property="Padding" Value="2,0" />
         </Style>
 
         <Style Selector="TextBlock">
-            <Setter Property="Margin" Value="0,6,0,0" />
+            <Setter Property="Margin" Value="0,4,0,0" />
         </Style>
 
         <Style Selector="StackPanel">
-            <Setter Property="Spacing" Value="6" />
+            <Setter Property="Spacing" Value="4" />
+        </Style>
+
+        <Style Selector="ProgressBar">
+            <Setter Property="MinHeight" Value="16" />
         </Style>
 
         <StyleInclude Source="avares://IconPacks.Avalonia/Icons.axaml" />
diff --git a/imagecatalog/AvaloniaMainWindow.axaml b/imagecatalog/AvaloniaMainWindow.axaml
index bd8498f..ba21b00 100644
--- a/imagecatalog/AvaloniaMainWindow.axaml
+++ b/imagecatalog/AvaloniaMainWindow.axaml
@@ -98,29 +98,29 @@
                 </TabItem>
             </TabControl>
 
-            <StackPanel Grid.Column="1">
+            <Grid Grid.Column="1" RowDefinitions="Auto,*">
                 <StackPanel HorizontalAlignment="Right" Margin="0,0,0,8">
                         <Button Name="ThemeToggleButton" Width="28" Height="28" Click="ToggleTheme_Click" ToolTip.Tip="Cambia tema"
                             HorizontalAlignment="Right" Padding="2">
-                        <iconPacks:PackIconMaterial Kind="ThemeLightDark" Width="12" Height="12" Foreground="{DynamicResource ForegroundBrush}" />
+                        <iconPacks:PackIconMaterial Kind="ThemeLightDark" Width="14" Height="14" Foreground="{DynamicResource ForegroundBrush}" />
                     </Button>
                 </StackPanel>
-                <Border BorderBrush="#DDD" BorderThickness="1" Padding="6" MaxWidth="280">
-                    <StackPanel>
-                        <StackPanel>
-                            <Button Width="120" Margin="0,0,0,8" Command="{Binding LoadSettingsCommand}">
+                <Border Grid.Row="1" BorderThickness="1" Padding="10" MaxWidth="280" MinWidth="0">
+                    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,*" RowSpacing="8" MinWidth="0">
+                        <StackPanel Grid.Row="0">
+                            <Button HorizontalAlignment="Stretch" Margin="0,0,0,4" Command="{Binding LoadSettingsCommand}">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                     <iconPacks:PackIconMaterial Kind="FolderUploadOutline" Width="14" Height="14" Margin="0,0,4,0" Foreground="{DynamicResource ForegroundBrush}" />
                                     <TextBlock Text="Carica" />
                                 </StackPanel>
                             </Button>
-                            <Button Width="120" Margin="0,0,0,8" Command="{Binding SaveSettingsCommand}">
+                            <Button HorizontalAlignment="Stretch" Margin="0,0,0,4" Command="{Binding SaveSettingsCommand}">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                     <iconPacks:PackIconMaterial Kind="ContentSaveOutline" Width="14" Height="14" Margin="0,0,4,0" Foreground="{DynamicResource ForegroundBrush}" />
                                     <TextBlock Text="Salva" />
                                 </StackPanel>
                             </Button>
-                            <Button Width="120" Height="36" Margin="0,6,0,8"
+                            <Button HorizontalAlignment="Stretch" Height="34" Margin="0,4,0,4"
                                     Command="{Binding ProcessImagesCommand}"
                                     IsEnabled="{Binding UiEnabled}">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
@@ -128,7 +128,7 @@
                                     <TextBlock Text="Avvia" />
                                 </StackPanel>
                             </Button>
-                            <Button Width="120" Height="36"
+                            <Button HorizontalAlignment="Stretch" Height="34"
                                     Command="{Binding AsyncCancelOperationCommand}">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                     <iconPacks:PackIconMaterial Kind="StopCircleOutline" Width="14" Height="14" Margin="0,0,4,0" Foreground="Red" />
@@ -137,27 +137,29 @@
                             </Button>
                         </StackPanel>
 
-                        <Separator Margin="0,8,0,8" />
+                        <Separator Grid.Row="1" Margin="0,4,0,0" />
 
-                        <TextBlock Text="Stato" FontWeight="Bold" />
-                        <TextBlock Text="{Binding ProcessingStatus}" TextWrapping="Wrap" />
+                        <TextBlock Grid.Row="2" Text="Stato" FontWeight="Bold" />
+                        <TextBlock Grid.Row="3" Text="{Binding ProcessingStatus}" TextWrapping="Wrap" />
 
-                        <TextBlock Text="Progresso" FontWeight="Bold" Margin="0,8,0,0" />
-                        <ProgressBar Minimum="0" Maximum="{Binding ProgressBarMaximum}"
-                                     Value="{Binding ProgressBarValue}" Height="20" />
-                        <TextBlock Margin="0,6,0,0">
+                        <TextBlock Grid.Row="4" Text="Progresso" FontWeight="Bold" Margin="0,4,0,0" />
+                        <ProgressBar Grid.Row="5" Minimum="0" Maximum="{Binding ProgressBarMaximum}"
+                                     Value="{Binding ProgressBarValue}" Height="18" HorizontalAlignment="Stretch" MinWidth="0" />
+                        <TextBlock Grid.Row="6" Margin="0,2,0,0">
                             <Run Text="{Binding ProcessedImagesCount}" />
                             <Run Text=" / " />
                             <Run Text="{Binding TotalImagesCount}" />
                         </TextBlock>
 
-                        <TextBlock Text="Velocita" FontWeight="Bold" Margin="0,8,0,0" />
-                        <TextBlock Text="{Binding SpeedCounter}" TextWrapping="Wrap" />
+                        <TextBlock Grid.Row="7" Text="Velocita" FontWeight="Bold" Margin="0,4,0,0" />
+                        <StackPanel Grid.Row="8" VerticalAlignment="Top">
+                            <TextBlock Text="{Binding SpeedCounter}" TextWrapping="Wrap" />
 
-                        <TextBlock Text="{Binding AppVersion}" Margin="0,8,0,0" Opacity="0.6" />
-                    </StackPanel>
+                            <TextBlock Text="{Binding AppVersion}" Margin="0,8,0,0" Opacity="0.6" />
+                        </StackPanel>
+                    </Grid>
                 </Border>
-            </StackPanel>
+            </Grid>
         </Grid>
     </Grid>
 </Window>
diff --git a/imagecatalog/AvaloniaMainWindow.axaml.cs b/imagecatalog/AvaloniaMainWindow.axaml.cs
index 96dcfc9..2de8d3f 100644
--- a/imagecatalog/AvaloniaMainWindow.axaml.cs
+++ b/imagecatalog/AvaloniaMainWindow.axaml.cs
@@ -155,12 +155,6 @@ public partial class AvaloniaMainWindow : Window
 
     private void UpdateThemeToggleButtonContent()
     {
-        var toggleButton = this.FindControl<Avalonia.Controls.Button>("ThemeToggleButton");
-        if (toggleButton is null)
-        {
-            return;
-        }
-
-        toggleButton.Content = _isDarkTheme ? "☀" : "🌙";
+        _ = this.FindControl<Avalonia.Controls.Button>("ThemeToggleButton");
     }
 }
diff --git a/imagecatalog/AvaloniaViews/AiTabView.axaml b/imagecatalog/AvaloniaViews/AiTabView.axaml
index 8b125d3..09abb0b 100644
--- a/imagecatalog/AvaloniaViews/AiTabView.axaml
+++ b/imagecatalog/AvaloniaViews/AiTabView.axaml
@@ -1,6 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:avaloniaDataGrid="clr-namespace:Avalonia.Controls;assembly=Avalonia.Controls.DataGrid"
+             xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
              x:Class="ImageCatalog_2.AvaloniaViews.AiTabView">
     <Grid>
         <Grid.RowDefinitions>
@@ -17,10 +18,20 @@
                 <Grid Margin="0,4,0,0" ColumnDefinitions="Auto,*,Auto,Auto">
                     <TextBlock Text="Cartella modelli:" VerticalAlignment="Center" Margin="0,0,8,0" Grid.Column="0" />
                     <TextBox Text="{Binding ModelsFolderPath, Mode=TwoWay}" Grid.Column="1" VerticalAlignment="Center" />
-                    <Button Width="88" Margin="6,0,0,0" Command="{Binding SelectModelsFolderCommand}"
-                            Grid.Column="2" Content="Scegli..." />
-                    <Button Width="56" Margin="6,0,0,0" Grid.Column="3"
-                            Click="OpenModelsFolder_Click" Content="Apri" />
+                    <Button Width="104" Margin="6,0,0,0" Command="{Binding SelectModelsFolderCommand}"
+                            Grid.Column="2">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <iconPacks:PackIconMaterial Kind="FolderOpenOutline" Width="14" Height="14" />
+                            <TextBlock Text="Scegli..." />
+                        </StackPanel>
+                    </Button>
+                    <Button Width="72" Margin="6,0,0,0" Grid.Column="3"
+                            Click="OpenModelsFolder_Click">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                            <TextBlock Text="Apri" />
+                        </StackPanel>
+                    </Button>
                 </Grid>
 
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,8,0,0" Spacing="8">
@@ -32,10 +43,20 @@
                 <Grid Margin="0,4,0,0" ColumnDefinitions="Auto,*,Auto,Auto">
                     <TextBlock Text="Percorso CSV:" VerticalAlignment="Center" Margin="0,0,8,0" Grid.Column="0" />
                     <TextBox Text="{Binding CsvOutputPath, Mode=TwoWay}" Grid.Column="1" VerticalAlignment="Center" />
-                    <Button Width="88" Margin="6,0,0,0" Command="{Binding SelectCsvOutputCommand}"
-                            Grid.Column="2" Content="Scegli..." />
-                    <Button Width="56" Margin="6,0,0,0" Grid.Column="3"
-                            Click="OpenCsvOutputFolder_Click" Content="Apri" />
+                    <Button Width="104" Margin="6,0,0,0" Command="{Binding SelectCsvOutputCommand}"
+                            Grid.Column="2">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <iconPacks:PackIconMaterial Kind="FileOutline" Width="14" Height="14" />
+                            <TextBlock Text="Scegli..." />
+                        </StackPanel>
+                    </Button>
+                    <Button Width="72" Margin="6,0,0,0" Grid.Column="3"
+                            Click="OpenCsvOutputFolder_Click">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                            <TextBlock Text="Apri" />
+                        </StackPanel>
+                    </Button>
                 </Grid>
 
                 <TextBlock Text="Anteprima risultati" FontWeight="Bold" Margin="0,8,0,0" />
diff --git a/imagecatalog/AvaloniaViews/FaceAiTabView.axaml b/imagecatalog/AvaloniaViews/FaceAiTabView.axaml
index 84b62d1..7f7f3ae 100644
--- a/imagecatalog/AvaloniaViews/FaceAiTabView.axaml
+++ b/imagecatalog/AvaloniaViews/FaceAiTabView.axaml
@@ -1,5 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
              x:Class="ImageCatalog_2.AvaloniaViews.FaceAiTabView">
     <ScrollViewer>
         <StackPanel Margin="4" Spacing="6">
@@ -11,22 +12,47 @@
             <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
                 <TextBlock Grid.Column="0" Text="face_encoder:" VerticalAlignment="Center" />
                 <TextBox Grid.Column="1" Name="FaceExecutablePathTextBox" Text="{Binding FaceExecutablePath, Mode=TwoWay}" Watermark="C:\\tools\\face_encoder.exe" />
-                <Button Grid.Column="2" Name="FaceSelectExecutableButton" Content="Scegli..." Click="SelectFaceExecutable_Click" Width="88" Margin="6,0,0,0" />
-                <Button Grid.Column="3" Name="FaceOpenExecutableButton" Content="Apri" Click="OpenFaceExecutableFolder_Click" Width="56" Margin="6,0,0,0" />
+                <Button Grid.Column="2" Name="FaceSelectExecutableButton" Click="SelectFaceExecutable_Click" Width="104" Margin="6,0,0,0">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                        <iconPacks:PackIconMaterial Kind="FileOutline" Width="14" Height="14" />
+                        <TextBlock Text="Scegli..." />
+                    </StackPanel>
+                </Button>
+                <Button Grid.Column="3" Name="FaceOpenExecutableButton" Click="OpenFaceExecutableFolder_Click" Width="72" Margin="6,0,0,0">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                        <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                        <TextBlock Text="Apri" />
+                    </StackPanel>
+                </Button>
             </Grid>
 
             <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
                 <TextBlock Grid.Column="0" Text="Sorgente:" VerticalAlignment="Center" />
                 <TextBox Grid.Column="1" Name="FaceDestinationPathTextBox" Text="{Binding DestinationPath, Mode=OneWay}" IsReadOnly="True" />
-                <Button Grid.Column="3" Name="FaceOpenDestinationButton" Content="Apri" Click="OpenFaceDestinationFolder_Click" Width="56" Margin="6,0,0,0" />
+                <Button Grid.Column="3" Name="FaceOpenDestinationButton" Click="OpenFaceDestinationFolder_Click" Width="72" Margin="6,0,0,0">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                        <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                        <TextBlock Text="Apri" />
+                    </StackPanel>
+                </Button>
             </Grid>
 
             <TextBlock Text="Output encodings" FontWeight="Bold" Margin="0,4,0,0" />
             <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
                 <TextBlock Grid.Column="0" Text="File out (.pkl):" VerticalAlignment="Center" />
                 <TextBox Grid.Column="1" Name="FaceOutputFolderTextBox" Text="{Binding FaceOutputFolderPath, Mode=TwoWay}" Watermark="C:\\output\\encodings.pkl" />
-                <Button Grid.Column="2" Name="FaceSelectOutputButton" Content="Scegli..." Click="SelectFaceOutputFile_Click" Width="88" Margin="6,0,0,0" />
-                <Button Grid.Column="3" Name="FaceOpenOutputButton" Content="Apri" Click="OpenFaceOutputFolder_Click" Width="56" Margin="6,0,0,0" />
+                <Button Grid.Column="2" Name="FaceSelectOutputButton" Click="SelectFaceOutputFile_Click" Width="104" Margin="6,0,0,0">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                        <iconPacks:PackIconMaterial Kind="FileOutline" Width="14" Height="14" />
+                        <TextBlock Text="Scegli..." />
+                    </StackPanel>
+                </Button>
+                <Button Grid.Column="3" Name="FaceOpenOutputButton" Click="OpenFaceOutputFolder_Click" Width="72" Margin="6,0,0,0">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                        <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                        <TextBlock Text="Apri" />
+                    </StackPanel>
+                </Button>
             </Grid>
 
             <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,6,0,0">
diff --git a/imagecatalog/AvaloniaViews/GeneralTabView.axaml b/imagecatalog/AvaloniaViews/GeneralTabView.axaml
index 7332d8b..82979eb 100644
--- a/imagecatalog/AvaloniaViews/GeneralTabView.axaml
+++ b/imagecatalog/AvaloniaViews/GeneralTabView.axaml
@@ -1,61 +1,92 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
              x:Class="ImageCatalog_2.AvaloniaViews.GeneralTabView">
     <ScrollViewer>
-        <StackPanel Margin="4">
+        <StackPanel Margin="4" Spacing="8">
             <TextBlock Text="Percorsi" FontWeight="Bold" />
-            <StackPanel Margin="0,4,0,0">
-                <Grid Margin="0,0,0,4" ColumnDefinitions="Auto,*,Auto,Auto">
+            <StackPanel Margin="0,2,0,0" Spacing="6">
+                <Grid Margin="0,0,0,2" ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
                     <TextBlock Text="Sorgente:" VerticalAlignment="Center" Margin="0,0,8,0" Grid.Column="0" />
                     <TextBox Text="{Binding SourcePath, Mode=TwoWay}" Grid.Column="1" VerticalAlignment="Center" />
-                    <Button Width="88" Margin="6,0,0,0" Command="{Binding SelectSourceFolderCommand}" Grid.Column="2" Content="Scegli..." />
-                    <Button Width="56" Margin="6,0,0,0" Grid.Column="3" Click="OpenSourceFolder_Click" Content="Apri" />
+                    <Button Width="104" Command="{Binding SelectSourceFolderCommand}" Grid.Column="2">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <iconPacks:PackIconMaterial Kind="FolderOpenOutline" Width="14" Height="14" />
+                            <TextBlock Text="Scegli..." />
+                        </StackPanel>
+                    </Button>
+                    <Button Width="72" Grid.Column="3" Click="OpenSourceFolder_Click">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                            <TextBlock Text="Apri" />
+                        </StackPanel>
+                    </Button>
                 </Grid>
-                <Grid ColumnDefinitions="Auto,*,Auto,Auto">
+                <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
                     <TextBlock Text="Destinazione:" VerticalAlignment="Center" Margin="0,0,8,0" Grid.Column="0" />
                     <TextBox Text="{Binding DestinationPath, Mode=TwoWay}" Grid.Column="1" VerticalAlignment="Center" />
-                    <Button Width="88" Margin="6,0,0,0" Command="{Binding SelectDestinationFolderCommand}" Grid.Column="2" Content="Scegli..." />
-                    <Button Width="56" Margin="6,0,0,0" Grid.Column="3" Click="OpenDestinationFolder_Click" Content="Apri" />
+                    <Button Width="104" Command="{Binding SelectDestinationFolderCommand}" Grid.Column="2">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <iconPacks:PackIconMaterial Kind="FolderOpenOutline" Width="14" Height="14" />
+                            <TextBlock Text="Scegli..." />
+                        </StackPanel>
+                    </Button>
+                    <Button Width="72" Grid.Column="3" Click="OpenDestinationFolder_Click">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                            <TextBlock Text="Apri" />
+                        </StackPanel>
+                    </Button>
                 </Grid>
             </StackPanel>
 
-            <TextBlock Text="Opzioni" FontWeight="Bold" Margin="0,8,0,0" />
-            <StackPanel Margin="0,4,0,0">
-                <CheckBox Content="Forza JPEG" IsChecked="{Binding ForceJpeg}" />
-                <CheckBox Content="Aggiorna sottodirectory" IsChecked="{Binding UpdateSubdirectories}" />
-                <CheckBox Content="Crea sottocartelle" IsChecked="{Binding CreateSubfolders}" />
-                <CheckBox Content="Sovrascrivi immagini" IsChecked="{Binding OverwriteImages}" />
-            </StackPanel>
+            <Grid ColumnDefinitions="*,*" ColumnSpacing="24" Margin="0,4,0,0">
+                <StackPanel Grid.Column="0" Spacing="8">
+                    <TextBlock Text="Opzioni" FontWeight="Bold" />
+                    <StackPanel Margin="0,2,0,0" Spacing="3">
+                        <CheckBox Content="Forza JPEG" IsChecked="{Binding ForceJpeg}" />
+                        <CheckBox Content="Aggiorna sottodirectory" IsChecked="{Binding UpdateSubdirectories}" />
+                        <CheckBox Content="Crea sottocartelle" IsChecked="{Binding CreateSubfolders}" />
+                        <CheckBox Content="Sovrascrivi immagini" IsChecked="{Binding OverwriteImages}" />
+                    </StackPanel>
 
-            <TextBlock Text="Elaborazione" FontWeight="Bold" Margin="0,8,0,0" />
-            <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
-                <TextBlock Text="Threads:" VerticalAlignment="Center" />
-                <TextBox Text="{Binding ThreadsCount, Mode=TwoWay}" Width="60" Margin="8,0,0,0" />
-                <TextBlock Text="Chunk:" VerticalAlignment="Center" Margin="12,0,0,0" />
-                <TextBox Text="{Binding ChunkSize, Mode=TwoWay}" Width="60" Margin="6,0,0,0" />
-            </StackPanel>
+                    <TextBlock Text="Elaborazione" FontWeight="Bold" />
+                    <Grid ColumnDefinitions="Auto,74,Auto,74" ColumnSpacing="8" RowDefinitions="Auto">
+                        <TextBlock Text="Threads:" VerticalAlignment="Center" Grid.Column="0" />
+                        <TextBox Text="{Binding ThreadsCount, Mode=TwoWay}" Width="74" Grid.Column="1" />
+                        <TextBlock Text="Chunk:" VerticalAlignment="Center" Grid.Column="2" />
+                        <TextBox Text="{Binding ChunkSize, Mode=TwoWay}" Width="74" Grid.Column="3" />
+                    </Grid>
 
-            <TextBlock Text="Divisione cartelle" FontWeight="Bold" Margin="0,8,0,0" />
-            <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
-                <TextBlock Text="File per cartella:" VerticalAlignment="Center" />
-                <TextBox Text="{Binding FilesPerFolder}" Width="60" Margin="8,0,0,0" />
-                <TextBlock Text="Suffisso:" VerticalAlignment="Center" Margin="12,0,0,0" />
-                <TextBox Text="{Binding FolderSuffix}" Width="120" Margin="8,0,0,0" />
-            </StackPanel>
+                    <TextBlock Text="Libreria Immagini" FontWeight="Bold" />
+                    <StackPanel Margin="0,2,0,0" Spacing="3">
+                        <RadioButton Content="System.Graphics" IsChecked="{Binding UseSystemGraphics}" GroupName="Lib" IsVisible="{Binding IsRunningOnWindows}" />
+                        <RadioButton Content="ImageSharp" IsChecked="{Binding UseImageSharp}" GroupName="Lib" />
+                    </StackPanel>
+                </StackPanel>
 
-            <TextBlock Text="Numerazione" FontWeight="Bold" Margin="0,8,0,0" />
-            <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
-                <RadioButton Content="Progressiva" IsChecked="{Binding UseProgressiveNumbering}" GroupName="Num" />
-                <RadioButton Content="Per file" IsChecked="{Binding UseFileNumbering}" GroupName="Num" Margin="8,0,0,0" />
-                <TextBlock Text="Cifre:" VerticalAlignment="Center" Margin="12,0,0,0" />
-                <TextBox Text="{Binding CounterDigits}" Width="40" Margin="8,0,0,0" />
-            </StackPanel>
+                <StackPanel Grid.Column="1" Spacing="8">
+                    <TextBlock Text="Divisione cartelle" FontWeight="Bold" />
+                    <Grid ColumnDefinitions="Auto,78,Auto,*" ColumnSpacing="8" RowDefinitions="Auto">
+                        <TextBlock Text="File per cartella:" VerticalAlignment="Center" Grid.Column="0" />
+                        <TextBox Text="{Binding FilesPerFolder}" Width="78" Grid.Column="1" />
+                        <TextBlock Text="Suffisso:" VerticalAlignment="Center" Grid.Column="2" />
+                        <TextBox Text="{Binding FolderSuffix}" MinWidth="120" Grid.Column="3" />
+                    </Grid>
 
-            <TextBlock Text="Libreria Immagini" FontWeight="Bold" Margin="0,8,0,0" />
-            <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
-                <RadioButton Content="System.Graphics" IsChecked="{Binding UseSystemGraphics}" GroupName="Lib" IsVisible="{Binding IsRunningOnWindows}" />
-                <RadioButton Content="ImageSharp" IsChecked="{Binding UseImageSharp}" GroupName="Lib" Margin="8,0,0,0" />
-            </StackPanel>
+                    <TextBlock Text="Numerazione" FontWeight="Bold" />
+                    <StackPanel Margin="0,2,0,0" Spacing="6">
+                        <StackPanel Orientation="Horizontal" Spacing="12">
+                            <RadioButton Content="Progressiva" IsChecked="{Binding UseProgressiveNumbering}" GroupName="Num" />
+                            <RadioButton Content="Per file" IsChecked="{Binding UseFileNumbering}" GroupName="Num" />
+                        </StackPanel>
+                        <Grid ColumnDefinitions="Auto,64,*" ColumnSpacing="8">
+                            <TextBlock Text="Cifre:" VerticalAlignment="Center" Grid.Column="0" />
+                            <TextBox Text="{Binding CounterDigits}" Width="64" Grid.Column="1" />
+                        </Grid>
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
         </StackPanel>
     </ScrollViewer>
 </UserControl>