diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor b/app/MindWork AI Studio/Assistants/AssistantBase.razor
index 0abbfec..f605189 100644
--- a/app/MindWork AI Studio/Assistants/AssistantBase.razor	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor	
@@ -4,7 +4,7 @@
     @(this.Title)
 </MudText>
 
-<InnerScrolling HeaderHeight="12.3em">
+<InnerScrolling HeaderHeight="6em">
     <ChildContent>
         <MudForm @ref="@(this.form)" @bind-IsValid="@(this.inputIsValid)" @bind-Errors="@(this.inputIssues)" Class="pr-2">
             <MudText Typo="Typo.body1" Align="Align.Justify" Class="mb-6">
@@ -33,10 +33,11 @@
         
         <div id="@AFTER_RESULT_DIV_ID" class="mt-3">
         </div>
-        
+    </ChildContent>
+    <FooterContent>
         @if (this.FooterButtons.Count > 0)
         {
-            <MudStack Row="@true" Wrap="Wrap.Wrap" Class="mt-3 mr-2">
+            <MudStack Row="@true" Wrap="Wrap.Wrap" Class="ma-1">
                 @foreach (var button in this.FooterButtons)
                 {
                     switch (button)
@@ -54,14 +55,14 @@
                                 @buttonData.Text
                             </MudButton>
                             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<SendTo>().OrderBy(n => n.Name().Length))
                                 {
                                     if(assistant is SendTo.NONE || sendToButton.Self == assistant)
                                         continue;
-                                    
+
                                     <MudMenuItem OnClick="() => this.SendToAssistant(assistant, sendToButton)">
                                         @assistant.Name()
                                     </MudMenuItem>
@@ -78,5 +79,5 @@
                 </MudButton>
             </MudStack>
         }
-    </ChildContent>
+    </FooterContent>
 </InnerScrolling>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/InnerScrolling.razor b/app/MindWork AI Studio/Components/InnerScrolling.razor
index bad2c09..83fd15e 100644
--- a/app/MindWork AI Studio/Components/InnerScrolling.razor	
+++ b/app/MindWork AI Studio/Components/InnerScrolling.razor	
@@ -8,6 +8,11 @@
             &nbsp;
         </div>
     </div>
-    
-    @this.FooterContent
+
+    @if (this.FooterContent is not null)
+    {
+        <MudPaper Class="pa-3 border-solid border rounded-lg">
+            @this.FooterContent
+        </MudPaper>
+    }
 </div>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Pages/Chat.razor b/app/MindWork AI Studio/Pages/Chat.razor
index beb5266..f87bdde 100644
--- a/app/MindWork AI Studio/Pages/Chat.razor	
+++ b/app/MindWork AI Studio/Pages/Chat.razor	
@@ -27,51 +27,49 @@
         }
     </ChildContent>
     <FooterContent>
-        <MudPaper Style="flex: 0 0 auto;">
+        <MudElement Style="flex: 0 0 auto;">
             <MudTextField T="string" @ref="@this.inputField" @bind-Text="@this.userInput" Variant="Variant.Outlined" AutoGrow="@true" Lines="3" MaxLines="12" Label="@this.InputLabel" Placeholder="@this.ProviderPlaceholder" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Send" OnAdornmentClick="() => this.SendMessage()" ReadOnly="!this.IsProviderSelected || this.isStreaming" Immediate="@true" OnKeyUp="this.InputKeyEvent" UserAttributes="@USER_INPUT_ATTRIBUTES"/>
-        </MudPaper>
-        <MudPaper Class="mt-1" Outlined="@true">
-            <MudToolBar WrapContent="true">
-                @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is not WorkspaceStorageBehavior.DISABLE_WORKSPACES)
-                {
-                    <MudTooltip Text="Your workspaces" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
-                        <MudIconButton Icon="@Icons.Material.Filled.SnippetFolder" OnClick="() => this.ToggleWorkspaces()"/>
-                    </MudTooltip>
-                }
-
-                @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is WorkspaceStorageBehavior.STORE_CHATS_MANUALLY)
-                {
-                    <MudTooltip Text="Save chat" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
-                        <MudIconButton Icon="@Icons.Material.Filled.Save" OnClick="() => this.SaveThread()" Disabled="@(!this.CanThreadBeSaved)"/>
-                    </MudTooltip>
-                }
-
-                <MudTooltip Text="Start temporary chat" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
-                    <MudIconButton Icon="@Icons.Material.Filled.AddComment" OnClick="() => this.StartNewChat(useSameWorkspace: false)"/>
+        </MudElement>
+        <MudToolBar WrapContent="true" Gutters="@false" Class="border border-solid rounded" Style="border-color: lightgrey;">
+            @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is not WorkspaceStorageBehavior.DISABLE_WORKSPACES)
+            {
+                <MudTooltip Text="Your workspaces" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
+                    <MudIconButton Icon="@Icons.Material.Filled.SnippetFolder" OnClick="() => this.ToggleWorkspaces()"/>
                 </MudTooltip>
+            }
 
