diff --git a/app/MindWork AI Studio/Components/ChatComponent.razor b/app/MindWork AI Studio/Components/ChatComponent.razor
index 4886c8f1..7df154f1 100644
--- a/app/MindWork AI Studio/Components/ChatComponent.razor	
+++ b/app/MindWork AI Studio/Components/ChatComponent.razor	
@@ -80,6 +80,11 @@
                     <MudIconButton Icon="@Icons.Material.Filled.CommentBank" OnClick="() => this.StartNewChat(useSameWorkspace: true)"/>
                 </MudTooltip>
             }
+            
+            @if (this.SettingsManager.ConfigurationData.ChatTemplates.Count > 0)
+            {
+                <ChatTemplateSelection CurrentChatTemplate="@this.currentChatTemplate" CurrentChatTemplateChanged="@this.ChatTemplateWasChanged"/>
+            }
 
             @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is WorkspaceStorageBehavior.STORE_CHATS_AUTOMATICALLY)
             {
@@ -107,12 +112,7 @@
                 </MudTooltip>
             }
             
-            <ProfileSelection CurrentProfile="@this.currentProfile" CurrentProfileChanged="@this.ProfileWasChanged"/>
-            
-            @if (this.SettingsManager.ConfigurationData.ChatTemplates.Count > 0)
-            {
-                <ChatTemplateSelection CurrentChatTemplate="@this.currentChatTemplate" CurrentChatTemplateChanged="@this.ChatTemplateWasChanged"/>
-            }
+            <ProfileSelection CurrentProfile="@this.currentProfile" CurrentProfileChanged="@this.ProfileWasChanged" Disabled="@(!this.currentChatTemplate.AllowProfileUsage)"/>
 
             @if (PreviewFeatures.PRE_RAG_2024.IsEnabled(this.SettingsManager))
             {
diff --git a/app/MindWork AI Studio/Components/ChatComponent.razor.cs b/app/MindWork AI Studio/Components/ChatComponent.razor.cs
index 4a0007a3..a6a156d3 100644
--- a/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
+++ b/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
@@ -339,7 +339,9 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
             Blocks = this.currentChatTemplate.AdditionalMessages.Select(x => x.DeepClone()).ToList(),
         };
         
-        await this.ChatThreadChanged.InvokeAsync(this.ChatThread);
+        // await this.ChatThreadChanged.InvokeAsync(this.ChatThread);
+
+        await this.StartNewChat(true, false);
     }
 
     private IReadOnlyList<DataSourceAgentSelected> GetAgentSelectedDataSources()
diff --git a/app/MindWork AI Studio/Components/ChatTemplateSelection.razor b/app/MindWork AI Studio/Components/ChatTemplateSelection.razor
index 901f6f08..3fe83a3f 100644
--- a/app/MindWork AI Studio/Components/ChatTemplateSelection.razor	
+++ b/app/MindWork AI Studio/Components/ChatTemplateSelection.razor	
@@ -1,11 +1,20 @@
+@using AIStudio.Settings
 @inherits MSGComponentBase
-<MudTooltip Text="@T("You can switch between your chat templates here")" Placement="Placement.Top">
-    <MudMenu TransformOrigin="@Origin.BottomLeft" AnchorOrigin="Origin.TopLeft" StartIcon="@Icons.Material.Filled.RateReview" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="@this.CurrentChatTemplate.Name" Variant="Variant.Filled" Color="Color.Default" Class="@this.MarginClass">
-        @foreach (var chatTemplate in this.SettingsManager.ConfigurationData.ChatTemplates.GetAllChatTemplates())
-        {
-            <MudMenuItem OnClick="() => this.SelectionChanged(chatTemplate)">
-                @chatTemplate.Name
-            </MudMenuItem>
-        }
+
+<MudTooltip Placement="Placement.Top" Text="@T("Start a new chat with a chat template.")">
+    <MudMenu AnchorOrigin="Origin.TopLeft" TransformOrigin="@Origin.BottomLeft" Class="@this.MarginClass">
+        <ActivatorContent>
+            <MudButton IconSize="Size.Large" StartIcon="@Icons.Material.Filled.RateReview">
+                @(this.CurrentChatTemplate != ChatTemplate.NO_CHATTEMPLATE ? this.CurrentChatTemplate.Name : "")
+            </MudButton>
+        </ActivatorContent>
+        <ChildContent>
+            @foreach (var chatTemplate in this.SettingsManager.ConfigurationData.ChatTemplates.GetAllChatTemplates())
+            {
+                <MudMenuItem OnClick="() => this.SelectionChanged(chatTemplate)">
+                    @chatTemplate.Name
+                </MudMenuItem>
+            }
+        </ChildContent>
     </MudMenu>
 </MudTooltip>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/ChatTemplateSelection.razor.cs b/app/MindWork AI Studio/Components/ChatTemplateSelection.razor.cs
