diff --git a/app/app.android.scss b/app/app.android.scss
index ef3308722..100db4cdc 100644
--- a/app/app.android.scss
+++ b/app/app.android.scss
@@ -3,6 +3,16 @@ checkbox {
     margin-right: 0;
 }
 
+// the primary button is a 40 tall pill
+button[variant='contained'] {
+    height: 40;
+}
+
+.sheetHeaderTitle {
+    font-size: 22;
+    margin-left: 8;
+}
+
 // a tonal chip: the surface has no glass here
 .cardChip {
     background-color: var(--colorPrimaryContainer);
@@ -17,3 +27,15 @@ checkbox {
     border-radius: 30;
     border-width: 1;
 }
+
+// a field: 56 tall and 4 around
+.formRow {
+    height: 64;
+}
+
+// the outline takes the accent while the field has the focus
+textfield[variant='outline'] {
+    floating-color: var(--colorPrimary);
+    stroke-color: var(--colorPrimary);
+    stroke-inactive-color: var(--colorOutline);
+}
diff --git a/app/app.ios.scss b/app/app.ios.scss
index 4f7d17469..b4a3a3270 100644
--- a/app/app.ios.scss
+++ b/app/app.ios.scss
@@ -75,6 +75,18 @@ textfield[variant='none'] {
     font-weight: 700;
 }
 
+// the primary button is a 44 tall capsule
+button[variant='prominentGlass'],
+button[variant='contained'] {
+    height: 44;
+}
+
+.sheetHeaderTitle {
+    font-size: 17;
+    font-weight: bold;
+    text-align: center;
+}
+
 // capsule text fields: the system fill, 12% gray in light and 24% in dark
 textfield[variant='outline'],
 textview[variant='outline'] {
@@ -94,3 +106,14 @@ textview[variant='outline'] {
     min-height: 84;
     padding: 12 16;
 }
+
+// a field: 48 tall and 4 around
+.formRow {
+    height: 56;
+}
+
+textfield[variant='outline']:focused,
+textview[variant='outline']:focused {
+    border-color: var(--colorPrimary);
+    border-width: 1.5;
+}
diff --git a/app/components/common/SheetHeader.svelte b/app/components/common/SheetHeader.svelte
new file mode 100644
index 000000000..948a64f5f
--- /dev/null
+++ b/app/components/common/SheetHeader.svelte
@@ -0,0 +1,24 @@
+<script lang="ts">
+    import { lc } from '@nativescript-community/l';
+    import { appIcon } from '~/utils/appIcons';
+    import { colors } from '~/variables';
+
+    export let title: string;
+    export let doneText: string;
+    export let doneEnabled = true;
+    export let onCancel: () => void;
+    export let onDone: () => void;
+    let { colorOnPrimary, colorOnSurface, colorPrimary } = $colors;
+    $: ({ colorOnPrimary, colorOnSurface, colorPrimary } = $colors);
+    $: doneColor = __IOS__ ? colorOnPrimary : colorPrimary;
+
+    // iOS: a glass Cancel pill and a prominent action. Android: a close icon and a text action
+    const cancelProps = __IOS__ ? { text: lc('cancel'), variant: 'glass' } : { src: appIcon('close'), variant: 'text' };
+    const doneVariant = __IOS__ ? 'contained' : 'text';
+</script>
+
+<gridlayout columns="auto,*,auto" padding="12 16 8 16" {...$$restProps}>
+    <uibutton accessibilityLabel={lc('cancel')} {...cancelProps} on:tap={onCancel} />
+    <label class="sheetHeaderTitle" col={1} color={colorOnSurface} text={title} verticalAlignment="center" />
+    <uibutton col={2} color={doneColor} isEnabled={doneEnabled} opacity={doneEnabled ? 1 : 0.45} text={doneText} variant={doneVariant} on:tap={onDone} />
+</gridlayout>
diff --git a/app/components/list/CardsList.svelte b/app/components/list/CardsList.svelte
index 38a4faf7a..d1fa6ec22 100644
--- a/app/components/list/CardsList.svelte
+++ b/app/components/list/CardsList.svelte
@@ -20,7 +20,8 @@
         DEFAULT_NB_COLUMNS_LANDSCAPE,
         SETTINGS_CARD_ALWAYS_SHOW_NAME,
         SETTINGS_NB_COLUMNS,
-        SETTINGS_NB_COLUMNS_LANDSCAPE
+        SETTINGS_NB_COLUMNS_LANDSCAPE,
+        SHEET_SOFT_INPUT_MODE
     } from '~/utils/constants';
     import { appIcon } from '~/utils/appIcons';
     import { documentHasPKPassData } from '~/utils/pkpass';
@@ -82,6 +83,7 @@
             const result = await showBottomSheet({
                 parent: this,
                 view: CreateCard,
+                windowSoftInputMode: SHEET_SOFT_INPUT_MODE,
                 ignoreTopSafeArea: true
             });
             DEV_LOG && console.log('CreateCard', result);
diff --git a/app/components/view/CardEditSheet.svelte b/app/components/view/CardEditSheet.svelte
index 3717c63b9..0f473c7b9 100644
--- a/app/components/view/CardEditSheet.svelte
+++ b/app/components/view/CardEditSheet.svelte
@@ -2,6 +2,7 @@
     import { lc } from '@nativescript-community/l';
     import { Template } from '@nativescript-community/svelte-native/components';
     import { TextField } from '@nativescript-community/ui-textfield';
+    import SheetHeader from '~/components/common/SheetHeader.svelte';
     import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
     import { showError } from '@shared/utils/showError';
     import dayjs from 'dayjs';
@@ -9,6 +10,7 @@
     import { qrcodeService } from '~/services/qrcode';
     import { shortcutService } from '~/services/shortcuts';
     import { appIcon } from '~/utils/appIcons';
+    import { SHEET_SOFT_INPUT_MODE } from '~/utils/constants';
     import { pickColor } from '~/utils/ui';
     import { colors } from '~/variables';
     import ListItemAutoSize from '@shared/components/ListItemAutoSize.svelte';
@@ -108,6 +110,7 @@
                 parent: rootView,
                 skipCollapsedState: true,
                 view: ExtraFieldPicker,
+                windowSoftInputMode: SHEET_SOFT_INPUT_MODE,
                 props: { editing: !!field, ...(field?.extra || {}) }
             });
             if (!result) {
@@ -166,11 +169,7 @@
 </script>
 
 <gesturerootview bind:this={rootView} backgroundColor={__IOS__ ? colorBackground : colorSurface} rows="auto,*">
-    <gridlayout columns="auto,*,auto" padding="12 16 8 16">
-        <uibutton text={lc('cancel')} variant="text" on:tap={() => close(false)} />
-        <label col={1} color={colorOnSurface} fontSize={17} fontWeight="bold" text={lc('edit')} textAlignment="center" verticalAlignment="center" />
-        <uibutton col={2} text={lc('save')} variant={__IOS__ ? 'prominentGlass' : 'contained'} on:tap={save} />
-    </gridlayout>
+    <SheetHeader doneText={lc('save')} onCancel={() => close(false)} onDone={save} title={lc('edit')} />
     <collectionview row={1} {itemTemplateSelector} items={listItems}>
         <Template key="name" let:item>
             <textfield hint={lc('name')} margin="4 16 4 16" text={name} variant={__IOS__ ? 'none' : 'filled'} on:textChange={(e) => (name = e.value)} />
@@ -190,13 +189,13 @@
         <Template key="code" let:item>
             <gridlayout columns="*,auto" margin="2 16 2 16">
                 <textfield error={item.code.error} hint={lc('barcode')} text={item.code.text} variant={__IOS__ ? 'none' : 'filled'} on:textChange={(e) => onCodeText(item.code, e.value, e.object)} />
-                <uibutton col={1} variant="text" {...{ src: appIcon('delete') }} on:tap={() => removeCode(item.code)} />
+                <uibutton col={1} color={colorError} variant="text" {...{ src: appIcon('delete') }} on:tap={() => removeCode(item.code)} />
             </gridlayout>
         </Template>
 
         <Template key="field" let:item>
             <ListItemAutoSize fontSize={17} item={{ title: item.field.name, subtitle: formatValue(item.field.extra) }} on:tap={() => editField(item.field)}>
-                <uibutton col={1} variant="text" {...{ src: appIcon('delete') }} on:tap={() => removeField(item.field)} />
+                <uibutton col={1} color={colorError} variant="text" {...{ src: appIcon('delete') }} on:tap={() => removeField(item.field)} />
             </ListItemAutoSize>
         </Template>
 
diff --git a/app/components/view/CardView.svelte b/app/components/view/CardView.svelte
index 48473706e..446f256e4 100644
--- a/app/components/view/CardView.svelte
+++ b/app/components/view/CardView.svelte
@@ -57,7 +57,8 @@
         EVENT_DOCUMENT_UPDATED,
         QRCODE_RESIZE_THRESHOLD,
         SETTINGS_DOCUMENT_NAME_FORMAT,
-        SETTINGS_FORCE_WHITE_BACKGROUND_QRCODE
+        SETTINGS_FORCE_WHITE_BACKGROUND_QRCODE,
+        SHEET_SOFT_INPUT_MODE
     } from '~/utils/constants';
     import { appIcon } from '~/utils/appIcons';
     import { optionsToMenuItems } from '~/utils/appMenu';
