diff --git a/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs
index 74104434..c104e41d 100644
--- a/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs	
@@ -95,13 +95,7 @@ public partial class AssistantAgenda : AssistantBaseCore
                                                          - Mary Jane: Work package 3
                                                          """;
     
-    protected override IReadOnlyList<IButtonData> FooterButtons =>
-    [
-        new SendToButton
-        {
-            Self = Tools.Components.AGENDA_ASSISTANT,
-        },
-    ];
+    protected override IReadOnlyList<IButtonData> FooterButtons => [];
 
     protected override ChatThread ConvertToChatThread => (this.chatThread ?? new()) with
     {
diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor b/app/MindWork AI Studio/Assistants/AssistantBase.razor
index 71102ed8..9d7673ef 100644
--- a/app/MindWork AI Studio/Assistants/AssistantBase.razor	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor	
@@ -35,49 +35,64 @@
         </div>
     </ChildContent>
     <FooterContent>
-        @if (this.FooterButtons.Count > 0)
-        {
-            <MudStack Row="@true" Wrap="Wrap.Wrap" Class="ma-1">
-                @foreach (var button in this.FooterButtons)
-                {
-                    switch (button)
+        <MudStack Row="@true" Wrap="Wrap.Wrap" Class="ma-1">
+            
+            @if (!this.FooterButtons.Any(x => x.Type is ButtonTypes.SEND_TO))
+            {
+                <MudMenu StartIcon="@Icons.Material.Filled.Apps" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="Send to ..." Variant="Variant.Filled" Color="Color.Info">
+                    @foreach (var assistant in Enum.GetValues<Components>().OrderBy(n => n.Name().Length))
                     {
-                        case ButtonData buttonData when !string.IsNullOrWhiteSpace(buttonData.Tooltip):
-                            <MudTooltip Text="@buttonData.Tooltip">
-                                <MudButton Variant="Variant.Filled" Color="@buttonData.Color" StartIcon="@GetButtonIcon(buttonData.Icon)" OnClick="async () => await buttonData.AsyncAction()">
-                                    @buttonData.Text
-                                </MudButton>
-                            </MudTooltip>
-                            break;
+                        if (assistant is Components.NONE || this.Component == assistant)
+                            continue;
 
-                        case ButtonData buttonData:
+                        <MudMenuItem OnClick="() => this.SendToAssistant(assistant, new())">
+                            @assistant.Name()
+                        </MudMenuItem>
+                    }
+                </MudMenu>
+            }
+
+            @foreach (var button in this.FooterButtons)
+            {
+                switch (button)
+                {
+                    case ButtonData buttonData when !string.IsNullOrWhiteSpace(buttonData.Tooltip):
+                        <MudTooltip Text="@buttonData.Tooltip">
                             <MudButton Variant="Variant.Filled" Color="@buttonData.Color" StartIcon="@GetButtonIcon(buttonData.Icon)" OnClick="async () => await buttonData.AsyncAction()">
                                 @buttonData.Text
                             </MudButton>
-                            break;
+                        </MudTooltip>
+                        break;
 
-                        case SendToButton sendToButton:
-                            <MudMenu StartIcon="@Icons.Material.Filled.Apps" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="Send to ..." Variant="Variant.Filled" Color="Color.Info">
-                                @foreach (var assistant in Enum.GetValues<Components>().OrderBy(n => n.Name().Length))
-                                {
-                                    if(assistant is Components.NONE || sendToButton.Self == assistant)
-                                        continue;
+                    case ButtonData buttonData:
+                        <MudButton Variant="Variant.Filled" Color="@buttonData.Color" StartIcon="@GetButtonIcon(buttonData.Icon)" OnClick="async () => await buttonData.AsyncAction()">
+                            @buttonData.Text
+                        </MudButton>
+                        break;
 
-                                    <MudMenuItem OnClick="() => this.SendToAssistant(assistant, sendToButton)">
-                                        @assistant.Name()
-                                    </MudMenuItem>
-                                }
-                            </MudMenu>
-                            break;
-                    }
+                    case SendToButton sendToButton:
+                        <MudMenu StartIcon="@Icons.Material.Filled.Apps" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="Send to ..." Variant="Variant.Filled" Color="Color.Info">
+                            @foreach (var assistant in Enum.GetValues<Components>().OrderBy(n => n.Name().Length))
+                            {
+                                if(assistant is Components.NONE || sendToButton.Self == assistant)
+                                    continue;
+
+                                <MudMenuItem OnClick="() => this.SendToAssistant(assistant, sendToButton)">
+                                    @assistant.Name()
+                                </MudMenuItem>
+                            }
+                        </MudMenu>
+                        break;
                 }
-                <MudButton Variant="Variant.Filled" StartIcon="@Icons.Material.Filled.ContentCopy" OnClick="() => this.CopyToClipboard()">
-                    Copy result
-                </MudButton>
-                <MudButton Variant="Variant.Filled" Color="Color.Warning" StartIcon="@Icons.Material.Filled.Refresh" OnClick="() => this.InnerResetForm()">
-                    Reset
-                </MudButton>
-            </MudStack>
-        }
+            }
+            
+            <MudButton Variant="Variant.Filled" StartIcon="@Icons.Material.Filled.ContentCopy" OnClick="() => this.CopyToClipboard()">
+                Copy result
+            </MudButton>
+            
+            <MudButton Variant="Variant.Filled" Color="Color.Warning" StartIcon="@Icons.Material.Filled.Refresh" OnClick="() => this.InnerResetForm()">
+                Reset
+            </MudButton>
+        </MudStack>
     </FooterContent>
 </InnerScrolling>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs
index 8a307e22..34764259 100644
--- a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs	
@@ -26,13 +26,7 @@ public partial class AssistantCoding : AssistantBaseCore
         When the user asks in a different language than English, you answer in the same language!
         """;
     
