diff --git a/web/src/app/admin/assistants/PersonaTable.tsx b/web/src/app/admin/assistants/PersonaTable.tsx
index 878736115..73fcbeb2b 100644
--- a/web/src/app/admin/assistants/PersonaTable.tsx
+++ b/web/src/app/admin/assistants/PersonaTable.tsx
@@ -9,7 +9,7 @@ import { useState } from "react";
 import { UniqueIdentifier } from "@dnd-kit/core";
 import { DraggableTable } from "@/components/table/DraggableTable";
 import { deletePersona, personaComparator } from "./lib";
-import { FiEdit } from "react-icons/fi";
+import { FiEdit2 } from "react-icons/fi";
 import { TrashIcon } from "@/components/icons/icons";
 
 function PersonaTypeDisplay({ persona }: { persona: Persona }) {
@@ -89,7 +89,7 @@ export function PersonasTable({ personas }: { personas: Persona[] }) {
             cells: [
               <div key="name" className="flex">
                 {!persona.default_persona && (
-                  <FiEdit
+                  <FiEdit2
                     className="mr-1 my-auto cursor-pointer"
                     onClick={() =>
                       router.push(
diff --git a/web/src/app/admin/documents/sets/page.tsx b/web/src/app/admin/documents/sets/page.tsx
index dc692451f..d5098322a 100644
--- a/web/src/app/admin/documents/sets/page.tsx
+++ b/web/src/app/admin/documents/sets/page.tsx
@@ -27,7 +27,7 @@ import {
   FiAlertTriangle,
   FiCheckCircle,
   FiClock,
-  FiEdit,
+  FiEdit2,
 } from "react-icons/fi";
 import { DeleteButton } from "@/components/DeleteButton";
 import Link from "next/link";
@@ -68,7 +68,7 @@ const EditRow = ({ documentSet }: { documentSet: DocumentSet }) => {
           }
         }}
       >
-        <FiEdit className="text-emphasis mr-1 my-auto" />
+        <FiEdit2 className="text-emphasis mr-1 my-auto" />
         {documentSet.name}
       </div>
     </div>
diff --git a/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx b/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
index 10ae3a26d..8b57aa1c8 100644
--- a/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
+++ b/web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
@@ -17,7 +17,7 @@ import { ConnectorTitle } from "@/components/admin/connectors/ConnectorTitle";
 import { getDocsProcessedPerMinute } from "@/lib/indexAttempt";
 import Link from "next/link";
 import { isCurrentlyDeleting } from "@/lib/documentDeletion";
-import { FiCheck, FiEdit, FiXCircle } from "react-icons/fi";
+import { FiCheck, FiEdit2, FiXCircle } from "react-icons/fi";
 
 const NUM_IN_PAGE = 20;
 
@@ -102,7 +102,7 @@ export function CCPairIndexingStatusTable({
               >
                 <TableCell>
                   <div className="flex my-auto">
-                    <FiEdit className="mr-4 my-auto" />
+                    <FiEdit2 className="mr-4 my-auto" />
                     <div className="whitespace-normal break-all max-w-3xl">
                       <ConnectorTitle
                         connector={ccPairsIndexingStatus.connector}
diff --git a/web/src/app/admin/tools/ToolsTable.tsx b/web/src/app/admin/tools/ToolsTable.tsx
index 8017a2431..88b91edda 100644
--- a/web/src/app/admin/tools/ToolsTable.tsx
+++ b/web/src/app/admin/tools/ToolsTable.tsx
@@ -12,7 +12,7 @@ import {
 import { ToolSnapshot } from "@/lib/tools/interfaces";
 import { useRouter } from "next/navigation";
 import { usePopup } from "@/components/admin/connectors/Popup";
-import { FiCheckCircle, FiEdit, FiXCircle } from "react-icons/fi";
+import { FiCheckCircle, FiEdit2, FiXCircle } from "react-icons/fi";
 import { TrashIcon } from "@/components/icons/icons";
 import { deleteCustomTool } from "@/lib/tools/edit";
 
@@ -42,7 +42,7 @@ export function ToolsTable({ tools }: { tools: ToolSnapshot[] }) {
               <TableCell>
                 <div className="flex">
                   {tool.in_code_tool_id === null && (
-                    <FiEdit
+                    <FiEdit2
                       className="mr-1 my-auto cursor-pointer"
                       onClick={() =>
                         router.push(
diff --git a/web/src/app/chat/ChatPersonaSelector.tsx b/web/src/app/chat/ChatPersonaSelector.tsx
index 55cb8086f..5984ab36e 100644
--- a/web/src/app/chat/ChatPersonaSelector.tsx
+++ b/web/src/app/chat/ChatPersonaSelector.tsx
@@ -1,5 +1,5 @@
 import { Persona } from "@/app/admin/assistants/interfaces";
-import { FiCheck, FiChevronDown, FiPlusSquare, FiEdit } from "react-icons/fi";
+import { FiCheck, FiChevronDown, FiPlusSquare, FiEdit2 } from "react-icons/fi";
 import { CustomDropdown, DefaultDropdownElement } from "@/components/Dropdown";
 import { useRouter } from "next/navigation";
 import Link from "next/link";
@@ -51,7 +51,7 @@ function PersonaItem({
       </div>
       {isOwner && (
         <Link href={`/assistants/edit/${id}`} className="mx-2 my-auto">
-          <FiEdit className="hover:bg-hover p-0.5 my-auto" size={20} />
+          <FiEdit2 className="hover:bg-hover p-0.5 my-auto" size={20} />
         </Link>
       )}
     </div>
diff --git a/web/src/app/chat/folders/FolderList.tsx b/web/src/app/chat/folders/FolderList.tsx
index 469638efb..8fa0f05a4 100644
--- a/web/src/app/chat/folders/FolderList.tsx
+++ b/web/src/app/chat/folders/FolderList.tsx
@@ -7,7 +7,7 @@ import {
   FiChevronDown,
   FiChevronRight,
   FiFolder,
-  FiEdit,
+  FiEdit2,
   FiCheck,
   FiX,
   FiTrash, // Import the trash icon
@@ -170,7 +170,7 @@ const FolderItem = ({
                     onClick={handleEditFolderName}
                     className="hover:bg-black/10 p-1 -m-1 rounded"
                   >
-                    <FiEdit size={16} />
+                    <FiEdit2 size={16} />
                   </div>
                   <div
                     onClick={deleteFolderHandler}
diff --git a/web/src/app/chat/sessionSidebar/AssistantsTab.tsx b/web/src/app/chat/sessionSidebar/AssistantsTab.tsx
index fc2ca413b..62b5d6d58 100644
--- a/web/src/app/chat/sessionSidebar/AssistantsTab.tsx
+++ b/web/src/app/chat/sessionSidebar/AssistantsTab.tsx
@@ -4,7 +4,7 @@ import { User } from "@/lib/types";
 import { Text } from "@tremor/react";
 import Link from "next/link";
 import { FaRobot } from "react-icons/fa";
-import { FiEdit } from "react-icons/fi";
+import { FiEdit2 } from "react-icons/fi";
 
 function AssistantDisplay({
   persona,
@@ -34,7 +34,7 @@ function AssistantDisplay({
       {isEditable && (
         <div className="pl-2 my-auto">
           <Link href={`/assistants/edit/${persona.id}`}>
-            <FiEdit
+            <FiEdit2
               className="my-auto ml-auto hover:bg-hover p-0.5"
               size={20}
             />
diff --git a/web/src/app/chat/sessionSidebar/ChatSessionDisplay.tsx b/web/src/app/chat/sessionSidebar/ChatSessionDisplay.tsx
index f7c0f3279..87657d761 100644
--- a/web/src/app/chat/sessionSidebar/ChatSessionDisplay.tsx
+++ b/web/src/app/chat/sessionSidebar/ChatSessionDisplay.tsx
@@ -9,8 +9,7 @@ import { BasicSelectable } from "@/components/BasicClickable";
 import Link from "next/link";
 import {
   FiCheck,
-  FiEdit,
-  FiMessageSquare,
+  FiEdit2,
   FiMoreHorizontal,
   FiShare2,
   FiTrash,
@@ -174,7 +173,7 @@ export function ChatSessionDisplay({
                               />
                               <DefaultDropdownElement
                                 name="Rename"
-                                icon={FiEdit}
+                                icon={FiEdit2}
                                 onSelect={() => setIsRenamingChat(true)}
                               />
                             </div>
diff --git a/web/src/app/ee/admin/api-key/page.tsx b/web/src/app/ee/admin/api-key/page.tsx
index 04ce59ebe..50eb98247 100644
--- a/web/src/app/ee/admin/api-key/page.tsx
+++ b/web/src/app/ee/admin/api-key/page.tsx
@@ -21,7 +21,7 @@ import { usePopup } from "@/components/admin/connectors/Popup";
 import { useState } from "react";
 import { Table } from "@tremor/react";
 import { DeleteButton } from "@/components/DeleteButton";
-import { FiCopy, FiEdit, FiRefreshCw, FiX } from "react-icons/fi";
+import { FiCopy, FiEdit2, FiRefreshCw, FiX } from "react-icons/fi";
 import { Modal } from "@/components/Modal";
 import { Spinner } from "@/components/Spinner";
 import { deleteApiKey, regenerateApiKey } from "./lib";
@@ -194,7 +194,7 @@ function Main() {
                   text-sm`}
                   onClick={() => handleEdit(apiKey)}
                 >
-                  <FiEdit className="my-auto mr-2" />
+                  <FiEdit2 className="my-auto mr-2" />
                   {apiKey.api_key_name || <i>null</i>}
                 </div>
               </TableCell>
diff --git a/web/src/app/ee/admin/groups/UserGroupsTable.tsx b/web/src/app/ee/admin/groups/UserGroupsTable.tsx
index 0c433d4ea..9a5201020 100644
--- a/web/src/app/ee/admin/groups/UserGroupsTable.tsx
+++ b/web/src/app/ee/admin/groups/UserGroupsTable.tsx
@@ -15,7 +15,7 @@ import { ConnectorTitle } from "@/components/admin/connectors/ConnectorTitle";
 import { TrashIcon } from "@/components/icons/icons";
 import { deleteUserGroup } from "./lib";
 import { useRouter } from "next/navigation";
-import { FiEdit, FiUser } from "react-icons/fi";
+import { FiEdit2, FiUser } from "react-icons/fi";
 import { User, UserGroup } from "@/lib/types";
 import Link from "next/link";
 import { DeleteButton } from "@/components/DeleteButton";
@@ -77,7 +77,7 @@ export const UserGroupsTable = ({
                       className="whitespace-normal break-all flex cursor-pointer p-2 rounded hover:bg-hover w-fit"
                       href={`/admin/groups/${userGroup.id}`}
                     >
-                      <FiEdit className="my-auto mr-2" />
+                      <FiEdit2 className="my-auto mr-2" />
                       <p className="text font-medium">{userGroup.name}</p>
                     </Link>
                   </TableCell>
diff --git a/web/src/components/EditButton.tsx b/web/src/components/EditButton.tsx
index 1d8ad1493..a7c76017e 100644
--- a/web/src/components/EditButton.tsx
+++ b/web/src/components/EditButton.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { FiEdit } from "react-icons/fi";
+import { FiEdit2 } from "react-icons/fi";
 
 export function EditButton({ onClick }: { onClick: () => void }) {
   return (
@@ -18,7 +18,7 @@ export function EditButton({ onClick }: { onClick: () => void }) {
         text-sm`}
       onClick={onClick}
     >
-      <FiEdit className="mr-1 my-auto" />
+      <FiEdit2 className="mr-1 my-auto" />
       Edit
     </div>
   );
diff --git a/web/src/components/EditableValue.tsx b/web/src/components/EditableValue.tsx
index 3e631b79b..c5c4a21d6 100644
--- a/web/src/components/EditableValue.tsx
+++ b/web/src/components/EditableValue.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useState } from "react";
-import { FiEdit } from "react-icons/fi";
+import { FiEdit2 } from "react-icons/fi";
 import { CheckmarkIcon } from "./icons/icons";
 
 export function EditableValue({
@@ -65,7 +65,7 @@ export function EditableValue({
           <div className="ml-auto my-auto">{initialValue || emptyDisplay}</div>
         </div>
         <div className="cursor-pointer ml-2 my-auto h-4">
-          <FiEdit size={16} />
+          <FiEdit2 size={16} />
         </div>
       </div>
     </div>
diff --git a/web/src/components/icons/icons.tsx b/web/src/components/icons/icons.tsx
index 99c358910..e66afd9e2 100644
--- a/web/src/components/icons/icons.tsx
+++ b/web/src/components/icons/icons.tsx
@@ -18,7 +18,7 @@ import {
   FiCheck,
   FiChevronsDown,
   FiChevronsUp,
-  FiEdit,
+  FiEdit2,
   FiFile,
   FiGlobe,
   FiThumbsDown,
@@ -187,7 +187,7 @@ export const EditIcon = ({
   size = 16,
   className = defaultTailwindCSS,
 }: IconProps) => {
-  return <FiEdit size={size} className={className} />;
+  return <FiEdit2 size={size} className={className} />;
 };
 
 export const XIcon = ({