diff --git a/frontend/src/conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx
index 4b0a5d46..1046b2fc 100644
--- a/frontend/src/conversation/Conversation.tsx
+++ b/frontend/src/conversation/Conversation.tsx
@@ -386,7 +386,7 @@ export default function Conversation() {
         )}
       </div>
 
-      <div className="flex w-11/12 flex-col items-end self-center rounded-2xl bg-opacity-0 z-3 sm:w-[58%] xl:max-w-[52vw] h-auto py-1">
+      <div className="flex w-11/12 flex-col items-end self-center rounded-2xl bg-opacity-0 z-3 sm:w-[58%] xl:w-[650px] 2xl:w-[49vw] h-auto py-1">
         <div
           {...getRootProps()}
           className="flex w-full items-center rounded-[40px] border dark:border-grey border-dark-gray bg-lotion dark:bg-raisin-black"
diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json
index 05f613d2..899d8cb2 100644
--- a/frontend/src/locale/en.json
+++ b/frontend/src/locale/en.json
@@ -73,6 +73,7 @@
         "monthly": "Monthly"
       },
       "actions": "Actions",
+      "view": "View",
       "deleteWarning": "Are you sure you want to delete \"{{name}}\"?"
     },
     "apiKeys": {
diff --git a/frontend/src/locale/es.json b/frontend/src/locale/es.json
index 8830402f..dc1fa0e8 100644
--- a/frontend/src/locale/es.json
+++ b/frontend/src/locale/es.json
@@ -72,6 +72,7 @@
         "monthly": "Mensual"
       },
       "actions": "Acciones",
+      "view": "Ver",
       "deleteWarning": "¿Estás seguro de que deseas eliminar \"{{name}}\"?"
     },
     "apiKeys": {
diff --git a/frontend/src/locale/jp.json b/frontend/src/locale/jp.json
index 06e0669b..f93fc4e2 100644
--- a/frontend/src/locale/jp.json
+++ b/frontend/src/locale/jp.json
@@ -72,6 +72,7 @@
         "monthly": "毎月"
       },
       "actions": "アクション",
+      "view": "表示",
       "deleteWarning": "\"{{name}}\"を削除してもよろしいですか？"
     },
     "apiKeys": {
diff --git a/frontend/src/locale/ru.json b/frontend/src/locale/ru.json
index 610faf69..daa6fc45 100644
--- a/frontend/src/locale/ru.json
+++ b/frontend/src/locale/ru.json
@@ -73,6 +73,7 @@
         "monthly": "Ежемесячно"
       },
       "actions": "Действия",
+      "view": "Просмотр",
       "deleteWarning": "Вы уверены, что хотите удалить \"{{name}}\"?"
     },
     "apiKeys": {
diff --git a/frontend/src/locale/zh-TW.json b/frontend/src/locale/zh-TW.json
index e723b866..4ffe65fe 100644
--- a/frontend/src/locale/zh-TW.json
+++ b/frontend/src/locale/zh-TW.json
@@ -73,6 +73,7 @@
         "monthly": "每月"
       },
       "actions": "操作",
+      "view": "查看",
       "deleteWarning": "您確定要刪除 \"{{name}}\" 嗎？"
     },
     "apiKeys": {
diff --git a/frontend/src/locale/zh.json b/frontend/src/locale/zh.json
index d34564fb..7c3e1510 100644
--- a/frontend/src/locale/zh.json
+++ b/frontend/src/locale/zh.json
@@ -73,6 +73,7 @@
         "monthly": "每月"
       },
       "actions": "操作",
+      "view": "查看",
       "deleteWarning": "您确定要删除 \"{{name}}\" 吗？"
     },
     "apiKeys": {
diff --git a/frontend/src/settings/Analytics.tsx b/frontend/src/settings/Analytics.tsx
index 307cfb5c..ab78d083 100644
--- a/frontend/src/settings/Analytics.tsx
+++ b/frontend/src/settings/Analytics.tsx
@@ -223,7 +223,7 @@ export default function Analytics() {
               }
               rounded="3xl"
               border="border"
-              borderColor="gray-700"
+              darkBorderColor="dim-gray"
             />
           </div>
         )}
