diff --git a/frontend/src/conversation/ConversationBubble.tsx b/frontend/src/conversation/ConversationBubble.tsx
index 445b6ee3..b436d5cc 100644
--- a/frontend/src/conversation/ConversationBubble.tsx
+++ b/frontend/src/conversation/ConversationBubble.tsx
@@ -155,13 +155,13 @@ const ConversationBubble = forwardRef<
               />
               <div className="flex items-center justify-end gap-2">
                 <button
-                  className="px-4 py-2 text-purple-30 text-sm hover:text-rich-black hover:bg-light-gray-hover dark:hover:bg-charcoal transition-colors rounded-full"
+                  className="px-4 py-2 text-purple-30 text-sm hover:text-chinese-black-2 hover:bg-gainsboro dark:hover:bg-onyx-2 transition-colors rounded-full"
                   onClick={() => setIsEditClicked(false)}
                 >
                   {t('conversation.edit.cancel')}
                 </button>
                 <button
-                  className="rounded-full bg-purple-30 hover:bg-purple-hover px-4 py-2 text-white text-sm font-medium transition-colors"
+                  className="rounded-full bg-purple-30 hover:bg-royal-purple px-4 py-2 text-white text-sm font-medium transition-colors"
                   onClick={handleEditClick}
                 >
                   {t('conversation.edit.update')}
diff --git a/frontend/src/modals/ShareConversationModal.tsx b/frontend/src/modals/ShareConversationModal.tsx
index d7ad4051..ce6ab1b8 100644
--- a/frontend/src/modals/ShareConversationModal.tsx
+++ b/frontend/src/modals/ShareConversationModal.tsx
@@ -138,14 +138,14 @@ export const ShareConversationModal = ({
           </span>
           {status === 'fetched' ? (
             <button
-              className="my-1 h-10 w-28 rounded-full border border-solid  bg-purple-30 p-2 text-sm text-white hover:bg-purple-hover"
+              className="my-1 h-10 w-28 rounded-full border border-solid  bg-purple-30 p-2 text-sm text-white hover:bg-royal-purple"
               onClick={() => handleCopyKey(`${domain}/share/${identifier}`)}
             >
               {isCopied ? t('modals.saveKey.copied') : t('modals.saveKey.copy')}
             </button>
           ) : (
             <button
-              className="my-1 flex h-10 w-28 items-center justify-evenly rounded-full bg-purple-30 p-2 text-center text-sm font-normal text-white hover:bg-purple-hover"
+              className="my-1 flex h-10 w-28 items-center justify-evenly rounded-full bg-purple-30 p-2 text-center text-sm font-normal text-white hover:bg-royal-purple"
               onClick={() => {
                 shareCoversationPublicly(allowPrompt);
               }}
diff --git a/frontend/tailwind.config.cjs b/frontend/tailwind.config.cjs
index e82b7322..efbb11ce 100644
--- a/frontend/tailwind.config.cjs
+++ b/frontend/tailwind.config.cjs
@@ -49,8 +49,6 @@ module.exports = {
         'independence': '#54546D',
         'philippine-yellow': '#FFC700',
         'bright-gray': '#EBEBEB',
-        
-        // New semantically named colors for UI elements
         'chinese-white': '#e0e0e0',
         'dark-gray': '#aaaaaa',
         'dim-gray': '#6A6A6A',
@@ -64,12 +62,10 @@ module.exports = {
         'light-silver': '#D9D9D9',
         'carbon': '#2E2E2E',
         'onyx':'#35363B',
-
-        // New colors for edit buttons
-        'purple-hover': '#6C4AB0', //royal purple
-        'rich-black': '#0F1419', // chinese-black-2
-        'light-gray-hover': '#D9DCDE', //gainsboro
-        'charcoal': '#35383C',//onyx 2
+        'royal-purple': '#6C4AB0',
+        'chinese-black-2': '#0F1419',
+        'gainsboro': '#D9DCDE',
+        'onyx-2': '#35383C',
         'philippine-grey': '#929292',
         'charcoal-grey':'#53545D',
         'rosso-corsa': '#D30000',