diff --git a/Installer/PassKey.iss b/Installer/PassKey.iss
index 4078573..b98f02d 100644
--- a/Installer/PassKey.iss
+++ b/Installer/PassKey.iss
@@ -4,8 +4,8 @@
 [Setup]
 AppId={{A7F3C2D1-8E4B-4F9A-B6D5-3C1E7A2F0D84}
 AppName=PassKey
-AppVersion=1.0.4
-AppVerName=PassKey 1.0.4
+AppVersion=1.0.5
+AppVerName=PassKey 1.0.5
 AppPublisher=Giuseppe Imperato
 AppPublisherURL=https://github.com/pexatar/PassKey
 AppSupportURL=https://github.com/pexatar/PassKey/issues
diff --git a/src/PassKey.Desktop/Controls/EmptyStateControl.xaml b/src/PassKey.Desktop/Controls/EmptyStateControl.xaml
index 6a88c45..68b968b 100644
--- a/src/PassKey.Desktop/Controls/EmptyStateControl.xaml
+++ b/src/PassKey.Desktop/Controls/EmptyStateControl.xaml
@@ -6,8 +6,7 @@
     <StackPanel
         HorizontalAlignment="Center"
         VerticalAlignment="Center"
-        Spacing="16"
-        MaxWidth="400">
+        Spacing="16">
 
         <FontIcon
             x:Name="IconElement"
@@ -26,6 +25,7 @@
             Style="{StaticResource BodyTextBlockStyle}"
             HorizontalAlignment="Center"
             TextAlignment="Center"
+            TextWrapping="NoWrap"
             Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
 
         <StackPanel
diff --git a/src/PassKey.Desktop/Views/CreditCardsListView.xaml b/src/PassKey.Desktop/Views/CreditCardsListView.xaml
index f03732e..17b7037 100644
--- a/src/PassKey.Desktop/Views/CreditCardsListView.xaml
+++ b/src/PassKey.Desktop/Views/CreditCardsListView.xaml
@@ -182,7 +182,7 @@
                 Icon="&#xE8C7;"
                 Title="Nessuna carta salvata"
                 Subtitle="Aggiungi la tua prima carta di credito per averla sempre al sicuro."
-                PrimaryActionText="Nuova carta" />
+                />
         </Grid>
 
         <!-- Detail panel (right side, 400px) -->
diff --git a/src/PassKey.Desktop/Views/CreditCardsListView.xaml.cs b/src/PassKey.Desktop/Views/CreditCardsListView.xaml.cs
index fb83744..58aa62e 100644
--- a/src/PassKey.Desktop/Views/CreditCardsListView.xaml.cs
+++ b/src/PassKey.Desktop/Views/CreditCardsListView.xaml.cs
@@ -31,8 +31,6 @@ public async void SetViewModel(CreditCardsListViewModel vm)
         // Apply localized empty-state strings (guarantees correct language on every OS locale).
         EmptyState.Title = _res.GetString("EmptyCardsTitle");
         EmptyState.Subtitle = _res.GetString("EmptyCardsSubtitle");
-        EmptyState.PrimaryActionText = _res.GetString("EmptyCardsPrimaryAction");
-
         vm.PropertyChanged += OnViewModelPropertyChanged;
         vm.SaveCompleted += ShowSavedToast;
 
diff --git a/src/PassKey.Desktop/Views/IdentitiesListView.xaml b/src/PassKey.Desktop/Views/IdentitiesListView.xaml
index 715e402..6c58b9e 100644
--- a/src/PassKey.Desktop/Views/IdentitiesListView.xaml
+++ b/src/PassKey.Desktop/Views/IdentitiesListView.xaml
@@ -60,10 +60,11 @@
                     x:Uid="EmptyIdentities"
                     x:Name="EmptyState"
                     Visibility="Collapsed"
+                    Margin="0,16,0,0"
                     Icon="&#xE77B;"
                     Title="Nessuna identità"
                     Subtitle="Aggiungi la tua prima identità per salvare dati personali, indirizzi e documenti."
-                    PrimaryActionText="Aggiungi identità" />
+                    />
 
                 <!-- Identity GridView (card layout) -->
                 <GridView x:Name="IdentityList"
diff --git a/src/PassKey.Desktop/Views/IdentitiesListView.xaml.cs b/src/PassKey.Desktop/Views/IdentitiesListView.xaml.cs
index e92ee8f..9eda370 100644
--- a/src/PassKey.Desktop/Views/IdentitiesListView.xaml.cs
+++ b/src/PassKey.Desktop/Views/IdentitiesListView.xaml.cs
@@ -35,11 +35,6 @@ public async void SetViewModel(IdentitiesListViewModel vm)
         // Apply localized empty-state strings (guarantees correct language on every OS locale).
         EmptyState.Title = _res.GetString("EmptyIdentitiesTitle");
         EmptyState.Subtitle = _res.GetString("EmptyIdentitiesSubtitle");
-        EmptyState.PrimaryActionText = _res.GetString("EmptyIdentitiesPrimaryAction");
-
-        // Wire EmptyState primary action to AddNew
-        EmptyState.PrimaryActionCommand = new RelayCommand(() => _viewModel?.AddNewCommand.Execute(null));
-
         await vm.LoadEntriesCommand.ExecuteAsync(null);
         UpdateList();
         UpdateEmptyState();
diff --git a/src/PassKey.Desktop/Views/PasswordsListView.xaml b/src/PassKey.Desktop/Views/PasswordsListView.xaml
index 611e14f..3d533c2 100644
--- a/src/PassKey.Desktop/Views/PasswordsListView.xaml
+++ b/src/PassKey.Desktop/Views/PasswordsListView.xaml
@@ -55,7 +55,7 @@
             </Grid>
 
             <!-- Column headers (clickable for sort) -->
-            <Grid Grid.Row="1" Padding="56,4,8,4" ColumnSpacing="12">
+            <Grid x:Name="ColumnHeadersGrid" Grid.Row="1" Padding="56,4,8,4" ColumnSpacing="12">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="2*" />
                     <ColumnDefinition Width="2*" />
@@ -187,7 +187,7 @@
                 Icon="&#xE8D7;"
                 Title="Nessuna password salvata"
                 Subtitle="Aggiungi la tua prima password per iniziare a proteggere i tuoi account."
-                PrimaryActionText="Nuova password" />
+                />
         </Grid>
 
         <!-- Detail panel (right side, 400px) -->
diff --git a/src/PassKey.Desktop/Views/PasswordsListView.xaml.cs b/src/PassKey.Desktop/Views/PasswordsListView.xaml.cs
index c3abbfe..e3c31d7 100644
--- a/src/PassKey.Desktop/Views/PasswordsListView.xaml.cs
+++ b/src/PassKey.Desktop/Views/PasswordsListView.xaml.cs
@@ -32,8 +32,6 @@ public async void SetViewModel(PasswordsListViewModel vm)
         // Apply localized empty-state strings (guarantees correct language on every OS locale).
         EmptyState.Title = _res.GetString("EmptyPasswordsTitle");
         EmptyState.Subtitle = _res.GetString("EmptyPasswordsSubtitle");
-        EmptyState.PrimaryActionText = _res.GetString("EmptyPasswordsPrimaryAction");
-
         vm.PropertyChanged += OnViewModelPropertyChanged;
         vm.SaveCompleted += ShowSavedToast;
 
@@ -68,6 +66,7 @@ private void UpdateEmptyState()
         if (_viewModel is null) return;
         EmptyState.Visibility = _viewModel.IsEmpty ? Visibility.Visible : Visibility.Collapsed;
         PasswordList.Visibility = _viewModel.IsEmpty ? Visibility.Collapsed : Visibility.Visible;
+        ColumnHeadersGrid.Visibility = _viewModel.IsEmpty ? Visibility.Collapsed : Visibility.Visible;
     }
 
     private void UpdateDetailPanel()
