diff --git a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatMessageOptions.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatMessageOptions.tsx
index f4e823cbe..3fd177f35 100644
--- a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatMessageOptions.tsx
+++ b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatMessageOptions.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Button } from '@/components/ui/buttons';
 import { AppTooltip } from '@/components/ui/tooltip';
-import { Copy, ThumbsDown } from '@/components/ui/icons';
+import { Copy, DuplicatePlus, ThumbsDown } from '@/components/ui/icons';
 import { ThumbsDown as ThumbsDownFilled } from '@/components/ui/icons/NucleoIconFilled';
 import {
   useDuplicateChat,
@@ -51,7 +51,7 @@ export const ChatMessageOptions: React.FC<{
       <AppTooltip title="Duplicate chat from this message">
         <Button
           variant="ghost"
-          prefix={<Copy />}
+          prefix={<DuplicatePlus />}
           loading={isCopying}
           onClick={warnBeforeDuplicate}
         />
diff --git a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatUserMessage.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatUserMessage.tsx
index 724832de4..c7d68cd43 100644
--- a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatUserMessage.tsx
+++ b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatUserMessage.tsx
@@ -33,7 +33,7 @@ export const ChatUserMessage: React.FC<{
   const handleCopy = useMemoizedFn((e?: React.ClipboardEvent) => {
     // Prevent default copy behavior
     //I do not know why this is needed, but it is...
-    if (e) {
+    if (e && e.clipboardData) {
       e.preventDefault();
       e.clipboardData.setData('text/plain', request);
     } else {
diff --git a/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderDropdown.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderDropdown.tsx
index ec372e9f1..e552c8f90 100644
--- a/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderDropdown.tsx
+++ b/web/src/layouts/ChatLayout/ChatContainer/ChatHeader/ChatHeaderOptions/ChatHeaderDropdown.tsx
@@ -1,7 +1,7 @@
 import { Dropdown, DropdownItems } from '@/components/ui/dropdown';
 import React, { useMemo } from 'react';
 import { useChatIndividualContextSelector } from '../../../ChatContext';
-import { Copy, Trash, Pencil } from '@/components/ui/icons';
+import { Copy, Trash, Pencil, DuplicatePlus } from '@/components/ui/icons';
 import { useDeleteChat, useDuplicateChat } from '@/api/buster_rest/chats';
 import { CHAT_HEADER_TITLE_ID } from '../ChatHeaderTitle';
 import { timeout } from '@/lib';
@@ -44,7 +44,7 @@ export const ChatContainerHeaderDropdown: React.FC<{
       {
         label: 'Duplicate chat',
         value: 'duplicate',
-        icon: <Copy />,
+        icon: <DuplicatePlus />,
         loading: isDuplicating,
         onClick: async () => {
           if (chatId) {