diff --git a/Locales/de-DE.xaml b/Locales/de-DE.xaml
index 9d7d6ed..f0cc9ee 100644
--- a/Locales/de-DE.xaml
+++ b/Locales/de-DE.xaml
@@ -54,6 +54,16 @@
     <sys:String x:Key="LogViewerView_ExportActivity">Aktivität exportieren</sys:String>
     <sys:String x:Key="LogViewerView_CleanupDiagnostics">Diagnosedateien bereinigen</sys:String>
     <sys:String x:Key="LogViewerView_OpenFolder">Öffnen Sie den Diagnoseordner</sys:String>
+    <sys:String x:Key="LogViewerView_SearchAutomationName">Protokolleinträge durchsuchen</sys:String>
+    <sys:String x:Key="LogViewerView_CategoryFilterAutomationName">Nach Kategorie filtern</sys:String>
+    <sys:String x:Key="LogViewerView_LevelFilterAutomationName">Nach Protokollebene filtern</sys:String>
+    <sys:String x:Key="LogViewerView_FromDateAutomationName">Startdatum des Protokolls</sys:String>
+    <sys:String x:Key="LogViewerView_ToDateAutomationName">Enddatum des Protokolls</sys:String>
+    <sys:String x:Key="LogViewerView_RefreshAutomationName">Protokolleinträge aktualisieren</sys:String>
+    <sys:String x:Key="LogViewerView_EntryListAutomationName">Aktivitätsprotokolleinträge</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsSplitterAutomationName">Bereich mit Aktivitätsdetails anpassen</sys:String>
+    <sys:String x:Key="LogViewerView_MessageAutomationName">Nachricht des ausgewählten Protokolleintrags</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsAutomationName">Details des ausgewählten Protokolleintrags</sys:String>
 
     <!-- LogViewerView Grid Headers -->
     <sys:String x:Key="LogViewerView_HeaderTime">Zeit</sys:String>
@@ -103,6 +113,12 @@
     <sys:String x:Key="MasksView_CpusHeader">CPUs</sys:String>
     <sys:String x:Key="MasksView_Cpu">CPU</sys:String>
     <sys:String x:Key="MasksView_Options">Maskenoptionen</sys:String>
+    <sys:String x:Key="MasksView_CreateMaskAutomationName">Neue CPU-Maske erstellen</sys:String>
+    <sys:String x:Key="MasksView_DeleteMaskAutomationName">Ausgewählte CPU-Maske löschen</sys:String>
+    <sys:String x:Key="MasksView_MaskListAutomationName">CPU-Maskenvoreinstellungen</sys:String>
+    <sys:String x:Key="MasksView_MaskListSplitterAutomationName">Maskenliste und Editor anpassen</sys:String>
+    <sys:String x:Key="MasksView_MaskNameAutomationName">Name der CPU-Maske</sys:String>
+    <sys:String x:Key="MasksView_MaskDescriptionAutomationName">Beschreibung der CPU-Maske</sys:String>
 
     <!-- PerformanceView -->
     <sys:String x:Key="PerformanceView_OptionalDiagnostics">Optionale Diagnose</sys:String>
diff --git a/Locales/en-US.xaml b/Locales/en-US.xaml
index 22cb72e..029aab9 100644
--- a/Locales/en-US.xaml
+++ b/Locales/en-US.xaml
@@ -54,6 +54,16 @@
     <sys:String x:Key="LogViewerView_ExportActivity">Export Activity</sys:String>
     <sys:String x:Key="LogViewerView_CleanupDiagnostics">Cleanup Diagnostic Files</sys:String>
     <sys:String x:Key="LogViewerView_OpenFolder">Open Diagnostic Folder</sys:String>
+    <sys:String x:Key="LogViewerView_SearchAutomationName">Search log entries</sys:String>
+    <sys:String x:Key="LogViewerView_CategoryFilterAutomationName">Filter by category</sys:String>
+    <sys:String x:Key="LogViewerView_LevelFilterAutomationName">Filter by log level</sys:String>
+    <sys:String x:Key="LogViewerView_FromDateAutomationName">Start date for log entries</sys:String>
+    <sys:String x:Key="LogViewerView_ToDateAutomationName">End date for log entries</sys:String>
+    <sys:String x:Key="LogViewerView_RefreshAutomationName">Refresh log entries</sys:String>
+    <sys:String x:Key="LogViewerView_EntryListAutomationName">Activity log entries</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsSplitterAutomationName">Resize activity details panel</sys:String>
+    <sys:String x:Key="LogViewerView_MessageAutomationName">Selected log entry message</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsAutomationName">Selected log entry details</sys:String>
     
     <!-- LogViewerView Grid Headers -->
     <sys:String x:Key="LogViewerView_HeaderTime">Time</sys:String>