diff --git a/src/PassKey.Desktop/Views/SecureNotesListView.xaml b/src/PassKey.Desktop/Views/SecureNotesListView.xaml
index 0b22109..bc375b5 100644
--- a/src/PassKey.Desktop/Views/SecureNotesListView.xaml
+++ b/src/PassKey.Desktop/Views/SecureNotesListView.xaml
@@ -171,7 +171,6 @@
                 Icon="&#xE70B;"
                 Title="Nessuna nota"
                 Subtitle="Crea la tua prima nota sicura per salvare informazioni riservate."
-                PrimaryActionText="Nuova nota"
                 AutomationProperties.Name="Nessuna nota. Crea la tua prima nota sicura." />
 
             <!-- Empty state: filtro attivo ma 0 risultati -->
diff --git a/src/PassKey.Desktop/Views/SecureNotesListView.xaml.cs b/src/PassKey.Desktop/Views/SecureNotesListView.xaml.cs
index 1dd4401..3feca18 100644
--- a/src/PassKey.Desktop/Views/SecureNotesListView.xaml.cs
+++ b/src/PassKey.Desktop/Views/SecureNotesListView.xaml.cs
@@ -39,13 +39,9 @@ public async void SetViewModel(SecureNotesListViewModel vm)
         // Apply localized empty-state strings (guarantees correct language on every OS locale).
         EmptyState.Title = _res.GetString("EmptyNotesTitle");
         EmptyState.Subtitle = _res.GetString("EmptyNotesSubtitle");
-        EmptyState.PrimaryActionText = _res.GetString("EmptyNotesPrimaryAction");
         FilteredEmptyState.Title = _res.GetString("EmptyFilteredTitle");
         FilteredEmptyState.Subtitle = _res.GetString("EmptyFilteredSubtitle");
 
-        // Wire EmptyState primary action button
-        EmptyState.PrimaryActionCommand = new RelayCommand(() => _viewModel?.AddNewCommand.Execute(null));
-
         await vm.LoadEntriesCommand.ExecuteAsync(null);
         UpdateList();
         UpdateEmptyState();