diff --git a/web/src/admin/AdminInterface/AboutModal.ts b/web/src/admin/AdminInterface/AboutModal.ts
index fa5496ac32b9..2badfa4bb281 100644
--- a/web/src/admin/AdminInterface/AboutModal.ts
+++ b/web/src/admin/AdminInterface/AboutModal.ts
@@ -6,7 +6,7 @@ import { globalAK } from "#common/global";
 import { ModalButton } from "#elements/buttons/ModalButton";
 import { WithBrandConfig } from "#elements/mixins/branding";
 import { WithLicenseSummary } from "#elements/mixins/license";
-import { renderImage } from "#elements/utils/images";
+import { ThemedImage } from "#elements/utils/images";
 
 import { AdminApi, CapabilitiesEnum, LicenseSummaryStatusEnum } from "@goauthentik/api";
 
@@ -95,11 +95,12 @@ export class AboutModal extends WithLicenseSummary(WithBrandConfig(ModalButton))
                     aria-labelledby="modal-title"
                 >
                     <div class="pf-c-about-modal-box__brand">
-                        ${renderImage(
-                            this.brandingFavicon,
-                            msg("authentik Logo"),
-                            "pf-c-about-modal-box__brand-image",
-                        )}
+                        ${ThemedImage({
+                            src: this.brandingFavicon,
+                            alt: msg("authentik Logo"),
+                            className: "pf-c-about-modal-box__brand-image",
+                            theme: this.activeTheme,
+                        })}
                     </div>
                     <div class="pf-c-about-modal-box__close">
                         <button class="pf-c-button pf-m-plain" type="button" @click=${this.close}>
