diff --git a/collector/package.json b/collector/package.json
index 01cf26b6b..d145ab865 100644
--- a/collector/package.json
+++ b/collector/package.json
@@ -40,7 +40,7 @@
     "uuid": "^9.0.0",
     "wavefile": "^11.0.0",
     "youtube-transcript": "^1.0.6",
-    "youtubei.js": "^8.0.0"
+    "youtubei.js": "^9.1.0"
   },
   "devDependencies": {
     "nodemon": "^2.0.22",
diff --git a/collector/yarn.lock b/collector/yarn.lock
index e181b245b..bf979c86c 100644
--- a/collector/yarn.lock
+++ b/collector/yarn.lock
@@ -40,9 +40,9 @@
     js-tokens "^4.0.0"
 
 "@fastify/busboy@^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.0.tgz#0709e9f4cb252351c609c6e6d8d6779a8d25edff"
-  integrity sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
+  integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
 
 "@googleapis/youtube@^9.0.0":
   version "9.0.0"
@@ -258,9 +258,9 @@ accepts@~1.3.8:
     negotiator "0.6.3"
 
 acorn@^8.8.0:
-  version "8.11.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
-  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
 agent-base@6:
   version "6.0.2"
@@ -3152,9 +3152,9 @@ undici-types@~5.26.4:
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
 undici@^5.19.1:
-  version "5.28.2"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.2.tgz#fea200eac65fc7ecaff80a023d1a0543423b4c91"
-  integrity sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==
+  version "5.28.3"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b"
+  integrity sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==
   dependencies:
     "@fastify/busboy" "^2.0.0"
 
@@ -3322,10 +3322,10 @@ youtube-transcript@^1.0.6:
   dependencies:
     phin "^3.5.0"
 
-youtubei.js@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-8.0.0.tgz#0fcbe332e263d9be6afe4e3d1917e9ddc1ffbed3"
-  integrity sha512-kUwHvqoB5vfaGaY1quAGcX5JPIyjr5fjj9Zj/ZwUDCrermz/r5uIkNiJ5cNHkmAJbZP9fdygzNMvGHd7fM445g==
+youtubei.js@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-9.1.0.tgz#bcf154c9fa21d3c8c1d00a5e10360d0a065c660e"
+  integrity sha512-C5GBJ4LgnS6vGAUkdIdQNOFFb5EZ1p3xBvUELNXmIG3Idr6vxWrKNBNy8ClZT3SuDVXaAJqDgF9b5jvY8lNKcg==
   dependencies:
     jintr "^1.1.0"
     tslib "^2.5.0"
diff --git a/docker/HOW_TO_USE_DOCKER.md b/docker/HOW_TO_USE_DOCKER.md
index 812119a64..9532fea0b 100644
--- a/docker/HOW_TO_USE_DOCKER.md
+++ b/docker/HOW_TO_USE_DOCKER.md
@@ -75,7 +75,7 @@ mintplexlabs/anythingllm
 # Run this in powershell terminal
 $env:STORAGE_LOCATION="$HOME\Documents\anythingllm"; `
 If(!(Test-Path $env:STORAGE_LOCATION)) {New-Item $env:STORAGE_LOCATION -ItemType Directory}; `
-If(!(Test-Path "$env:STORAGE_LOCATION\.env")) {New-Item "$env:STORAGE_LOCATION\.env"}; `
+If(!(Test-Path "$env:STORAGE_LOCATION\.env")) {New-Item "$env:STORAGE_LOCATION\.env" -ItemType File}; `
 docker run -d -p 3001:3001 `
 --cap-add SYS_ADMIN `
 -v "$env:STORAGE_LOCATION`:/app/server/storage" `
diff --git a/frontend/src/components/EditingChatBubble/index.jsx b/frontend/src/components/EditingChatBubble/index.jsx
index ba5cc4804..0aa2a0784 100644
--- a/frontend/src/components/EditingChatBubble/index.jsx
+++ b/frontend/src/components/EditingChatBubble/index.jsx
@@ -13,49 +13,52 @@ export default function EditingChatBubble({
   const isUser = type === "user";
 
   return (
-    <div
-      className={`relative flex w-full mt-2 items-start ${
-        isUser ? "justify-end" : "justify-start"
-      }`}
-    >
-      <button
-        className={`transition-all duration-300 absolute z-10 text-white bg-neutral-700 rounded-full hover:bg-selected-preference-gradient hover:border-white border-transparent border shadow-lg ${
-          isUser ? "right-0 mr-2" : "ml-2"
-        }`}
-        style={{ top: "-8px", [isUser ? "right" : "left"]: "255px" }}
-        onClick={() => removeMessage(index)}
-      >
-        <X className="m-0.5" size={20} />
-      </button>
+    <div>
+      <p className={`text-xs text-[#D3D4D4] ${isUser ? "text-right" : ""}`}>
+        {isUser ? "User" : "AnythingLLM Chat Assistant"}
+      </p>
       <div
-        className={`p-4 max-w-full md:w-[290px] ${
-          isUser ? "bg-sky-400 text-black" : "bg-white text-black"
-        } ${
-          isUser
-            ? "rounded-tr-[40px] rounded-tl-[40px] rounded-bl-[40px]"
-            : "rounded-br-[40px] rounded-tl-[40px] rounded-tr-[40px]"
-        }
+        className={`relative flex w-full mt-2 items-start ${
+          isUser ? "justify-end" : "justify-start"
         }`}
-        onDoubleClick={() => setIsEditing(true)}
       >
-        {isEditing ? (
-          <input
-            value={tempMessage}
-            onChange={(e) => setTempMessage(e.target.value)}
-            onBlur={() => {
-              handleMessageChange(index, type, tempMessage);
-              setIsEditing(false);
-            }}
-            autoFocus
-            className="w-full"
-          />
-        ) : (
-          tempMessage && (
-            <p className="text-black font-[500] md:font-semibold text-sm md:text-base break-words">
-              {tempMessage}
-            </p>
-          )
-        )}
+        <button
+          className={`transition-all duration-300 absolute z-10 text-white rounded-full hover:bg-neutral-700 hover:border-white border-transparent border shadow-lg ${
+            isUser ? "right-0 mr-2" : "ml-2"
+          }`}
+          style={{ top: "6px", [isUser ? "right" : "left"]: "290px" }}
+          onClick={() => removeMessage(index)}
+        >
+          <X className="m-0.5" size={20} />
+        </button>
+        <div
+          className={`p-2 max-w-full md:w-[290px] text-black rounded-[8px] ${
+            isUser ? "bg-[#41444C] text-white" : "bg-[#2E3036] text-white"
+          }
+        }`}
+          onDoubleClick={() => setIsEditing(true)}
+        >
+          {isEditing ? (
+            <input
+              value={tempMessage}
+              onChange={(e) => setTempMessage(e.target.value)}
+              onBlur={() => {
+                handleMessageChange(index, type, tempMessage);
+                setIsEditing(false);
+              }}
+              autoFocus
+              className={`w-full ${
+                isUser ? "bg-[#41444C] text-white" : "bg-[#2E3036] text-white"
+              }`}
+            />
+          ) : (
+            tempMessage && (
+              <p className=" font-[500] md:font-semibold text-sm md:text-base break-words">
+                {tempMessage}
+              </p>
+            )
+          )}
+        </div>
       </div>
     </div>
   );
diff --git a/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx b/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx
index 406fda868..b83aadc2f 100644
--- a/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx
+++ b/frontend/src/components/Modals/MangeWorkspace/Documents/UploadFile/index.jsx
@@ -57,8 +57,7 @@ export default function UploadFile({ workspace, fetchKeys, setLoading }) {
         reason: file.errors[0].code,
       };
     });
-
-    setFiles([...files, ...newAccepted, ...newRejected]);
+    setFiles([...newAccepted, ...newRejected]);
   };
 
   useEffect(() => {
diff --git a/frontend/src/components/SettingsSidebar/index.jsx b/frontend/src/components/SettingsSidebar/index.jsx
index 112b641bf..84b78064a 100644
--- a/frontend/src/components/SettingsSidebar/index.jsx
+++ b/frontend/src/components/SettingsSidebar/index.jsx
@@ -149,7 +149,9 @@ export default function SettingsSidebar() {
                 <SidebarOptions user={user} />
               </div>
             </div>
-            <Footer />
+            <div className="mb-2">
+              <Footer />
+            </div>
           </div>
         </div>
       </div>
diff --git a/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx b/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
index 78c53c26e..7ee1c38d5 100644
--- a/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
+++ b/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
@@ -92,11 +92,11 @@ export default function ActiveWorkspaces() {
                 className={`
               transition-all duration-[200ms]
                 flex flex-grow w-[75%] gap-x-2 py-[6px] px-[12px] rounded-[4px] text-white justify-start items-center
-                hover:bg-workspace-item-selected-gradient  border-outline
+                hover:bg-workspace-item-selected-gradient hover:font-bold border-2 border-outline
                 ${
                   isActive
-                    ? "bg-workspace-item-selected-gradient font-medium border-none"
-                    : "border-[1px]"
+                    ? "bg-workspace-item-selected-gradient font-bold"
+                    : ""
                 }`}
               >
                 <div className="flex flex-row justify-between w-full">
diff --git a/frontend/src/components/Sidebar/index.jsx b/frontend/src/components/Sidebar/index.jsx
index 75c854d90..561f46b3e 100644
--- a/frontend/src/components/Sidebar/index.jsx
+++ b/frontend/src/components/Sidebar/index.jsx
@@ -38,10 +38,10 @@ export default function Sidebar() {
       <div
         ref={sidebarRef}
         style={{ height: "calc(100% - 76px)" }}
-        className="transition-all pt-[11px] px-[10px] duration-500 relative m-[16px] rounded-[16px] bg-sidebar border-2 border-outline min-w-[250px]"
+        className="relative m-[16px] rounded-[16px] bg-sidebar border-2 border-outline min-w-[250px] p-[10px]"
       >
         <div className="flex flex-col h-full overflow-x-hidden">
-          <div className="flex-grow flex flex-col w-[235px]">
+          <div className="flex-grow flex flex-col min-w-[235px]">
             <div className="flex flex-col gap-y-2 pb-8 overflow-y-scroll no-scroll">
               <div className="flex gap-x-2 items-center justify-between">
                 {(!user || user?.role !== "default") && (
@@ -144,9 +144,11 @@ export function SidebarMobileHeader() {
                   style={{ objectFit: "contain" }}
                 />
               </div>
-              <div className="flex gap-x-2 items-center text-slate-500 shrink-0">
-                <SettingsButton />
-              </div>
+              {(!user || user?.role !== "default") && (
+                <div className="flex gap-x-2 items-center text-slate-500 shink-0">
+                  <SettingsButton />
+                </div>
+              )}
             </div>
 
             {/* Primary Body */}
diff --git a/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/HistoricalMessage/index.jsx b/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/HistoricalMessage/index.jsx
index 1a3f1a0db..a128e0195 100644
--- a/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/HistoricalMessage/index.jsx
+++ b/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/HistoricalMessage/index.jsx
@@ -31,15 +31,7 @@ const HistoricalMessage = ({
         className={`py-8 px-4 w-full flex gap-x-5 md:max-w-[800px] flex-col`}
       >
         <div className="flex gap-x-5">
-          <Jazzicon
-            size={36}
-            user={{
-              uid:
-                role === "user" ? userFromStorage()?.username : workspace.slug,
-            }}
-            role={role}
-          />
-
+          <ProfileImage role={role} workspace={workspace} />
           {error ? (
             <div className="p-2 rounded-lg bg-red-50 text-red-500">
               <span className={`inline-block `}>
@@ -76,4 +68,28 @@ const HistoricalMessage = ({
   );
 };
 
+function ProfileImage({ role, workspace }) {
+  if (role === "assistant" && workspace.pfpUrl) {
+    return (
+      <div className="relative w-[35px] h-[35px] rounded-full flex-shrink-0 overflow-hidden">
+        <img
+          src={workspace.pfpUrl}
+          alt="Workspace profile picture"
+          className="absolute top-0 left-0 w-full h-full object-cover rounded-full bg-white"
+        />
+      </div>
+    );
+  }
+
+  return (
+    <Jazzicon
+      size={36}
+      user={{
+        uid: role === "user" ? userFromStorage()?.username : workspace.slug,
+      }}
+      role={role}
+    />
+  );
+}
+
 export default memo(HistoricalMessage);
diff --git a/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/PromptReply/index.jsx b/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/PromptReply/index.jsx
index 440883a71..5c48e9224 100644
--- a/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/PromptReply/index.jsx
+++ b/frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/PromptReply/index.jsx
@@ -14,7 +14,6 @@ const PromptReply = ({
   closed = true,
 }) => {
   const assistantBackgroundColor = "bg-historical-msg-system";
-
   if (!reply && sources.length === 0 && !pending && !error) return null;
 
   if (pending) {
@@ -24,11 +23,7 @@ const PromptReply = ({
       >
         <div className="py-8 px-4 w-full flex gap-x-5 md:max-w-[800px] flex-col">
           <div className="flex gap-x-5">
-            <Jazzicon
-              size={36}
-              user={{ uid: workspace.slug }}
-              role="assistant"
-            />
+            <WorkspaceProfileImage workspace={workspace} />
             <div className="mt-3 ml-5 dot-falling"></div>
           </div>
         </div>
@@ -43,11 +38,7 @@ const PromptReply = ({
       >
         <div className="py-8 px-4 w-full flex gap-x-5 md:max-w-[800px] flex-col">
           <div className="flex gap-x-5">
-            <Jazzicon
-              size={36}
-              user={{ uid: workspace.slug }}
-              role="assistant"
-            />
+            <WorkspaceProfileImage workspace={workspace} />
             <span
               className={`inline-block p-2 rounded-lg bg-red-50 text-red-500`}
             >
@@ -68,7 +59,7 @@ const PromptReply = ({
     >
       <div className="py-8 px-4 w-full flex gap-x-5 md:max-w-[800px] flex-col">
         <div className="flex gap-x-5">
-          <Jazzicon size={36} user={{ uid: workspace.slug }} role="assistant" />
+          <WorkspaceProfileImage workspace={workspace} />
           <span
             className={`reply flex flex-col gap-y-1 mt-2`}
             dangerouslySetInnerHTML={{ __html: renderMarkdown(reply) }}
@@ -80,4 +71,20 @@ const PromptReply = ({
   );
 };
 
+function WorkspaceProfileImage({ workspace }) {
+  if (!!workspace.pfpUrl) {
+    return (
+      <div className="relative w-[35px] h-[35px] rounded-full flex-shrink-0 overflow-hidden">
+        <img
+          src={workspace.pfpUrl}
+          alt="Workspace profile picture"
+          className="absolute top-0 left-0 w-full h-full object-cover rounded-full bg-white"
+        />
+      </div>
+    );
+  }
+
+  return <Jazzicon size={36} user={{ uid: workspace.slug }} role="assistant" />;
+}
+
 export default memo(PromptReply);
diff --git a/frontend/src/models/workspace.js b/frontend/src/models/workspace.js
index d00388743..6786abffd 100644
--- a/frontend/src/models/workspace.js
+++ b/frontend/src/models/workspace.js
@@ -238,6 +238,54 @@ const Workspace = {
       });
   },
   threads: WorkspaceThread,
+
+  uploadPfp: async function (formData, slug) {
+    return await fetch(`${API_BASE}/workspace/${slug}/upload-pfp`, {
+      method: "POST",
+      body: formData,
+      headers: baseHeaders(),
+    })
+      .then((res) => {
+        if (!res.ok) throw new Error("Error uploading pfp.");
+        return { success: true, error: null };
+      })
+      .catch((e) => {
+        console.log(e);
+        return { success: false, error: e.message };
+      });
+  },
+
+  fetchPfp: async function (slug) {
+    return await fetch(`${API_BASE}/workspace/${slug}/pfp`, {
+      method: "GET",
+      cache: "no-cache",
+      headers: baseHeaders(),
+    })
+      .then((res) => {
+        if (res.ok && res.status !== 204) return res.blob();
+        throw new Error("Failed to fetch pfp.");
+      })
+      .then((blob) => (blob ? URL.createObjectURL(blob) : null))
+      .catch((e) => {
+        console.log(e);
+        return null;
+      });
+  },
+
+  removePfp: async function (slug) {
+    return await fetch(`${API_BASE}/workspace/${slug}/remove-pfp`, {
+      method: "DELETE",
+      headers: baseHeaders(),
+    })
+      .then((res) => {
+        if (res.ok) return { success: true, error: null };
+        throw new Error("Failed to remove pfp.");
+      })
+      .catch((e) => {
+        console.log(e);
+        return { success: false, error: e.message };
+      });
+  },
 };
 
 export default Workspace;
diff --git a/frontend/src/pages/Admin/Invitations/index.jsx b/frontend/src/pages/Admin/Invitations/index.jsx
index 31b2b7923..f81ccae52 100644
--- a/frontend/src/pages/Admin/Invitations/index.jsx
+++ b/frontend/src/pages/Admin/Invitations/index.jsx
@@ -13,25 +13,29 @@ import ModalWrapper from "@/components/ModalWrapper";
 
 export default function AdminInvites() {
   const { isOpen, openModal, closeModal } = useModal();
+
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
-        <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+        <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">
-              <p className="text-2xl font-semibold text-white">Invitations</p>
+              <p className="text-lg leading-6 font-bold text-white">
+                Invitations
+              </p>
               <button
                 onClick={openModal}
-                className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
+                className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
               >
-                <EnvelopeSimple className="h-4 w-4" /> Create Invite Link
+                <EnvelopeSimple className="h-4 w-4" />
+                Create Invite Link
               </button>
             </div>
-            <p className="text-sm font-base text-white text-opacity-60">
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
               Create invitation links for people in your organization to accept
               and sign up with. Invitations can only be used by a single user.
             </p>
@@ -50,6 +54,7 @@ function InvitationsContainer() {
   const darkMode = usePrefersDarkMode();
   const [loading, setLoading] = useState(true);
   const [invites, setInvites] = useState([]);
+
   useEffect(() => {
     async function fetchInvites() {
       const _invites = await Admin.invites();
@@ -74,13 +79,13 @@ function InvitationsContainer() {
   }
 
   return (
-    <table className="md:w-3/4 w-full text-sm text-left rounded-lg mt-5">
-      <thead className="text-white text-opacity-80 text-sm font-bold uppercase border-white border-b border-opacity-60">
+    <table className="w-full text-sm text-left rounded-lg mt-6">
+      <thead className="text-white text-opacity-80 text-xs leading-[18px] font-bold uppercase border-white border-b border-opacity-60">
         <tr>
-          <th scope="col" className="px-6 py-3">
+          <th scope="col" className="px-6 py-3 rounded-tl-lg">
             Status
           </th>
-          <th scope="col" className="px-6 py-3 rounded-tl-lg">
+          <th scope="col" className="px-6 py-3">
             Accepted By
           </th>
           <th scope="col" className="px-6 py-3">
diff --git a/frontend/src/pages/Admin/Logging/index.jsx b/frontend/src/pages/Admin/Logging/index.jsx
index f405c9a68..5d8a90acb 100644
--- a/frontend/src/pages/Admin/Logging/index.jsx
+++ b/frontend/src/pages/Admin/Logging/index.jsx
@@ -30,20 +30,22 @@ export default function AdminLogs() {
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
-        <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+        <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
-            <div className="items-center flex gap-x-4">
-              <p className="text-2xl font-semibold text-white">Event Logs</p>
+            <div className="flex gap-x-4 items-center">
+              <p className="text-lg leading-6 font-bold text-white">
+                Event Logs
+              </p>
               <button
                 onClick={handleResetLogs}
-                className="px-4 py-1 rounded-lg text-slate-200/50 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
+                className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
               >
                 Clear event logs
               </button>
             </div>
-            <p className="text-sm font-base text-white text-opacity-60">
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
               View all actions and events happening on this instance for
               monitoring.
             </p>
@@ -95,10 +97,10 @@ function LogsContainer() {
 
   return (
     <>
-      <table className="md:w-5/6 w-full text-sm text-left rounded-lg mt-5">
-        <thead className="text-white text-opacity-80 text-sm font-bold uppercase border-white border-b border-opacity-60">
+      <table className="w-full text-sm text-left rounded-lg mt-6">
+        <thead className="text-white text-opacity-80 text-xs leading-[18px] font-bold uppercase border-white border-b border-opacity-60">
           <tr>
-            <th scope="col" className="px-6 py-3">
+            <th scope="col" className="px-6 py-3 rounded-tl-lg">
               Event Type
             </th>
             <th scope="col" className="px-6 py-3">
@@ -116,7 +118,7 @@ function LogsContainer() {
           {!!logs && logs.map((log) => <LogRow key={log.id} log={log} />)}
         </tbody>
       </table>
-      <div className="flex w-full justify-between items-center">
+      <div className="flex w-full justify-between items-center mt-6">
         <button
           onClick={handlePrevious}
           className="px-4 py-2 rounded-lg border border-slate-200 text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800 disabled:invisible"
diff --git a/frontend/src/pages/Admin/System/index.jsx b/frontend/src/pages/Admin/System/index.jsx
index 9fe4c7183..867276b0e 100644
--- a/frontend/src/pages/Admin/System/index.jsx
+++ b/frontend/src/pages/Admin/System/index.jsx
@@ -12,6 +12,7 @@ export default function AdminSystem() {
     enabled: false,
     limit: 10,
   });
+
   const handleSubmit = async (e) => {
     e.preventDefault();
     setSaving(true);
@@ -43,46 +44,35 @@ export default function AdminSystem() {
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
         <form
           onSubmit={handleSubmit}
           onChange={() => setHasChanges(true)}
-          className="flex w-full"
+          className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16"
         >
-          <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
-            <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
-              <div className="items-center flex gap-x-4">
-                <p className="text-2xl font-semibold text-white">
-                  System Preferences
-                </p>
-                {hasChanges && (
-                  <button
-                    type="submit"
-                    disabled={saving}
-                    className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
-                  >
-                    {saving ? "Saving..." : "Save changes"}
-                  </button>
-                )}
-              </div>
-              <p className="text-sm font-base text-white text-opacity-60">
-                These are the overall settings and configurations of your
-                instance.
+          <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
+            <div className="items-center">
+              <p className="text-lg leading-6 font-bold text-white">
+                System Preferences
               </p>
             </div>
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
+              These are the overall settings and configurations of your
+              instance.
+            </p>
+          </div>
 
-            <div className="my-5">
-              <div className="flex flex-col gap-y-2 mb-2.5">
-                <label className="leading-tight font-semibold text-white">
-                  Users can delete workspaces
-                </label>
-                <p className="leading-tight text-sm text-white text-opacity-60 w-96">
-                  Allow non-admin users to delete workspaces that they are a
-                  part of. This would delete the workspace for everyone.
-                </p>
-              </div>
-              <label className="relative inline-flex cursor-pointer items-center">
+          <div className="mt-6 mb-8">
+            <div className="flex flex-col gap-y-1">
+              <h2 className="text-base leading-6 font-bold text-white">
+                Users can delete workspaces
+              </h2>
+              <p className="text-xs leading-[18px] font-base text-white/60">
+                Allow non-admin users to delete workspaces that they are a part
+                of. This would delete the workspace for everyone.
+              </p>
+              <label className="relative inline-flex cursor-pointer items-center mt-2">
                 <input
                   type="checkbox"
                   name="users_can_delete_workspaces"
@@ -94,42 +84,44 @@ export default function AdminSystem() {
                 <span className="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300"></span>
               </label>
             </div>
+          </div>
 
-            <div className="my-4">
-              <div className="flex flex-col gap-y-2 mb-2.5">
-                <label className="leading-tight font-medium text-black dark:text-white">
-                  Limit messages per user per day
+          <div className="mb-8">
+            <div className="flex flex-col gap-y-1">
+              <h2 className="text-base leading-6 font-bold text-white">
+                Limit messages per user per day
+              </h2>
+              <p className="text-xs leading-[18px] font-base text-white/60">
+                Restrict non-admin users to a number of successful queries or
+                chats within a 24 hour window. Enable this to prevent users from
+                running up OpenAI costs.
+              </p>
+              <div className="mt-2">
+                <label className="relative inline-flex cursor-pointer items-center">
+                  <input
+                    type="checkbox"
+                    name="limit_user_messages"
+                    value="yes"
+                    checked={messageLimit.enabled}
+                    onChange={(e) => {
+                      setMessageLimit({
+                        ...messageLimit,
+                        enabled: e.target.checked,
+                      });
+                    }}
+                    className="peer sr-only"
+                  />
+                  <div className="pointer-events-none peer h-6 w-11 rounded-full bg-stone-400 after:absolute after:left-[2px] after:top-[2px] after:h-5 after:w-5 after:rounded-full after:shadow-xl after:border after:border-gray-600 after:bg-white after:box-shadow-md after:transition-all after:content-[''] peer-checked:bg-lime-300 peer-checked:after:translate-x-full peer-checked:after:border-white peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-800"></div>
+                  <span className="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300"></span>
                 </label>
-                <p className="leading-tight text-sm text-white text-opacity-60 w-96">
-                  Restrict non-admin users to a number of successful queries or
-                  chats within a 24 hour window. Enable this to prevent users
-                  from running up OpenAI costs.
-                </p>
               </div>
-              <label className="relative inline-flex cursor-pointer items-center">
-                <input
-                  type="checkbox"
-                  name="limit_user_messages"
-                  value="yes"
-                  checked={messageLimit.enabled}
-                  onChange={(e) => {
-                    setMessageLimit({
-                      ...messageLimit,
-                      enabled: e.target.checked,
-                    });
-                  }}
-                  className="peer sr-only"
-                />
-                <div className="pointer-events-none peer h-6 w-11 rounded-full bg-stone-400 after:absolute after:left-[2px] after:top-[2px] after:h-5 after:w-5 after:rounded-full after:shadow-xl after:border after:border-gray-600 after:bg-white after:box-shadow-md after:transition-all after:content-[''] peer-checked:bg-lime-300 peer-checked:after:translate-x-full peer-checked:after:border-white peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-800"></div>
-                <span className="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300"></span>
-              </label>
             </div>
             {messageLimit.enabled && (
-              <div className="mb-4">
-                <label className=" block flex items-center gap-x-1 font-medium text-black dark:text-white">
+              <div className="mt-4">
+                <label className="block text-sm font-medium text-white">
                   Message limit per day
                 </label>
-                <div className="relative">
+                <div className="relative mt-2">
                   <input
                     type="number"
                     name="message_limit"
@@ -143,12 +135,24 @@ export default function AdminSystem() {
                     value={messageLimit.limit}
                     min={1}
                     max={300}
-                    className="w-1/3 my-2 rounded-lg border border-stroke bg-transparent py-4 pl-6 pr-10 text-gray-800 dark:text-slate-200 outline-none focus:border-primary focus-visible:shadow-none dark:border-form-strokedark dark:bg-form-input dark:focus:border-primary"
+                    className="w-1/3 rounded-lg border border-stroke bg-transparent py-4 pl-6 pr-10 text-gray-800 dark:text-slate-200 outline-none focus:border-primary focus-visible:shadow-none dark:border-form-strokedark dark:bg-form-input dark:focus:border-primary"
                   />
                 </div>
               </div>
             )}
           </div>
+
+          {hasChanges && (
+            <div className="flex justify-start">
+              <button
+                type="submit"
+                disabled={saving}
+                className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
+              >
+                {saving ? "Saving..." : "Save changes"}
+              </button>
+            </div>
+          )}
         </form>
       </div>
     </div>
diff --git a/frontend/src/pages/Admin/Users/index.jsx b/frontend/src/pages/Admin/Users/index.jsx
index f9b067821..78d85c812 100644
--- a/frontend/src/pages/Admin/Users/index.jsx
+++ b/frontend/src/pages/Admin/Users/index.jsx
@@ -13,25 +13,26 @@ import ModalWrapper from "@/components/ModalWrapper";
 
 export default function AdminUsers() {
   const { isOpen, openModal, closeModal } = useModal();
+
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
-        <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+        <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">
-              <p className="text-2xl font-semibold text-white">Users</p>
+              <p className="text-lg leading-6 font-bold text-white">Users</p>
               <button
                 onClick={openModal}
-                className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
+                className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
               >
                 <UserPlus className="h-4 w-4" /> Add user
               </button>
             </div>
-            <p className="text-sm font-base text-white text-opacity-60">
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
               These are all the accounts which have an account on this instance.
               Removing an account will instantly remove their access to this
               instance.
@@ -51,6 +52,7 @@ function UsersContainer() {
   const { user: currUser } = useUser();
   const [loading, setLoading] = useState(true);
   const [users, setUsers] = useState([]);
+
   useEffect(() => {
     async function fetchUsers() {
       const _users = await Admin.users();
@@ -75,8 +77,8 @@ function UsersContainer() {
   }
 
   return (
-    <table className="md:w-3/4 w-full text-sm text-left rounded-lg mt-5">
-      <thead className="text-white text-opacity-80 text-sm font-bold uppercase border-white border-b border-opacity-60">
+    <table className="w-full text-sm text-left rounded-lg mt-6">
+      <thead className="text-white text-opacity-80 text-xs leading-[18px] font-bold uppercase border-white border-b border-opacity-60">
         <tr>
           <th scope="col" className="px-6 py-3 rounded-tl-lg">
             Username
@@ -120,7 +122,7 @@ const ROLE_HINT = {
 export function RoleHintDisplay({ role }) {
   return (
     <div className="flex flex-col gap-y-1 py-1 pb-4">
-      <p className="text-white/60 font-semibold text-sm">Permissions</p>
+      <p className="text-sm font-medium text-white">Permissions</p>
       <ul className="flex flex-col gap-y-1 list-disc px-4">
         {ROLE_HINT[role ?? "default"].map((hints, i) => {
           return (
diff --git a/frontend/src/pages/Admin/Workspaces/index.jsx b/frontend/src/pages/Admin/Workspaces/index.jsx
index fa612af12..0085c32b2 100644
--- a/frontend/src/pages/Admin/Workspaces/index.jsx
+++ b/frontend/src/pages/Admin/Workspaces/index.jsx
@@ -13,27 +13,28 @@ import ModalWrapper from "@/components/ModalWrapper";
 
 export default function AdminWorkspaces() {
   const { isOpen, openModal, closeModal } = useModal();
+
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
-        <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+        <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">
-              <p className="text-2xl font-semibold text-white">
-                Instance workspaces
+              <p className="text-lg leading-6 font-bold text-white">
+                Instance Workspaces
               </p>
               <button
                 onClick={openModal}
-                className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
+                className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
               >
                 <BookOpen className="h-4 w-4" /> New Workspace
               </button>
             </div>
-            <p className="text-sm font-base text-white text-opacity-60">
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
               These are all the workspaces that exist on this instance. Removing
               a workspace will delete all of it's associated chats and settings.
             </p>
@@ -80,8 +81,8 @@ function WorkspacesContainer() {
   }
 
   return (
-    <table className="md:w-3/4 w-full text-sm text-left rounded-lg mt-5">
-      <thead className="text-white text-opacity-80 text-sm font-bold uppercase border-white border-b border-opacity-60">
+    <table className="w-full text-sm text-left rounded-lg mt-6">
+      <thead className="text-white text-opacity-80 text-xs leading-[18px] font-bold uppercase border-white border-b border-opacity-60">
         <tr>
           <th scope="col" className="px-6 py-3 rounded-tl-lg">
             Name
diff --git a/frontend/src/pages/GeneralSettings/ApiKeys/index.jsx b/frontend/src/pages/GeneralSettings/ApiKeys/index.jsx
index 606dbf0f5..6df1d09dd 100644
--- a/frontend/src/pages/GeneralSettings/ApiKeys/index.jsx
+++ b/frontend/src/pages/GeneralSettings/ApiKeys/index.jsx
@@ -15,25 +15,26 @@ import { useModal } from "@/hooks/useModal";
 
 export default function AdminApiKeys() {
   const { isOpen, openModal, closeModal } = useModal();
+
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
-        <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+        <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">
-              <p className="text-2xl font-semibold text-white">API Keys</p>
+              <p className="text-lg leading-6 font-bold text-white">API Keys</p>
               <button
                 onClick={openModal}
-                className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
+                className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
               >
                 <PlusCircle className="h-4 w-4" /> Generate New API Key
               </button>
             </div>
-            <p className="text-sm font-base text-white text-opacity-60">
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
               API keys allow the holder to programmatically access and manage
               this AnythingLLM instance.
             </p>
@@ -41,7 +42,7 @@ export default function AdminApiKeys() {
               href={paths.apiDocs()}
               target="_blank"
               rel="noreferrer"
-              className="text-sm font-base text-blue-300 hover:underline"
+              className="text-xs leading-[18px] font-base text-blue-300 hover:underline"
             >
               Read the API documentation &rarr;
             </a>
@@ -59,11 +60,11 @@ export default function AdminApiKeys() {
 function ApiKeysContainer() {
   const [loading, setLoading] = useState(true);
   const [apiKeys, setApiKeys] = useState([]);
+
   useEffect(() => {
     async function fetchExistingKeys() {
       const user = userFromStorage();
       const Model = !!user ? Admin : System;
-
       const { apiKeys: foundKeys } = await Model.getApiKeys();
       setApiKeys(foundKeys);
       setLoading(false);
@@ -86,8 +87,8 @@ function ApiKeysContainer() {
   }
 
   return (
-    <table className="md:w-3/4 w-full text-sm text-left rounded-lg mt-5">
-      <thead className="text-white text-opacity-80 text-sm font-bold uppercase border-white border-b border-opacity-60">
+    <table className="w-full text-sm text-left rounded-lg mt-6">
+      <thead className="text-white text-opacity-80 text-xs leading-[18px] font-bold uppercase border-white border-b border-opacity-60">
         <tr>
           <th scope="col" className="px-6 py-3 rounded-tl-lg">
             API Key
diff --git a/frontend/src/pages/GeneralSettings/Appearance/CustomLogo/index.jsx b/frontend/src/pages/GeneralSettings/Appearance/CustomLogo/index.jsx
index 1e81f563c..8b2b5cab6 100644
--- a/frontend/src/pages/GeneralSettings/Appearance/CustomLogo/index.jsx
+++ b/frontend/src/pages/GeneralSettings/Appearance/CustomLogo/index.jsx
@@ -1,7 +1,7 @@
 import useLogo from "@/hooks/useLogo";
 import System from "@/models/system";
 import showToast from "@/utils/toast";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import AnythingLLM from "@/media/logo/anything-llm.png";
 import { Plus } from "@phosphor-icons/react";
 
@@ -9,6 +9,7 @@ export default function CustomLogo() {
   const { logo: _initLogo, setLogo: _setLogo } = useLogo();
   const [logo, setLogo] = useState("");
   const [isDefaultLogo, setIsDefaultLogo] = useState(true);
+  const fileInputRef = useRef(null);
 
   useEffect(() => {
     async function logoInit() {
@@ -62,61 +63,88 @@ export default function CustomLogo() {
     showToast("Image successfully removed.", "success");
   };
 
+  const triggerFileInputClick = () => {
+    fileInputRef.current?.click();
+  };
+
   return (
-    <div className="my-6">
-      <div className="flex flex-col gap-y-2">
-        <h2 className="leading-tight font-medium text-white">Custom Logo</h2>
-        <p className="text-sm font-base text-white/60">
+    <div className="mt-6 mb-8">
+      <div className="flex flex-col gap-y-1">
+        <h2 className="text-base leading-6 font-bold text-white">
+          Custom Logo
+        </h2>
+        <p className="text-xs leading-[18px] font-base text-white/60">
           Upload your custom logo to make your chatbot yours.
         </p>
       </div>
-      <div className="flex md:flex-row flex-col items-center">
-        <img
-          src={logo}
-          alt="Uploaded Logo"
-          className="w-48 h-48 object-contain mr-6"
-          hidden={isDefaultLogo}
-          onError={(e) => (e.target.src = AnythingLLM)}
-        />
-        <div className="flex flex-row gap-x-8">
-          <label
-            className="mt-5 transition-all duration-300 hover:opacity-60"
-            hidden={!isDefaultLogo}
-          >
-            <input
-              id="logo-upload"
-              type="file"
-              accept="image/*"
-              className="hidden"
-              onChange={handleFileUpload}
-            />
-            <div
-              className="w-80 py-4 bg-zinc-900/50 rounded-2xl border-2 border-dashed border-white border-opacity-60 justify-center items-center inline-flex cursor-pointer"
-              htmlFor="logo-upload"
+      {isDefaultLogo ? (
+        <div className="flex md:flex-row flex-col items-center">
+          <div className="flex flex-row gap-x-8">
+            <label
+              className="mt-3 transition-all duration-300 hover:opacity-60"
+              hidden={!isDefaultLogo}
             >
-              <div className="flex flex-col items-center justify-center">
-                <div className="rounded-full bg-white/40">
-                  <Plus className="w-6 h-6 text-black/80 m-2" />
-                </div>
-                <div className="text-white text-opacity-80 text-sm font-semibold py-1">
-                  Add a custom logo
-                </div>
-                <div className="text-white text-opacity-60 text-xs font-medium py-1">
-                  Recommended size: 800 x 200
+              <input
+                id="logo-upload"
+                type="file"
+                accept="image/*"
+                className="hidden"
+                onChange={handleFileUpload}
+              />
+              <div
+                className="w-80 py-4 bg-zinc-900/50 rounded-2xl border-2 border-dashed border-white border-opacity-60 justify-center items-center inline-flex cursor-pointer"
+                htmlFor="logo-upload"
+              >
+                <div className="flex flex-col items-center justify-center">
+                  <div className="rounded-full bg-white/40">
+                    <Plus className="w-6 h-6 text-black/80 m-2" />
+                  </div>
+                  <div className="text-white text-opacity-80 text-sm font-semibold py-1">
+                    Add a custom logo
+                  </div>
+                  <div className="text-white text-opacity-60 text-xs font-medium py-1">
+                    Recommended size: 800 x 200
+                  </div>
                 </div>
               </div>
-            </div>
-          </label>
-          {!isDefaultLogo && (
-            <button
-              onClick={handleRemoveLogo}
-              className="text-white text-base font-medium hover:text-opacity-60"
-            >
-              Delete
-            </button>
-          )}
+            </label>
+          </div>
         </div>
-      </div>
+      ) : (
+        <div className="flex md:flex-row flex-col items-center relative">
+          <div className="group w-80 h-[130px] mt-3 overflow-hidden">
+            <img
+              src={logo}
+              alt="Uploaded Logo"
+              className="w-full h-full object-cover border-2 border-white/20 border-dashed p-1 rounded-2xl"
+            />
+
+            <div className="absolute w-80 top-0 left-0 right-0 bottom-0 flex flex-col gap-y-3 justify-center items-center rounded-2xl mt-3 bg-black bg-opacity-80 opacity-0 group-hover:opacity-100 transition-opacity duration-300 ease-in-out border-2 border-transparent hover:border-white">
+              <button
+                onClick={triggerFileInputClick}
+                className="text-white text-base font-medium hover:text-opacity-60 mx-2"
+              >
+                Replace
+              </button>
+
+              <input
+                id="logo-upload"
+                type="file"
+                accept="image/*"
+                className="hidden"
+                onChange={handleFileUpload}
+                ref={fileInputRef}
+              />
+              <button
+                onClick={handleRemoveLogo}
+                className="text-white text-base font-medium hover:text-opacity-60 mx-2"
+              >
+                Remove
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }
diff --git a/frontend/src/pages/GeneralSettings/Appearance/CustomMessages/index.jsx b/frontend/src/pages/GeneralSettings/Appearance/CustomMessages/index.jsx
index 42df5b9dc..40043f15a 100644
--- a/frontend/src/pages/GeneralSettings/Appearance/CustomMessages/index.jsx
+++ b/frontend/src/pages/GeneralSettings/Appearance/CustomMessages/index.jsx
@@ -53,16 +53,16 @@ export default function CustomMessages() {
   };
 
   return (
-    <div className="mb-6">
-      <div className="flex flex-col gap-y-2">
-        <h2 className="leading-tight font-medium text-white">
+    <div className="mb-8">
+      <div className="flex flex-col gap-y-1">
+        <h2 className="text-base leading-6 font-bold text-white">
           Custom Messages
         </h2>
-        <p className="text-sm font-base text-white/60">
+        <p className="text-xs leading-[18px] font-base text-white/60">
           Customize the automatic messages displayed to your users.
         </p>
       </div>
-      <div className="mt-6 flex flex-col gap-y-6 bg-zinc-900 rounded-lg px-6 pt-4 max-w-[700px]">
+      <div className="mt-3 flex flex-col gap-y-6 bg-[#1C1E21] rounded-lg pr-[31px] pl-[12px] pt-4 max-w-[700px]">
         {messages.map((message, index) => (
           <div key={index} className="flex flex-col gap-y-2">
             {message.user && (
@@ -85,27 +85,34 @@ export default function CustomMessages() {
             )}
           </div>
         ))}
-        <div className="flex gap-4 mt-12 justify-between pb-7">
+        <div className="flex gap-4 mt-12 justify-between pb-[15px]">
           <button
             className="self-end text-white hover:text-white/60 transition"
             onClick={() => addMessage("response")}
           >
-            <div className="flex items-center justify-start">
-              <Plus className="w-5 h-5 m-2" weight="fill" /> New System Message
+            <div className="flex items-center justify-start text-sm font-normal -ml-2">
+              <Plus className="m-2" size={16} weight="bold" />
+              <span className="leading-5">
+                New <span className="font-bold italic mr-1">system</span>{" "}
+                message
+              </span>
             </div>
           </button>
           <button
-            className="self-end text-sky-400 hover:text-sky-400/60 transition"
+            className="self-end text-white hover:text-white/60 transition"
             onClick={() => addMessage("user")}
           >
-            <div className="flex items-center">
-              <Plus className="w-5 h-5 m-2" weight="fill" /> New User Message
+            <div className="flex items-center justify-start text-sm font-normal">
+              <Plus className="m-2" size={16} weight="bold" />
+              <span className="leading-5">
+                New <span className="font-bold italic mr-1">user</span> message
+              </span>
             </div>
           </button>
         </div>
       </div>
       {hasChanges && (
-        <div className="flex justify-center py-6">
+        <div className="flex justify-start pt-6">
           <button
             className="transition-all duration-300 border border-slate-200 px-4 py-2 rounded-lg text-white text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800 focus:ring-gray-800"
             onClick={handleMessageSave}
diff --git a/frontend/src/pages/GeneralSettings/Appearance/FooterCustomization/NewIconForm/index.jsx b/frontend/src/pages/GeneralSettings/Appearance/FooterCustomization/NewIconForm/index.jsx
index 0bbc64efe..51284bfa4 100644
--- a/frontend/src/pages/GeneralSettings/Appearance/FooterCustomization/NewIconForm/index.jsx
+++ b/frontend/src/pages/GeneralSettings/Appearance/FooterCustomization/NewIconForm/index.jsx
@@ -1,11 +1,20 @@
 import { ICON_COMPONENTS } from "@/components/Footer";
 import React, { useEffect, useRef, useState } from "react";
+import { Plus, X } from "@phosphor-icons/react";
 
-export default function NewIconForm({ handleSubmit, showing }) {
-  const [selectedIcon, setSelectedIcon] = useState("Info");
+export default function NewIconForm({ icon, url, onSave, onRemove }) {
+  const [selectedIcon, setSelectedIcon] = useState(icon || "Plus");
+  const [selectedUrl, setSelectedUrl] = useState(url || "");
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+  const [isEdited, setIsEdited] = useState(false);
   const dropdownRef = useRef(null);
 
+  useEffect(() => {
+    setSelectedIcon(icon || "Plus");
+    setSelectedUrl(url || "");
+    setIsEdited(false);
+  }, [icon, url]);
+
   useEffect(() => {
     function handleClickOutside(event) {
       if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
@@ -17,82 +26,90 @@ export default function NewIconForm({ handleSubmit, showing }) {
     return () => document.removeEventListener("mousedown", handleClickOutside);
   }, [dropdownRef]);
 
-  if (!showing) return null;
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    if (selectedIcon !== "Plus" && selectedUrl) {
+      onSave(selectedIcon, selectedUrl);
+      setIsEdited(false);
+    }
+  };
+
+  const handleRemove = () => {
+    onRemove();
+    setSelectedIcon("Plus");
+    setSelectedUrl("");
+    setIsEdited(false);
+  };
+
+  const handleIconChange = (iconName) => {
+    setSelectedIcon(iconName);
+    setIsDropdownOpen(false);
+    setIsEdited(true);
+  };
+
+  const handleUrlChange = (e) => {
+    setSelectedUrl(e.target.value);
+    setIsEdited(true);
+  };
+
   return (
-    <form onSubmit={handleSubmit} className="flex justify-start">
-      <div className="mt-6 mb-6 flex flex-col bg-zinc-900 rounded-lg px-6 py-4">
-        <div className="flex gap-x-4 items-center">
-          <div
-            className="relative flex flex-col items-center gap-y-4"
-            ref={dropdownRef}
-          >
-            <input type="hidden" name="icon" value={selectedIcon} />
-            <label className="text-sm font-medium text-white">Icon</label>
+    <form onSubmit={handleSubmit} className="flex items-center gap-x-1.5">
+      <div className="relative" ref={dropdownRef}>
+        <div
+          className="h-[34px] w-[34px] bg-[#1C1E21] rounded-full flex items-center justify-center cursor-pointer"
+          onClick={() => setIsDropdownOpen(!isDropdownOpen)}
+        >
+          {React.createElement(ICON_COMPONENTS[selectedIcon] || Plus, {
+            className: "h-5 w-5 text-white",
+            weight: selectedIcon === "Plus" ? "bold" : "fill",
+          })}
+        </div>
+        {isDropdownOpen && (
+          <div className="absolute z-10 grid grid-cols-4 bg-[#41444C] mt-2 rounded-md w-[150px] h-[78px] overflow-y-auto border border-white/20 shadow-lg">
+            {Object.keys(ICON_COMPONENTS).map((iconName) => (
+              <button
+                key={iconName}
+                type="button"
+                className="flex justify-center items-center border border-transparent hover:bg-[#1C1E21] hover:border-slate-100 rounded-full p-2"
+                onClick={() => handleIconChange(iconName)}
+              >
+                {React.createElement(ICON_COMPONENTS[iconName], {
+                  className: "h-5 w-5 text-white",
+                  weight: "fill",
+                })}
+              </button>
+            ))}
+          </div>
+        )}
+      </div>
+      <input
+        type="url"
+        value={selectedUrl}
+        onChange={handleUrlChange}
+        placeholder="https://example.com"
+        className="bg-zinc-900 text-white placeholder-white/20 text-sm rounded-md p-2.5 w-[300px] h-[32px]"
+        required
+      />
+      {selectedIcon !== "Plus" && (
+        <>
+          {isEdited ? (
+            <button
+              type="submit"
+              className="text-sky-400 px-2 py-2 rounded-md text-sm font-bold hover:text-sky-500"
+            >
+              Save
+            </button>
+          ) : (
             <button
               type="button"
-              className={`${
-                isDropdownOpen
-                  ? "bg-menu-item-selected-gradient border-slate-100/50"
-                  : ""
-              }border-transparent transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border`}
-              onClick={(e) => {
-                e.preventDefault();
-                setIsDropdownOpen(!isDropdownOpen);
-              }}
+              onClick={handleRemove}
+              className="hover:text-red-500 text-white/80 px-2 py-2 rounded-md text-sm font-bold"
             >
-              {React.createElement(ICON_COMPONENTS[selectedIcon], {
-                className: "h-5 w-5 text-white",
-                weight: "fill",
-              })}
+              <X size={20} />
             </button>
-            {isDropdownOpen && (
-              <div className="absolute z-10 grid grid-cols-4 gap-4 bg-zinc-800 -mt-20 ml-44 p-1 rounded-md w-56 h-28 overflow-y-auto border border-slate-100/10">
-                {Object.keys(ICON_COMPONENTS).map((iconName) => (
-                  <button
-                    key={iconName}
-                    type="button"
-                    className="flex justify-center items-center border border-transparent hover:bg-menu-item-selected-gradient hover:border-slate-100 rounded-full"
-                    onClick={() => {
-                      setSelectedIcon(iconName);
-                      setIsDropdownOpen(false);
-                    }}
-                  >
-                    {React.createElement(ICON_COMPONENTS[iconName], {
-                      className: "h-5 w-5 text-white m-2.5",
-                      weight: "fill",
-                    })}
-                  </button>
-                ))}
-              </div>
-            )}
-          </div>
-          <div className="flex flex-col gap-y-4">
-            <label className="text-sm font-medium text-white">Link</label>
-            <input
-              type="url"
-              name="url"
-              required={true}
-              placeholder="https://example.com"
-              className="bg-sidebar text-white placeholder:text-white/20 rounded-md p-2"
-            />
-          </div>
-          {selectedIcon !== "" && (
-            <div className="flex flex-col gap-y-4">
-              <label className="text-sm font-medium text-white invisible">
-                Submit
-              </label>
-              <div className="flex justify-center">
-                <button
-                  type="submit"
-                  className="transition-all duration-300 border border-slate-200 px-4 py-2 rounded-lg text-white text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800 focus:ring-gray-800"
-                >
-                  Save
-                </button>
-              </div>
-            </div>
           )}
-        </div>
-      </div>
+        </>
+      )}
     </form>
   );
 }
diff --git a/frontend/src/pages/GeneralSettings/Appearance/FooterCustomization/index.jsx b/frontend/src/pages/GeneralSettings/Appearance/FooterCustomization/index.jsx
index ee94e7c34..bd78861a7 100644
--- a/frontend/src/pages/GeneralSettings/Appearance/FooterCustomization/index.jsx
+++ b/frontend/src/pages/GeneralSettings/Appearance/FooterCustomization/index.jsx
@@ -1,36 +1,37 @@
 import React, { useState, useEffect } from "react";
 import showToast from "@/utils/toast";
-import { Plus, X } from "@phosphor-icons/react";
-import { ICON_COMPONENTS, MAX_ICONS } from "@/components/Footer";
 import { safeJsonParse } from "@/utils/request";
 import NewIconForm from "./NewIconForm";
 import Admin from "@/models/admin";
 import System from "@/models/system";
 
 export default function FooterCustomization() {
-  const [loading, setLoading] = useState(true);
-  const [footerIcons, setFooterIcons] = useState([]);
-  const [showForm, setShowForm] = useState(false);
+  const [footerIcons, setFooterIcons] = useState(Array(3).fill(null));
 
   useEffect(() => {
     async function fetchFooterIcons() {
       const settings = (await Admin.systemPreferences())?.settings;
       if (settings && settings.footer_data) {
-        setFooterIcons(safeJsonParse(settings.footer_data, []));
+        const parsedIcons = safeJsonParse(settings.footer_data, []);
+        setFooterIcons((prevIcons) => {
+          const updatedIcons = [...prevIcons];
+          parsedIcons.forEach((icon, index) => {
+            updatedIcons[index] = icon;
+          });
+          return updatedIcons;
+        });
       }
-      setLoading(false);
     }
     fetchFooterIcons();
   }, []);
 
-  const removeFooterIcon = async (index) => {
-    const updatedIcons = footerIcons.filter((_, i) => i !== index);
+  const updateFooterIcons = async (updatedIcons) => {
     const { success, error } = await Admin.updateSystemPreferences({
-      footer_data: JSON.stringify(updatedIcons),
+      footer_data: JSON.stringify(updatedIcons.filter((icon) => icon !== null)),
     });
 
     if (!success) {
-      showToast(`Failed to remove footer icon - ${error}`, "error", {
+      showToast(`Failed to update footer icons - ${error}`, "error", {
         clear: true,
       });
       return;
@@ -38,103 +39,44 @@ export default function FooterCustomization() {
 
     window.localStorage.removeItem(System.cacheKeys.footerIcons);
     setFooterIcons(updatedIcons);
-    showToast("Successfully removed footer icon.", "success", { clear: true });
+    showToast("Successfully updated footer icons.", "success", { clear: true });
   };
 
-  const onSubmit = async (e) => {
-    e.preventDefault();
-    const form = new FormData(e.target);
-    const icon = form.get("icon");
-    const url = form.get("url");
-
-    const newIcon = { icon, url };
-    setFooterIcons([...footerIcons, newIcon]);
-
-    const { success, error } = await Admin.updateSystemPreferences({
-      footer_data: JSON.stringify([...footerIcons, newIcon]),
-    });
-
-    if (!success) {
-      showToast(`Failed to add footer icon - ${error}`, "error", {
-        clear: true,
-      });
-      return;
-    }
-    window.localStorage.removeItem(System.cacheKeys.footerIcons);
-
-    setShowForm(false);
-    showToast("Successfully added footer icon.", "success", { clear: true });
+  const handleRemoveIcon = (index) => {
+    const updatedIcons = [...footerIcons];
+    updatedIcons[index] = null;
+    updateFooterIcons(updatedIcons);
   };
 
   return (
-    <div className="mb-6">
-      <div className="flex flex-col gap-y-2">
-        <h2 className="leading-tight font-medium text-white">
+    <div className="mb-8">
+      <div className="flex flex-col gap-y-1">
+        <h2 className="text-base leading-6 font-bold text-white">
           Custom Footer Icons
         </h2>
-        <p className="text-sm font-base text-white/60">
+        <p className="text-xs leading-[18px] font-base text-white/60">
           Customize the footer icons displayed on the bottom of the sidebar.
         </p>
       </div>
-      <CurrentIcons footerIcons={footerIcons} remove={removeFooterIcon} />
-      <NewIconForm
-        handleSubmit={onSubmit}
-        showing={footerIcons.length < MAX_ICONS && showForm}
-      />
-      <div hidden={!(!showForm && footerIcons.length < MAX_ICONS) || loading}>
-        <div className="flex gap-2 mt-6">
-          <button
-            onClick={() => setShowForm(true)}
-            className="flex gap-x-2 items-center justify-center text-white text-sm hover:text-sky-400 transition-all duration-300"
-          >
-            Add new footer icon
-            <Plus className="" size={24} weight="fill" />
-          </button>
-        </div>
+      <div className="mt-3 flex gap-x-3 font-bold text-white text-sm">
+        <div>Icon</div>
+        <div>Link</div>
+      </div>
+      <div className="mt-2 flex flex-col gap-y-[10px]">
+        {footerIcons.map((icon, index) => (
+          <NewIconForm
+            key={index}
+            icon={icon?.icon}
+            url={icon?.url}
+            onSave={(newIcon, newUrl) => {
+              const updatedIcons = [...footerIcons];
+              updatedIcons[index] = { icon: newIcon, url: newUrl };
+              updateFooterIcons(updatedIcons);
+            }}
+            onRemove={() => handleRemoveIcon(index)}
+          />
+        ))}
       </div>
     </div>
   );
 }
-
-function CurrentIcons({ footerIcons, remove }) {
-  if (footerIcons.length === 0) return null;
-  return (
-    <div className="flex flex-col w-fit gap-y-2 mt-4">
-      {footerIcons.map((icon, index) => (
-        <div
-          key={index}
-          className="flex items-center justify-between bg-zinc-900 p-2 rounded-md gap-x-4"
-        >
-          <div className="flex items-center gap-x-2">
-            <IconPreview symbol={icon.icon} disabled={true} />
-            <span className="text-white/60">{icon.url}</span>
-          </div>
-
-          <button
-            type="button"
-            className="transition-all duration-300 text-neutral-700 bg-transparent rounded-full hover:bg-zinc-600 hover:border-zinc-600 hover:text-white border-transparent border shadow-lg mr-2"
-            onClick={() => remove(index)}
-          >
-            <X className="m-[1px]" size={20} />
-          </button>
-        </div>
-      ))}
-    </div>
-  );
-}
-
-const IconPreview = ({ symbol, disabled = false }) => {
-  const IconComponent = ICON_COMPONENTS.hasOwnProperty(symbol)
-    ? ICON_COMPONENTS[symbol]
-    : ICON_COMPONENTS.Info;
-
-  return (
-    <button
-      type="button"
-      disabled={disabled}
-      className="disabled:pointer-events-none border-transparent transition-all duration-300 p-2 rounded-full text-white bg-sidebar-button hover:bg-menu-item-selected-gradient hover:border-slate-100 hover:border-opacity-50 border mx-1"
-    >
-      <IconComponent className="h-5 w-5 text-white" weight="fill" />
-    </button>
-  );
-};
diff --git a/frontend/src/pages/GeneralSettings/Appearance/SupportEmail/index.jsx b/frontend/src/pages/GeneralSettings/Appearance/SupportEmail/index.jsx
index 5ccbec8cd..8a50c73f9 100644
--- a/frontend/src/pages/GeneralSettings/Appearance/SupportEmail/index.jsx
+++ b/frontend/src/pages/GeneralSettings/Appearance/SupportEmail/index.jsx
@@ -53,9 +53,11 @@ export default function SupportEmail() {
   if (loading || !user?.role) return null;
   return (
     <form className="mb-6" onSubmit={updateSupportEmail}>
-      <div className="flex flex-col gap-y-2">
-        <h2 className="leading-tight font-medium text-white">Support Email</h2>
-        <p className="text-sm font-base text-white/60">
+      <div className="flex flex-col gap-y-1">
+        <h2 className="text-base leading-6 font-bold text-white">
+          Support Email
+        </h2>
+        <p className="text-xs leading-[18px] font-base text-white/60">
           Set the support email address that shows up in the user menu while
           logged into this instance.
         </p>
@@ -64,7 +66,7 @@ export default function SupportEmail() {
         <input
           name="supportEmail"
           type="email"
-          className="bg-zinc-900 mt-4 text-white placeholder:text-white/20 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 max-w-[275px]"
+          className="bg-zinc-900 mt-3 text-white text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 max-w-[275px] placeholder:text-white/20"
           placeholder="support@mycompany.com"
           required={true}
           autoComplete="off"
diff --git a/frontend/src/pages/GeneralSettings/Appearance/index.jsx b/frontend/src/pages/GeneralSettings/Appearance/index.jsx
index c2311a2c3..bb2c79896 100644
--- a/frontend/src/pages/GeneralSettings/Appearance/index.jsx
+++ b/frontend/src/pages/GeneralSettings/Appearance/index.jsx
@@ -11,16 +11,16 @@ export default function Appearance() {
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
-        <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+        <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
-            <div className="items-center flex gap-x-4">
-              <p className="text-2xl font-semibold text-white">
-                Appearance Settings
+            <div className="items-center">
+              <p className="text-lg leading-6 font-bold text-white">
+                Appearance
               </p>
             </div>
-            <p className="text-sm font-base text-white text-opacity-60">
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
               Customize the appearance settings of your platform.
             </p>
           </div>
diff --git a/frontend/src/pages/GeneralSettings/Chats/index.jsx b/frontend/src/pages/GeneralSettings/Chats/index.jsx
index 5afde115d..e5da1a888 100644
--- a/frontend/src/pages/GeneralSettings/Chats/index.jsx
+++ b/frontend/src/pages/GeneralSettings/Chats/index.jsx
@@ -7,7 +7,7 @@ import useQuery from "@/hooks/useQuery";
 import ChatRow from "./ChatRow";
 import showToast from "@/utils/toast";
 import System from "@/models/system";
-import { CaretDown } from "@phosphor-icons/react";
+import { CaretDown, Download } from "@phosphor-icons/react";
 import { saveAs } from "file-saver";
 
 const exportOptions = {
@@ -47,11 +47,9 @@ const exportOptions = {
 
 export default function WorkspaceChats() {
   const [showMenu, setShowMenu] = useState(false);
-  const [exportType, setExportType] = useState("jsonl");
   const menuRef = useRef();
   const openMenuButton = useRef();
-
-  const handleDumpChats = async () => {
+  const handleDumpChats = async (exportType) => {
     const chats = await System.exportChats(exportType);
     if (!!chats) {
       const { name, mimeType, fileExtension, filenameFunc } =
@@ -90,56 +88,48 @@ export default function WorkspaceChats() {
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
-        <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+        <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
-            <div className="items-center flex gap-x-4">
-              <p className="text-2xl font-semibold text-white">
+            <div className="flex gap-x-4 items-center">
+              <p className="text-lg leading-6 font-bold text-white">
                 Workspace Chats
               </p>
-              <div className="flex gap-x-1 relative">
-                <button
-                  onClick={handleDumpChats}
-                  className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
-                >
-                  Export as {exportOptions[exportType].name}
-                </button>
+              <div className="relative">
                 <button
                   ref={openMenuButton}
                   onClick={toggleMenu}
-                  className={`transition-all duration-300 border border-slate-200 p-1 rounded-lg text-slate-200 text-sm items-center flex hover:bg-slate-200 hover:text-slate-800 ${
-                    showMenu ? "bg-slate-200 text-slate-800" : ""
-                  }`}
+                  className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
                 >
-                  <CaretDown weight="bold" className="h-4 w-4" />
+                  <Download size={18} weight="bold" />
+                  Export
+                  <CaretDown size={18} weight="bold" />
                 </button>
                 <div
                   ref={menuRef}
                   className={`${
                     showMenu ? "slide-down" : "slide-up hidden"
-                  } z-20 w-fit rounded-lg absolute top-full right-0 bg-sidebar p-4 flex items-center justify-center mt-2`}
+                  } z-20 w-fit rounded-lg absolute top-full right-0 bg-[#2C2F36] mt-2 shadow-md`}
                 >
-                  <div className="flex flex-col gap-y-2">
-                    {Object.entries(exportOptions)
-                      .filter(([type, _]) => type !== exportType)
-                      .map(([key, data]) => (
-                        <button
-                          key={key}
-                          onClick={() => {
-                            setExportType(key);
-                            setShowMenu(false);
-                          }}
-                          className="text-white hover:bg-slate-200/20 w-full text-left px-4 py-1.5 rounded-md"
-                        >
-                          {data.name}
-                        </button>
-                      ))}
+                  <div className="py-2">
+                    {Object.entries(exportOptions).map(([key, data]) => (
+                      <button
+                        key={key}
+                        onClick={() => {
+                          handleDumpChats(key);
+                          setShowMenu(false);
+                        }}
+                        className="w-full text-left px-4 py-2 text-white text-sm hover:bg-[#3D4147]"
+                      >
+                        {data.name}
+                      </button>
+                    ))}
                   </div>
                 </div>
               </div>
             </div>
-            <p className="text-sm font-base text-white text-opacity-60">
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
               These are all the recorded chats and messages that have been sent
               by users ordered by their creation date.
             </p>
@@ -195,8 +185,8 @@ function ChatsContainer() {
 
   return (
     <>
-      <table className="md:w-3/4 w-full text-sm text-left rounded-lg mt-5">
-        <thead className="text-white text-opacity-80 text-sm font-bold uppercase border-white border-b border-opacity-60">
+      <table className="w-full text-sm text-left rounded-lg mt-6">
+        <thead className="text-white text-opacity-80 text-xs leading-[18px] font-bold uppercase border-white border-b border-opacity-60">
           <tr>
             <th scope="col" className="px-6 py-3 rounded-tl-lg">
               Id
@@ -228,7 +218,7 @@ function ChatsContainer() {
             ))}
         </tbody>
       </table>
-      <div className="flex w-full justify-between items-center">
+      <div className="flex w-full justify-between items-center mt-6">
         <button
           onClick={handlePrevious}
           className="px-4 py-2 rounded-lg border border-slate-200 text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800 disabled:invisible"
diff --git a/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Github/index.jsx b/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Github/index.jsx
index 8a1c25a68..1366ec1c9 100644
--- a/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Github/index.jsx
+++ b/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Github/index.jsx
@@ -67,19 +67,19 @@ export default function GithubConnectorSetup() {
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
         <div className="flex w-full">
-          <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
-            <div className="flex w-full gap-x-4 items-center  pb-6 border-white border-b-2 border-opacity-10">
+          <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
+            <div className="flex w-full gap-x-4 items-center pb-6 border-white border-b-2 border-opacity-10">
               <img src={image} alt="Github" className="rounded-lg h-16 w-16" />
               <div className="w-full flex flex-col gap-y-1">
-                <div className="items-center flex gap-x-4">
-                  <p className="text-2xl font-semibold text-white">
+                <div className="items-center">
+                  <p className="text-lg leading-6 font-bold text-white">
                     Import GitHub Repository
                   </p>
                 </div>
-                <p className="text-sm font-base text-white text-opacity-60">
+                <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
                   Import all files from a public or private Github repository
                   and have its files be available in your workspace.
                 </p>
@@ -88,7 +88,7 @@ export default function GithubConnectorSetup() {
 
             <form className="w-full" onSubmit={handleSubmit}>
               {!accessToken && (
-                <div className="flex flex-col gap-y-1 py-4 ">
+                <div className="flex flex-col gap-y-1 py-4">
                   <div className="flex flex-col w-fit gap-y-2 bg-blue-600/20 rounded-lg px-4 py-2">
                     <div className="flex items-center gap-x-2">
                       <Info size={20} className="shrink-0 text-blue-400" />
diff --git a/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Youtube/index.jsx b/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Youtube/index.jsx
index 9c8588d3d..053c5630f 100644
--- a/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Youtube/index.jsx
+++ b/frontend/src/pages/GeneralSettings/DataConnectors/Connectors/Youtube/index.jsx
@@ -48,19 +48,19 @@ export default function YouTubeTranscriptConnectorSetup() {
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
         <div className="flex w-full">
-          <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
-            <div className="flex w-full gap-x-4 items-center  pb-6 border-white border-b-2 border-opacity-10">
+          <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
+            <div className="flex w-full gap-x-4 items-center pb-6 border-white border-b-2 border-opacity-10">
               <img src={image} alt="YouTube" className="rounded-lg h-16 w-16" />
               <div className="w-full flex flex-col gap-y-1">
-                <div className="items-center flex gap-x-4">
-                  <p className="text-2xl font-semibold text-white">
+                <div className="items-center">
+                  <p className="text-lg leading-6 font-bold text-white">
                     Import YouTube transcription
                   </p>
                 </div>
-                <p className="text-sm font-base text-white text-opacity-60">
+                <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
                   From a youtube link, import the entire transcript of that
                   video for embedding.
                 </p>
diff --git a/frontend/src/pages/GeneralSettings/DataConnectors/index.jsx b/frontend/src/pages/GeneralSettings/DataConnectors/index.jsx
index e3bfa642a..65da9b33c 100644
--- a/frontend/src/pages/GeneralSettings/DataConnectors/index.jsx
+++ b/frontend/src/pages/GeneralSettings/DataConnectors/index.jsx
@@ -9,26 +9,31 @@ export default function DataConnectors() {
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
         <div className="flex w-full">
-          <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+          <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
             <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
-              <div className="items-center flex gap-x-4">
-                <p className="text-2xl font-semibold text-white">
+              <div className="items-center">
+                <p className="text-lg leading-6 font-bold text-white">
                   Data Connectors
                 </p>
               </div>
-              <p className="text-sm font-base text-white text-opacity-60">
+              <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
                 Verified data connectors allow you to add more content to your
                 AnythingLLM workspaces with no custom code or complexity.
                 <br />
                 Guaranteed to work with your AnythingLLM instance.
               </p>
             </div>
-            <div className="py-4 w-full flex md:flex-wrap overflow-x-scroll gap-4 max-w-full">
-              <DataConnectorOption slug="github" />
-              <DataConnectorOption slug="youtube-transcript" />
+            <div className="text-sm font-medium text-white mt-6 mb-4">
+              Available Data Connectors
+            </div>
+            <div className="w-full">
+              <div className="py-4 w-full flex md:flex-wrap overflow-x-scroll gap-4 max-w-full">
+                <DataConnectorOption slug="github" />
+                <DataConnectorOption slug="youtube-transcript" />
+              </div>
             </div>
           </div>
         </div>
diff --git a/frontend/src/pages/GeneralSettings/EmbedChats/index.jsx b/frontend/src/pages/GeneralSettings/EmbedChats/index.jsx
index d6079f391..a2605154f 100644
--- a/frontend/src/pages/GeneralSettings/EmbedChats/index.jsx
+++ b/frontend/src/pages/GeneralSettings/EmbedChats/index.jsx
@@ -14,14 +14,16 @@ export default function EmbedChats() {
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
-        <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+        <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
-            <div className="items-center flex gap-x-4">
-              <p className="text-2xl font-semibold text-white">Embed Chats</p>
+            <div className="flex gap-x-4 items-center">
+              <p className="text-lg leading-6 font-bold text-white">
+                Embed Chats
+              </p>
             </div>
-            <p className="text-sm font-base text-white text-opacity-60">
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
               These are all the recorded chats and messages from any embed that
               you have published.
             </p>
diff --git a/frontend/src/pages/GeneralSettings/EmbedConfigs/index.jsx b/frontend/src/pages/GeneralSettings/EmbedConfigs/index.jsx
index 73a2ca6db..a46a9d5e0 100644
--- a/frontend/src/pages/GeneralSettings/EmbedConfigs/index.jsx
+++ b/frontend/src/pages/GeneralSettings/EmbedConfigs/index.jsx
@@ -12,27 +12,28 @@ import Embed from "@/models/embed";
 
 export default function EmbedConfigs() {
   const { isOpen, openModal, closeModal } = useModal();
+
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
       <Sidebar />
       <div
         style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-        className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+        className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
       >
-        <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+        <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
           <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
             <div className="items-center flex gap-x-4">
-              <p className="text-2xl font-semibold text-white">
+              <p className="text-lg leading-6 font-bold text-white">
                 Embeddable Chat Widgets
               </p>
               <button
                 onClick={openModal}
-                className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
+                className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
               >
                 <CodeBlock className="h-4 w-4" /> Create embed
               </button>
             </div>
-            <p className="text-sm font-base text-white text-opacity-60">
+            <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
               Embeddable chat widgets are public facing chat interfaces that are
               tied to a single workspace. These allow you to build workspaces
               that then you can publish to the world.
@@ -51,6 +52,7 @@ export default function EmbedConfigs() {
 function EmbedContainer() {
   const [loading, setLoading] = useState(true);
   const [embeds, setEmbeds] = useState([]);
+
   useEffect(() => {
     async function fetchUsers() {
       const _embeds = await Embed.embeds();
@@ -75,8 +77,8 @@ function EmbedContainer() {
   }
 
   return (
-    <table className="md:w-3/4 w-full text-sm text-left rounded-lg mt-5">
-      <thead className="text-white text-opacity-80 text-sm font-bold uppercase border-white border-b border-opacity-60">
+    <table className="w-full text-sm text-left rounded-lg mt-6">
+      <thead className="text-white text-opacity-80 text-xs leading-[18px] font-bold uppercase border-white border-b border-opacity-60">
         <tr>
           <th scope="col" className="px-6 py-3 rounded-tl-lg">
             Workspace
diff --git a/frontend/src/pages/GeneralSettings/EmbeddingPreference/index.jsx b/frontend/src/pages/GeneralSettings/EmbeddingPreference/index.jsx
index 2e400ad63..77204c3cb 100644
--- a/frontend/src/pages/GeneralSettings/EmbeddingPreference/index.jsx
+++ b/frontend/src/pages/GeneralSettings/EmbeddingPreference/index.jsx
@@ -128,18 +128,11 @@ export default function GeneralEmbeddingPreference() {
 
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      <ModalWrapper isOpen={isOpen}>
-        <ChangeWarningModal
-          warningText="Switching the vector database will ignore previously embedded documents and future similarity search results. They will need to be re-added to each workspace."
-          onClose={closeModal}
-          onConfirm={handleSaveSettings}
-        />
-      </ModalWrapper>
       <Sidebar />
       {loading ? (
         <div
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-          className="relative md:ml-[2px] md:mr-[8px] md:my-[16px] md:rounded-[26px] bg-main-gradient p-[18px] h-full overflow-y-scroll animate-pulse border-4 border-accent"
+          className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
         >
           <div className="w-full h-full flex justify-center items-center">
             <PreLoader />
@@ -148,30 +141,30 @@ export default function GeneralEmbeddingPreference() {
       ) : (
         <div
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-          className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
+          className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
         >
           <form
             id="embedding-form"
             onSubmit={handleSubmit}
             className="flex w-full"
           >
-            <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+            <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
               <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
-                <div className="items-center flex gap-x-4">
-                  <p className="text-2xl font-semibold text-white">
+                <div className="flex gap-x-4 items-center">
+                  <p className="text-lg leading-6 font-bold text-white">
                     Embedding Preference
                   </p>
                   {hasChanges && (
                     <button
                       type="submit"
                       disabled={saving}
-                      className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
+                      className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
                     >
                       {saving ? "Saving..." : "Save changes"}
                     </button>
                   )}
                 </div>
-                <p className="text-sm font-base text-white text-opacity-60">
+                <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
                   When using an LLM that does not natively support an embedding
                   engine - you may need to additionally specify credentials to
                   for embedding text.
@@ -181,63 +174,67 @@ export default function GeneralEmbeddingPreference() {
                   format which AnythingLLM can use to process.
                 </p>
               </div>
-
-              <>
-                <div className="text-white text-sm font-medium py-4">
-                  Embedding Providers
-                </div>
-                <div className="w-full">
-                  <div className="w-full relative border-slate-300/20 shadow border-4 rounded-xl text-white">
-                    <div className="w-full p-4 absolute top-0 rounded-t-lg backdrop-blur-sm">
-                      <div className="w-full flex items-center sticky top-0 z-20">
-                        <MagnifyingGlass
-                          size={16}
-                          weight="bold"
-                          className="absolute left-4 z-30 text-white"
-                        />
-                        <input
-                          type="text"
-                          placeholder="Search Embedding providers"
-                          className="bg-zinc-600 z-20 pl-10 h-[38px] rounded-full w-full px-4 py-1 text-sm border-2 border-slate-300/40 outline-none focus:border-white text-white"
-                          onChange={(e) => setSearchQuery(e.target.value)}
-                          autoComplete="off"
-                          onKeyDown={(e) => {
-                            if (e.key === "Enter") e.preventDefault();
-                          }}
-                        />
-                      </div>
-                    </div>
-                    <div className="px-4 pt-[70px] flex flex-col gap-y-1 max-h-[390px] overflow-y-auto no-scroll pb-4">
-                      {filteredEmbedders.map((embedder) => {
-                        return (
-                          <EmbedderItem
-                            key={embedder.name}
-                            name={embedder.name}
-                            value={embedder.value}
-                            image={embedder.logo}
-                            description={embedder.description}
-                            checked={selectedEmbedder === embedder.value}
-                            onClick={() => updateChoice(embedder.value)}
-                          />
-                        );
-                      })}
+              <div className="text-sm font-medium text-white mt-6 mb-4">
+                Embedding Providers
+              </div>
+              <div className="w-full">
+                <div className="w-full relative border-slate-300/20 shadow border-4 rounded-xl text-white">
+                  <div className="w-full p-4 absolute top-0 rounded-t-lg backdrop-blur-sm">
+                    <div className="w-full flex items-center sticky top-0">
+                      <MagnifyingGlass
+                        size={16}
+                        weight="bold"
+                        className="absolute left-4 z-30 text-white"
+                      />
+                      <input
+                        type="text"
+                        placeholder="Search Embedding providers"
+                        className="bg-zinc-600 z-20 pl-10 h-[38px] rounded-full w-full px-4 py-1 text-sm border-2 border-slate-300/40 outline-none focus:border-white text-white"
+                        onChange={(e) => setSearchQuery(e.target.value)}
+                        autoComplete="off"
+                        onKeyDown={(e) => {
+                          if (e.key === "Enter") e.preventDefault();
+                        }}
+                      />
                     </div>
                   </div>
-                  <div
-                    onChange={() => setHasChanges(true)}
-                    className="mt-4 flex flex-col gap-y-1"
-                  >
-                    {selectedEmbedder &&
-                      EMBEDDERS.find(
-                        (embedder) => embedder.value === selectedEmbedder
-                      )?.options}
+                  <div className="px-4 pt-[70px] flex flex-col gap-y-1 max-h-[390px] overflow-y-auto no-scroll pb-4">
+                    {filteredEmbedders.map((embedder) => {
+                      return (
+                        <EmbedderItem
+                          key={embedder.name}
+                          name={embedder.name}
+                          value={embedder.value}
+                          image={embedder.logo}
+                          description={embedder.description}
+                          checked={selectedEmbedder === embedder.value}
+                          onClick={() => updateChoice(embedder.value)}
+                        />
+                      );
+                    })}
                   </div>
                 </div>
-              </>
+                <div
+                  onChange={() => setHasChanges(true)}
+                  className="mt-4 flex flex-col gap-y-1"
+                >
+                  {selectedEmbedder &&
+                    EMBEDDERS.find(
+                      (embedder) => embedder.value === selectedEmbedder
+                    )?.options}
+                </div>
+              </div>
             </div>
           </form>
         </div>
       )}
+      <ModalWrapper isOpen={isOpen}>
+        <ChangeWarningModal
+          warningText="Switching the vector database will ignore previously embedded documents and future similarity search results. They will need to be re-added to each workspace."
+          onClose={closeModal}
+          onConfirm={handleSaveSettings}
+        />
+      </ModalWrapper>
     </div>
   );
 }
diff --git a/frontend/src/pages/GeneralSettings/LLMPreference/index.jsx b/frontend/src/pages/GeneralSettings/LLMPreference/index.jsx
index 56babc3b9..4f6f6d9e1 100644
--- a/frontend/src/pages/GeneralSettings/LLMPreference/index.jsx
+++ b/frontend/src/pages/GeneralSettings/LLMPreference/index.jsx
@@ -189,7 +189,7 @@ export default function GeneralLLMPreference() {
       {loading ? (
         <div
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-          className="relative md:ml-[2px] md:mr-[8px] md:my-[16px] md:rounded-[26px] bg-main-gradient p-[18px] h-full overflow-y-scroll animate-pulse border-4 border-accent"
+          className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
         >
           <div className="w-full h-full flex justify-center items-center">
             <PreLoader />
@@ -198,33 +198,33 @@ export default function GeneralLLMPreference() {
       ) : (
         <div
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-          className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[26px] bg-main-gradient w-full h-full overflow-y-scroll border-4 border-accent"
+          className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
         >
           <form onSubmit={handleSubmit} className="flex w-full">
-            <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+            <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
               <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
-                <div className="items-center flex gap-x-4">
-                  <p className="text-2xl font-semibold text-white">
+                <div className="flex gap-x-4 items-center">
+                  <p className="text-lg leading-6 font-bold text-white">
                     LLM Preference
                   </p>
                   {hasChanges && (
                     <button
                       type="submit"
                       disabled={saving}
-                      className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
+                      className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
                     >
                       {saving ? "Saving..." : "Save changes"}
                     </button>
                   )}
                 </div>
-                <p className="text-sm font-base text-white text-opacity-60">
+                <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
                   These are the credentials and settings for your preferred LLM
                   chat & embedding provider. Its important these keys are
                   current and correct or else AnythingLLM will not function
                   properly.
                 </p>
               </div>
-              <div className="text-white text-sm font-medium py-4">
+              <div className="text-sm font-medium text-white mt-6 mb-4">
                 LLM Providers
               </div>
               <div className="w-full">
diff --git a/frontend/src/pages/GeneralSettings/VectorDatabase/index.jsx b/frontend/src/pages/GeneralSettings/VectorDatabase/index.jsx
index 36242d146..0b2225cb3 100644
--- a/frontend/src/pages/GeneralSettings/VectorDatabase/index.jsx
+++ b/frontend/src/pages/GeneralSettings/VectorDatabase/index.jsx
@@ -154,18 +154,11 @@ export default function GeneralVectorDatabase() {
 
   return (
     <div className="w-screen h-screen overflow-hidden bg-sidebar flex">
-      <ModalWrapper isOpen={isOpen}>
-        <ChangeWarningModal
-          warningText="Switching the vector database will ignore previously embedded documents and future similarity search results. They will need to be re-added to each workspace."
-          onClose={closeModal}
-          onConfirm={handleSaveSettings}
-        />
-      </ModalWrapper>
       <Sidebar />
       {loading ? (
         <div
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-          className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline animate-pulse"
+          className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
         >
           <div className="w-full h-full flex justify-center items-center">
             <PreLoader />
@@ -174,42 +167,42 @@ export default function GeneralVectorDatabase() {
       ) : (
         <div
           style={{ height: isMobile ? "100%" : "calc(100% - 32px)" }}
-          className="transition-all duration-500 relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll border-2 border-outline"
+          className="relative md:ml-[2px] md:mr-[16px] md:my-[16px] md:rounded-[16px] bg-main-gradient w-full h-full overflow-y-scroll"
         >
           <form
             id="vectordb-form"
             onSubmit={handleSubmit}
             className="flex w-full"
           >
-            <div className="flex flex-col w-full px-1 md:px-20 md:py-12 py-16">
+            <div className="flex flex-col w-full px-1 md:pl-6 md:pr-[86px] md:py-6 py-16">
               <div className="w-full flex flex-col gap-y-1 pb-6 border-white border-b-2 border-opacity-10">
-                <div className="items-center flex gap-x-4">
-                  <p className="text-2xl font-semibold text-white">
+                <div className="flex items-center gap-x-4">
+                  <p className="text-lg leading-6 font-bold text-white">
                     Vector Database
                   </p>
                   {hasChanges && (
                     <button
                       type="submit"
                       disabled={saving}
-                      className="border border-slate-200 px-4 py-1 rounded-lg text-slate-200 text-sm items-center flex gap-x-2 hover:bg-slate-200 hover:text-slate-800"
+                      className="flex items-center gap-x-2 px-4 py-2 rounded-lg bg-[#2C2F36] text-white text-sm hover:bg-[#3D4147] shadow-md border border-[#3D4147]"
                     >
                       {saving ? "Saving..." : "Save changes"}
                     </button>
                   )}
                 </div>
-                <p className="text-sm font-base text-white text-opacity-60">
+                <p className="text-xs leading-[18px] font-base text-white text-opacity-60">
                   These are the credentials and settings for how your
                   AnythingLLM instance will function. It's important these keys
                   are current and correct.
                 </p>
               </div>
-              <div className="text-white text-sm font-medium py-4">
-                Select your preferred vector database provider
+              <div className="text-sm font-medium text-white mt-6 mb-4">
+                Vector Database Providers
               </div>
               <div className="w-full">
                 <div className="w-full relative border-slate-300/20 shadow border-4 rounded-xl text-white">
                   <div className="w-full p-4 absolute top-0 rounded-t-lg backdrop-blur-sm">
-                    <div className="w-full flex items-center sticky top-0 z-20">
+                    <div className="w-full flex items-center sticky top-0">
                       <MagnifyingGlass
                         size={16}
                         weight="bold"
@@ -257,6 +250,13 @@ export default function GeneralVectorDatabase() {
           </form>
         </div>
       )}
+      <ModalWrapper isOpen={isOpen}>
+        <ChangeWarningModal
+          warningText="Switching the vector database will ignore previously embedded documents and future similarity search results. They will need to be re-added to each workspace."
+          onClose={closeModal}
+          onConfirm={handleSaveSettings}
+        />
+      </ModalWrapper>
     </div>
   );
 }
diff --git a/frontend/src/pages/WorkspaceChat/index.jsx b/frontend/src/pages/WorkspaceChat/index.jsx
index 88a6744cd..6d6ce4b4b 100644
--- a/frontend/src/pages/WorkspaceChat/index.jsx
+++ b/frontend/src/pages/WorkspaceChat/index.jsx
@@ -19,7 +19,7 @@ export default function WorkspaceChat() {
 }
 
 function ShowWorkspaceChat() {
-  const { slug, threadSlug = null } = useParams();
+  const { slug } = useParams();
   const [workspace, setWorkspace] = useState(null);
   const [loading, setLoading] = useState(true);
 
@@ -32,9 +32,11 @@ function ShowWorkspaceChat() {
         return;
       }
       const suggestedMessages = await Workspace.getSuggestedMessages(slug);
+      const pfpUrl = await Workspace.fetchPfp(slug);
       setWorkspace({
         ..._workspace,
         suggestedMessages,
+        pfpUrl,
       });
       setLoading(false);
     }
diff --git a/frontend/src/pages/WorkspaceSettings/GeneralAppearance/SuggestedChatMessages/index.jsx b/frontend/src/pages/WorkspaceSettings/GeneralAppearance/SuggestedChatMessages/index.jsx
index 05cdbebac..5ac15f218 100644
--- a/frontend/src/pages/WorkspaceSettings/GeneralAppearance/SuggestedChatMessages/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/GeneralAppearance/SuggestedChatMessages/index.jsx
@@ -101,7 +101,7 @@ export default function SuggestedChatMessages({ slug }) {
       </div>
     );
   return (
-    <div className="w-screen">
+    <div className="w-screen mt-6">
       <div className="flex flex-col">
         <label className="block input-label">Suggested Chat Messages</label>
         <p className="text-white text-opacity-60 text-xs font-medium py-1.5">
diff --git a/frontend/src/pages/WorkspaceSettings/GeneralAppearance/WorkspacePfp/index.jsx b/frontend/src/pages/WorkspaceSettings/GeneralAppearance/WorkspacePfp/index.jsx
new file mode 100644
index 000000000..e9fb8303a
--- /dev/null
+++ b/frontend/src/pages/WorkspaceSettings/GeneralAppearance/WorkspacePfp/index.jsx
@@ -0,0 +1,96 @@
+import Workspace from "@/models/workspace";
+import showToast from "@/utils/toast";
+import { Plus } from "@phosphor-icons/react";
+import { useEffect, useState } from "react";
+
+export default function WorkspacePfp({ workspace, slug }) {
+  const [pfp, setPfp] = useState(null);
+
+  useEffect(() => {
+    async function fetchWorkspace() {
+      const pfpUrl = await Workspace.fetchPfp(slug);
+      setPfp(pfpUrl);
+    }
+    fetchWorkspace();
+  }, [slug]);
+
+  const handleFileUpload = async (event) => {
+    const file = event.target.files[0];
+    if (!file) return false;
+
+    const formData = new FormData();
+    formData.append("file", file);
+    const { success, error } = await Workspace.uploadPfp(
+      formData,
+      workspace.slug
+    );
+    if (!success) {
+      showToast(`Failed to upload profile picture: ${error}`, "error");
+      return;
+    }
+
+    const pfpUrl = await Workspace.fetchPfp(workspace.slug);
+    setPfp(pfpUrl);
+    showToast("Profile picture uploaded.", "success");
+  };
+
+  const handleRemovePfp = async () => {
+    const { success, error } = await Workspace.removePfp(workspace.slug);
+    if (!success) {
+      showToast(`Failed to remove profile picture: ${error}`, "error");
+      return;
+    }
+
+    setPfp(null);
+  };
+
+  return (
+    <div className="mt-6">
+      <div className="flex flex-col">
+        <label className="block input-label">Assistant Profile Image</label>
+        <p className="text-white text-opacity-60 text-xs font-medium py-1.5">
+          Customize the profile image of the assistant for this workspace.
+        </p>
+      </div>
+      <div className="flex flex-col md:flex-row items-center gap-8">
+        <div className="flex flex-col items-center">
+          <label className="w-36 h-36 flex flex-col items-center justify-center bg-zinc-900/50 transition-all duration-300 rounded-full mt-8 border-2 border-dashed border-white border-opacity-60 cursor-pointer hover:opacity-60">
+            <input
+              id="workspace-pfp-upload"
+              type="file"
+              accept="image/*"
+              className="hidden"
+              onChange={handleFileUpload}
+            />
+            {pfp ? (
+              <img
+                src={pfp}
+                alt="User profile picture"
+                className="w-36 h-36 rounded-full object-cover bg-white"
+              />
+            ) : (
+              <div className="flex flex-col items-center justify-center p-3">
+                <Plus className="w-8 h-8 text-white/80 m-2" />
+                <span className="text-white text-opacity-80 text-xs font-semibold">
+                  Workspace Image
+                </span>
+                <span className="text-white text-opacity-60 text-xs">
+                  800 x 800
+                </span>
+              </div>
+            )}
+          </label>
+          {pfp && (
+            <button
+              type="button"
+              onClick={handleRemovePfp}
+              className="mt-3 text-white text-opacity-60 text-sm font-medium hover:underline"
+            >
+              Remove Workspace Image
+            </button>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/src/pages/WorkspaceSettings/GeneralAppearance/index.jsx b/frontend/src/pages/WorkspaceSettings/GeneralAppearance/index.jsx
index ee00143e4..b6d5b84a6 100644
--- a/frontend/src/pages/WorkspaceSettings/GeneralAppearance/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/GeneralAppearance/index.jsx
@@ -6,6 +6,7 @@ import VectorCount from "./VectorCount";
 import WorkspaceName from "./WorkspaceName";
 import SuggestedChatMessages from "./SuggestedChatMessages";
 import DeleteWorkspace from "./DeleteWorkspace";
+import WorkspacePfp from "./WorkspacePfp";
 
 export default function GeneralInfo({ slug }) {
   const [workspace, setWorkspace] = useState(null);
@@ -66,9 +67,8 @@ export default function GeneralInfo({ slug }) {
           </button>
         )}
       </form>
-      <div className="mt-6">
-        <SuggestedChatMessages slug={workspace.slug} />
-      </div>
+      <SuggestedChatMessages slug={workspace.slug} />
+      <WorkspacePfp workspace={workspace} slug={slug} />
       <DeleteWorkspace workspace={workspace} />
     </>
   );
diff --git a/server/endpoints/system.js b/server/endpoints/system.js
index fe6b319c3..0d4545046 100644
--- a/server/endpoints/system.js
+++ b/server/endpoints/system.js
@@ -553,8 +553,6 @@ function systemEndpoints(app) {
 
         const userRecord = await User.get({ id: user.id });
         const oldPfpFilename = userRecord.pfpFilename;
-
-        console.log("oldPfpFilename", oldPfpFilename);
         if (oldPfpFilename) {
           const oldPfpPath = path.join(
             __dirname,
diff --git a/server/endpoints/workspaces.js b/server/endpoints/workspaces.js
index 54228bba0..2fe63e58a 100644
--- a/server/endpoints/workspaces.js
+++ b/server/endpoints/workspaces.js
@@ -19,10 +19,21 @@ const { validWorkspaceSlug } = require("../utils/middleware/validWorkspace");
 const { convertToChatHistory } = require("../utils/helpers/chat/responses");
 const { CollectorApi } = require("../utils/collectorApi");
 const { handleUploads } = setupMulter();
+const { setupPfpUploads } = require("../utils/files/multer");
+const { normalizePath } = require("../utils/files");
+const { handlePfpUploads } = setupPfpUploads();
+const path = require("path");
+const fs = require("fs");
+const {
+  determineWorkspacePfpFilepath,
+  fetchPfp,
+} = require("../utils/files/pfp");
 
 function workspaceEndpoints(app) {
   if (!app) return;
 
+  const responseCache = new Map();
+
   app.post(
     "/workspace/new",
     [validatedRequest, flexUserRoleValid([ROLES.admin, ROLES.manager])],
@@ -422,6 +433,138 @@ function workspaceEndpoints(app) {
       }
     }
   );
+
+  app.get(
+    "/workspace/:slug/pfp",
+    [validatedRequest, flexUserRoleValid([ROLES.all])],
+    async function (request, response) {
+      try {
+        const { slug } = request.params;
+        const cachedResponse = responseCache.get(slug);
+
+        if (cachedResponse) {
+          response.writeHead(200, {
+            "Content-Type": cachedResponse.mime || "image/png",
+          });
+          response.end(cachedResponse.buffer);
+          return;
+        }
+
+        const pfpPath = await determineWorkspacePfpFilepath(slug);
+
+        if (!pfpPath) {
+          response.sendStatus(204).end();
+          return;
+        }
+
+        const { found, buffer, mime } = fetchPfp(pfpPath);
+        if (!found) {
+          response.sendStatus(204).end();
+          return;
+        }
+
+        responseCache.set(slug, { buffer, mime });
+
+        response.writeHead(200, {
+          "Content-Type": mime || "image/png",
+        });
+        response.end(buffer);
+        return;
+      } catch (error) {
+        console.error("Error processing the logo request:", error);
+        response.status(500).json({ message: "Internal server error" });
+      }
+    }
+  );
+
+  app.post(
+    "/workspace/:slug/upload-pfp",
+    [validatedRequest, flexUserRoleValid([ROLES.admin, ROLES.manager])],
+    handlePfpUploads.single("file"),
+    async function (request, response) {
+      try {
+        const { slug } = request.params;
+        const uploadedFileName = request.randomFileName;
+        if (!uploadedFileName) {
+          return response.status(400).json({ message: "File upload failed." });
+        }
+
+        const workspaceRecord = await Workspace.get({
+          slug,
+        });
+
+        const oldPfpFilename = workspaceRecord.pfpFilename;
+        if (oldPfpFilename) {
+          const oldPfpPath = path.join(
+            __dirname,
+            `../storage/assets/pfp/${normalizePath(
+              workspaceRecord.pfpFilename
+            )}`
+          );
+
+          if (fs.existsSync(oldPfpPath)) fs.unlinkSync(oldPfpPath);
+        }
+
+        const { workspace, message } = await Workspace.update(
+          workspaceRecord.id,
+          {
+            pfpFilename: uploadedFileName,
+          }
+        );
+
+        return response.status(workspace ? 200 : 500).json({
+          message: workspace
+            ? "Profile picture uploaded successfully."
+            : message,
+        });
+      } catch (error) {
+        console.error("Error processing the profile picture upload:", error);
+        response.status(500).json({ message: "Internal server error" });
+      }
+    }
+  );
+
+  app.delete(
+    "/workspace/:slug/remove-pfp",
+    [validatedRequest, flexUserRoleValid([ROLES.admin, ROLES.manager])],
+    async function (request, response) {
+      try {
+        const { slug } = request.params;
+        const workspaceRecord = await Workspace.get({
+          slug,
+        });
+        const oldPfpFilename = workspaceRecord.pfpFilename;
+
+        if (oldPfpFilename) {
+          const oldPfpPath = path.join(
+            __dirname,
+            `../storage/assets/pfp/${normalizePath(oldPfpFilename)}`
+          );
+
+          if (fs.existsSync(oldPfpPath)) fs.unlinkSync(oldPfpPath);
+        }
+
+        const { workspace, message } = await Workspace.update(
+          workspaceRecord.id,
+          {
+            pfpFilename: null,
+          }
+        );
+
+        // Clear the cache
+        responseCache.delete(slug);
+
+        return response.status(workspace ? 200 : 500).json({
+          message: workspace
+            ? "Profile picture removed successfully."
+            : message,
+        });
+      } catch (error) {
+        console.error("Error processing the profile picture removal:", error);
+        response.status(500).json({ message: "Internal server error" });
+      }
+    }
+  );
 }
 
 module.exports = { workspaceEndpoints };
diff --git a/server/models/workspace.js b/server/models/workspace.js
index 92c2f9e36..48952c637 100644
--- a/server/models/workspace.js
+++ b/server/models/workspace.js
@@ -19,6 +19,7 @@ const Workspace = {
     "chatModel",
     "topN",
     "chatMode",
+    "pfpFilename",
   ],
 
   new: async function (name = null, creatorId = null) {
diff --git a/server/prisma/migrations/20240301002308_init/migration.sql b/server/prisma/migrations/20240301002308_init/migration.sql
new file mode 100644
index 000000000..5847beafd
--- /dev/null
+++ b/server/prisma/migrations/20240301002308_init/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "workspaces" ADD COLUMN "pfpFilename" TEXT;
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 3e3461946..e0ff76020 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -100,6 +100,7 @@ model workspaces {
   chatModel                    String?
   topN                         Int?                           @default(4)
   chatMode                     String?                        @default("chat")
+  pfpFilename     String?
   workspace_users              workspace_users[]
   documents                    workspace_documents[]
   workspace_suggested_messages workspace_suggested_messages[]
diff --git a/server/utils/files/pfp.js b/server/utils/files/pfp.js
index dd6ba0fe2..0d1dd9f85 100644
--- a/server/utils/files/pfp.js
+++ b/server/utils/files/pfp.js
@@ -3,6 +3,7 @@ const fs = require("fs");
 const { getType } = require("mime");
 const { User } = require("../../models/user");
 const { normalizePath } = require(".");
+const { Workspace } = require("../../models/workspace");
 
 function fetchPfp(pfpPath) {
   if (!fs.existsSync(pfpPath)) {
@@ -38,7 +39,21 @@ async function determinePfpFilepath(id) {
   return pfpFilepath;
 }
 
+async function determineWorkspacePfpFilepath(slug) {
+  const workspace = await Workspace.get({ slug });
+  const pfpFilename = workspace?.pfpFilename || null;
+  if (!pfpFilename) return null;
+
+  const basePath = process.env.STORAGE_DIR
+    ? path.join(process.env.STORAGE_DIR, "assets/pfp")
+    : path.join(__dirname, "../../storage/assets/pfp");
+  const pfpFilepath = path.join(basePath, normalizePath(pfpFilename));
+  if (!fs.existsSync(pfpFilepath)) return null;
+  return pfpFilepath;
+}
+
 module.exports = {
   fetchPfp,
   determinePfpFilepath,
+  determineWorkspacePfpFilepath,
 };