-    protected override IReadOnlyList<IButtonData> FooterButtons =>
-    [
-        new SendToButton
-        {
-            Self = Tools.Components.CODING_ASSISTANT,
-        },
-    ];
+    protected override IReadOnlyList<IButtonData> FooterButtons => [];
     
     protected override void ResetFrom()
     {
diff --git a/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs b/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs
index 5e987d0c..a25077df 100644
--- a/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs	
@@ -22,13 +22,7 @@ public partial class AssistantEMail : AssistantBaseCore
         {this.SystemPromptGreeting()} {this.SystemPromptName()} You write the email in the following language: {this.SystemPromptLanguage()}.
         """;
     
-    protected override IReadOnlyList<IButtonData> FooterButtons =>
-    [
-        new SendToButton
-        {
-            Self = Tools.Components.EMAIL_ASSISTANT,
-        },
-    ];
+    protected override IReadOnlyList<IButtonData> FooterButtons => [];
     
     protected override ChatThread ConvertToChatThread => (this.chatThread ?? new()) with
     {
diff --git a/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs
index 8c85d8bf..f23f7109 100644
--- a/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs	
@@ -25,13 +25,7 @@ public partial class AssistantIconFinder : AssistantBaseCore
         quotation marks.
         """;
 
-    protected override IReadOnlyList<IButtonData> FooterButtons =>
-    [
-        new SendToButton
-        {
-            Self = Tools.Components.ICON_FINDER_ASSISTANT,
-        },
-    ];
+    protected override IReadOnlyList<IButtonData> FooterButtons => [];
     
     protected override void ResetFrom()
     {
diff --git a/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs b/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs
index 2f3062f6..05201944 100644
--- a/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs	
@@ -22,13 +22,7 @@ public partial class AssistantLegalCheck : AssistantBaseCore
         Never invent facts!
         """;
     
-    protected override IReadOnlyList<IButtonData> FooterButtons =>
-    [
-        new SendToButton
-        {
-            Self = Tools.Components.LEGAL_CHECK_ASSISTANT,
-        },
-    ];
+    protected override IReadOnlyList<IButtonData> FooterButtons => [];
     
     protected override void ResetFrom()
     {
diff --git a/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs
index 4196efc1..c8461e23 100644
--- a/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs	
@@ -25,13 +25,7 @@ public partial class AssistantTextSummarizer : AssistantBaseCore
         a summary with the requested complexity. In any case, do not add any information.
         """;
     
-    protected override IReadOnlyList<IButtonData> FooterButtons => 
-    [
-        new SendToButton
-        {
-            Self = Tools.Components.TEXT_SUMMARIZER_ASSISTANT,
-        },
-    ];
+    protected override IReadOnlyList<IButtonData> FooterButtons => [];
     
     protected override ChatThread ConvertToChatThread => (this.chatThread ?? new()) with
     {
diff --git a/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs
index e894842d..8485b16e 100644
--- a/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs	
@@ -21,13 +21,7 @@ public partial class AssistantTranslation : AssistantBaseCore
         language requires, e.g., shorter sentences, you should split the text into shorter sentences.
         """;
     
-    protected override IReadOnlyList<IButtonData> FooterButtons =>
-    [
-        new SendToButton
-        {
-            Self = Tools.Components.TRANSLATION_ASSISTANT,
-        },
-    ];
+    protected override IReadOnlyList<IButtonData> FooterButtons => [];
     
     protected override ChatThread ConvertToChatThread => (this.chatThread ?? new()) with
     {