diff --git a/frontend/src/components/v2/EmptyState/EmptyState.tsx b/frontend/src/components/v2/EmptyState/EmptyState.tsx
index 1abe484f2..be2333723 100644
--- a/frontend/src/components/v2/EmptyState/EmptyState.tsx
+++ b/frontend/src/components/v2/EmptyState/EmptyState.tsx
@@ -11,11 +11,11 @@ type Props = {
 };
 
 export const EmptyState = ({ title, className, children, icon = faCubesStacked }: Props) => (
-  <div className={twMerge('flex w-full flex-col items-center p-8 text-mineshaft-50', className)}>
-    <div className="mb-4">
-      <FontAwesomeIcon icon={icon} size="3x" />
+  <div className={twMerge('flex w-full flex-col items-center px-2 pt-6 text-bunker-300', className)}>
+    <FontAwesomeIcon icon={icon} size="2x" className='mr-4' />
+    <div className='flex flex-row items-center py-4'>
+      <div className="text-bunker-300 text-sm">{title}</div>
+      <div>{children}</div>
     </div>
-    <div className="mb-8 text-gray-300">{title}</div>
-    <div>{children}</div>
   </div>
 );
diff --git a/frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx b/frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx
index 04ef841d2..ca1f3a3fd 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx
@@ -232,14 +232,11 @@ export const OrgSettingsPage = () => {
       <div className="max-w-8xl ml-6 mr-6 flex flex-col text-mineshaft-50">
         <OrgNameChangeSection orgName={currentOrg?.name} onOrgNameChange={onRenameOrg} />
         <div className="mb-6 flex w-full flex-col items-start rounded-md bg-white/5 px-6 pt-6 pb-6">
-          <p className="mr-4 text-xl font-semibold text-white">
+          <p className="mr-4 mb-4 text-xl font-semibold text-white">
             {t('section-members:org-members')}
           </p>
-          <p className="mr-4 mt-2 mb-2 text-gray-400">
-            {t('section-members:org-members-description')}
-          </p>
           <OrgMembersTable
-            isLoading={isOrgUserLoading && IsWsMembershipLoading}
+            isLoading={isOrgUserLoading || IsWsMembershipLoading}
             isMoreUserNotAllowed={isMoreUsersNotAllowed}
             orgName={currentOrg?.name || ''}
             members={orgUsers}
diff --git a/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenSection/ServiceTokenSection.tsx b/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenSection/ServiceTokenSection.tsx
index 88500c6e9..e4c4bbf2e 100644
--- a/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenSection/ServiceTokenSection.tsx
+++ b/frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenSection/ServiceTokenSection.tsx
@@ -256,7 +256,7 @@ export const ServiceTokenSection = ({
         isOpen={popUp.deleteAPITokenConfirmation.isOpen}
         title={`Delete ${
           (popUp?.deleteAPITokenConfirmation?.data as DeleteModalData)?.name || ' '
-        } api key?`}
+        } service token?`}
         onChange={(isOpen) => handlePopUpToggle('deleteAPITokenConfirmation', isOpen)}
         deleteKey={(popUp?.deleteAPITokenConfirmation?.data as DeleteModalData)?.name}
         onClose={() => handlePopUpClose('deleteAPITokenConfirmation')}