index 28d4f75b..141fed74 100644
--- a/app/MindWork AI Studio/Components/ChatTemplateSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/ChatTemplateSelection.razor.cs	
@@ -13,7 +13,7 @@ public partial class ChatTemplateSelection : MSGComponentBase
     public EventCallback<ChatTemplate> CurrentChatTemplateChanged { get; set; }
 
     [Parameter]
-    public string MarginLeft { get; set; } = "ml-3";
+    public string MarginLeft { get; set; } = "ml-1";
 
     [Parameter]
     public string MarginRight { get; set; } = string.Empty;
diff --git a/app/MindWork AI Studio/Components/ProfileSelection.razor b/app/MindWork AI Studio/Components/ProfileSelection.razor
index 9c9a0520..2c355ff7 100644
--- a/app/MindWork AI Studio/Components/ProfileSelection.razor	
+++ b/app/MindWork AI Studio/Components/ProfileSelection.razor	
@@ -1,6 +1,6 @@
 @inherits MSGComponentBase
 <MudTooltip Text="@T("You can switch between your profiles here")" Placement="Placement.Top">
-    <MudMenu TransformOrigin="@Origin.BottomLeft" AnchorOrigin="Origin.TopLeft" StartIcon="@Icons.Material.Filled.Person4" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="@this.CurrentProfile.Name" Variant="Variant.Filled" Color="Color.Default" Class="@this.MarginClass">
+    <MudMenu TransformOrigin="@Origin.BottomLeft" AnchorOrigin="Origin.TopLeft" StartIcon="@Icons.Material.Filled.Person4" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="@this.CurrentProfile.Name" Variant="Variant.Filled" Color="Color.Default" Class="@this.MarginClass" disabled="@this.Disabled">
         @foreach (var profile in this.SettingsManager.ConfigurationData.Profiles.GetAllProfiles())
         {
             <MudMenuItem OnClick="() => this.SelectionChanged(profile)">
diff --git a/app/MindWork AI Studio/Components/ProfileSelection.razor.cs b/app/MindWork AI Studio/Components/ProfileSelection.razor.cs
index efd15cb5..d72873dd 100644
--- a/app/MindWork AI Studio/Components/ProfileSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/ProfileSelection.razor.cs	
@@ -18,6 +18,9 @@ public partial class ProfileSelection : MSGComponentBase
     [Parameter]
     public string MarginRight { get; set; } = string.Empty;
     
+    [Parameter]
+    public bool Disabled { get; set; }
+    
     private string MarginClass => $"{this.MarginLeft} {this.MarginRight}";
     
     private async Task SelectionChanged(Profile profile)
diff --git a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor
index c49ab2e5..30ee2955 100644
--- a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor	
+++ b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor	
@@ -6,11 +6,11 @@
 <MudDialog>
     <DialogContent>
 
-        <MudJustifiedText Typo="Typo.body1" Class="mb-3">
+        <MudJustifiedText Class="mb-3" Typo="Typo.body1">
             @T("Create your custom chat template to tailor the LLM's behavior for specific tasks or domains. Define a custom system prompt and provide an example conversation to design an AI experience perfectly suited to your requirements.")
         </MudJustifiedText>
 
-        <MudJustifiedText Typo="Typo.body1" Class="mb-3">
+        <MudJustifiedText Class="mb-3" Typo="Typo.body1">
             @T("The name of the chat template is mandatory. Each chat template must have a unique name.")
         </MudJustifiedText>
         
@@ -51,7 +51,7 @@
             />
             
             <MudTooltip Text="@T("Are you unsure which system prompt to use? You can simply start with the default system prompt that AI Studio uses for all chats.")">
-                <MudButton Class="mb-3" Color="Color.Primary" OnClick="@this.UseDefaultSystemPrompt" Size="Size.Small" StartIcon="@Icons.Material.Filled.Add" Variant="Variant.Filled">@T("Use the default system prompt")</MudButton>
+                <MudButton Class="mb-3" Color="Color.Primary" OnClick="@this.UseDefaultSystemPrompt" Size="Size.Small" StartIcon="@Icons.Material.Filled.ListAlt" Variant="Variant.Filled">@T("Use the default system prompt")</MudButton>
             </MudTooltip>
             
             <MudTooltip Text="@T("Using some chat templates in tandem with profiles might cause issues. Therefore, you can preliminarily block the usage of profiles here.")">