refactor: update forms and other areas to use new shadcn components (#1115)

Co-authored-by: Elias Schneider <login@eliasschneider.com>
Co-authored-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

frontend/messages/en.json

@@ -483,5 +483,6 @@
 	"allowed_oidc_clients_updated_successfully": "Allowed OIDC clients updated successfully",
 	"yes": "Yes",
 	"no": "No",
-	"restricted": "Restricted"
+	"restricted": "Restricted",
+  "scopes": "Scopes"
 }

frontend/src/lib/components/form/checkbox-with-label.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Checkbox } from '$lib/components/ui/checkbox';
-	import { Label } from '$lib/components/ui/label';
+	import * as Field from '$lib/components/ui/field';
 
 	let {
 		id,
@@ -26,14 +26,10 @@
 		onCheckedChange={(v) => onCheckedChange && onCheckedChange(v == true)}
 		bind:checked
 	/>
-	<div class="grid gap-1.5 leading-none">
-		<Label for={id} class="mb-0 text-sm leading-none font-medium">
-			{label}
-		</Label>
+	<Field.Field class="gap-0">
+		<Field.Label for={id}>{label}</Field.Label>
 		{#if description}
-			<p class="text-muted-foreground text-[0.8rem]">
-				{description}
-			</p>
+			<Field.Description>{description}</Field.Description>
 		{/if}
-	</div>
+	</Field.Field>
 </div>

frontend/src/lib/components/form/form-input.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import DatePicker from '$lib/components/form/date-picker.svelte';
+	import * as Field from '$lib/components/ui/field';
 	import { Input, type FormInputEvent } from '$lib/components/ui/input';
-	import { Label } from '$lib/components/ui/label';
 	import { m } from '$lib/paraglide/messages';
 	import type { FormInput } from '$lib/utils/form-util';
 	import { LucideExternalLink } from '@lucide/svelte';
@@ -46,12 +46,12 @@
 	const id = label?.toLowerCase().replace(/ /g, '-');
 </script>
 
-<div {...restProps}>
+<Field.Field data-disabled={disabled} {...restProps}>
 	{#if label}
-		<Label required={input?.required} class="mb-0" for={labelFor ?? id}>{label}</Label>
+		<Field.Label required={input?.required} class="mb-0" for={labelFor ?? id}>{label}</Field.Label>
 	{/if}
 	{#if description}
-		<p class="text-muted-foreground mt-1 text-xs">
+		<Field.Description>
 			<FormattedMessage m={description} />
 			{#if docsLink}
 				<a
@@ -63,28 +63,26 @@
 					<LucideExternalLink class="inline size-3 align-text-top" />
 				</a>
 			{/if}
-		</p>
+		</Field.Description>
 	{/if}
-	<div class={label || description ? 'mt-2' : ''}>
-		{#if children}
-			{@render children()}
-		{:else if input}
-			{#if type === 'date'}
-				<DatePicker {id} bind:value={input.value as Date} />
-			{:else}
-				<Input
-					aria-invalid={!!input.error}
-					{id}
-					{placeholder}
-					{type}
-					bind:value={input.value}
-					{disabled}
-					oninput={(e) => onInput?.(e)}
-				/>
-			{/if}
+	{#if children}
+		{@render children()}
+	{:else if input}
+		{#if type === 'date'}
+			<DatePicker {id} bind:value={input.value as Date} />
+		{:else}
+			<Input
+				aria-invalid={!!input.error}
+				{id}
+				{placeholder}
+				{type}
+				bind:value={input.value}
+				{disabled}
+				oninput={(e) => onInput?.(e)}
+			/>
 		{/if}
-		{#if input?.error}
-			<p class="text-destructive mt-1 text-start text-xs">{input.error}</p>
-		{/if}
-	</div>
-</div>
+	{/if}
+	{#if input?.error}
+		<Field.Error>{input.error}</Field.Error>
+	{/if}
+</Field.Field>

frontend/src/lib/components/form/profile-picture-settings.svelte

@@ -5,7 +5,8 @@
 	import { m } from '$lib/paraglide/messages';
 	import appConfigStore from '$lib/stores/application-configuration-store';
 	import { cachedProfilePicture } from '$lib/utils/cached-image-util';
-	import { LucideLoader, LucideRefreshCw, LucideUpload } from '@lucide/svelte';
+	import { LucideRefreshCw, LucideUpload } from '@lucide/svelte';
+	import { Spinner } from '$lib/components/ui/spinner';
 	import { onMount } from 'svelte';
 	import { openConfirmDialog } from '../confirm-dialog';
 
@@ -88,7 +89,7 @@
 					</Avatar.Root>
 					<div class="absolute inset-0 flex items-center justify-center">
 						{#if isLoading}
-							<LucideLoader class="size-5 animate-spin" />
+							<Spinner class="size-5" />
 						{:else}
 							<LucideUpload class="size-5 opacity-0 transition-opacity group-hover:opacity-100" />
 						{/if}

frontend/src/lib/components/form/searchable-multi-select.svelte

@@ -3,9 +3,10 @@
 	import { Button } from '$lib/components/ui/button';
 	import * as Command from '$lib/components/ui/command';
 	import * as Popover from '$lib/components/ui/popover';
-	import { cn } from '$lib/utils/style';
+	import { Spinner } from '$lib/components/ui/spinner';
 	import { m } from '$lib/paraglide/messages';
-	import { LoaderCircle, LucideCheck, LucideChevronDown } from '@lucide/svelte';
+	import { cn } from '$lib/utils/style';
+	import { LucideCheck, LucideChevronDown } from '@lucide/svelte';
 	import type { FormEventHandler } from 'svelte/elements';
 
 	type Item = {
@@ -108,7 +109,7 @@
 			<Command.Empty>
 				{#if isLoading}
 					<div class="flex w-full items-center justify-center py-2">
-						<LoaderCircle class="size-4 animate-spin" />
+						<Spinner />
 					</div>
 				{:else}
 					{m.no_items_found()}

frontend/src/lib/components/form/searchable-select.svelte

@@ -2,9 +2,10 @@
 	import { Button } from '$lib/components/ui/button';
 	import * as Command from '$lib/components/ui/command';
 	import * as Popover from '$lib/components/ui/popover';
+	import { Spinner } from '$lib/components/ui/spinner';
 	import { m } from '$lib/paraglide/messages';
 	import { cn } from '$lib/utils/style';
-	import { LoaderCircle, LucideCheck, LucideChevronDown } from '@lucide/svelte';
+	import { LucideCheck, LucideChevronDown } from '@lucide/svelte';
 	import { tick } from 'svelte';
 	import type { FormEventHandler, HTMLAttributes } from 'svelte/elements';
 
@@ -90,7 +91,7 @@
 			<Command.Empty>
 				{#if isLoading}
 					<div class="flex w-full justify-center">
-						<LoaderCircle class="size-4 animate-spin" />
+						<Spinner />
 					</div>
 				{:else}
 					{m.no_items_found()}

frontend/src/lib/components/one-time-link-modal.svelte

@@ -4,7 +4,7 @@
 	import Qrcode from '$lib/components/qrcode/qrcode.svelte';
 	import { Button } from '$lib/components/ui/button';
 	import * as Dialog from '$lib/components/ui/dialog';
-	import Label from '$lib/components/ui/label/label.svelte';
+	import * as Field from '$lib/components/ui/field';
 	import * as Select from '$lib/components/ui/select/index.js';
 	import { Separator } from '$lib/components/ui/separator';
 	import { m } from '$lib/paraglide/messages';
@@ -78,14 +78,14 @@
 		</Dialog.Header>
 
 		{#if oneTimeLink === null}
-			<div>
-				<Label for="expiration">{m.expiration()}</Label>
+			<Field.Field>
+				<Field.Label for="expiration">{m.expiration()}</Field.Label>
 				<Select.Root
 					type="single"
 					value={Object.keys(availableExpirations)[0]}
 					onValueChange={(v) => (selectedExpiration = v! as keyof typeof availableExpirations)}
 				>
-					<Select.Trigger id="expiration" class="w-full h-9">
+					<Select.Trigger id="expiration" class="w-full">
 						{selectedExpiration}
 					</Select.Trigger>
 					<Select.Content>
@@ -94,7 +94,7 @@
 						{/each}
 					</Select.Content>
 				</Select.Root>
-			</div>
+			</Field.Field>
 			<Dialog.Footer class="mt-2">
 				{#if $appConfigStore.emailOneTimeAccessAsAdminEnabled}
 					<Button
@@ -115,7 +115,7 @@
 					<p class="text-3xl font-bold">{code}</p>
 				</CopyToClipboard>
 
-				<div class="flex items-center justify-center gap-3 my-2 text-muted-foreground">
+				<div class="text-muted-foreground my-2 flex items-center justify-center gap-3">
 					<Separator />
 					<p class="text-xs text-nowrap">{m.or_visit()}</p>
 					<Separator />

frontend/src/lib/components/passkey-row.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { Button } from '$lib/components/ui/button';
+	import * as Item from '$lib/components/ui/item/index.js';
 	import * as Tooltip from '$lib/components/ui/tooltip/index.js';
 	import { m } from '$lib/paraglide/messages';
 	import { LucideCalendar, LucidePencil, LucideTrash, type Icon as IconType } from '@lucide/svelte';
@@ -19,61 +20,54 @@
 	} = $props();
 </script>
 
-<div class="bg-card hover:bg-muted/50 group rounded-lg p-3 transition-colors">
-	<div class="flex items-center justify-between">
-		<div class="flex items-start gap-3">
-			<div class="bg-primary/10 text-primary mt-1 rounded-lg p-2">
-				{#if icon}{@const Icon = icon}
-					<Icon class="size-5" />
-				{/if}
-			</div>
-			<div>
-				<div class="flex items-center gap-2">
-					<p class="font-medium">{label}</p>
-				</div>
-				{#if description}
-					<div class="text-muted-foreground mt-1 flex items-center text-xs">
-						<LucideCalendar class="mr-1 size-3" />
-						{description}
-					</div>
-				{/if}
-			</div>
-		</div>
+<Item.Root variant="transparent" class="hover:bg-muted transition-colors py-3 px-0 sm:px-4">
+	<Item.Media class="bg-primary/10 text-primary rounded-lg p-2">
+		{#if icon}{@const Icon = icon}
+			<Icon class="size-5" />
+		{/if}
+	</Item.Media>
+	<Item.Content class="gap-0.5">
+		<Item.Title>{label}</Item.Title>
+		{#if description}
+			<Item.Description class="flex items-center">
+				<LucideCalendar class="mr-1 size-3" />
+				{description}
+			</Item.Description>
+		{/if}
+	</Item.Content>
+	<Item.Actions>
+		<Tooltip.Provider>
+			<Tooltip.Root>
+				<Tooltip.Trigger>
+					<Button
+						onclick={onRename}
+						size="icon"
+						variant="ghost"
+						class="size-8"
+						aria-label={m.rename()}
+					>
+						<LucidePencil class="size-4" />
+					</Button>
+				</Tooltip.Trigger>
+				<Tooltip.Content>{m.rename()}</Tooltip.Content>
+			</Tooltip.Root>
+		</Tooltip.Provider>
 
-		<div class="flex items-center gap-2">
-			<Tooltip.Provider>
-				<Tooltip.Root>
-					<Tooltip.Trigger>
-						<Button
-							onclick={onRename}
-							size="icon"
-							variant="ghost"
-							class="size-8"
-							aria-label={m.rename()}
-						>
-							<LucidePencil class="size-4" />
-						</Button>
-					</Tooltip.Trigger>
-					<Tooltip.Content>{m.rename()}</Tooltip.Content>
-				</Tooltip.Root></Tooltip.Provider
-			>
-
-			<Tooltip.Provider>
-				<Tooltip.Root>
-					<Tooltip.Trigger>
-						<Button
-							onclick={onDelete}
-							size="icon"
-							variant="ghost"
-							class="hover:bg-destructive/10 hover:text-destructive size-8"
-							aria-label={m.delete()}
-						>
-							<LucideTrash class="size-4" />
-						</Button>
-					</Tooltip.Trigger>
-					<Tooltip.Content>{m.delete()}</Tooltip.Content>
-				</Tooltip.Root></Tooltip.Provider
-			>
-		</div>
-	</div>
-</div>
+		<Tooltip.Provider>
+			<Tooltip.Root>
+				<Tooltip.Trigger>
+					<Button
+						onclick={onDelete}
+						size="icon"
+						variant="ghost"
+						class="hover:bg-destructive/10 hover:text-destructive size-8"
+						aria-label={m.delete()}
+					>
+						<LucideTrash class="size-4" />
+					</Button>
+				</Tooltip.Trigger>
+				<Tooltip.Content>{m.delete()}</Tooltip.Content>
+			</Tooltip.Root>
+		</Tooltip.Provider>
+	</Item.Actions>
+</Item.Root>

frontend/src/lib/components/scope-item.svelte

@@ -1,5 +1,7 @@
 <script lang="ts">
+	import * as Item from '$lib/components/ui/item/index.js';
 	import type { Icon as IconType } from '@lucide/svelte';
+
 	interface Props {
 		icon: typeof IconType;
 		name: string;
@@ -11,10 +13,12 @@
 	const SvelteComponent = $derived(icon);
 </script>
 
-<div class="flex items-center">
-	<div class="bg-muted mr-5 rounded-lg p-2"><SvelteComponent /></div>
-	<div class="text-start">
-		<h3 class="font-semibold">{name}</h3>
-		<p class="text-muted-foreground text-sm">{description}</p>
-	</div>
-</div>
+<Item.Root class="py-1.5 px-0">
+	<Item.Media class="bg-muted !self-center rounded-lg p-2 !translate-y-0 h-full">
+		<SvelteComponent class="size-5" />
+	</Item.Media>
+	<Item.Content class="text-start">
+		<Item.Title class="font-semibold">{name}</Item.Title>
+		<Item.Description>{description}</Item.Description>
+	</Item.Content>
+</Item.Root>

frontend/src/lib/components/scope-list.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+	import * as Item from '$lib/components/ui/item/index.js';
 	import { m } from '$lib/paraglide/messages';
 	import { LucideMail, LucideUser, LucideUsers } from '@lucide/svelte';
 	import ScopeItem from './scope-item.svelte';
@@ -6,7 +7,7 @@
 	let { scope }: { scope: string } = $props();
 </script>
 
-<div class="flex flex-col gap-3" data-testid="scopes">
+<Item.Group data-testid="scopes">
 	{#if scope!.includes('email')}
 		<ScopeItem icon={LucideMail} name={m.email()} description={m.view_your_email_address()} />
 	{/if}
@@ -24,4 +25,4 @@
 			description={m.view_the_groups_you_are_a_member_of()}
 		/>
 	{/if}
-</div>
+</Item.Group>

frontend/src/lib/components/signup/signup-token-modal.svelte

@@ -136,7 +136,7 @@
 						value={$inputs.ttl.value.toString()}
 						onValueChange={(v) => v && form.setValue('ttl', Number(v))}
 					>
-						<Select.Trigger id="expiration" class="h-9 w-full">
+						<Select.Trigger id="expiration" class="w-full">
 							{getExpirationLabel($inputs.ttl.value)}
 						</Select.Trigger>
 						<Select.Content>

frontend/src/lib/components/table/advanced-table.svelte

@@ -331,7 +331,7 @@
 				value={items?.pagination.itemsPerPage.toString()}
 				onValueChange={(v) => onPageSizeChange(Number(v))}
 			>
-				<Select.Trigger class="h-9 w-[80px]">
+				<Select.Trigger class="w-20">
 					{items?.pagination.itemsPerPage}
 				</Select.Trigger>
 				<Select.Content>

frontend/src/lib/components/ui/button/button.svelte

@@ -18,7 +18,7 @@
 			},
 			size: {
 				default: 'h-10 px-4 py-2',
-				sm: 'h-9 rounded-md px-3',
+				sm: 'h-8 rounded-md px-3',
 				lg: 'h-11 rounded-md px-8',
 				icon: 'h-10 w-10'
 			}
@@ -42,7 +42,7 @@
 </script>
 
 <script lang="ts">
-	import LoaderCircle from '@lucide/svelte/icons/loader-circle';
+	import { Spinner } from '$lib/components/ui/spinner';
 	import { onMount } from 'svelte';
 
 	let {
@@ -97,7 +97,7 @@
 		{...restProps}
 	>
 		{#if isLoading}
-			<LoaderCircle class="size-4 animate-spin" />
+			<Spinner />
 		{/if}
 		{@render children?.()}
 	</a>
@@ -112,7 +112,7 @@
 		{...restProps}
 	>
 		{#if isLoading}
-			<LoaderCircle class="size-4 animate-spin" />
+			<Spinner />
 		{/if}
 		{@render children?.()}
 	</button>

frontend/src/lib/components/ui/field/field-content.svelte

@@ -0,0 +1,20 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div
+	bind:this={ref}
+	data-slot="field-content"
+	class={cn("group/field-content flex flex-1 flex-col gap-1.5 leading-snug", className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/field/field-description.svelte

@@ -0,0 +1,24 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from '$lib/utils/style.js';
+	import type { HTMLAttributes } from 'svelte/elements';
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLParagraphElement>> = $props();
+</script>
+
+<p
+	bind:this={ref}
+	data-slot="field-description"
+	class={cn(
+		'text-muted-foreground -mt-1 mb-0 text-xs leading-normal font-normal group-has-[[data-orientation=horizontal]]/field:text-balance',
+		'[&>a:hover]:text-primary [&>a]:underline [&>a]:underline-offset-4',
+		className
+	)}
+	{...restProps}
+>
+	{@render children?.()}
+</p>

frontend/src/lib/components/ui/field/field-error.svelte

@@ -0,0 +1,58 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+	import type { Snippet } from "svelte";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		errors,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> & {
+		children?: Snippet;
+		errors?: { message?: string }[];
+	} = $props();
+
+	const hasContent = $derived.by(() => {
+		// has slotted error
+		if (children) return true;
+
+		// no errors
+		if (!errors) return false;
+
+		// has an error but no message
+		if (errors.length === 1 && !errors[0]?.message) {
+			return false;
+		}
+
+		return true;
+	});
+
+	const isMultipleErrors = $derived(errors && errors.length > 1);
+	const singleErrorMessage = $derived(errors && errors.length === 1 && errors[0]?.message);
+</script>
+
+{#if hasContent}
+	<div
+		bind:this={ref}
+		role="alert"
+		data-slot="field-error"
+		class={cn("text-destructive text-sm font-normal", className)}
+		{...restProps}
+	>
+		{#if children}
+			{@render children()}
+		{:else if singleErrorMessage}
+			{singleErrorMessage}
+		{:else if isMultipleErrors}
+			<ul class="ms-4 flex list-disc flex-col gap-1">
+				{#each errors ?? [] as error, index (index)}
+					{#if error?.message}
+						<li>{error.message}</li>
+					{/if}
+				{/each}
+			</ul>
+		{/if}
+	</div>
+{/if}

frontend/src/lib/components/ui/field/field-group.svelte

@@ -0,0 +1,23 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from '$lib/utils/style.js';
+	import type { HTMLAttributes } from 'svelte/elements';
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div
+	bind:this={ref}
+	data-slot="field-group"
+	class={cn(
+		'group/field-group @container/field-group flex w-full flex-col gap-4 data-[slot=checkbox-group]:gap-3 [&>[data-slot=field-group]]:gap-4',
+		className
+	)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/field/field-label.svelte

@@ -0,0 +1,30 @@
+<script lang="ts">
+	import { Label } from '$lib/components/ui/label/index.js';
+	import { cn } from '$lib/utils/style.js';
+	import type { ComponentProps } from 'svelte';
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		required = false,
+		children,
+		...restProps
+	}: ComponentProps<typeof Label> & {
+		required?: boolean;
+	} = $props();
+</script>
+
+<Label
+	bind:ref
+	data-slot="field-label"
+	{required}
+	class={cn(
+		'group/field-label peer/field-label mb-0 flex w-fit gap-2 leading-snug group-data-[disabled=true]/field:opacity-50',
+		'has-[>[data-slot=field]]:w-full has-[>[data-slot=field]]:flex-col has-[>[data-slot=field]]:rounded-md has-[>[data-slot=field]]:border [&>*]:data-[slot=field]:p-4',
+		'has-data-[state=checked]:bg-primary/5 has-data-[state=checked]:border-primary dark:has-data-[state=checked]:bg-primary/10',
+		className
+	)}
+	{...restProps}
+>
+	{@render children?.()}
+</Label>

frontend/src/lib/components/ui/field/field-legend.svelte

@@ -0,0 +1,29 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		variant = "legend",
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLLegendElement>> & {
+		variant?: "legend" | "label";
+	} = $props();
+</script>
+
+<legend
+	bind:this={ref}
+	data-slot="field-legend"
+	data-variant={variant}
+	class={cn(
+		"mb-3 font-medium",
+		"data-[variant=legend]:text-base",
+		"data-[variant=label]:text-sm",
+		className
+	)}
+	{...restProps}
+>
+	{@render children?.()}
+</legend>

frontend/src/lib/components/ui/field/field-separator.svelte

@@ -0,0 +1,38 @@
+<script lang="ts">
+	import { Separator } from "$lib/components/ui/separator/index.js";
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+	import type { Snippet } from "svelte";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> & {
+		children?: Snippet;
+	} = $props();
+
+	const hasContent = $derived(!!children);
+</script>
+
+<div
+	bind:this={ref}
+	data-slot="field-separator"
+	data-content={hasContent}
+	class={cn(
+		"relative -my-2 h-5 text-sm group-data-[variant=outline]/field-group:-mb-2",
+		className
+	)}
+	{...restProps}
+>
+	<Separator class="absolute inset-0 top-1/2" />
+	{#if children}
+		<span
+			class="bg-background text-muted-foreground relative mx-auto block w-fit px-2"
+			data-slot="field-separator-content"
+		>
+			{@render children()}
+		</span>
+	{/if}
+</div>

frontend/src/lib/components/ui/field/field-set.svelte

@@ -0,0 +1,24 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from '$lib/utils/style.js';
+	import type { HTMLFieldsetAttributes } from 'svelte/elements';
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLFieldsetAttributes> = $props();
+</script>
+
+<fieldset
+	bind:this={ref}
+	data-slot="field-set"
+	class={cn(
+		'flex flex-col gap-4',
+		'has-[>[data-slot=checkbox-group]]:gap-3 has-[>[data-slot=radio-group]]:gap-3',
+		className
+	)}
+	{...restProps}
+>
+	{@render children?.()}
+</fieldset>

frontend/src/lib/components/ui/field/field-title.svelte

@@ -0,0 +1,23 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div
+	bind:this={ref}
+	data-slot="field-title"
+	class={cn(
+		"flex w-fit items-center gap-2 text-sm font-medium leading-snug group-data-[disabled=true]/field:opacity-50",
+		className
+	)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/field/field.svelte

@@ -0,0 +1,53 @@
+<script lang="ts" module>
+	import { tv, type VariantProps } from 'tailwind-variants';
+
+	export const fieldVariants = tv({
+		base: 'group/field data-[invalid=true]:text-destructive flex w-full gap-1.5',
+		variants: {
+			orientation: {
+				vertical: 'flex-col [&>*]:w-full [&>.sr-only]:w-auto',
+				horizontal: [
+					'flex-row items-center',
+					'[&>[data-slot=field-label]]:flex-auto',
+					'has-[>[data-slot=field-content]]:[&>[role=checkbox],[role=radio]]:mt-px has-[>[data-slot=field-content]]:items-start'
+				],
+				responsive: [
+					'@md/field-group:flex-row @md/field-group:items-center @md/field-group:[&>*]:w-auto flex-col [&>*]:w-full [&>.sr-only]:w-auto',
+					'@md/field-group:[&>[data-slot=field-label]]:flex-auto',
+					'@md/field-group:has-[>[data-slot=field-content]]:items-start @md/field-group:has-[>[data-slot=field-content]]:[&>[role=checkbox],[role=radio]]:mt-px'
+				]
+			}
+		},
+		defaultVariants: {
+			orientation: 'vertical'
+		}
+	});
+
+	export type FieldOrientation = VariantProps<typeof fieldVariants>['orientation'];
+</script>
+
+<script lang="ts">
+	import { cn, type WithElementRef } from '$lib/utils/style.js';
+	import type { HTMLAttributes } from 'svelte/elements';
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		orientation = 'vertical',
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> & {
+		orientation?: FieldOrientation;
+	} = $props();
+</script>
+
+<div
+	bind:this={ref}
+	role="group"
+	data-slot="field"
+	data-orientation={orientation}
+	class={cn(fieldVariants({ orientation }), className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/field/index.ts

@@ -0,0 +1,33 @@
+import Field from "./field.svelte";
+import Set from "./field-set.svelte";
+import Legend from "./field-legend.svelte";
+import Group from "./field-group.svelte";
+import Content from "./field-content.svelte";
+import Label from "./field-label.svelte";
+import Title from "./field-title.svelte";
+import Description from "./field-description.svelte";
+import Separator from "./field-separator.svelte";
+import Error from "./field-error.svelte";
+
+export {
+	Field,
+	Set,
+	Legend,
+	Group,
+	Content,
+	Label,
+	Title,
+	Description,
+	Separator,
+	Error,
+	//
+	Set as FieldSet,
+	Legend as FieldLegend,
+	Group as FieldGroup,
+	Content as FieldContent,
+	Label as FieldLabel,
+	Title as FieldTitle,
+	Description as FieldDescription,
+	Separator as FieldSeparator,
+	Error as FieldError,
+};

frontend/src/lib/components/ui/input/input.svelte

@@ -24,7 +24,7 @@
 		bind:this={ref}
 		data-slot="input"
 		class={cn(
-			'selection:bg-primary dark:bg-input/30 selection:text-primary-foreground border-input ring-offset-background placeholder:text-muted-foreground flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-2 text-sm font-medium shadow-xs transition-[color,box-shadow] outline-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+			'selection:bg-primary dark:bg-input/30 selection:text-primary-foreground border-input ring-offset-background placeholder:text-muted-foreground flex h-8 w-full min-w-0 rounded-md border bg-transparent px-3 py-2 text-sm font-medium shadow-xs transition-[color,box-shadow] outline-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
 			'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
 			'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
 			className
@@ -39,7 +39,7 @@
 		bind:this={ref}
 		data-slot="input"
 		class={cn(
-			'border-input bg-background selection:bg-primary dark:bg-input/30 selection:text-primary-foreground ring-offset-background placeholder:text-muted-foreground flex h-9 w-full min-w-0 rounded-md border px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+			'border-input bg-background selection:bg-primary dark:bg-input/30 selection:text-primary-foreground ring-offset-background placeholder:text-muted-foreground flex h-8 w-full min-w-0 rounded-md border px-3 py-1 text-sm shadow-xs transition-[color,box-shadow] outline-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
 			'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
 			'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
 			className

frontend/src/lib/components/ui/item/index.ts

@@ -0,0 +1,34 @@
+import Root from "./item.svelte";
+import Group from "./item-group.svelte";
+import Separator from "./item-separator.svelte";
+import Header from "./item-header.svelte";
+import Footer from "./item-footer.svelte";
+import Content from "./item-content.svelte";
+import Title from "./item-title.svelte";
+import Description from "./item-description.svelte";
+import Actions from "./item-actions.svelte";
+import Media from "./item-media.svelte";
+
+export {
+	Root,
+	Group,
+	Separator,
+	Header,
+	Footer,
+	Content,
+	Title,
+	Description,
+	Actions,
+	Media,
+	//
+	Root as Item,
+	Group as ItemGroup,
+	Separator as ItemSeparator,
+	Header as ItemHeader,
+	Footer as ItemFooter,
+	Content as ItemContent,
+	Title as ItemTitle,
+	Description as ItemDescription,
+	Actions as ItemActions,
+	Media as ItemMedia,
+};

frontend/src/lib/components/ui/item/item-actions.svelte

@@ -0,0 +1,23 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from '$lib/utils/style.js';
+	import type { HTMLAttributes } from 'svelte/elements';
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		wrapOnMobile,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> & {
+		wrapOnMobile?: boolean;
+	} = $props();
+</script>
+
+<div
+	bind:this={ref}
+	data-slot="item-actions"
+	class={cn('flex items-center gap-2', wrapOnMobile && 'w-full pl-8 sm:w-auto sm:pl-0 pt-1', className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/item/item-content.svelte

@@ -0,0 +1,20 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div
+	bind:this={ref}
+	data-slot="item-content"
+	class={cn("flex flex-1 flex-col gap-1 [&+[data-slot=item-content]]:flex-none", className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/item/item-description.svelte

@@ -0,0 +1,24 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLParagraphElement>> = $props();
+</script>
+
+<p
+	bind:this={ref}
+	data-slot="item-description"
+	class={cn(
+		"text-muted-foreground text-balance text-sm font-normal leading-normal",
+		"[&>a:hover]:text-primary [&>a]:underline [&>a]:underline-offset-4",
+		className
+	)}
+	{...restProps}
+>
+	{@render children?.()}
+</p>

frontend/src/lib/components/ui/item/item-footer.svelte

@@ -0,0 +1,20 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div
+	bind:this={ref}
+	data-slot="item-footer"
+	class={cn("flex basis-full items-center justify-between gap-2", className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/item/item-group.svelte

@@ -0,0 +1,21 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div
+	bind:this={ref}
+	role="list"
+	data-slot="item-group"
+	class={cn("group/item-group flex flex-col", className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/item/item-header.svelte

@@ -0,0 +1,20 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div
+	bind:this={ref}
+	data-slot="item-header"
+	class={cn("flex basis-full items-center justify-between gap-2", className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/item/item-media.svelte

@@ -0,0 +1,43 @@
+<script lang="ts" module>
+	import { tv, type VariantProps } from 'tailwind-variants';
+
+	export const itemMediaVariants = tv({
+		base: 'flex shrink-0 items-center justify-center gap-2 group-has-[[data-slot=item-description]]/item:translate-y-0.5 group-has-[[data-slot=item-description]]/item:self-start [&_svg]:pointer-events-none',
+		variants: {
+			variant: {
+				default: 'bg-transparent',
+				transparent: 'bg-transparent',
+				icon: "bg-muted size-8 rounded-sm border [&_svg:not([class*='size-'])]:size-4",
+				image: 'size-10 overflow-hidden rounded-sm [&_img]:size-full [&_img]:object-cover'
+			}
+		},
+		defaultVariants: {
+			variant: 'default'
+		}
+	});
+
+	export type ItemMediaVariant = VariantProps<typeof itemMediaVariants>['variant'];
+</script>
+
+<script lang="ts">
+	import { cn, type WithElementRef } from '$lib/utils/style.js';
+	import type { HTMLAttributes } from 'svelte/elements';
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		variant = 'default',
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> & { variant?: ItemMediaVariant } = $props();
+</script>
+
+<div
+	bind:this={ref}
+	data-slot="item-media"
+	data-variant={variant}
+	class={cn(itemMediaVariants({ variant }), className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/item/item-separator.svelte

@@ -0,0 +1,19 @@
+<script lang="ts">
+	import { Separator } from "$lib/components/ui/separator/index.js";
+	import { cn } from "$lib/utils/style.js";
+	import type { ComponentProps } from "svelte";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		...restProps
+	}: ComponentProps<typeof Separator> = $props();
+</script>
+
+<Separator
+	bind:ref
+	data-slot="item-separator"
+	orientation="horizontal"
+	class={cn("my-0", className)}
+	{...restProps}
+/>

frontend/src/lib/components/ui/item/item-title.svelte

@@ -0,0 +1,22 @@
+<script lang="ts">
+	import { cn, type WithElementRef } from "$lib/utils/style.js";
+	import type { HTMLAttributes } from "svelte/elements";
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		children,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div
+	bind:this={ref}
+	role="heading"
+	aria-level="3"
+	data-slot="item-title"
+	class={cn("flex w-fit items-center gap-2 font-semibold leading-snug", className)}
+	{...restProps}
+>
+	{@render children?.()}
+</div>

frontend/src/lib/components/ui/item/item.svelte

@@ -0,0 +1,62 @@
+<script lang="ts" module>
+	import { tv, type VariantProps } from 'tailwind-variants';
+
+	export const itemVariants = tv({
+		base: 'group/item focus-visible:border-ring focus-visible:ring-ring/50 flex flex-wrap items-center rounded-xl border border-transparent text-sm outline-none transition-colors duration-100 focus-visible:ring-[3px]',
+		variants: {
+			variant: {
+				default: 'bg-transparent [a&]:hover:bg-accent/50 [a&]:transition-colors',
+				outline: 'border-border [a&]:hover:bg-accent/50 [a&]:transition-colors',
+				muted: 'bg-muted/50 [a&]:hover:bg-accent/50 [a&]:transition-colors',
+				card: 'bg-card shadow-sm [a&]:hover:bg-accent/50 [a&]:transition-colors',
+				transparent: 'bg-transparent'
+			},
+			size: {
+				default: 'gap-4 p-4',
+				sm: 'gap-2.5 px-4 py-3'
+			}
+		},
+		defaultVariants: {
+			variant: 'default',
+			size: 'default'
+		}
+	});
+
+	export type ItemSize = VariantProps<typeof itemVariants>['size'];
+	export type ItemVariant = VariantProps<typeof itemVariants>['variant'];
+</script>
+
+<script lang="ts">
+	import { cn, type WithElementRef } from '$lib/utils/style.js';
+	import type { HTMLAttributes } from 'svelte/elements';
+	import type { Snippet } from 'svelte';
+
+	let {
+		ref = $bindable(null),
+		class: className,
+		child,
+		variant,
+		size,
+		...restProps
+	}: WithElementRef<HTMLAttributes<HTMLDivElement>> & {
+		child?: Snippet<[{ props: Record<string, unknown> }]>;
+		variant?: ItemVariant;
+		size?: ItemSize;
+	} = $props();
+
+	const mergedProps = $derived({
+		class: cn(itemVariants({ variant, size }), className),
+		'data-slot': 'item',
+		'data-variant': variant,
+		'data-size': size,
+		...restProps
+	});
+</script>
+
+{#if child}
+	{@render child({ props: mergedProps })}
+{:else}
+	<div bind:this={ref} {...mergedProps}>
+		{@render mergedProps.children?.()}
+	</div>
+{/if}

frontend/src/lib/components/ui/spinner/index.ts

@@ -0,0 +1 @@
+export { default as Spinner } from "./spinner.svelte";

frontend/src/lib/components/ui/spinner/spinner.svelte

@@ -0,0 +1,14 @@
+<script lang="ts">
+	import { cn } from "$lib/utils/style.js";
+	import Loader2Icon from "@lucide/svelte/icons/loader-2";
+	import type { ComponentProps } from "svelte";
+
+	let { class: className, ...restProps }: ComponentProps<typeof Loader2Icon> = $props();
+</script>
+
+<Loader2Icon
+	role="status"
+	aria-label="Loading"
+	class={cn("size-4 animate-spin", className)}
+	{...restProps}
+/>

frontend/src/routes/authorize/+page.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import FormattedMessage from '$lib/components/formatted-message.svelte';
 	import SignInWrapper from '$lib/components/login-wrapper.svelte';
-	import ScopeItem from '$lib/components/scope-item.svelte';
+	import ScopeList from '$lib/components/scope-list.svelte';
 	import { Button } from '$lib/components/ui/button';
 	import * as Card from '$lib/components/ui/card';
 	import { m } from '$lib/paraglide/messages';
@@ -10,7 +10,6 @@
 	import appConfigStore from '$lib/stores/application-configuration-store';
 	import userStore from '$lib/stores/user-store';
 	import { getWebauthnErrorMessage } from '$lib/utils/error-util';
-	import { LucideMail, LucideUser, LucideUsers } from '@lucide/svelte';
 	import { startAuthentication, type AuthenticationResponseJSON } from '@simplewebauthn/browser';
 	import { onMount } from 'svelte';
 	import { slide } from 'svelte/transition';
@@ -140,30 +139,8 @@
 							/>
 						</p>
 					</Card.Header>
-					<Card.Content data-testid="scopes">
-						<div class="flex flex-col gap-3">
-							{#if scope!.includes('email')}
-								<ScopeItem
-									icon={LucideMail}
-									name={m.email()}
-									description={m.view_your_email_address()}
-								/>
-							{/if}
-							{#if scope!.includes('profile')}
-								<ScopeItem
-									icon={LucideUser}
-									name={m.profile()}
-									description={m.view_your_profile_information()}
-								/>
-							{/if}
-							{#if scope!.includes('groups')}
-								<ScopeItem
-									icon={LucideUsers}
-									name={m.groups()}
-									description={m.view_the_groups_you_are_a_member_of()}
-								/>
-							{/if}
-						</div>
+					<Card.Content>
+						<ScopeList {scope} />
 					</Card.Content>
 				</Card.Root>
 			</div>

frontend/src/routes/login/alternative/+page.svelte

@@ -2,8 +2,7 @@
 	import { page } from '$app/state';
 	import SignInWrapper from '$lib/components/login-wrapper.svelte';
 	import Logo from '$lib/components/logo.svelte';
-	import { Button } from '$lib/components/ui/button';
-	import * as Card from '$lib/components/ui/card';
+	import * as Item from '$lib/components/ui/item/index.js';
 	import { m } from '$lib/paraglide/messages';
 	import appConfigStore from '$lib/stores/application-configuration-store';
 	import { LucideChevronRight, LucideMail, LucideRectangleEllipsis } from '@lucide/svelte';
@@ -40,24 +39,26 @@
 		<p class="text-muted-foreground mt-3">
 			{m.if_you_do_not_have_access_to_your_passkey_you_can_sign_in_using_one_of_the_following_methods()}
 		</p>
-		<div class="mt-5 flex flex-col gap-3">
+		<Item.Group class="mt-5 gap-3">
 			{#each methods as method}
-				<a href={method.href + page.url.search}>
-					<Card.Root>
-						<Card.Content class="flex items-center justify-between px-4">
-							<div class="flex gap-3">
-								<method.icon class="text-primary size-7" />
-								<div class="text-start">
-									<h3 class="text-lg font-semibold">{method.title}</h3>
-									<p class="text-muted-foreground text-sm">{method.description}</p>
-								</div>
-							</div>
-							<Button variant="ghost"><LucideChevronRight class="size-5" /></Button>
-						</Card.Content>
-					</Card.Root>
-				</a>
+				<Item.Root variant="outline" class="gap-5">
+					{#snippet child({ props })}
+						<a href={method.href + page.url.search} {...props}>
+							<Item.Media class="text-primary !self-center !translate-y-0">
+								<method.icon class="size-7" />
+							</Item.Media>
+							<Item.Content class="text-start">
+								<Item.Title class="text-lg font-semibold">{method.title}</Item.Title>
+								<Item.Description>{method.description}</Item.Description>
+							</Item.Content>
+							<Item.Actions>
+								<LucideChevronRight class="size-5" />
+							</Item.Actions>
+						</a>
+					{/snippet}
+				</Item.Root>
 			{/each}
-		</div>
+		</Item.Group>
 
 		<a class="text-muted-foreground mt-5 text-xs" href={'/login' + page.url.search}
 			>{m.use_your_passkey_instead()}</a

frontend/src/routes/settings/account/+page.svelte

@@ -3,6 +3,7 @@
 	import * as Alert from '$lib/components/ui/alert';
 	import { Button } from '$lib/components/ui/button';
 	import * as Card from '$lib/components/ui/card';
+	import * as Item from '$lib/components/ui/item/index.js';
 	import { m } from '$lib/paraglide/messages';
 	import UserService from '$lib/services/user-service';
 	import WebAuthnService from '$lib/services/webauthn-service';
@@ -100,28 +101,24 @@
 
 <!-- Login code card mobile -->
 <div class="block sm:hidden">
-	<Card.Root>
-		<Card.Header>
-			<div class="flex flex-col items-start justify-between gap-3 sm:flex-row sm:items-center">
-				<div>
-					<Card.Title>
-						<RectangleEllipsis class="text-primary/80 size-5" />
-						{m.login_code()}
-					</Card.Title>
-					<Card.Description>
-						{m.create_a_one_time_login_code_to_sign_in_from_a_different_device_without_a_passkey()}
-					</Card.Description>
-				</div>
-
-				<Button variant="outline" class="w-full" onclick={() => (showLoginCodeModal = true)}>
-					{m.create()}
-				</Button>
-			</div>
-		</Card.Header>
-	</Card.Root>
+	<Item.Root variant="outline">
+		<Item.Media class="text-primary/80">
+			<RectangleEllipsis class="size-5" />
+		</Item.Media>
+		<Item.Content>
+			<Item.Title>{m.login_code()}</Item.Title>
+			<Item.Description>
+				{m.create_a_one_time_login_code_to_sign_in_from_a_different_device_without_a_passkey()}
+			</Item.Description>
+		</Item.Content>
+		<Item.Actions class="w-full sm:w-auto">
+			<Button variant="outline" class="w-full" onclick={() => (showLoginCodeModal = true)}>
+				{m.create()}
+			</Button>
+		</Item.Actions>
+	</Item.Root>
 </div>
 
-<!-- Account details card -->
 <Card.Root>
 	<Card.Header>
 		<Card.Title>
@@ -140,76 +137,63 @@
 	</Card.Content>
 </Card.Root>
 
-<!-- Passkey management card -->
-<div>
-	<Card.Root class="gap-3">
-		<Card.Header>
-			<div class="flex items-center justify-between">
-				<div>
-					<Card.Title>
-						<KeyRound class="text-primary/80 size-5" />
-						{m.passkeys()}
-					</Card.Title>
-					<Card.Description>
-						{m.manage_your_passkeys_that_you_can_use_to_authenticate_yourself()}
-					</Card.Description>
-				</div>
-				<Button variant="outline" class="ml-3" onclick={createPasskey}>
-					{m.add_passkey()}
-				</Button>
-			</div>
-		</Card.Header>
-		{#if passkeys.length != 0}
-			<Card.Content>
-				<PasskeyList bind:passkeys />
-			</Card.Content>
-		{/if}
-	</Card.Root>
-</div>
+<Item.Group class="bg-card rounded-xl border p-4 shadow-sm">
+	<Item.Root class="border-none bg-transparent p-0">
+		<Item.Media class="text-primary/80">
+			<KeyRound class="size-5" />
+		</Item.Media>
+		<Item.Content class="min-w-52">
+			<Item.Title class="text-xl font-semibold">{m.passkeys()}</Item.Title>
+			<Item.Description>
+				{m.manage_your_passkeys_that_you_can_use_to_authenticate_yourself()}
+			</Item.Description>
+		</Item.Content>
+		<Item.Actions>
+			<Button variant="outline" onclick={createPasskey}>
+				{m.add_passkey()}
+			</Button>
+		</Item.Actions>
+	</Item.Root>
+	{#if passkeys.length != 0}
+		<PasskeyList bind:passkeys />
+	{/if}
+</Item.Group>
 
-<!-- Login code card -->
 <div class="hidden sm:block">
-	<Card.Root>
-		<Card.Header>
-			<div class="flex flex-col items-start justify-between gap-3 sm:flex-row sm:items-center">
-				<div>
-					<Card.Title>
-						<RectangleEllipsis class="text-primary/80 size-5" />
-						{m.login_code()}
-					</Card.Title>
-					<Card.Description>
-						{m.create_a_one_time_login_code_to_sign_in_from_a_different_device_without_a_passkey()}
-					</Card.Description>
-				</div>
-				<Button variant="outline" onclick={() => (showLoginCodeModal = true)}>
-					{m.create()}
-				</Button>
-			</div>
-		</Card.Header>
-	</Card.Root>
+	<Item.Root variant="card" class="border-border">
+		<Item.Media class="text-primary/80">
+			<RectangleEllipsis class="size-5" />
+		</Item.Media>
+		<Item.Content>
+			<Item.Title>{m.login_code()}</Item.Title>
+			<Item.Description>
+				{m.create_a_one_time_login_code_to_sign_in_from_a_different_device_without_a_passkey()}
+			</Item.Description>
+		</Item.Content>
+		<Item.Actions>
+			<Button variant="outline" onclick={() => (showLoginCodeModal = true)}>
+				{m.create()}
+			</Button>
+		</Item.Actions>
+	</Item.Root>
 </div>
 
-<!-- Language selection card -->
-<div>
-	<Card.Root>
-		<Card.Header>
-			<div class="flex flex-col items-start justify-between gap-3 sm:flex-row sm:items-center">
-				<div>
-					<Card.Title>
-						<Languages class="text-primary/80 size-5" />
-						{m.language()}
-					</Card.Title>
-					<Card.Description>
-						{m.select_the_language_you_want_to_use()}
-						<br />
-						<FormattedMessage m={m.contribute_to_translation()} />
-					</Card.Description>
-				</div>
-				<LocalePicker />
-			</div>
-		</Card.Header>
-	</Card.Root>
-</div>
+<Item.Root variant="card" class="border-border mb-2">
+	<Item.Media class="text-primary/80">
+		<Languages class="size-5" />
+	</Item.Media>
+	<Item.Content class="min-w-52">
+		<Item.Title>{m.language()}</Item.Title>
+		<Item.Description>
+			{m.select_the_language_you_want_to_use()}
+			<br />
+			<FormattedMessage m={m.contribute_to_translation()} />
+		</Item.Description>
+	</Item.Content>
+	<Item.Actions>
+		<LocalePicker />
+	</Item.Actions>
+</Item.Root>
 
 <RenamePasskeyModal
 	bind:passkey={passkeyToRename}

frontend/src/routes/settings/account/account-form.svelte

@@ -2,6 +2,7 @@
 	import FormInput from '$lib/components/form/form-input.svelte';
 	import ProfilePictureSettings from '$lib/components/form/profile-picture-settings.svelte';
 	import { Button } from '$lib/components/ui/button';
+	import * as Field from '$lib/components/ui/field/index.js';
 	import { m } from '$lib/paraglide/messages';
 	import UserService from '$lib/services/user-service';
 	import appConfigStore from '$lib/stores/application-configuration-store';
@@ -86,30 +87,20 @@
 		resetCallback={resetProfilePicture}
 	/>
 
-	<hr class="border-border" />
+	<Field.Separator class="m-2" />
 
 	<fieldset disabled={userInfoInputDisabled}>
-		<div class="grid grid-cols-1 gap-3 sm:grid-cols-2">
-			<div>
-				<FormInput label={m.first_name()} bind:input={$inputs.firstName} onInput={onNameInput} />
-			</div>
-			<div>
-				<FormInput label={m.last_name()} bind:input={$inputs.lastName} onInput={onNameInput} />
-			</div>
-			<div>
-				<FormInput
-					label={m.display_name()}
-					bind:input={$inputs.displayName}
-					onInput={() => (hasManualDisplayNameEdit = true)}
-				/>
-			</div>
-			<div>
-				<FormInput label={m.username()} bind:input={$inputs.username} />
-			</div>
-			<div>
-				<FormInput label={m.email()} bind:input={$inputs.email} />
-			</div>
-		</div>
+		<Field.Group class="grid grid-cols-1 gap-4 sm:grid-cols-2">
+			<FormInput label={m.first_name()} bind:input={$inputs.firstName} onInput={onNameInput} />
+			<FormInput label={m.last_name()} bind:input={$inputs.lastName} onInput={onNameInput} />
+			<FormInput
+				label={m.display_name()}
+				bind:input={$inputs.displayName}
+				onInput={() => (hasManualDisplayNameEdit = true)}
+			/>
+			<FormInput label={m.username()} bind:input={$inputs.username} />
+			<FormInput label={m.email()} type="email" bind:input={$inputs.email} />
+		</Field.Group>
 
 		<div class="flex justify-end pt-4">
 			<Button {isLoading} type="submit">{m.save()}</Button>

frontend/src/routes/settings/account/locale-picker.svelte

@@ -41,7 +41,7 @@
 </script>
 
 <Select.Root type="single" value={currentLocale} onValueChange={(v) => updateLocale(v as Locale)}>
-	<Select.Trigger class="h-9 max-w-[200px]" aria-label="Select locale">
+	<Select.Trigger class="max-w-[200px]" aria-label="Select locale">
 		{locales[currentLocale]}
 	</Select.Trigger>
 	<Select.Content>

frontend/src/routes/settings/account/passkey-list.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { openConfirmDialog } from '$lib/components/confirm-dialog/';
 	import GlassRowItem from '$lib/components/passkey-row.svelte';
+	import * as Item from '$lib/components/ui/item/index.js';
 	import { m } from '$lib/paraglide/messages';
 	import WebauthnService from '$lib/services/webauthn-service';
 	import type { Passkey } from '$lib/types/passkey.type';
@@ -36,7 +37,7 @@
 	}
 </script>
 
-<div class="space-y-3">
+<Item.Group class="mt-3">
 	{#each passkeys as passkey}
 		<GlassRowItem
 			label={passkey.name}
@@ -46,7 +47,7 @@
 			onDelete={() => deletePasskey(passkey)}
 		/>
 	{/each}
-</div>
+</Item.Group>
 
 <RenamePasskeyModal
 	bind:passkey={passkeyToRename}

frontend/src/routes/settings/account/rename-passkey-modal.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { Button } from '$lib/components/ui/button';
 	import * as Dialog from '$lib/components/ui/dialog';
+	import * as Field from '$lib/components/ui/field';
 	import { Input } from '$lib/components/ui/input';
-	import { Label } from '$lib/components/ui/label';
 	import { m } from '$lib/paraglide/messages';
 	import WebAuthnService from '$lib/services/webauthn-service';
 	import type { Passkey } from '$lib/types/passkey.type';
@@ -52,7 +52,7 @@
 		</Dialog.Header>
 		<form onsubmit={preventDefault(onSubmit)}>
 			<div class="grid items-center gap-4 sm:grid-cols-4">
-				<Label for="name" class="sm:text-right">{m.name()}</Label>
+				<Field.Label for="name" class="sm:text-right">{m.name()}</Field.Label>
 				<Input id="name" bind:value={name} class="col-span-3" />
 			</div>
 			<Dialog.Footer class="mt-4">

frontend/src/routes/settings/admin/application-configuration/application-image.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import FileInput from '$lib/components/form/file-input.svelte';
 	import { Button } from '$lib/components/ui/button';
-	import { Label } from '$lib/components/ui/label';
+	import * as Field from '$lib/components/ui/field';
 	import { cn } from '$lib/utils/style';
 	import { LucideImageOff, LucideUpload, LucideX } from '@lucide/svelte';
 	import type { HTMLAttributes } from 'svelte/elements';
@@ -53,7 +53,7 @@
 </script>
 
 <div class="flex flex-col items-start md:flex-row md:items-center" {...restProps}>
-	<Label class="w-52" for={id}>{label}</Label>
+	<Field.Label class="w-52" for={id}>{label}</Field.Label>
 	<FileInput {id} variant="secondary" {accept} onchange={onImageChange}>
 		<div
 			class={cn('group/image relative flex items-center rounded transition-colors', {

frontend/src/routes/settings/admin/application-configuration/forms/app-config-email-form.svelte

@@ -3,7 +3,7 @@
 	import FormInput from '$lib/components/form/form-input.svelte';
 	import SwitchWithLabel from '$lib/components/form/switch-with-label.svelte';
 	import { Button } from '$lib/components/ui/button';
-	import Label from '$lib/components/ui/label/label.svelte';
+	import * as Field from '$lib/components/ui/field';
 	import * as Select from '$lib/components/ui/select';
 	import { m } from '$lib/paraglide/messages';
 	import AppConfigService from '$lib/services/app-config-service';
@@ -112,8 +112,8 @@
 			<FormInput label={m.smtp_user()} bind:input={$inputs.smtpUser} />
 			<FormInput label={m.smtp_password()} type="password" bind:input={$inputs.smtpPassword} />
 			<FormInput label={m.smtp_from()} bind:input={$inputs.smtpFrom} />
-			<div class="grid gap-2">
-				<Label class="mb-0" for="smtp-tls">{m.smtp_tls_option()}</Label>
+			<Field.Field>
+				<Field.Label for="smtp-tls">{m.smtp_tls_option()}</Field.Label>
 				<Select.Root
 					type="single"
 					value={$inputs.smtpTls.value}
@@ -128,7 +128,7 @@
 						<Select.Item value="tls" label="TLS" />
 					</Select.Content>
 				</Select.Root>
-			</div>
+			</Field.Field>
 			<SwitchWithLabel
 				id="skip-cert-verify"
 				label={m.skip_certificate_verification()}

frontend/src/routes/settings/admin/application-configuration/forms/app-config-general-form.svelte

@@ -2,8 +2,7 @@
 	import FormInput from '$lib/components/form/form-input.svelte';
 	import SwitchWithLabel from '$lib/components/form/switch-with-label.svelte';
 	import { Button } from '$lib/components/ui/button';
-	import { Label } from '$lib/components/ui/label/index.js';
-	import * as Select from '$lib/components/ui/select';
+	import * as Field from '$lib/components/ui/field';
 	import { m } from '$lib/paraglide/messages';
 	import appConfigStore from '$lib/stores/application-configuration-store';
 	import type { AllAppConfig } from '$lib/types/application-configuration';
@@ -82,21 +81,21 @@
 				bind:checked={$inputs.disableAnimations.value}
 			/>
 
-			<div class="space-y-5">
+			<Field.Field class="space-y-5">
 				<div>
-					<Label class="mb-0 text-sm font-medium">
+					<Field.Label>
 						{m.accent_color()}
-					</Label>
-					<p class="text-muted-foreground text-[0.8rem]">
+					</Field.Label>
+					<Field.Description>
 						{m.select_an_accent_color_to_customize_the_appearance_of_pocket_id()}
-					</p>
+					</Field.Description>
 				</div>
 				<AccentColorPicker
 					previousColor={appConfig.accentColor}
 					bind:selectedColor={$inputs.accentColor.value}
 					disabled={$appConfigStore.uiConfigDisabled}
 				/>
-			</div>
+			</Field.Field>
 		</div>
 		<div class="mt-5 flex justify-end">
 			<Button {isLoading} type="submit">{m.save()}</Button>

frontend/src/routes/settings/admin/application-configuration/forms/app-config-signup-defaults-form.svelte

@@ -2,7 +2,7 @@
 	import CustomClaimsInput from '$lib/components/form/custom-claims-input.svelte';
 	import UserGroupInput from '$lib/components/form/user-group-input.svelte';
 	import { Button } from '$lib/components/ui/button';
-	import { Label } from '$lib/components/ui/label';
+	import * as Field from '$lib/components/ui/field';
 	import * as Select from '$lib/components/ui/select';
 	import { m } from '$lib/paraglide/messages';
 	import appConfigStore from '$lib/stores/application-configuration-store';
@@ -58,68 +58,68 @@
 <form onsubmit={preventDefault(onSubmit)}>
 	<fieldset class="flex flex-col gap-5" disabled={$appConfigStore.uiConfigDisabled}>
 		<div class="grid gap-2">
-			<div>
-				<Label class="mb-0" for="enable-user-signup">{m.enable_user_signups()}</Label>
-				<p class="text-muted-foreground text-[0.8rem]">
+			<Field.Field>
+				<Field.Label for="enable-user-signup">{m.enable_user_signups()}</Field.Label>
+				<Field.Description>
 					{m.enable_user_signups_description()}
-				</p>
-			</div>
-			<Select.Root
-				type="single"
-				value={allowUserSignups}
-				onValueChange={(v) => (allowUserSignups = v as typeof allowUserSignups)}
-			>
-				<Select.Trigger
-					id="enable-user-signup"
-					class="w-full"
-					aria-label={m.enable_user_signups()}
-					placeholder={m.enable_user_signups()}
+				</Field.Description>
+				<Select.Root
+					type="single"
+					value={allowUserSignups}
+					onValueChange={(v) => (allowUserSignups = v as typeof allowUserSignups)}
 				>
-					{signupOptions[allowUserSignups]?.label}
-				</Select.Trigger>
-				<Select.Content>
-					<Select.Item value="disabled">
-						<div class="flex flex-col items-start gap-1">
-							<span class="font-medium">{signupOptions.disabled.label}</span>
-							<span class="text-muted-foreground text-xs">
-								{signupOptions.disabled.description}
-							</span>
-						</div>
-					</Select.Item>
-					<Select.Item value="withToken">
-						<div class="flex flex-col items-start gap-1">
-							<span class="font-medium">{signupOptions.withToken.label}</span>
-							<span class="text-muted-foreground text-xs">
-								{signupOptions.withToken.description}
-							</span>
-						</div>
-					</Select.Item>
-					<Select.Item value="open">
-						<div class="flex flex-col items-start gap-1">
-							<span class="font-medium">{signupOptions.open.label}</span>
-							<span class="text-muted-foreground text-xs">
-								{signupOptions.open.description}
-							</span>
-						</div>
-					</Select.Item>
-				</Select.Content>
-			</Select.Root>
+					<Select.Trigger
+						id="enable-user-signup"
+						class="w-full"
+						aria-label={m.enable_user_signups()}
+						placeholder={m.enable_user_signups()}
+					>
+						{signupOptions[allowUserSignups]?.label}
+					</Select.Trigger>
+					<Select.Content>
+						<Select.Item value="disabled">
+							<div class="flex flex-col items-start gap-1">
+								<span class="font-medium">{signupOptions.disabled.label}</span>
+								<span class="text-muted-foreground text-xs">
+									{signupOptions.disabled.description}
+								</span>
+							</div>
+						</Select.Item>
+						<Select.Item value="withToken">
+							<div class="flex flex-col items-start gap-1">
+								<span class="font-medium">{signupOptions.withToken.label}</span>
+								<span class="text-muted-foreground text-xs">
+									{signupOptions.withToken.description}
+								</span>
+							</div>
+						</Select.Item>
+						<Select.Item value="open">
+							<div class="flex flex-col items-start gap-1">
+								<span class="font-medium">{signupOptions.open.label}</span>
+								<span class="text-muted-foreground text-xs">
+									{signupOptions.open.description}
+								</span>
+							</div>
+						</Select.Item>
+					</Select.Content>
+				</Select.Root>
+			</Field.Field>
 		</div>
 
-		<div>
-			<Label for="default-groups" class="mb-0">{m.user_groups()}</Label>
-			<p class="text-muted-foreground mt-1 mb-2 text-xs">
+		<Field.Field>
+			<Field.Label for="default-groups">{m.user_groups()}</Field.Label>
+			<Field.Description>
 				{m.user_creation_groups_description()}
-			</p>
+			</Field.Description>
 			<UserGroupInput bind:selectedGroupIds />
-		</div>
-		<div>
-			<Label class="mb-0">{m.custom_claims()}</Label>
-			<p class="text-muted-foreground mt-1 mb-2 text-xs">
+		</Field.Field>
+		<Field.Field>
+			<Field.Label>{m.custom_claims()}</Field.Label>
+			<Field.Description>
 				{m.user_creation_claims_description()}
-			</p>
+			</Field.Description>
 			<CustomClaimsInput bind:customClaims />
-		</div>
+		</Field.Field>
 
 		<div class="flex justify-end pt-2">
 			<Button {isLoading} type="submit">{m.save()}</Button>

frontend/src/routes/settings/admin/application-configuration/forms/custom-accent-color-dialog.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { Button } from '$lib/components/ui/button';
 	import * as Dialog from '$lib/components/ui/dialog';
+	import * as Field from '$lib/components/ui/field';
 	import { Input } from '$lib/components/ui/input';
-	import { Label } from '$lib/components/ui/label/index.js';
 	import { m } from '$lib/paraglide/messages';
 	import { preventDefault } from '$lib/utils/event-util';
 
@@ -48,8 +48,8 @@
 
 		<form onsubmit={preventDefault(applyCustomColor)}>
 			<div class="space-y-4">
-				<div>
-					<Label for="custom-color-input" class="text-sm font-medium">{m.color_value()}</Label>
+				<Field.Field>
+					<Field.Label for="custom-color-input">{m.color_value()}</Field.Label>
 					<div class="flex items-center gap-2">
 						<div class="w-full transition">
 							<Input
@@ -68,7 +68,7 @@
 							style="background-color: {customColorInput}"
 						></div>
 					</div>
-				</div>
+				</Field.Field>
 			</div>
 
 			<Dialog.Footer class="mt-6">

frontend/src/routes/settings/admin/oidc-clients/[id]/+page.svelte

@@ -6,7 +6,7 @@
 	import CopyToClipboard from '$lib/components/copy-to-clipboard.svelte';
 	import { Button } from '$lib/components/ui/button';
 	import * as Card from '$lib/components/ui/card';
-	import Label from '$lib/components/ui/label/label.svelte';
+	import * as Field from '$lib/components/ui/field';
 	import UserGroupSelection from '$lib/components/user-group-selection.svelte';
 	import { m } from '$lib/paraglide/messages';
 	import OidcService from '$lib/services/oidc-service';
@@ -177,14 +177,14 @@
 	<Card.Content>
 		<div class="flex flex-col">
 			<div class="mb-2 flex flex-col sm:flex-row sm:items-center">
-				<Label class="mb-0 w-50">{m.client_id()}</Label>
+				<Field.Label class="w-50">{m.client_id()}</Field.Label>
 				<CopyToClipboard value={client.id}>
 					<span class="text-muted-foreground text-sm" data-testid="client-id"> {client.id}</span>
 				</CopyToClipboard>
 			</div>
 			{#if !client.isPublic}
 				<div class="mt-1 mb-2 flex flex-col sm:flex-row sm:items-center">
-					<Label class="mb-0 w-50">{m.client_secret()}</Label>
+					<Field.Label class="w-50">{m.client_secret()}</Field.Label>
 					{#if $clientSecretStore}
 						<CopyToClipboard value={$clientSecretStore}>
 							<span class="text-muted-foreground text-sm" data-testid="client-secret">
@@ -211,7 +211,7 @@
 				<div transition:slide>
 					{#each Object.entries(setupDetails) as [key, value]}
 						<div class="mb-5 flex flex-col sm:flex-row sm:items-center">
-							<Label class="mb-0 w-50">{key}</Label>
+							<Field.Label class="w-50">{key}</Field.Label>
 							<CopyToClipboard {value}>
 								<span class="text-muted-foreground text-sm">{value}</span>
 							</CopyToClipboard>

frontend/src/routes/settings/admin/oidc-clients/client-secret.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import * as Dialog from '$lib/components/ui/dialog';
+	import * as Field from '$lib/components/ui/field';
 	import Input from '$lib/components/ui/input/input.svelte';
-	import Label from '$lib/components/ui/label/label.svelte';
 	import { m } from '$lib/paraglide/messages';
 
 	let {
@@ -23,7 +23,7 @@
 			<Dialog.Title>{m.one_time_link()}</Dialog.Title>
 			<Dialog.Description>{m.use_this_link_to_sign_in_once()}</Dialog.Description>
 		</Dialog.Header>
-		<Label for="one-time-link">{m.one_time_link()}</Label>
+		<Field.Label for="one-time-link">{m.one_time_link()}</Field.Label>
 		<Input id="one-time-link" value={oneTimeLink} readonly />
 	</Dialog.Content>
 </Dialog.Root>

frontend/src/routes/settings/admin/oidc-clients/federated-identities-input.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
 	import FormInput from '$lib/components/form/form-input.svelte';
 	import { Button } from '$lib/components/ui/button';
+	import * as Field from '$lib/components/ui/field';
 	import { Input } from '$lib/components/ui/input';
-	import Label from '$lib/components/ui/label/label.svelte';
 	import { m } from '$lib/paraglide/messages';
 	import type { OidcClient, OidcClientFederatedIdentity } from '$lib/types/oidc.type';
 	import { LucideMinus, LucidePlus } from '@lucide/svelte';
@@ -67,7 +67,7 @@
 			{#each federatedIdentities as identity, i}
 				<div class="space-y-3 rounded-lg border p-4">
 					<div class="flex items-center justify-between">
-						<Label class="text-sm font-medium">Identity {i + 1}</Label>
+						<Field.Label>Identity {i + 1}</Field.Label>
 						{#if federatedIdentities.length > 0}
 							<Button
 								variant="outline"
@@ -81,8 +81,8 @@
 					</div>
 
 					<div class="grid grid-cols-1 gap-3 md:grid-cols-2">
-						<div>
-							<Label required for="issuer-{i}" class="text-xs">Issuer</Label>
+						<Field.Field>
+							<Field.Label required for="issuer-{i}">Issuer</Field.Label>
 							<Input
 								id="issuer-{i}"
 								placeholder="https://example.com/"
@@ -91,12 +91,12 @@
 								aria-invalid={!!getFieldError(i, 'issuer')}
 							/>
 							{#if getFieldError(i, 'issuer')}
-								<p class="text-destructive mt-1 text-xs">{getFieldError(i, 'issuer')}</p>
+								<Field.Error>{getFieldError(i, 'issuer')}</Field.Error>
 							{/if}
-						</div>
+						</Field.Field>
 
-						<div>
-							<Label for="subject-{i}" class="text-xs">Subject</Label>
+						<Field.Field>
+							<Field.Label for="subject-{i}">Subject</Field.Label>
 							<Input
 								id="subject-{i}"
 								placeholder="Defaults to the client ID"
@@ -105,12 +105,12 @@
 								aria-invalid={!!getFieldError(i, 'subject')}
 							/>
 							{#if getFieldError(i, 'subject')}
-								<p class="text-destructive mt-1 text-xs">{getFieldError(i, 'subject')}</p>
+								<Field.Error>{getFieldError(i, 'subject')}</Field.Error>
 							{/if}
-						</div>
+						</Field.Field>
 
-						<div>
-							<Label for="audience-{i}" class="text-xs">Audience</Label>
+						<Field.Field>
+							<Field.Label for="audience-{i}">Audience</Field.Label>
 							<Input
 								id="audience-{i}"
 								placeholder="Defaults to the Pocket ID URL"
@@ -119,12 +119,12 @@
 								aria-invalid={!!getFieldError(i, 'audience')}
 							/>
 							{#if getFieldError(i, 'audience')}
-								<p class="text-destructive mt-1 text-xs">{getFieldError(i, 'audience')}</p>
+								<Field.Error>{getFieldError(i, 'audience')}</Field.Error>
 							{/if}
-						</div>
+						</Field.Field>
 
-						<div>
-							<Label for="jwks-{i}" class="text-xs">JWKS URL</Label>
+						<Field.Field>
+							<Field.Label for="jwks-{i}">JWKS URL</Field.Label>
 							<Input
 								id="jwks-{i}"
 								placeholder="Defaults to {identity.issuer || '<issuer>'}/.well-known/jwks.json"
@@ -133,9 +133,9 @@
 								aria-invalid={!!getFieldError(i, 'jwks')}
 							/>
 							{#if getFieldError(i, 'jwks')}
-								<p class="text-destructive mt-1 text-xs">{getFieldError(i, 'jwks')}</p>
+								<Field.Error>{getFieldError(i, 'jwks')}</Field.Error>
 							{/if}
-						</div>
+						</Field.Field>
 					</div>
 				</div>
 			{/each}

frontend/src/routes/settings/admin/oidc-clients/oidc-callback-url-input.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import FormInput from '$lib/components/form/form-input.svelte';
 	import { Button } from '$lib/components/ui/button';
+	import * as Field from '$lib/components/ui/field';
 	import { Input } from '$lib/components/ui/input';
 	import { m } from '$lib/paraglide/messages';
 	import { LucideMinus, LucidePlus } from '@lucide/svelte';
@@ -44,7 +45,7 @@
 		</div>
 	</FormInput>
 	{#if error}
-		<p class="text-destructive mt-1 text-xs">{error}</p>
+		<Field.Error>{error}</Field.Error>
 	{/if}
 	<Button
 		class="mt-2"

frontend/src/routes/settings/admin/oidc-clients/oidc-client-form.svelte

@@ -233,7 +233,7 @@
 					onLogoChange={(input) => onLogoChange(input, true)}
 				>
 					{#snippet tabTriggers()}
-						<Tabs.List class="grid h-9 w-full grid-cols-2">
+						<Tabs.List class="grid h-8 w-full grid-cols-2">
 							<Tabs.Trigger value="light-logo" class="px-3">
 								<LucideSun class="size-4" />
 							</Tabs.Trigger>
@@ -253,7 +253,7 @@
 					onLogoChange={(input) => onLogoChange(input, false)}
 				>
 					{#snippet tabTriggers()}
-						<Tabs.List class="grid h-9 w-full grid-cols-2">
+						<Tabs.List class="grid h-8 w-full grid-cols-2">
 							<Tabs.Trigger value="light-logo" class="px-3">
 								<LucideSun class="size-4" />
 							</Tabs.Trigger>

frontend/src/routes/settings/admin/oidc-clients/oidc-client-image-input.svelte

@@ -2,7 +2,7 @@
 	import UrlFileInput from '$lib/components/form/url-file-input.svelte';
 	import ImageBox from '$lib/components/image-box.svelte';
 	import { Button } from '$lib/components/ui/button';
-	import { Label } from '$lib/components/ui/label';
+	import * as Field from '$lib/components/ui/field';
 	import { m } from '$lib/paraglide/messages';
 	import { LucideX } from '@lucide/svelte';
 	import type { Snippet } from 'svelte';
@@ -26,7 +26,7 @@
 	let id = `oidc-client-logo-${light ? 'light' : 'dark'}`;
 </script>
 
-<Label for={id}>{m.logo()}</Label>
+<Field.Label for={id}>{m.logo()}</Field.Label>
 <div class="flex h-24 items-end gap-4">
 	<div class="flex flex-col gap-2">
 		{#if tabTriggers}

frontend/src/routes/settings/admin/oidc-clients/oidc-client-preview-modal.svelte

@@ -5,7 +5,8 @@
 	import * as Alert from '$lib/components/ui/alert';
 	import { Button } from '$lib/components/ui/button';
 	import * as Dialog from '$lib/components/ui/dialog';
-	import Label from '$lib/components/ui/label/label.svelte';
+	import * as Field from '$lib/components/ui/field';
+	import { Spinner } from '$lib/components/ui/spinner';
 	import * as Tabs from '$lib/components/ui/tabs';
 	import { m } from '$lib/paraglide/messages';
 	import OidcService from '$lib/services/oidc-service';
@@ -110,33 +111,30 @@
 		<div class="overflow-auto px-4">
 			{#if loadingPreview}
 				<div class="flex items-center justify-center py-12">
-					<div class="h-8 w-8 animate-spin rounded-full border-b-2 border-gray-900"></div>
+					<Spinner class="size-8" />
 				</div>
 			{/if}
 
 			<div class="flex justify-start gap-3">
-				<div>
-					<Label class="text-sm font-medium">{m.users()}</Label>
-					<div>
-						<SearchableSelect
-							class="w-48"
-							selectText={m.select_user()}
-							isLoading={isUserSearchLoading}
-							items={Object.values(users).map((user) => ({
-								value: user.id,
-								label: user.username
-							}))}
-							value={user?.id || ''}
-							oninput={(e) => onUserSearch(e.currentTarget.value)}
-							onSelect={(value) => {
-								user = users.find((u) => u.id === value) || null;
-								loadPreviewData();
-							}}
-						/>
-					</div>
-				</div>
-				<div>
-					<Label class="text-sm font-medium">Scopes</Label>
+				<Field.Field class="w-auto min-w-48">
+					<Field.Label>{m.users()}</Field.Label>
+					<SearchableSelect
+						selectText={m.select_user()}
+						isLoading={isUserSearchLoading}
+						items={Object.values(users).map((user) => ({
+							value: user.id,
+							label: user.username
+						}))}
+						value={user?.id || ''}
+						oninput={(e) => onUserSearch(e.currentTarget.value)}
+						onSelect={(value) => {
+							user = users.find((u) => u.id === value) || null;
+							loadPreviewData();
+						}}
+					/>
+				</Field.Field>
+				<Field.Field class="w-auto">
+					<Field.Label>{m.scopes()}</Field.Label>
 					<MultiSelect
 						items={[
 							{ value: 'openid', label: 'openid' },
@@ -146,7 +144,7 @@
 						]}
 						bind:selectedItems={scopes}
 					/>
-				</div>
+				</Field.Field>
 			</div>
 
 			{#if errorMessage && !loadingPreview}
@@ -186,7 +184,7 @@
 {#snippet tabContent(data: any, title: string)}
 	<div class="space-y-4">
 		<div class="mb-6 flex items-center justify-between">
-			<Label class="text-lg font-semibold">{title}</Label>
+			<span class="text-lg font-semibold">{title}</span>
 			<CopyToClipboard value={JSON.stringify(data, null, 2)}>
 				<Button size="sm" variant="outline">{m.copy_all()}</Button>
 			</CopyToClipboard>
@@ -194,7 +192,7 @@
 		<div class="space-y-3">
 			{#each Object.entries(data || {}) as [key, value]}
 				<div class="grid grid-cols-1 items-start gap-4 border-b pb-3 md:grid-cols-[200px_1fr]">
-					<Label class="pt-1 text-sm font-medium">{key}</Label>
+					<Field.Label class="pt-1">{key}</Field.Label>
 					<div class="min-w-0">
 						<CopyToClipboard value={typeof value === 'string' ? value : JSON.stringify(value)}>
 							<div