@@ -103,6 +113,12 @@
     <sys:String x:Key="MasksView_CpusHeader">CPUs</sys:String>
     <sys:String x:Key="MasksView_Cpu">CPU</sys:String>
     <sys:String x:Key="MasksView_Options">Mask Options</sys:String>
+    <sys:String x:Key="MasksView_CreateMaskAutomationName">Create new CPU mask</sys:String>
+    <sys:String x:Key="MasksView_DeleteMaskAutomationName">Delete selected CPU mask</sys:String>
+    <sys:String x:Key="MasksView_MaskListAutomationName">CPU mask presets</sys:String>
+    <sys:String x:Key="MasksView_MaskListSplitterAutomationName">Resize mask list and editor</sys:String>
+    <sys:String x:Key="MasksView_MaskNameAutomationName">CPU mask name</sys:String>
+    <sys:String x:Key="MasksView_MaskDescriptionAutomationName">CPU mask description</sys:String>
 
     <!-- PerformanceView -->
     <sys:String x:Key="PerformanceView_OptionalDiagnostics">Optional Diagnostics</sys:String>
diff --git a/Locales/es-ES.xaml b/Locales/es-ES.xaml
index f199574..9bd0962 100644
--- a/Locales/es-ES.xaml
+++ b/Locales/es-ES.xaml
@@ -54,6 +54,16 @@
     <sys:String x:Key="LogViewerView_ExportActivity">Exportar actividad</sys:String>
     <sys:String x:Key="LogViewerView_CleanupDiagnostics">Limpiar archivos de diagnóstico</sys:String>
     <sys:String x:Key="LogViewerView_OpenFolder">Abrir carpeta de diagnóstico</sys:String>
+    <sys:String x:Key="LogViewerView_SearchAutomationName">Buscar entradas del registro</sys:String>
+    <sys:String x:Key="LogViewerView_CategoryFilterAutomationName">Filtrar por categoría</sys:String>
+    <sys:String x:Key="LogViewerView_LevelFilterAutomationName">Filtrar por nivel del registro</sys:String>
+    <sys:String x:Key="LogViewerView_FromDateAutomationName">Fecha inicial de las entradas</sys:String>
+    <sys:String x:Key="LogViewerView_ToDateAutomationName">Fecha final de las entradas</sys:String>
+    <sys:String x:Key="LogViewerView_RefreshAutomationName">Actualizar entradas del registro</sys:String>
+    <sys:String x:Key="LogViewerView_EntryListAutomationName">Entradas del registro de actividad</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsSplitterAutomationName">Cambiar el tamaño del panel de detalles de actividad</sys:String>
+    <sys:String x:Key="LogViewerView_MessageAutomationName">Mensaje de la entrada seleccionada</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsAutomationName">Detalles de la entrada seleccionada</sys:String>
 
     <!-- LogViewerView Grid Headers -->
     <sys:String x:Key="LogViewerView_HeaderTime">tiempo</sys:String>
@@ -103,6 +113,12 @@
     <sys:String x:Key="MasksView_CpusHeader">CPUs</sys:String>
     <sys:String x:Key="MasksView_Cpu">CPU</sys:String>
     <sys:String x:Key="MasksView_Options">Opciones de máscara</sys:String>
+    <sys:String x:Key="MasksView_CreateMaskAutomationName">Crear una nueva máscara de CPU</sys:String>
+    <sys:String x:Key="MasksView_DeleteMaskAutomationName">Eliminar la máscara de CPU seleccionada</sys:String>
+    <sys:String x:Key="MasksView_MaskListAutomationName">Preajustes de máscaras de CPU</sys:String>
+    <sys:String x:Key="MasksView_MaskListSplitterAutomationName">Cambiar el tamaño de la lista de máscaras y el editor</sys:String>
+    <sys:String x:Key="MasksView_MaskNameAutomationName">Nombre de la máscara de CPU</sys:String>
+    <sys:String x:Key="MasksView_MaskDescriptionAutomationName">Descripción de la máscara de CPU</sys:String>
 
     <!-- PerformanceView -->
     <sys:String x:Key="PerformanceView_OptionalDiagnostics">Diagnóstico opcional</sys:String>
