diff --git a/frontend/src/lib/components/instance-views/views/views/OpenAIChat.svelte b/frontend/src/lib/components/instance-views/views/views/OpenAIChat.svelte
index 1032d466..aeb119a6 100644
--- a/frontend/src/lib/components/instance-views/views/views/OpenAIChat.svelte
+++ b/frontend/src/lib/components/instance-views/views/views/OpenAIChat.svelte
@@ -22,15 +22,17 @@
 </script>
 
 <div class="flex flex-col border border-grey-light rounded p-2.5 m-1 w-[32rem]">
-	<button
-		class="self-center bg-transparent cursor-pointer flex items-center p-1 -mt-1.5 rounded-2xl hover:bg-grey-lighter"
-		on:click={() => (showAll = !showAll)}
-	>
-		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 fill-grey-darker">
-			<path d={showAll ? mdiChevronDown : mdiChevronUp} />
-		</svg>
-		<span class="pr-1">Show {showAll ? 'Less' : 'All'}</span>
-	</button>
+	{#if data.length > 4}
+		<button
+			class="self-center bg-transparent cursor-pointer flex items-center p-1 -mt-1.5 rounded-2xl hover:bg-grey-lighter"
+			on:click={() => (showAll = !showAll)}
+		>
+			<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 fill-grey-darker">
+				<path d={showAll ? mdiChevronDown : mdiChevronUp} />
+			</svg>
+			<span class="pr-1">Show {showAll ? 'Less' : 'All'}</span>
+		</button>
+	{/if}
 	{#if shownData}
 		{#key shownData}
 			{#each shownData as item}
diff --git a/frontend/src/lib/components/instance-views/views/views/OpenAIChatMarkdown.svelte b/frontend/src/lib/components/instance-views/views/views/OpenAIChatMarkdown.svelte
index 6fccd1bd..dc51ee01 100644
--- a/frontend/src/lib/components/instance-views/views/views/OpenAIChatMarkdown.svelte
+++ b/frontend/src/lib/components/instance-views/views/views/OpenAIChatMarkdown.svelte
@@ -30,15 +30,17 @@
 </script>
 
 <div class="flex flex-col border border-grey-light rounded p-2.5 m-1 max-w-4xl">
-	<button
-		class="self-center bg-transparent cursor-pointer flex items-center p-1 -mt-1.5 rounded-2xl hover:bg-grey-lighter"
-		on:click={() => (showAll = !showAll)}
-	>
-		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 fill-grey-darker">
-			<path d={showAll ? mdiChevronDown : mdiChevronUp} />
-		</svg>
-		<span class="pr-1">Show {showAll ? 'Less' : 'All'}</span>
-	</button>
+	{#if data.length > 4}
+		<button
+			class="self-center bg-transparent cursor-pointer flex items-center p-1 -mt-1.5 rounded-2xl hover:bg-grey-lighter"
+			on:click={() => (showAll = !showAll)}
+		>
+			<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 fill-grey-darker">
+				<path d={showAll ? mdiChevronDown : mdiChevronUp} />
+			</svg>
+			<span class="pr-1">Show {showAll ? 'Less' : 'All'}</span>
+		</button>
+	{/if}
 	{#if shownData}
 		{#key shownData}
 			{#each shownData as item}
diff --git a/frontend/src/lib/components/instance-views/views/views/openai-chat-markdown/AssistantBlock.svelte b/frontend/src/lib/components/instance-views/views/views/openai-chat-markdown/AssistantBlock.svelte
index 04286786..2e687d71 100644
--- a/frontend/src/lib/components/instance-views/views/views/openai-chat-markdown/AssistantBlock.svelte
+++ b/frontend/src/lib/components/instance-views/views/views/openai-chat-markdown/AssistantBlock.svelte
@@ -10,6 +10,7 @@
 </script>
 
 <div class="my-1 flex items-end relative z-0">
+	<!-- Robot Icon -->
 	<svg
 		xmlns="http://www.w3.org/2000/svg"
 		viewBox="0 0 640 512"
diff --git a/frontend/src/lib/components/instance-views/views/views/openai-chat-markdown/UserBlock.svelte b/frontend/src/lib/components/instance-views/views/views/openai-chat-markdown/UserBlock.svelte
index 87f5f931..62227427 100644
--- a/frontend/src/lib/components/instance-views/views/views/openai-chat-markdown/UserBlock.svelte
+++ b/frontend/src/lib/components/instance-views/views/views/openai-chat-markdown/UserBlock.svelte
@@ -21,6 +21,7 @@
 		viewBox="0 0 448 512"
 		class="w-3.5 ml-2.5 mt-2 fill-grey-darker"
 	>
+		<!-- Person Icon -->
 		<path
 			d="M224 256A128 128 0 1 0 224 0a128 128 0 1 0 0 256zm-45.7 48C79.8 304 0 383.8 0 482.3C0 498.7 13.3 512 29.7 512H418.3c16.4 0 29.7-13.3 29.7-29.7C448 383.8 368.2 304 269.7 304H178.3z"
 		/>
diff --git a/frontend/src/lib/components/instance-views/views/views/openai-chat/AssistantBlock.svelte b/frontend/src/lib/components/instance-views/views/views/openai-chat/AssistantBlock.svelte
index 77a8edf5..fa046e24 100644
--- a/frontend/src/lib/components/instance-views/views/views/openai-chat/AssistantBlock.svelte
+++ b/frontend/src/lib/components/instance-views/views/views/openai-chat/AssistantBlock.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-	import { mdiRobotHappy } from '@mdi/js';
-
 	export let input: string;
 	export let output = false;
 </script>
@@ -11,7 +9,10 @@
 		viewBox="0 0 640 512"
 		class={`${output ? 'fill-primary' : 'fill-grey-darker'} w-6 mr-2.5 mt-2`}
 	>
-		<path d={mdiRobotHappy} />
+		<!-- Robot Icon -->
+		<path
+			d="M320 0c17.7 0 32 14.3 32 32V96H472c39.8 0 72 32.2 72 72V440c0 39.8-32.2 72-72 72H168c-39.8 0-72-32.2-72-72V168c0-39.8 32.2-72 72-72H288V32c0-17.7 14.3-32 32-32zM208 384c-8.8 0-16 7.2-16 16s7.2 16 16 16h32c8.8 0 16-7.2 16-16s-7.2-16-16-16H208zm96 0c-8.8 0-16 7.2-16 16s7.2 16 16 16h32c8.8 0 16-7.2 16-16s-7.2-16-16-16H304zm96 0c-8.8 0-16 7.2-16 16s7.2 16 16 16h32c8.8 0 16-7.2 16-16s-7.2-16-16-16H400zM264 256a40 40 0 1 0 -80 0 40 40 0 1 0 80 0zm152 40a40 40 0 1 0 0-80 40 40 0 1 0 0 80zM48 224H64V416H48c-26.5 0-48-21.5-48-48V272c0-26.5 21.5-48 48-48zm544 0c26.5 0 48 21.5 48 48v96c0 26.5-21.5 48-48 48H576V224h16z"
+		/>
 	</svg>
 
 	<p
diff --git a/frontend/src/lib/components/instance-views/views/views/openai-chat/UserBlock.svelte b/frontend/src/lib/components/instance-views/views/views/openai-chat/UserBlock.svelte
index f93bf3f3..8f662043 100644
--- a/frontend/src/lib/components/instance-views/views/views/openai-chat/UserBlock.svelte
+++ b/frontend/src/lib/components/instance-views/views/views/openai-chat/UserBlock.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-	import { mdiAccount } from '@mdi/js';
-
 	export let input: string;
 </script>
 
@@ -17,6 +15,9 @@
 		viewBox="0 0 448 512"
 		class="w-3.5 ml-2.5 mt-2 fill-grey-darker"
 	>
-		<path d={mdiAccount} />
+		<!-- Person Icon -->
+		<path
+			d="M224 256A128 128 0 1 0 224 0a128 128 0 1 0 0 256zm-45.7 48C79.8 304 0 383.8 0 482.3C0 498.7 13.3 512 29.7 512H418.3c16.4 0 29.7-13.3 29.7-29.7C448 383.8 368.2 304 269.7 304H178.3z"
+		/>
 	</svg>
 </div>