diff --git a/Chat.go b/Chat.go
index 27bda7c..ecaecb4 100644
--- a/Chat.go
+++ b/Chat.go
@@ -174,6 +174,23 @@ func GetMessageContentHandler(c *fiber.Ctx) error {
 	out += "	</ct>"
 	out += "</div>"
 
+	// Update the selected value of messages in the database
+	err = edgeClient.Execute(edgeCtx, `
+	WITH m := (SELECT Message FILTER .id = <uuid>$0)
+	UPDATE Message
+	FILTER .area = m.area
+	SET {selected := false};
+	`, messageUUID)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	_ = edgeClient.Execute(edgeCtx, `
+	UPDATE Message
+	FILTER .id = <uuid>$0
+	SET {selected := true};
+	`, messageUUID)
+
 	return c.SendString(out)
 }
 
diff --git a/static/icons/anthropic-outline.png b/static/icons/anthropic-outline.png
deleted file mode 100644
index 8a608c0..0000000
Binary files a/static/icons/anthropic-outline.png and /dev/null differ
diff --git a/static/icons/openai-outline.png b/static/icons/openai-outline.png
deleted file mode 100644
index e47321c..0000000
Binary files a/static/icons/openai-outline.png and /dev/null differ
diff --git a/views/partials/message-bot.html b/views/partials/message-bot.html
index 5fa37c9..5fcf12d 100644
--- a/views/partials/message-bot.html
+++ b/views/partials/message-bot.html
@@ -47,7 +47,7 @@
                 {% for message in Messages %}
                 <button class="button is-small is-primary message-button is-outlined mr-1"
                     hx-get="/messageContent?id={{ message.Id }}" hx-target="#content-{{ ConversationAreaId }}"
-                    onclick="updateIcon('{{ message.Icon }}', '{{ ConversationAreaId }}')">
+                    onclick="updateIcon('{{ message.Icon }}', '{{ ConversationAreaId }}')" title="{{ message.Name }}">
                     <span class="icon is-small">
                         <img src="icons/{{ message.Icon }}.png" alt="{{ message.Name }}"
                             style="max-height: 100%; max-width: 100%;">