diff --git a/frontend/src/settings/General.tsx b/frontend/src/settings/General.tsx
index 415f1aaf..2ffd054d 100644
--- a/frontend/src/settings/General.tsx
+++ b/frontend/src/settings/General.tsx
@@ -176,7 +176,7 @@ export default function General() {
       {/* Delete conversations button without label */}
       <div className="flex flex-col gap-2">
         <button
-          className="flex w-56 cursor-pointer items-center justify-between rounded-3xl border border-solid border-red-700 px-5 py-3 text-red-700 transition-colors hover:bg-red-700 hover:text-white dark:border-red-600 dark:text-red-600 dark:hover:bg-red-600 dark:hover:text-white"
+          className="flex w-56 cursor-pointer items-center justify-between rounded-3xl border border-solid border-rosso-corsa bg-transparent px-5 py-3 text-rosso-corsa transition-colors hover:bg-rosso-corsa hover:text-white dark:hover:text-white"
           onClick={() => dispatch(setModalStateDeleteConv('ACTIVE'))}
         >
           {t('settings.general.deleteAllBtn')}
diff --git a/frontend/src/settings/Prompts.tsx b/frontend/src/settings/Prompts.tsx
index 8938e59d..137e3a8a 100644
--- a/frontend/src/settings/Prompts.tsx
+++ b/frontend/src/settings/Prompts.tsx
@@ -35,10 +35,7 @@ export default function Prompts({
   });
   const [modalType, setModalType] = React.useState<'ADD' | 'EDIT'>('ADD');
   const [modalState, setModalState] = React.useState<ActiveState>('INACTIVE');
-  const {
-    t,
-    i18n: { changeLanguage, language },
-  } = useTranslation();
+  const { t } = useTranslation();
 
   const handleAddPrompt = async () => {
     try {
@@ -135,11 +132,11 @@ export default function Prompts({
   return (
     <>
       <div>
-        <div className="flex flex-row items-center gap-8">
-          <div>
-            <p className="font-semibold dark:text-bright-gray">
-              {t('settings.general.prompt')}
-            </p>
+        <div className="flex flex-col">
+          <p className="font-semibold dark:text-bright-gray">
+            {t('settings.general.prompt')}
+          </p>
+          <div className="flex flex-row justify-start items-baseline gap-6">
             <Dropdown
               options={prompts}
               selectedValue={selectedPrompt.name}
@@ -166,16 +163,17 @@ export default function Prompts({
               }}
               onDelete={handleDeletePrompt}
             />
+
+            <button
+              className="mt-[24px] rounded-3xl border border-solid border-purple-30 px-5 py-3 text-purple-30 transition-colors hover:text-white hover:bg-[#6F3FD1] dark:border-purple-30 dark:text-purple-30 dark:hover:bg-purple-30 dark:hover:text-white"
+              onClick={() => {
+                setModalType('ADD');
+                setModalState('ACTIVE');
+              }}
+            >
+              {t('settings.general.add')}
+            </button>
           </div>
-          <button
-            className="mt-[24px] rounded-3xl border border-solid border-purple-30 px-5 py-3 text-purple-30 transition-colors hover:text-white hover:bg-[#6F3FD1] dark:border-purple-30 dark:text-purple-30 dark:hover:bg-purple-30 dark:hover:text-white"
-            onClick={() => {
-              setModalType('ADD');
-              setModalState('ACTIVE');
-            }}
-          >
-            {t('settings.general.add')}
-          </button>
         </div>
       </div>
       <PromptsModal
diff --git a/frontend/src/upload/Upload.tsx b/frontend/src/upload/Upload.tsx
index f97473d5..8710c5d3 100644
--- a/frontend/src/upload/Upload.tsx
+++ b/frontend/src/upload/Upload.tsx
@@ -656,6 +656,7 @@ function Upload({
                 handleIngestorTypeChange(selected.value as IngestorType)
               }
               size="w-full"
+              darkBorderColor="dim-gray"
               rounded="3xl"
             />
             {/* Dynamically render form fields based on schema */}