-                @if (!string.IsNullOrWhiteSpace(this.currentWorkspaceName))
-                {
-                    <MudTooltip Text="@this.TooltipAddChatToWorkspace" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
-                        <MudIconButton Icon="@Icons.Material.Filled.CommentBank" OnClick="() => this.StartNewChat(useSameWorkspace: true)"/>
-                    </MudTooltip>
-                }
-                
-                @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is WorkspaceStorageBehavior.STORE_CHATS_AUTOMATICALLY)
-                {
-                    <MudTooltip Text="Delete this chat & start a new one" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
-                        <MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="() => this.StartNewChat(useSameWorkspace: true, deletePreviousChat: true)" Disabled="@(!this.CanThreadBeSaved)"/>
-                    </MudTooltip>
-                }
+            @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is WorkspaceStorageBehavior.STORE_CHATS_MANUALLY)
+            {
+                <MudTooltip Text="Save chat" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
+                    <MudIconButton Icon="@Icons.Material.Filled.Save" OnClick="() => this.SaveThread()" Disabled="@(!this.CanThreadBeSaved)"/>
+                </MudTooltip>
+            }
 
-                @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is not WorkspaceStorageBehavior.DISABLE_WORKSPACES)
-                {
-                    <MudTooltip Text="Move the chat to a workspace, or to another if it is already in one." Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
-                        <MudIconButton Icon="@Icons.Material.Filled.MoveToInbox" Disabled="@(!this.CanThreadBeSaved)" OnClick="() => this.MoveChatToWorkspace()"/>
-                    </MudTooltip>
-                }
-            </MudToolBar>
-        </MudPaper>
+            <MudTooltip Text="Start temporary chat" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
+                <MudIconButton Icon="@Icons.Material.Filled.AddComment" OnClick="() => this.StartNewChat(useSameWorkspace: false)"/>
+            </MudTooltip>
+
+            @if (!string.IsNullOrWhiteSpace(this.currentWorkspaceName))
+            {
+                <MudTooltip Text="@this.TooltipAddChatToWorkspace" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
+                    <MudIconButton Icon="@Icons.Material.Filled.CommentBank" OnClick="() => this.StartNewChat(useSameWorkspace: true)"/>
+                </MudTooltip>
+            }
+            
+            @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is WorkspaceStorageBehavior.STORE_CHATS_AUTOMATICALLY)
+            {
+                <MudTooltip Text="Delete this chat & start a new one" Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
+                    <MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="() => this.StartNewChat(useSameWorkspace: true, deletePreviousChat: true)" Disabled="@(!this.CanThreadBeSaved)"/>
+                </MudTooltip>
+            }
+
+            @if (this.SettingsManager.ConfigurationData.Workspace.StorageBehavior is not WorkspaceStorageBehavior.DISABLE_WORKSPACES)
+            {
+                <MudTooltip Text="Move the chat to a workspace, or to another if it is already in one." Placement="@TOOLBAR_TOOLTIP_PLACEMENT">
+                    <MudIconButton Icon="@Icons.Material.Filled.MoveToInbox" Disabled="@(!this.CanThreadBeSaved)" OnClick="() => this.MoveChatToWorkspace()"/>
+                </MudTooltip>
+            }
+        </MudToolBar>
     </FooterContent>
 </InnerScrolling>
 
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md b/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md
index c42e0d3..27eaf39 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md	
@@ -1,6 +1,8 @@
 # v0.8.12, build 174
 - Added an e-mail writing assistant.
 - Added the possibility to preselect some e-mail writing assistant options.
+- Fixed the header height of assistant pages.
+- Improved assistant footer handling; the footer is now fixed at the bottom of the page.
 - Improved the coding assistant by adding a button to delete a context.
 - Improved chat page by scrolling to the bottom after loading (configurable; default is on).
 - Improved all assistants to provide a button to copy their respective result to the clipboard.
@@ -8,4 +10,5 @@
 - Improved the language handling of the agenda assistant.
 - Improved the chat options readability by separating the preselection of values.
 - Improved some default settings. Default key for sending input is now `Enter`. The default update check is now set to hourly. The navigation menu behavior is now set to use tooltips.
-- Refactored the "send to" implementation of assistants.
\ No newline at end of file
+- Refactored the "send to" implementation of assistants.
+- Refactored & unified footer border style handling.
\ No newline at end of file