diff --git a/Locales/fr-FR.xaml b/Locales/fr-FR.xaml
index ea3d136..35d158b 100644
--- a/Locales/fr-FR.xaml
+++ b/Locales/fr-FR.xaml
@@ -54,6 +54,16 @@
     <sys:String x:Key="LogViewerView_ExportActivity">Exporter l’activité</sys:String>
     <sys:String x:Key="LogViewerView_CleanupDiagnostics">Nettoyer les fichiers de diagnostic</sys:String>
     <sys:String x:Key="LogViewerView_OpenFolder">Ouvrir le dossier de diagnostic</sys:String>
+    <sys:String x:Key="LogViewerView_SearchAutomationName">Rechercher des entrées du journal</sys:String>
+    <sys:String x:Key="LogViewerView_CategoryFilterAutomationName">Filtrer par catégorie</sys:String>
+    <sys:String x:Key="LogViewerView_LevelFilterAutomationName">Filtrer par niveau de journal</sys:String>
+    <sys:String x:Key="LogViewerView_FromDateAutomationName">Date de début des entrées</sys:String>
+    <sys:String x:Key="LogViewerView_ToDateAutomationName">Date de fin des entrées</sys:String>
+    <sys:String x:Key="LogViewerView_RefreshAutomationName">Actualiser les entrées du journal</sys:String>
+    <sys:String x:Key="LogViewerView_EntryListAutomationName">Entrées du journal d’activité</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsSplitterAutomationName">Redimensionner le panneau des détails de l’activité</sys:String>
+    <sys:String x:Key="LogViewerView_MessageAutomationName">Message de l’entrée sélectionnée</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsAutomationName">Détails de l’entrée sélectionnée</sys:String>
 
     <!-- LogViewerView Grid Headers -->
     <sys:String x:Key="LogViewerView_HeaderTime">Temps</sys:String>
@@ -103,6 +113,12 @@
     <sys:String x:Key="MasksView_CpusHeader">CPUs</sys:String>
     <sys:String x:Key="MasksView_Cpu">CPU</sys:String>
     <sys:String x:Key="MasksView_Options">Options de masque</sys:String>
+    <sys:String x:Key="MasksView_CreateMaskAutomationName">Créer un nouveau masque CPU</sys:String>
+    <sys:String x:Key="MasksView_DeleteMaskAutomationName">Supprimer le masque CPU sélectionné</sys:String>
+    <sys:String x:Key="MasksView_MaskListAutomationName">Préréglages de masques CPU</sys:String>
+    <sys:String x:Key="MasksView_MaskListSplitterAutomationName">Redimensionner la liste des masques et l’éditeur</sys:String>
+    <sys:String x:Key="MasksView_MaskNameAutomationName">Nom du masque CPU</sys:String>
+    <sys:String x:Key="MasksView_MaskDescriptionAutomationName">Description du masque CPU</sys:String>
 
     <!-- PerformanceView -->
     <sys:String x:Key="PerformanceView_OptionalDiagnostics">Diagnostics en option</sys:String>
diff --git a/Locales/it-IT.xaml b/Locales/it-IT.xaml
index 8496980..97a2d19 100644
--- a/Locales/it-IT.xaml
+++ b/Locales/it-IT.xaml
@@ -54,6 +54,16 @@
     <sys:String x:Key="LogViewerView_ExportActivity">Esporta attività</sys:String>
     <sys:String x:Key="LogViewerView_CleanupDiagnostics">Elimina file diagnostici</sys:String>
     <sys:String x:Key="LogViewerView_OpenFolder">Apri la cartella diagnostica</sys:String>
+    <sys:String x:Key="LogViewerView_SearchAutomationName">Cerca voci del registro</sys:String>
+    <sys:String x:Key="LogViewerView_CategoryFilterAutomationName">Filtra per categoria</sys:String>
+    <sys:String x:Key="LogViewerView_LevelFilterAutomationName">Filtra per livello del registro</sys:String>
+    <sys:String x:Key="LogViewerView_FromDateAutomationName">Data iniziale delle voci</sys:String>
+    <sys:String x:Key="LogViewerView_ToDateAutomationName">Data finale delle voci</sys:String>
+    <sys:String x:Key="LogViewerView_RefreshAutomationName">Aggiorna voci del registro</sys:String>
+    <sys:String x:Key="LogViewerView_EntryListAutomationName">Voci del registro attività</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsSplitterAutomationName">Ridimensiona il pannello dei dettagli attività</sys:String>
+    <sys:String x:Key="LogViewerView_MessageAutomationName">Messaggio della voce selezionata</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsAutomationName">Dettagli della voce selezionata</sys:String>
 
     <!-- LogViewerView Grid Headers -->
     <sys:String x:Key="LogViewerView_HeaderTime">Tempo</sys:String>