@@ -943,6 +944,7 @@
             const saved = await showBottomSheet({
                 parent: page,
                 view: CardEditSheet,
+                windowSoftInputMode: SHEET_SOFT_INPUT_MODE,
                 detents: [{ fraction: 0.65 }, 'large'],
                 grabber: true,
                 props: { document }
diff --git a/app/components/widgets/CreateCard.svelte b/app/components/widgets/CreateCard.svelte
index 52b96c6bc..9d5470921 100644
--- a/app/components/widgets/CreateCard.svelte
+++ b/app/components/widgets/CreateCard.svelte
@@ -5,6 +5,8 @@
     import { FORMATS, getBarcodeFallbackString, qrcodeService } from '~/services/qrcode';
     import { pickColor, showPopoverMenu } from '~/utils/ui';
     import { colors } from '~/variables';
+    import { focusState } from '~/utils/svelte/actions';
+    import SheetHeader from '../common/SheetHeader.svelte';
     import SvgView from '../common/SVGView.svelte';
 </script>
 
@@ -21,6 +23,10 @@
     let validCode = true;
     const tMargin = '4 0 4 0';
 
+    function close() {
+        rootView.nativeView.bindingContext.closeCallback();
+    }
+
     async function add() {
         try {
             if (!name || !color) {
@@ -80,26 +86,36 @@
     }
 </script>
 
-<gesturerootview bind:this={rootView} columns="*,auto" padding={16} rows="auto,auto,auto,auto,auto,auto">
-    <label color={colorOnBackground} fontSize={20} fontWeight="bold" text={lc('create')} verticalAlignment="center" />
-    <stacklayout col={1} orientation="horizontal">
-        <label color={colorOnBackground} fontSize={16} text={lc('color')} verticalAlignment="center" />
-        <absolutelayout backgroundColor={color} borderColor={colorOutline} borderRadius="50%" borderWidth={2} height={40} marginLeft={10} width={40} on:tap={changeColor} />
-    </stacklayout>
-    <textfield colSpan={2} hint={lc('name')} margin={tMargin} row={1} text={name} variant="outline" on:textChange={(e) => (name = e.value)} />
-    <textfield colSpan={2} hint={lc('barcode')} margin={tMargin} row={2} text={code} variant="outline" on:textChange={onCodeTextChange} />
-    <textfield colSpan={2} editable={false} hint={lc('barcode_type')} margin={tMargin} row={3} text={codeFormat} textTransform="uppercase" variant="outline" on:tap={(e) => selectBarcodeFormat(e)} />
-    <SvgView backgroundColor="white" borderRadius={12} colSpan={2} height={100} item={{ svg }} row={4} stretch="aspectFit" visibility={code?.length ? 'visible' : 'collapse'} />
-    <label
-        colSpan={2}
-        fontSize={20}
-        fontWeight="bold"
-        row={4}
-        text={lc('invalid')}
-        textAlignment="center"
-        verticalAlignment="center"
-        visibility={code?.length && !validCode ? 'visible' : 'collapse'}
-    />
-
-    <uibutton colSpan={2} horizontalAlignment="right" isEnabled={name?.length > 0} row={5} text={lc('add')} variant="text" on:tap={add} />
+<gesturerootview bind:this={rootView} rows="auto,auto">
+    <SheetHeader doneEnabled={name?.length > 0} doneText={lc('add')} onCancel={close} onDone={add} title={lc('create')} />
+    <gridlayout columns="*,auto" padding="0 16 16 16" row={1} rows="auto,auto,auto,auto,auto,auto">
+        <textfield colSpan={2} hint={lc('name')} margin={tMargin} text={name} use:focusState variant="outline" on:textChange={(e) => (name = e.value)} />
+        <textfield colSpan={2} hint={lc('barcode')} margin={tMargin} row={1} text={code} use:focusState variant="outline" on:textChange={onCodeTextChange} />
+        <textfield
+            colSpan={2}
+            editable={false}
+            hint={lc('barcode_type')}
+            margin={tMargin}
+            row={2}
+            text={codeFormat}
+            textTransform="uppercase"
+            variant="outline"
+            on:tap={(e) => selectBarcodeFormat(e)}
+        />
+        <gridlayout class="formRow" colSpan={2} columns="*,auto" row={3} on:tap={changeColor}>
+            <label color={colorOnBackground} fontSize={17} margin="0 4" text={lc('color')} verticalAlignment="center" />
+            <absolutelayout backgroundColor={color} borderColor={colorOutline} borderRadius="50%" borderWidth={2} col={1} height={40} verticalAlignment="center" width={40} />
+        </gridlayout>
+        <SvgView backgroundColor="white" borderRadius={12} colSpan={2} height={100} item={{ svg }} row={4} stretch="aspectFit" visibility={code?.length ? 'visible' : 'collapse'} />
+        <label
+            colSpan={2}
+            fontSize={20}
+            fontWeight="bold"
+            row={4}
+            text={lc('invalid')}
+            textAlignment="center"
+            verticalAlignment="center"
+            visibility={code?.length && !validCode ? 'visible' : 'collapse'}
+        />
+    </gridlayout>
 </gesturerootview>
diff --git a/app/components/widgets/ExtraFieldPicker.svelte b/app/components/widgets/ExtraFieldPicker.svelte
index 5a5a77021..637d835b3 100644
--- a/app/components/widgets/ExtraFieldPicker.svelte
+++ b/app/components/widgets/ExtraFieldPicker.svelte
@@ -4,14 +4,16 @@
     import { showError } from '@shared/utils/showError';
     import dayjs from 'dayjs';
     import { formatDate } from '~/helpers/locale';
+    import SheetHeader from '~/components/common/SheetHeader.svelte';
+    import { focusState } from '~/utils/svelte/actions';
     import { ExtraFieldType } from '~/models/OCRDocument';
     import { pickDate, showPopoverMenu } from '~/utils/ui';
     import { colors } from '~/variables';
 </script>
 
 <script lang="ts">
-    let { colorOnBackground, colorOnSurfaceVariant, colorOutlineVariant } = $colors;
-    $: ({ colorOnBackground, colorOnSurfaceVariant, colorOutlineVariant } = $colors);
+    let { colorOnSurfaceVariant, colorOutlineVariant } = $colors;
+    $: ({ colorOnSurfaceVariant, colorOutlineVariant } = $colors);
 
     export let editing = false;
     export let name = null;
@@ -91,6 +93,10 @@
         }
     }
 
+    function close() {
+        rootView.nativeView.bindingContext.closeCallback();
+    }
+
     async function add() {
         try {
             if (!currentName || (!currentValue && currentType !== ExtraFieldType.Date)) {
@@ -123,25 +129,24 @@
     }
 </script>
 
-<gesturerootview bind:this={rootView} padding={16} rows="auto,auto,auto,auto,auto">
-    <label color={colorOnBackground} fontSize={20} fontWeight="bold" marginBottom={16} text={editing ? lc('edit_extra_field') : lc('add_extra_field')} />
-    <gridlayout row={1}>
-        <textfield hint={lc('name')} margin={tMargin} paddingLeft={60} row={2} text={currentName} variant="outline" on:textChange={(e) => (currentName = e.value)} />
-        <uibutton class="icon-btn" color={colorOnSurfaceVariant} horizontalAlignment="left" text="mdi-menu-down" variant="text" verticalAlignment="middle" on:tap={selecteTemplateName} />
-    </gridlayout>
-    <textfield editable={false} hint={lc('type')} margin={tMargin} row={2} text={lc(currentType)} textTransform="uppercase" variant="outline" on:tap={(e) => selectType(e)} />
-
-    <textview
-        editable={currentType !== ExtraFieldType.Date}
-        hint={lc('value')}
-        keyboardType={getKeyboardType(currentType)}
-        margin={tMargin}
-        row={3}
-        text={currentType === ExtraFieldType.Date ? formatDate(currentTime, 'LL') : currentValue}
-        variant="outline"
-        on:textChange={(e) => (currentValue = e.value)}
-        on:tap={(e) => selectDate(e)}
-    />
-
-    <uibutton horizontalAlignment="right" row={4} text={editing ? lc('edit') : lc('add')} variant="text" on:tap={add} />
+<gesturerootview bind:this={rootView} rows="auto,auto">
+    <SheetHeader doneText={editing ? lc('edit') : lc('add')} onCancel={close} onDone={add} title={editing ? lc('edit_extra_field') : lc('add_extra_field')} />
+    <stacklayout padding="0 16 16 16" row={1}>
+        <gridlayout>
+            <textfield hint={lc('name')} margin={tMargin} paddingLeft={60} text={currentName} use:focusState variant="outline" on:textChange={(e) => (currentName = e.value)} />
+            <uibutton class="icon-btn" color={colorOnSurfaceVariant} horizontalAlignment="left" text="mdi-menu-down" variant="text" verticalAlignment="middle" on:tap={selecteTemplateName} />
+        </gridlayout>
+        <textfield editable={false} hint={lc('type')} margin={tMargin} text={lc(currentType)} textTransform="uppercase" variant="outline" on:tap={(e) => selectType(e)} />
+        <textview
+            editable={currentType !== ExtraFieldType.Date}
+            hint={lc('value')}
+            keyboardType={getKeyboardType(currentType)}
+            margin={tMargin}
+            text={currentType === ExtraFieldType.Date ? formatDate(currentTime, 'LL') : currentValue}
+            use:focusState
+            variant="outline"
+            on:textChange={(e) => (currentValue = e.value)}
+            on:tap={(e) => selectDate(e)}
+        />
+    </stacklayout>
 </gesturerootview>
diff --git a/app/utils/constants.ts b/app/utils/constants.ts
index 81afe1a02..3a79f0715 100644
--- a/app/utils/constants.ts
+++ b/app/utils/constants.ts
@@ -174,3 +174,6 @@ export const DOCUMENT_DATA_FILENAME = 'data.json';
 export const DELETED_DOCUMENTS_DATA_FILENAME = 'deleted_documents.json';
 export const DELETED_FOLDERS_DATA_FILENAME = 'deleted_folders.json';
 export const VALID_MARKER_FILENAME = '.valid';
+
+// SOFT_INPUT_ADJUST_RESIZE: a sheet with fields moves up with the keyboard
+export const SHEET_SOFT_INPUT_MODE = __ANDROID__ ? 16 : undefined;
diff --git a/app/utils/svelte/actions.ts b/app/utils/svelte/actions.ts
new file mode 100644
index 000000000..6bf49cb62
--- /dev/null
+++ b/app/utils/svelte/actions.ts
@@ -0,0 +1,16 @@
+import type { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
+import type { TextBase } from '@nativescript/core';
+
+/** css has no `:focus`: the field gets the `focused` pseudo class while it has the focus */
+export function focusState(node: NativeViewElementNode<TextBase>) {
+    const onFocus = () => node.nativeView.addPseudoClass('focused');
+    const onBlur = () => node.nativeView.deletePseudoClass('focused');
+    node.addEventListener('focus', onFocus);
+    node.addEventListener('blur', onBlur);
+    return {
+        destroy() {
+            node.removeEventListener('focus', onFocus);
+            node.removeEventListener('blur', onBlur);
+        }
+    };
+}