diff --git a/web/src/admin/applications/ApplicationListPage.ts b/web/src/admin/applications/ApplicationListPage.ts
index bc859326d..203b91720 100644
--- a/web/src/admin/applications/ApplicationListPage.ts
+++ b/web/src/admin/applications/ApplicationListPage.ts
@@ -60,6 +60,10 @@ export class ApplicationListPage extends TablePage<Application> {
             PFCard,
             AKGlobal,
             css`
+                /* Fix alignment issues with images in tables */
+                .pf-c-table tbody > tr > * {
+                    vertical-align: middle;
+                }
                 tr td:first-child {
                     width: auto;
                     min-width: 0px;
diff --git a/web/src/admin/crypto/CertificateKeyPairListPage.ts b/web/src/admin/crypto/CertificateKeyPairListPage.ts
index 9bd678a2e..86dbf0237 100644
--- a/web/src/admin/crypto/CertificateKeyPairListPage.ts
+++ b/web/src/admin/crypto/CertificateKeyPairListPage.ts
@@ -70,7 +70,7 @@ export class CertificateKeyPairListPage extends TablePage<CertificateKeyPair> {
             .metadata=${(item: CertificateKeyPair) => {
                 return [
                     { key: t`Name`, value: item.name },
-                    { key: t`Expiry`, value: item.certExpiry.toLocaleString() },
+                    { key: t`Expiry`, value: item.certExpiry?.toLocaleString() },
                 ];
             }}
             .usedBy=${(item: CertificateKeyPair) => {
@@ -101,7 +101,7 @@ export class CertificateKeyPairListPage extends TablePage<CertificateKeyPair> {
             html`<ak-label color=${item.privateKeyAvailable ? PFColor.Green : PFColor.Grey}>
                 ${item.privateKeyAvailable ? t`Yes (${item.privateKeyType?.toUpperCase()})` : t`No`}
             </ak-label>`,
-            html`<ak-label color=${item.certExpiry > new Date() ? PFColor.Green : PFColor.Orange}>
+            html`<ak-label color=${item.certExpiry || new Date() > new Date() ? PFColor.Green : PFColor.Orange}>
                 ${item.certExpiry?.toLocaleString()}
             </ak-label>`,
             html`<ak-forms-modal>
diff --git a/web/src/admin/flows/FlowListPage.ts b/web/src/admin/flows/FlowListPage.ts
index 9a63024d1..6a2022ed5 100644
--- a/web/src/admin/flows/FlowListPage.ts
+++ b/web/src/admin/flows/FlowListPage.ts
@@ -92,13 +92,11 @@ export class FlowListPage extends TablePage<Flow> {
     row(item: Flow): TemplateResult[] {
         return [
             html`<div>
-                <div>
                     <a href="#/flow/flows/${item.slug}">
                         <code>${item.slug}</code>
                     </a>
                 </div>
-                <small>${item.title}</small>
-            </div>`,
+                <small>${item.title}</small>`,
             html`${item.name}`,
             html`${Array.from(item.stages || []).length}`,
             html`${Array.from(item.policies || []).length}`,
diff --git a/web/src/admin/groups/MemberSelectModal.ts b/web/src/admin/groups/MemberSelectModal.ts
index 0368e2241..f5f84de8b 100644
--- a/web/src/admin/groups/MemberSelectModal.ts
+++ b/web/src/admin/groups/MemberSelectModal.ts
@@ -47,10 +47,8 @@ export class MemberSelectTable extends TableModal<User> {
 
     row(item: User): TemplateResult[] {
         return [
-            html`<div>
-                <div>${item.username}</div>
-                <small>${item.name}</small>
-            </div>`,
+            html`<div>${item.username}</div>
+                <small>${item.name}</small>`,
             html` <ak-label color=${item.isActive ? PFColor.Green : PFColor.Orange}>
                 ${item.isActive ? t`Yes` : t`No`}
             </ak-label>`,
diff --git a/web/src/admin/outposts/OutpostListPage.ts b/web/src/admin/outposts/OutpostListPage.ts
index aaaf9f060..1df8225db 100644
--- a/web/src/admin/outposts/OutpostListPage.ts
+++ b/web/src/admin/outposts/OutpostListPage.ts
@@ -81,16 +81,14 @@ export class OutpostListPage extends TablePage<Outpost> {
 
     row(item: Outpost): TemplateResult[] {
         return [
-            html`<div>
-                <div>${item.name}</div>
+            html`<div>${item.name}</div>
                 ${item.config.authentik_host === ""
                     ? html`<i class="pf-icon pf-icon-warning-triangle"></i>
                           <small
                               >${t`Warning: authentik Domain is not configured, authentication will not work.`}</small
                           >`
                     : html`<i class="pf-icon pf-icon-ok"></i>
-                          <small> ${t`Logging in via ${item.config.authentik_host}.`} </small>`}
-            </div>`,
+                          <small> ${t`Logging in via ${item.config.authentik_host}.`} </small>`}`,
             html`${TypeToLabel(item.type)}`,
             html`<ul>
                 ${item.providersObj?.map((p) => {
diff --git a/web/src/admin/policies/PolicyListPage.ts b/web/src/admin/policies/PolicyListPage.ts
index 8629f690f..5c7c772c8 100644
--- a/web/src/admin/policies/PolicyListPage.ts
+++ b/web/src/admin/policies/PolicyListPage.ts
@@ -10,6 +10,7 @@ import "@goauthentik/admin/policies/reputation/ReputationPolicyForm";
 import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import { uiConfig } from "@goauthentik/common/ui/config";
 import { groupBy } from "@goauthentik/common/utils";
+import { PFColor } from "@goauthentik/elements/Label";
 import "@goauthentik/elements/forms/ConfirmationForm";
 import "@goauthentik/elements/forms/DeleteBulkForm";
 import "@goauthentik/elements/forms/ModalForm";
@@ -69,14 +70,14 @@ export class PolicyListPage extends TablePage<Policy> {
 
     row(item: Policy): TemplateResult[] {
         return [
-            html`<div>
-                <div>${item.name}</div>
+            html`<div>${item.name}</div>
                 ${(item.boundTo || 0) > 0
-                    ? html`<i class="pf-icon pf-icon-ok"></i>
-                          <small>${t`Assigned to ${item.boundTo} object(s).`}</small>`
-                    : html`<i class="pf-icon pf-icon-warning-triangle"></i>
-                          <small>${t`Warning: Policy is not assigned.`}</small>`}
-            </div>`,
+                    ? html`<ak-label color=${PFColor.Green}>
+                          ${t`Assigned to ${item.boundTo} object(s).`}
+                      </ak-label>`
+                    : html`<ak-label color=${PFColor.Orange}>
+                          ${t`Warning: Policy is not assigned.`}
+                      </ak-label>`}`,
             html`${item.verboseName}`,
             html` <ak-forms-modal>
                     <span slot="submit"> ${t`Update`} </span>
diff --git a/web/src/admin/stages/StageListPage.ts b/web/src/admin/stages/StageListPage.ts
index b85cff250..bc8e08f60 100644
--- a/web/src/admin/stages/StageListPage.ts
+++ b/web/src/admin/stages/StageListPage.ts
@@ -118,10 +118,8 @@ export class StageListPage extends TablePage<Stage> {
 
     row(item: Stage): TemplateResult[] {
         return [
-            html`<div>
-                <div>${item.name}</div>
-                <small>${item.verboseName}</small>
-            </div>`,
+            html`<div>${item.name}</div>
+                <small>${item.verboseName}</small>`,
             html`<ul class="pf-c-list">
                 ${item.flowSet?.map((flow) => {
                     return html`<li>
diff --git a/web/src/admin/tokens/TokenListPage.ts b/web/src/admin/tokens/TokenListPage.ts
index d8b18adf7..f5252d27d 100644
--- a/web/src/admin/tokens/TokenListPage.ts
+++ b/web/src/admin/tokens/TokenListPage.ts
@@ -105,10 +105,8 @@ export class TokenListPage extends TablePage<Token> {
 
     row(item: Token): TemplateResult[] {
         return [
-            html`<div>
-                <div>${item.identifier}</div>
-                ${item.managed ? html`<small>${t`Token is managed by authentik.`}</small>` : html``}
-            </div>`,
+            html`<div>${item.identifier}</div>
+                ${item.managed ? html`<small>${t`Token is managed by authentik.`}</small>` : html``}`,
             html`<a href="#/identity/users/${item.userObj?.pk}">${item.userObj?.username}</a>`,
             html` <ak-label color=${item.expiring ? PFColor.Green : PFColor.Orange}>
                 ${item.expiring ? t`Yes` : t`No`}
diff --git a/web/src/common/styles/authentik.css b/web/src/common/styles/authentik.css
index 881e2f5ed..161d03932 100644
--- a/web/src/common/styles/authentik.css
+++ b/web/src/common/styles/authentik.css
@@ -96,11 +96,6 @@ html > form > input {
     color: var(--pf-global--Color--100);
 }
 
-/* Fix alignment issues with images in tables */
-.pf-c-table tbody > tr > * {
-    vertical-align: middle;
-}
-
 .pf-c-description-list__description .pf-c-button {
     margin-right: 6px;
     margin-bottom: 6px;