@@ -103,6 +113,12 @@
     <sys:String x:Key="MasksView_CpusHeader">CPUs</sys:String>
     <sys:String x:Key="MasksView_Cpu">CPU</sys:String>
     <sys:String x:Key="MasksView_Options">Opzioni maschera</sys:String>
+    <sys:String x:Key="MasksView_CreateMaskAutomationName">Crea una nuova maschera CPU</sys:String>
+    <sys:String x:Key="MasksView_DeleteMaskAutomationName">Elimina la maschera CPU selezionata</sys:String>
+    <sys:String x:Key="MasksView_MaskListAutomationName">Preimpostazioni delle maschere CPU</sys:String>
+    <sys:String x:Key="MasksView_MaskListSplitterAutomationName">Ridimensiona l’elenco delle maschere e l’editor</sys:String>
+    <sys:String x:Key="MasksView_MaskNameAutomationName">Nome della maschera CPU</sys:String>
+    <sys:String x:Key="MasksView_MaskDescriptionAutomationName">Descrizione della maschera CPU</sys:String>
 
     <!-- PerformanceView -->
     <sys:String x:Key="PerformanceView_OptionalDiagnostics">Diagnostica opzionale</sys:String>
diff --git a/Locales/ru-RU.xaml b/Locales/ru-RU.xaml
index 12a2591..24d2564 100644
--- a/Locales/ru-RU.xaml
+++ b/Locales/ru-RU.xaml
@@ -54,6 +54,16 @@
     <sys:String x:Key="LogViewerView_ExportActivity">Экспортировать журнал</sys:String>
     <sys:String x:Key="LogViewerView_CleanupDiagnostics">Очистка диагностических файлов</sys:String>
     <sys:String x:Key="LogViewerView_OpenFolder">Открыть папку диагностики</sys:String>
+    <sys:String x:Key="LogViewerView_SearchAutomationName">Поиск записей журнала</sys:String>
+    <sys:String x:Key="LogViewerView_CategoryFilterAutomationName">Фильтр по категории</sys:String>
+    <sys:String x:Key="LogViewerView_LevelFilterAutomationName">Фильтр по уровню журнала</sys:String>
+    <sys:String x:Key="LogViewerView_FromDateAutomationName">Начальная дата записей журнала</sys:String>
+    <sys:String x:Key="LogViewerView_ToDateAutomationName">Конечная дата записей журнала</sys:String>
+    <sys:String x:Key="LogViewerView_RefreshAutomationName">Обновить записи журнала</sys:String>
+    <sys:String x:Key="LogViewerView_EntryListAutomationName">Записи журнала действий</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsSplitterAutomationName">Изменить размер панели сведений о действиях</sys:String>
+    <sys:String x:Key="LogViewerView_MessageAutomationName">Сообщение выбранной записи журнала</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsAutomationName">Сведения о выбранной записи журнала</sys:String>
 
     <!-- LogViewerView Grid Headers -->
     <sys:String x:Key="LogViewerView_HeaderTime">Время</sys:String>
@@ -103,6 +113,12 @@
     <sys:String x:Key="MasksView_CpusHeader">CPUs</sys:String>
     <sys:String x:Key="MasksView_Cpu">CPU</sys:String>
     <sys:String x:Key="MasksView_Options">Параметры маски</sys:String>
+    <sys:String x:Key="MasksView_CreateMaskAutomationName">Создать маску CPU</sys:String>
+    <sys:String x:Key="MasksView_DeleteMaskAutomationName">Удалить выбранную маску CPU</sys:String>
+    <sys:String x:Key="MasksView_MaskListAutomationName">Предустановки масок CPU</sys:String>
+    <sys:String x:Key="MasksView_MaskListSplitterAutomationName">Изменить размер списка масок и редактора</sys:String>
+    <sys:String x:Key="MasksView_MaskNameAutomationName">Имя маски CPU</sys:String>
+    <sys:String x:Key="MasksView_MaskDescriptionAutomationName">Описание маски CPU</sys:String>
 
     <!-- PerformanceView -->
     <sys:String x:Key="PerformanceView_OptionalDiagnostics">Дополнительная диагностика</sys:String>
