diff --git a/apps/app/components/common/board-view/single-issue.tsx b/apps/app/components/common/board-view/single-issue.tsx
index 598eaad1e..5ce4ff0c0 100644
--- a/apps/app/components/common/board-view/single-issue.tsx
+++ b/apps/app/components/common/board-view/single-issue.tsx
@@ -56,7 +56,7 @@ const SingleIssue: React.FC<Props> = ({
     >
       <div className="group/card relative p-2 select-none">
         {handleDeleteIssue && (
-          <div className="opacity-0 group-hover/card:opacity-100 absolute top-1 right-1 z-10">
+          <div className="opacity-0 group-hover/card:opacity-100 absolute top-1.5 right-1.5 z-10">
             <button
               type="button"
               className="h-7 w-7 p-1 grid place-items-center rounded text-red-500 bg-white hover:bg-red-50 duration-300 outline-none"
diff --git a/apps/app/components/project/ConfirmProjectMemberRemove.tsx b/apps/app/components/project/confirm-project-member-remove.tsx
similarity index 100%
rename from apps/app/components/project/ConfirmProjectMemberRemove.tsx
rename to apps/app/components/project/confirm-project-member-remove.tsx
diff --git a/apps/app/components/project/SendProjectInvitationModal.tsx b/apps/app/components/project/send-project-invitation-modal.tsx
similarity index 100%
rename from apps/app/components/project/SendProjectInvitationModal.tsx
rename to apps/app/components/project/send-project-invitation-modal.tsx
diff --git a/apps/app/components/project/settings/control.tsx b/apps/app/components/project/settings/control.tsx
index 007389834..eea215256 100644
--- a/apps/app/components/project/settings/control.tsx
+++ b/apps/app/components/project/settings/control.tsx
@@ -33,13 +33,15 @@ const ControlSettings: React.FC<Props> = ({ control, isSubmitting }) => {
   );
   return (
     <>
-      <section className="space-y-5">
+      <section className="space-y-8">
         <div>
-          <h3 className="text-lg font-medium leading-6 text-gray-900">Control</h3>
-          <p className="mt-1 text-sm text-gray-500">Set the control for the project.</p>
+          <h3 className="text-3xl font-bold leading-6 text-gray-900">Control</h3>
+          <p className="mt-4 text-sm text-gray-500">Set the control for the project.</p>
         </div>
-        <div className="flex justify-between gap-3">
-          <div className="w-full md:w-1/2">
+        <div className="grid grid-cols-2 gap-16">
+          <div>
+            <h4 className="text-md leading-6 text-gray-900 mb-1">Project Lead</h4>
+            <p className="text-sm text-gray-500 mb-3">Select the project leader.</p>
             <Controller
               control={control}
               name="project_lead"
@@ -47,18 +49,13 @@ const ControlSettings: React.FC<Props> = ({ control, isSubmitting }) => {
                 <Listbox value={value} onChange={onChange}>
                   {({ open }) => (
                     <>
-                      <Listbox.Label>
-                        <div className="text-gray-500 mb-2">Project Lead</div>
-                      </Listbox.Label>
                       <div className="relative">
-                        <Listbox.Button className="bg-white relative w-full border border-gray-300 rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+                        <Listbox.Button className="relative w-full flex justify-between items-center gap-4 border border-gray-300 rounded-md shadow-sm p-3 text-left cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                           <span className="block truncate">
                             {people?.find((person) => person.member.id === value)?.member
                               .first_name ?? "Select Lead"}
                           </span>
-                          <span className="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
-                            <ChevronDownIcon className="h-5 w-5 text-gray-400" aria-hidden="true" />
-                          </span>
+                          <ChevronDownIcon className="h-5 w-5 text-gray-400" aria-hidden="true" />
                         </Listbox.Button>
 
                         <Transition
@@ -68,14 +65,14 @@ const ControlSettings: React.FC<Props> = ({ control, isSubmitting }) => {
                           leaveFrom="opacity-100"
                           leaveTo="opacity-0"
                         >
-                          <Listbox.Options className="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
+                          <Listbox.Options className="absolute z-20 mt-1 w-full bg-white shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
                             {people?.map((person) => (
                               <Listbox.Option
                                 key={person.id}
                                 className={({ active }) =>
                                   `${
-                                    active ? "text-white bg-theme" : "text-gray-900"
-                                  } cursor-default select-none relative py-2 pl-3 pr-9`
+                                    active ? "bg-indigo-50" : ""
+                                  } text-gray-900 cursor-default select-none relative px-3 py-2`
                                 }
                                 value={person.member.id}
                               >
@@ -86,7 +83,9 @@ const ControlSettings: React.FC<Props> = ({ control, isSubmitting }) => {
                                         selected ? "font-semibold" : "font-normal"
                                       } block truncate`}
                                     >
-                                      {person.member.first_name}
+                                      {person.member.first_name !== ""
+                                        ? person.member.first_name
+                                        : person.member.email}
                                     </span>
 
                                     {selected ? (
@@ -111,7 +110,11 @@ const ControlSettings: React.FC<Props> = ({ control, isSubmitting }) => {
               )}
             />
           </div>
-          <div className="w-full md:w-1/2">
+          <div>
+            <h4 className="text-md leading-6 text-gray-900 mb-1">Default Assignee</h4>
+            <p className="text-sm text-gray-500 mb-3">
+              Select the default assignee for the project.
+            </p>
             <Controller
               control={control}
               name="default_assignee"
@@ -119,18 +122,13 @@ const ControlSettings: React.FC<Props> = ({ control, isSubmitting }) => {
                 <Listbox value={value} onChange={onChange}>
                   {({ open }) => (
                     <>
-                      <Listbox.Label>
-                        <div className="text-gray-500 mb-2">Default Assignee</div>
-                      </Listbox.Label>
                       <div className="relative">
-                        <Listbox.Button className="bg-white relative w-full border border-gray-300 rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+                        <Listbox.Button className="relative w-full flex justify-between items-center gap-4 border border-gray-300 rounded-md shadow-sm p-3 text-left cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
                           <span className="block truncate">
                             {people?.find((p) => p.member.id === value)?.member.first_name ??
                               "Select Default Assignee"}
                           </span>
-                          <span className="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
-                            <ChevronDownIcon className="h-5 w-5 text-gray-400" aria-hidden="true" />
-                          </span>
+                          <ChevronDownIcon className="h-5 w-5 text-gray-400" aria-hidden="true" />
                         </Listbox.Button>
 
                         <Transition
@@ -140,14 +138,14 @@ const ControlSettings: React.FC<Props> = ({ control, isSubmitting }) => {
                           leaveFrom="opacity-100"
                           leaveTo="opacity-0"
                         >
-                          <Listbox.Options className="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
+                          <Listbox.Options className="absolute z-20 mt-1 w-full bg-white shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
                             {people?.map((person) => (
                               <Listbox.Option
                                 key={person.id}
                                 className={({ active }) =>
                                   `${
-                                    active ? "text-white bg-theme" : "text-gray-900"
-                                  } cursor-default select-none relative py-2 pl-3 pr-9`
+                                    active ? "bg-indigo-50" : ""
+                                  } text-gray-900 cursor-default select-none relative px-3 py-2`
                                 }
                                 value={person.member.id}
                               >
@@ -158,7 +156,9 @@ const ControlSettings: React.FC<Props> = ({ control, isSubmitting }) => {
                                         selected ? "font-semibold" : "font-normal"
                                       } block truncate`}
                                     >
-                                      {person.member.first_name}
+                                      {person.member.first_name !== ""
+                                        ? person.member.first_name
+                                        : person.member.email}
                                     </span>
 
                                     {selected ? (
@@ -184,7 +184,7 @@ const ControlSettings: React.FC<Props> = ({ control, isSubmitting }) => {
             />
           </div>
         </div>
-        <div className="flex justify-end">
+        <div>
           <Button type="submit" disabled={isSubmitting}>
             {isSubmitting ? "Updating Project..." : "Update Project"}
           </Button>
diff --git a/apps/app/components/project/settings/general.tsx b/apps/app/components/project/settings/general.tsx
index d310f71f9..0330ef9d6 100644
--- a/apps/app/components/project/settings/general.tsx
+++ b/apps/app/components/project/settings/general.tsx
@@ -45,68 +45,70 @@ const GeneralSettings: React.FC<Props> = ({
 
   return (
     <>
-      <section className="space-y-5">
+      <section className="space-y-8">
         <div>
-          <h3 className="text-lg font-medium leading-6 text-gray-900">General</h3>
-          <p className="mt-1 text-sm text-gray-500">
+          <h3 className="text-3xl font-bold leading-6 text-gray-900">General</h3>
+          <p className="mt-4 text-sm text-gray-500">
             This information will be displayed to every member of the project.
           </p>
         </div>
-        <div className="grid grid-cols-10 gap-3 items-center">
-          <div className="col-span-1">
-            <div>
-              <label htmlFor="icon" className="text-gray-500 mb-2">
-                Icon
-              </label>
+        <div className="grid grid-cols-2 gap-16">
+          <div>
+            <h4 className="text-md leading-6 text-gray-900 mb-1">Icon & Name</h4>
+            <p className="text-sm text-gray-500 mb-3">Select an icon and a name for the project.</p>
+            <div className="flex gap-2">
               <Controller
                 control={control}
                 name="icon"
                 render={({ field: { value, onChange } }) => (
                   <EmojiIconPicker
-                    label={value ? String.fromCodePoint(parseInt(value)) : "Select Icon"}
+                    label={value ? String.fromCodePoint(parseInt(value)) : "Icon"}
                     value={value}
                     onChange={onChange}
                   />
                 )}
               />
+              <Input
+                id="name"
+                name="name"
+                error={errors.name}
+                register={register}
+                placeholder="Project Name"
+                size="lg"
+                className="w-auto"
+                validations={{
+                  required: "Name is required",
+                }}
+              />
             </div>
           </div>
-          <div className="col-span-5">
-            <Input
-              id="name"
-              name="name"
-              error={errors.name}
+          <div>
+            <h4 className="text-md leading-6 text-gray-900 mb-1">Description</h4>
+            <p className="text-sm text-gray-500 mb-3">Give a description to the project.</p>
+            <TextArea
+              id="description"
+              name="description"
+              error={errors.description}
               register={register}
-              placeholder="Project Name"
-              label="Name"
+              placeholder="Enter project description"
               validations={{
-                required: "Name is required",
+                required: "Description is required",
               }}
             />
           </div>
-          <div className="col-span-2">
-            <Select
-              name="network"
-              id="network"
-              options={Object.keys(NETWORK_CHOICES).map((key) => ({
-                value: key,
-                label: NETWORK_CHOICES[key as keyof typeof NETWORK_CHOICES],
-              }))}
-              label="Network"
-              register={register}
-              validations={{
-                required: "Network is required",
-              }}
-            />
-          </div>
-          <div className="col-span-2">
+          <div>
+            <h4 className="text-md leading-6 text-gray-900 mb-1">Identifier</h4>
+            <p className="text-sm text-gray-500 mb-3">
+              Create a 1-6 characters{"'"} identifier for the project.
+            </p>
             <Input
               id="identifier"
               name="identifier"
               error={errors.identifier}
               register={register}
               placeholder="Enter identifier"
-              label="Identifier"
+              className="w-40"
+              size="lg"
               onChange={(e: any) => {
                 if (!activeWorkspace || !e.target.value) return;
                 checkIdentifierAvailability(activeWorkspace.slug, e.target.value);
@@ -124,21 +126,26 @@ const GeneralSettings: React.FC<Props> = ({
               }}
             />
           </div>
+          <div>
+            <h4 className="text-md leading-6 text-gray-900 mb-1">Network</h4>
+            <p className="text-sm text-gray-500 mb-3">Select privacy type for the project.</p>
+            <Select
+              name="network"
+              id="network"
+              options={Object.keys(NETWORK_CHOICES).map((key) => ({
+                value: key,
+                label: NETWORK_CHOICES[key as keyof typeof NETWORK_CHOICES],
+              }))}
+              size="lg"
+              register={register}
+              validations={{
+                required: "Network is required",
+              }}
+              className="w-40"
+            />
+          </div>
         </div>
         <div>
-          <TextArea
-            id="description"
-            name="description"
-            error={errors.description}
-            register={register}
-            label="Description"
-            placeholder="Enter project description"
-            validations={{
-              required: "Description is required",
-            }}
-          />
-        </div>
-        <div className="flex justify-end">
           <Button type="submit" disabled={isSubmitting}>
             {isSubmitting ? "Updating Project..." : "Update Project"}
           </Button>
diff --git a/apps/app/components/project/settings/labels/index.tsx b/apps/app/components/project/settings/labels/index.tsx
index 459ece444..d6f8746c3 100644
--- a/apps/app/components/project/settings/labels/index.tsx
+++ b/apps/app/components/project/settings/labels/index.tsx
@@ -11,17 +11,11 @@ import issuesServices from "lib/services/issues.service";
 // hooks
 import useUser from "lib/hooks/useUser";
 // headless ui
-import { Popover, Transition, Menu } from "@headlessui/react";
+import { Popover, Transition } from "@headlessui/react";
 // ui
-import { Button, CustomMenu, Input, Spinner } from "ui";
+import { Button, Input, Spinner } from "ui";
 // icons
-import {
-  ChevronDownIcon,
-  EllipsisHorizontalIcon,
-  PencilIcon,
-  PlusIcon,
-  RectangleGroupIcon,
-} from "@heroicons/react/24/outline";
+import { PlusIcon } from "@heroicons/react/24/outline";
 // types
 import { IIssueLabels } from "types";
 // fetch-keys
@@ -109,11 +103,11 @@ const LabelsSettings: React.FC = () => {
 
   return (
     <>
-      <section className="space-y-5">
-        <div className="flex items-center justify-between">
+      <section className="space-y-8">
+        <div className="md:w-2/3 flex justify-between items-center gap-2">
           <div>
-            <h3 className="text-lg font-medium leading-6 text-gray-900">Labels</h3>
-            <p className="mt-1 text-sm text-gray-500">Manage the labels of this project.</p>
+            <h3 className="text-3xl font-bold leading-6 text-gray-900">Labels</h3>
+            <p className="mt-4 text-sm text-gray-500">Manage the labels of this project.</p>
           </div>
           <Button
             theme="secondary"
diff --git a/apps/app/components/project/settings/labels/single-label.tsx b/apps/app/components/project/settings/labels/single-label.tsx
index ed84a79a7..9376b189e 100644
--- a/apps/app/components/project/settings/labels/single-label.tsx
+++ b/apps/app/components/project/settings/labels/single-label.tsx
@@ -25,7 +25,7 @@ const defaultValues: Partial<IIssueLabels> = {
 };
 
 const SingleLabel: React.FC<Props> = ({ label, issueLabels, editLabel, handleLabelDelete }) => {
-  const [newLabelForm, setNewLabelForm] = useState(true);
+  const [newLabelForm, setNewLabelForm] = useState(false);
 
   const {
     register,
@@ -54,7 +54,7 @@ const SingleLabel: React.FC<Props> = ({ label, issueLabels, editLabel, handleLab
               <h6 className="text-sm">{label.name}</h6>
             </div>
             <CustomMenu ellipsis>
-              <CustomMenu.MenuItem>Convert to group</CustomMenu.MenuItem>
+              {/* <CustomMenu.MenuItem>Convert to group</CustomMenu.MenuItem> */}
               <CustomMenu.MenuItem
                 onClick={() => {
                   editLabel(label);
diff --git a/apps/app/components/project/settings/members.tsx b/apps/app/components/project/settings/members.tsx
new file mode 100644
index 000000000..4d3dfb33d
--- /dev/null
+++ b/apps/app/components/project/settings/members.tsx
@@ -0,0 +1,261 @@
+// react
+import { useState } from "react";
+// next
+import Image from "next/image";
+import useSWR from "swr";
+// services
+import projectService from "lib/services/project.service";
+// hooks
+import useUser from "lib/hooks/useUser";
+import useToast from "lib/hooks/useToast";
+// components
+import ConfirmProjectMemberRemove from "components/project/confirm-project-member-remove";
+import SendProjectInvitationModal from "components/project/send-project-invitation-modal";
+// ui
+import { Button, CustomListbox, CustomMenu, Spinner } from "ui";
+// fetch-keys
+import { PROJECT_INVITATIONS, PROJECT_MEMBERS } from "constants/fetch-keys";
+import { PlusIcon } from "@heroicons/react/24/outline";
+
+type Props = { projectId: string };
+
+const ROLE = {
+  5: "Guest",
+  10: "Viewer",
+  15: "Member",
+  20: "Admin",
+};
+
+const MembersSettings: React.FC<Props> = ({ projectId }) => {
+  const [selectedMember, setSelectedMember] = useState<string | null>(null);
+  const [selectedRemoveMember, setSelectedRemoveMember] = useState<string | null>(null);
+  const [selectedInviteRemoveMember, setSelectedInviteRemoveMember] = useState<string | null>(null);
+  const [inviteModal, setInviteModal] = useState(false);
+
+  const { activeWorkspace } = useUser();
+
+  const { setToastAlert } = useToast();
+
+  const { data: projectMembers, mutate: mutateMembers } = useSWR(
+    activeWorkspace && projectId ? PROJECT_MEMBERS(projectId as string) : null,
+    activeWorkspace && projectId
+      ? () => projectService.projectMembers(activeWorkspace.slug, projectId as any)
+      : null,
+    {
+      onErrorRetry(err, _, __, revalidate, revalidateOpts) {
+        if (err?.status === 403) return;
+        setTimeout(() => revalidate(revalidateOpts), 5000);
+      },
+    }
+  );
+
+  const { data: projectInvitations, mutate: mutateInvitations } = useSWR(
+    activeWorkspace && projectId ? PROJECT_INVITATIONS : null,
+    activeWorkspace && projectId
+      ? () => projectService.projectInvitations(activeWorkspace.slug, projectId as any)
+      : null
+  );
+
+  let members = [
+    ...(projectMembers?.map((item: any) => ({
+      id: item.id,
+      avatar: item.member?.avatar,
+      first_name: item.member?.first_name,
+      last_name: item.member?.last_name,
+      email: item.member?.email,
+      role: item.role,
+      status: true,
+      member: true,
+    })) || []),
+    ...(projectInvitations?.map((item: any) => ({
+      id: item.id,
+      avatar: item.avatar ?? "",
+      first_name: item.first_name ?? item.email,
+      last_name: item.last_name ?? "",
+      email: item.email,
+      role: item.role,
+      status: item.accepted,
+      member: false,
+    })) || []),
+  ];
+
+  return (
+    <>
+      <ConfirmProjectMemberRemove
+        isOpen={Boolean(selectedRemoveMember) || Boolean(selectedInviteRemoveMember)}
+        onClose={() => {
+          setSelectedRemoveMember(null);
+          setSelectedInviteRemoveMember(null);
+        }}
+        data={members.find(
+          (item) => item.id === selectedRemoveMember || item.id === selectedInviteRemoveMember
+        )}
+        handleDelete={async () => {
+          if (!activeWorkspace || !projectId) return;
+          if (selectedRemoveMember) {
+            await projectService.deleteProjectMember(
+              activeWorkspace.slug,
+              projectId as string,
+              selectedRemoveMember
+            );
+            mutateMembers(
+              (prevData) => prevData?.filter((item: any) => item.id !== selectedRemoveMember),
+              false
+            );
+          }
+          if (selectedInviteRemoveMember) {
+            await projectService.deleteProjectInvitation(
+              activeWorkspace.slug,
+              projectId as string,
+              selectedInviteRemoveMember
+            );
+            mutateInvitations(
+              (prevData) => prevData?.filter((item: any) => item.id !== selectedInviteRemoveMember),
+              false
+            );
+          }
+          setToastAlert({
+            type: "success",
+            message: "Member removed successfully",
+            title: "Success",
+          });
+        }}
+      />
+      <SendProjectInvitationModal
+        isOpen={inviteModal}
+        setIsOpen={setInviteModal}
+        members={members}
+      />
+      <section className="space-y-8">
+        <div>
+          <h3 className="text-3xl font-bold leading-6 text-gray-900">Members</h3>
+          <p className="mt-4 text-sm text-gray-500">Manage all the members of the project.</p>
+        </div>
+        {!projectMembers || !projectInvitations ? (
+          <div className="h-full w-full grid place-items-center px-4 sm:px-0">
+            <Spinner />
+          </div>
+        ) : (
+          <div className="md:w-2/3">
+            <div className="flex justify-between items-center gap-2">
+              <h4 className="text-md leading-6 text-gray-900 mb-1">Manage members</h4>
+              <Button
+                theme="secondary"
+                className="flex items-center gap-x-1"
+                onClick={() => setInviteModal(true)}
+              >
+                <PlusIcon className="h-4 w-4" />
+                Add Member
+              </Button>
+            </div>
+            <div className="space-y-6 mt-6">
+              {members.length > 0
+                ? members.map((member) => (
+                    <div key={member.id} className="flex justify-between items-center">
+                      <div className="flex items-center gap-x-8 gap-y-2">
+                        <div className="h-10 w-10 p-4 flex items-center justify-center bg-gray-700 text-white rounded uppercase relative">
+                          {member.avatar && member.avatar !== "" ? (
+                            <Image
+                              src={member.avatar}
+                              alt={member.first_name}
+                              layout="fill"
+                              objectFit="cover"
+                              className="rounded"
+                            />
+                          ) : (
+                            member.first_name.charAt(0) ?? "N"
+                          )}
+                        </div>
+                        <div>
+                          <h4 className="text-sm">
+                            {member.first_name} {member.last_name}
+                          </h4>
+                          <p className="text-xs text-gray-500">{member.email}</p>
+                        </div>
+                      </div>
+                      <div className="flex items-center gap-2 text-xs">
+                        {selectedMember === member.id ? (
+                          <CustomListbox
+                            options={Object.keys(ROLE).map((key) => ({
+                              value: key,
+                              display: ROLE[parseInt(key) as keyof typeof ROLE],
+                            }))}
+                            title={ROLE[member.role as keyof typeof ROLE] ?? "Select Role"}
+                            value={member.role}
+                            onChange={(value) => {
+                              if (!activeWorkspace || !projectId) return;
+                              projectService
+                                .updateProjectMember(
+                                  activeWorkspace.slug,
+                                  projectId as string,
+                                  member.id,
+                                  {
+                                    role: value,
+                                  }
+                                )
+                                .then((res) => {
+                                  setToastAlert({
+                                    type: "success",
+                                    message: "Member role updated successfully.",
+                                    title: "Success",
+                                  });
+                                  mutateMembers(
+                                    (prevData: any) =>
+                                      prevData.map((m: any) => {
+                                        return m.id === selectedMember
+                                          ? { ...m, ...res, role: value }
+                                          : m;
+                                      }),
+                                    false
+                                  );
+                                  setSelectedMember(null);
+                                })
+                                .catch((err) => {
+                                  console.log(err);
+                                });
+                            }}
+                          />
+                        ) : (
+                          ROLE[member.role as keyof typeof ROLE] ?? "None"
+                        )}
+                        <CustomMenu ellipsis>
+                          <CustomMenu.MenuItem
+                            onClick={() => {
+                              if (!member.member) {
+                                setToastAlert({
+                                  type: "error",
+                                  message: "You can't edit a pending invitation.",
+                                  title: "Error",
+                                });
+                              } else {
+                                setSelectedMember(member.id);
+                              }
+                            }}
+                          >
+                            Edit
+                          </CustomMenu.MenuItem>
+                          <CustomMenu.MenuItem
+                            onClick={() => {
+                              if (member.member) {
+                                setSelectedRemoveMember(member.id);
+                              } else {
+                                setSelectedInviteRemoveMember(member.id);
+                              }
+                            }}
+                          >
+                            Remove
+                          </CustomMenu.MenuItem>
+                        </CustomMenu>
+                      </div>
+                    </div>
+                  ))
+                : null}
+            </div>
+          </div>
+        )}
+      </section>
+    </>
+  );
+};
+
+export default MembersSettings;
diff --git a/apps/app/components/project/settings/states.tsx b/apps/app/components/project/settings/states.tsx
index 4cc02a6b1..188886028 100644
--- a/apps/app/components/project/settings/states.tsx
+++ b/apps/app/components/project/settings/states.tsx
@@ -7,6 +7,8 @@ import {
   CreateUpdateStateInline,
 } from "components/project/issues/BoardView/state/create-update-state-inline";
 import ConfirmStateDeletion from "components/project/issues/BoardView/state/confirm-state-delete";
+// ui
+import { Spinner } from "ui";
 // icons
 import { PencilSquareIcon, PlusIcon, TrashIcon } from "@heroicons/react/24/outline";
 // constants
@@ -15,7 +17,7 @@ import { addSpaceIfCamelCase, groupBy } from "constants/common";
 import type { IState } from "types";
 
 type Props = {
-  projectId: string | string[] | undefined;
+  projectId: string;
 };
 
 const StatesSettings: React.FC<Props> = ({ projectId }) => {
@@ -37,82 +39,88 @@ const StatesSettings: React.FC<Props> = ({ projectId }) => {
         onClose={() => setSelectDeleteState(null)}
       />
 
-      <section className="space-y-5">
+      <section className="space-y-8">
         <div>
-          <h3 className="text-lg font-medium leading-6 text-gray-900">State</h3>
-          <p className="mt-1 text-sm text-gray-500">Manage the state of this project.</p>
+          <h3 className="text-3xl font-bold leading-6 text-gray-900">State</h3>
+          <p className="mt-4 text-sm text-gray-500">Manage the state of this project.</p>
         </div>
-        <div className="flex flex-col justify-between gap-3">
-          {Object.keys(groupedStates).map((key) => (
-            <React.Fragment key={key}>
-              <div className="flex justify-between w-full md:w-2/3">
-                <p className="font-medium capitalize">{key} states</p>
-                <button
-                  type="button"
-                  onClick={() => setActiveGroup(key as keyof StateGroup)}
-                  className="flex items-center gap-x-2 text-theme"
-                >
-                  <PlusIcon className="h-4 w-4 text-theme" />
-                  <span>Add</span>
-                </button>
-              </div>
-              <div className="md:w-2/3 space-y-1 border p-1 rounded-xl">
-                {key === activeGroup && (
-                  <CreateUpdateStateInline
-                    projectId={projectId as string}
-                    onClose={() => {
-                      setActiveGroup(null);
-                      setSelectedState(null);
-                    }}
-                    workspaceSlug={activeWorkspace?.slug}
-                    data={null}
-                    selectedGroup={key as keyof StateGroup}
-                  />
-                )}
-                {groupedStates[key]?.map((state) =>
-                  state.id !== selectedState ? (
-                    <div
-                      key={state.id}
-                      className={`bg-gray-50 p-3 flex justify-between items-center gap-2 border-b ${
-                        Boolean(activeGroup !== key) ? "last:border-0" : ""
-                      }`}
-                    >
-                      <div className="flex items-center gap-2">
-                        <div
-                          className="flex-shrink-0 h-3 w-3 rounded-full"
-                          style={{
-                            backgroundColor: state.color,
+        <div className="flex flex-col justify-between gap-4">
+          {states ? (
+            Object.keys(groupedStates).map((key) => (
+              <div key={key}>
+                <div className="flex justify-between w-full md:w-2/3 mb-2">
+                  <p className="text-md leading-6 text-gray-900 capitalize">{key} states</p>
+                  <button
+                    type="button"
+                    onClick={() => setActiveGroup(key as keyof StateGroup)}
+                    className="flex items-center gap-x-2 text-theme"
+                  >
+                    <PlusIcon className="h-4 w-4 text-theme" />
+                    <span>Add</span>
+                  </button>
+                </div>
+                <div className="md:w-2/3 space-y-1 border p-1 rounded-xl">
+                  {key === activeGroup && (
+                    <CreateUpdateStateInline
+                      projectId={projectId as string}
+                      onClose={() => {
+                        setActiveGroup(null);
+                        setSelectedState(null);
+                      }}
+                      workspaceSlug={activeWorkspace?.slug}
+                      data={null}
+                      selectedGroup={key as keyof StateGroup}
+                    />
+                  )}
+                  {groupedStates[key]?.map((state) =>
+                    state.id !== selectedState ? (
+                      <div
+                        key={state.id}
+                        className={`bg-gray-50 p-3 flex justify-between items-center gap-2 border-b ${
+                          Boolean(activeGroup !== key) ? "last:border-0" : ""
+                        }`}
+                      >
+                        <div className="flex items-center gap-2">
+                          <div
+                            className="flex-shrink-0 h-3 w-3 rounded-full"
+                            style={{
+                              backgroundColor: state.color,
+                            }}
+                          ></div>
+                          <h6 className="text-sm">{addSpaceIfCamelCase(state.name)}</h6>
+                        </div>
+                        <div className="flex items-center gap-2">
+                          <button type="button" onClick={() => setSelectDeleteState(state.id)}>
+                            <TrashIcon className="h-4 w-4 text-red-400" />
+                          </button>
+                          <button type="button" onClick={() => setSelectedState(state.id)}>
+                            <PencilSquareIcon className="h-4 w-4 text-gray-400" />
+                          </button>
+                        </div>
+                      </div>
+                    ) : (
+                      <div className={`border-b last:border-b-0`} key={state.id}>
+                        <CreateUpdateStateInline
+                          projectId={projectId as string}
+                          onClose={() => {
+                            setActiveGroup(null);
+                            setSelectedState(null);
                           }}
-                        ></div>
-                        <h6 className="text-sm">{addSpaceIfCamelCase(state.name)}</h6>
+                          workspaceSlug={activeWorkspace?.slug}
+                          data={states?.find((state) => state.id === selectedState) ?? null}
+                          selectedGroup={key as keyof StateGroup}
+                        />
                       </div>
-                      <div className="flex items-center gap-2">
-                        <button type="button" onClick={() => setSelectDeleteState(state.id)}>
-                          <TrashIcon className="h-4 w-4 text-red-400" />
-                        </button>
-                        <button type="button" onClick={() => setSelectedState(state.id)}>
-                          <PencilSquareIcon className="h-4 w-4 text-gray-400" />
-                        </button>
-                      </div>
-                    </div>
-                  ) : (
-                    <div className={`border-b last:border-b-0`} key={state.id}>
-                      <CreateUpdateStateInline
-                        projectId={projectId as string}
-                        onClose={() => {
-                          setActiveGroup(null);
-                          setSelectedState(null);
-                        }}
-                        workspaceSlug={activeWorkspace?.slug}
-                        data={states?.find((state) => state.id === selectedState) ?? null}
-                        selectedGroup={key as keyof StateGroup}
-                      />
-                    </div>
-                  )
-                )}
+                    )
+                  )}
+                </div>
               </div>
-            </React.Fragment>
-          ))}
+            ))
+          ) : (
+            <div className="h-full w-full grid place-items-center px-4 sm:px-0">
+              <Spinner />
+            </div>
+          )}
         </div>
       </section>
     </>
diff --git a/apps/app/layouts/navbar/main-siderbar.tsx b/apps/app/layouts/navbar/main-siderbar.tsx
index 9d9c13bcd..a352cb45d 100644
--- a/apps/app/layouts/navbar/main-siderbar.tsx
+++ b/apps/app/layouts/navbar/main-siderbar.tsx
@@ -35,16 +35,16 @@ const navigation = (projectId: string) => [
     href: `/projects/${projectId}/cycles`,
     icon: ArrowPathIcon,
   },
-  {
-    name: "Modules",
-    href: `/projects/${projectId}/modules`,
-    icon: RectangleGroupIcon,
-  },
-  {
-    name: "Members",
-    href: `/projects/${projectId}/members`,
-    icon: UserGroupIcon,
-  },
+  // {
+  //   name: "Modules",
+  //   href: `/projects/${projectId}/modules`,
+  //   icon: RectangleGroupIcon,
+  // },
+  // {
+  //   name: "Members",
+  //   href: `/projects/${projectId}/members`,
+  //   icon: UserGroupIcon,
+  // },
   {
     name: "Settings",
     href: `/projects/${projectId}/settings`,
diff --git a/apps/app/pages/projects/[projectId]/members.tsx b/apps/app/pages/projects/[projectId]/members.tsx
index 9eb046722..2402296f4 100644
--- a/apps/app/pages/projects/[projectId]/members.tsx
+++ b/apps/app/pages/projects/[projectId]/members.tsx
@@ -5,28 +5,26 @@ import type { NextPage } from "next";
 import { useRouter } from "next/router";
 // swr
 import useSWR from "swr";
-// headless ui
-import { Menu } from "@headlessui/react";
 // services
 import projectService from "lib/services/project.service";
 // hooks
 import useUser from "lib/hooks/useUser";
 import useToast from "lib/hooks/useToast";
-// fetching keys
-import { PROJECT_MEMBERS, PROJECT_INVITATIONS } from "constants/fetch-keys";
 // hoc
 import withAuth from "lib/hoc/withAuthWrapper";
 // layouts
 import AppLayout from "layouts/app-layout";
 // components
-import SendProjectInvitationModal from "components/project/SendProjectInvitationModal";
-import ConfirmProjectMemberRemove from "components/project/ConfirmProjectMemberRemove";
+import ConfirmProjectMemberRemove from "components/project/confirm-project-member-remove";
+import SendProjectInvitationModal from "components/project/send-project-invitation-modal";
+// headless ui
+import { Menu } from "@headlessui/react";
 // ui
-import { Spinner, CustomListbox } from "ui";
+import { Spinner, CustomListbox, BreadcrumbItem, Breadcrumbs, HeaderButton } from "ui";
 // icons
 import { PlusIcon, EllipsisHorizontalIcon } from "@heroicons/react/20/solid";
-import HeaderButton from "ui/HeaderButton";
-import { BreadcrumbItem, Breadcrumbs } from "ui/Breadcrumbs";
+// fetch-keys
+import { PROJECT_MEMBERS, PROJECT_INVITATIONS } from "constants/fetch-keys";
 
 const ROLE = {
   5: "Guest",
@@ -63,6 +61,7 @@ const ProjectMembers: NextPage = () => {
       },
     }
   );
+
   const { data: projectInvitations, mutate: mutateInvitations } = useSWR(
     activeWorkspace && projectId ? PROJECT_INVITATIONS : null,
     activeWorkspace && projectId
diff --git a/apps/app/pages/projects/[projectId]/settings.tsx b/apps/app/pages/projects/[projectId]/settings.tsx
index a030dc300..64d290bf8 100644
--- a/apps/app/pages/projects/[projectId]/settings.tsx
+++ b/apps/app/pages/projects/[projectId]/settings.tsx
@@ -22,7 +22,7 @@ import useToast from "lib/hooks/useToast";
 // fetch keys
 import { PROJECT_DETAILS, PROJECTS_LIST } from "constants/fetch-keys";
 // ui
-import { Spinner } from "ui";
+import { Button, Spinner } from "ui";
 import { Breadcrumbs, BreadcrumbItem } from "ui/Breadcrumbs";
 // types
 import type { IProject, IWorkspace } from "types";
@@ -32,6 +32,11 @@ const GeneralSettings = dynamic(() => import("components/project/settings/genera
   ssr: false,
 });
 
+const MembersSettings = dynamic(() => import("components/project/settings/members"), {
+  loading: () => <p>Loading...</p>,
+  ssr: false,
+});
+
 const ControlSettings = dynamic(() => import("components/project/settings/control"), {
   loading: () => <p>Loading...</p>,
   ssr: false,
@@ -167,19 +172,16 @@ const ProjectSettings: NextPage = () => {
       // links={sidebarLinks}
     >
       {projectDetails ? (
-        <div className="space-y-3">
+        <div className="space-y-3 px-10">
           <Tab.Group>
             <Tab.List className="flex items-center gap-x-4 gap-y-2 flex-wrap mb-8">
-              {["General", "Control", "States", "Labels"].map((tab, index) => (
-                <Tab
-                  key={index}
-                  className={({ selected }) =>
-                    `px-6 py-2 border-2 border-theme hover:bg-theme hover:text-white text-xs font-medium rounded-md outline-none duration-300 ${
-                      selected ? "bg-theme text-white" : ""
-                    }`
-                  }
-                >
-                  {tab}
+              {["General", "Control", "Members", "States", "Labels"].map((tab, index) => (
+                <Tab key={index}>
+                  {({ selected }) => (
+                    <Button theme="secondary" className={selected ? "border-theme" : ""}>
+                      {tab}
+                    </Button>
+                  )}
                 </Tab>
               ))}
             </Tab.List>
@@ -199,7 +201,10 @@ const ProjectSettings: NextPage = () => {
                 </Tab.Panel>
               </form>
               <Tab.Panel>
-                <StatesSettings projectId={projectId} />
+                <MembersSettings projectId={projectId as string} />
+              </Tab.Panel>
+              <Tab.Panel>
+                <StatesSettings projectId={projectId as string} />
               </Tab.Panel>
               <Tab.Panel>
                 <LabelsSettings />
diff --git a/apps/app/ui/Button/index.tsx b/apps/app/ui/Button/index.tsx
index bb1d3b54c..3c1dd077c 100644
--- a/apps/app/ui/Button/index.tsx
+++ b/apps/app/ui/Button/index.tsx
@@ -33,6 +33,7 @@ const Button = React.forwardRef<HTMLButtonElement, Props>(
         type={type}
         disabled={disabled}
         className={classNames(
+          className,
           "inline-flex items-center rounded justify-center font-medium",
           theme === "primary"
             ? `${
@@ -53,8 +54,7 @@ const Button = React.forwardRef<HTMLButtonElement, Props>(
             ? "px-3 py-2 text-base"
             : size === "lg"
             ? "px-4 py-2 text-base"
-            : "px-2.5 py-2 text-sm",
-          className
+            : "px-2.5 py-2 text-sm"
         )}
       >
         {children}
diff --git a/apps/app/ui/Input/index.tsx b/apps/app/ui/Input/index.tsx
index 9fc66600c..561e865a3 100644
--- a/apps/app/ui/Input/index.tsx
+++ b/apps/app/ui/Input/index.tsx
@@ -13,9 +13,11 @@ const Input: React.FC<Props> = ({
   error,
   mode = "primary",
   onChange,
-  className,
+  className = "",
   type,
   id,
+  size = "rg",
+  fullWidth = true,
   ...rest
 }) => {
   return (
@@ -35,14 +37,16 @@ const Input: React.FC<Props> = ({
           onChange && onChange(e);
         }}
         className={classNames(
-          "mt-1 block w-full px-3 py-2 text-base focus:outline-none sm:text-sm rounded-md bg-transparent",
+          "block text-base focus:outline-none sm:text-sm rounded-md bg-transparent",
           mode === "primary" ? "border border-gray-300 rounded-md" : "",
           mode === "transparent"
             ? "bg-transparent border-none transition-all ring-0 focus:ring-1 focus:ring-indigo-500 rounded"
             : "",
           error ? "border-red-500" : "",
           error && mode === "primary" ? "bg-red-100" : "",
-          className ?? ""
+          fullWidth ? "w-full" : "",
+          size === "rg" ? "px-3 py-2" : size === "lg" ? "p-3" : "",
+          className
         )}
         {...rest}
       />
diff --git a/apps/app/ui/Input/types.d.ts b/apps/app/ui/Input/types.d.ts
index ff3981e83..8ff5f7c81 100644
--- a/apps/app/ui/Input/types.d.ts
+++ b/apps/app/ui/Input/types.d.ts
@@ -10,4 +10,6 @@ export interface Props extends React.ComponentPropsWithoutRef<"input"> {
   validations?: RegisterOptions;
   error?: FieldError;
   className?: string;
+  size?: "rg" | "lg";
+  fullWidth?: boolean;
 }
diff --git a/apps/app/ui/Select/index.tsx b/apps/app/ui/Select/index.tsx
index d8337a980..ba782d8fd 100644
--- a/apps/app/ui/Select/index.tsx
+++ b/apps/app/ui/Select/index.tsx
@@ -13,6 +13,8 @@ const Select: React.FC<Props> = ({
   validations,
   error,
   options,
+  size = "rg",
+  fullWidth = true,
 }) => {
   return (
     <>
@@ -27,7 +29,9 @@ const Select: React.FC<Props> = ({
         value={value}
         {...(register && register(name, validations))}
         disabled={disabled}
-        className={`mt-1 block w-full px-3 py-2 text-base border border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md bg-transparent ${className}`}
+        className={`mt-1 block text-base border border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md bg-transparent ${
+          fullWidth ? "w-full" : ""
+        } ${size === "rg" ? "px-3 py-2" : size === "lg" ? "p-3" : ""} ${className}`}
       >
         {options.map((option, index) => (
           <option value={option.value} key={index}>
diff --git a/apps/app/ui/Select/types.d.ts b/apps/app/ui/Select/types.d.ts
index 4c5d9fb11..e69fe256c 100644
--- a/apps/app/ui/Select/types.d.ts
+++ b/apps/app/ui/Select/types.d.ts
@@ -1,8 +1,4 @@
-import type {
-  UseFormRegister,
-  RegisterOptions,
-  FieldError,
-} from "react-hook-form";
+import type { UseFormRegister, RegisterOptions, FieldError } from "react-hook-form";
 
 export type Props = {
   label?: string;
@@ -16,4 +12,6 @@ export type Props = {
   error?: FieldError;
   autoComplete?: "on" | "off";
   options: { label: string; value: any }[];
+  size?: "rg" | "lg";
+  fullWidth?: boolean;
 };
diff --git a/apps/app/ui/custom-listbox/index.tsx b/apps/app/ui/custom-listbox/index.tsx
index 91c81263a..33b33735e 100644
--- a/apps/app/ui/custom-listbox/index.tsx
+++ b/apps/app/ui/custom-listbox/index.tsx
@@ -30,7 +30,7 @@ const CustomListbox: React.FC<Props> = ({
           )}
           <div className="relative">
             <Listbox.Button
-              className={`flex items-center gap-1 hover:bg-gray-100 relative border rounded-md shadow-sm cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm duration-300 ${
+              className={`flex items-center gap-1 hover:bg-gray-100 text-xs relative border rounded-md shadow-sm cursor-pointer focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm duration-300 ${
                 width === "sm"
                   ? "w-32"
                   : width === "md"
@@ -48,7 +48,7 @@ const CustomListbox: React.FC<Props> = ({
               ${className || "px-2 py-1"}`}
             >
               {icon ?? null}
-              <span className="block truncate">
+              <span className="block truncate text-xs">
                 {Array.isArray(value)
                   ? value.map((v) => options?.find((o) => o.value === v)?.display).join(", ") ||
                     `${title}`
diff --git a/apps/app/ui/emoji-icon-picker/emojis.json b/apps/app/ui/emoji-icon-picker/emojis.json
index f108a46e3..73b9b800f 100644
--- a/apps/app/ui/emoji-icon-picker/emojis.json
+++ b/apps/app/ui/emoji-icon-picker/emojis.json
@@ -1,1090 +1,1090 @@
 [
-    "8986",
-    "8987",
-    "9193",
-    "9194",
-    "9195",
-    "9196",
-    "9197",
-    "9198",
-    "9199",
-    "9200",
-    "9201",
-    "9202",
-    "9203",
-    "9208",
-    "9209",
-    "9210",
-    "9410",
-    "9748",
-    "9749",
-    "9757",
-    "9800",
-    "9801",
-    "9802",
-    "9803",
-    "9804",
-    "9805",
-    "9806",
-    "9807",
-    "9808",
-    "9809",
-    "9810",
-    "9811",
-    "9823",
-    "9855",
-    "9875",
-    "9889",
-    "9898",
-    "9899",
-    "9917",
-    "9918",
-    "9924",
-    "9925",
-    "9934",
-    "9935",
-    "9937",
-    "9939",
-    "9940",
-    "9961",
-    "9962",
-    "9968",
-    "9969",
-    "9970",
-    "9971",
-    "9972",
-    "9973",
-    "9975",
-    "9976",
-    "9977",
-    "9978",
-    "9981",
-    "9986",
-    "9989",
-    "9992",
-    "9993",
-    "9994",
-    "9995",
-    "9996",
-    "9997",
-    "9999",
-    "10002",
-    "10004",
-    "10006",
-    "10013",
-    "10017",
-    "10024",
-    "10035",
-    "10036",
-    "10052",
-    "10055",
-    "10060",
-    "10062",
-    "10067",
-    "10068",
-    "10069",
-    "10071",
-    "10083",
-    "10084",
-    "10133",
-    "10134",
-    "10135",
-    "10145",
-    "10160",
-    "10175",
-    "10548",
-    "10549",
-    "11013",
-    "11014",
-    "11015",
-    "11035",
-    "11036",
-    "11088",
-    "11093",
-    "12336",
-    "12349",
-    "12951",
-    "12953",
-    "126980",
-    "127183",
-    "127344",
-    "127345",
-    "127358",
-    "127359",
-    "127374",
-    "127377",
-    "127378",
-    "127379",
-    "127380",
-    "127381",
-    "127382",
-    "127383",
-    "127384",
-    "127385",
-    "127386",
-    "127489",
-    "127490",
-    "127514",
-    "127535",
-    "127538",
-    "127539",
-    "127540",
-    "127541",
-    "127542",
-    "127543",
-    "127544",
-    "127545",
-    "127546",
-    "127568",
-    "127569",
-    "127744",
-    "127745",
-    "127746",
-    "127747",
-    "127748",
-    "127749",
-    "127750",
-    "127751",
-    "127752",
-    "127753",
-    "127754",
-    "127755",
-    "127756",
-    "127757",
-    "127758",
-    "127759",
-    "127760",
-    "127761",
-    "127762",
-    "127763",
-    "127764",
-    "127765",
-    "127766",
-    "127767",
-    "127768",
-    "127769",
-    "127770",
-    "127771",
-    "127772",
-    "127773",
-    "127774",
-    "127775",
-    "127776",
-    "127777",
-    "127780",
-    "127781",
-    "127782",
-    "127783",
-    "127784",
-    "127785",
-    "127786",
-    "127787",
-    "127788",
-    "127789",
-    "127790",
-    "127791",
-    "127792",
-    "127793",
-    "127794",
-    "127795",
-    "127796",
-    "127797",
-    "127798",
-    "127799",
-    "127800",
-    "127801",
-    "127802",
-    "127803",
-    "127804",
-    "127805",
-    "127806",
-    "127807",
-    "127808",
-    "127809",
-    "127810",
-    "127811",
-    "127812",
-    "127813",
-    "127814",
-    "127815",
-    "127816",
-    "127817",
-    "127818",
-    "127819",
-    "127820",
-    "127821",
-    "127822",
-    "127823",
-    "127824",
-    "127825",
-    "127826",
-    "127827",
-    "127828",
-    "127829",
-    "127830",
-    "127831",
-    "127832",
-    "127833",
-    "127834",
-    "127835",
-    "127836",
-    "127837",
-    "127838",
-    "127839",
-    "127840",
-    "127841",
-    "127842",
-    "127843",
-    "127844",
-    "127845",
-    "127846",
-    "127847",
-    "127848",
-    "127849",
-    "127850",
-    "127851",
-    "127852",
-    "127853",
-    "127854",
-    "127855",
-    "127856",
-    "127857",
-    "127858",
-    "127859",
-    "127860",
-    "127861",
-    "127862",
-    "127863",
-    "127864",
-    "127865",
-    "127866",
-    "127867",
-    "127868",
-    "127869",
-    "127870",
-    "127871",
-    "127872",
-    "127873",
-    "127874",
-    "127875",
-    "127876",
-    "127877",
-    "127878",
-    "127879",
-    "127880",
-    "127881",
-    "127882",
-    "127883",
-    "127884",
-    "127885",
-    "127886",
-    "127887",
-    "127888",
-    "127889",
-    "127890",
-    "127891",
-    "127894",
-    "127895",
-    "127897",
-    "127898",
-    "127899",
-    "127902",
-    "127903",
-    "127904",
-    "127905",
-    "127906",
-    "127907",
-    "127908",
-    "127909",
-    "127910",
-    "127911",
-    "127912",
-    "127913",
-    "127914",
-    "127915",
-    "127916",
-    "127917",
-    "127918",
-    "127919",
-    "127920",
-    "127921",
-    "127922",
-    "127923",
-    "127924",
-    "127925",
-    "127926",
-    "127927",
-    "127928",
-    "127929",
-    "127930",
-    "127931",
-    "127932",
-    "127933",
-    "127934",
-    "127935",
-    "127936",
-    "127937",
-    "127938",
-    "127939",
-    "127940",
-    "127941",
-    "127942",
-    "127943",
-    "127944",
-    "127945",
-    "127946",
-    "127947",
-    "127948",
-    "127949",
-    "127950",
-    "127951",
-    "127952",
-    "127953",
-    "127954",
-    "127955",
-    "127956",
-    "127957",
-    "127958",
-    "127959",
-    "127960",
-    "127961",
-    "127962",
-    "127963",
-    "127964",
-    "127965",
-    "127966",
-    "127967",
-    "127968",
-    "127969",
-    "127970",
-    "127971",
-    "127972",
-    "127973",
-    "127974",
-    "127975",
-    "127976",
-    "127977",
-    "127978",
-    "127979",
-    "127980",
-    "127981",
-    "127982",
-    "127983",
-    "127984",
-    "127987",
-    "127988",
-    "127989",
-    "127991",
-    "127992",
-    "127993",
-    "127994",
-    "127995",
-    "127996",
-    "127997",
-    "127998",
-    "127999",
-    "128000",
-    "128001",
-    "128002",
-    "128003",
-    "128004",
-    "128005",
-    "128006",
-    "128007",
-    "128008",
-    "128009",
-    "128010",
-    "128011",
-    "128012",
-    "128013",
-    "128014",
-    "128015",
-    "128016",
-    "128017",
-    "128018",
-    "128019",
-    "128020",
-    "128021",
-    "128022",
-    "128023",
-    "128024",
-    "128025",
-    "128026",
-    "128027",
-    "128028",
-    "128029",
-    "128030",
-    "128031",
-    "128032",
-    "128033",
-    "128034",
-    "128035",
-    "128036",
-    "128037",
-    "128038",
-    "128039",
-    "128040",
-    "128041",
-    "128042",
-    "128043",
-    "128044",
-    "128045",
-    "128046",
-    "128047",
-    "128048",
-    "128049",
-    "128050",
-    "128051",
-    "128052",
-    "128053",
-    "128054",
-    "128055",
-    "128056",
-    "128057",
-    "128058",
-    "128059",
-    "128060",
-    "128061",
-    "128062",
-    "128063",
-    "128064",
-    "128065",
-    "128066",
-    "128067",
-    "128068",
-    "128069",
-    "128070",
-    "128071",
-    "128072",
-    "128073",
-    "128074",
-    "128075",
-    "128076",
-    "128077",
-    "128078",
-    "128079",
-    "128080",
-    "128081",
-    "128082",
-    "128083",
-    "128084",
-    "128085",
-    "128086",
-    "128087",
-    "128088",
-    "128089",
-    "128090",
-    "128091",
-    "128092",
-    "128093",
-    "128094",
-    "128095",
-    "128096",
-    "128097",
-    "128098",
-    "128099",
-    "128100",
-    "128101",
-    "128102",
-    "128103",
-    "128104",
-    "128105",
-    "128106",
-    "128107",
-    "128108",
-    "128109",
-    "128110",
-    "128111",
-    "128112",
-    "128113",
-    "128114",
-    "128115",
-    "128116",
-    "128117",
-    "128118",
-    "128119",
-    "128120",
-    "128121",
-    "128122",
-    "128123",
-    "128124",
-    "128125",
-    "128126",
-    "128127",
-    "128128",
-    "128129",
-    "128130",
-    "128131",
-    "128132",
-    "128133",
-    "128134",
-    "128135",
-    "128136",
-    "128137",
-    "128138",
-    "128139",
-    "128140",
-    "128141",
-    "128142",
-    "128143",
-    "128144",
-    "128145",
-    "128146",
-    "128147",
-    "128148",
-    "128149",
-    "128150",
-    "128151",
-    "128152",
-    "128153",
-    "128154",
-    "128155",
-    "128156",
-    "128157",
-    "128158",
-    "128159",
-    "128160",
-    "128161",
-    "128162",
-    "128163",
-    "128164",
-    "128165",
-    "128166",
-    "128167",
-    "128168",
-    "128169",
-    "128170",
-    "128171",
-    "128172",
-    "128173",
-    "128174",
-    "128175",
-    "128176",
-    "128177",
-    "128178",
-    "128179",
-    "128180",
-    "128181",
-    "128182",
-    "128183",
-    "128184",
-    "128185",
-    "128186",
-    "128187",
-    "128188",
-    "128189",
-    "128190",
-    "128191",
-    "128192",
-    "128193",
-    "128194",
-    "128195",
-    "128196",
-    "128197",
-    "128198",
-    "128199",
-    "128200",
-    "128201",
-    "128202",
-    "128203",
-    "128204",
-    "128205",
-    "128206",
-    "128207",
-    "128208",
-    "128209",
-    "128210",
-    "128211",
-    "128212",
-    "128213",
-    "128214",
-    "128215",
-    "128216",
-    "128217",
-    "128218",
-    "128219",
-    "128220",
-    "128221",
-    "128222",
-    "128223",
-    "128224",
-    "128225",
-    "128226",
-    "128227",
-    "128228",
-    "128229",
-    "128230",
-    "128231",
-    "128232",
-    "128233",
-    "128234",
-    "128235",
-    "128236",
-    "128237",
-    "128238",
-    "128239",
-    "128240",
-    "128241",
-    "128242",
-    "128243",
-    "128244",
-    "128245",
-    "128246",
-    "128247",
-    "128248",
-    "128249",
-    "128250",
-    "128251",
-    "128252",
-    "128253",
-    "128255",
-    "128256",
-    "128257",
-    "128258",
-    "128259",
-    "128260",
-    "128261",
-    "128262",
-    "128263",
-    "128264",
-    "128265",
-    "128266",
-    "128267",
-    "128268",
-    "128269",
-    "128270",
-    "128271",
-    "128272",
-    "128273",
-    "128274",
-    "128275",
-    "128276",
-    "128277",
-    "128278",
-    "128279",
-    "128280",
-    "128281",
-    "128282",
-    "128283",
-    "128284",
-    "128285",
-    "128286",
-    "128287",
-    "128288",
-    "128289",
-    "128290",
-    "128291",
-    "128292",
-    "128293",
-    "128294",
-    "128295",
-    "128296",
-    "128297",
-    "128298",
-    "128299",
-    "128300",
-    "128301",
-    "128302",
-    "128303",
-    "128304",
-    "128305",
-    "128306",
-    "128307",
-    "128308",
-    "128309",
-    "128310",
-    "128311",
-    "128312",
-    "128313",
-    "128314",
-    "128315",
-    "128316",
-    "128317",
-    "128329",
-    "128330",
-    "128331",
-    "128332",
-    "128333",
-    "128334",
-    "128336",
-    "128337",
-    "128338",
-    "128339",
-    "128340",
-    "128341",
-    "128342",
-    "128343",
-    "128344",
-    "128345",
-    "128346",
-    "128347",
-    "128348",
-    "128349",
-    "128350",
-    "128351",
-    "128352",
-    "128353",
-    "128354",
-    "128355",
-    "128356",
-    "128357",
-    "128358",
-    "128359",
-    "128367",
-    "128368",
-    "128371",
-    "128372",
-    "128373",
-    "128374",
-    "128375",
-    "128376",
-    "128377",
-    "128378",
-    "128391",
-    "128394",
-    "128395",
-    "128396",
-    "128397",
-    "128400",
-    "128405",
-    "128406",
-    "128420",
-    "128421",
-    "128424",
-    "128433",
-    "128434",
-    "128444",
-    "128450",
-    "128451",
-    "128452",
-    "128465",
-    "128466",
-    "128467",
-    "128476",
-    "128477",
-    "128478",
-    "128481",
-    "128483",
-    "128488",
-    "128495",
-    "128499",
-    "128506",
-    "128507",
-    "128508",
-    "128509",
-    "128510",
-    "128511",
-    "128512",
-    "128513",
-    "128514",
-    "128515",
-    "128516",
-    "128517",
-    "128518",
-    "128519",
-    "128520",
-    "128521",
-    "128522",
-    "128523",
-    "128524",
-    "128525",
-    "128526",
-    "128527",
-    "128528",
-    "128529",
-    "128530",
-    "128531",
-    "128532",
-    "128533",
-    "128534",
-    "128535",
-    "128536",
-    "128537",
-    "128538",
-    "128539",
-    "128540",
-    "128541",
-    "128542",
-    "128543",
-    "128544",
-    "128545",
-    "128546",
-    "128547",
-    "128548",
-    "128549",
-    "128550",
-    "128551",
-    "128552",
-    "128553",
-    "128554",
-    "128555",
-    "128556",
-    "128557",
-    "128558",
-    "128559",
-    "128560",
-    "128561",
-    "128562",
-    "128563",
-    "128564",
-    "128565",
-    "128566",
-    "128567",
-    "128568",
-    "128569",
-    "128570",
-    "128571",
-    "128572",
-    "128573",
-    "128574",
-    "128575",
-    "128576",
-    "128577",
-    "128578",
-    "128579",
-    "128580",
-    "128581",
-    "128582",
-    "128583",
-    "128584",
-    "128585",
-    "128586",
-    "128587",
-    "128588",
-    "128589",
-    "128590",
-    "128591",
-    "128640",
-    "128641",
-    "128642",
-    "128643",
-    "128644",
-    "128645",
-    "128646",
-    "128647",
-    "128648",
-    "128649",
-    "128650",
-    "128651",
-    "128652",
-    "128653",
-    "128654",
-    "128655",
-    "128656",
-    "128657",
-    "128658",
-    "128659",
-    "128660",
-    "128661",
-    "128662",
-    "128663",
-    "128664",
-    "128665",
-    "128666",
-    "128667",
-    "128668",
-    "128669",
-    "128670",
-    "128671",
-    "128672",
-    "128673",
-    "128674",
-    "128675",
-    "128676",
-    "128677",
-    "128678",
-    "128679",
-    "128680",
-    "128681",
-    "128682",
-    "128683",
-    "128684",
-    "128685",
-    "128686",
-    "128687",
-    "128688",
-    "128689",
-    "128690",
-    "128691",
-    "128692",
-    "128693",
-    "128694",
-    "128695",
-    "128696",
-    "128697",
-    "128698",
-    "128699",
-    "128700",
-    "128701",
-    "128702",
-    "128703",
-    "128704",
-    "128705",
-    "128706",
-    "128707",
-    "128708",
-    "128709",
-    "128715",
-    "128716",
-    "128717",
-    "128718",
-    "128719",
-    "128720",
-    "128721",
-    "128722",
-    "128736",
-    "128737",
-    "128738",
-    "128739",
-    "128740",
-    "128741",
-    "128745",
-    "128747",
-    "128748",
-    "128752",
-    "128755",
-    "128756",
-    "128757",
-    "128758",
-    "128759",
-    "128760",
-    "128761",
-    "128762",
-    "129296",
-    "129297",
-    "129298",
-    "129299",
-    "129300",
-    "129301",
-    "129302",
-    "129303",
-    "129304",
-    "129305",
-    "129306",
-    "129307",
-    "129308",
-    "129309",
-    "129310",
-    "129311",
-    "129312",
-    "129313",
-    "129314",
-    "129315",
-    "129316",
-    "129317",
-    "129318",
-    "129319",
-    "129320",
-    "129321",
-    "129322",
-    "129323",
-    "129324",
-    "129325",
-    "129326",
-    "129327",
-    "129328",
-    "129329",
-    "129330",
-    "129331",
-    "129332",
-    "129333",
-    "129334",
-    "129335",
-    "129336",
-    "129337",
-    "129338",
-    "129340",
-    "129341",
-    "129342",
-    "129344",
-    "129345",
-    "129346",
-    "129347",
-    "129348",
-    "129349",
-    "129351",
-    "129352",
-    "129353",
-    "129354",
-    "129355",
-    "129356",
-    "129357",
-    "129358",
-    "129359",
-    "129360",
-    "129361",
-    "129362",
-    "129363",
-    "129364",
-    "129365",
-    "129366",
-    "129367",
-    "129368",
-    "129369",
-    "129370",
-    "129371",
-    "129372",
-    "129373",
-    "129374",
-    "129375",
-    "129376",
-    "129377",
-    "129378",
-    "129379",
-    "129380",
-    "129381",
-    "129382",
-    "129383",
-    "129384",
-    "129385",
-    "129386",
-    "129387",
-    "129408",
-    "129409",
-    "129410",
-    "129411",
-    "129412",
-    "129413",
-    "129414",
-    "129415",
-    "129416",
-    "129417",
-    "129418",
-    "129419",
-    "129420",
-    "129421",
-    "129422",
-    "129423",
-    "129424",
-    "129425",
-    "129426",
-    "129427",
-    "129428",
-    "129429",
-    "129430",
-    "129431",
-    "129472",
-    "129488",
-    "129489",
-    "129490",
-    "129491",
-    "129492",
-    "129493",
-    "129494",
-    "129495",
-    "129496",
-    "129497",
-    "129498",
-    "129499",
-    "129500",
-    "129501",
-    "129502",
-    "129503",
-    "129504",
-    "129505",
-    "129506",
-    "129507",
-    "129508",
-    "129509",
-    "129510"
-]
\ No newline at end of file
+  "8986",
+  "8987",
+  "9193",
+  "9194",
+  "9195",
+  "9196",
+  "9197",
+  "9198",
+  "9199",
+  "9200",
+  "9201",
+  "9202",
+  "9203",
+  "9208",
+  "9209",
+  "9210",
+  "9410",
+  "9748",
+  "9749",
+  "9757",
+  "9800",
+  "9801",
+  "9802",
+  "9803",
+  "9804",
+  "9805",
+  "9806",
+  "9807",
+  "9808",
+  "9809",
+  "9810",
+  "9811",
+  "9823",
+  "9855",
+  "9875",
+  "9889",
+  "9898",
+  "9899",
+  "9917",
+  "9918",
+  "9924",
+  "9925",
+  "9934",
+  "9935",
+  "9937",
+  "9939",
+  "9940",
+  "9961",
+  "9962",
+  "9968",
+  "9969",
+  "9970",
+  "9971",
+  "9972",
+  "9973",
+  "9975",
+  "9976",
+  "9977",
+  "9978",
+  "9981",
+  "9986",
+  "9989",
+  "9992",
+  "9993",
+  "9994",
+  "9995",
+  "9996",
+  "9997",
+  "9999",
+  "10002",
+  "10004",
+  "10006",
+  "10013",
+  "10017",
+  "10024",
+  "10035",
+  "10036",
+  "10052",
+  "10055",
+  "10060",
+  "10062",
+  "10067",
+  "10068",
+  "10069",
+  "10071",
+  "10083",
+  "10084",
+  "10133",
+  "10134",
+  "10135",
+  "10145",
+  "10160",
+  "10175",
+  "10548",
+  "10549",
+  "11013",
+  "11014",
+  "11015",
+  "11035",
+  "11036",
+  "11088",
+  "11093",
+  "12336",
+  "12349",
+  "12951",
+  "12953",
+  "126980",
+  "127183",
+  "127344",
+  "127345",
+  "127358",
+  "127359",
+  "127374",
+  "127377",
+  "127378",
+  "127379",
+  "127380",
+  "127381",
+  "127382",
+  "127383",
+  "127384",
+  "127385",
+  "127386",
+  "127489",
+  "127490",
+  "127514",
+  "127535",
+  "127538",
+  "127539",
+  "127540",
+  "127541",
+  "127542",
+  "127543",
+  "127544",
+  "127545",
+  "127546",
+  "127568",
+  "127569",
+  "127744",
+  "127745",
+  "127746",
+  "127747",
+  "127748",
+  "127749",
+  "127750",
+  "127751",
+  "127752",
+  "127753",
+  "127754",
+  "127755",
+  "127756",
+  "127757",
+  "127758",
+  "127759",
+  "127760",
+  "127761",
+  "127762",
+  "127763",
+  "127764",
+  "127765",
+  "127766",
+  "127767",
+  "127768",
+  "127769",
+  "127770",
+  "127771",
+  "127772",
+  "127773",
+  "127774",
+  "127775",
+  "127776",
+  "127777",
+  "127780",
+  "127781",
+  "127782",
+  "127783",
+  "127784",
+  "127785",
+  "127786",
+  "127787",
+  "127788",
+  "127789",
+  "127790",
+  "127791",
+  "127792",
+  "127793",
+  "127794",
+  "127795",
+  "127796",
+  "127797",
+  "127798",
+  "127799",
+  "127800",
+  "127801",
+  "127802",
+  "127803",
+  "127804",
+  "127805",
+  "127806",
+  "127807",
+  "127808",
+  "127809",
+  "127810",
+  "127811",
+  "127812",
+  "127813",
+  "127814",
+  "127815",
+  "127816",
+  "127817",
+  "127818",
+  "127819",
+  "127820",
+  "127821",
+  "127822",
+  "127823",
+  "127824",
+  "127825",
+  "127826",
+  "127827",
+  "127828",
+  "127829",
+  "127830",
+  "127831",
+  "127832",
+  "127833",
+  "127834",
+  "127835",
+  "127836",
+  "127837",
+  "127838",
+  "127839",
+  "127840",
+  "127841",
+  "127842",
+  "127843",
+  "127844",
+  "127845",
+  "127846",
+  "127847",
+  "127848",
+  "127849",
+  "127850",
+  "127851",
+  "127852",
+  "127853",
+  "127854",
+  "127855",
+  "127856",
+  "127857",
+  "127858",
+  "127859",
+  "127860",
+  "127861",
+  "127862",
+  "127863",
+  "127864",
+  "127865",
+  "127866",
+  "127867",
+  "127868",
+  "127869",
+  "127870",
+  "127871",
+  "127872",
+  "127873",
+  "127874",
+  "127875",
+  "127876",
+  "127877",
+  "127878",
+  "127879",
+  "127880",
+  "127881",
+  "127882",
+  "127883",
+  "127884",
+  "127885",
+  "127886",
+  "127887",
+  "127888",
+  "127889",
+  "127890",
+  "127891",
+  "127894",
+  "127895",
+  "127897",
+  "127898",
+  "127899",
+  "127902",
+  "127903",
+  "127904",
+  "127905",
+  "127906",
+  "127907",
+  "127908",
+  "127909",
+  "127910",
+  "127911",
+  "127912",
+  "127913",
+  "127914",
+  "127915",
+  "127916",
+  "127917",
+  "127918",
+  "127919",
+  "127920",
+  "127921",
+  "127922",
+  "127923",
+  "127924",
+  "127925",
+  "127926",
+  "127927",
+  "127928",
+  "127929",
+  "127930",
+  "127931",
+  "127932",
+  "127933",
+  "127934",
+  "127935",
+  "127936",
+  "127937",
+  "127938",
+  "127939",
+  "127940",
+  "127941",
+  "127942",
+  "127943",
+  "127944",
+  "127945",
+  "127946",
+  "127947",
+  "127948",
+  "127949",
+  "127950",
+  "127951",
+  "127952",
+  "127953",
+  "127954",
+  "127955",
+  "127956",
+  "127957",
+  "127958",
+  "127959",
+  "127960",
+  "127961",
+  "127962",
+  "127963",
+  "127964",
+  "127965",
+  "127966",
+  "127967",
+  "127968",
+  "127969",
+  "127970",
+  "127971",
+  "127972",
+  "127973",
+  "127974",
+  "127975",
+  "127976",
+  "127977",
+  "127978",
+  "127979",
+  "127980",
+  "127981",
+  "127982",
+  "127983",
+  "127984",
+  "127987",
+  "127988",
+  "127989",
+  "127991",
+  "127992",
+  "127993",
+  "127994",
+  "127995",
+  "127996",
+  "127997",
+  "127998",
+  "127999",
+  "128000",
+  "128001",
+  "128002",
+  "128003",
+  "128004",
+  "128005",
+  "128006",
+  "128007",
+  "128008",
+  "128009",
+  "128010",
+  "128011",
+  "128012",
+  "128013",
+  "128014",
+  "128015",
+  "128016",
+  "128017",
+  "128018",
+  "128019",
+  "128020",
+  "128021",
+  "128022",
+  "128023",
+  "128024",
+  "128025",
+  "128026",
+  "128027",
+  "128028",
+  "128029",
+  "128030",
+  "128031",
+  "128032",
+  "128033",
+  "128034",
+  "128035",
+  "128036",
+  "128037",
+  "128038",
+  "128039",
+  "128040",
+  "128041",
+  "128042",
+  "128043",
+  "128044",
+  "128045",
+  "128046",
+  "128047",
+  "128048",
+  "128049",
+  "128050",
+  "128051",
+  "128052",
+  "128053",
+  "128054",
+  "128055",
+  "128056",
+  "128057",
+  "128058",
+  "128059",
+  "128060",
+  "128061",
+  "128062",
+  "128063",
+  "128064",
+  "128065",
+  "128066",
+  "128067",
+  "128068",
+  "128069",
+  "128070",
+  "128071",
+  "128072",
+  "128073",
+  "128074",
+  "128075",
+  "128076",
+  "128077",
+  "128078",
+  "128079",
+  "128080",
+  "128081",
+  "128082",
+  "128083",
+  "128084",
+  "128085",
+  "128086",
+  "128087",
+  "128088",
+  "128089",
+  "128090",
+  "128091",
+  "128092",
+  "128093",
+  "128094",
+  "128095",
+  "128096",
+  "128097",
+  "128098",
+  "128099",
+  "128100",
+  "128101",
+  "128102",
+  "128103",
+  "128104",
+  "128105",
+  "128106",
+  "128107",
+  "128108",
+  "128109",
+  "128110",
+  "128111",
+  "128112",
+  "128113",
+  "128114",
+  "128115",
+  "128116",
+  "128117",
+  "128118",
+  "128119",
+  "128120",
+  "128121",
+  "128122",
+  "128123",
+  "128124",
+  "128125",
+  "128126",
+  "128127",
+  "128128",
+  "128129",
+  "128130",
+  "128131",
+  "128132",
+  "128133",
+  "128134",
+  "128135",
+  "128136",
+  "128137",
+  "128138",
+  "128139",
+  "128140",
+  "128141",
+  "128142",
+  "128143",
+  "128144",
+  "128145",
+  "128146",
+  "128147",
+  "128148",
+  "128149",
+  "128150",
+  "128151",
+  "128152",
+  "128153",
+  "128154",
+  "128155",
+  "128156",
+  "128157",
+  "128158",
+  "128159",
+  "128160",
+  "128161",
+  "128162",
+  "128163",
+  "128164",
+  "128165",
+  "128166",
+  "128167",
+  "128168",
+  "128169",
+  "128170",
+  "128171",
+  "128172",
+  "128173",
+  "128174",
+  "128175",
+  "128176",
+  "128177",
+  "128178",
+  "128179",
+  "128180",
+  "128181",
+  "128182",
+  "128183",
+  "128184",
+  "128185",
+  "128186",
+  "128187",
+  "128188",
+  "128189",
+  "128190",
+  "128191",
+  "128192",
+  "128193",
+  "128194",
+  "128195",
+  "128196",
+  "128197",
+  "128198",
+  "128199",
+  "128200",
+  "128201",
+  "128202",
+  "128203",
+  "128204",
+  "128205",
+  "128206",
+  "128207",
+  "128208",
+  "128209",
+  "128210",
+  "128211",
+  "128212",
+  "128213",
+  "128214",
+  "128215",
+  "128216",
+  "128217",
+  "128218",
+  "128219",
+  "128220",
+  "128221",
+  "128222",
+  "128223",
+  "128224",
+  "128225",
+  "128226",
+  "128227",
+  "128228",
+  "128229",
+  "128230",
+  "128231",
+  "128232",
+  "128233",
+  "128234",
+  "128235",
+  "128236",
+  "128237",
+  "128238",
+  "128239",
+  "128240",
+  "128241",
+  "128242",
+  "128243",
+  "128244",
+  "128245",
+  "128246",
+  "128247",
+  "128248",
+  "128249",
+  "128250",
+  "128251",
+  "128252",
+  "128253",
+  "128255",
+  "128256",
+  "128257",
+  "128258",
+  "128259",
+  "128260",
+  "128261",
+  "128262",
+  "128263",
+  "128264",
+  "128265",
+  "128266",
+  "128267",
+  "128268",
+  "128269",
+  "128270",
+  "128271",
+  "128272",
+  "128273",
+  "128274",
+  "128275",
+  "128276",
+  "128277",
+  "128278",
+  "128279",
+  "128280",
+  "128281",
+  "128282",
+  "128283",
+  "128284",
+  "128285",
+  "128286",
+  "128287",
+  "128288",
+  "128289",
+  "128290",
+  "128291",
+  "128292",
+  "128293",
+  "128294",
+  "128295",
+  "128296",
+  "128297",
+  "128298",
+  "128299",
+  "128300",
+  "128301",
+  "128302",
+  "128303",
+  "128304",
+  "128305",
+  "128306",
+  "128307",
+  "128308",
+  "128309",
+  "128310",
+  "128311",
+  "128312",
+  "128313",
+  "128314",
+  "128315",
+  "128316",
+  "128317",
+  "128329",
+  "128330",
+  "128331",
+  "128332",
+  "128333",
+  "128334",
+  "128336",
+  "128337",
+  "128338",
+  "128339",
+  "128340",
+  "128341",
+  "128342",
+  "128343",
+  "128344",
+  "128345",
+  "128346",
+  "128347",
+  "128348",
+  "128349",
+  "128350",
+  "128351",
+  "128352",
+  "128353",
+  "128354",
+  "128355",
+  "128356",
+  "128357",
+  "128358",
+  "128359",
+  "128367",
+  "128368",
+  "128371",
+  "128372",
+  "128373",
+  "128374",
+  "128375",
+  "128376",
+  "128377",
+  "128378",
+  "128391",
+  "128394",
+  "128395",
+  "128396",
+  "128397",
+  "128400",
+  "128405",
+  "128406",
+  "128420",
+  "128421",
+  "128424",
+  "128433",
+  "128434",
+  "128444",
+  "128450",
+  "128451",
+  "128452",
+  "128465",
+  "128466",
+  "128467",
+  "128476",
+  "128477",
+  "128478",
+  "128481",
+  "128483",
+  "128488",
+  "128495",
+  "128499",
+  "128506",
+  "128507",
+  "128508",
+  "128509",
+  "128510",
+  "128511",
+  "128512",
+  "128513",
+  "128514",
+  "128515",
+  "128516",
+  "128517",
+  "128518",
+  "128519",
+  "128520",
+  "128521",
+  "128522",
+  "128523",
+  "128524",
+  "128525",
+  "128526",
+  "128527",
+  "128528",
+  "128529",
+  "128530",
+  "128531",
+  "128532",
+  "128533",
+  "128534",
+  "128535",
+  "128536",
+  "128537",
+  "128538",
+  "128539",
+  "128540",
+  "128541",
+  "128542",
+  "128543",
+  "128544",
+  "128545",
+  "128546",
+  "128547",
+  "128548",
+  "128549",
+  "128550",
+  "128551",
+  "128552",
+  "128553",
+  "128554",
+  "128555",
+  "128556",
+  "128557",
+  "128558",
+  "128559",
+  "128560",
+  "128561",
+  "128562",
+  "128563",
+  "128564",
+  "128565",
+  "128566",
+  "128567",
+  "128568",
+  "128569",
+  "128570",
+  "128571",
+  "128572",
+  "128573",
+  "128574",
+  "128575",
+  "128576",
+  "128577",
+  "128578",
+  "128579",
+  "128580",
+  "128581",
+  "128582",
+  "128583",
+  "128584",
+  "128585",
+  "128586",
+  "128587",
+  "128588",
+  "128589",
+  "128590",
+  "128591",
+  "128640",
+  "128641",
+  "128642",
+  "128643",
+  "128644",
+  "128645",
+  "128646",
+  "128647",
+  "128648",
+  "128649",
+  "128650",
+  "128651",
+  "128652",
+  "128653",
+  "128654",
+  "128655",
+  "128656",
+  "128657",
+  "128658",
+  "128659",
+  "128660",
+  "128661",
+  "128662",
+  "128663",
+  "128664",
+  "128665",
+  "128666",
+  "128667",
+  "128668",
+  "128669",
+  "128670",
+  "128671",
+  "128672",
+  "128673",
+  "128674",
+  "128675",
+  "128676",
+  "128677",
+  "128678",
+  "128679",
+  "128680",
+  "128681",
+  "128682",
+  "128683",
+  "128684",
+  "128685",
+  "128686",
+  "128687",
+  "128688",
+  "128689",
+  "128690",
+  "128691",
+  "128692",
+  "128693",
+  "128694",
+  "128695",
+  "128696",
+  "128697",
+  "128698",
+  "128699",
+  "128700",
+  "128701",
+  "128702",
+  "128703",
+  "128704",
+  "128705",
+  "128706",
+  "128707",
+  "128708",
+  "128709",
+  "128715",
+  "128716",
+  "128717",
+  "128718",
+  "128719",
+  "128720",
+  "128721",
+  "128722",
+  "128736",
+  "128737",
+  "128738",
+  "128739",
+  "128740",
+  "128741",
+  "128745",
+  "128747",
+  "128748",
+  "128752",
+  "128755",
+  "128756",
+  "128757",
+  "128758",
+  "128759",
+  "128760",
+  "128761",
+  "128762",
+  "129296",
+  "129297",
+  "129298",
+  "129299",
+  "129300",
+  "129301",
+  "129302",
+  "129303",
+  "129304",
+  "129305",
+  "129306",
+  "129307",
+  "129308",
+  "129309",
+  "129310",
+  "129311",
+  "129312",
+  "129313",
+  "129314",
+  "129315",
+  "129316",
+  "129317",
+  "129318",
+  "129319",
+  "129320",
+  "129321",
+  "129322",
+  "129323",
+  "129324",
+  "129325",
+  "129326",
+  "129327",
+  "129328",
+  "129329",
+  "129330",
+  "129331",
+  "129332",
+  "129333",
+  "129334",
+  "129335",
+  "129336",
+  "129337",
+  "129338",
+  "129340",
+  "129341",
+  "129342",
+  "129344",
+  "129345",
+  "129346",
+  "129347",
+  "129348",
+  "129349",
+  "129351",
+  "129352",
+  "129353",
+  "129354",
+  "129355",
+  "129356",
+  "129357",
+  "129358",
+  "129359",
+  "129360",
+  "129361",
+  "129362",
+  "129363",
+  "129364",
+  "129365",
+  "129366",
+  "129367",
+  "129368",
+  "129369",
+  "129370",
+  "129371",
+  "129372",
+  "129373",
+  "129374",
+  "129375",
+  "129376",
+  "129377",
+  "129378",
+  "129379",
+  "129380",
+  "129381",
+  "129382",
+  "129383",
+  "129384",
+  "129385",
+  "129386",
+  "129387",
+  "129408",
+  "129409",
+  "129410",
+  "129411",
+  "129412",
+  "129413",
+  "129414",
+  "129415",
+  "129416",
+  "129417",
+  "129418",
+  "129419",
+  "129420",
+  "129421",
+  "129422",
+  "129423",
+  "129424",
+  "129425",
+  "129426",
+  "129427",
+  "129428",
+  "129429",
+  "129430",
+  "129431",
+  "129472",
+  "129488",
+  "129489",
+  "129490",
+  "129491",
+  "129492",
+  "129493",
+  "129494",
+  "129495",
+  "129496",
+  "129497",
+  "129498",
+  "129499",
+  "129500",
+  "129501",
+  "129502",
+  "129503",
+  "129504",
+  "129505",
+  "129506",
+  "129507",
+  "129508",
+  "129509",
+  "129510"
+]
diff --git a/apps/app/ui/emoji-icon-picker/index.tsx b/apps/app/ui/emoji-icon-picker/index.tsx
index b415724c1..c540edc6f 100644
--- a/apps/app/ui/emoji-icon-picker/index.tsx
+++ b/apps/app/ui/emoji-icon-picker/index.tsx
@@ -39,7 +39,7 @@ const EmojiIconPicker: React.FC<Props> = ({ label, value, onChange }) => {
   return (
     <Popover className="relative" ref={ref}>
       <Popover.Button
-        className="bg-gray-100 px-3 py-1 rounded-full outline-none"
+        className="border border-gray-300 p-3 sm:text-sm rounded-md outline-none"
         onClick={() => setIsOpen((prev) => !prev)}
       >
         {label}