diff --git a/app/MindWork AI Studio/Components/DataSourceSelection.razor b/app/MindWork AI Studio/Components/DataSourceSelection.razor
index 2a5f96b9..abaf7088 100644
--- a/app/MindWork AI Studio/Components/DataSourceSelection.razor	
+++ b/app/MindWork AI Studio/Components/DataSourceSelection.razor	
@@ -19,13 +19,13 @@
 
         <MudPopover Open="@this.showDataSourceSelection" AnchorOrigin="Origin.TopLeft" TransformOrigin="Origin.BottomLeft" DropShadow="@true" Class="border-solid border-4 rounded-lg">
             <MudCard>
-                <MudCardHeader>
+                <MudCardHeader Class="pa-2 pb-0">
                     <CardHeaderContent>
-                        <PreviewBeta/>
                         <MudStack Row="true" AlignItems="AlignItems.Center">
                             <MudText Typo="Typo.h5">
                                 @T("Data Source Selection")
                             </MudText>
+                            <PreviewBeta ChipClass=""/>
                             <MudSpacer/>
                             <MudTooltip Text="@T("Manage your data sources")" Placement="Placement.Top">
                                 <MudIconButton Icon="@Icons.Material.Filled.Settings" OnClick="@this.OpenSettingsDialog"/>
@@ -33,7 +33,7 @@
                         </MudStack>
                     </CardHeaderContent>
                 </MudCardHeader>
