diff --git a/web/sdk/react/views-new/pat/components/pat-form-dialog.tsx b/web/sdk/react/views-new/pat/components/pat-form-dialog.tsx
index 7db108e08..fc770c7cf 100644
--- a/web/sdk/react/views-new/pat/components/pat-form-dialog.tsx
+++ b/web/sdk/react/views-new/pat/components/pat-form-dialog.tsx
@@ -15,7 +15,7 @@ import {
   UpdateCurrentUserPATRequestSchema,
   CheckCurrentUserPATTitleRequestSchema,
   ListRolesForPATRequestSchema,
-  ListOrganizationProjectsRequestSchema
+  ListProjectsByCurrentUserRequestSchema
 } from '@raystack/proton/frontier';
 import type { PAT } from '@raystack/proton/frontier';
 import {
@@ -145,11 +145,10 @@ export function PATFormDialog({
   };
 
   const { data: projectsData, isLoading: isProjectsLoading } = useQuery(
-    FrontierServiceQueries.listOrganizationProjects,
-    create(ListOrganizationProjectsRequestSchema, {
-      id: orgId,
-      state: '',
-      withMemberCount: false
+    FrontierServiceQueries.listProjectsByCurrentUser,
+    create(ListProjectsByCurrentUserRequestSchema, {
+      orgId,
+      nonInherited: false
     }),
     { enabled: Boolean(orgId) }
   );
@@ -542,51 +541,51 @@ export function PATFormDialog({
                           const remaining =
                             selectedIds.length - visible.length;
                           return (
-                          <Select
-                            multiple
-                            value={field.value}
-                            onValueChange={(val: string[]) => {
-                              field.onChange(val);
-                              clearErrors('projectIds');
-                            }}
-                          >
-                            <Select.Trigger>
-                              <Select.Value placeholder="Select projects">
-                                {selectedIds.length === 0 ? null : (
-                                  <Flex gap={2} align="center">
-                                    {visible.map(id => (
-                                      <Chip
-                                        key={id}
-                                        className={styles.projectChip}
-                                      >
-                                        <span
-                                          className={
-                                            styles.projectChipLabel
-                                          }
+                            <Select
+                              multiple
+                              value={field.value}
+                              onValueChange={(val: string[]) => {
+                                field.onChange(val);
+                                clearErrors('projectIds');
+                              }}
+                            >
+                              <Select.Trigger>
+                                <Select.Value placeholder="Select projects">
+                                  {selectedIds.length === 0 ? null : (
+                                    <Flex gap={2} align="center">
+                                      {visible.map(id => (
+                                        <Chip
+                                          key={id}
+                                          className={styles.projectChip}
                                         >
-                                          {projects.find(p => p.id === id)
-                                            ?.title || id}
-                                        </span>
-                                      </Chip>
-                                    ))}
-                                    {remaining > 0 && (
-                                      <Chip>{`+${remaining}`}</Chip>
-                                    )}
-                                  </Flex>
-                                )}
-                              </Select.Value>
-                            </Select.Trigger>
-                            <Select.Content>
-                              {projects.map(project => (
-                                <Select.Item
-                                  value={project.id}
-                                  key={project.id}
-                                >
-                                  {project.title}
-                                </Select.Item>
-                              ))}
-                            </Select.Content>
-                          </Select>
+                                          <span
+                                            className={
+                                              styles.projectChipLabel
+                                            }
+                                          >
+                                            {projects.find(p => p.id === id)
+                                              ?.title || id}
+                                          </span>
+                                        </Chip>
+                                      ))}
+                                      {remaining > 0 && (
+                                        <Chip>{`+${remaining}`}</Chip>
+                                      )}
+                                    </Flex>
+                                  )}
+                                </Select.Value>
+                              </Select.Trigger>
+                              <Select.Content>
+                                {projects.map(project => (
+                                  <Select.Item
+                                    value={project.id}
+                                    key={project.id}
+                                  >
+                                    {project.title}
+                                  </Select.Item>
+                                ))}
+                              </Select.Content>
+                            </Select>
                           );
                         }}
                       />
diff --git a/web/sdk/react/views-new/pat/pat-details-view.tsx b/web/sdk/react/views-new/pat/pat-details-view.tsx
index a3b812beb..5b7e52d52 100644
--- a/web/sdk/react/views-new/pat/pat-details-view.tsx
+++ b/web/sdk/react/views-new/pat/pat-details-view.tsx
@@ -20,7 +20,7 @@ import {
   FrontierServiceQueries,
   GetCurrentUserPATRequestSchema,
   ListRolesForPATRequestSchema,
-  ListOrganizationProjectsRequestSchema
+  ListProjectsByCurrentUserRequestSchema
 } from '@raystack/proton/frontier';
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
@@ -129,11 +129,10 @@ export function PATDetailsView({
   );
 
   const { data: projectsData, isLoading: isProjectsLoading } = useQuery(
-    FrontierServiceQueries.listOrganizationProjects,
-    create(ListOrganizationProjectsRequestSchema, {
-      id: orgId,
-      state: '',
-      withMemberCount: false
+    FrontierServiceQueries.listProjectsByCurrentUser,
+    create(ListProjectsByCurrentUserRequestSchema, {
+      orgId,
+      nonInherited: false
     }),
     { enabled: Boolean(orgId) }
   );
diff --git a/web/sdk/react/views-new/pat/pat-view.module.css b/web/sdk/react/views-new/pat/pat-view.module.css
index 0420a1152..5b25d383b 100644
--- a/web/sdk/react/views-new/pat/pat-view.module.css
+++ b/web/sdk/react/views-new/pat/pat-view.module.css
@@ -22,3 +22,8 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.emptyStateIcon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
diff --git a/web/sdk/react/views-new/pat/pat-view.tsx b/web/sdk/react/views-new/pat/pat-view.tsx
index 5df99a715..5084c821d 100644
--- a/web/sdk/react/views-new/pat/pat-view.tsx
+++ b/web/sdk/react/views-new/pat/pat-view.tsx
@@ -169,6 +169,9 @@ export function PatsView({ onPATClick }: PatsViewProps = {}) {
       ) : hasNoPats ? (
         <EmptyState
           variant="empty2"
+          classNames={{
+            icon: styles.emptyStateIcon
+          }}
           icon={
             <Image
               src={keyIcon as unknown as string}
diff --git a/web/sdk/react/views-new/projects/projects-view.module.css b/web/sdk/react/views-new/projects/projects-view.module.css
index 9d3c0abbc..4b3fe1369 100644
--- a/web/sdk/react/views-new/projects/projects-view.module.css
+++ b/web/sdk/react/views-new/projects/projects-view.module.css
@@ -15,3 +15,9 @@
   min-width: 140px;
   box-shadow: none;
 }
+
+.emptyStateIcon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
diff --git a/web/sdk/react/views-new/projects/projects-view.tsx b/web/sdk/react/views-new/projects/projects-view.tsx
index 4c64c4244..6b3090ca1 100644
--- a/web/sdk/react/views-new/projects/projects-view.tsx
+++ b/web/sdk/react/views-new/projects/projects-view.tsx
@@ -145,12 +145,15 @@ export function ProjectsView({
         <ViewHeader title={title} description={description ?? `Manage projects for this ${t.organization({ case: 'lower' })}`} />
         <EmptyState
           variant="empty2"
+          classNames={{
+            icon: styles.emptyStateIcon
+          }}
           icon={
             <Image
               src={inboxStackIcon as unknown as string}
               alt=""
-              width="100%"
-              height="100%"
+              width={40}
+              height={40}
             />
           }
           heading={t.project()}
diff --git a/web/sdk/react/views-new/teams/teams-view.module.css b/web/sdk/react/views-new/teams/teams-view.module.css
index dcc38126c..a6fbd0680 100644
--- a/web/sdk/react/views-new/teams/teams-view.module.css
+++ b/web/sdk/react/views-new/teams/teams-view.module.css
@@ -11,3 +11,9 @@
   min-width: 120px;
   box-shadow: none;
 }
+
+.emptyStateIcon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
diff --git a/web/sdk/react/views-new/teams/teams-view.tsx b/web/sdk/react/views-new/teams/teams-view.tsx
index 31fbe768e..22ec29c28 100644
--- a/web/sdk/react/views-new/teams/teams-view.tsx
+++ b/web/sdk/react/views-new/teams/teams-view.tsx
@@ -147,12 +147,15 @@ export function TeamsView({
         />
         <EmptyState
           variant="empty2"
+          classNames={{
+            icon: styles.emptyStateIcon
+          }}
           icon={
             <Image
               src={usersIcon as unknown as string}
               alt=""
-              width="100%"
-              height="100%"
+              width={40}
+              height={40}
             />
           }
           heading={t.team()}