diff --git a/app/MindWork AI Studio/Assistants/I18N/allTexts.lua b/app/MindWork AI Studio/Assistants/I18N/allTexts.lua
index 40df7acf..334a6c68 100644
--- a/app/MindWork AI Studio/Assistants/I18N/allTexts.lua	
+++ b/app/MindWork AI Studio/Assistants/I18N/allTexts.lua	
@@ -6364,6 +6364,9 @@ UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T214675
 -- Edit ERI v1 Data Source
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T221059217"] = "Edit ERI v1 Data Source"
 
+-- Indexed files
+UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T2235289713"] = "Indexed files"
+
 -- Edit Local File Data Source
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T2453292893"] = "Edit Local File Data Source"
 
@@ -6373,6 +6376,9 @@ UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T262437
 -- Name
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T266367750"] = "Name"
 
+-- Not applicable
+UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T2675917723"] = "Not applicable"
+
 -- No valid embedding
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T2698203405"] = "No valid embedding"
 
@@ -6415,6 +6421,9 @@ UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T359566
 -- Local data sources refresh when files change.
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T3687976654"] = "Local data sources refresh when files change."
 
+-- Not available
+UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T3706935413"] = "Not available"
+
 -- Export ERI Data Source
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T3831281036"] = "Export ERI Data Source"
 
@@ -6424,6 +6433,12 @@ UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T386503
 -- This ERI data source has an access token configured. Do you want to include the encrypted access token in the export? Note: The recipient will need the same encryption secret to use the access token.
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T4027572258"] = "This ERI data source has an access token configured. Do you want to include the encrypted access token in the export? Note: The recipient will need the same encryption secret to use the access token."
 
+-- Waiting for indexing status
+UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T4108252513"] = "Waiting for indexing status"
+
+-- Information
+UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T4256323669"] = "Information"
+
 -- Configured Data Sources
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T543942217"] = "Configured Data Sources"
 
@@ -6439,6 +6454,9 @@ UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T774473
 -- Cannot export this ERI data source because no authentication secret is configured. The issue was: {0}
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T782820095"] = "Cannot export this ERI data source because no authentication secret is configured. The issue was: {0}"
 
+-- {0} of {1}
+UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T825342513"] = "{0} of {1}"
+
 -- Local data sources refresh only when triggered manually.
 UI_TEXT_CONTENT["AISTUDIO::DIALOGS::SETTINGS::SETTINGSDIALOGDATASOURCES::T854231603"] = "Local data sources refresh only when triggered manually."
 
diff --git a/app/MindWork AI Studio/Components/DataSourceSelection.razor b/app/MindWork AI Studio/Components/DataSourceSelection.razor
index 74566d7e..08ae07ec 100644
--- a/app/MindWork AI Studio/Components/DataSourceSelection.razor	
+++ b/app/MindWork AI Studio/Components/DataSourceSelection.razor	
@@ -1,4 +1,5 @@
 @using AIStudio.Settings