diff --git a/Locales/zh-CN.xaml b/Locales/zh-CN.xaml
index 7e73372..b6265ba 100644
--- a/Locales/zh-CN.xaml
+++ b/Locales/zh-CN.xaml
@@ -54,6 +54,16 @@
     <sys:String x:Key="LogViewerView_ExportActivity">导出活动</sys:String>
     <sys:String x:Key="LogViewerView_CleanupDiagnostics">清理诊断文件</sys:String>
     <sys:String x:Key="LogViewerView_OpenFolder">打开诊断文件夹</sys:String>
+    <sys:String x:Key="LogViewerView_SearchAutomationName">搜索日志条目</sys:String>
+    <sys:String x:Key="LogViewerView_CategoryFilterAutomationName">按类别筛选</sys:String>
+    <sys:String x:Key="LogViewerView_LevelFilterAutomationName">按日志级别筛选</sys:String>
+    <sys:String x:Key="LogViewerView_FromDateAutomationName">日志条目开始日期</sys:String>
+    <sys:String x:Key="LogViewerView_ToDateAutomationName">日志条目结束日期</sys:String>
+    <sys:String x:Key="LogViewerView_RefreshAutomationName">刷新日志条目</sys:String>
+    <sys:String x:Key="LogViewerView_EntryListAutomationName">活动日志条目</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsSplitterAutomationName">调整活动详情面板大小</sys:String>
+    <sys:String x:Key="LogViewerView_MessageAutomationName">所选日志条目的消息</sys:String>
+    <sys:String x:Key="LogViewerView_DetailsAutomationName">所选日志条目的详情</sys:String>
     
     <!-- LogViewerView Grid Headers -->
     <sys:String x:Key="LogViewerView_HeaderTime">时间</sys:String>
@@ -103,6 +113,12 @@
     <sys:String x:Key="MasksView_CpusHeader">CPU 核心</sys:String>
     <sys:String x:Key="MasksView_Cpu">CPU</sys:String>
     <sys:String x:Key="MasksView_Options">掩码选项</sys:String>
+    <sys:String x:Key="MasksView_CreateMaskAutomationName">创建新的 CPU 掩码</sys:String>
+    <sys:String x:Key="MasksView_DeleteMaskAutomationName">删除所选 CPU 掩码</sys:String>
+    <sys:String x:Key="MasksView_MaskListAutomationName">CPU 掩码预设列表</sys:String>
+    <sys:String x:Key="MasksView_MaskListSplitterAutomationName">调整掩码列表和编辑器大小</sys:String>
+    <sys:String x:Key="MasksView_MaskNameAutomationName">CPU 掩码名称</sys:String>
+    <sys:String x:Key="MasksView_MaskDescriptionAutomationName">CPU 掩码描述</sys:String>
 
     <!-- PerformanceView -->
     <sys:String x:Key="PerformanceView_OptionalDiagnostics">可选性能诊断</sys:String>
diff --git a/Views/LogViewerView.xaml b/Views/LogViewerView.xaml
index 36fa3c7..0856c1c 100644
--- a/Views/LogViewerView.xaml
+++ b/Views/LogViewerView.xaml
@@ -93,15 +93,18 @@
                     </Grid.ColumnDefinitions>
 
                     <TextBlock Grid.Column="0" Text="{DynamicResource LogViewerView_Search}" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                    <TextBox Grid.Column="1" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
+                    <TextBox Grid.Column="1" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}"
+                             AutomationProperties.Name="{DynamicResource LogViewerView_SearchAutomationName}"/>
 
                     <TextBlock Grid.Column="3" Text="{DynamicResource LogViewerView_CategoryLabel}" VerticalAlignment="Center" Margin="0,0,8,0"/>
                     <ComboBox Grid.Column="4" ItemsSource="{Binding AvailableCategories}"
-                              SelectedItem="{Binding SelectedCategory}" HorizontalAlignment="Stretch"/>
+                              SelectedItem="{Binding SelectedCategory}" HorizontalAlignment="Stretch"
+                              AutomationProperties.Name="{DynamicResource LogViewerView_CategoryFilterAutomationName}"/>
 
                     <TextBlock Grid.Column="6" Text="{DynamicResource LogViewerView_LevelLabel}" VerticalAlignment="Center" Margin="0,0,8,0"/>
                     <ComboBox Grid.Column="7" ItemsSource="{Binding AvailableLogLevels}"
-                              SelectedItem="{Binding SelectedLogLevel}" HorizontalAlignment="Stretch"/>
+                              SelectedItem="{Binding SelectedLogLevel}" HorizontalAlignment="Stretch"
+                              AutomationProperties.Name="{DynamicResource LogViewerView_LevelFilterAutomationName}"/>
                 </Grid>
 
                 <!-- Filters Row 2 -->
