From ccffbe1b4e3c63018b4f52a35ec3a4f214aa6c35 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:03:32 +0530
Subject: [PATCH] style: workspace and profile setting revamp (#2193)

* chore: custom theme mode svg added

* style: workspace settings ui revamp

* style: project settings and image upload modal improvement

* style: profile setting ui revamp

* chore: settings ui improvement and bug fixes
---
 .../automation/auto-close-automation.tsx      |   6 +-
 web/components/core/activity.tsx              |  32 +-
 .../core/modals/image-upload-modal.tsx        |  38 +-
 web/components/exporter/guide.tsx             |  87 ++--
 web/components/exporter/single-export.tsx     |   2 +-
 web/components/integration/guide.tsx          | 157 +++----
 web/components/integration/single-import.tsx  |   2 +-
 .../integration/single-integration-card.tsx   |  35 +-
 .../labels/create-update-label-inline.tsx     |   8 +-
 web/components/labels/single-label.tsx        |   2 +-
 .../project/confirm-project-member-remove.tsx |   2 +-
 web/components/project/member-select.tsx      |   2 +-
 .../project/send-project-invitation-modal.tsx |  15 +-
 web/components/project/settings-sidebar.tsx   | 127 +++++-
 web/components/states/single-state.tsx        |  43 +-
 .../integration-and-import-export-banner.tsx  |   2 +-
 web/components/web-view/activity-message.tsx  |  30 +-
 .../confirm-workspace-member-remove.tsx       |   2 +-
 web/components/workspace/index.ts             |   1 -
 web/components/workspace/settings-header.tsx  |  13 -
 web/layouts/settings-navbar.tsx               | 127 ------
 .../[workspaceSlug]/me/profile/activity.tsx   | 321 +++++++------
 .../[workspaceSlug]/me/profile/index.tsx      | 430 +++++++++---------
 .../me/profile/preferences.tsx                |  22 +-
 .../[projectId]/settings/features.tsx         |  10 +-
 .../projects/[projectId]/settings/index.tsx   | 111 ++---
 .../projects/[projectId]/settings/labels.tsx  |   6 +-
 .../projects/[projectId]/settings/members.tsx |   8 +-
 .../[workspaceSlug]/settings/billing.tsx      |  18 +-
 .../[workspaceSlug]/settings/exports.tsx      |  17 +-
 .../[workspaceSlug]/settings/imports.tsx      |  25 +-
 web/pages/[workspaceSlug]/settings/index.tsx  | 301 ++++++------
 .../[workspaceSlug]/settings/integrations.tsx |  18 +-
 .../[workspaceSlug]/settings/members.tsx      |  99 ++--
 web/public/theme-mode/custom-mode.svg         |  54 +++
 web/public/theme-mode/custom-theme-banner.svg |  33 ++
 web/public/theme-mode/dark-high-contrast.svg  |  34 ++
 web/public/theme-mode/dark-mode.svg           |  41 ++
 web/public/theme-mode/light-high-contrast.svg |  42 ++
 web/public/theme-mode/light-mode.svg          |  42 ++
 40 files changed, 1296 insertions(+), 1069 deletions(-)
 delete mode 100644 web/components/workspace/settings-header.tsx
 delete mode 100644 web/layouts/settings-navbar.tsx
 create mode 100644 web/public/theme-mode/custom-mode.svg
 create mode 100644 web/public/theme-mode/custom-theme-banner.svg
 create mode 100644 web/public/theme-mode/dark-high-contrast.svg
 create mode 100644 web/public/theme-mode/dark-mode.svg
 create mode 100644 web/public/theme-mode/light-high-contrast.svg
 create mode 100644 web/public/theme-mode/light-mode.svg

diff --git a/web/components/automation/auto-close-automation.tsx b/web/components/automation/auto-close-automation.tsx
index 8235c806347..868d6455737 100644
--- a/web/components/automation/auto-close-automation.tsx
+++ b/web/components/automation/auto-close-automation.tsx
@@ -103,8 +103,8 @@ export const AutoCloseAutomation: React.FC<Props> = ({ projectDetails, handleCha
 
         {projectDetails?.close_in !== 0 && (
           <div className="ml-12">
-            <div className="flex flex-col gap-4">
-              <div className="flex items-center justify-between rounded px-5 py-4 bg-custom-background-90 border border-custom-border-200 gap-2 w-full">
+            <div className="flex flex-col rounded bg-custom-background-90 border border-custom-border-200 p-2">
+              <div className="flex items-center justify-between px-5 py-4 gap-2 w-full">
                 <div className="w-1/2 text-sm font-medium">
                   Auto-close issues that are inactive for
                 </div>
@@ -138,7 +138,7 @@ export const AutoCloseAutomation: React.FC<Props> = ({ projectDetails, handleCha
                 </div>
               </div>
 
-              <div className="flex items-center justify-between rounded px-5 py-4 bg-custom-background-90 border border-custom-border-200 gap-2 w-full">
+              <div className="flex items-center justify-between px-5 py-4 gap-2 w-full">
                 <div className="w-1/2 text-sm font-medium">Auto-close Status</div>
                 <div className="w-1/2 ">
                   <CustomSearchSelect
diff --git a/web/components/core/activity.tsx b/web/components/core/activity.tsx
index c8f6377b789..4a20c15e817 100644
--- a/web/components/core/activity.tsx
+++ b/web/components/core/activity.tsx
@@ -90,14 +90,14 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="group" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="group" className="!text-2xl" aria-hidden="true" />,
   },
   archived_at: {
     message: (activity) => {
       if (activity.new_value === "restore") return "restored the issue.";
       else return "archived the issue.";
     },
-    icon: <Icon iconName="archive" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="archive" className="!text-2xl" aria-hidden="true" />,
   },
   attachment: {
     message: (activity, showIssue) => {
@@ -136,7 +136,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="attach_file" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="attach_file" className="!text-2xl" aria-hidden="true" />,
   },
   blocking: {
     message: (activity) => {
@@ -224,7 +224,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="contrast" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="contrast" className="!text-2xl" aria-hidden="true" />,
   },
   description: {
     message: (activity, showIssue) => (
@@ -239,7 +239,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="chat" className="!text-2xl" aria-hidden="true" />,
   },
   estimate_point: {
     message: (activity, showIssue) => {
@@ -271,14 +271,14 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="change_history" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="change_history" className="!text-2xl" aria-hidden="true" />,
   },
   issue: {
     message: (activity) => {
       if (activity.verb === "created") return "created the issue.";
       else return "deleted an issue.";
     },
-    icon: <Icon iconName="stack" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="stack" className="!text-2xl" aria-hidden="true" />,
   },
   labels: {
     message: (activity, showIssue) => {
@@ -327,7 +327,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="sell" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="sell" className="!text-2xl" aria-hidden="true" />,
   },
   link: {
     message: (activity, showIssue) => {
@@ -398,7 +398,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="link" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="link" className="!text-2xl" aria-hidden="true" />,
   },
   modules: {
     message: (activity, showIssue, workspaceSlug) => {
@@ -448,7 +448,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="dataset" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="dataset" className="!text-2xl" aria-hidden="true" />,
   },
   name: {
     message: (activity, showIssue) => (
@@ -463,7 +463,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="chat" className="!text-2xl" aria-hidden="true" />,
   },
   parent: {
     message: (activity, showIssue) => {
@@ -496,7 +496,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="supervised_user_circle" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="supervised_user_circle" className="!text-2xl" aria-hidden="true" />,
   },
   priority: {
     message: (activity, showIssue) => (
@@ -514,7 +514,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="signal_cellular_alt" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="signal_cellular_alt" className="!text-2xl" aria-hidden="true" />,
   },
   start_date: {
     message: (activity, showIssue) => {
@@ -548,7 +548,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="calendar_today" className="!text-2xl" aria-hidden="true" />,
   },
   state: {
     message: (activity, showIssue) => (
@@ -564,7 +564,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Squares2X2Icon className="h-3 w-3" aria-hidden="true" />,
+    icon: <Squares2X2Icon className="h-6 w-6 text-custom-sidebar-200" aria-hidden="true" />,
   },
   target_date: {
     message: (activity, showIssue) => {
@@ -598,7 +598,7 @@ const activityDetails: {
           </>
         );
     },
-    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="calendar_today" className="!text-2xl" aria-hidden="true" />,
   },
 };
 
diff --git a/web/components/core/modals/image-upload-modal.tsx b/web/components/core/modals/image-upload-modal.tsx
index 14e4844de68..df4f21e12b7 100644
--- a/web/components/core/modals/image-upload-modal.tsx
+++ b/web/components/core/modals/image-upload-modal.tsx
@@ -1,6 +1,5 @@
 import React, { useCallback, useState } from "react";
 
-import NextImage from "next/image";
 import { useRouter } from "next/router";
 
 // react-dropzone
@@ -12,7 +11,7 @@ import fileServices from "services/file.service";
 // hooks
 import useWorkspaceDetails from "hooks/use-workspace-details";
 // ui
-import { PrimaryButton, SecondaryButton } from "components/ui";
+import { DangerButton, PrimaryButton, SecondaryButton } from "components/ui";
 // icons
 import { UserCircleIcon } from "components/icons";
 
@@ -21,6 +20,8 @@ type Props = {
   onClose: () => void;
   isOpen: boolean;
   onSuccess: (url: string) => void;
+  isRemoving: boolean;
+  handleDelete: () => void;
   userImage?: boolean;
 };
 
@@ -29,6 +30,8 @@ export const ImageUploadModal: React.FC<Props> = ({
   onSuccess,
   isOpen,
   onClose,
+  isRemoving,
+  handleDelete,
   userImage,
 }) => {
   const [image, setImage] = useState<File | null>(null);
@@ -148,12 +151,10 @@ export const ImageUploadModal: React.FC<Props> = ({
                             >
                               Edit
                             </button>
-                            <NextImage
-                              layout="fill"
-                              objectFit="cover"
+                            <img
                               src={image ? URL.createObjectURL(image) : value ? value : ""}
                               alt="image"
-                              className="rounded-lg"
+                              className="absolute top-0 left-0 h-full w-full object-cover rounded-md"
                             />
                           </>
                         ) : (
@@ -182,15 +183,22 @@ export const ImageUploadModal: React.FC<Props> = ({
                 <p className="my-4 text-custom-text-200 text-sm">
                   File formats supported- .jpeg, .jpg, .png, .webp, .svg
                 </p>
-                <div className="flex items-center justify-end gap-2">
-                  <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
-                  <PrimaryButton
-                    onClick={handleSubmit}
-                    disabled={!image}
-                    loading={isImageUploading}
-                  >
-                    {isImageUploading ? "Uploading..." : "Upload & Save"}
-                  </PrimaryButton>
+                <div className="flex items-center justify-between">
+                  <div className="flex items-center">
+                    <DangerButton onClick={handleDelete} outline disabled={!value}>
+                      {isRemoving ? "Removing..." : "Remove"}
+                    </DangerButton>
+                  </div>
+                  <div className="flex items-center gap-2">
+                    <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
+                    <PrimaryButton
+                      onClick={handleSubmit}
+                      disabled={!image}
+                      loading={isImageUploading}
+                    >
+                      {isImageUploading ? "Uploading..." : "Upload & Save"}
+                    </PrimaryButton>
+                  </div>
                 </div>
               </Dialog.Panel>
             </Transition.Child>
diff --git a/web/components/exporter/guide.tsx b/web/components/exporter/guide.tsx
index 67b7c6d4d6f..45fc5027087 100644
--- a/web/components/exporter/guide.tsx
+++ b/web/components/exporter/guide.tsx
@@ -46,32 +46,38 @@ const IntegrationGuide = () => {
 
   return (
     <>
-      <div className="h-full space-y-2">
+      <div className="h-full w-full">
         <>
-          <div className="space-y-2">
+          <div>
             {EXPORTERS_LIST.map((service) => (
               <div
                 key={service.provider}
-                className="rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4"
+                className="flex items-center justify-between gap-2 border-b border-custom-border-200 bg-custom-background-100 px-4 py-6"
               >
-                <div className="flex items-center gap-4 whitespace-nowrap">
-                  <div className="relative h-10 w-10 flex-shrink-0">
-                    <Image
-                      src={service.logo}
-                      layout="fill"
-                      objectFit="cover"
-                      alt={`${service.title} Logo`}
-                    />
-                  </div>
-                  <div className="w-full">
-                    <h3>{service.title}</h3>
-                    <p className="text-sm text-custom-text-200">{service.description}</p>
+                <div className="flex items-start justify-between gap-4 w-full">
+                  <div className="flex item-center gap-2.5">
+                    <div className="relative h-10 w-10 flex-shrink-0">
+                      <Image
+                        src={service.logo}
+                        layout="fill"
+                        objectFit="cover"
+                        alt={`${service.title} Logo`}
+                      />
+                    </div>
+                    <div>
+                      <h3 className="flex items-center gap-4 text-sm font-medium">
+                        {service.title}
+                      </h3>
+                      <p className="text-sm text-custom-text-200 tracking-tight">
+                        {service.description}
+                      </p>
+                    </div>
                   </div>
                   <div className="flex-shrink-0">
                     <Link href={`/${workspaceSlug}/settings/exports?provider=${service.provider}`}>
                       <a>
                         <PrimaryButton>
-                          <span className="capitalize">{service.type}</span> now
+                          <span className="capitalize">{service.type}</span>
                         </PrimaryButton>
                       </a>
                     </Link>
@@ -80,10 +86,11 @@ const IntegrationGuide = () => {
               </div>
             ))}
           </div>
-          <div className="rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4">
-            <h3 className="mb-2 flex gap-2 text-lg font-medium justify-between">
-              <div className="flex gap-2">
-                <div className="">Previous Exports</div>
+          <div>
+            <div className="flex items-center justify-between pt-7 pb-3.5 border-b border-custom-border-200">
+              <div className="flex gap-2 items-center">
+                <h3 className="flex gap-2 text-xl font-medium">Previous Exports</h3>
+
                 <button
                   type="button"
                   className="flex flex-shrink-0 items-center gap-1 rounded bg-custom-background-80 py-1 px-1.5 text-xs outline-none"
@@ -128,27 +135,29 @@ const IntegrationGuide = () => {
                   <Icon iconName="keyboard_arrow_right" className="!text-lg" />
                 </button>
               </div>
-            </h3>
-            {exporterServices && exporterServices?.results ? (
-              exporterServices?.results?.length > 0 ? (
-                <div className="space-y-2">
-                  <div className="divide-y divide-custom-border-200">
-                    {exporterServices?.results.map((service) => (
-                      <SingleExport key={service.id} service={service} refreshing={refreshing} />
-                    ))}
+            </div>
+            <div className="flex flex-col">
+              {exporterServices && exporterServices?.results ? (
+                exporterServices?.results?.length > 0 ? (
+                  <div>
+                    <div className="divide-y divide-custom-border-200">
+                      {exporterServices?.results.map((service) => (
+                        <SingleExport key={service.id} service={service} refreshing={refreshing} />
+                      ))}
+                    </div>
                   </div>
-                </div>
+                ) : (
+                  <p className="py-2 text-sm text-custom-text-200">No previous export available.</p>
+                )
               ) : (
-                <p className="py-2 text-sm text-custom-text-200">No previous export available.</p>
-              )
-            ) : (
-              <Loader className="mt-6 grid grid-cols-1 gap-3">
-                <Loader.Item height="40px" width="100%" />
-                <Loader.Item height="40px" width="100%" />
-                <Loader.Item height="40px" width="100%" />
-                <Loader.Item height="40px" width="100%" />
-              </Loader>
-            )}
+                <Loader className="mt-6 grid grid-cols-1 gap-3">
+                  <Loader.Item height="40px" width="100%" />
+                  <Loader.Item height="40px" width="100%" />
+                  <Loader.Item height="40px" width="100%" />
+                  <Loader.Item height="40px" width="100%" />
+                </Loader>
+              )}
+            </div>
           </div>
         </>
         {provider && (
diff --git a/web/components/exporter/single-export.tsx b/web/components/exporter/single-export.tsx
index c8ef2dc1a07..772119f25a3 100644
--- a/web/components/exporter/single-export.tsx
+++ b/web/components/exporter/single-export.tsx
@@ -23,7 +23,7 @@ export const SingleExport: React.FC<Props> = ({ service, refreshing }) => {
   };
 
   return (
-    <div className="flex items-center justify-between gap-2 py-3">
+    <div className="flex items-center justify-between gap-2 px-4 py-3">
       <div>
         <h4 className="flex items-center gap-2 text-sm">
           <span>
diff --git a/web/components/integration/guide.tsx b/web/components/integration/guide.tsx
index 7c1dd20fe99..a819566bfab 100644
--- a/web/components/integration/guide.tsx
+++ b/web/components/integration/guide.tsx
@@ -21,7 +21,6 @@ import {
 import { Loader, PrimaryButton } from "components/ui";
 // icons
 import { ArrowPathIcon } from "@heroicons/react/24/outline";
-import { ArrowRightIcon } from "components/icons";
 // types
 import { IImporterService } from "types";
 // fetch-keys
@@ -57,10 +56,10 @@ const IntegrationGuide = () => {
         data={importToDelete}
         user={user}
       />
-      <div className="h-full space-y-2">
+      <div className="h-full">
         {(!provider || provider === "csv") && (
           <>
-            <div className="mb-5 flex items-center gap-2">
+            {/* <div className="mb-5 flex items-center gap-2">
               <div className="h-full w-full space-y-1">
                 <div className="text-lg font-medium">Relocation Guide</div>
                 <div className="text-sm">
@@ -78,85 +77,87 @@ const IntegrationGuide = () => {
                   <ArrowRightIcon width={"18px"} color={"#3F76FF"} />
                 </div>
               </a>
-            </div>
-            <div className="space-y-2">
-              {IMPORTERS_EXPORTERS_LIST.map((service) => (
-                <div
-                  key={service.provider}
-                  className="rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4"
-                >
-                  <div className="flex items-center gap-4 whitespace-nowrap">
-                    <div className="relative h-10 w-10 flex-shrink-0">
-                      <Image
-                        src={service.logo}
-                        layout="fill"
-                        objectFit="cover"
-                        alt={`${service.title} Logo`}
-                      />
-                    </div>
-                    <div className="w-full">
-                      <h3>{service.title}</h3>
-                      <p className="text-sm text-custom-text-200">{service.description}</p>
-                    </div>
-                    <div className="flex-shrink-0">
-                      <Link
-                        href={`/${workspaceSlug}/settings/imports?provider=${service.provider}`}
-                      >
-                        <a>
-                          <PrimaryButton>
-                            <span className="capitalize">{service.type}</span> now
-                          </PrimaryButton>
-                        </a>
-                      </Link>
-                    </div>
+            </div> */}
+            {IMPORTERS_EXPORTERS_LIST.map((service) => (
+              <div
+                key={service.provider}
+                className="flex items-center justify-between gap-2 border-b border-custom-border-200 bg-custom-background-100 px-4 py-6"
+              >
+                <div className="flex items-start gap-4">
+                  <div className="relative h-10 w-10 flex-shrink-0">
+                    <Image
+                      src={service.logo}
+                      layout="fill"
+                      objectFit="cover"
+                      alt={`${service.title} Logo`}
+                    />
+                  </div>
+                  <div>
+                    <h3 className="flex items-center gap-4 text-sm font-medium">{service.title}</h3>
+                    <p className="text-sm text-custom-text-200 tracking-tight">
+                      {service.description}
+                    </p>
                   </div>
                 </div>
-              ))}
-            </div>
-            <div className="rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4">
-              <h3 className="mb-2 flex gap-2 text-lg font-medium">
-                Previous Imports
-                <button
-                  type="button"
-                  className="flex flex-shrink-0 items-center gap-1 rounded bg-custom-background-80 py-1 px-1.5 text-xs outline-none"
-                  onClick={() => {
-                    setRefreshing(true);
-                    mutate(IMPORTER_SERVICES_LIST(workspaceSlug as string)).then(() =>
-                      setRefreshing(false)
-                    );
-                  }}
-                >
-                  <ArrowPathIcon className={`h-3 w-3 ${refreshing ? "animate-spin" : ""}`} />{" "}
-                  {refreshing ? "Refreshing..." : "Refresh status"}
-                </button>
-              </h3>
-              {importerServices ? (
-                importerServices.length > 0 ? (
-                  <div className="space-y-2">
-                    <div className="divide-y divide-custom-border-200">
-                      {importerServices.map((service) => (
-                        <SingleImport
-                          key={service.id}
-                          service={service}
-                          refreshing={refreshing}
-                          handleDelete={() => handleDeleteImport(service)}
-                        />
-                      ))}
+                <div className="flex-shrink-0">
+                  <Link href={`/${workspaceSlug}/settings/imports?provider=${service.provider}`}>
+                    <a>
+                      <PrimaryButton>
+                        <span className="capitalize">{service.type}</span>
+                      </PrimaryButton>
+                    </a>
+                  </Link>
+                </div>
+              </div>
+            ))}
+            <div>
+              <div className="flex items-center pt-7 pb-3.5 border-b border-custom-border-200">
+                <h3 className="flex gap-2 text-xl font-medium">
+                  Previous Imports
+                  <button
+                    type="button"
+                    className="flex flex-shrink-0 items-center gap-1 rounded bg-custom-background-80 py-1 px-1.5 text-xs outline-none"
+                    onClick={() => {
+                      setRefreshing(true);
+                      mutate(IMPORTER_SERVICES_LIST(workspaceSlug as string)).then(() =>
+                        setRefreshing(false)
+                      );
+                    }}
+                  >
+                    <ArrowPathIcon className={`h-3 w-3 ${refreshing ? "animate-spin" : ""}`} />{" "}
+                    {refreshing ? "Refreshing..." : "Refresh status"}
+                  </button>
+                </h3>
+              </div>
+              <div className="flex flex-col px-4 py-6">
+                {importerServices ? (
+                  importerServices.length > 0 ? (
+                    <div className="space-y-2">
+                      <div className="divide-y divide-custom-border-200">
+                        {importerServices.map((service) => (
+                          <SingleImport
+                            key={service.id}
+                            service={service}
+                            refreshing={refreshing}
+                            handleDelete={() => handleDeleteImport(service)}
+                          />
+                        ))}
+                      </div>
                     </div>
-                  </div>
+                  ) : (
+                    <p className="py-2 text-sm text-custom-text-200">
+                      No previous imports available.
+                    </p>
+                  )
                 ) : (
-                  <p className="py-2 text-sm text-custom-text-200">
-                    No previous imports available.
-                  </p>
-                )
-              ) : (
-                <Loader className="mt-6 grid grid-cols-1 gap-3">
-                  <Loader.Item height="40px" width="100%" />
-                  <Loader.Item height="40px" width="100%" />
-                  <Loader.Item height="40px" width="100%" />
-                  <Loader.Item height="40px" width="100%" />
-                </Loader>
-              )}
+                  <Loader className="mt-6 grid grid-cols-1 gap-3">
+                    <Loader.Item height="40px" width="100%" />
+                    <Loader.Item height="40px" width="100%" />
+                    <Loader.Item height="40px" width="100%" />
+                    <Loader.Item height="40px" width="100%" />
+                  </Loader>
+                )}
+              </div>
             </div>
           </>
         )}
diff --git a/web/components/integration/single-import.tsx b/web/components/integration/single-import.tsx
index b74628a83bb..9ebe1ad224e 100644
--- a/web/components/integration/single-import.tsx
+++ b/web/components/integration/single-import.tsx
@@ -16,7 +16,7 @@ type Props = {
 };
 
 export const SingleImport: React.FC<Props> = ({ service, refreshing, handleDelete }) => (
-  <div className="flex items-center justify-between gap-2 py-3">
+  <div className="flex items-center justify-between gap-2 px-4 py-3">
     <div>
       <h4 className="flex items-center gap-2 text-sm">
         <span>
diff --git a/web/components/integration/single-integration-card.tsx b/web/components/integration/single-integration-card.tsx
index 0a59de8b795..fab37b0c8ee 100644
--- a/web/components/integration/single-integration-card.tsx
+++ b/web/components/integration/single-integration-card.tsx
@@ -15,6 +15,7 @@ import { DangerButton, Loader, PrimaryButton } from "components/ui";
 // icons
 import GithubLogo from "public/services/github.png";
 import SlackLogo from "public/services/slack.png";
+import { CheckCircle2 } from "lucide-react";
 // types
 import { IAppIntegration, IWorkspaceIntegration } from "types";
 // fetch-keys
@@ -27,13 +28,12 @@ type Props = {
 const integrationDetails: { [key: string]: any } = {
   github: {
     logo: GithubLogo,
-    installed:
-      "Activate GitHub integrations on individual projects to sync with specific repositories.",
+    installed: "Activate GitHub on individual projects to sync with specific repositories.",
     notInstalled: "Connect with GitHub with your Plane workspace to sync project issues.",
   },
   slack: {
     logo: SlackLogo,
-    installed: "Activate Slack integrations on individual projects to sync with specific channels.",
+    installed: "Activate Slack on individual projects to sync with specific channels.",
     notInstalled: "Connect with Slack with your Plane workspace to sync project issues.",
   },
 };
@@ -99,31 +99,22 @@ export const SingleIntegrationCard: React.FC<Props> = ({ integration }) => {
   );
 
   return (
-    <div className="flex items-center justify-between gap-2 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-5">
+    <div className="flex items-center justify-between gap-2 border-b border-custom-border-200 bg-custom-background-100 px-4 py-6">
       <div className="flex items-start gap-4">
-        <div className="h-12 w-12 flex-shrink-0">
+        <div className="h-10 w-10 flex-shrink-0">
           <Image
             src={integrationDetails[integration.provider].logo}
             alt={`${integration.title} Logo`}
           />
         </div>
         <div>
-          <h3 className="flex items-center gap-4 text-xl font-semibold">
+          <h3 className="flex items-center gap-2 text-sm font-medium">
             {integration.title}
-            {workspaceIntegrations ? (
-              isInstalled ? (
-                <span className="flex items-center gap-1 text-sm font-normal text-green-500">
-                  <span className="h-1.5 w-1.5 flex-shrink-0 rounded-full bg-green-500" /> Installed
-                </span>
-              ) : (
-                <span className="flex items-center gap-1 text-sm font-normal text-custom-text-200">
-                  <span className="h-1.5 w-1.5 flex-shrink-0 rounded-full bg-custom-background-80" />{" "}
-                  Not Installed
-                </span>
-              )
-            ) : null}
+            {workspaceIntegrations
+              ? isInstalled && <CheckCircle2 className="h-3.5 w-3.5 text-white fill-green-500" />
+              : null}
           </h3>
-          <p className="text-sm text-custom-text-200">
+          <p className="text-sm text-custom-text-200 tracking-tight">
             {workspaceIntegrations
               ? isInstalled
                 ? integrationDetails[integration.provider].installed
@@ -135,12 +126,12 @@ export const SingleIntegrationCard: React.FC<Props> = ({ integration }) => {
 
       {workspaceIntegrations ? (
         isInstalled ? (
-          <DangerButton onClick={handleRemoveIntegration} loading={deletingIntegration}>
-            {deletingIntegration ? "Removing..." : "Remove installation"}
+          <DangerButton onClick={handleRemoveIntegration} loading={deletingIntegration} outline>
+            {deletingIntegration ? "Uninstalling..." : "Uninstall"}
           </DangerButton>
         ) : (
           <PrimaryButton onClick={startAuth} loading={isInstalling}>
-            {isInstalling ? "Installing..." : "Add installation"}
+            {isInstalling ? "Installing..." : "Install"}
           </PrimaryButton>
         )
       ) : (
diff --git a/web/components/labels/create-update-label-inline.tsx b/web/components/labels/create-update-label-inline.tsx
index 61064e7774f..264fb790172 100644
--- a/web/components/labels/create-update-label-inline.tsx
+++ b/web/components/labels/create-update-label-inline.tsx
@@ -16,8 +16,6 @@ import { Popover, Transition } from "@headlessui/react";
 import issuesService from "services/issues.service";
 // ui
 import { Input, PrimaryButton, SecondaryButton } from "components/ui";
-// icons
-import { Component } from "lucide-react";
 // types
 import { IIssueLabels } from "types";
 // fetch-keys
@@ -146,10 +144,10 @@ export const CreateUpdateLabelInline = forwardRef<HTMLDivElement, Props>(
                     open ? "text-custom-text-100" : "text-custom-text-200"
                   }`}
                 >
-                  <Component
-                    className="h-4 w-4 text-custom-text-100 flex-shrink-0"
+                  <span
+                    className="h-4 w-4 rounded-full"
                     style={{
-                      color: watch("color"),
+                      backgroundColor: watch("color"),
                     }}
                   />
                 </Popover.Button>
diff --git a/web/components/labels/single-label.tsx b/web/components/labels/single-label.tsx
index 464b331529d..be981e510d1 100644
--- a/web/components/labels/single-label.tsx
+++ b/web/components/labels/single-label.tsx
@@ -43,7 +43,7 @@ export const SingleLabel: React.FC<Props> = ({
           >
             <CustomMenu.MenuItem onClick={() => addLabelToGroup(label)}>
               <span className="flex items-center justify-start gap-2">
-                <RectangleGroupIcon className="h-4 w-4" />
+                <Component className="h-4 w-4 leading-4 text-custom-sidebar-text-400 flex-shrink-0" />
                 <span>Convert to group</span>
               </span>
             </CustomMenu.MenuItem>
diff --git a/web/components/project/confirm-project-member-remove.tsx b/web/components/project/confirm-project-member-remove.tsx
index bfce430a71a..4edc278219c 100644
--- a/web/components/project/confirm-project-member-remove.tsx
+++ b/web/components/project/confirm-project-member-remove.tsx
@@ -79,7 +79,7 @@ const ConfirmProjectMemberRemove: React.FC<Props> = ({ isOpen, onClose, data, ha
                     </div>
                   </div>
                 </div>
-                <div className="flex justify-end gap-2 bg-custom-background-90 p-4 sm:px-6">
+                <div className="flex justify-end gap-2 p-4 sm:px-6">
                   <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
                   <DangerButton onClick={handleDeletion} loading={isDeleteLoading}>
                     {isDeleteLoading ? "Removing..." : "Remove"}
diff --git a/web/components/project/member-select.tsx b/web/components/project/member-select.tsx
index e6eee911d20..5a1ec5cb1f7 100644
--- a/web/components/project/member-select.tsx
+++ b/web/components/project/member-select.tsx
@@ -49,7 +49,7 @@ export const MemberSelect: React.FC<Props> = ({ value, onChange }) => {
           {selectedOption ? (
             selectedOption?.display_name
           ) : (
-            <span className="text-sm py-0.5 text-custom-text-200">Select</span>
+            <span className="text-sm py-0.5 text-custom-sidebar-text-400">Select</span>
           )}
         </div>
       }
diff --git a/web/components/project/send-project-invitation-modal.tsx b/web/components/project/send-project-invitation-modal.tsx
index b8f383f05ff..07b90840c86 100644
--- a/web/components/project/send-project-invitation-modal.tsx
+++ b/web/components/project/send-project-invitation-modal.tsx
@@ -219,7 +219,9 @@ const SendProjectInvitationModal: React.FC<Props> = (props) => {
                                           }
                                         </div>
                                       ) : (
-                                        <div>Select co-worker</div>
+                                        <div className="flex items-center gap-2 py-0.5">
+                                          Select co-worker
+                                        </div>
                                       )}
                                       <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
                                     </button>
@@ -249,10 +251,13 @@ const SendProjectInvitationModal: React.FC<Props> = (props) => {
                                 render={({ field }) => (
                                   <CustomSelect
                                     {...field}
-                                    label={
-                                      <span className="capitalize">
-                                        {field.value ? ROLE[field.value] : "Select role"}
-                                      </span>
+                                    customButton={
+                                      <button className="flex w-full items-center justify-between gap-1 rounded-md border border-custom-border-200 shadow-sm duration-300 text-custom-text-200 hover:text-custom-text-100 hover:bg-custom-background-80 focus:outline-none px-3 py-2.5 text-sm text-left">
+                                        <span className="capitalize">
+                                          {field.value ? ROLE[field.value] : "Select role"}
+                                        </span>
+                                        <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
+                                      </button>
                                     }
                                     input
                                     width="w-full"
diff --git a/web/components/project/settings-sidebar.tsx b/web/components/project/settings-sidebar.tsx
index 9da5c10586f..a147c8a3aad 100644
--- a/web/components/project/settings-sidebar.tsx
+++ b/web/components/project/settings-sidebar.tsx
@@ -2,7 +2,11 @@ import React from "react";
 import { useRouter } from "next/router";
 import Link from "next/link";
 
-export const SettingsSidebar = () => {
+type Props = {
+  profilePage?: boolean;
+};
+
+export const SettingsSidebar: React.FC<Props> = ({ profilePage = false }) => {
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
 
@@ -43,30 +47,107 @@ export const SettingsSidebar = () => {
       href: `/${workspaceSlug}/projects/${projectId}/settings/automations`,
     },
   ];
+
+  const workspaceLinks: Array<{
+    label: string;
+    href: string;
+  }> = [
+    {
+      label: "General",
+      href: `/${workspaceSlug}/settings`,
+    },
+    {
+      label: "Members",
+      href: `/${workspaceSlug}/settings/members`,
+    },
+    {
+      label: "Billing & Plans",
+      href: `/${workspaceSlug}/settings/billing`,
+    },
+    {
+      label: "Integrations",
+      href: `/${workspaceSlug}/settings/integrations`,
+    },
+    {
+      label: "Imports",
+      href: `/${workspaceSlug}/settings/imports`,
+    },
+    {
+      label: "Exports",
+      href: `/${workspaceSlug}/settings/exports`,
+    },
+  ];
+
+  const profileLinks: Array<{
+    label: string;
+    href: string;
+  }> = [
+    {
+      label: "Profile",
+      href: `/${workspaceSlug}/me/profile`,
+    },
+    {
+      label: "Activity",
+      href: `/${workspaceSlug}/me/profile/activity`,
+    },
+    {
+      label: "Preferences",
+      href: `/${workspaceSlug}/me/profile/preferences`,
+    },
+  ];
+
   return (
-    <div className="flex flex-col gap-2 w-80 px-9">
-      <span className="text-xs text-custom-sidebar-text-400 font-semibold">SETTINGS</span>
-      <div className="flex flex-col gap-1 w-full">
-        {projectLinks.map((link) => (
-          <Link key={link.href} href={link.href}>
-            <a>
-              <div
-                className={`px-4 py-2 text-sm font-medium rounded-md ${
-                  (
-                    link.label === "Import"
-                      ? router.asPath.includes(link.href)
-                      : router.asPath === link.href
-                  )
-                    ? "bg-custom-primary-100/10 text-custom-primary-100"
-                    : "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:bg-custom-sidebar-background-80"
-                }`}
-              >
-                {link.label}
-              </div>
-            </a>
-          </Link>
-        ))}
+    <div className="flex flex-col gap-6 w-80 px-5">
+      <div className="flex flex-col gap-2">
+        <span className="text-xs text-custom-sidebar-text-400 font-semibold">SETTINGS</span>
+        <div className="flex flex-col gap-1 w-full">
+          {(projectId ? projectLinks : workspaceLinks).map((link) => (
+            <Link key={link.href} href={link.href}>
+              <a>
+                <div
+                  className={`px-4 py-2 text-sm font-medium rounded-md ${
+                    (
+                      link.label === "Import"
+                        ? router.asPath.includes(link.href)
+                        : router.asPath === link.href
+                    )
+                      ? "bg-custom-primary-100/10 text-custom-primary-100"
+                      : "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:bg-custom-sidebar-background-80"
+                  }`}
+                >
+                  {link.label}
+                </div>
+              </a>
+            </Link>
+          ))}
+        </div>
       </div>
+      {!projectId && (
+        <div className="flex flex-col gap-2">
+          <span className="text-xs text-custom-sidebar-text-400 font-semibold">My Account</span>
+          <div className="flex flex-col gap-1 w-full">
+            {profileLinks.map((link) => (
+              <Link key={link.href} href={link.href}>
+                <a>
+                  <div
+                    className={`px-4 py-2 text-sm font-medium rounded-md ${
+                      (
+                        link.label === "Import"
+                          ? router.asPath.includes(link.href)
+                          : router.asPath === link.href
+                      )
+                        ? "bg-custom-primary-100/10 text-custom-primary-100"
+                        : "text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:bg-custom-sidebar-background-80"
+                    }`}
+                  >
+                    {link.label}
+                  </div>
+                </a>
+              </Link>
+            ))}
+          </div>
+        </div>
+      )}
     </div>
   );
 };
diff --git a/web/components/states/single-state.tsx b/web/components/states/single-state.tsx
index 6ec19ff0696..eb2d9b61065 100644
--- a/web/components/states/single-state.tsx
+++ b/web/components/states/single-state.tsx
@@ -184,19 +184,20 @@ export const SingleState: React.FC<Props> = ({
             <ArrowDownIcon className="h-4 w-4" />
           </button>
         )}
-        {state.default ? (
-          <span className="text-xs text-custom-text-200">Default</span>
-        ) : (
-          <button
-            type="button"
-            className="hidden text-xs text-custom-sidebar-text-400 group-hover:inline-block"
-            onClick={handleMakeDefault}
-            disabled={isSubmitting}
-          >
-            Mark as default
-          </button>
-        )}
+
         <div className=" items-center gap-2.5 hidden group-hover:flex">
+          {state.default ? (
+            <span className="text-xs text-custom-text-200">Default</span>
+          ) : (
+            <button
+              type="button"
+              className="hidden text-xs text-custom-sidebar-text-400 group-hover:inline-block"
+              onClick={handleMakeDefault}
+              disabled={isSubmitting}
+            >
+              Mark as default
+            </button>
+          )}
           <button
             type="button"
             className="grid place-items-center group-hover:opacity-100 opacity-0"
@@ -215,14 +216,26 @@ export const SingleState: React.FC<Props> = ({
           >
             {state.default ? (
               <Tooltip tooltipContent="Cannot delete the default state.">
-                <X className="h-3.5 w-3.5 text-red-500" />
+                <X
+                  className={`h-4 w-4 ${
+                    groupLength < 1 ? "text-custom-sidebar-text-400" : "text-red-500"
+                  }`}
+                />
               </Tooltip>
             ) : groupLength === 1 ? (
               <Tooltip tooltipContent="Cannot have an empty group.">
-                <X className="h-3.5 w-3.5 text-red-500" />
+                <X
+                  className={`h-4 w-4 ${
+                    groupLength < 1 ? "text-custom-sidebar-text-400" : "text-red-500"
+                  }`}
+                />
               </Tooltip>
             ) : (
-              <X className="h-3.5 w-3.5 text-red-500" />
+              <X
+                className={`h-4 w-4 ${
+                  groupLength < 1 ? "text-custom-sidebar-text-400" : "text-red-500"
+                }`}
+              />
             )}
           </button>
         </div>
diff --git a/web/components/ui/integration-and-import-export-banner.tsx b/web/components/ui/integration-and-import-export-banner.tsx
index 541c49efcad..aa79abaf354 100644
--- a/web/components/ui/integration-and-import-export-banner.tsx
+++ b/web/components/ui/integration-and-import-export-banner.tsx
@@ -6,7 +6,7 @@ type Props = {
 };
 
 export const IntegrationAndImportExportBanner: React.FC<Props> = ({ bannerName, description }) => (
-  <div className="flex flex-col items-start gap-3 py-3.5 border-b border-custom-border-200">
+  <div className="flex items-start gap-3 py-3.5 border-b border-custom-border-200">
     <h3 className="text-xl font-medium">{bannerName}</h3>
     {description && (
       <div className="flex items-center gap-3 rounded-[10px] border border-custom-primary/75 bg-custom-primary/5 p-4 text-sm text-custom-text-100">
diff --git a/web/components/web-view/activity-message.tsx b/web/components/web-view/activity-message.tsx
index 956dfb9043a..7100cadc4d0 100644
--- a/web/components/web-view/activity-message.tsx
+++ b/web/components/web-view/activity-message.tsx
@@ -73,7 +73,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="group" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="group" className="!text-2xl" aria-hidden="true" />,
   },
 
   archived_at: {
@@ -81,7 +81,7 @@ const activityDetails: {
       if (activity.new_value === "restore") return "restored the issue.";
       else return "archived the issue.";
     },
-    icon: <Icon iconName="archive" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="archive" className="!text-2xl" aria-hidden="true" />,
   },
 
   attachment: {
@@ -99,7 +99,7 @@ const activityDetails: {
         {showIssue && <IssueLink activity={activity} />}
       </>
     ),
-    icon: <Icon iconName="attach_file" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="attach_file" className="!text-2xl" aria-hidden="true" />,
   },
 
   blocking: {
@@ -156,7 +156,7 @@ const activityDetails: {
         </button>
       </>
     ),
-    icon: <Icon iconName="contrast" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="contrast" className="!text-2xl" aria-hidden="true" />,
   },
 
   description: {
@@ -172,7 +172,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="chat" className="!text-2xl" aria-hidden="true" />,
   },
 
   estimate_point: {
@@ -190,7 +190,7 @@ const activityDetails: {
         )}
       </>
     ),
-    icon: <Icon iconName="change_history" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="change_history" className="!text-2xl" aria-hidden="true" />,
   },
 
   issue: {
@@ -198,7 +198,7 @@ const activityDetails: {
       if (activity.verb === "created") return "created the issue.";
       else return "deleted an issue.";
     },
-    icon: <Icon iconName="stack" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="stack" className="!text-2xl" aria-hidden="true" />,
   },
 
   labels: {
@@ -225,7 +225,7 @@ const activityDetails: {
         )}
       </>
     ),
-    icon: <Icon iconName="sell" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="sell" className="!text-2xl" aria-hidden="true" />,
   },
 
   link: {
@@ -255,7 +255,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="link" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="link" className="!text-2xl" aria-hidden="true" />,
   },
 
   modules: {
@@ -279,7 +279,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="dataset" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="dataset" className="!text-2xl" aria-hidden="true" />,
   },
 
   name: {
@@ -295,7 +295,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="chat" className="!text-2xl" aria-hidden="true" />,
   },
 
   parent: {
@@ -314,7 +314,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="supervised_user_circle" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="supervised_user_circle" className="!text-2xl" aria-hidden="true" />,
   },
 
   priority: {
@@ -333,7 +333,7 @@ const activityDetails: {
         .
       </>
     ),
-    icon: <Icon iconName="signal_cellular_alt" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="signal_cellular_alt" className="!text-2xl" aria-hidden="true" />,
   },
 
   start_date: {
@@ -351,7 +351,7 @@ const activityDetails: {
         )}
       </>
     ),
-    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="calendar_today" className="!text-2xl" aria-hidden="true" />,
   },
 
   state: {
@@ -389,7 +389,7 @@ const activityDetails: {
         )}
       </>
     ),
-    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
+    icon: <Icon iconName="calendar_today" className="!text-2xl" aria-hidden="true" />,
   },
 };
 
diff --git a/web/components/workspace/confirm-workspace-member-remove.tsx b/web/components/workspace/confirm-workspace-member-remove.tsx
index 9a480c500e4..9ca80c3dc67 100644
--- a/web/components/workspace/confirm-workspace-member-remove.tsx
+++ b/web/components/workspace/confirm-workspace-member-remove.tsx
@@ -79,7 +79,7 @@ const ConfirmWorkspaceMemberRemove: React.FC<Props> = ({ isOpen, onClose, data,
                     </div>
                   </div>
                 </div>
-                <div className="flex justify-end gap-2 bg-custom-background-90 p-4 sm:px-6">
+                <div className="flex justify-end gap-2 p-4 sm:px-6">
                   <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
                   <DangerButton onClick={handleDeletion} loading={isDeleteLoading}>
                     {isDeleteLoading ? "Removing..." : "Remove"}
diff --git a/web/components/workspace/index.ts b/web/components/workspace/index.ts
index 8e354a718a4..bb0f28a9367 100644
--- a/web/components/workspace/index.ts
+++ b/web/components/workspace/index.ts
@@ -6,7 +6,6 @@ export * from "./help-section";
 export * from "./issues-list";
 export * from "./issues-pie-chart";
 export * from "./issues-stats";
-export * from "./settings-header";
 export * from "./sidebar-dropdown";
 export * from "./sidebar-menu";
 export * from "./sidebar-quick-action";
diff --git a/web/components/workspace/settings-header.tsx b/web/components/workspace/settings-header.tsx
deleted file mode 100644
index 2f11b8a9825..00000000000
--- a/web/components/workspace/settings-header.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import SettingsNavbar from "layouts/settings-navbar";
-
-export const SettingsHeader = () => (
-  <div className="mb-8 space-y-6">
-    <div>
-      <h3 className="text-2xl font-semibold">Workspace Settings</h3>
-      <p className="mt-1 text-sm text-custom-text-200">
-        This information will be displayed to every member of the workspace.
-      </p>
-    </div>
-    <SettingsNavbar />
-  </div>
-);
diff --git a/web/layouts/settings-navbar.tsx b/web/layouts/settings-navbar.tsx
deleted file mode 100644
index 462a4b6a095..00000000000
--- a/web/layouts/settings-navbar.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-
-type Props = {
-  profilePage?: boolean;
-};
-
-const SettingsNavbar: React.FC<Props> = ({ profilePage = false }) => {
-  const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
-
-  const workspaceLinks: Array<{
-    label: string;
-    href: string;
-  }> = [
-    {
-      label: "General",
-      href: `/${workspaceSlug}/settings`,
-    },
-    {
-      label: "Members",
-      href: `/${workspaceSlug}/settings/members`,
-    },
-    {
-      label: "Billing & Plans",
-      href: `/${workspaceSlug}/settings/billing`,
-    },
-    {
-      label: "Integrations",
-      href: `/${workspaceSlug}/settings/integrations`,
-    },
-    {
-      label: "Imports",
-      href: `/${workspaceSlug}/settings/imports`,
-    },
-    {
-      label: "Exports",
-      href: `/${workspaceSlug}/settings/exports`,
-    },
-  ];
-
-  const projectLinks: Array<{
-    label: string;
-    href: string;
-  }> = [
-    {
-      label: "General",
-      href: `/${workspaceSlug}/projects/${projectId}/settings`,
-    },
-    {
-      label: "Control",
-      href: `/${workspaceSlug}/projects/${projectId}/settings/control`,
-    },
-    {
-      label: "Members",
-      href: `/${workspaceSlug}/projects/${projectId}/settings/members`,
-    },
-    {
-      label: "Features",
-      href: `/${workspaceSlug}/projects/${projectId}/settings/features`,
-    },
-    {
-      label: "States",
-      href: `/${workspaceSlug}/projects/${projectId}/settings/states`,
-    },
-    {
-      label: "Labels",
-      href: `/${workspaceSlug}/projects/${projectId}/settings/labels`,
-    },
-    {
-      label: "Integrations",
-      href: `/${workspaceSlug}/projects/${projectId}/settings/integrations`,
-    },
-    {
-      label: "Estimates",
-      href: `/${workspaceSlug}/projects/${projectId}/settings/estimates`,
-    },
-    {
-      label: "Automations",
-      href: `/${workspaceSlug}/projects/${projectId}/settings/automations`,
-    },
-  ];
-
-  const profileLinks: Array<{
-    label: string;
-    href: string;
-  }> = [
-    {
-      label: "General",
-      href: `/${workspaceSlug}/me/profile`,
-    },
-    {
-      label: "Activity",
-      href: `/${workspaceSlug}/me/profile/activity`,
-    },
-    {
-      label: "Preferences",
-      href: `/${workspaceSlug}/me/profile/preferences`,
-    },
-  ];
-
-  return (
-    <div className="flex flex-wrap gap-4">
-      {(profilePage ? profileLinks : projectId ? projectLinks : workspaceLinks).map((link) => (
-        <Link key={link.href} href={link.href}>
-          <a>
-            <div
-              className={`rounded-full border px-5 py-1.5 text-sm outline-none ${
-                (
-                  link.label === "Import"
-                    ? router.asPath.includes(link.href)
-                    : router.asPath === link.href
-                )
-                  ? "border-custom-primary bg-custom-primary text-white"
-                  : "border-custom-border-200 bg-custom-background-100 hover:bg-custom-background-90"
-              }`}
-            >
-              {link.label}
-            </div>
-          </a>
-        </Link>
-      ))}
-    </div>
-  );
-};
-
-export default SettingsNavbar;
diff --git a/web/pages/[workspaceSlug]/me/profile/activity.tsx b/web/pages/[workspaceSlug]/me/profile/activity.tsx
index 20f2784272c..6313e950731 100644
--- a/web/pages/[workspaceSlug]/me/profile/activity.tsx
+++ b/web/pages/[workspaceSlug]/me/profile/activity.tsx
@@ -7,7 +7,6 @@ import Link from "next/link";
 import userService from "services/user.service";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
-import SettingsNavbar from "layouts/settings-navbar";
 // components
 import { ActivityIcon, ActivityMessage } from "components/core";
 import { TipTapEditor } from "components/tiptap";
@@ -20,6 +19,7 @@ import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
 import { USER_ACTIVITY } from "constants/fetch-keys";
 // helper
 import { timeAgo } from "helpers/date-time.helper";
+import { SettingsSidebar } from "components/project";
 
 const ProfileActivity = () => {
   const router = useRouter();
@@ -38,186 +38,179 @@ const ProfileActivity = () => {
         </Breadcrumbs>
       }
     >
-      <div className="p-8">
-        <div className="mb-8 space-y-6">
-          <div>
-            <h3 className="text-3xl font-semibold">Profile Settings</h3>
-            <p className="mt-1 text-custom-text-200">
-              This information will be visible to only you.
-            </p>
-          </div>
-          <SettingsNavbar profilePage />
+      <div className="flex flex-row gap-2">
+        <div className="w-80 py-8">
+          <SettingsSidebar />
         </div>
+
         {userActivity ? (
-          <div>
-            <ul role="list" className="-mb-4">
-              {userActivity.results.map((activityItem: any, activityIdx: number) => {
-                if (activityItem.field === "comment") {
-                  return (
-                    <div key={activityItem.id} className="mt-2">
-                      <div className="relative flex items-start space-x-3">
-                        <div className="relative px-1">
-                          {activityItem.field ? (
-                            activityItem.new_value === "restore" && (
-                              <Icon iconName="history" className="text-sm text-custom-text-200" />
-                            )
-                          ) : activityItem.actor_detail.avatar &&
-                            activityItem.actor_detail.avatar !== "" ? (
-                            <img
-                              src={activityItem.actor_detail.avatar}
-                              alt={activityItem.actor_detail.display_name}
-                              height={30}
-                              width={30}
-                              className="grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white"
-                            />
-                          ) : (
-                            <div
-                              className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white`}
-                            >
-                              {activityItem.actor_detail.display_name?.charAt(0)}
-                            </div>
-                          )}
+          <section className="pr-9 py-8 w-full">
+            <div className="flex items-center py-3.5 border-b border-custom-border-200">
+              <h3 className="text-xl font-medium">Acitivity</h3>
+            </div>
+            <div className={`flex flex-col gap-2 py-4 w-full`}>
+              <ul role="list" className="-mb-4">
+                {userActivity.results.map((activityItem: any, activityIdx: number) => {
+                  if (activityItem.field === "comment") {
+                    return (
+                      <div key={activityItem.id} className="mt-2">
+                        <div className="relative flex items-start space-x-3">
+                          <div className="relative px-1">
+                            {activityItem.field ? (
+                              activityItem.new_value === "restore" && (
+                                <Icon iconName="history" className="text-sm text-custom-text-200" />
+                              )
+                            ) : activityItem.actor_detail.avatar &&
+                              activityItem.actor_detail.avatar !== "" ? (
+                              <img
+                                src={activityItem.actor_detail.avatar}
+                                alt={activityItem.actor_detail.display_name}
+                                height={30}
+                                width={30}
+                                className="grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white"
+                              />
+                            ) : (
+                              <div
+                                className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white`}
+                              >
+                                {activityItem.actor_detail.display_name?.charAt(0)}
+                              </div>
+                            )}
 
-                          <span className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
-                            <ChatBubbleLeftEllipsisIcon
-                              className="h-3.5 w-3.5 text-custom-text-200"
-                              aria-hidden="true"
-                            />
-                          </span>
-                        </div>
-                        <div className="min-w-0 flex-1">
-                          <div>
-                            <div className="text-xs">
-                              {activityItem.actor_detail.is_bot
-                                ? activityItem.actor_detail.first_name + " Bot"
-                                : activityItem.actor_detail.display_name}
-                            </div>
-                            <p className="mt-0.5 text-xs text-custom-text-200">
-                              Commented {timeAgo(activityItem.created_at)}
-                            </p>
+                            <span className="ring-6 flex h-6 w-6 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
+                              <ChatBubbleLeftEllipsisIcon
+                                className="h-6 w-6 !text-2xl text-custom-text-200"
+                                aria-hidden="true"
+                              />
+                            </span>
                           </div>
-                          <div className="issue-comments-section p-0">
-                            <TipTapEditor
-                              workspaceSlug={workspaceSlug as string}
-                              value={
-                                activityItem?.new_value !== ""
-                                  ? activityItem.new_value
-                                  : activityItem.old_value
-                              }
-                              customClassName="text-xs border border-custom-border-200 bg-custom-background-100"
-                              noBorder
-                              borderOnFocus={false}
-                              editable={false}
-                            />
+                          <div className="min-w-0 flex-1">
+                            <div>
+                              <div className="text-xs">
+                                {activityItem.actor_detail.is_bot
+                                  ? activityItem.actor_detail.first_name + " Bot"
+                                  : activityItem.actor_detail.display_name}
+                              </div>
+                              <p className="mt-0.5 text-xs text-custom-text-200">
+                                Commented {timeAgo(activityItem.created_at)}
+                              </p>
+                            </div>
+                            <div className="issue-comments-section p-0">
+                              <TipTapEditor
+                                workspaceSlug={workspaceSlug as string}
+                                value={
+                                  activityItem?.new_value !== ""
+                                    ? activityItem.new_value
+                                    : activityItem.old_value
+                                }
+                                customClassName="text-xs border border-custom-border-200 bg-custom-background-100"
+                                noBorder
+                                borderOnFocus={false}
+                                editable={false}
+                              />
+                            </div>
                           </div>
                         </div>
                       </div>
-                    </div>
-                  );
-                }
+                    );
+                  }
 
-                const message =
-                  activityItem.verb === "created" &&
-                  activityItem.field !== "cycles" &&
-                  activityItem.field !== "modules" &&
-                  activityItem.field !== "attachment" &&
-                  activityItem.field !== "link" &&
-                  activityItem.field !== "estimate" ? (
-                    <span className="text-custom-text-200">
-                      created{" "}
-                      <Link
-                        href={`/${workspaceSlug}/projects/${activityItem.project}/issues/${activityItem.issue}`}
-                      >
-                        <a className="inline-flex items-center hover:underline">
-                          this issue. <ArrowTopRightOnSquareIcon className="ml-1 h-3.5 w-3.5" />
-                        </a>
-                      </Link>
-                    </span>
-                  ) : activityItem.field ? (
-                    <ActivityMessage activity={activityItem} showIssue />
-                  ) : (
-                    "created the issue."
-                  );
+                  const message =
+                    activityItem.verb === "created" &&
+                    activityItem.field !== "cycles" &&
+                    activityItem.field !== "modules" &&
+                    activityItem.field !== "attachment" &&
+                    activityItem.field !== "link" &&
+                    activityItem.field !== "estimate" ? (
+                      <span className="text-custom-text-200">
+                        created{" "}
+                        <Link
+                          href={`/${workspaceSlug}/projects/${activityItem.project}/issues/${activityItem.issue}`}
+                        >
+                          <a className="inline-flex items-center hover:underline">
+                            this issue. <ArrowTopRightOnSquareIcon className="ml-1 h-3.5 w-3.5" />
+                          </a>
+                        </Link>
+                      </span>
+                    ) : activityItem.field ? (
+                      <ActivityMessage activity={activityItem} showIssue />
+                    ) : (
+                      "created the issue."
+                    );
 
-                if ("field" in activityItem && activityItem.field !== "updated_by") {
-                  return (
-                    <li key={activityItem.id}>
-                      <div className="relative pb-1">
-                        {userActivity.results.length > 1 &&
-                        activityIdx !== userActivity.results.length - 1 ? (
-                          <span
-                            className="absolute top-5 left-5 -ml-px h-full w-0.5 bg-custom-background-80"
-                            aria-hidden="true"
-                          />
-                        ) : null}
-                        <div className="relative flex items-start space-x-2">
-                          <>
-                            <div>
-                              <div className="relative px-1.5">
-                                <div className="mt-1.5">
-                                  <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
-                                    {activityItem.field ? (
-                                      activityItem.new_value === "restore" ? (
-                                        <Icon
-                                          iconName="history"
-                                          className="text-sm text-custom-text-200"
+                  if ("field" in activityItem && activityItem.field !== "updated_by") {
+                    return (
+                      <li key={activityItem.id}>
+                        <div className="relative pb-1">
+                          <div className="relative flex items-center space-x-2">
+                            <>
+                              <div>
+                                <div className="relative px-1.5">
+                                  <div className="mt-1.5">
+                                    <div className="flex h-6 w-6 items-center justify-center">
+                                      {activityItem.field ? (
+                                        activityItem.new_value === "restore" ? (
+                                          <Icon
+                                            iconName="history"
+                                            className="!text-2xl text-custom-text-200"
+                                          />
+                                        ) : (
+                                          <ActivityIcon activity={activityItem} />
+                                        )
+                                      ) : activityItem.actor_detail.avatar &&
+                                        activityItem.actor_detail.avatar !== "" ? (
+                                        <img
+                                          src={activityItem.actor_detail.avatar}
+                                          alt={activityItem.actor_detail.display_name}
+                                          height={24}
+                                          width={24}
+                                          className="rounded-full"
                                         />
                                       ) : (
-                                        <ActivityIcon activity={activityItem} />
-                                      )
-                                    ) : activityItem.actor_detail.avatar &&
-                                      activityItem.actor_detail.avatar !== "" ? (
-                                      <img
-                                        src={activityItem.actor_detail.avatar}
-                                        alt={activityItem.actor_detail.display_name}
-                                        height={24}
-                                        width={24}
-                                        className="rounded-full"
-                                      />
-                                    ) : (
-                                      <div
-                                        className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-700 text-xs text-white`}
-                                      >
-                                        {activityItem.actor_detail.display_name?.charAt(0)}
-                                      </div>
-                                    )}
+                                        <div
+                                          className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-700 text-xs text-white`}
+                                        >
+                                          {activityItem.actor_detail.display_name?.charAt(0)}
+                                        </div>
+                                      )}
+                                    </div>
                                   </div>
                                 </div>
                               </div>
-                            </div>
-                            <div className="min-w-0 flex-1 py-3">
-                              <div className="text-xs text-custom-text-200 break-words">
-                                {activityItem.field === "archived_at" &&
-                                activityItem.new_value !== "restore" ? (
-                                  <span className="text-gray font-medium">Plane</span>
-                                ) : activityItem.actor_detail.is_bot ? (
-                                  <span className="text-gray font-medium">
-                                    {activityItem.actor_detail.first_name} Bot
+                              <div className="min-w-0 flex-1 py-4 border-b border-custom-border-200">
+                                <div className="text-sm text-custom-text-200 break-words">
+                                  {activityItem.field === "archived_at" &&
+                                  activityItem.new_value !== "restore" ? (
+                                    <span className="text-gray font-medium">Plane</span>
+                                  ) : activityItem.actor_detail.is_bot ? (
+                                    <span className="text-gray font-medium">
+                                      {activityItem.actor_detail.first_name} Bot
+                                    </span>
+                                  ) : (
+                                    <Link
+                                      href={`/${workspaceSlug}/profile/${activityItem.actor_detail.id}`}
+                                    >
+                                      <a className="text-gray font-medium">
+                                        {activityItem.actor_detail.display_name}
+                                      </a>
+                                    </Link>
+                                  )}{" "}
+                                  {message}{" "}
+                                  <span className="whitespace-nowrap">
+                                    {timeAgo(activityItem.created_at)}
                                   </span>
-                                ) : (
-                                  <Link
-                                    href={`/${workspaceSlug}/profile/${activityItem.actor_detail.id}`}
-                                  >
-                                    <a className="text-gray font-medium">
-                                      {activityItem.actor_detail.display_name}
-                                    </a>
-                                  </Link>
-                                )}{" "}
-                                {message}{" "}
-                                <span className="whitespace-nowrap">
-                                  {timeAgo(activityItem.created_at)}
-                                </span>
+                                </div>
                               </div>
-                            </div>
-                          </>
+                            </>
+                          </div>
                         </div>
-                      </div>
-                    </li>
-                  );
-                }
-              })}
-            </ul>
-          </div>
+                      </li>
+                    );
+                  }
+                })}
+              </ul>
+            </div>
+          </section>
         ) : (
           <Loader className="space-y-5">
             <Loader.Item height="40px" />
diff --git a/web/pages/[workspaceSlug]/me/profile/index.tsx b/web/pages/[workspaceSlug]/me/profile/index.tsx
index 6c0af1bc27d..6b083143eb4 100644
--- a/web/pages/[workspaceSlug]/me/profile/index.tsx
+++ b/web/pages/[workspaceSlug]/me/profile/index.tsx
@@ -1,4 +1,6 @@
 import React, { useEffect, useState } from "react";
+import { useRouter } from "next/router";
+import Link from "next/link";
 
 // react-hook-form
 import { Controller, useForm } from "react-hook-form";
@@ -10,21 +12,15 @@ import useUserAuth from "hooks/use-user-auth";
 import useToast from "hooks/use-toast";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
-import SettingsNavbar from "layouts/settings-navbar";
 // components
 import { ImagePickerPopover, ImageUploadModal } from "components/core";
+import { SettingsSidebar } from "components/project";
 // ui
-import {
-  CustomSearchSelect,
-  CustomSelect,
-  DangerButton,
-  Input,
-  SecondaryButton,
-  Spinner,
-} from "components/ui";
+import { CustomSearchSelect, CustomSelect, Input, PrimaryButton, Spinner } from "components/ui";
 import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
 // icons
 import { UserIcon } from "@heroicons/react/24/outline";
+import { UserCircle } from "lucide-react";
 // types
 import type { NextPage } from "next";
 import type { IUser } from "types";
@@ -46,6 +42,9 @@ const Profile: NextPage = () => {
   const [isRemoving, setIsRemoving] = useState(false);
   const [isImageUploadModalOpen, setIsImageUploadModalOpen] = useState(false);
 
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
   const {
     register,
     handleSubmit,
@@ -126,6 +125,7 @@ const Profile: NextPage = () => {
               if (!prevData) return prevData;
               return { ...prevData, avatar: "" };
             }, false);
+            setIsRemoving(false);
           })
           .catch(() => {
             setToastAlert({
@@ -155,6 +155,8 @@ const Profile: NextPage = () => {
       <ImageUploadModal
         isOpen={isImageUploadModalOpen}
         onClose={() => setIsImageUploadModalOpen(false)}
+        isRemoving={isRemoving}
+        handleDelete={() => handleDelete(myProfile?.avatar, true)}
         onSuccess={(url) => {
           setValue("avatar", url);
           handleSubmit(onSubmit)();
@@ -164,81 +166,49 @@ const Profile: NextPage = () => {
         userImage
       />
       {myProfile ? (
-        <div className="p-8">
-          <div className="mb-8 space-y-6">
-            <div>
-              <h3 className="text-3xl font-semibold">Profile Settings</h3>
-              <p className="mt-1 text-custom-text-200">
-                This information will be visible to only you.
-              </p>
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <div className="flex flex-row gap-2">
+            <div className="w-80 py-8">
+              <SettingsSidebar />
             </div>
-            <SettingsNavbar profilePage />
-          </div>
-          <form onSubmit={handleSubmit(onSubmit)} className="space-y-8 sm:space-y-12">
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold text-custom-text-100">Profile Picture</h4>
-                <p className="text-sm text-custom-text-200">
-                  Max file size is 5MB. Supported file types are .jpg and .png.
-                </p>
-              </div>
-              <div className="col-span-12 sm:col-span-6">
-                <div className="flex items-center gap-4">
-                  <button type="button" onClick={() => setIsImageUploadModalOpen(true)}>
-                    {!watch("avatar") || watch("avatar") === "" ? (
-                      <div className="h-12 w-12 rounded-md bg-custom-background-80 p-2">
-                        <UserIcon className="h-full w-full text-custom-text-200" />
-                      </div>
-                    ) : (
-                      <div className="relative h-12 w-12 overflow-hidden">
-                        <img
-                          src={watch("avatar")}
-                          className="absolute top-0 left-0 h-full w-full object-cover rounded-md"
-                          onClick={() => setIsImageUploadModalOpen(true)}
-                          alt={myProfile.display_name}
-                        />
-                      </div>
-                    )}
-                  </button>
-                  <div className="flex items-center gap-2">
-                    <SecondaryButton
-                      onClick={() => {
-                        setIsImageUploadModalOpen(true);
-                      }}
-                    >
-                      Upload
-                    </SecondaryButton>
-                    {myProfile.avatar && myProfile.avatar !== "" && (
-                      <DangerButton
-                        onClick={() => handleDelete(myProfile.avatar, true)}
-                        loading={isRemoving}
-                      >
-                        {isRemoving ? "Removing..." : "Remove"}
-                      </DangerButton>
-                    )}
+            <div className={`flex flex-col gap-8 pr-9 py-9 w-full`}>
+              <div className="relative h-44 w-full mt-6">
+                <img
+                  src={
+                    watch("cover_image") ??
+                    "https://images.unsplash.com/photo-1506383796573-caf02b4a79ab"
+                  }
+                  className="h-44 w-full rounded-lg object-cover"
+                  alt={myProfile?.name ?? "Cover image"}
+                />
+                <div className="flex items-end justify-between absolute left-8 -bottom-6">
+                  <div className="flex gap-3">
+                    <div className="flex items-center justify-center bg-custom-background-90 h-16 w-16 rounded-lg">
+                      <button type="button" onClick={() => setIsImageUploadModalOpen(true)}>
+                        {!watch("avatar") || watch("avatar") === "" ? (
+                          <div className="h-16 w-16 rounded-md bg-custom-background-80 p-2">
+                            <UserIcon className="h-full w-full text-custom-text-200" />
+                          </div>
+                        ) : (
+                          <div className="relative h-16 w-16 overflow-hidden">
+                            <img
+                              src={watch("avatar")}
+                              className="absolute top-0 left-0 h-full w-full object-cover rounded-lg"
+                              onClick={() => setIsImageUploadModalOpen(true)}
+                              alt={myProfile.display_name}
+                            />
+                          </div>
+                        )}
+                      </button>
+                    </div>
                   </div>
                 </div>
-              </div>
-            </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold">Cover Photo</h4>
-                <p className="text-sm text-custom-text-200">
-                  Select your cover photo from the given library.
-                </p>
-              </div>
-              <div className="col-span-12 sm:col-span-6">
-                <div className="h-32 w-full rounded border border-custom-border-200 p-1">
-                  <div className="relative h-full w-full rounded">
-                    <img
-                      src={
-                        watch("cover_image") ??
-                        "https://images.unsplash.com/photo-1506383796573-caf02b4a79ab"
-                      }
-                      className="absolute top-0 left-0 h-full w-full object-cover rounded"
-                      alt={myProfile?.name ?? "Cover image"}
-                    />
-                    <div className="absolute bottom-0 flex w-full justify-end">
+
+                <div className="flex absolute right-3 bottom-3">
+                  <Controller
+                    control={control}
+                    name="cover_image"
+                    render={() => (
                       <ImagePickerPopover
                         label={"Change cover"}
                         onChange={(imageUrl) => {
@@ -249,157 +219,167 @@ const Profile: NextPage = () => {
                           "https://images.unsplash.com/photo-1506383796573-caf02b4a79ab"
                         }
                       />
-                    </div>
-                  </div>
+                    )}
+                  />
                 </div>
               </div>
-            </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold text-custom-text-100">Full Name</h4>
-              </div>
-              <div className="col-span-12 flex items-center gap-2 sm:col-span-6">
-                <Input
-                  name="first_name"
-                  id="first_name"
-                  register={register}
-                  error={errors.first_name}
-                  placeholder="Enter your first name"
-                  autoComplete="off"
-                />
-                <Input
-                  name="last_name"
-                  register={register}
-                  error={errors.last_name}
-                  id="last_name"
-                  placeholder="Enter your last name"
-                  autoComplete="off"
-                />
-              </div>
-            </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold text-custom-text-100">Display Name</h4>
-                <p className="text-sm text-custom-text-200">
-                  This could be your first name, or a nickname — however you{"'"}d like people to
-                  refer to you in Plane.
-                </p>
-              </div>
-              <div className="col-span-12 sm:col-span-6">
-                <Input
-                  id="display_name"
-                  name="display_name"
-                  autoComplete="off"
-                  register={register}
-                  error={errors.display_name}
-                  className="w-full"
-                  placeholder="Enter your display name"
-                  validations={{
-                    required: "Display name is required.",
-                    validate: (value) => {
-                      if (value.trim().length < 1) return "Display name can't be empty.";
-
-                      if (value.split("  ").length > 1)
-                        return "Display name can't have two consecutive spaces.";
-
-                      if (value.replace(/\s/g, "").length < 1)
-                        return "Display name must be at least 1 characters long.";
-
-                      if (value.replace(/\s/g, "").length > 20)
-                        return "Display name must be less than 20 characters long.";
-
-                      return true;
-                    },
-                  }}
-                />
-              </div>
-            </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold text-custom-text-100">Email</h4>
-                <p className="text-sm text-custom-text-200">
-                  The email address that you are using.
-                </p>
-              </div>
-              <div className="col-span-12 sm:col-span-6">
-                <Input
-                  id="email"
-                  name="email"
-                  autoComplete="off"
-                  register={register}
-                  error={errors.name}
-                  className="w-full"
-                  disabled
-                />
-              </div>
-            </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold text-custom-text-100">Role</h4>
-                <p className="text-sm text-custom-text-200">Add your role.</p>
+
+              <div className="flex item-center justify-between px-8 mt-4">
+                <div className="flex flex-col">
+                  <div className="flex item-center text-lg font-semibold text-custom-text-100">
+                    <span>{`${watch("first_name")} ${watch("last_name")}`}</span>
+                  </div>
+                  <span className="text-sm tracking-tight">{watch("email")}</span>
+                </div>
+
+                <Link href={`/${workspaceSlug}/profile/${myProfile.id}`}>
+                  <a className="flex item-center cursor-pointer gap-2 h-4 leading-4 text-sm text-custom-primary-100">
+                    <span className="h-4 w-4">
+                      <UserCircle className="h-4 w-4" />
+                    </span>
+                    View Profile
+                  </a>
+                </Link>
               </div>
-              <div className="col-span-12 sm:col-span-6">
-                <Controller
-                  name="role"
-                  control={control}
-                  rules={{ required: "This field is required" }}
-                  render={({ field: { value, onChange } }) => (
-                    <CustomSelect
-                      value={value}
-                      onChange={onChange}
-                      label={value ? value.toString() : "Select your role"}
-                      buttonClassName={errors.role ? "border-red-500 bg-red-500/10" : ""}
-                      width="w-full"
-                      input
-                      position="right"
-                    >
-                      {USER_ROLES.map((item) => (
-                        <CustomSelect.Option key={item.value} value={item.value}>
-                          {item.label}
-                        </CustomSelect.Option>
-                      ))}
-                    </CustomSelect>
+
+              <div className="grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-3 gap-6 px-8">
+                <div className="flex flex-col gap-1">
+                  <h4 className="text-sm">First Name</h4>
+                  <Input
+                    name="first_name"
+                    id="first_name"
+                    register={register}
+                    error={errors.first_name}
+                    placeholder="Enter your first name"
+                    className="!px-3 !py-2 rounded-md font-medium"
+                    autoComplete="off"
+                  />
+                </div>
+
+                <div className="flex flex-col gap-1">
+                  <h4 className="text-sm">Last Name</h4>
+                  <Input
+                    name="last_name"
+                    register={register}
+                    error={errors.last_name}
+                    id="last_name"
+                    placeholder="Enter your last name"
+                    autoComplete="off"
+                    className="!px-3 !py-2 rounded-md font-medium"
+                  />
+                </div>
+
+                <div className="flex flex-col gap-1">
+                  <h4 className="text-sm">Email</h4>
+                  <Input
+                    id="email"
+                    name="email"
+                    autoComplete="off"
+                    register={register}
+                    className="!px-3 !py-2 rounded-md font-medium"
+                    error={errors.name}
+                    disabled
+                  />
+                </div>
+
+                <div className="flex flex-col gap-1">
+                  <h4 className="text-sm">Role</h4>
+                  <Controller
+                    name="role"
+                    control={control}
+                    rules={{ required: "This field is required" }}
+                    render={({ field: { value, onChange } }) => (
+                      <CustomSelect
+                        value={value}
+                        onChange={onChange}
+                        label={value ? value.toString() : "Select your role"}
+                        buttonClassName={errors.role ? "border-red-500 bg-red-500/10" : ""}
+                        width="w-full"
+                        input
+                        verticalPosition="top"
+                        position="right"
+                      >
+                        {USER_ROLES.map((item) => (
+                          <CustomSelect.Option key={item.value} value={item.value}>
+                            {item.label}
+                          </CustomSelect.Option>
+                        ))}
+                      </CustomSelect>
+                    )}
+                  />
+                  {errors.role && (
+                    <span className="text-xs text-red-500">Please select a role</span>
                   )}
-                />
-                {errors.role && <span className="text-xs text-red-500">Please select a role</span>}
-              </div>
-            </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold text-custom-text-100">Timezone</h4>
-                <p className="text-sm text-custom-text-200">Select a timezone</p>
-              </div>
-              <div className="col-span-12 sm:col-span-6">
-                <Controller
-                  name="user_timezone"
-                  control={control}
-                  rules={{ required: "This field is required" }}
-                  render={({ field: { value, onChange } }) => (
-                    <CustomSearchSelect
-                      value={value}
-                      label={
-                        value
-                          ? TIME_ZONES.find((t) => t.value === value)?.label ?? value
-                          : "Select a timezone"
-                      }
-                      options={timeZoneOptions}
-                      onChange={onChange}
-                      verticalPosition="top"
-                      optionsClassName="w-full"
-                      input
-                    />
+                </div>
+
+                <div className="flex flex-col gap-1">
+                  <h4 className="text-sm">Display name </h4>
+
+                  <Input
+                    id="display_name"
+                    name="display_name"
+                    autoComplete="off"
+                    register={register}
+                    error={errors.display_name}
+                    className="w-full"
+                    placeholder="Enter your display name"
+                    validations={{
+                      required: "Display name is required.",
+                      validate: (value) => {
+                        if (value.trim().length < 1) return "Display name can't be empty.";
+
+                        if (value.split("  ").length > 1)
+                          return "Display name can't have two consecutive spaces.";
+
+                        if (value.replace(/\s/g, "").length < 1)
+                          return "Display name must be at least 1 characters long.";
+
+                        if (value.replace(/\s/g, "").length > 20)
+                          return "Display name must be less than 20 characters long.";
+
+                        return true;
+                      },
+                    }}
+                  />
+                </div>
+
+                <div className="flex flex-col gap-1">
+                  <h4 className="text-sm">Timezone </h4>
+
+                  <Controller
+                    name="user_timezone"
+                    control={control}
+                    rules={{ required: "This field is required" }}
+                    render={({ field: { value, onChange } }) => (
+                      <CustomSearchSelect
+                        value={value}
+                        label={
+                          value
+                            ? TIME_ZONES.find((t) => t.value === value)?.label ?? value
+                            : "Select a timezone"
+                        }
+                        options={timeZoneOptions}
+                        onChange={onChange}
+                        verticalPosition="top"
+                        optionsClassName="w-full"
+                        input
+                      />
+                    )}
+                  />
+                  {errors.role && (
+                    <span className="text-xs text-red-500">Please select a role</span>
                   )}
-                />
-                {errors.role && <span className="text-xs text-red-500">Please select a role</span>}
+                </div>
+
+                <div className="flex items-center justify-between py-2">
+                  <PrimaryButton type="submit" loading={isSubmitting}>
+                    {isSubmitting ? "Updating Project..." : "Update Project"}
+                  </PrimaryButton>
+                </div>
               </div>
             </div>
-            <div className="sm:text-right">
-              <SecondaryButton type="submit" loading={isSubmitting}>
-                {isSubmitting ? "Updating..." : "Update profile"}
-              </SecondaryButton>
-            </div>
-          </form>
-        </div>
+          </div>
+        </form>
       ) : (
         <div className="grid h-full w-full place-items-center px-4 sm:px-0">
           <Spinner />
diff --git a/web/pages/[workspaceSlug]/me/profile/preferences.tsx b/web/pages/[workspaceSlug]/me/profile/preferences.tsx
index 8205ec129cc..031ed367cb1 100644
--- a/web/pages/[workspaceSlug]/me/profile/preferences.tsx
+++ b/web/pages/[workspaceSlug]/me/profile/preferences.tsx
@@ -3,7 +3,6 @@ import { useEffect, useState } from "react";
 import useUserAuth from "hooks/use-user-auth";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
-import SettingsNavbar from "layouts/settings-navbar";
 // components
 import { CustomThemeSelector, ThemeSwitch } from "components/core";
 // ui
@@ -15,6 +14,7 @@ import { ICustomTheme } from "types";
 import { observer } from "mobx-react-lite";
 // mobx store
 import { useMobxStore } from "lib/mobx/store-provider";
+import { SettingsSidebar } from "components/project";
 
 const ProfilePreferences = observer(() => {
   const { user: myProfile } = useUserAuth();
@@ -59,18 +59,16 @@ const ProfilePreferences = observer(() => {
       }
     >
       {myProfile ? (
-        <div className="p-8">
-          <div className="mb-8 space-y-6">
-            <div>
-              <h3 className="text-3xl font-semibold">Profile Settings</h3>
-              <p className="mt-1 text-custom-text-200">
-                This information will be visible to only you.
-              </p>
-            </div>
-            <SettingsNavbar profilePage />
+        <div className="flex flex-row gap-2">
+          <div className="w-80 py-8">
+            <SettingsSidebar />
           </div>
-          <div className="space-y-8 sm:space-y-12">
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
+
+          <div className="pr-9 py-8 w-full">
+            <div className="flex items-center py-3.5 border-b border-custom-border-200">
+              <h3 className="text-xl font-medium">Acitivity</h3>
+            </div>
+            <div className="grid grid-cols-12 gap-4 sm:gap-16 py-6">
               <div className="col-span-12 sm:col-span-6">
                 <h4 className="text-lg font-semibold text-custom-text-100">Theme</h4>
                 <p className="text-sm text-custom-text-200">
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
index 0aaaf0b1c93..e72616c0ad6 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/features.tsx
@@ -19,7 +19,8 @@ import { ToggleSwitch } from "components/ui";
 import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
 // icons
 import { ModuleIcon } from "components/icons";
-import { Contrast, FileText, Inbox, Layers } from "lucide-react";
+import { FileText, Inbox, Layers } from "lucide-react";
+import { ContrastOutlined } from "@mui/icons-material";
 // types
 import { IProject } from "types";
 import type { NextPage } from "next";
@@ -33,7 +34,10 @@ const featuresList = [
     title: "Cycles",
     description:
       "Cycles are enabled for all the projects in this workspace. Access them from the sidebar.",
-    icon: <Contrast className="h-4 w-4 text-custom-primary-100 flex-shrink-0" />,
+    icon: (
+      <ContrastOutlined className="!text-base !leading-4 text-purple-500 flex-shrink-0 rotate-180" />
+    ),
+
     property: "cycle_view",
   },
   {
@@ -61,7 +65,7 @@ const featuresList = [
     title: "Inbox",
     description:
       "Inbox are enabled for all the projects in this workspace. Access it from the issues views page.",
-    icon: <Inbox className="h-4 w-4 text-cyan-500 flex-shrink-0" />,
+    icon: <Inbox className="h-4 w-4 text-fuchsia-500 flex-shrink-0" />,
     property: "inbox_view",
   },
 ];
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
index 612d21c145c..cd9e9e6ec2b 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
@@ -25,7 +25,6 @@ import {
   TextArea,
   Loader,
   CustomSelect,
-  SecondaryButton,
   DangerButton,
   Icon,
   PrimaryButton,
@@ -67,7 +66,7 @@ const GeneralSettings: NextPage = () => {
       : null
   );
 
-  const { data: memberDetails, error } = useSWR(
+  const { data: memberDetails } = useSWR(
     workspaceSlug && projectId ? USER_PROJECT_VIEW(projectId.toString()) : null,
     workspaceSlug && projectId
       ? () => projectService.projectMemberMe(workspaceSlug.toString(), projectId.toString())
@@ -168,6 +167,7 @@ const GeneralSettings: NextPage = () => {
   };
 
   const currentNetwork = NETWORK_CHOICES.find((n) => n.key === projectDetails?.network);
+  const selectedNetwork = NETWORK_CHOICES.find((n) => n.key === watch("network"));
 
   const isAdmin = memberDetails?.role === 20;
 
@@ -350,7 +350,7 @@ const GeneralSettings: NextPage = () => {
                         <CustomSelect
                           value={value}
                           onChange={onChange}
-                          label={currentNetwork?.label ?? "Select network"}
+                          label={selectedNetwork?.label ?? "Select network"}
                           className="!border-custom-border-200 !shadow-none"
                           input
                           disabled={!isAdmin}
@@ -388,59 +388,60 @@ const GeneralSettings: NextPage = () => {
                 )}
               </div>
             </div>
-
-            <Disclosure as="div" className="border-t border-custom-border-400">
-              {({ open }) => (
-                <div className="w-full">
-                  <Disclosure.Button
-                    as="button"
-                    type="button"
-                    className="flex items-center justify-between w-full py-4"
-                  >
-                    <span className="text-xl tracking-tight">Danger Zone</span>
-                    <Icon iconName={open ? "expand_more" : "expand_less"} className="!text-2xl" />
-                  </Disclosure.Button>
-
-                  <Transition
-                    show={open}
-                    enter="transition duration-100 ease-out"
-                    enterFrom="transform opacity-0"
-                    enterTo="transform opacity-100"
-                    leave="transition duration-75 ease-out"
-                    leaveFrom="transform opacity-100"
-                    leaveTo="transform opacity-0"
-                  >
-                    <Disclosure.Panel>
-                      <div className="flex flex-col gap-8">
-                        <span className="text-sm tracking-tight">
-                          The danger zone of the project delete page is a critical area that
-                          requires careful consideration and attention. When deleting a project, all
-                          of the data and resources within that project will be permanently removed
-                          and cannot be recovered.
-                        </span>
-                        <div>
-                          {projectDetails ? (
-                            <div>
-                              <DangerButton
-                                onClick={() => setSelectedProject(projectDetails.id ?? null)}
-                                className="!text-sm"
-                                outline
-                              >
-                                Delete my project
-                              </DangerButton>
-                            </div>
-                          ) : (
-                            <Loader className="mt-2 w-full">
-                              <Loader.Item height="38px" width="144px" />
-                            </Loader>
-                          )}
+            {isAdmin && (
+              <Disclosure as="div" className="border-t border-custom-border-400">
+                {({ open }) => (
+                  <div className="w-full">
+                    <Disclosure.Button
+                      as="button"
+                      type="button"
+                      className="flex items-center justify-between w-full py-4"
+                    >
+                      <span className="text-xl tracking-tight">Delete Project</span>
+                      <Icon iconName={open ? "expand_less" : "expand_more"} className="!text-2xl" />
+                    </Disclosure.Button>
+
+                    <Transition
+                      show={open}
+                      enter="transition duration-100 ease-out"
+                      enterFrom="transform opacity-0"
+                      enterTo="transform opacity-100"
+                      leave="transition duration-75 ease-out"
+                      leaveFrom="transform opacity-100"
+                      leaveTo="transform opacity-0"
+                    >
+                      <Disclosure.Panel>
+                        <div className="flex flex-col gap-8">
+                          <span className="text-sm tracking-tight">
+                            The danger zone of the project delete page is a critical area that
+                            requires careful consideration and attention. When deleting a project,
+                            all of the data and resources within that project will be permanently
+                            removed and cannot be recovered.
+                          </span>
+                          <div>
+                            {projectDetails ? (
+                              <div>
+                                <DangerButton
+                                  onClick={() => setSelectedProject(projectDetails.id ?? null)}
+                                  className="!text-sm"
+                                  outline
+                                >
+                                  Delete my project
+                                </DangerButton>
+                              </div>
+                            ) : (
+                              <Loader className="mt-2 w-full">
+                                <Loader.Item height="38px" width="144px" />
+                              </Loader>
+                            )}
+                          </div>
                         </div>
-                      </div>
-                    </Disclosure.Panel>
-                  </Transition>
-                </div>
-              )}
-            </Disclosure>
+                      </Disclosure.Panel>
+                    </Transition>
+                  </div>
+                )}
+              </Disclosure>
+            )}
           </div>
         </div>
       </form>
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx
index bd1e68a7702..72df3ce856a 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/labels.tsx
@@ -113,11 +113,11 @@ const LabelsSettings: NextPage = () => {
           </Breadcrumbs>
         }
       >
-        <div className="flex flex-row gap-2">
+        <div className="flex flex-row gap-2 h-full w-full">
           <div className="w-80 py-8">
             <SettingsSidebar />
           </div>
-          <section className="pr-9 py-8 gap-10 w-full">
+          <section className="pr-9 py-8 gap-10 h-full w-full">
             <div className="flex items-center justify-between pt-2 pb-3.5 border-b border-custom-border-200">
               <h3 className="text-xl font-medium">Labels</h3>
 
@@ -129,7 +129,7 @@ const LabelsSettings: NextPage = () => {
                 Add label
               </PrimaryButton>
             </div>
-            <div className="space-y-3 py-6">
+            <div className="space-y-3 py-6 h-full w-full">
               {labelForm && (
                 <CreateUpdateLabelInline
                   labelForm={labelForm}
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx
index 8a4d807861e..ca1045568e0 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/settings/members.tsx
@@ -334,7 +334,7 @@ const MembersSettings: NextPage = () => {
           </div>
 
           <div className="flex items-center justify-between gap-4 py-3.5 border-b border-custom-border-200">
-            <h4 className="text-xl font-medium border-b border-custom-border-100">Members</h4>
+            <h4 className="text-xl font-medium">Members</h4>
             <PrimaryButton onClick={() => setInviteModal(true)}>Add Member</PrimaryButton>
           </div>
           {!projectMembers || !projectInvitations ? (
@@ -386,11 +386,13 @@ const MembersSettings: NextPage = () => {
                             <h4 className="text-sm">{member.display_name || member.email}</h4>
                           )}
                           {isOwner && (
-                            <p className="mt-0.5 text-xs text-custom-text-200">{member.email}</p>
+                            <p className="mt-0.5 text-xs text-custom-sidebar-text-300">
+                              {member.email}
+                            </p>
                           )}
                         </div>
                       </div>
-                      <div className="flex items-center gap-2 text-xs">
+                      <div className="flex items-center gap-3 text-xs">
                         {!member.member && (
                           <div className="mr-2 flex items-center justify-center rounded-full bg-yellow-500/20 px-2 py-1 text-center text-xs text-yellow-500">
                             Pending
diff --git a/web/pages/[workspaceSlug]/settings/billing.tsx b/web/pages/[workspaceSlug]/settings/billing.tsx
index 6731cd33f3f..aaa64f97eda 100644
--- a/web/pages/[workspaceSlug]/settings/billing.tsx
+++ b/web/pages/[workspaceSlug]/settings/billing.tsx
@@ -8,7 +8,8 @@ import useSWR from "swr";
 import workspaceService from "services/workspace.service";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
-import { SettingsHeader } from "components/workspace";
+// component
+import { SettingsSidebar } from "components/project";
 // ui
 import { SecondaryButton } from "components/ui";
 import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
@@ -42,14 +43,17 @@ const BillingSettings: NextPage = () => {
         </Breadcrumbs>
       }
     >
-      <div className="p-8">
-        <SettingsHeader />
-        <section className="space-y-8">
+      <div className="flex flex-row gap-2 h-full overflow-hidden">
+        <div className="w-80 py-8">
+          <SettingsSidebar />
+        </div>
+        <section className="pr-9 py-8 w-full">
           <div>
-            <h3 className="text-2xl font-semibold leading-6">Billing & Plans</h3>
-            <p className="mt-4 text-sm text-custom-text-200">Free launch preview</p>
+            <div className="flex  items-center py-3.5 border-b border-custom-border-200">
+              <h3 className="text-xl font-medium">Billing & Plan</h3>
+            </div>
           </div>
-          <div className="space-y-8 md:w-2/3">
+          <div className="px-4 py-6">
             <div>
               <h4 className="text-md mb-1 leading-6">Current plan</h4>
               <p className="mb-3 text-sm text-custom-text-200">
diff --git a/web/pages/[workspaceSlug]/settings/exports.tsx b/web/pages/[workspaceSlug]/settings/exports.tsx
index 7f98d36184f..b825e0cea59 100644
--- a/web/pages/[workspaceSlug]/settings/exports.tsx
+++ b/web/pages/[workspaceSlug]/settings/exports.tsx
@@ -6,10 +6,9 @@ import useSWR from "swr";
 import workspaceService from "services/workspace.service";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
-import { SettingsHeader } from "components/workspace";
 // components
 import ExportGuide from "components/exporter/guide";
-import { IntegrationAndImportExportBanner } from "components/ui";
+import { SettingsSidebar } from "components/project";
 // ui
 import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
 // types
@@ -41,10 +40,16 @@ const ImportExport: NextPage = () => {
         </Breadcrumbs>
       }
     >
-      <div className="p-8 space-y-4">
-        <SettingsHeader />
-        <IntegrationAndImportExportBanner bannerName="Export" />
-        <ExportGuide />
+      <div className="flex flex-row gap-2">
+        <div className="w-80 py-8">
+          <SettingsSidebar />
+        </div>
+        <div className="pr-9 py-8 overflow-y-auto w-full">
+          <div className="flex items-center py-3.5 border-b border-custom-border-200">
+            <h3 className="text-xl font-medium">Exports</h3>
+          </div>
+          <ExportGuide />
+        </div>
       </div>
     </WorkspaceAuthorizationLayout>
   );
diff --git a/web/pages/[workspaceSlug]/settings/imports.tsx b/web/pages/[workspaceSlug]/settings/imports.tsx
index a0a46f0bc9d..205923f7c0b 100644
--- a/web/pages/[workspaceSlug]/settings/imports.tsx
+++ b/web/pages/[workspaceSlug]/settings/imports.tsx
@@ -6,10 +6,9 @@ import useSWR from "swr";
 import workspaceService from "services/workspace.service";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
-import { SettingsHeader } from "components/workspace";
 // components
 import IntegrationGuide from "components/integration/guide";
-import { IntegrationAndImportExportBanner } from "components/ui";
+import { SettingsSidebar } from "components/project";
 // ui
 import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
 // types
@@ -41,15 +40,19 @@ const ImportExport: NextPage = () => {
         </Breadcrumbs>
       }
     >
-      <div className="p-8 space-y-4">
-        <SettingsHeader />
-        <IntegrationAndImportExportBanner
-          bannerName="Import/ Export"
-          description="Integrations and importers are only available on the cloud version. We plan to open-source
-        our SDKs in the near future so that the community can request or contribute integrations as
-        needed."
-        />
-        <IntegrationGuide />
+      <div className="flex flex-row gap-2 h-full overflow-hidden">
+        <div className="w-80 py-8">
+          <SettingsSidebar />
+        </div>
+        <section className="pr-9 py-8 w-full">
+          <div className="flex items-center py-3.5 border-b border-custom-border-200">
+            <h3 className="text-xl font-medium">Imports</h3>
+          </div>
+          <IntegrationGuide />
+          <div className="flex items-center py-3.5 border-b border-custom-border-200">
+            <h3 className="text-xl font-medium">Previous Imports</h3>
+          </div>
+        </section>
       </div>
     </WorkspaceAuthorizationLayout>
   );
diff --git a/web/pages/[workspaceSlug]/settings/index.tsx b/web/pages/[workspaceSlug]/settings/index.tsx
index bd7ea1bd9b1..ffad4a55c6f 100644
--- a/web/pages/[workspaceSlug]/settings/index.tsx
+++ b/web/pages/[workspaceSlug]/settings/index.tsx
@@ -16,14 +16,16 @@ import useUserAuth from "hooks/use-user-auth";
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
 // components
 import { ImageUploadModal } from "components/core";
-import { DeleteWorkspaceModal, SettingsHeader } from "components/workspace";
+import { DeleteWorkspaceModal } from "components/workspace";
+import { SettingsSidebar } from "components/project";
 // ui
-import { Spinner, Input, CustomSelect, SecondaryButton, DangerButton } from "components/ui";
+import { Disclosure, Transition } from "@headlessui/react";
+import { Spinner, Input, CustomSelect, DangerButton, PrimaryButton, Icon } from "components/ui";
 import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
 // icons
-import { LinkIcon } from "@heroicons/react/24/outline";
+import { Pencil } from "lucide-react";
 // helpers
-import { copyTextToClipboard, truncateText } from "helpers/string.helper";
+import { truncateText } from "helpers/string.helper";
 // types
 import type { IWorkspace } from "types";
 import type { NextPage } from "next";
@@ -135,6 +137,7 @@ const WorkspaceSettings: NextPage = () => {
               logo: "",
             };
           });
+          setIsImageUploadModalOpen(false);
         })
         .catch(() => {
           setToastAlert({
@@ -162,6 +165,8 @@ const WorkspaceSettings: NextPage = () => {
       <ImageUploadModal
         isOpen={isImageUploadModalOpen}
         onClose={() => setIsImageUploadModalOpen(false)}
+        isRemoving={isImageRemoving}
+        handleDelete={() => handleDelete(activeWorkspace?.logo)}
         onSuccess={(imageUrl) => {
           setIsImageUploading(true);
           setValue("logo", imageUrl);
@@ -178,67 +183,109 @@ const WorkspaceSettings: NextPage = () => {
         data={activeWorkspace ?? null}
         user={user}
       />
-      <div className="p-8">
-        <SettingsHeader />
+      <div className="flex flex-row gap-2 h-full w-full">
+        <div className="w-80 py-8">
+          <SettingsSidebar />
+        </div>
         {activeWorkspace ? (
-          <div className={`space-y-8 sm:space-y-12 ${isAdmin ? "" : "opacity-60"}`}>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold">Logo</h4>
-                <p className="text-sm text-custom-text-200">
-                  Max file size is 5MB. Supported file types are .jpg and .png.
-                </p>
+          <div className={`pr-9 py-8 w-full  ${isAdmin ? "" : "opacity-60"}`}>
+            <div className="flex gap-5 items-center pb-7 border-b border-custom-border-200">
+              <div className="flex flex-col gap-1">
+                <button
+                  type="button"
+                  onClick={() => setIsImageUploadModalOpen(true)}
+                  disabled={!isAdmin}
+                >
+                  {watch("logo") && watch("logo") !== null && watch("logo") !== "" ? (
+                    <div className="relative mx-auto flex h-14 w-14">
+                      <img
+                        src={watch("logo")!}
+                        className="absolute top-0 left-0 h-full w-full object-cover rounded-md"
+                        alt="Workspace Logo"
+                      />
+                    </div>
+                  ) : (
+                    <div className="relative flex h-14 w-14 items-center justify-center rounded bg-gray-700 p-4 uppercase text-white">
+                      {activeWorkspace?.name?.charAt(0) ?? "N"}
+                    </div>
+                  )}
+                </button>
               </div>
-              <div className="col-span-12 sm:col-span-6">
-                <div className="flex items-center gap-4">
+              <div className="flex flex-col gap-1">
+                <h3 className="text-lg font-semibold leading-6">{watch("name")}</h3>
+                <span className="text-sm tracking-tight">{`${
+                  typeof window !== "undefined" &&
+                  window.location.origin.replace("http://", "").replace("https://", "")
+                }/${activeWorkspace.slug}`}</span>
+                <div className="flex item-center gap-2.5">
                   <button
-                    type="button"
+                    className="flex items-center gap-1.5 text-xs text-left text-custom-primary-100 font-medium"
                     onClick={() => setIsImageUploadModalOpen(true)}
                     disabled={!isAdmin}
                   >
                     {watch("logo") && watch("logo") !== null && watch("logo") !== "" ? (
-                      <div className="relative mx-auto flex h-12 w-12">
-                        <img
-                          src={watch("logo")!}
-                          className="absolute top-0 left-0 h-full w-full object-cover rounded-md"
-                          alt="Workspace Logo"
-                        />
-                      </div>
+                      <>
+                        <Pencil className="h-3 w-3" />
+                        Edit logo
+                      </>
                     ) : (
-                      <div className="relative flex h-12 w-12 items-center justify-center rounded bg-gray-700 p-4 uppercase text-white">
-                        {activeWorkspace?.name?.charAt(0) ?? "N"}
-                      </div>
+                      "Upload logo"
                     )}
                   </button>
-                  {isAdmin && (
-                    <div className="flex gap-4">
-                      <SecondaryButton
-                        onClick={() => {
-                          setIsImageUploadModalOpen(true);
-                        }}
-                      >
-                        {isImageUploading ? "Uploading..." : "Upload"}
-                      </SecondaryButton>
-                      {activeWorkspace.logo && activeWorkspace.logo !== "" && (
-                        <DangerButton
-                          onClick={() => handleDelete(activeWorkspace.logo)}
-                          loading={isImageRemoving}
-                        >
-                          {isImageRemoving ? "Removing..." : "Remove"}
-                        </DangerButton>
-                      )}
-                    </div>
-                  )}
                 </div>
               </div>
             </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold">URL</h4>
-                <p className="text-sm text-custom-text-200">Your workspace URL.</p>
-              </div>
-              <div className="col-span-12 flex items-center gap-2 sm:col-span-6">
-                <div className="flex flex-col gap-1">
+
+            <div className="flex flex-col gap-8 my-10">
+              <div className="grid grid-col grid-cols-1 xl:grid-cols-2 2xl:grid-cols-3 items-center justify-between gap-10 w-full">
+                <div className="flex flex-col gap-1 ">
+                  <h4 className="text-sm">Workspace Name</h4>
+                  <Input
+                    id="name"
+                    name="name"
+                    placeholder="Name"
+                    autoComplete="off"
+                    register={register}
+                    error={errors.name}
+                    validations={{
+                      required: "Name is required",
+                      maxLength: {
+                        value: 80,
+                        message: "Workspace name should not exceed 80 characters",
+                      },
+                    }}
+                    disabled={!isAdmin}
+                  />
+                </div>
+
+                <div className="flex flex-col gap-1 ">
+                  <h4 className="text-sm">Company Size</h4>
+                  <Controller
+                    name="organization_size"
+                    control={control}
+                    render={({ field: { value, onChange } }) => (
+                      <CustomSelect
+                        value={value}
+                        onChange={onChange}
+                        label={
+                          ORGANIZATION_SIZE.find((c) => c === value) ?? "Select organization size"
+                        }
+                        width="w-full"
+                        input
+                        disabled={!isAdmin}
+                      >
+                        {ORGANIZATION_SIZE?.map((item) => (
+                          <CustomSelect.Option key={item} value={item}>
+                            {item}
+                          </CustomSelect.Option>
+                        ))}
+                      </CustomSelect>
+                    )}
+                  />
+                </div>
+
+                <div className="flex flex-col gap-1 ">
+                  <h4 className="text-sm">Workspace URL</h4>
                   <Input
                     id="url"
                     name="url"
@@ -253,114 +300,66 @@ const WorkspaceSettings: NextPage = () => {
                     disabled
                   />
                 </div>
-                <SecondaryButton
-                  className="h-min"
-                  onClick={() =>
-                    copyTextToClipboard(
-                      `${typeof window !== "undefined" && window.location.origin}/${
-                        activeWorkspace.slug
-                      }`
-                    ).then(() => {
-                      setToastAlert({
-                        type: "success",
-                        title: "Link Copied!",
-                        message: "Workspace link copied to clipboard.",
-                      });
-                    })
-                  }
-                  outline
-                >
-                  <LinkIcon className="h-[18px] w-[18px]" />
-                </SecondaryButton>
-              </div>
-            </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold">Name</h4>
-                <p className="text-sm text-custom-text-200">Give a name to your workspace.</p>
               </div>
-              <div className="col-span-12 sm:col-span-6">
-                <Input
-                  id="name"
-                  name="name"
-                  placeholder="Name"
-                  autoComplete="off"
-                  register={register}
-                  error={errors.name}
-                  validations={{
-                    required: "Name is required",
-                    maxLength: {
-                      value: 80,
-                      message: "Workspace name should not exceed 80 characters",
-                    },
-                  }}
+
+              <div className="flex items-center justify-between py-2">
+                <PrimaryButton
+                  onClick={handleSubmit(onSubmit)}
+                  loading={isSubmitting}
                   disabled={!isAdmin}
-                />
-              </div>
-            </div>
-            <div className="grid grid-cols-12 gap-4 sm:gap-16">
-              <div className="col-span-12 sm:col-span-6">
-                <h4 className="text-lg font-semibold">Organization Size</h4>
-                <p className="text-sm text-custom-text-200">What size is your organization?</p>
-              </div>
-              <div className="col-span-12 sm:col-span-6">
-                <Controller
-                  name="organization_size"
-                  control={control}
-                  render={({ field: { value, onChange } }) => (
-                    <CustomSelect
-                      value={value}
-                      onChange={onChange}
-                      label={
-                        ORGANIZATION_SIZE.find((c) => c === value) ?? "Select organization size"
-                      }
-                      width="w-full"
-                      input
-                      disabled={!isAdmin}
-                    >
-                      {ORGANIZATION_SIZE?.map((item) => (
-                        <CustomSelect.Option key={item} value={item}>
-                          {item}
-                        </CustomSelect.Option>
-                      ))}
-                    </CustomSelect>
-                  )}
-                />
+                >
+                  {isSubmitting ? "Updating..." : "Update Workspace"}
+                </PrimaryButton>
               </div>
             </div>
 
-            {isAdmin && (
-              <>
-                <div className="sm:text-right">
-                  <SecondaryButton
-                    onClick={handleSubmit(onSubmit)}
-                    loading={isSubmitting}
-                    disabled={!isAdmin}
+            <Disclosure as="div" className="border-t border-custom-border-400">
+              {({ open }) => (
+                <div className="w-full">
+                  <Disclosure.Button
+                    as="button"
+                    type="button"
+                    className="flex items-center justify-between w-full py-4"
                   >
-                    {isSubmitting ? "Updating..." : "Update Workspace"}
-                  </SecondaryButton>
-                </div>
-                <div className="grid grid-cols-12 gap-4 sm:gap-16">
-                  <div className="col-span-12 sm:col-span-6">
-                    <h4 className="text-lg font-semibold">Danger Zone</h4>
-                    <p className="text-sm text-custom-text-200">
-                      The danger zone of the workspace delete page is a critical area that requires
-                      careful consideration and attention. When deleting a workspace, all of the
-                      data and resources within that workspace will be permanently removed and
-                      cannot be recovered.
-                    </p>
-                  </div>
-                  <div className="col-span-12 sm:col-span-6">
-                    <DangerButton onClick={() => setIsOpen(true)} outline>
-                      Delete the workspace
-                    </DangerButton>
-                  </div>
+                    <span className="text-xl tracking-tight">Delete Workspace</span>
+                    <Icon iconName={open ? "expand_less" : "expand_more"} className="!text-2xl" />
+                  </Disclosure.Button>
+
+                  <Transition
+                    show={open}
+                    enter="transition duration-100 ease-out"
+                    enterFrom="transform opacity-0"
+                    enterTo="transform opacity-100"
+                    leave="transition duration-75 ease-out"
+                    leaveFrom="transform opacity-100"
+                    leaveTo="transform opacity-0"
+                  >
+                    <Disclosure.Panel>
+                      <div className="flex flex-col gap-8">
+                        <span className="text-sm tracking-tight">
+                          The danger zone of the project delete page is a critical area that
+                          requires careful consideration and attention. When deleting a project, all
+                          of the data and resources within that project will be permanently removed
+                          and cannot be recovered.
+                        </span>
+                        <div>
+                          <DangerButton
+                            onClick={() => setIsOpen(true)}
+                            className="!text-sm"
+                            outline
+                          >
+                            Delete my project
+                          </DangerButton>
+                        </div>
+                      </div>
+                    </Disclosure.Panel>
+                  </Transition>
                 </div>
-              </>
-            )}
+              )}
+            </Disclosure>
           </div>
         ) : (
-          <div className="grid h-full w-full place-items-center px-4 sm:px-0">
+          <div className="flex items-center justify-center h-full w-full px-4 sm:px-0">
             <Spinner />
           </div>
         )}
diff --git a/web/pages/[workspaceSlug]/settings/integrations.tsx b/web/pages/[workspaceSlug]/settings/integrations.tsx
index 1b7a540c424..99508512fd0 100644
--- a/web/pages/[workspaceSlug]/settings/integrations.tsx
+++ b/web/pages/[workspaceSlug]/settings/integrations.tsx
@@ -9,9 +9,9 @@ import workspaceService from "services/workspace.service";
 import IntegrationService from "services/integration";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
-import { SettingsHeader } from "components/workspace";
 // components
 import { SingleIntegrationCard } from "components/integration";
+import { SettingsSidebar } from "components/project";
 // ui
 import { IntegrationAndImportExportBanner, Loader } from "components/ui";
 import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
@@ -48,19 +48,21 @@ const WorkspaceIntegrations: NextPage = () => {
         </Breadcrumbs>
       }
     >
-      <div className="p-8">
-        <SettingsHeader />
-        <section className="space-y-5">
+      <div className="flex flex-row gap-2">
+        <div className="w-80 py-8">
+          <SettingsSidebar />
+        </div>
+        <section className="pr-9 py-8 w-full">
           <IntegrationAndImportExportBanner bannerName="Integrations" />
-          <div className="space-y-5">
+          <div>
             {appIntegrations ? (
               appIntegrations.map((integration) => (
                 <SingleIntegrationCard key={integration.id} integration={integration} />
               ))
             ) : (
-              <Loader className="space-y-5">
-                <Loader.Item height="60px" />
-                <Loader.Item height="60px" />
+              <Loader className="space-y-1">
+                <Loader.Item height="89px" />
+                <Loader.Item height="89px" />
               </Loader>
             )}
           </div>
diff --git a/web/pages/[workspaceSlug]/settings/members.tsx b/web/pages/[workspaceSlug]/settings/members.tsx
index 9090e1c1729..435bdd24eae 100644
--- a/web/pages/[workspaceSlug]/settings/members.tsx
+++ b/web/pages/[workspaceSlug]/settings/members.tsx
@@ -13,15 +13,15 @@ import useUser from "hooks/use-user";
 import useWorkspaceMembers from "hooks/use-workspace-members";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
-import { SettingsHeader } from "components/workspace";
 // components
 import ConfirmWorkspaceMemberRemove from "components/workspace/confirm-workspace-member-remove";
 import SendWorkspaceInvitationModal from "components/workspace/send-workspace-invitation-modal";
+import { SettingsSidebar } from "components/project";
 // ui
-import { CustomMenu, CustomSelect, Loader } from "components/ui";
+import { CustomMenu, CustomSelect, Icon, Loader, PrimaryButton } from "components/ui";
 import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
 // icons
-import { PlusIcon } from "@heroicons/react/24/outline";
+import { XMarkIcon } from "components/icons";
 // types
 import type { NextPage } from "next";
 // fetch-keys
@@ -143,9 +143,8 @@ const MembersSettings: NextPage = () => {
                 });
               })
               .finally(() => {
-                mutateMembers(
-                  (prevData: any) =>
-                    prevData?.filter((item: any) => item.id !== selectedRemoveMember)
+                mutateMembers((prevData: any) =>
+                  prevData?.filter((item: any) => item.id !== selectedRemoveMember)
                 );
               });
           }
@@ -187,19 +186,14 @@ const MembersSettings: NextPage = () => {
         user={user}
         onSuccess={handleInviteModalSuccess}
       />
-      <div className="p-8">
-        <SettingsHeader />
-        <section className="space-y-5">
-          <div className="flex items-end justify-between gap-4">
-            <h3 className="text-2xl font-semibold">Members</h3>
-            <button
-              type="button"
-              className="flex items-center gap-2 text-custom-primary outline-none"
-              onClick={() => setInviteModal(true)}
-            >
-              <PlusIcon className="h-4 w-4" />
-              Add Member
-            </button>
+      <div className="flex flex-row gap-2">
+        <div className="w-80 py-8">
+          <SettingsSidebar />
+        </div>
+        <section className="pr-9 py-8 w-full">
+          <div className="flex items-center justify-between gap-4 pt-2 pb-3.5 border-b border-custom-border-200">
+            <h4 className="text-xl font-medium">Members</h4>
+            <PrimaryButton onClick={() => setInviteModal(true)}>Add Member</PrimaryButton>
           </div>
           {!workspaceMembers || !workspaceInvitations ? (
             <Loader className="space-y-5">
@@ -209,23 +203,30 @@ const MembersSettings: NextPage = () => {
               <Loader.Item height="40px" />
             </Loader>
           ) : (
-            <div className="divide-y divide-custom-border-200 rounded-[10px] border border-custom-border-200 bg-custom-background-100 px-6">
+            <div className="divide-y divide-custom-border-200">
               {members.length > 0
                 ? members.map((member) => (
-                    <div key={member.id} className="flex items-center justify-between py-6">
+                    <div
+                      key={member.id}
+                      className="group flex items-center justify-between px-3.5 py-[18px]"
+                    >
                       <div className="flex items-center gap-x-8 gap-y-2">
                         {member.avatar && member.avatar !== "" ? (
-                          <div className="relative flex h-10 w-10 items-center justify-center rounded-lg p-4 capitalize text-white">
-                            <img
-                              src={member.avatar}
-                              className="absolute top-0 left-0 h-full w-full object-cover rounded-lg"
-                              alt={member.display_name || member.email}
-                            />
-                          </div>
+                          <Link href={`/${workspaceSlug}/profile/${member.memberId}`}>
+                            <a className="relative flex h-10 w-10 items-center justify-center rounded-lg p-4 capitalize text-white">
+                              <img
+                                src={member.avatar}
+                                className="absolute top-0 left-0 h-full w-full object-cover rounded-lg"
+                                alt={member.display_name || member.email}
+                              />
+                            </a>
+                          </Link>
                         ) : member.display_name || member.email ? (
-                          <div className="relative flex h-10 w-10 items-center justify-center rounded-lg p-4 capitalize bg-gray-700 text-white">
-                            {(member.display_name || member.email)?.charAt(0)}
-                          </div>
+                          <Link href={`/${workspaceSlug}/profile/${member.memberId}`}>
+                            <a className="relative flex h-10 w-10 items-center justify-center rounded-lg p-4 capitalize bg-gray-700 text-white">
+                              {(member.display_name || member.email)?.charAt(0)}
+                            </a>
+                          </Link>
                         ) : (
                           <div className="relative flex h-10 w-10 items-center justify-center rounded-lg p-4 capitalize bg-gray-700 text-white">
                             ?
@@ -244,14 +245,18 @@ const MembersSettings: NextPage = () => {
                               </a>
                             </Link>
                           ) : (
-                            <h4 className="text-sm">{member.display_name || member.email}</h4>
+                            <h4 className="text-sm cursor-default">
+                              {member.display_name || member.email}
+                            </h4>
                           )}
                           {isOwner && (
-                            <p className="text-xs text-custom-text-200">{member.email}</p>
+                            <p className="mt-0.5 text-xs text-custom-sidebar-text-300">
+                              {member.email}
+                            </p>
                           )}
                         </div>
                       </div>
-                      <div className="flex items-center gap-2 text-xs">
+                      <div className="flex items-center gap-3 text-xs">
                         {!member?.status && (
                           <div className="mr-2 flex items-center justify-center rounded-full bg-yellow-500/20 px-2 py-1 text-center text-xs text-yellow-500">
                             <p>Pending</p>
@@ -263,9 +268,22 @@ const MembersSettings: NextPage = () => {
                           </div>
                         )}
                         <CustomSelect
-                          label={ROLE[member.role as keyof typeof ROLE]}
+                          customButton={
+                            <button className="flex item-center gap-1">
+                              <span
+                                className={`flex items-center text-sm font-medium ${
+                                  member.memberId !== user?.id ? "" : "text-custom-sidebar-text-400"
+                                }`}
+                              >
+                                {ROLE[member.role as keyof typeof ROLE]}
+                              </span>
+                              {member.memberId !== user?.id && (
+                                <Icon iconName="expand_more" className="text-lg font-medium" />
+                              )}
+                            </button>
+                          }
                           value={member.role}
-                          onChange={(value: any) => {
+                          onChange={(value: 5 | 10 | 15 | 20 | undefined) => {
                             if (!workspaceSlug) return;
 
                             mutateMembers(
@@ -323,7 +341,14 @@ const MembersSettings: NextPage = () => {
                               }
                             }}
                           >
-                            {user?.id === member.memberId ? "Leave" : "Remove member"}
+                            <span className="flex items-center justify-start gap-2">
+                              <XMarkIcon className="h-4 w-4" />
+
+                              <span>
+                                {" "}
+                                {user?.id === member.memberId ? "Leave" : "Remove member"}
+                              </span>
+                            </span>
                           </CustomMenu.MenuItem>
                         </CustomMenu>
                       </div>
diff --git a/web/public/theme-mode/custom-mode.svg b/web/public/theme-mode/custom-mode.svg
new file mode 100644
index 00000000000..01be18d5b40
--- /dev/null
+++ b/web/public/theme-mode/custom-mode.svg
@@ -0,0 +1,54 @@
+<svg width="201" height="150" viewBox="0 0 201 150" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_2267_36125" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="101" height="150">
+<rect width="101" height="150" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_2267_36125)">
+<path d="M1.25 4.00001C1.25 1.92894 2.92893 0.25 5 0.25H225C227.071 0.25 228.75 1.92893 228.75 4V189.75H1.25V4.00001Z" fill="#231035" stroke="#3F2B58" stroke-width="0.5"/>
+<path d="M2 4C2 2.34315 3.34315 1 5 1H204C205.657 1 207 2.34315 207 4V10H2V4Z" fill="#32184C"/>
+<line x1="51.25" y1="10" x2="51.25" y2="190" stroke="#3F2B58" stroke-width="0.5"/>
+<line x1="1" y1="9.75" x2="211" y2="9.75002" stroke="#3F2B58" stroke-width="0.5"/>
+<rect x="5" y="14" width="36" height="6" rx="1" fill="#572D81"/>
+<rect x="5" y="26" width="39" height="4" rx="1" fill="#371B52"/>
+<rect x="5" y="35" width="31" height="4" rx="1" fill="#371B52"/>
+<rect x="5" y="53" width="26" height="4" rx="1" fill="#371B52"/>
+<rect x="5" y="80" width="34" height="4" rx="1" fill="#371B52"/>
+<rect x="5" y="44" width="35" height="4" rx="1" fill="#371B52"/>
+<rect x="5" y="62" width="29" height="4" rx="1" fill="#371B52"/>
+<rect x="5" y="71" width="38" height="4" rx="1" fill="#371B52"/>
+<rect x="43" y="14" width="6" height="6" rx="3" fill="#572D81"/>
+<rect x="66" y="44" width="51" height="4" rx="1" fill="#572D81"/>
+<rect x="66" y="53" width="132" height="4" rx="1" fill="#371B52"/>
+<rect x="66" y="60" width="97" height="4" rx="1" fill="#371B52"/>
+<rect x="75" y="76" width="52" height="4" rx="1" fill="#371B52"/>
+<rect x="75" y="87" width="78" height="4" rx="1" fill="#371B52"/>
+<rect x="75" y="98" width="71" height="4" rx="1" fill="#371B52"/>
+<rect x="75" y="109" width="58" height="4" rx="1" fill="#371B52"/>
+<rect x="66" y="75" width="6" height="6" rx="3" fill="#401E60"/>
+<rect x="66" y="86" width="6" height="6" rx="3" fill="#401E60"/>
+<rect x="66" y="97" width="6" height="6" rx="3" fill="#401E60"/>
+<rect x="66" y="108" width="6" height="6" rx="3" fill="#401E60"/>
+<rect x="66" y="26" width="12" height="12" rx="6" fill="#572D81"/>
+<rect x="5" y="4" width="3" height="3" rx="1.5" fill="#EF4444"/>
+<rect x="9" y="4" width="3" height="3" rx="1.5" fill="#FCD34D"/>
+<rect x="13" y="4" width="3" height="3" rx="1.5" fill="#4ADE80"/>
+</g>
+<mask id="mask1_2267_36125" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="101" y="0" width="100" height="150">
+<rect x="101" width="100" height="150" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask1_2267_36125)">
+<path d="M0.5 4.00001C0.5 2.06701 2.067 0.5 4 0.5H224C225.933 0.5 227.5 2.067 227.5 4V189.5H0.5V4.00001Z" fill="#000C1B" stroke="#172534"/>
+<path d="M1 4C1 2.34315 2.34315 1 4 1H203C204.657 1 206 2.34315 206 4V10H1V4Z" fill="#001936"/>
+<line x1="2.18557e-08" y1="9.75" x2="210" y2="9.75002" stroke="#172534" stroke-width="0.5"/>
+<rect x="65" y="44" width="51" height="4" rx="1" fill="#172B52"/>
+<rect x="65" y="53" width="132" height="4" rx="1" fill="#151E3D"/>
+<rect x="65" y="60" width="97" height="4" rx="1" fill="#151E3D"/>
+<rect x="74" y="76" width="52" height="4" rx="1" fill="#151E3D"/>
+<rect x="74" y="87" width="78" height="4" rx="1" fill="#151E3D"/>
+<rect x="74" y="98" width="71" height="4" rx="1" fill="#151E3D"/>
+<rect x="74" y="109" width="58" height="4" rx="1" fill="#151E3D"/>
+<rect x="129" y="76" width="6" height="4" rx="1" fill="#151E3D"/>
+<rect x="155" y="87" width="6" height="4" rx="1" fill="#151E3D"/>
+<rect x="148" y="98" width="6" height="4" rx="1" fill="#151E3D"/>
+<rect x="135" y="109" width="6" height="4" rx="1" fill="#151E3D"/>
+</g>
+</svg>
diff --git a/web/public/theme-mode/custom-theme-banner.svg b/web/public/theme-mode/custom-theme-banner.svg
new file mode 100644
index 00000000000..b7434cd764e
--- /dev/null
+++ b/web/public/theme-mode/custom-theme-banner.svg
@@ -0,0 +1,33 @@
+<svg width="462" height="536" viewBox="0 0 462 536" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.827922 13.2468C0.827922 6.38804 6.38802 0.827922 13.2468 0.827922H741.818C748.677 0.827922 754.237 6.38802 754.237 13.2468V628.393H0.827922V13.2468Z" fill="white" stroke="#E5E5E5" stroke-width="1.65584"/>
+<path d="M0.827922 13.2468C0.827922 6.38802 6.38802 0.827922 13.2468 0.827922H672.273C677.302 0.827922 681.38 4.90533 681.38 9.93507V32.289H0.827922V13.2468Z" fill="#F5F5F5" stroke="#E5E5E5" stroke-width="1.65584"/>
+<line x1="166.414" y1="33.1162" x2="166.414" y2="629.22" stroke="#E5E5E5" stroke-width="1.65584"/>
+<line x1="-7.23793e-08" y1="32.2883" x2="695.455" y2="32.2882" stroke="#E5E5E5" stroke-width="1.65584"/>
+<rect x="13.25" y="46.3633" width="119.221" height="19.8701" rx="3.31169" fill="#E5E5E5"/>
+<rect x="13.25" y="86.1035" width="129.156" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="13.25" y="115.908" width="102.662" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="13.25" y="175.519" width="86.1039" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="13.25" y="264.935" width="112.597" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="13.25" y="145.714" width="115.909" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="13.25" y="205.324" width="96.039" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="13.25" y="235.129" width="125.844" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="139.094" y="46.3633" width="19.8701" height="19.8701" rx="9.93506" fill="#E5E5E5"/>
+<rect x="215.266" y="145.715" width="168.896" height="13.2468" rx="3.31169" fill="#E5E5E5"/>
+<rect x="397.406" y="145.715" width="43.0519" height="13.2468" rx="3.31169" fill="#3F76FF"/>
+<rect x="215.266" y="175.521" width="437.143" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="215.266" y="198.702" width="321.234" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="245.07" y="251.688" width="172.208" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="245.07" y="288.117" width="258.312" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="245.07" y="324.546" width="235.13" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="245.07" y="360.975" width="192.078" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="427.219" y="251.688" width="19.8701" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="447.078" y="360.975" width="19.8701" height="13.2468" rx="3.31169" fill="#F1F1F1"/>
+<rect x="215.266" y="248.378" width="19.8701" height="19.8701" rx="9.93506" fill="#E5E5E5"/>
+<rect x="215.266" y="284.806" width="19.8701" height="19.8701" rx="9.93506" fill="#E5E5E5"/>
+<rect x="215.266" y="321.234" width="19.8701" height="19.8701" rx="9.93506" fill="#E5E5E5"/>
+<rect x="215.266" y="357.663" width="19.8701" height="19.8701" rx="9.93506" fill="#E5E5E5"/>
+<rect x="215.266" y="86.1045" width="39.7403" height="39.7403" rx="19.8701" fill="#D4D4D4"/>
+<rect x="13.2422" y="13.2471" width="9.93506" height="9.93506" rx="4.96753" fill="#EF4444"/>
+<rect x="26.4922" y="13.2471" width="9.93506" height="9.93506" rx="4.96753" fill="#FCD34D"/>
+<rect x="39.7422" y="13.2471" width="9.93506" height="9.93506" rx="4.96753" fill="#4ADE80"/>
+</svg>
diff --git a/web/public/theme-mode/dark-high-contrast.svg b/web/public/theme-mode/dark-high-contrast.svg
new file mode 100644
index 00000000000..e5839b28600
--- /dev/null
+++ b/web/public/theme-mode/dark-high-contrast.svg
@@ -0,0 +1,34 @@
+<svg width="201" height="151" viewBox="0 0 201 151" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.25 4.00001C0.25 1.92894 1.92893 0.25 4 0.25H224C226.071 0.25 227.75 1.92893 227.75 4V189.75H0.25V4.00001Z" fill="#171717" stroke="white" stroke-width="0.5"/>
+<path d="M1 4C1 2.34315 2.34315 1 4 1H203C204.657 1 206 2.34315 206 4V10H1V4Z" fill="#171717"/>
+<line x1="50.25" y1="10" x2="50.25" y2="190" stroke="white" stroke-width="0.5"/>
+<line x1="2.18557e-08" y1="9.75" x2="210" y2="9.75002" stroke="white" stroke-width="0.5"/>
+<rect x="4" y="14" width="36" height="6" rx="1" fill="white"/>
+<rect x="4" y="26" width="39" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="4" y="35" width="31" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="4" y="53" width="26" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="4" y="80" width="34" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="4" y="44" width="35" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="4" y="62" width="29" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="4" y="71" width="38" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="42" y="14" width="6" height="6" rx="3" fill="white"/>
+<rect x="65" y="44" width="51" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="65" y="53" width="132" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="65" y="60" width="97" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="74" y="76" width="52" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="74" y="87" width="78" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="74" y="98" width="71" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="74" y="109" width="58" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="129" y="76" width="6" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="155" y="87" width="6" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="148" y="98" width="6" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="135" y="109" width="6" height="4" rx="1" fill="#D4D4D4"/>
+<rect x="65" y="75" width="6" height="6" rx="3" fill="white"/>
+<rect x="65" y="86" width="6" height="6" rx="3" fill="white"/>
+<rect x="65" y="97" width="6" height="6" rx="3" fill="white"/>
+<rect x="65" y="108" width="6" height="6" rx="3" fill="white"/>
+<rect x="65" y="26" width="12" height="12" rx="6" fill="#F1F1F1"/>
+<rect x="4" y="4" width="3" height="3" rx="1.5" fill="#EF4444"/>
+<rect x="8" y="4" width="3" height="3" rx="1.5" fill="#FCD34D"/>
+<rect x="12" y="4" width="3" height="3" rx="1.5" fill="#4ADE80"/>
+</svg>
diff --git a/web/public/theme-mode/dark-mode.svg b/web/public/theme-mode/dark-mode.svg
new file mode 100644
index 00000000000..b8c14711c17
--- /dev/null
+++ b/web/public/theme-mode/dark-mode.svg
@@ -0,0 +1,41 @@
+<svg width="201" height="154" viewBox="0 0 201 154" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2273_36428)">
+<path d="M0.25 4.00001C0.25 1.92894 1.92893 0.25 4 0.25H224C226.071 0.25 227.75 1.92893 227.75 4V189.75H0.25V4.00001Z" fill="#121212" stroke="#262626" stroke-width="0.5"/>
+<path d="M0.25 4C0.25 1.92893 1.92893 0.25 4 0.25H203C204.519 0.25 205.75 1.48122 205.75 3V9.75H0.25V4Z" fill="#222222" stroke="#222222" stroke-width="0.5"/>
+<line x1="50.25" y1="10" x2="50.25" y2="190" stroke="#262626" stroke-width="0.5"/>
+<rect x="4" y="14" width="36" height="6" rx="1" fill="#404040"/>
+<rect x="4" y="26" width="39" height="4" rx="1" fill="#262626"/>
+<rect x="4" y="35" width="31" height="4" rx="1" fill="#262626"/>
+<rect x="4" y="53" width="26" height="4" rx="1" fill="#262626"/>
+<rect x="4" y="80" width="34" height="4" rx="1" fill="#262626"/>
+<rect x="4" y="44" width="35" height="4" rx="1" fill="#262626"/>
+<rect x="4" y="62" width="29" height="4" rx="1" fill="#262626"/>
+<rect x="4" y="71" width="38" height="4" rx="1" fill="#262626"/>
+<rect x="42" y="14" width="6" height="6" rx="3" fill="#404040"/>
+<rect x="65" y="44" width="51" height="4" rx="1" fill="#404040"/>
+<rect x="65" y="53" width="132" height="4" rx="1" fill="#262626"/>
+<rect x="65" y="60" width="97" height="4" rx="1" fill="#262626"/>
+<rect x="74" y="76" width="52" height="4" rx="1" fill="#262626"/>
+<rect x="74" y="87" width="78" height="4" rx="1" fill="#262626"/>
+<rect x="74" y="98" width="71" height="4" rx="1" fill="#262626"/>
+<rect x="74" y="109" width="58" height="4" rx="1" fill="#262626"/>
+<rect x="129" y="76" width="6" height="4" rx="1" fill="#262626"/>
+<rect x="155" y="87" width="6" height="4" rx="1" fill="#262626"/>
+<rect x="148" y="98" width="6" height="4" rx="1" fill="#262626"/>
+<rect x="135" y="109" width="6" height="4" rx="1" fill="#262626"/>
+<rect x="65" y="75" width="6" height="6" rx="3" fill="#222222"/>
+<rect x="65" y="86" width="6" height="6" rx="3" fill="#222222"/>
+<rect x="65" y="97" width="6" height="6" rx="3" fill="#222222"/>
+<rect x="65" y="108" width="6" height="6" rx="3" fill="#222222"/>
+<rect x="65" y="26" width="12" height="12" rx="6" fill="#404040"/>
+<rect x="4" y="4" width="3" height="3" rx="1.5" fill="#EF4444"/>
+<rect x="8" y="4" width="3" height="3" rx="1.5" fill="#FCD34D"/>
+<rect x="12" y="4" width="3" height="3" rx="1.5" fill="#4ADE80"/>
+<rect x="121" y="44" width="13" height="4" rx="1" fill="#3F76FF"/>
+</g>
+<defs>
+<clipPath id="clip0_2273_36428">
+<rect width="201" height="154" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/web/public/theme-mode/light-high-contrast.svg b/web/public/theme-mode/light-high-contrast.svg
new file mode 100644
index 00000000000..c2f5ded22be
--- /dev/null
+++ b/web/public/theme-mode/light-high-contrast.svg
@@ -0,0 +1,42 @@
+<svg width="204" height="154" viewBox="0 0 204 154" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2273_36429)">
+<path d="M0.25 4.00001C0.25 1.92894 1.92893 0.25 4 0.25H224C226.071 0.25 227.75 1.92893 227.75 4V189.75H0.25V4.00001Z" fill="white" stroke="black" stroke-width="0.5"/>
+<path d="M1 4C1 2.34315 2.34315 1 4 1H203C204.657 1 206 2.34315 206 4V10H1V4Z" fill="white"/>
+<line x1="50.25" y1="10" x2="50.25" y2="190" stroke="black" stroke-width="0.5"/>
+<line x1="-2.18557e-08" y1="9.75" x2="210" y2="9.74998" stroke="black" stroke-width="0.5"/>
+<rect x="4" y="14" width="36" height="6" rx="1" fill="#2E2E2E"/>
+<rect x="4" y="26" width="39" height="4" rx="1" fill="#404040"/>
+<rect x="4" y="35" width="31" height="4" rx="1" fill="#404040"/>
+<rect x="4" y="53" width="26" height="4" rx="1" fill="#404040"/>
+<rect x="4" y="80" width="34" height="4" rx="1" fill="#404040"/>
+<rect x="4" y="44" width="35" height="4" rx="1" fill="#404040"/>
+<rect x="4" y="62" width="29" height="4" rx="1" fill="#404040"/>
+<rect x="4" y="71" width="38" height="4" rx="1" fill="#404040"/>
+<rect x="42" y="14" width="6" height="6" rx="3" fill="#2E2E2E"/>
+<rect x="65" y="44" width="51" height="4" rx="1" fill="#2E2E2E"/>
+<rect x="65" y="53" width="132" height="4" rx="1" fill="#404040"/>
+<rect x="65" y="60" width="97" height="4" rx="1" fill="#404040"/>
+<rect x="74" y="76" width="52" height="4" rx="1" fill="#404040"/>
+<rect x="74" y="87" width="78" height="4" rx="1" fill="#404040"/>
+<rect x="74" y="98" width="71" height="4" rx="1" fill="#404040"/>
+<rect x="74" y="109" width="58" height="4" rx="1" fill="#404040"/>
+<rect x="129" y="76" width="6" height="4" rx="1" fill="#404040"/>
+<rect x="155" y="87" width="6" height="4" rx="1" fill="#404040"/>
+<rect x="148" y="98" width="6" height="4" rx="1" fill="#404040"/>
+<rect x="135" y="109" width="6" height="4" rx="1" fill="#404040"/>
+<rect x="65" y="75" width="6" height="6" rx="3" fill="#3A3A3A"/>
+<rect x="65" y="86" width="6" height="6" rx="3" fill="#3A3A3A"/>
+<rect x="65" y="97" width="6" height="6" rx="3" fill="#3A3A3A"/>
+<rect x="65" y="108" width="6" height="6" rx="3" fill="#3A3A3A"/>
+<rect x="65" y="26" width="12" height="12" rx="6" fill="#262626"/>
+<rect x="4" y="4" width="3" height="3" rx="1.5" fill="#EF4444"/>
+<rect x="8" y="4" width="3" height="3" rx="1.5" fill="#FCD34D"/>
+<rect x="12" y="4" width="3" height="3" rx="1.5" fill="#4ADE80"/>
+<rect x="121" y="44" width="13" height="4" rx="1" fill="#3F76FF"/>
+</g>
+<defs>
+<clipPath id="clip0_2273_36429">
+<rect width="204" height="154" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/web/public/theme-mode/light-mode.svg b/web/public/theme-mode/light-mode.svg
new file mode 100644
index 00000000000..9c7fdae4b8d
--- /dev/null
+++ b/web/public/theme-mode/light-mode.svg
@@ -0,0 +1,42 @@
+<svg width="201" height="154" viewBox="0 0 201 154" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2273_36427)">
+<path d="M0.25 4.00001C0.25 1.92894 1.92893 0.25 4 0.25H224C226.071 0.25 227.75 1.92893 227.75 4V189.75H0.25V4.00001Z" fill="white" stroke="#E5E5E5" stroke-width="0.5"/>
+<path d="M0.25 4C0.25 1.92893 1.92893 0.25 4 0.25H203C204.519 0.25 205.75 1.48122 205.75 3V9.75H0.25V4Z" fill="#F5F5F5" stroke="#E5E5E5" stroke-width="0.5"/>
+<line x1="50.25" y1="10" x2="50.25" y2="190" stroke="#E5E5E5" stroke-width="0.5"/>
+<line x1="-2.18557e-08" y1="9.75" x2="210" y2="9.74998" stroke="#E5E5E5" stroke-width="0.5"/>
+<rect x="4" y="14" width="36" height="6" rx="1" fill="#E5E5E5"/>
+<rect x="4" y="26" width="39" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="4" y="35" width="31" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="4" y="53" width="26" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="4" y="80" width="34" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="4" y="44" width="35" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="4" y="62" width="29" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="4" y="71" width="38" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="42" y="14" width="6" height="6" rx="3" fill="#E5E5E5"/>
+<rect x="65" y="44" width="51" height="4" rx="1" fill="#E5E5E5"/>
+<rect x="120" y="44" width="13" height="4" rx="1" fill="#3F76FF"/>
+<rect x="65" y="53" width="132" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="65" y="60" width="97" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="74" y="76" width="52" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="74" y="87" width="78" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="74" y="98" width="71" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="74" y="109" width="58" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="129" y="76" width="6" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="155" y="87" width="6" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="148" y="98" width="6" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="135" y="109" width="6" height="4" rx="1" fill="#F1F1F1"/>
+<rect x="65" y="75" width="6" height="6" rx="3" fill="#E5E5E5"/>
+<rect x="65" y="86" width="6" height="6" rx="3" fill="#E5E5E5"/>
+<rect x="65" y="97" width="6" height="6" rx="3" fill="#E5E5E5"/>
+<rect x="65" y="108" width="6" height="6" rx="3" fill="#E5E5E5"/>
+<rect x="65" y="26" width="12" height="12" rx="6" fill="#D4D4D4"/>
+<rect x="4" y="4" width="3" height="3" rx="1.5" fill="#EF4444"/>
+<rect x="8" y="4" width="3" height="3" rx="1.5" fill="#FCD34D"/>
+<rect x="12" y="4" width="3" height="3" rx="1.5" fill="#4ADE80"/>
+</g>
+<defs>
+<clipPath id="clip0_2273_36427">
+<rect width="201" height="154" fill="white"/>
+</clipPath>
+</defs>
+</svg>