diff --git a/web/src/admin/ak-about-modal.ts b/web/src/admin/ak-about-modal.ts
index 59f78395ee..be67d50450 100644
--- a/web/src/admin/ak-about-modal.ts
+++ b/web/src/admin/ak-about-modal.ts
@@ -52,10 +52,6 @@ export class AboutModal extends WithLicenseSummary(WithBrandConfig(AKModal)) {
         ...AKModal.styles,
         PFAbout,
         css`
-            :host {
-                height: 100%;
-            }
-
             .pf-c-about-modal-box {
                 --pf-c-about-modal-box--BackgroundColor: var(--ak-c-dialog--BackgroundColor);
                 width: unset;
diff --git a/web/src/admin/ak-interface-admin.ts b/web/src/admin/ak-interface-admin.ts
index 1090fbdeef..e185684b49 100644
--- a/web/src/admin/ak-interface-admin.ts
+++ b/web/src/admin/ak-interface-admin.ts
@@ -135,7 +135,7 @@ export class AdminInterface extends WithCapabilitiesConfig(
 
         WebsocketClient.connect();
 
-        this.#sidebarMatcher = window.matchMedia("(width >= 1200px)");
+        this.#sidebarMatcher = window.matchMedia("(width > 1210px)");
         this.sidebarOpen = this.#sidebarMatcher.matches;
     }
 
diff --git a/web/src/admin/applications/wizard/steps/ak-application-wizard-submit-step.ts b/web/src/admin/applications/wizard/steps/ak-application-wizard-submit-step.ts
index f856c4c8a7..2bacaa752f 100644
--- a/web/src/admin/applications/wizard/steps/ak-application-wizard-submit-step.ts
+++ b/web/src/admin/applications/wizard/steps/ak-application-wizard-submit-step.ts
@@ -381,7 +381,7 @@ export class ApplicationWizardSubmitStep extends CustomEmitterElement(Applicatio
         return html`<h2 class="pf-c-wizard__main-title">
                     ${msg("Review the Application and Provider")}
                 </h2>
-                <fieldset>
+                <fieldset class="ak-c-fieldset" name="application-details">
                     <legend>${msg("Application Details")}</legend>
                     <dl class="pf-c-description-list">
                         <div class="pf-c-description-list__group">
@@ -419,7 +419,7 @@ export class ApplicationWizardSubmitStep extends CustomEmitterElement(Applicatio
 
                 ${
                     renderer
-                        ? html`<fieldset>
+                        ? html`<fieldset class="ak-c-fieldset" name="provider-details">
                               <legend>${msg("Provider Details")}</legend>
                               ${renderer(provider)}
                           </fieldset>`
diff --git a/web/src/admin/endpoints/connectors/agent/ConfigModal.ts b/web/src/admin/endpoints/connectors/agent/ConfigModal.ts
index 9894629054..7b5d474789 100644
--- a/web/src/admin/endpoints/connectors/agent/ConfigModal.ts
+++ b/web/src/admin/endpoints/connectors/agent/ConfigModal.ts
@@ -86,7 +86,7 @@ export class ConfigModal extends ModalButton {
                     ></ak-codemirror>
                 </ak-expand>
             </div>
-            <fieldset class="pf-c-modal-box__footer">
+            <fieldset class="ak-c-fieldset pf-c-modal-box__footer">
                 <legend class="sr-only">${msg("Form actions")}</legend>
                 <button
                     class="pf-c-button pf-m-plain"
diff --git a/web/src/admin/endpoints/devices/DeviceAddHowTo.ts b/web/src/admin/endpoints/devices/DeviceAddHowTo.ts
index 0856ad6711..e9c26f9aa2 100644
--- a/web/src/admin/endpoints/devices/DeviceAddHowTo.ts
+++ b/web/src/admin/endpoints/devices/DeviceAddHowTo.ts
@@ -65,7 +65,7 @@ export class DeviceAddHowTo extends ModalButton {
                           })}
                       </ak-tabs>`}
             </div>
-            <fieldset class="pf-c-modal-box__footer">
+            <fieldset class="ak-c-fieldset pf-c-modal-box__footer">
                 <legend class="sr-only">${msg("Form actions")}</legend>
                 <button
                     class="pf-c-button pf-m-primary"
diff --git a/web/src/admin/users/UserBulkRevokeSessionsForm.ts b/web/src/admin/users/UserBulkRevokeSessionsForm.ts
index 55d3589f9b..611a81b3e6 100644
--- a/web/src/admin/users/UserBulkRevokeSessionsForm.ts
+++ b/web/src/admin/users/UserBulkRevokeSessionsForm.ts
@@ -159,7 +159,7 @@ export class UserBulkRevokeSessionsForm extends ModalButton {
                 >
                 </ak-user-bulk-revoke-sessions-table>
             </section>
-            <fieldset class="pf-c-modal-box__footer">
+            <fieldset class="ak-c-fieldset pf-c-modal-box__footer">
                 <legend class="sr-only">${msg("Form actions")}</legend>
                 <ak-spinner-button
                     .callAction=${async () => {
diff --git a/web/src/components/ak-page-navbar.css b/web/src/components/ak-page-navbar.css
index c17d07a5ba..1f92925c44 100644
--- a/web/src/components/ak-page-navbar.css
+++ b/web/src/components/ak-page-navbar.css
@@ -48,7 +48,7 @@
         width: 100%;
     }
 
-    @media (width < 1200px) {
+    @media (width <= 1210px) {
         column-gap: calc(var(--pf-global--spacer--md) / 2);
     }
 }
@@ -137,7 +137,7 @@
         display: none;
     }
 
-    @media (width < 1200px) {
+    @media (width <= 1210px) {
         display: none;
     }
 }
@@ -164,7 +164,7 @@
     grid-area: toggle;
 }
 
-@media (width >= 1200px) {
+@media (width > 1210px) {
     slot[name="toggle"] {
         display: none;
     }
diff --git a/web/src/elements/ak-mdx/components/MDXAnchor.tsx b/web/src/elements/ak-mdx/components/MDXAnchor.tsx
index ec73c11006..034dc3b9de 100644
--- a/web/src/elements/ak-mdx/components/MDXAnchor.tsx
+++ b/web/src/elements/ak-mdx/components/MDXAnchor.tsx
@@ -22,11 +22,12 @@ function resolvePath(...args: string[]): string {
  * - Intercepts local links and scrolls to the target element.
  */
 export const MDXAnchor = ({
-    href,
+    href: initialHref,
     children,
     ...props
 }: React.AnchorHTMLAttributes<HTMLAnchorElement>) => {
     const { publicDirectory } = useMDXModule();
+    let href = initialHref;
 
     if (href?.startsWith(".") && publicDirectory) {
         const nextPathname = resolvePath(publicDirectory, href);
diff --git a/web/src/elements/commands/ak-command-palette-modal.css b/web/src/elements/commands/ak-command-palette-modal.css
index aa58370519..dd4c87ee9d 100644
--- a/web/src/elements/commands/ak-command-palette-modal.css
+++ b/web/src/elements/commands/ak-command-palette-modal.css
@@ -12,7 +12,7 @@
     );
     --ak-c-command-palette__group--Color: var(--pf-global--palette--purple-100);
 
-    --ak-fieldset--BorderColor: transparent;
+    --ak-c-fieldset--BorderColor: transparent;
 
     --ak-c-command-palette__item--BackgroundColor: transparent;
     --ak-c-command-palette__item--Color: var(--pf-global--palette--purple-50);
@@ -37,7 +37,7 @@
     transform: translate3d(0, 0, 0); /* Fixes rendering artifacts. */
 
     @media (prefers-contrast: more) {
-        --ak-fieldset--BorderColor: var(--pf-global--palette--purple-500);
+        --ak-c-fieldset--BorderColor: var(--pf-global--palette--purple-500);
     }
 }
 
@@ -109,7 +109,7 @@
     transition-duration: 0.2s;
 
     legend {
-        --ak-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--md);
+        --ak-c-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--md);
 
         cursor: pointer;
         color: var(--ak-c-command-palette__group--Color);
diff --git a/web/src/elements/commands/ak-command-palette-modal.ts b/web/src/elements/commands/ak-command-palette-modal.ts
index 908c23ae76..79771e5da3 100644
--- a/web/src/elements/commands/ak-command-palette-modal.ts
+++ b/web/src/elements/commands/ak-command-palette-modal.ts
@@ -524,7 +524,7 @@ export class AKCommandPaletteModal extends AKModal {
                     Object.entries(grouped),
                     (_group, groupIdx) => `group-${groupIdx}`,
                     ([groupLabel, commands], groupIdx) => html`
-                        <fieldset part="results-group">
+                        <fieldset class="ak-c-fieldset" part="results-group">
                             <legend
                                 class="${!groupLabel ? "sr-only more-contrast-only" : ""}"
                                 data-label=${ifPresent(groupLabel)}
diff --git a/web/src/elements/dialogs/ak-modal.css b/web/src/elements/dialogs/ak-modal.css
index 872df4067f..fc61598eca 100644
--- a/web/src/elements/dialogs/ak-modal.css
+++ b/web/src/elements/dialogs/ak-modal.css
@@ -115,8 +115,8 @@
 /* #region Footer */
 
 fieldset.ak-c-dialog__footer {
-    --ak-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--md);
-    padding-block: calc(var(--ak-fieldset__legend--PaddingInlineBase) / 2);
+    --ak-c-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--md);
+    padding-block: calc(var(--ak-c-fieldset__legend--PaddingInlineBase) / 2);
     border-inline: none;
     border-block-end: none;
 
diff --git a/web/src/elements/forms/ConfirmationForm.ts b/web/src/elements/forms/ConfirmationForm.ts
index a561859f88..502ed2345f 100644
--- a/web/src/elements/forms/ConfirmationForm.ts
+++ b/web/src/elements/forms/ConfirmationForm.ts
@@ -77,7 +77,7 @@ export class ConfirmationForm extends ModalButton {
                     <slot class="pf-c-content" name="body"></slot>
                 </form>
             </section>
-            <fieldset class="pf-c-modal-box__footer">
+            <fieldset class="ak-c-fieldset pf-c-modal-box__footer">
                 <legend class="sr-only">${msg("Form actions")}</legend>
                 <ak-spinner-button
                     .callAction=${async () => {
diff --git a/web/src/elements/forms/DeleteBulkForm.ts b/web/src/elements/forms/DeleteBulkForm.ts
index 6464ba66d5..e0c04c5124 100644
--- a/web/src/elements/forms/DeleteBulkForm.ts
+++ b/web/src/elements/forms/DeleteBulkForm.ts
@@ -119,7 +119,7 @@ export class DeleteBulkForm<T> extends ModalButton {
                 >
                 </ak-used-by-table>
             </section>
-            <fieldset class="pf-c-modal-box__footer">
+            <fieldset class="ak-c-fieldset pf-c-modal-box__footer">
                 <legend class="sr-only">${msg("Form actions")}</legend>
                 <ak-spinner-button
                     .callAction=${async () => {
diff --git a/web/src/elements/forms/ModalForm.ts b/web/src/elements/forms/ModalForm.ts
index 194debcf3e..86ecca32ee 100644
--- a/web/src/elements/forms/ModalForm.ts
+++ b/web/src/elements/forms/ModalForm.ts
@@ -218,7 +218,7 @@ export class ModalForm extends ModalButton {
     }
 
     protected renderActions(): SlottedTemplateResult {
-        return html`<fieldset class="pf-c-modal-box__footer">
+        return html`<fieldset class="ak-c-fieldset pf-c-modal-box__footer">
             <legend class="sr-only">${msg("Form actions")}</legend>
             <button
                 type="button"
diff --git a/web/src/flow/inspector/FlowInspector.ts b/web/src/flow/inspector/FlowInspector.ts
index 1a64e4aa87..67c387c154 100644
--- a/web/src/flow/inspector/FlowInspector.ts
+++ b/web/src/flow/inspector/FlowInspector.ts
@@ -126,7 +126,7 @@ export class FlowInspector extends AKElement {
 
     protected renderNextStage({ currentPlan, isCompleted }: FlowInspection): TemplateResult {
         return html`<div class="pf-c-card">
-            <fieldset>
+            <fieldset class="ak-c-fieldset">
                 <legend class="pf-c-card__title">${msg("Next stage")}</legend>
                 <div class="pf-c-card__body">
                     <dl class="pf-c-description-list">
@@ -184,7 +184,7 @@ ${stringify(this.getStage(currentPlan?.nextPlannedStage?.stageObj))}</pre
         currentPlan,
     }: FlowInspection): TemplateResult {
         return html`<div class="pf-c-card">
-            <fieldset>
+            <fieldset class="ak-c-fieldset">
                 <legend class="pf-c-card__title">${msg("Plan history")}</legend>
                 <div class="pf-c-card__body">
                     <ol class="pf-c-progress-stepper pf-m-vertical">
@@ -248,7 +248,7 @@ ${stringify(this.getStage(currentPlan?.nextPlannedStage?.stageObj))}</pre
 
     protected renderCurrentPlan({ currentPlan }: FlowInspection): TemplateResult {
         return html`<div class="pf-c-card">
-            <fieldset>
+            <fieldset class="ak-c-fieldset">
                 <legend class="pf-c-card__title">${msg("Current plan context")}</legend>
                 <pre class="pf-c-card__body"><code>${stringify(
                     currentPlan?.planContext,
@@ -259,7 +259,7 @@ ${stringify(this.getStage(currentPlan?.nextPlannedStage?.stageObj))}</pre
 
     protected renderSession({ currentPlan }: FlowInspection): TemplateResult {
         return html`<div class="pf-c-card">
-            <fieldset>
+            <fieldset class="ak-c-fieldset">
                 <legend class="pf-c-card__title">${msg("Session ID")}</legend>
                 <div class="pf-c-card__body">
                     <code class="break"> ${currentPlan?.sessionId} </code>
diff --git a/web/src/flow/stages/RedirectStage.ts b/web/src/flow/stages/RedirectStage.ts
index cd47124652..2fabc35915 100644
--- a/web/src/flow/stages/RedirectStage.ts
+++ b/web/src/flow/stages/RedirectStage.ts
@@ -118,7 +118,7 @@ export class RedirectStage extends BaseStage<RedirectChallenge, FlowChallengeRes
                     <p>${msg("You're about to be redirected to the following URL.")}</p>
                     <code>${this.getURL()}</code>
                 </div>
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <a
                         type="submit"
diff --git a/web/src/flow/stages/access_denied/AccessDeniedStage.ts b/web/src/flow/stages/access_denied/AccessDeniedStage.ts
index bf27a75b94..ab60d28ff6 100644
--- a/web/src/flow/stages/access_denied/AccessDeniedStage.ts
+++ b/web/src/flow/stages/access_denied/AccessDeniedStage.ts
@@ -38,7 +38,7 @@ export class AccessDeniedStage extends BaseStage<
                         : nothing}
                 </ak-empty-state>
                 ${this.challenge?.flowInfo?.cancelUrl
-                    ? html`<fieldset class="pf-c-form__group pf-m-action">
+                    ? html`<fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                           <legend class="sr-only">${msg("Form actions")}</legend>
                           <a
                               class="pf-c-button pf-m-primary pf-m-block"
diff --git a/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts b/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts
index 8ea89e91a1..423d961e02 100644
--- a/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts
+++ b/web/src/flow/stages/authenticator_duo/AuthenticatorDuoStage.ts
@@ -87,7 +87,7 @@ export class AuthenticatorDuoStage extends BaseStage<
                     </p>
                     <a href=${this.challenge.activationCode}>${msg("Duo activation")}</a>
 
-                    <fieldset class="pf-c-form__group pf-m-action">
+                    <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                         <legend class="sr-only">${msg("Form actions")}</legend>
                         <button
                             type="button"
diff --git a/web/src/flow/stages/authenticator_email/AuthenticatorEmailStage.ts b/web/src/flow/stages/authenticator_email/AuthenticatorEmailStage.ts
index 96ff356a3f..e356429324 100644
--- a/web/src/flow/stages/authenticator_email/AuthenticatorEmailStage.ts
+++ b/web/src/flow/stages/authenticator_email/AuthenticatorEmailStage.ts
@@ -64,7 +64,7 @@ export class AuthenticatorEmailStage extends BaseStage<
                     ${AKFormErrors({ errors: this.challenge?.responseErrors?.email })}
                 </div>
                 ${this.renderNonFieldErrors()}
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
@@ -120,7 +120,7 @@ export class AuthenticatorEmailStage extends BaseStage<
                     ${AKFormErrors({ errors: this.challenge.responseErrors?.code })}
                 </div>
                 ${this.renderNonFieldErrors()}
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
diff --git a/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts b/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts
index 0b294ad8ef..96ce125c09 100644
--- a/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts
+++ b/web/src/flow/stages/authenticator_sms/AuthenticatorSMSStage.ts
@@ -67,7 +67,7 @@ export class AuthenticatorSMSStage extends BaseStage<
                     ${AKFormErrors({ errors: this.challenge.responseErrors?.phone_number })}
                 </div>
                 ${this.renderNonFieldErrors()}
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
@@ -106,7 +106,7 @@ export class AuthenticatorSMSStage extends BaseStage<
                     ${AKFormErrors({ errors: this.challenge.responseErrors?.code })}
                 </div>
                 ${this.renderNonFieldErrors()}
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
diff --git a/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts b/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts
index 81df44051a..4df0c97cfb 100644
--- a/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts
+++ b/web/src/flow/stages/authenticator_static/AuthenticatorStaticStage.ts
@@ -66,7 +66,7 @@ export class AuthenticatorStaticStage extends BaseStage<
                 </ul>
                 <p>${msg("Make sure to keep these tokens in a safe place.")}</p>
 
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
diff --git a/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts b/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts
index 983eebacde..ce3dbf8583 100644
--- a/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts
+++ b/web/src/flow/stages/authenticator_totp/AuthenticatorTOTPStage.ts
@@ -175,7 +175,7 @@ export class AuthenticatorTOTPStage extends BaseStage<
                     ${AKFormErrors({ errors: this.challenge.responseErrors?.code })}
                 </div>
 
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.css b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.css
index 9efb3e3728..6c49d3439a 100644
--- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.css
+++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.css
@@ -1,3 +1,13 @@
+.ak-c-fieldset.ak-c-fieldset.pf-c-form__group.pf-m-action[name="device-challenges"] {
+    --ak-c-fieldset--BorderWidth: thin;
+
+    --ak-c-fieldset__legend--MarginInlineBase: var(--pf-global--spacer--sm);
+    --ak-c-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--sm);
+
+    --ak-c-fieldset--RowGap: 0;
+    --ak-c-fieldset--ColumnGap: var(--pf-global--spacer--sm);
+}
+
 .authenticator-button,
 ak-stage-authenticator-validate.style-scope .authenticator-button {
     align-items: center;
@@ -5,6 +15,7 @@ ak-stage-authenticator-validate.style-scope .authenticator-button {
     display: grid;
     grid-template-columns: minmax(auto, 2rem) minmax(33%, max-content);
     gap: var(--pf-global--spacer--lg);
+    padding-block: calc(var(--pf-global--spacer--form-element) * 2);
 
     &:hover {
         background-color: var(--pf-global--BackgroundColor--200);
diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts
index 9e822a5ffb..0eb253252a 100644
--- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts
+++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStage.ts
@@ -267,7 +267,10 @@ export class AuthenticatorValidateStage
             },
         );
 
-        return html`<fieldset class="pf-c-form__group pf-m-action" name="device-challenges">
+        return html`<fieldset
+            class="ak-c-fieldset pf-c-form__group pf-m-action"
+            name="device-challenges"
+        >
             <legend class="pf-c-title">${msg("Select an authentication method")}</legend>
             ${deviceChallengeButtons}
         </fieldset>`;
@@ -300,7 +303,7 @@ export class AuthenticatorValidateStage
             },
         );
 
-        return html`<fieldset class="pf-c-form__group pf-m-action" name="stages">
+        return html`<fieldset class="ak-c-fieldset pf-c-form__group pf-m-action" name="stages">
             <legend class="sr-only">${msg("Select a configuration stage")}</legend>
             ${stageButtons}
         </fieldset>`;
diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
index 61f6ecd3f8..57be00d7d4 100644
--- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
+++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
@@ -30,7 +30,7 @@ export class AuthenticatorValidateStageWebCode extends BaseDeviceStage<
 
         return html`<form class="pf-c-form" @submit=${this.submitForm}>
             ${this.renderUserInfo()}
-            <fieldset class="pf-c-form__group">
+            <fieldset class="ak-c-fieldset pf-c-form__group">
                 <legend class="sr-only">${msg("Authentication code")}</legend>
                 ${AKLabel(
                     {
@@ -62,7 +62,7 @@ export class AuthenticatorValidateStageWebCode extends BaseDeviceStage<
                 ${AKFormErrors({ errors: this.challenge?.responseErrors?.code })}
             </fieldset>
 
-            <fieldset class="pf-c-form__group pf-m-action">
+            <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                 <legend class="sr-only">${msg("Form actions")}</legend>
                 <button name="continue" type="submit" class="pf-c-button pf-m-primary pf-m-block">
                     ${msg("Continue")}
diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts
index 9a7141b153..fd36e64da3 100644
--- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts
+++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageDuo.ts
@@ -63,7 +63,7 @@ export class AuthenticatorValidateStageWebDuo extends BaseDeviceStage<
                 >
             </ak-empty-state>
             ${this.showBackButton
-                ? html`<fieldset class="pf-c-form__group pf-m-action">
+                ? html`<fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                       <legend class="sr-only">${msg("Form actions")}</legend>
                       ${this.renderReturnToDevicePicker()}
                   </fieldset>`
diff --git a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts
index 96938e46f1..e10c607a10 100644
--- a/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts
+++ b/web/src/flow/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts
@@ -133,7 +133,7 @@ export class AuthenticatorValidateStageWebAuthn extends BaseDeviceStage<
                 >
             </ak-empty-state>
             ${!this.authenticating || this.showBackButton
-                ? html`<fieldset class="pf-c-form__group pf-m-action">
+                ? html`<fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                       <legend class="sr-only">${msg("Form actions")}</legend>
                       ${!this.authenticating
                           ? html`<button
diff --git a/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts b/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts
index 43b56037ab..9d1a63305e 100644
--- a/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts
+++ b/web/src/flow/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts
@@ -153,7 +153,7 @@ export class WebAuthnAuthenticatorRegisterStage extends BaseStage<
                 ${this.challenge?.responseErrors
                     ? html`<p>${this.challenge.responseErrors.response[0].string}</p>`
                     : nothing}
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     ${!this.registerRunning
                         ? html` <button
diff --git a/web/src/flow/stages/consent/ConsentStage.ts b/web/src/flow/stages/consent/ConsentStage.ts
index 8f32dd56ad..eba3656788 100644
--- a/web/src/flow/stages/consent/ConsentStage.ts
+++ b/web/src/flow/stages/consent/ConsentStage.ts
@@ -126,7 +126,7 @@ export class ConsentStage extends BaseStage<ConsentChallenge, ConsentChallengeRe
                     ? this.renderAdditional()
                     : this.renderNoPrevious()}
 
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
diff --git a/web/src/flow/stages/dummy/DummyStage.ts b/web/src/flow/stages/dummy/DummyStage.ts
index 5105b93204..22a1346a29 100644
--- a/web/src/flow/stages/dummy/DummyStage.ts
+++ b/web/src/flow/stages/dummy/DummyStage.ts
@@ -23,7 +23,7 @@ export class DummyStage extends BaseStage<DummyChallenge, DummyChallengeResponse
         return html`<ak-flow-card .challenge=${this.challenge}>
             <form class="pf-c-form" @submit=${this.submitForm}>
                 <p>${msg(str`Stage name: ${this.challenge?.name}`)}</p>
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
diff --git a/web/src/flow/stages/email/EmailStage.ts b/web/src/flow/stages/email/EmailStage.ts
index f85b3902cd..7c9da650fc 100644
--- a/web/src/flow/stages/email/EmailStage.ts
+++ b/web/src/flow/stages/email/EmailStage.ts
@@ -25,7 +25,7 @@ export class EmailStage extends BaseStage<EmailChallenge, EmailChallengeResponse
                     <p>${msg("Check your Inbox for a verification email.")}</p>
                 </div>
 
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
diff --git a/web/src/flow/stages/identification/IdentificationStage.ts b/web/src/flow/stages/identification/IdentificationStage.ts
index 99b3fa8090..46c6af2752 100644
--- a/web/src/flow/stages/identification/IdentificationStage.ts
+++ b/web/src/flow/stages/identification/IdentificationStage.ts
@@ -296,8 +296,15 @@ export class IdentificationStage extends BaseStage<
         type: string,
         label: string,
         initialUserIdentification: string | null,
-        autocomplete: string,
+        passwordFields?: boolean,
     ) {
+        // When webauthn is enabled, add "webauthn" to autocomplete to enable passkey autofill
+        let autocomplete: AutoFill = type === "email" ? "email" : "username";
+
+        if (this.#webauthn.live) {
+            autocomplete = `${autocomplete} webauthn`;
+        }
+
         return html`<input
             ${ref(this.autofocusTarget.reference)}
             id=${id}
@@ -307,6 +314,9 @@ export class IdentificationStage extends BaseStage<
             autofocus
             autocomplete=${autocomplete}
             spellcheck="false"
+            inputmode=${type === "email" ? "email" : "text"}
+            autocapitalize="none"
+            enterkeyhint=${passwordFields ? "next" : "go"}
             class="pf-c-form-control"
             value=${initialUserIdentification ?? ""}
             required
@@ -345,19 +355,11 @@ export class IdentificationStage extends BaseStage<
         const type = fields.length === 1 && fields[0] === UserFieldsEnum.Email ? "email" : "text";
         const label = OR_LIST_FORMATTERS.format(fields.map((f) => UI_FIELDS[f]));
 
-        // When webauthn is enabled, add "webauthn" to autocomplete to enable passkey autofill
-        const autocomplete: AutoFill = this.#webauthn.live ? "username webauthn" : "username";
-
-        console.debug(
-            "Rendering identification stage with fields:",
-            fields,
-            initialUserIdentification,
-        );
         // prettier-ignore
         return html`${offerRecovery ? this.renderRecoveryMessage() : nothing}
             <div class="pf-c-form__group">
                 ${AKLabel({ required: true, htmlFor: inputID }, label)}
-                ${this.renderUidField(inputID, type, label, initialUserIdentification, autocomplete)}
+                ${this.renderUidField(inputID, type, label, initialUserIdentification, passwordFields)}
                 ${rememberMeController?.renderToggleInput() ?? null}
                 ${AKFormErrors({ errors: challenge.responseErrors?.uid_field })}
             </div>
@@ -433,9 +435,8 @@ export class IdentificationStage extends BaseStage<
         return html`<fieldset
             slot="footer"
             part="source-list"
-            role="group"
             name="login-sources"
-            class="pf-c-form__group"
+            class="ak-c-fieldset pf-c-form__group"
         >
             <legend class="sr-only">${msg("Login sources")}</legend>
             ${repeat(
@@ -467,7 +468,8 @@ export class IdentificationStage extends BaseStage<
         return html`<fieldset
             slot="footer-band"
             part="additional-actions"
-            class="pf-c-login__main-footer-band"
+            name="additional-actions"
+            class="ak-c-fieldset pf-c-login__main-footer-band"
         >
             <legend class="sr-only">${msg("Additional actions")}</legend>
             ${enrollUrl
diff --git a/web/src/flow/stages/password/PasswordStage.ts b/web/src/flow/stages/password/PasswordStage.ts
index d34f406e50..d467c57fdb 100644
--- a/web/src/flow/stages/password/PasswordStage.ts
+++ b/web/src/flow/stages/password/PasswordStage.ts
@@ -52,7 +52,7 @@ export class PasswordStage extends BaseStage<PasswordChallenge, PasswordChalleng
                     ?allow-show-password=${!!this.challenge?.allowShowPassword}
                     prefill=${PasswordManagerPrefill.password ?? ""}
                 ></ak-flow-input-password>
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button
                         name="continue"
@@ -67,7 +67,8 @@ export class PasswordStage extends BaseStage<PasswordChallenge, PasswordChalleng
                 ? html`<fieldset
                       slot="footer-band"
                       part="additional-actions"
-                      class="pf-c-login__main-footer-band"
+                      name="additional-actions"
+                      class="ak-c-fieldset pf-c-login__main-footer-band"
                   >
                       <legend class="sr-only">${msg("Additional actions")}</legend>
                       <div class="pf-c-login__main-footer-band-item">
diff --git a/web/src/flow/stages/prompt/PromptStage.ts b/web/src/flow/stages/prompt/PromptStage.ts
index 7dd4ba53cb..e43c529d00 100644
--- a/web/src/flow/stages/prompt/PromptStage.ts
+++ b/web/src/flow/stages/prompt/PromptStage.ts
@@ -322,7 +322,7 @@ ${prompt.initialValue}</textarea
     }
 
     protected renderContinue(): SlottedTemplateResult {
-        return html`<fieldset class="pf-c-form__group pf-m-action">
+        return html`<fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
             <legend class="sr-only">${msg("Form actions")}</legend>
             <button name="continue" type="submit" class="pf-c-button pf-m-primary pf-m-block">
                 ${msg("Continue")}
diff --git a/web/src/flow/stages/user_login/UserLoginStage.ts b/web/src/flow/stages/user_login/UserLoginStage.ts
index 0a7e6bd294..cee7e7ce71 100644
--- a/web/src/flow/stages/user_login/UserLoginStage.ts
+++ b/web/src/flow/stages/user_login/UserLoginStage.ts
@@ -50,7 +50,7 @@ export class PasswordStage extends BaseStage<
                     </p>
                 </div>
 
-                <fieldset class="pf-c-form__group pf-m-action">
+                <fieldset class="ak-c-fieldset pf-c-form__group pf-m-action">
                     <legend class="sr-only">${msg("Form actions")}</legend>
                     <button name="remember-me" type="submit" class="pf-c-button pf-m-primary">
                         ${msg("Yes")}
diff --git a/web/src/styles/authentik/base.css b/web/src/styles/authentik/base.css
index 7b41edc6d4..5ab38b4e17 100644
--- a/web/src/styles/authentik/base.css
+++ b/web/src/styles/authentik/base.css
@@ -13,6 +13,7 @@
 @import "./components/Content/content.css";
 @import "./components/Table/table.css";
 @import "./components/Form/form.css";
+@import "./components/Fieldset/fieldset.css";
 @import "./components/Switch/switch.css";
 @import "./components/Select/select.css";
 @import "./components/Modal/modal.css";
diff --git a/web/src/styles/authentik/base/common.css b/web/src/styles/authentik/base/common.css
index e506e9a6b5..6cd0f381f4 100644
--- a/web/src/styles/authentik/base/common.css
+++ b/web/src/styles/authentik/base/common.css
@@ -245,3 +245,94 @@ html[data-theme="dark"],
         );
     }
 }
+
+.ak-c-fieldset {
+    --ak-c-fieldset--BorderWidth: thin;
+    --ak-c-fieldset__legend--MarginInlineBase: var(--pf-global--spacer--sm);
+    --ak-c-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--sm);
+
+    border-color: var(--ak-c-fieldset--BorderColor, var(--pf-global--BackgroundColor--light-100));
+
+    @media (prefers-contrast: more) {
+        border-color: var(--ak-c-fieldset--BorderColor, var(--pf-global--BorderColor--200));
+    }
+
+    @media (prefers-contrast: less) {
+        border-color: var(--ak-c-fieldset--BorderColor, transparent);
+    }
+
+    border-width: var(--ak-c-fieldset--BorderWidth);
+
+    padding: var(--ak-c-fieldset__legend--PaddingInlineBase) !important;
+
+    & > legend {
+        line-height: 1;
+        padding: var(--ak-c-fieldset__legend--PaddingInlineBase) !important;
+        margin-inline-start: var(
+            --ak-c-fieldset__legend--MarginInlineStart,
+            var(--ak-c-fieldset__legend--MarginInlineBase)
+        ) !important;
+        margin-inline-end: var(
+            --ak-legend-margin-inline-end,
+            var(--ak-c-fieldset__legend--MarginInlineBase)
+        ) !important;
+    }
+
+    &:has(legend.sr-only:not(.more-contrast-only)) {
+        border-width: 0;
+
+        &:not(.pf-c-modal-box__footer) {
+            --ak-c-fieldset__legend--PaddingInlineBase: 0;
+            --ak-c-fieldset__legend--MarginInlineBase: 0;
+        }
+    }
+
+    &.pf-c-form__group {
+        border-radius: var(--pf-global--BorderRadius--sm);
+    }
+
+    &.pf-c-form__group {
+        display: flex;
+        flex-wrap: wrap;
+
+        &.pf-m-action {
+            gap: var(--pf-global--spacer--md) var(--pf-global--spacer--sm);
+            margin-block-start: 0;
+
+            /* Fallback for action-only fieldsets when :has() does not suppress
+             * the browser's native groove border. Keep the device picker
+             * bordered because it has a visible legend.
+             */
+            &:not([name="device-challenges"]) {
+                border-width: 0;
+                --ak-c-fieldset__legend--PaddingInlineBase: 0;
+                --ak-c-fieldset__legend--MarginInlineBase: 0;
+            }
+        }
+    }
+
+    &.pf-c-login__main-footer-band {
+        & > *:last-child {
+            padding-block-end: var(--pf-c-login__main-footer-band-item--PaddingTop);
+        }
+    }
+
+    &.pf-c-modal-box__footer {
+        --ak-c-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--lg);
+        --pf-c-modal-box__footer--c-button--MarginRight: 0;
+
+        gap: var(--pf-global--spacer--sm);
+        justify-content: end;
+        padding-block: calc(var(--ak-c-fieldset__legend--PaddingInlineBase) / 2);
+        border-inline: none;
+        border-block-end: none;
+
+        --pf-c-modal-box__footer--c-button--sm--MarginRight: var(
+            --pf-c-modal-box__footer--c-button--MarginRight
+        );
+
+        & > ak-spinner-button:not(:last-child) {
+            margin-right: var(--pf-c-modal-box__footer--c-button--MarginRight);
+        }
+    }
+}
diff --git a/web/src/styles/authentik/components/Card/card.css b/web/src/styles/authentik/components/Card/card.css
index c405022427..523e5028e4 100644
--- a/web/src/styles/authentik/components/Card/card.css
+++ b/web/src/styles/authentik/components/Card/card.css
@@ -1,13 +1,13 @@
-.pf-c-card > fieldset {
+.pf-c-card > .ak-c-fieldset {
     margin-inline: var(--pf-global--spacer--md);
     margin-block-end: var(--pf-global--spacer--md);
 
     @media not (prefers-contrast: more) {
-        --ak-fieldset__legend--MarginInlineStart: calc(
-            var(--pf-c-card--child--PaddingLeft) - var(--ak-fieldset__legend--PaddingInlineBase)
+        --ak-c-fieldset__legend--MarginInlineStart: calc(
+            var(--pf-c-card--child--PaddingLeft) - var(--ak-c-fieldset__legend--PaddingInlineBase)
         );
         --ak-legend-margin-inline-end: calc(
-            var(--pf-c-card--child--PaddingRight) - var(--ak-fieldset__legend--PaddingInlineBase)
+            var(--pf-c-card--child--PaddingRight) - var(--ak-c-fieldset__legend--PaddingInlineBase)
         );
 
         border-width: 0;
diff --git a/web/src/styles/authentik/components/Fieldset/fieldset.css b/web/src/styles/authentik/components/Fieldset/fieldset.css
new file mode 100644
index 0000000000..06f82452cb
--- /dev/null
+++ b/web/src/styles/authentik/components/Fieldset/fieldset.css
@@ -0,0 +1,102 @@
+.ak-c-fieldset {
+    --ak-c-fieldset--BorderWidth: thin;
+
+    --ak-c-fieldset--RowGap: var(--pf-global--spacer--md);
+    --ak-c-fieldset--ColumnGap: var(--pf-global--spacer--sm);
+
+    --ak-c-fieldset__legend--MarginInlineBase: var(--pf-global--spacer--sm);
+    --ak-c-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--sm);
+
+    border-color: var(--ak-c-fieldset--BorderColor, var(--pf-global--BackgroundColor--light-100));
+    border-width: var(--ak-c-fieldset--BorderWidth);
+    padding: var(--ak-c-fieldset__legend--PaddingInlineBase) !important;
+
+    @media (prefers-contrast: more) {
+        border-color: var(--ak-c-fieldset--BorderColor, var(--pf-global--BorderColor--200));
+    }
+
+    @media (prefers-contrast: less) {
+        border-color: var(--ak-c-fieldset--BorderColor, transparent);
+    }
+}
+
+.ak-c-fieldset > legend {
+    line-height: 1;
+    padding: var(--ak-c-fieldset__legend--PaddingInlineBase) !important;
+    margin-inline-start: var(
+        --ak-c-fieldset__legend--MarginInlineStart,
+        var(--ak-c-fieldset__legend--MarginInlineBase)
+    ) !important;
+    margin-inline-end: var(
+        --ak-legend-margin-inline-end,
+        var(--ak-c-fieldset__legend--MarginInlineBase)
+    ) !important;
+}
+
+.ak-c-fieldset:has(legend.sr-only:not(.more-contrast-only)) {
+    border-width: 0;
+
+    &:not(.pf-c-modal-box__footer) {
+        --ak-c-fieldset__legend--PaddingInlineBase: 0;
+        --ak-c-fieldset__legend--MarginInlineBase: 0;
+    }
+}
+
+.ak-c-fieldset.pf-c-form__group {
+    border-radius: var(--pf-global--BorderRadius--sm);
+}
+
+.ak-c-fieldset.pf-c-form__group {
+    display: flex;
+    flex-wrap: wrap;
+
+    &.pf-m-action {
+        --ak-c-fieldset__legend--PaddingInlineBase: 0;
+        --ak-c-fieldset__legend--MarginInlineBase: 0;
+        --ak-c-fieldset--BorderWidth: 0;
+
+        row-gap: var(--ak-c-fieldset--RowGap);
+        column-gap: var(--ak-c-fieldset--ColumnGap);
+        margin-block-start: 0;
+    }
+}
+
+.ak-c-fieldset.pf-c-login__main-footer-band > *:last-child {
+    padding-block-end: var(--pf-c-login__main-footer-band-item--PaddingTop);
+}
+
+/* TODO: Remove after ak-modal migration. */
+.ak-c-fieldset.pf-c-modal-box__footer {
+    --ak-c-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--lg);
+
+    --pf-c-modal-box__footer--c-button--MarginRight: 0;
+    --pf-c-modal-box__footer--c-button--sm--MarginRight: var(
+        --pf-c-modal-box__footer--c-button--MarginRight
+    );
+
+    gap: var(--pf-global--spacer--sm);
+    justify-content: end;
+    padding-block: calc(var(--ak-c-fieldset__legend--PaddingInlineBase) / 2);
+    border-inline: none;
+    border-block-end: none;
+
+    & > ak-spinner-button:not(:last-child) {
+        margin-right: var(--pf-c-modal-box__footer--c-button--MarginRight);
+    }
+}
+
+[data-theme="dark"] .ak-c-fieldset,
+:host([theme="dark"]) .ak-c-fieldset {
+    border-color: var(
+        --ak-c-fieldset--BorderColor,
+        var(--pf-global--BackgroundColor--dark-transparent-200)
+    );
+
+    @media (prefers-contrast: more) {
+        border-color: var(--ak-c-fieldset--BorderColor, var(--pf-global--BorderColor--300));
+    }
+
+    @media (prefers-contrast: less) {
+        border-color: var(--ak-c-fieldset--BorderColor, transparent);
+    }
+}
diff --git a/web/src/styles/authentik/components/Form/form.css b/web/src/styles/authentik/components/Form/form.css
index 4fd563d369..cfd508151a 100644
--- a/web/src/styles/authentik/components/Form/form.css
+++ b/web/src/styles/authentik/components/Form/form.css
@@ -20,6 +20,11 @@
     );
 }
 
+.pf-c-form__alert {
+    display: grid;
+    gap: var(--pf-global--spacer--form-element);
+}
+
 .pf-c-form.ak-m-content-center {
     --pf-c-form--GridGap: var(--pf-global--spacer--sm);
 
@@ -90,91 +95,6 @@ ak-form-element-horizontal:has(.pf-c-form__helper-text + ak-checkbox-group) {
     }
 }
 
-/* #region Fields */
-
-fieldset {
-    --ak-fieldset--BorderWidth: thin;
-    --ak-fieldset__legend--MarginInlineBase: var(--pf-global--spacer--sm);
-    --ak-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--sm);
-
-    border-color: var(--ak-fieldset--BorderColor, var(--pf-global--BackgroundColor--light-100));
-
-    @media (prefers-contrast: more) {
-        border-color: var(--ak-fieldset--BorderColor, var(--pf-global--BorderColor--200));
-    }
-
-    @media (prefers-contrast: less) {
-        border-color: var(--ak-fieldset--BorderColor, transparent);
-    }
-
-    border-width: var(--ak-fieldset--BorderWidth);
-
-    padding: var(--ak-fieldset__legend--PaddingInlineBase) !important;
-
-    & > legend {
-        line-height: 1;
-        padding: var(--ak-fieldset__legend--PaddingInlineBase) !important;
-        margin-inline-start: var(
-            --ak-fieldset__legend--MarginInlineStart,
-            var(--ak-fieldset__legend--MarginInlineBase)
-        ) !important;
-        margin-inline-end: var(
-            --ak-legend-margin-inline-end,
-            var(--ak-fieldset__legend--MarginInlineBase)
-        ) !important;
-    }
-
-    &:has(legend.sr-only:not(.more-contrast-only)) {
-        border-width: 0;
-
-        &:not(.pf-c-modal-box__footer) {
-            --ak-fieldset__legend--PaddingInlineBase: 0;
-            --ak-fieldset__legend--MarginInlineBase: 0;
-        }
-    }
-
-    &.pf-c-form__group {
-        border-radius: var(--pf-global--BorderRadius--sm);
-    }
-
-    &.pf-c-form__group {
-        display: flex;
-        flex-wrap: wrap;
-
-        &.pf-m-action {
-            gap: var(--pf-global--spacer--md) var(--pf-global--spacer--sm);
-            margin-block-start: 0;
-        }
-    }
-
-    &.pf-c-login__main-footer-band {
-        & > *:last-child {
-            padding-block-end: var(--pf-c-login__main-footer-band-item--PaddingTop);
-        }
-    }
-
-    &.pf-c-modal-box__footer {
-        --ak-fieldset__legend--PaddingInlineBase: var(--pf-global--spacer--lg);
-        --pf-c-modal-box__footer--c-button--MarginRight: 0;
-
-        gap: var(--pf-global--spacer--sm);
-        justify-content: end;
-        padding-block: calc(var(--ak-fieldset__legend--PaddingInlineBase) / 2);
-        border-inline: none;
-        border-block-end: none;
-
-        --pf-c-modal-box__footer--c-button--sm--MarginRight: var(
-            --pf-c-modal-box__footer--c-button--MarginRight
-        );
-
-        & > ak-spinner-button:not(:last-child) {
-            margin-right: var(--pf-c-modal-box__footer--c-button--MarginRight);
-        }
-    }
-}
-
-/* #endregion */
-
 /* #region Radio */
 
 .pf-c-radio {
@@ -402,21 +322,6 @@ ak-switch-input {
         border-bottom: 0;
     }
 
-    fieldset {
-        border-color: var(
-            --ak-fieldset--BorderColor,
-            var(--pf-global--BackgroundColor--dark-transparent-200)
-        );
-
-        @media (prefers-contrast: more) {
-            border-color: var(--ak-fieldset--BorderColor, var(--pf-global--BorderColor--300));
-        }
-
-        @media (prefers-contrast: less) {
-            border-color: var(--ak-fieldset--BorderColor, transparent);
-        }
-    }
-
     /* #endregion */
 
     /* #region Radio */
diff --git a/web/src/styles/authentik/components/Page/page.css b/web/src/styles/authentik/components/Page/page.css
index 4d86775804..233aacb5c3 100644
--- a/web/src/styles/authentik/components/Page/page.css
+++ b/web/src/styles/authentik/components/Page/page.css
@@ -16,13 +16,13 @@
     position: relative;
 }
 
-@media (width >= 1200px) {
+@media (width > 1210px) {
     .pf-c-page__sidebar.pf-m-expanded {
         --pf-c-page__sidebar--BoxShadow: var(--pf-global--BoxShadow--sm-right);
     }
 }
 
-@media (width < 1200px) {
+@media (width <= 1210px) {
     .pf-c-page__sidebar.pf-m-expanded ~ .pf-c-page__drawer .pf-c-page__sidebar-backdrop::after {
         background-color: var(--pf-global--BackgroundColor--dark-transparent-100);
         content: "";
diff --git a/web/src/styles/authentik/components/Wizard/wizard.css b/web/src/styles/authentik/components/Wizard/wizard.css
index 6f756c69ce..cb2da2971f 100644
--- a/web/src/styles/authentik/components/Wizard/wizard.css
+++ b/web/src/styles/authentik/components/Wizard/wizard.css
@@ -17,7 +17,7 @@
 }
 
 .pf-c-wizard__main-body {
-    --ak-fieldset--BorderColor: var(--pf-global--BackgroundColor--150);
+    --ak-c-fieldset--BorderColor: var(--pf-global--BackgroundColor--150);
 
     gap: var(--pf-global--spacer--lg);
 
@@ -44,6 +44,8 @@
 .pf-c-wizard__footer {
     justify-content: end;
     align-items: center;
+    /** Approximation of the height of navigation buttons to avoid excessive layout shifts when they are added or removed. */
+    min-height: calc(var(--pf-global--spacer--3xl) + (var(--pf-global--spacer--form-element) * 2));
 }
 
 .pf-c-wizard__nav-link {
diff --git a/web/src/styles/authentik/static.global.css b/web/src/styles/authentik/static.global.css
index 3b988fccf1..b1e721fd65 100644
--- a/web/src/styles/authentik/static.global.css
+++ b/web/src/styles/authentik/static.global.css
@@ -9,6 +9,7 @@
 @import "@patternfly/patternfly/utilities/Text/text.css";
 @import "./components/Drawer/drawer.css";
 @import "./components/Form/form.css";
+@import "./components/Fieldset/fieldset.css";
 @import "./components/Login/login.css";
 @import "./components/Icon/icon.css";
 @import "#elements/locale/ak-locale-select.css";
diff --git a/web/src/user/LibraryPage/ApplicationList.css b/web/src/user/LibraryPage/ApplicationList.css
index bf7802d7cf..929ca66280 100644
--- a/web/src/user/LibraryPage/ApplicationList.css
+++ b/web/src/user/LibraryPage/ApplicationList.css
@@ -132,7 +132,7 @@ ak-app-icon {
 
 [part="app-group-header"] {
     @media not (prefers-contrast: more) {
-        --ak-fieldset__legend--PaddingInlineBase: 1rem;
+        --ak-c-fieldset__legend--PaddingInlineBase: 1rem;
         padding-block-start: 0 !important;
         padding-inline: 0 !important;
         margin-inline: 0 !important;
diff --git a/web/src/user/LibraryPage/ApplicationList.ts b/web/src/user/LibraryPage/ApplicationList.ts
index 3487b3c85c..1bcee1c92f 100644
--- a/web/src/user/LibraryPage/ApplicationList.ts
+++ b/web/src/user/LibraryPage/ApplicationList.ts
@@ -63,6 +63,7 @@ export const AKLibraryApplicationList: LitFC<AKLibraryApplicationListProps> = ({
                 const groupID = kebabCase(groupLabel);
 
                 return html`<fieldset
+                    class="ak-c-fieldset"
                     data-group-id=${ifPresent(groupID)}
                     part="app-group"
                     data-group-index=${groupIndex}
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 9030d44f28..579d770442 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -39,6 +39,7 @@
 
                     "aria-description",
                     "inert",
+                    "enterkeyhint",
 
                     //#endregion