@@ -115,15 +118,18 @@
                     </Grid.ColumnDefinitions>
 
                     <TextBlock Grid.Column="0" Text="{DynamicResource LogViewerView_From}" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                    <DatePicker Grid.Column="1" SelectedDate="{Binding FromDate}" HorizontalAlignment="Stretch"/>
+                    <DatePicker Grid.Column="1" SelectedDate="{Binding FromDate}" HorizontalAlignment="Stretch"
+                                AutomationProperties.Name="{DynamicResource LogViewerView_FromDateAutomationName}"/>
 
                     <TextBlock Grid.Column="3" Text="{DynamicResource LogViewerView_To}" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                    <DatePicker Grid.Column="4" SelectedDate="{Binding ToDate}" HorizontalAlignment="Stretch"/>
+                    <DatePicker Grid.Column="4" SelectedDate="{Binding ToDate}" HorizontalAlignment="Stretch"
+                                AutomationProperties.Name="{DynamicResource LogViewerView_ToDateAutomationName}"/>
                 </Grid>
 
                 <!-- Action Buttons -->
                 <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Bottom">
-                    <Button Content="{DynamicResource LogViewerView_Refresh}" Command="{Binding RefreshLogsCommand}" Margin="5,0">
+                    <Button Content="{DynamicResource LogViewerView_Refresh}" Command="{Binding RefreshLogsCommand}" Margin="5,0"
+                            AutomationProperties.Name="{DynamicResource LogViewerView_RefreshAutomationName}">
                         <Button.IsEnabled>
                             <Binding Path="IsLoading">
                                 <Binding.Converter>
@@ -132,10 +138,14 @@
                             </Binding>
                         </Button.IsEnabled>
                     </Button>
-                    <Button Content="{DynamicResource LogViewerView_ClearDisplay}" Command="{Binding ClearLogsCommand}" Margin="5,0"/>
-                    <Button Content="{DynamicResource LogViewerView_ExportActivity}" Command="{Binding ExportLogsCommand}" Margin="5,0"/>
-                    <Button Content="{DynamicResource LogViewerView_CleanupDiagnostics}" Command="{Binding CleanupOldLogsCommand}" Margin="5,0"/>
-                    <Button Content="{DynamicResource LogViewerView_OpenFolder}" Command="{Binding OpenLogDirectoryCommand}" Margin="5,0"/>
+                    <Button Content="{DynamicResource LogViewerView_ClearDisplay}" Command="{Binding ClearLogsCommand}" Margin="5,0"
+                            AutomationProperties.Name="{DynamicResource LogViewerView_ClearDisplay}"/>
+                    <Button Content="{DynamicResource LogViewerView_ExportActivity}" Command="{Binding ExportLogsCommand}" Margin="5,0"
+                            AutomationProperties.Name="{DynamicResource LogViewerView_ExportActivity}"/>
+                    <Button Content="{DynamicResource LogViewerView_CleanupDiagnostics}" Command="{Binding CleanupOldLogsCommand}" Margin="5,0"
+                            AutomationProperties.Name="{DynamicResource LogViewerView_CleanupDiagnostics}"/>
+                    <Button Content="{DynamicResource LogViewerView_OpenFolder}" Command="{Binding OpenLogDirectoryCommand}" Margin="5,0"
+                            AutomationProperties.Name="{DynamicResource LogViewerView_OpenFolder}"/>
                 </StackPanel>
             </Grid>
         </Border>
@@ -151,7 +161,8 @@
                       VirtualizingPanel.IsVirtualizing="True"
                       VirtualizingPanel.VirtualizationMode="Recycling"
                       VirtualizingPanel.ScrollUnit="Item"
-                      ScrollViewer.CanContentScroll="True">
+                      ScrollViewer.CanContentScroll="True"
+                      AutomationProperties.Name="{DynamicResource LogViewerView_EntryListAutomationName}">
                 <ListView.View>
                     <GridView ColumnHeaderContainerStyle="{StaticResource LogGridViewHeaderStyle}">
                     <GridViewColumn Header="{DynamicResource LogViewerView_HeaderTime}" Width="150">
@@ -222,9 +233,11 @@
                 <ListView.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="{DynamicResource LogViewerView_ContextMenuCopy}" Command="{Binding CopyLogEntryCommand}"
-                                  CommandParameter="{Binding SelectedLogEntry}"/>
+                                  CommandParameter="{Binding SelectedLogEntry}"
+                                  AutomationProperties.Name="{DynamicResource LogViewerView_ContextMenuCopy}"/>
                         <Separator/>
