diff --git a/dashboard/src/pages/Group.svelte b/dashboard/src/pages/Group.svelte
index 46c8d5d3..b9abbe34 100644
--- a/dashboard/src/pages/Group.svelte
+++ b/dashboard/src/pages/Group.svelte
@@ -162,69 +162,55 @@
             {#if settings && settings.accessibility ? (!settings.accessibility.expandedcards && !settings.accessibility.pagelinks) : true}
             <Accordion class="mb-3" stayOpen>
             {#each slicedMembers as member, index (member.id)}
-            {#if (!isPublic && member.privacy.visibility === "public") || isPublic}
                 <AccordionItem>
                     <CardsHeader bind:item={member} slot="header">
-                        <FaUserCircle slot="icon" />
+                        <div slot="icon">
+                            {#if isPublic || member.privacy.visibility === "public"}
+                            <FaUserCircle />
+                            {:else}
+                            <FaLock />
+                            {/if}
+                        </div>
                     </CardsHeader>
                     <MemberBody on:update={updateMemberList} isMainDash={isMainDash} on:deletion={deleteMemberFromList} bind:member bind:isPublic={isPublic}/>
                 </AccordionItem>
-                {:else}
-                <AccordionItem>
-                    <CardsHeader bind:item={member} slot="header">
-                        <FaLock slot="icon" />
-                    </CardsHeader>
-                    <MemberBody on:update={updateMemberList} isMainDash={isMainDash} on:deletion={deleteMemberFromList} bind:member bind:isPublic={isPublic}/>
-                </AccordionItem>
-                {/if}
             {/each}
             </Accordion>
             {:else if settings.accessibility.expandedcards}
             {#each slicedMembers as member, index (member.id)}
-                {#if (!isPublic && member.privacy.visibility === "public") || isPublic}
                 <Card class="mb-3">
                     <CardHeader>
                         <CardsHeader bind:item={member}>
-                            <FaUserCircle slot="icon" />
+                            <div slot="icon">
+                                {#if isPublic || member.privacy.visibility === "public"}
+                                <FaUserCircle />
+                                {:else}
+                                <FaLock />
+                                {/if}
+                            </div>
                         </CardsHeader>
                     </CardHeader>
                     <CardBody>
                         <MemberBody on:update={updateMemberList} isMainDash={isMainDash} on:deletion={deleteMemberFromList} bind:member bind:isPublic={isPublic}/>
                     </CardBody>
                 </Card>
-                {:else}
-                <Card class="mb-3">
-                    <CardHeader>
-                        <CardsHeader bind:item={member}>
-                            <FaLock slot="icon" />
-                        </CardsHeader>
-                    </CardHeader>
-                    <CardBody>
-                        <MemberBody on:update={updateMemberList} isMainDash={isMainDash} on:deletion={deleteMemberFromList} bind:member bind:isPublic={isPublic}/>
-                    </CardBody>
-                </Card>
-                {/if}
             {/each}
             {:else}
             <div class="my-3">
             {#each slicedMembers as member, index (member.id)}
-                {#if (!isPublic && member.privacy.visibility === "public") || isPublic}
                 <Card>
                     <Link class="accordion-button collapsed" style="text-decoration: none;" to={!isPublic ? `/dash/m/${member.id}` : `/profile/m/${member.id}`}>
                         <CardsHeader bind:item={member}>
-                            <FaUserCircle slot="icon" />
+                            <div slot="icon">
+                                {#if isPublic || member.privacy.visibility === "public"}
+                                <FaUserCircle />
+                                {:else}
+                                <FaLock />
+                                {/if}
+                            </div>
                         </CardsHeader>
                     </Link>
                 </Card>
-                {:else}
-                <Card>
-                    <Link class="accordion-button collapsed" style="text-decoration: none;" to={!isPublic ? `/dash/m/${member.id}` : `/profile/m/${member.id}`}>
-                        <CardsHeader bind:item={member}>
-                            <FaLock slot="icon" />
-                        </CardsHeader>
-                    </Link>
-                </Card>
-                {/if}
             {/each}
             </div>
             {/if}
diff --git a/dashboard/src/pages/Member.svelte b/dashboard/src/pages/Member.svelte
index 69aba683..0524d142 100644
--- a/dashboard/src/pages/Member.svelte
+++ b/dashboard/src/pages/Member.svelte
@@ -169,69 +169,53 @@
             {#if settings && settings.accessibility ? (!settings.accessibility.expandedcards && !settings.accessibility.pagelinks) : true}
             <Accordion class="mb-3" stayOpen>
             {#each slicedGroups as group, index (group.id)}
-            {#if (!isPublic && group.privacy.visibility === "public") || isPublic}
                 <AccordionItem>
                     <CardsHeader bind:item={group} slot="header">
-                        <FaUsers slot="icon" />
+                        <div slot="icon">
+                            {#if isPublic || group.privacy.visibility === "public"}
+                            <FaUsers />
+                            {:else}
+                            <FaLock />
+                            {/if}
+                        </div>
                     </CardsHeader>
-                    <GroupBody bind:members={systemMembers} on:update={updateGroupList} isMainDash={isMainDash} on:deletion={deleteGroupFromList} bind:group bind:isPublic={isPublic}/>
+                    <GroupBody bind:members={systemMembers} isMainDash={isMainDash} on:deletion={deleteGroupFromList} bind:group bind:isPublic={isPublic}/>
                 </AccordionItem>
-                {:else}
-                <AccordionItem>
-                    <CardsHeader bind:item={group} slot="header">
-                        <FaLock slot="icon" />
-                    </CardsHeader>
-                    <GroupBody bind:members={systemMembers} on:update={updateGroupList} isMainDash={isMainDash} on:deletion={deleteGroupFromList} bind:group bind:isPublic={isPublic}/>
-                </AccordionItem>
-                {/if}
             {/each}
             </Accordion>
             {:else if settings.accessibility.expandedcards}
             {#each slicedGroups as group, index (group.id)}
-                {#if (!isPublic && group.privacy.visibility === "public") || isPublic}
                 <Card class="mb-3">
                     <CardHeader>
-                        <CardsHeader bind:item={group} >
-                            <FaUsers slot="icon" />
-                        </CardsHeader>
+                        <div slot="icon">
+                            {#if isPublic || group.privacy.visibility === "public"}
+                            <FaUsers />
+                            {:else}
+                            <FaLock />
+                            {/if}
+                        </div>
                     </CardHeader>
                     <CardBody>
-                        <GroupBody bind:members={systemMembers} on:update={updateGroupList} isMainDash={isMainDash} on:deletion={deleteGroupFromList} bind:group bind:isPublic={isPublic}/>
+                        <GroupBody bind:members={systemMembers} isMainDash={isMainDash} on:deletion={deleteGroupFromList} bind:group bind:isPublic={isPublic}/>
                     </CardBody>
                 </Card>
-                {:else}
-                <Card class="mb-3">
-                    <CardHeader>
-                        <CardsHeader bind:item={group} >
-                            <FaLock slot="icon" />
-                        </CardsHeader>
-                    </CardHeader>
-                    <CardBody>
-                        <GroupBody bind:members={systemMembers} on:update={updateGroupList} isMainDash={isMainDash} on:deletion={deleteGroupFromList} bind:group bind:isPublic={isPublic}/>
-                    </CardBody>
-                </Card>
-                {/if}
             {/each}
             {:else}
             <div class="my-3">
             {#each slicedGroups as group, index (group.id)}
-                {#if (!isPublic && group.privacy.visibility === "public") || isPublic}
                 <Card>
                     <Link class="accordion-button collapsed" style="text-decoration: none;" to={!isPublic ? `/dash/g/${group.id}` : `/profile/g/${group.id}`}>
                         <CardsHeader bind:item={group}>
-                            <FaUsers slot="icon" />
+                            <div slot="icon">
+                                {#if isPublic || group.privacy.visibility === "public"}
+                                <FaUsers />
+                                {:else}
+                                <FaLock />
+                                {/if}
+                            </div>
                         </CardsHeader>
                     </Link>
                 </Card>
-                {:else}
-                <Card>
-                    <Link class="accordion-button collapsed" style="text-decoration: none;" to={!isPublic ? `/dash/g/${group.id}` : `/profile/g/${group.id}`}>
-                        <CardsHeader bind:item={group}>
-                            <FaUsers slot="icon" />
-                        </CardsHeader>
-                    </Link>
-                </Card>
-                {/if}
             {/each}
             </div>
             {/if}