diff --git a/web/src/common/theme.ts b/web/src/common/theme.ts
index 908cc04bbd36..0840242110bf 100644
--- a/web/src/common/theme.ts
+++ b/web/src/common/theme.ts
@@ -338,7 +338,7 @@ export function applyBackgroundImageProperty(
 /**
  * Returns the root interface element of the page.
  *
- * @todo Can this be handled with a Lit Mixin?
+ * @deprecated Use context controllers to access the interface root instead.
  */
 export function rootInterface<T extends HTMLElement = HTMLElement>(): T {
     const element = document.body.querySelector<T>("[data-test-id=interface-root]");
diff --git a/web/src/components/ak-page-navbar.ts b/web/src/components/ak-page-navbar.ts
index 89e48c2ae793..2791a83b9c9a 100644
--- a/web/src/components/ak-page-navbar.ts
+++ b/web/src/components/ak-page-navbar.ts
@@ -7,7 +7,7 @@ import { AKElement } from "#elements/Base";
 import { WithBrandConfig } from "#elements/mixins/branding";
 import { WithSession } from "#elements/mixins/session";
 import { isAdminRoute } from "#elements/router/utils";
-import { renderImage } from "#elements/utils/images";
+import { ThemedImage } from "#elements/utils/images";
 
 import { msg } from "@lit/localize";
 import { css, CSSResult, html, nothing, TemplateResult } from "lit";
@@ -377,7 +377,11 @@ export class AKPageNavbar
                 <aside role="presentation" class="brand ${this.open ? "" : "pf-m-collapsed"}">
                     <a aria-label="${msg("Home")}" href="#/">
                         <div class="logo">
-                            ${renderImage(this.brandingLogo, msg("authentik Logo"), "")}
+                            ${ThemedImage({
+                                src: this.brandingLogo,
+                                alt: msg("authentik Logo"),
+                                theme: this.activeTheme,
+                            })}
                         </div>
                     </a>
                 </aside>
diff --git a/web/src/elements/utils/images.ts b/web/src/elements/utils/images.ts
index 8f6e77f8e6e1..e635a840a18d 100644
--- a/web/src/elements/utils/images.ts
+++ b/web/src/elements/utils/images.ts
@@ -1,58 +1,48 @@
-import { resolveUITheme, rootInterface } from "#common/theme";
+import { ResolvedUITheme } from "#common/theme";
 
-import type { AKElement } from "#elements/Base";
-import type { SlottedTemplateResult } from "#elements/types";
+import type { LitFC } from "#elements/types";
 import { ifPresent } from "#elements/utils/attributes";
 
+import { spread } from "@open-wc/lit-helpers";
+import { ImgHTMLAttributes } from "react";
+
 import { html, nothing } from "lit";
 
 export const FontAwesomeProtocol = "fa://";
 
-export function themeImage(rawPath: string) {
-    const enabledTheme = rootInterface<AKElement>()?.activeTheme || resolveUITheme();
+export function themeImage(rawPath: string, theme: ResolvedUITheme) {
+    return rawPath.replaceAll("%(theme)s", theme);
+}
 
-    return rawPath.replaceAll("%(theme)s", enabledTheme);
+export interface ThemedImageProps extends ImgHTMLAttributes<HTMLImageElement> {
+    /**
+     * The image path, which can be:
+     * - A regular URL
+     * - A Font Awesome icon (fa://icon-name)
+     * - A themed image path with %(theme)s placeholder
+     */
+    src: string;
+    theme: ResolvedUITheme;
 }
 
-/**
- * Renders an image that can be a regular URL, Font Awesome icon (fa://), or themed image
- *
- * @param imagePath - URL, fa:// icon, or path with %(theme)s placeholder
- * @param alt - Alt text for the image
- * @param className - CSS classes to apply
- * @returns TemplateResult with either <img> or <i> element
- */
-export function renderImage(
-    imagePath: string,
-    alt?: string,
-    className?: string,
-): SlottedTemplateResult {
-    if (!imagePath) {
+export const ThemedImage: LitFC<ThemedImageProps> = ({ src, className, theme, ...props }) => {
+    if (!src) {
         return nothing;
     }
 
     // Handle Font Awesome icons (same logic as ak-app-icon)
-    if (imagePath.startsWith(FontAwesomeProtocol)) {
-        const classes = [
-            className,
-            "font-awesome",
-            "fas",
-            imagePath.slice(FontAwesomeProtocol.length),
-        ]
+    if (src.startsWith(FontAwesomeProtocol)) {
+        const classes = [className, "font-awesome", "fas", src.slice(FontAwesomeProtocol.length)]
             .filter(Boolean)
             .join(" ");
-        return html`<i
-            part="icon font-awesome"
-            role="img"
-            aria-label=${ifPresent(alt)}
-            class=${classes}
-        ></i>`;
+
+        return html`<i part="icon font-awesome" role="img" class=${classes} ${spread(props)}></i>`;
     }
 
-    const src = themeImage(imagePath);
+    const themedSrc = themeImage(src, theme);
 
-    return html`<img src=${src} alt=${ifPresent(alt)} class=${ifPresent(className)} />`;
-}
+    return html`<img src=${themedSrc} class=${ifPresent(className)} ${spread(props)} />`;
+};
 
 export function isDefaultAvatar(path?: string | null): boolean {
     return !!path?.endsWith("user_default.png");
diff --git a/web/src/flow/FlowExecutor.ts b/web/src/flow/FlowExecutor.ts
index 6ac16616a679..9ae05041e8aa 100644
--- a/web/src/flow/FlowExecutor.ts
+++ b/web/src/flow/FlowExecutor.ts
@@ -26,7 +26,7 @@ import { WithBrandConfig } from "#elements/mixins/branding";
 import { WithCapabilitiesConfig } from "#elements/mixins/capabilities";
 import { LitPropertyRecord } from "#elements/types";
 import { exportParts } from "#elements/utils/attributes";
-import { renderImage } from "#elements/utils/images";
+import { ThemedImage } from "#elements/utils/images";
 
 import { AKFlowAdvanceEvent, AKFlowInspectorChangeEvent } from "#flow/events";
 import { BaseStage, StageHost, SubmitOptions } from "#flow/stages/base";
@@ -489,7 +489,12 @@ export class FlowExecutor
                 part="main"
             >
                 <div class="pf-c-login__main-header pf-c-brand" part="branding">
-                    ${renderImage(this.brandingLogo, msg("authentik Logo"), "branding-logo")}
+                    ${ThemedImage({
+                        src: this.brandingLogo,
+                        alt: msg("authentik Logo"),
+                        className: "branding-logo",
+                        theme: this.activeTheme,
+                    })}
                 </div>
                 ${this.loading && this.challenge
                     ? html`<ak-loading-overlay></ak-loading-overlay>`
diff --git a/web/src/standalone/api-browser/index.entrypoint.ts b/web/src/standalone/api-browser/index.entrypoint.ts
index e9c5d70f3fd5..d2387bdacf18 100644
--- a/web/src/standalone/api-browser/index.entrypoint.ts
+++ b/web/src/standalone/api-browser/index.entrypoint.ts
@@ -9,7 +9,7 @@ import { getCookie } from "#common/utils";
 
 import { Interface } from "#elements/Interface";
 import { WithBrandConfig } from "#elements/mixins/branding";
-import { renderImage } from "#elements/utils/images";
+import { ThemedImage } from "#elements/utils/images";
 
 import { msg } from "@lit/localize";
 import { CSSResult, html, TemplateResult } from "lit";
@@ -101,7 +101,12 @@ export class APIBrowser extends WithBrandConfig(Interface) {
                 show-method-in-nav-bar="as-colored-text"
             >
                 <div slot="nav-logo">
-                    ${renderImage(this.brandingLogo, msg("authentik Logo"), "logo")}
+                    ${ThemedImage({
+                        src: this.brandingLogo,
+                        alt: msg("authentik Logo"),
+                        className: "logo",
+                        theme: this.activeTheme,
+                    })}
                 </div>
             </rapi-doc>
         `;
diff --git a/web/src/styles/authentik/components/Login/login.css b/web/src/styles/authentik/components/Login/login.css
index cf0ffbed673a..c9a3f44f9734 100644
--- a/web/src/styles/authentik/components/Login/login.css
+++ b/web/src/styles/authentik/components/Login/login.css
@@ -187,8 +187,7 @@
 
     .branding-logo {
         display: block;
-        width: clamp(75%, calc(var(--ak-login--MaxWidth) / 2), 90%);
-        min-height: 4rem;
+        max-width: clamp(75%, calc(var(--ak-login--MaxWidth) / 2), 90%);
     }
 
     /* Ensure Font Awesome logos scale similarly to image logos */
diff --git a/web/src/user/index.entrypoint.ts b/web/src/user/index.entrypoint.ts
index c233186a013e..80ece937399e 100644
--- a/web/src/user/index.entrypoint.ts
+++ b/web/src/user/index.entrypoint.ts
@@ -26,7 +26,7 @@ import {
     renderNotificationDrawerPanel,
 } from "#elements/notifications/utils";
 import { ifPresent } from "#elements/utils/attributes";
-import { renderImage } from "#elements/utils/images";
+import { ThemedImage } from "#elements/utils/images";
 
 import Styles from "#user/index.entrypoint.css";
 import { ROUTES } from "#user/Routes";
@@ -150,7 +150,12 @@ class UserInterface extends WithBrandConfig(WithSession(AuthenticatedInterface))
                 <header part="page__header" class="pf-c-page__header">
                     <div part="brand" class="pf-c-page__header-brand">
                         <a href="#/" class="pf-c-page__header-brand-link">
-                            ${renderImage(this.brandingLogo, this.brandingTitle, "pf-c-brand")}
+                            ${ThemedImage({
+                                src: this.brandingLogo,
+                                alt: this.brandingTitle,
+                                className: "pf-c-brand",
+                                theme: this.activeTheme,
+                            })}
                         </a>
                     </div>
                     <ak-nav-buttons>${this.renderAdminInterfaceLink()}</ak-nav-buttons>