-                        <MenuItem Header="{DynamicResource LogViewerView_ContextMenuRefresh}" Command="{Binding RefreshLogsCommand}"/>
+                        <MenuItem Header="{DynamicResource LogViewerView_ContextMenuRefresh}" Command="{Binding RefreshLogsCommand}"
+                                  AutomationProperties.Name="{DynamicResource LogViewerView_RefreshAutomationName}"/>
                     </ContextMenu>
                 </ListView.ContextMenu>
             </ListView>
@@ -259,7 +272,8 @@
 
         <!-- Splitter -->
         <GridSplitter Grid.Row="3" Height="5" HorizontalAlignment="Stretch"
-                      Background="{DynamicResource SurfaceStrokeColorDefaultBrush}" ResizeBehavior="PreviousAndNext"/>
+                      Background="{DynamicResource SurfaceStrokeColorDefaultBrush}" ResizeBehavior="PreviousAndNext"
+                      AutomationProperties.Name="{DynamicResource LogViewerView_DetailsSplitterAutomationName}"/>
 
         <!-- Activity Details -->
         <Border Grid.Row="4" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" BorderBrush="{DynamicResource SurfaceStrokeColorDefaultBrush}" BorderThickness="0,1,0,0">
@@ -303,7 +317,8 @@
                         <TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource LogViewerView_Message}" FontWeight="SemiBold" Margin="0,0,10,5" VerticalAlignment="Top"/>
                         <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding Message, Mode=OneWay}"
                                  IsReadOnly="True" TextWrapping="Wrap" Background="Transparent"
-                                 BorderThickness="0" Margin="0,0,0,10"/>
+                                 BorderThickness="0" Margin="0,0,0,10"
+                                 AutomationProperties.Name="{DynamicResource LogViewerView_MessageAutomationName}"/>
 
                         <TextBlock Grid.Row="4" Grid.Column="0" Text="{DynamicResource LogViewerView_Details}" FontWeight="SemiBold" Margin="0,0,10,5"
                                    VerticalAlignment="Top">
@@ -319,7 +334,8 @@
                         </TextBlock>
                         <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding Details, Mode=OneWay}"
                                  IsReadOnly="True" TextWrapping="Wrap" Background="Transparent"
-                                 BorderThickness="0" Margin="0,0,0,10">
+                                 BorderThickness="0" Margin="0,0,0,10"
+                                 AutomationProperties.Name="{DynamicResource LogViewerView_DetailsAutomationName}">
                             <TextBox.Style>
                                 <Style TargetType="TextBox">
                                     <Style.Triggers>
@@ -393,16 +409,20 @@
                 <!-- Settings Panel -->
                 <StackPanel Grid.Column="1" Orientation="Horizontal">
                     <CheckBox Content="{DynamicResource LogViewerView_DebugDiagnostics}" IsChecked="{Binding EnableDebugLogging}"
-                              VerticalAlignment="Center" Margin="0,0,15,0"/>
+                              VerticalAlignment="Center" Margin="0,0,15,0"
+                              AutomationProperties.Name="{DynamicResource LogViewerView_DebugDiagnostics}"/>
 
                     <TextBlock Text="{DynamicResource LogViewerView_MaxSize}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                    <TextBox Text="{Binding MaxLogFileSizeMb}" Width="50" Margin="0,0,15,0"/>
+                    <TextBox Text="{Binding MaxLogFileSizeMb}" Width="50" Margin="0,0,15,0"
+                             AutomationProperties.Name="{DynamicResource LogViewerView_MaxSize}"/>
 
                     <TextBlock Text="{DynamicResource LogViewerView_Retention}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                    <TextBox Text="{Binding LogRetentionDays}" Width="50" Margin="0,0,15,0"/>
+                    <TextBox Text="{Binding LogRetentionDays}" Width="50" Margin="0,0,15,0"
+                             AutomationProperties.Name="{DynamicResource LogViewerView_Retention}"/>
 
                     <Button Content="{DynamicResource LogViewerView_SaveSettings}" Command="{Binding SaveSettingsCommand}"
-                            Padding="10,5" Margin="5,0"/>
+                            Padding="10,5" Margin="5,0"
+                            AutomationProperties.Name="{DynamicResource LogViewerView_SaveSettings}"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/Views/MasksView.xaml b/Views/MasksView.xaml
index 25a0139..16a3a6c 100644
--- a/Views/MasksView.xaml
+++ b/Views/MasksView.xaml
@@ -98,9 +98,11 @@
                 <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="0,0,0,10">
                     <Button Content="{DynamicResource MasksView_New}" Command="{Binding CreateMaskCommand}"
                             Padding="10,5" FontSize="13" Margin="0,0,5,0"