-                <MudCardContent Style="min-width: 24em; max-height: 60vh; max-width: 45vw; overflow: auto;">
+                <MudCardContent Class="pa-2" Style="min-width: 24em; max-height: 60vh; max-width: 45vw; overflow: auto;">
                     @if (this.waitingForDataSources)
                     {
                         <MudSkeleton Width="30%" Height="42px;"/>
@@ -42,7 +42,7 @@
                     }
                     else if (this.SettingsManager.ConfigurationData.DataSources.Count == 0)
                     {
-                        <MudJustifiedText Typo="Typo.body1" Class="mb-3">
+                        <MudJustifiedText Typo="Typo.body2" Class="mb-2">
                             @T("You haven't configured any data sources. To grant the AI access to your data, you need to add such a source. However, if you wish to use data from your device, you first have to set up a so-called embedding. This embedding is necessary so the AI can effectively search your data, find and retrieve the correct information required for each task. In addition to local data, you can also incorporate your company's data. To do so, your company must provide the data through an ERI (External Retrieval Interface).")
                         </MudJustifiedText>
                         
@@ -70,25 +70,25 @@
                             @switch (this.aiBasedSourceSelection)
                             {
                                 case true when this.availableDataSources.Count == 0:
-                                    <MudText Typo="Typo.body1" Class="mb-3">
+                                    <MudText Typo="Typo.body2" Class="mb-2">
                                         @T("Your data sources cannot be used with the selected providers due to data privacy or confidence-level requirements, or they are currently unavailable.")
                                     </MudText>
                                     break; 
                                     
                                 case true when this.DataSourcesAISelected.Count == 0:
-                                    <MudText Typo="Typo.body1" Class="mb-3">
+                                    <MudText Typo="Typo.body2" Class="mb-2">
                                         @T("The AI evaluates each of your inputs to determine whether and which data sources are necessary. Currently, the AI has not selected any source.")
                                     </MudText>
                                     break;
                                     
                                 case false when this.availableDataSources.Count == 0:
-                                    <MudText Typo="Typo.body1" Class="mb-3">
+                                    <MudText Typo="Typo.body2" Class="mb-2">
                                         @T("Your data sources cannot be used with the selected providers due to data privacy or confidence-level requirements, or they are currently unavailable.")
                                     </MudText>
                                     break;
                                     
                                 case false:
-                                    <MudField Label="@T("Available Data Sources")" Variant="Variant.Outlined" Class="mb-3" Disabled="@this.aiBasedSourceSelection">
+                                    <MudField Label="@T("Available Data Sources")" Variant="Variant.Outlined" Class="mb-2" Disabled="@this.aiBasedSourceSelection">
                                         <MudList T="IDataSource" Dense="@true" Class="data-source-rows" SelectionMode="@this.GetListSelectionMode()" @bind-SelectedValues:get="@this.selectedDataSources" @bind-SelectedValues:set="@(x => this.SelectionChanged(x))" Style="max-height: 14em;">
                                             @foreach (var source in this.availableDataSources)
                                             {
@@ -113,7 +113,7 @@
                                 
                                 case true:
                                     <MudExpansionPanels MultiExpansion="@false" Class="mt-3" Style="max-height: 14em;">
-                                        <ExpansionPanel HeaderIcon="@Icons.Material.Filled.TouchApp" HeaderText="@T("Available Data Sources")">
+                                        <ExpansionPanel HeaderIcon="@Icons.Material.Filled.TouchApp" IconSize="Size.Small" HeaderTypo="Typo.subtitle1" HeaderClass="expansion-panel-header-compact" HeaderText="@T("Available Data Sources")">
                                             <MudList T="IDataSource" Dense="@true" Class="data-source-rows" SelectionMode="MudBlazor.SelectionMode.SingleSelection" SelectedValues="@this.selectedDataSources" Style="max-height: 14em;">
                                                 @foreach (var source in this.availableDataSources)
                                                 {
@@ -134,7 +134,7 @@
                                                 }
                                             </MudList>
                                         </ExpansionPanel>
-                                        <ExpansionPanel HeaderIcon="@Icons.Material.Filled.Filter" HeaderText="@T("AI-Selected Data Sources")">
+                                        <ExpansionPanel HeaderIcon="@Icons.Material.Filled.Filter" IconSize="Size.Small" HeaderTypo="Typo.subtitle1" HeaderClass="expansion-panel-header-compact" HeaderText="@T("AI-Selected Data Sources")">
                                             <MudList T="DataSourceAgentSelected" Dense="@true" Class="data-source-rows" SelectionMode="MudBlazor.SelectionMode.MultiSelection" ReadOnly="@true" SelectedValues="@this.GetSelectedDataSourcesWithAI()" Style="max-height: 14em;">
                                                 @foreach (var source in this.DataSourcesAISelected)
                                                 {
diff --git a/app/MindWork AI Studio/Components/PreviewBeta.razor b/app/MindWork AI Studio/Components/PreviewBeta.razor
index 5494f51a..9cd66969 100644
--- a/app/MindWork AI Studio/Components/PreviewBeta.razor	
+++ b/app/MindWork AI Studio/Components/PreviewBeta.razor	
@@ -1,7 +1,7 @@
 @inherits MSGComponentBase
 <MudTooltip Placement="Placement.Bottom" Arrow="@true" Class="@this.Classes">
     <ChildContent>
-        <MudChip T="string" Icon="@Icons.Material.Filled.HourglassTop" Color="Color.Info" Class="mb-3">
+        <MudChip T="string" Icon="@Icons.Material.Filled.HourglassTop" Color="Color.Info" Class="@this.ChipClass">
             @T("Beta")
         </MudChip>
     </ChildContent>
diff --git a/app/MindWork AI Studio/Components/PreviewBeta.razor.cs b/app/MindWork AI Studio/Components/PreviewBeta.razor.cs
index d73a9c53..b06089cd 100644
--- a/app/MindWork AI Studio/Components/PreviewBeta.razor.cs	
+++ b/app/MindWork AI Studio/Components/PreviewBeta.razor.cs	
@@ -7,5 +7,16 @@ public partial class PreviewBeta : MSGComponentBase
     [Parameter]
     public bool ApplyInnerScrollingFix { get; set; }
     
+    /// <summary>
+    /// Additional class names for the chip itself, separated by space.
+    /// </summary>
+    /// <remarks>
+    /// The default is the margin every caller relied on before this parameter existed, because the
+    /// chip usually sits on a line of its own above a heading. A header which puts it beside the
+    /// heading instead passes an empty value.
+    /// </remarks>
+    [Parameter]
+    public string ChipClass { get; set; } = "mb-3";
+    
     private string Classes => this.ApplyInnerScrollingFix ? "InnerScrollingFix" : string.Empty;
 }
\ No newline at end of file