+@using AIStudio.Provider
 @inherits MSGComponentBase
 @if (this.SelectionMode is DataSourceSelectionMode.SELECTION_MODE)
 {
@@ -92,7 +93,18 @@
                                             @foreach (var source in this.availableDataSources)
                                             {
                                                 <MudListItem Value="@source">
-                                                    @source.Name
+                                                    <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1" Style="min-width: 0; width: 100%;">
+                                                        <MudText Typo="Typo.body1" Style="min-width: 0; white-space: normal; overflow-wrap: anywhere;">
+                                                            @source.Name
+                                                        </MudText>
+                                                        @if (source is IInternalDataSource)
+                                                        {
+                                                            <MudSpacer/>
+                                                            <MudTooltip Text="@source.ComplianceLevel.GetName()">
+                                                                <MudIcon Icon="@Icons.Material.Filled.Security" Class="confidence-icon" Style="@this.GetConfidenceIconStyle(source)"/>
+                                                            </MudTooltip>
+                                                        }
+                                                    </MudStack>
                                                 </MudListItem>
                                             }
                                         </MudList>
@@ -106,7 +118,18 @@
                                                 @foreach (var source in this.availableDataSources)
                                                 {
                                                     <MudListItem Value="@source">
-                                                        @source.Name
+                                                        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1" Style="min-width: 0; width: 100%;">
+                                                            <MudText Typo="Typo.body1" Style="min-width: 0; white-space: normal; overflow-wrap: anywhere;">
+                                                                @source.Name
+                                                            </MudText>
+                                                            @if (source is IInternalDataSource)
+                                                            {
+                                                                <MudSpacer/>
+                                                                <MudTooltip Text="@source.ComplianceLevel.GetName()">
+                                                                    <MudIcon Icon="@Icons.Material.Filled.Security" Class="confidence-icon" Style="@this.GetConfidenceIconStyle(source)"/>
+                                                                </MudTooltip>
+                                                            }
+                                                        </MudStack>
                                                     </MudListItem>
                                                 }
                                             </MudList>
@@ -117,9 +140,18 @@
                                                 {
                                                     <MudListItem Value="@source">
                                                         <ChildContent>
-                                                            <MudText Typo="Typo.body1">
-                                                                @source.DataSource.Name
-                                                            </MudText>
+                                                            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1" Style="min-width: 0; width: 100%;">
+                                                                <MudText Typo="Typo.body1" Style="min-width: 0; white-space: normal; overflow-wrap: anywhere;">
+                                                                    @source.DataSource.Name
+                                                                </MudText>
+                                                                @if (source.DataSource is IInternalDataSource)
+                                                                {
+                                                                    <MudSpacer/>
+                                                                    <MudTooltip Text="@source.DataSource.ComplianceLevel.GetName()">
+                                                                        <MudIcon Icon="@Icons.Material.Filled.Security" Class="confidence-icon" Style="@this.GetConfidenceIconStyle(source.DataSource)"/>
+                                                                    </MudTooltip>
+                                                                }
+                                                            </MudStack>
                                                         
                                                             <MudProgressLinear Color="Color.Info" Min="0" Max="1" Value="@source.AIDecision.Confidence"/>
                                                             <MudJustifiedText Typo="Typo.body2">
@@ -170,7 +202,18 @@ else if (this.SelectionMode is DataSourceSelectionMode.CONFIGURATION_MODE)
                     @foreach (var source in this.availableDataSources)
                     {
                         <MudListItem Value="@source">
-                            @source.Name
+                            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1" Style="min-width: 0; width: 100%;">
+                                <MudText Typo="Typo.body1" Style="min-width: 0; white-space: normal; overflow-wrap: anywhere;">
+                                    @source.Name
+                                </MudText>
+                                @if (source is IInternalDataSource)
+                                {
+                                    <MudSpacer/>
+                                    <MudTooltip Text="@source.ComplianceLevel.GetName()">
+                                        <MudIcon Icon="@Icons.Material.Filled.Security" Class="confidence-icon" Style="@this.GetConfidenceIconStyle(source)"/>
+                                    </MudTooltip>
+                                }
+                            </MudStack>
                         </MudListItem>
                     }
                 </MudList>
diff --git a/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs b/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs
index 7f11972a..50e7164d 100644
--- a/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs	
@@ -1,4 +1,5 @@
 using AIStudio.Dialogs.Settings;
+using AIStudio.Provider;
 using AIStudio.Settings;
 using AIStudio.Settings.DataModel;
 using AIStudio.Tools.Services;
@@ -141,6 +142,8 @@ public partial class DataSourceSelection : MSGComponentBase
     private IReadOnlyCollection<DataSourceAgentSelected> GetSelectedDataSourcesWithAI() => this.DataSourcesAISelected.Where(n => n.Selected).ToList();
 
     private string GetAIReasoning(DataSourceAgentSelected source) => $"AI reasoning (confidence {source.AIDecision.Confidence:P0}): {source.AIDecision.Reason}";
+
+    private string GetConfidenceIconStyle(IDataSource source) => $"{source.ComplianceLevel.SetColorStyle(this.SettingsManager)} flex-shrink: 0;";
     
     public void ChangeOptionWithoutSaving(DataSourceOptions options, IReadOnlyList<DataSourceAgentSelected>? aiSelectedDataSources = null)
     {
@@ -308,4 +311,4 @@ public partial class DataSourceSelection : MSGComponentBase
     }
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogDataSources.razor b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogDataSources.razor
index e6d58126..308e20c5 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogDataSources.razor	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogDataSources.razor	
@@ -1,3 +1,4 @@
+@using AIStudio.Settings
 @using AIStudio.Settings.DataModel
 @inherits SettingsDialogBase
 
@@ -16,35 +17,56 @@
 
         <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Class="mb-3" Wrap="Wrap.Wrap">
             <MudTextSwitch Label="@T("Automatic local data source refresh")" Value="@this.SettingsManager.ConfigurationData.App.DataSourceIndexing.AutomaticRefresh" LabelOn="@T("Local data sources refresh when files change.")" LabelOff="@T("Local data sources refresh only when triggered manually.")" ValueChanged="@this.AutomaticRefreshChanged"/>
-            <MudButton Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Sync" Disabled="@(!this.HasRefreshableDataSources())" OnClick="@this.RefreshAllDataSources">
-                @T("Refresh all")
-            </MudButton>
+            <MudTooltip Text="@T("Refresh all")">
+                <MudIconButton Color="Color.Primary" Icon="@Icons.Material.Filled.Sync" Disabled="@(!this.HasRefreshableDataSources())" OnClick="@this.RefreshAllDataSources"/>
+            </MudTooltip>
         </MudStack>
 
+        @{ var embeddingStatuses = this.DataSourceEmbeddingService.GetStatuses().ToDictionary(status => status.DataSourceId, StringComparer.OrdinalIgnoreCase); }
         <MudTable Items="@this.SettingsManager.ConfigurationData.DataSources" Hover="@true" Class="border-dashed border rounded-lg">
             <ColGroup>
                 <col style="width: 3em;"/>
                 <col/>
-                <col style="width: 12em;"/>
-                <col style="width: 12em;"/>
-                <col style="width: 40em;"/>
+                <col style="width: 9em;"/>
+                <col style="width: 10em;"/>
+                <col style="width: 8em;"/>
+                <col style="width: 16em;"/>
             </ColGroup>
             <HeaderContent>
                 <MudTh>#</MudTh>
                 <MudTh>@T("Name")</MudTh>
                 <MudTh>@T("Type")</MudTh>
                 <MudTh>@T("Embedding")</MudTh>
+                <MudTh>@T("Indexed files")</MudTh>
                 <MudTh>@T("Actions")</MudTh>
             </HeaderContent>
             <RowTemplate>
+                @{ var embeddingStatus = embeddingStatuses.GetValueOrDefault(context.Id); }
                 <MudTd>@context.Num</MudTd>
-                <MudTd>@context.Name</MudTd>
-                <MudTd>@context.Type.GetDisplayName()</MudTd>
-                <MudTd>@this.GetEmbeddingName(context)</MudTd>
+                <MudTd Style="white-space: normal; overflow-wrap: anywhere;">@context.Name</MudTd>
+                <MudTd Style="white-space: nowrap;">@context.Type.GetDisplayName()</MudTd>
+                <MudTd Style="white-space: nowrap;">@this.GetEmbeddingName(context)</MudTd>
+                <MudTd>
+                    @if (context is IInternalDataSource)
+                    {
+                        <MudTooltip Text="@(embeddingStatus?.StateLabel ?? T("Waiting for indexing status"))">
+                            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
+                                <MudIcon Icon="@Icons.Material.Filled.Circle" Color="@GetIndexingStatusColor(embeddingStatus)" Size="Size.Small" Style="width: 0.75rem; height: 0.75rem; flex-shrink: 0;"/>
+                                <MudText Typo="Typo.body2">@(embeddingStatus is null ? T("Not available") : string.Format(T("{0} of {1}"), embeddingStatus.IndexedFiles, embeddingStatus.TotalFiles))</MudText>
+                            </MudStack>
+                        </MudTooltip>
+                    }
+                    else
+                    {
+                        <MudText Typo="Typo.body2" Color="Color.Secondary">@T("Not applicable")</MudText>
+                    }
+                </MudTd>
                 
                 <MudTd>
-                    <MudStack Row="true" Class="mb-2 mt-2" Wrap="Wrap.Wrap">
-                        <MudIconButton Variant="Variant.Filled" Color="Color.Info" Icon="@Icons.Material.Filled.Info" OnClick="() => this.ShowInformation(context)"/>
+                    <MudStack Row="true" Class="mb-2 mt-2" Spacing="1" Wrap="Wrap.NoWrap">
+                        <MudTooltip Text="@T("Information")">
+                            <MudIconButton Color="Color.Info" Icon="@Icons.Material.Outlined.Info" OnClick="() => this.ShowInformation(context)"/>
+                        </MudTooltip>
                         @if (context.IsEnterpriseConfiguration)
                         {
                             <MudTooltip Text="@T("This data source is managed by your organization.")">
@@ -53,21 +75,21 @@
                         }
                         else
                         {
-                            <MudButton Variant="Variant.Filled" Color="Color.Info" StartIcon="@Icons.Material.Filled.Edit" OnClick="() => this.EditDataSource(context)">
-                                @T("Edit")
-                            </MudButton>
-                            <MudButton Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Sync" Disabled="@(!this.CanRefreshDataSource(context))" OnClick="() => this.RefreshDataSource(context)">
-                                @T("Refresh")
-                            </MudButton>
+                            <MudTooltip Text="@T("Edit")">
+                                <MudIconButton Color="Color.Info" Icon="@Icons.Material.Filled.Edit" OnClick="() => this.EditDataSource(context)"/>
+                            </MudTooltip>
+                            <MudTooltip Text="@T("Refresh")">
+                                <MudIconButton Color="Color.Primary" Icon="@Icons.Material.Filled.Sync" Disabled="@(!this.CanRefreshDataSource(context))" OnClick="() => this.RefreshDataSource(context)"/>
+                            </MudTooltip>
                             @if (this.SettingsManager.ConfigurationData.App.ShowAdminSettings && context is DataSourceERI_V1)
                             {
                                 <MudTooltip Text="@T("Export configuration")">
-                                    <MudIconButton Variant="Variant.Filled" Color="Color.Info" Icon="@Icons.Material.Filled.Dataset" OnClick="() => this.ExportDataSource(context)"/>
+                                    <MudIconButton Color="Color.Info" Icon="@Icons.Material.Filled.Dataset" OnClick="() => this.ExportDataSource(context)"/>
                                 </MudTooltip>
                             }
-                            <MudButton Variant="Variant.Filled" Color="Color.Error" StartIcon="@Icons.Material.Filled.Delete" OnClick="() => this.DeleteDataSource(context)">
-                                @T("Delete")
-                            </MudButton>
+                            <MudTooltip Text="@T("Delete")">
+                                <MudIconButton Color="Color.Error" Icon="@Icons.Material.Filled.Delete" OnClick="() => this.DeleteDataSource(context)"/>
+                            </MudTooltip>
                         }
                     </MudStack>
                 </MudTd>
@@ -81,21 +103,23 @@
             </MudText>
         }
         
-        <MudMenu EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="@T("Add Data Source")" Color="Color.Primary" Variant="Variant.Filled" AnchorOrigin="Origin.CenterCenter" TransformOrigin="Origin.TopLeft" Class="mt-3 mb-6">
-            <MudMenuItem OnClick="() => this.AddDataSource(DataSourceType.ERI_V1)">
-                @T("External Data (ERI-Server v1)")
-            </MudMenuItem>
-            <MudMenuItem OnClick="() => this.AddDataSource(DataSourceType.LOCAL_DIRECTORY)">
-                @T("Local Directory")
-            </MudMenuItem>
-            <MudMenuItem OnClick="() => this.AddDataSource(DataSourceType.LOCAL_FILE)">
-                @T("Local File")
-            </MudMenuItem>
-        </MudMenu>
     </DialogContent>
     <DialogActions>
-        <MudButton OnClick="@this.Close" Variant="Variant.Filled">
-            @T("Close")
-        </MudButton>
+        <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Style="width: 100%;">
+            <MudMenu EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="@T("Add Data Source")" Color="Color.Primary" Variant="Variant.Filled" AnchorOrigin="Origin.TopLeft" TransformOrigin="Origin.BottomLeft">
+                <MudMenuItem OnClick="() => this.AddDataSource(DataSourceType.ERI_V1)">
+                    @T("External Data (ERI-Server v1)")
+                </MudMenuItem>
+                <MudMenuItem OnClick="() => this.AddDataSource(DataSourceType.LOCAL_DIRECTORY)">
+                    @T("Local Directory")
+                </MudMenuItem>
+                <MudMenuItem OnClick="() => this.AddDataSource(DataSourceType.LOCAL_FILE)">
+                    @T("Local File")
+                </MudMenuItem>
+            </MudMenu>
+            <MudButton OnClick="@this.Close" Variant="Variant.Filled">
+                @T("Close")
+            </MudButton>
+        </MudStack>
     </DialogActions>
 </MudDialog>
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogDataSources.razor.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogDataSources.razor.cs
index a6136595..25680fa9 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogDataSources.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogDataSources.razor.cs	
@@ -12,6 +12,29 @@ public partial class SettingsDialogDataSources : SettingsDialogBase
     [Inject]
     private DataSourceEmbeddingService DataSourceEmbeddingService { get; init; } = null!;
 
+    protected override async Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+        this.ApplyFilters([], [ Event.CONFIGURATION_CHANGED, Event.RAG_EMBEDDING_STATUS_CHANGED ]);
+    }
+
+    protected override async Task ProcessIncomingMessage<T>(ComponentBase? sendingComponent, Event triggeredEvent, T? data) where T : default
+    {
+        await base.ProcessIncomingMessage(sendingComponent, triggeredEvent, data);
+        if (triggeredEvent is Event.RAG_EMBEDDING_STATUS_CHANGED)
+            this.StateHasChanged();
+    }
+
+    private static Color GetIndexingStatusColor(DataSourceEmbeddingStatus? status)
+    {
+        if (status is null || status.State is DataSourceEmbeddingState.IDLE or DataSourceEmbeddingState.QUEUED or DataSourceEmbeddingState.RUNNING)
+            return Color.Warning;
+
+        return status.State is DataSourceEmbeddingState.FAILED || status.FailedFiles > 0
+            ? Color.Error
+            : Color.Success;
+    }
+
     private string GetEmbeddingName(IDataSource dataSource)
     {
         if(dataSource is IInternalDataSource internalDataSource)
diff --git a/app/MindWork AI Studio/Provider/ConfidenceLevelExtensions.cs b/app/MindWork AI Studio/Provider/ConfidenceLevelExtensions.cs
index 426bdffb..ccfdcd1f 100644
--- a/app/MindWork AI Studio/Provider/ConfidenceLevelExtensions.cs	
+++ b/app/MindWork AI Studio/Provider/ConfidenceLevelExtensions.cs	
@@ -25,6 +25,9 @@ public static class ConfidenceLevelExtensions
     public static string GetColor(this ConfidenceLevel level, SettingsManager settingsManager) => (level, settingsManager.IsDarkMode) switch
     {
         (ConfidenceLevel.NONE, _) => "#cccccc",
+
+        (ConfidenceLevel.UNKNOWN, false) => "#777777",
+        (ConfidenceLevel.UNKNOWN, true) => "#aaaaaa",
         
         (ConfidenceLevel.UNTRUSTED, false) => "#ff0000",
         (ConfidenceLevel.UNTRUSTED, true) => "#800000",