diff --git a/packages/bbui/src/Badge/Badge.svelte b/packages/bbui/src/Badge/Badge.svelte
index 15bb6c62c2..dadbaa3317 100644
--- a/packages/bbui/src/Badge/Badge.svelte
+++ b/packages/bbui/src/Badge/Badge.svelte
@@ -11,7 +11,7 @@
   export let active = false
   export let inactive = false
   export let hoverable = false
-  export let customColor = null
+  export let outlineColor = null
 </script>
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
@@ -30,7 +30,7 @@
   class:spectrum-Label--seafoam={seafoam}
   class:spectrum-Label--active={active}
   class:spectrum-Label--inactive={inactive}
-  style={customColor ? `background-color: ${customColor}` : ""}
+  style={outlineColor ? `border: 2px solid ${outlineColor}` : ""}
 >
   <slot />
 </span>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
index 47811cbcb9..43c662a6d2 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
@@ -1,49 +1,22 @@
 <script>
-  import { Icon, Popover } from "@budibase/bbui"
-  import GroupBadge from "./GroupBadge.svelte"
+  import { Icon } from "@budibase/bbui"
+  import { helpers } from "@budibase/shared-core"
 
   export let groups = []
-
-  let anchor, popover
-
-  function show() {
-    popover.show()
-  }
-
-  function hide() {
-    popover.hide()
+  function tooltip(groups) {
+    const sortedNames = groups.sort((a, b) => a.name.localeCompare(b.name)).map(group => group.name)
+    return `Member of ${helpers.lists.punctuateList(sortedNames)}`
   }
 </script>
 
-<div class="icon" bind:this={anchor}>
-  <Icon name="More" size="S" hoverable on:mouseover={show} on:mouseleave={hide} />
+<div class="icon">
+  <Icon name="Info" size="XS" color="grey" hoverable tooltip={tooltip(groups)} tooltipPosition="top" />
 </div>
 
-<Popover
-  customZIndex={1002}
-  bind:this={popover}
-  align="center"
-  {anchor}
-  showPopover={true}
-  minWidth={0}
->
-  <div class="badges">
-    {#each groups as group}
-      <GroupBadge color={group.color} name={group.name} />
-    {/each}
-  </div>
-</Popover>
-
 <style>
   .icon {
     height: auto;
     display: flex;
     justify-content: center;
   }
-  .badges {
-    display: flex;
-    flex-wrap: wrap;
-    gap: var(--spacing-s);
-    padding: var(--spacing-m);
-  }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 11a36706cf..0bf32e4b76 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -13,7 +13,6 @@
     FancyInput,
     Button,
     FancySelect,
-    Badge,
   } from "@budibase/bbui"
   import { builderStore, appStore, roles, appPublished } from "@/stores/builder"
   import {
@@ -39,7 +38,6 @@
   import { fly } from "svelte/transition"
   import InfoDisplay from "../design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
   import BuilderGroupPopover from "./BuilderGroupPopover.svelte"
-  import GroupBadge from "./GroupBadge.svelte"
 
   let query = null
   let loaded = false
@@ -542,6 +540,12 @@
       creationAccessType = Constants.Roles.CREATOR
     }
   }
+
+  const itemCountText = (word, count) => {
+    return `${count} ${word}${
+      count !== 1 ? "s" : ""
+    }`
+  }
 </script>
 
 <svelte:window on:keydown={handleKeyDown} />
@@ -708,9 +712,7 @@
                       {group.name}
                     </div>
                     <div class="auth-entity-meta">
-                      {`${group.users?.length} user${
-                        group.users?.length != 1 ? "s" : ""
-                      }`}
+                      {itemCountText("user", group.users?.length)}
                     </div>
                   </div>
                   <div class="auth-entity-access">
@@ -755,20 +757,20 @@
                       <div class="user-email" title={user.email}>
                         {user.email}
                       </div>
-                      <div class="group-badges">
-                        {#each userGroups.slice(0, 3) as group}
-                          <GroupBadge color={group.color} name={group.name} />
-                        {/each}
-                        {#if userGroups.length > 3}
-                          <BuilderGroupPopover groups={userGroups.slice(3)} />
-                        {/if}
-                      </div>
+                      {#if userGroups.length}
+                        <div class="group-info">
+                          <div class="auth-entity-meta">
+                            {itemCountText("group", userGroups.length)}
+                          </div>
+                          <BuilderGroupPopover groups={userGroups} />
+                        </div>
+                      {/if}
                     </div>
                   </div>
                   <div class="auth-entity-access" class:muted={user.group}>
                     <RoleSelect
                       footer={getRoleFooter(user)}
-                      placeholder={userGroups?.length ? "Override" : false}
+                      placeholder={userGroups?.length ? "Controlled by group" : false}
                       value={parseRole(user)}
                       allowRemove={user.role && !user.group}
                       allowPublic={false}
@@ -949,7 +951,7 @@
 
   .auth-entity,
   .auth-entity-header {
-    padding: 0px var(--spacing-xl);
+    padding: 0 var(--spacing-xl);
   }
 
   .auth-entity,
@@ -958,8 +960,6 @@
     grid-template-columns: 1fr 220px;
     align-items: center;
     gap: var(--spacing-xl);
-    border-bottom: var(--border-light);
-    padding-bottom: var(--spacing-s);
   }
 
   .auth-entity .details {
@@ -1071,12 +1071,16 @@
 
   .user-groups {
     display: flex;
-    flex-direction: column;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    gap: var(--spacing-m);
   }
-  .group-badges {
-    padding-top: var(--spacing-s);
+
+  .group-info {
     display: flex;
-    gap: var(--spacing-s);
-    flex-wrap: wrap;
+    flex-direction: row;
+    gap: var(--spacing-xs);
+    justify-content: center;
   }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte b/packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte
deleted file mode 100644
index f10e2aa220..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
-  import { Badge } from "@budibase/bbui"
-
-  export let color
-  export let name
-</script>
-
-<Badge size="S" customColor={`color-mix(in srgb, ${color} 30%, transparent)`}
-  >{name}</Badge
->
diff --git a/packages/shared-core/src/helpers/index.ts b/packages/shared-core/src/helpers/index.ts
index 0aa378b46a..b924617a0f 100644
--- a/packages/shared-core/src/helpers/index.ts
+++ b/packages/shared-core/src/helpers/index.ts
@@ -6,3 +6,4 @@ export * as cron from "./cron"
 export * as schema from "./schema"
 export * as views from "./views"
 export * as roles from "./roles"
+export * as lists from "./lists"
diff --git a/packages/shared-core/src/helpers/lists.ts b/packages/shared-core/src/helpers/lists.ts
new file mode 100644
index 0000000000..64b906fef8
--- /dev/null
+++ b/packages/shared-core/src/helpers/lists.ts
@@ -0,0 +1,7 @@
+export function punctuateList(list: string[]) {
+  if (list.length === 0) return ""
+  if (list.length === 1) return list[0]
+  if (list.length === 2) return list.join(" and ")
+  // For more than 2 elements: join all but the last with commas, then add "and" before the last element.
+  return list.slice(0, -1).join(", ") + " and " + list[list.length - 1]
+}