+                            AutomationProperties.Name="{DynamicResource MasksView_CreateMaskAutomationName}"
                             ToolTip="{DynamicResource MasksView_CreateNewTooltip}"/>
                     <Button Content="{DynamicResource MasksView_Delete}" Command="{Binding DeleteMaskCommand}"
                             Padding="10,5" FontSize="13"
+                            AutomationProperties.Name="{DynamicResource MasksView_DeleteMaskAutomationName}"
                             ToolTip="{DynamicResource MasksView_DeleteTooltip}"/>
                 </StackPanel>
 
@@ -112,7 +114,8 @@
                              SelectedItem="{Binding SelectedCoreMask, Mode=TwoWay}"
                              ItemContainerStyle="{StaticResource MaskListItemStyle}"
                              Background="{DynamicResource CardSurfaceBrush}"
-                             BorderThickness="0">
+                             BorderThickness="0"
+                             AutomationProperties.Name="{DynamicResource MasksView_MaskListAutomationName}">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <Grid Margin="5">
@@ -158,7 +161,8 @@
             </DockPanel>
 
             <!-- DIVIDER -->
-            <GridSplitter Grid.Column="1" Width="8" HorizontalAlignment="Stretch" Background="Transparent"/>
+            <GridSplitter Grid.Column="1" Width="8" HorizontalAlignment="Stretch" Background="Transparent"
+                          AutomationProperties.Name="{DynamicResource MasksView_MaskListSplitterAutomationName}"/>
 
             <ScrollViewer Grid.Column="2" VerticalScrollBarVisibility="Auto">
                 <StackPanel Margin="10,0,0,0">
@@ -182,12 +186,14 @@
                                        Margin="0,0,0,10"/>
                             <TextBlock Text="{DynamicResource MasksView_Name}" FontWeight="SemiBold" Margin="0,0,0,5"/>
                             <TextBox Text="{Binding SelectedCoreMask.Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                     Padding="8,6" FontSize="13" Margin="0,0,0,10"/>
+                                     Padding="8,6" FontSize="13" Margin="0,0,0,10"
+                                     AutomationProperties.Name="{DynamicResource MasksView_MaskNameAutomationName}"/>
 
                             <TextBlock Text="{DynamicResource MasksView_Description}" FontWeight="SemiBold" Margin="0,0,0,5"/>
                             <TextBox Text="{Binding SelectedCoreMask.Description, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                      Padding="8,6" MinHeight="52" MaxHeight="90" TextWrapping="Wrap" AcceptsReturn="True"
-                                     VerticalScrollBarVisibility="Auto"/>
+                                     VerticalScrollBarVisibility="Auto"
+                                     AutomationProperties.Name="{DynamicResource MasksView_MaskDescriptionAutomationName}"/>
                         </StackPanel>
                     </GroupBox>
 
@@ -246,16 +252,19 @@
                     <GroupBox Header="{DynamicResource MasksView_Options}" Padding="{DynamicResource CompactCardPadding}">
                         <StackPanel>
                             <Button Content="{DynamicResource MasksView_Duplicate}" Command="{Binding DuplicateMaskCommand}"
-                                    HorizontalAlignment="Left" Padding="10,6" Margin="0,0,0,5"/>
+                                    HorizontalAlignment="Left" Padding="10,6" Margin="0,0,0,5"
+                                    AutomationProperties.Name="{DynamicResource MasksView_Duplicate}"/>
 
                             <CheckBox Content="{DynamicResource MasksView_DefaultPreset}"
                                       IsChecked="{Binding SelectedCoreMask.IsDefault, Mode=TwoWay}"
                                       Margin="0,10,0,5"
+                                      AutomationProperties.Name="{DynamicResource MasksView_DefaultPreset}"
                                       ToolTip="{DynamicResource MasksView_DefaultPresetTip}"/>
 
                             <CheckBox Content="{DynamicResource MasksView_Enabled}"
                                       IsChecked="{Binding SelectedCoreMask.IsEnabled, Mode=TwoWay}"
                                       Margin="0,5"
+                                      AutomationProperties.Name="{DynamicResource MasksView_Enabled}"
                                       ToolTip="{DynamicResource MasksView_DisableTip}"/>
                         </StackPanel>
                     </GroupBox>