Merge branch 'main' into week-note

test: add test for week number with different first day of week setting
refactor: clear calendar code
2026-02-18 04:17:04 +01:00 · 2026-02-01 14:29:45 +00:00 · 2026-02-01 14:26:11 +00:00 · 2026-01-19 21:15:18 +00:00 · 2026-01-19 21:01:07 +00:00 · 2026-01-19 20:59:15 +00:00
304 changed files with 4712 additions and 11998 deletions
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-24.13.1
+24.13.0
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -42,8 +42,5 @@
    },
    "eslint.rules.customizations": [
        { "rule": "*", "severity": "warn" }
-    ],
-    "cSpell.words": [
-      "Trilium"
    ]
-}
+}
--- a/apps/build-docs/package.json
+++ b/apps/build-docs/package.json
@@ -9,14 +9,14 @@
  "keywords": [],
  "author": "Elian Doran <contact@eliandoran.me>",
  "license": "AGPL-3.0-only",
-  "packageManager": "pnpm@10.29.3",
+  "packageManager": "pnpm@10.28.2",
  "devDependencies": {
-    "@redocly/cli": "2.18.2",
+    "@redocly/cli": "2.15.0",
    "archiver": "7.0.1",
    "fs-extra": "11.3.3",
    "react": "19.2.4",
    "react-dom": "19.2.4",
-    "typedoc": "0.28.17",
+    "typedoc": "0.28.16",
    "typedoc-plugin-missing-exports": "4.1.2"
  }
 }
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -27,7 +27,7 @@
    "@mermaid-js/layout-elk": "0.2.0",
    "@mind-elixir/node-menu": "5.0.1",
    "@popperjs/core": "2.11.8",
-    "@preact/signals": "2.8.1",
+    "@preact/signals": "2.6.2",
    "@triliumnext/ckeditor5": "workspace:*",
    "@triliumnext/codemirror": "workspace:*",
    "@triliumnext/commons": "workspace:*",
@@ -42,9 +42,9 @@
    "color": "5.0.3",
    "debounce": "3.0.0",
    "draggabilly": "3.0.0",
-    "force-graph": "1.51.1",
-    "globals": "17.3.0",
-    "i18next": "25.8.10",
+    "force-graph": "1.51.0",
+    "globals": "17.2.0",
+    "i18next": "25.8.0",
    "i18next-http-backend": "3.0.2",
    "jquery": "4.0.0",
    "jquery.fancytree": "2.38.5",
@@ -54,14 +54,14 @@
    "leaflet": "1.9.4",
    "leaflet-gpx": "2.2.0",
    "mark.js": "8.11.1",
-    "marked": "17.0.3",
+    "marked": "17.0.1",
    "mermaid": "11.12.2",
-    "mind-elixir": "5.8.2",
+    "mind-elixir": "5.6.1",
    "normalize.css": "8.0.1",
    "panzoom": "9.4.3",
    "preact": "10.28.3",
    "react-i18next": "16.5.4",
-    "react-window": "2.2.7",
+    "react-window": "2.2.6",
    "reveal.js": "5.2.1",
    "svg-pan-zoom": "3.6.2",
    "tabulator-tables": "6.3.1",
@@ -78,7 +78,7 @@
    "@types/reveal.js": "5.2.2",
    "@types/tabulator-tables": "6.3.1",
    "copy-webpack-plugin": "13.0.1",
-    "happy-dom": "20.6.1",
+    "happy-dom": "20.4.0",
    "lightningcss": "1.31.1",
    "script-loader": "0.7.2",
    "vite-plugin-static-copy": "3.2.0"
--- a/apps/client/src/desktop.ts
+++ b/apps/client/src/desktop.ts
@@ -46,6 +46,10 @@ if (utils.isElectron()) {
    electronContextMenu.setupContextMenu();
 }

+if (utils.isPWA()) {
+    initPWATopbarColor();
+}
+
 function initOnElectron() {
    const electron: typeof Electron = utils.dynamicRequire("electron");
    electron.ipcRenderer.on("globalShortcut", async (event, actionName) => appContext.triggerCommand(actionName));
@@ -130,3 +134,20 @@ function initDarkOrLightMode(style: CSSStyleDeclaration) {
    const { nativeTheme } = utils.dynamicRequire("@electron/remote") as typeof ElectronRemote;
    nativeTheme.themeSource = themeSource;
 }
+
+function initPWATopbarColor() {
+    const tracker = $("#background-color-tracker");
+
+    if (tracker.length) {
+        const applyThemeColor = () => {
+            let meta = $("meta[name='theme-color']");
+            if (!meta.length) {
+                meta = $(`<meta name="theme-color">`).appendTo($("head"));
+            }
+            meta.attr("content", tracker.css("color"));
+        };
+
+        tracker.on("transitionend", applyThemeColor);
+        applyThemeColor();
+    }
+}
--- a/apps/client/src/entities/fnote.ts
+++ b/apps/client/src/entities/fnote.ts
@@ -700,15 +700,6 @@ export default class FNote {
        return this.hasAttribute(LABEL, name);
    }

-    /**
-     * Returns `true` if the note has a label with the given name (same as {@link hasOwnedLabel}), or it has a label with the `disabled:` prefix (for example due to a safe import).
-     * @param name the name of the label to look for.
-     * @returns `true` if the label exists, or its version with the `disabled:` prefix.
-     */
-    hasLabelOrDisabled(name: string) {
-        return this.hasLabel(name) || this.hasLabel(`disabled:${name}`);
-    }
-
    /**
     * @param name - label name
     * @returns true if label exists (including inherited) and does not have "false" value.
--- a/apps/client/src/layouts/mobile_layout.css
+++ b/apps/client/src/layouts/mobile_layout.css
@@ -1,76 +0,0 @@
-#background-color-tracker {
-    color: var(--main-background-color) !important;
-}
-
-span.keyboard-shortcut,
-kbd {
-    display: none;
-}
-
-.dropdown-menu {
-    font-size: larger;
-}
-
-.action-button {
-    background: none;
-    border: none;
-    cursor: pointer;
-    font-size: 1.25em;
-    padding-inline-start: 0.5em;
-    padding-inline-end: 0.5em;
-    color: var(--main-text-color);
-}
-.quick-search {
-    margin: 0;
-}
-.quick-search .dropdown-menu {
-    max-width: 350px;
-}
-
-/* #region Tree */
-.tree-wrapper {
-    max-height: 100%;
-    margin-top: 0px;
-    overflow-y: auto;
-    contain: content;
-    padding-inline-start: 10px;
-}
-
-.fancytree-title {
-    margin-inline-start: 0.6em !important;
-}
-
-.fancytree-node {
-    padding: 5px;
-}
-
-span.fancytree-expander {
-    width: 24px !important;
-    margin-inline-end: 5px;
-}
-
-.fancytree-loading span.fancytree-expander {
-    width: 24px;
-    height: 32px;
-}
-
-.fancytree-loading  span.fancytree-expander:after {
-    width: 20px;
-    height: 20px;
-    margin-top: 4px;
-    border-width: 2px;
-    border-style: solid;
-}
-
-.tree-wrapper .collapse-tree-button,
-.tree-wrapper .scroll-to-active-note-button,
-.tree-wrapper .tree-settings-button {
-    position: fixed;
-    margin-inline-end: 16px;
-    display: none;
-}
-
-.tree-wrapper .unhoist-button {
-    font-size: 200%;
-}
-/* #endregion */
--- a/apps/client/src/layouts/mobile_layout.tsx
+++ b/apps/client/src/layouts/mobile_layout.tsx
@@ -1,40 +1,128 @@
-import "./mobile_layout.css";
-
 import type AppContext from "../components/app_context.js";
 import GlobalMenuWidget from "../widgets/buttons/global_menu.js";
 import CloseZenModeButton from "../widgets/close_zen_button.js";
 import NoteList from "../widgets/collections/NoteList.jsx";
+import ContentHeader from "../widgets/containers/content_header.js";
 import FlexContainer from "../widgets/containers/flex_container.js";
 import RootContainer from "../widgets/containers/root_container.js";
 import ScrollingContainer from "../widgets/containers/scrolling_container.js";
 import SplitNoteContainer from "../widgets/containers/split_note_container.js";
-import FindWidget from "../widgets/find.js";
+import FloatingButtons from "../widgets/FloatingButtons.jsx";
+import { MOBILE_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.jsx";
 import LauncherContainer from "../widgets/launch_bar/LauncherContainer.jsx";
-import InlineTitle from "../widgets/layout/InlineTitle.jsx";
-import NoteBadges from "../widgets/layout/NoteBadges.jsx";
-import NoteTitleActions from "../widgets/layout/NoteTitleActions.jsx";
 import MobileDetailMenu from "../widgets/mobile_widgets/mobile_detail_menu.js";
 import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
 import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js";
 import ToggleSidebarButton from "../widgets/mobile_widgets/toggle_sidebar_button.jsx";
-import NoteIconWidget from "../widgets/note_icon.jsx";
 import NoteTitleWidget from "../widgets/note_title.js";
 import NoteTreeWidget from "../widgets/note_tree.js";
 import NoteWrapperWidget from "../widgets/note_wrapper.js";
 import NoteDetail from "../widgets/NoteDetail.jsx";
+import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
 import QuickSearchWidget from "../widgets/quick_search.js";
 import { useNoteContext } from "../widgets/react/hooks.jsx";
+import ReadOnlyNoteInfoBar from "../widgets/ReadOnlyNoteInfoBar.jsx";
+import StandaloneRibbonAdapter from "../widgets/ribbon/components/StandaloneRibbonAdapter.jsx";
 import FilePropertiesTab from "../widgets/ribbon/FilePropertiesTab.jsx";
-import ScrollPadding from "../widgets/scroll_padding";
+import SearchDefinitionTab from "../widgets/ribbon/SearchDefinitionTab.jsx";
 import SearchResult from "../widgets/search_result.jsx";
+import SharedInfoWidget from "../widgets/shared_info.js";
+import TabRowWidget from "../widgets/tab_row.js";
 import MobileEditorToolbar from "../widgets/type_widgets/text/mobile_editor_toolbar.jsx";
 import { applyModals } from "./layout_commons.js";

+const MOBILE_CSS = `
+<style>
+span.keyboard-shortcut,
+kbd {
+    display: none;
+}
+
+.dropdown-menu {
+    font-size: larger;
+}
+
+.action-button {
+    background: none;
+    border: none;
+    cursor: pointer;
+    font-size: 1.25em;
+    padding-inline-start: 0.5em;
+    padding-inline-end: 0.5em;
+    color: var(--main-text-color);
+}
+.quick-search {
+    margin: 0;
+}
+.quick-search .dropdown-menu {
+    max-width: 350px;
+}
+</style>`;
+
+const FANCYTREE_CSS = `
+<style>
+.tree-wrapper {
+    max-height: 100%;
+    margin-top: 0px;
+    overflow-y: auto;
+    contain: content;
+    padding-inline-start: 10px;
+}
+
+.fancytree-custom-icon {
+    font-size: 2em;
+}
+
+.fancytree-title {
+    font-size: 1.5em;
+    margin-inline-start: 0.6em !important;
+}
+
+.fancytree-node {
+    padding: 5px;
+}
+
+.fancytree-node .fancytree-expander:before {
+    font-size: 2em !important;
+}
+
+span.fancytree-expander {
+    width: 24px !important;
+    margin-inline-end: 5px;
+}
+
+.fancytree-loading span.fancytree-expander {
+    width: 24px;
+    height: 32px;
+}
+
+.fancytree-loading  span.fancytree-expander:after {
+    width: 20px;
+    height: 20px;
+    margin-top: 4px;
+    border-width: 2px;
+    border-style: solid;
+}
+
+.tree-wrapper .collapse-tree-button,
+.tree-wrapper .scroll-to-active-note-button,
+.tree-wrapper .tree-settings-button {
+    position: fixed;
+    margin-inline-end: 16px;
+    display: none;
+}
+
+.tree-wrapper .unhoist-button {
+    font-size: 200%;
+}
+</style>`;
+
 export default class MobileLayout {
    getRootWidget(appContext: typeof AppContext) {
        const rootContainer = new RootContainer(true)
            .setParent(appContext)
            .class("horizontal-layout")
+            .cssBlock(MOBILE_CSS)
            .child(new FlexContainer("column").id("mobile-sidebar-container"))
            .child(
                new FlexContainer("row")
@@ -48,7 +136,7 @@ export default class MobileLayout {
                            .css("padding-inline-start", "0")
                            .css("padding-inline-end", "0")
                            .css("contain", "content")
-                            .child(new FlexContainer("column").filling().id("mobile-sidebar-wrapper").child(new QuickSearchWidget()).child(new NoteTreeWidget()))
+                            .child(new FlexContainer("column").filling().id("mobile-sidebar-wrapper").child(new QuickSearchWidget()).child(new NoteTreeWidget().cssBlock(FANCYTREE_CSS)))
                    )
                    .child(
                        new ScreenContainer("detail", "row")
@@ -59,28 +147,30 @@ export default class MobileLayout {
                                    new NoteWrapperWidget()
                                        .child(
                                            new FlexContainer("row")
-                                                .class("title-row note-split-title")
                                                .contentSized()
+                                                .css("font-size", "larger")
                                                .css("align-items", "center")
                                                .child(<ToggleSidebarButton />)
-                                                .child(<NoteIconWidget />)
                                                .child(<NoteTitleWidget />)
-                                                .child(<NoteBadges />)
                                                .child(<MobileDetailMenu />)
                                        )
+                                        .child(<FloatingButtons items={MOBILE_FLOATING_BUTTONS} />)
+                                        .child(<PromotedAttributes />)
                                        .child(
                                            new ScrollingContainer()
                                                .filling()
                                                .contentSized()
-                                                .child(<InlineTitle />)
-                                                .child(<NoteTitleActions />)
+                                                .child(new ContentHeader()
+                                                    .child(<ReadOnlyNoteInfoBar />)
+                                                    .child(<SharedInfoWidget />)
+                                                )
                                                .child(<NoteDetail />)
                                                .child(<NoteList media="screen" />)
+                                                .child(<StandaloneRibbonAdapter component={SearchDefinitionTab} />)
                                                .child(<SearchResult />)
-                                                .child(<ScrollPadding />)
+                                                .child(<FilePropertiesWrapper />)
                                        )
                                        .child(<MobileEditorToolbar />)
-                                        .child(new FindWidget())
                                )
                            )
                    )
@@ -101,3 +191,13 @@ export default class MobileLayout {
        return rootContainer;
    }
 }
+
+function FilePropertiesWrapper() {
+    const { note, ntxId } = useNoteContext();
+
+    return (
+        <div>
+            {note?.type === "file" && <FilePropertiesTab note={note} ntxId={ntxId} />}
+        </div>
+    );
+}
--- a/apps/client/src/menus/context_menu.ts
+++ b/apps/client/src/menus/context_menu.ts
@@ -248,7 +248,7 @@ class ContextMenu {
        if ("uiIcon" in item || "checked" in item) {
            const icon = (item.checked ? "bx bx-check" : item.uiIcon);
            if (icon) {
-                $icon.addClass([icon, "tn-icon"]);
+                $icon.addClass(icon);
            } else {
                $icon.append("&nbsp;");
            }
--- a/apps/client/src/menus/launcher_context_menu.ts
+++ b/apps/client/src/menus/launcher_context_menu.ts
@@ -1,12 +1,12 @@
-import type { ContextMenuCommandData,FilteredCommandNames } from "../components/app_context.js";
-import type { SelectMenuItemEventListener } from "../components/events.js";
-import dialogService from "../services/dialog.js";
-import froca from "../services/froca.js";
-import { t } from "../services/i18n.js";
-import server from "../services/server.js";
 import treeService from "../services/tree.js";
-import type NoteTreeWidget from "../widgets/note_tree.js";
+import froca from "../services/froca.js";
 import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
+import dialogService from "../services/dialog.js";
+import server from "../services/server.js";
+import { t } from "../services/i18n.js";
+import type { SelectMenuItemEventListener } from "../components/events.js";
+import type NoteTreeWidget from "../widgets/note_tree.js";
+import type { FilteredCommandNames, ContextMenuCommandData } from "../components/app_context.js";

 type LauncherCommandNames = FilteredCommandNames<ContextMenuCommandData>;

@@ -32,8 +32,8 @@ export default class LauncherContextMenu implements SelectMenuItemEventListener<
        const note = this.node.data.noteId ? await froca.getNote(this.node.data.noteId) : null;
        const parentNoteId = this.node.getParent().data.noteId;

-        const isVisibleRoot = note?.noteId === "_lbVisibleLaunchers" || note?.noteId === "_lbMobileVisibleLaunchers";
-        const isAvailableRoot = note?.noteId === "_lbAvailableLaunchers" || note?.noteId === "_lbMobileAvailableLaunchers";
+        const isVisibleRoot = note?.noteId === "_lbVisibleLaunchers";
+        const isAvailableRoot = note?.noteId === "_lbAvailableLaunchers";
        const isVisibleItem = parentNoteId === "_lbVisibleLaunchers" || parentNoteId === "_lbMobileVisibleLaunchers";
        const isAvailableItem = parentNoteId === "_lbAvailableLaunchers" || parentNoteId === "_lbMobileAvailableLaunchers";
        const isItem = isVisibleItem || isAvailableItem;
--- a/apps/client/src/print.tsx
+++ b/apps/client/src/print.tsx
@@ -18,10 +18,6 @@ export type PrintReport = {
 } | {
    type: "collection";
    ignoredNoteIds: string[];
-} | {
-    type: "error";
-    message: string;
-    stack?: string;
 };

 async function main() {
--- a/apps/client/src/services/attributes.ts
+++ b/apps/client/src/services/attributes.ts
@@ -168,49 +168,6 @@ function isAffecting(attrRow: AttributeRow, affectedNote: FNote | null | undefin
    return false;
 }

-/**
- * Toggles whether a dangerous attribute is enabled or not. When an attribute is disabled, its name is prefixed with `disabled:`.
- *
- * Note that this work for non-dangerous attributes as well.
- *
- * If there are multiple attributes with the same name, all of them will be toggled at the same time.
- *
- * @param note the note whose attribute to change.
- * @param type the type of dangerous attribute (label or relation).
- * @param name the name of the dangerous attribute.
- * @param willEnable whether to enable or disable the attribute.
- * @returns a promise that will resolve when the request to the server completes.
- */
-async function toggleDangerousAttribute(note: FNote, type: "label" | "relation", name: string, willEnable: boolean) {
-    const attrs = [
-        ...note.getOwnedAttributes(type, name),
-        ...note.getOwnedAttributes(type, `disabled:${name}`)
-    ];
-
-    for (const attr of attrs) {
-        const baseName = getNameWithoutDangerousPrefix(attr.name);
-        const newName = willEnable ? baseName : `disabled:${baseName}`;
-        if (newName === attr.name) continue;
-
-        // We are adding and removing afterwards to avoid a flicker (because for a moment there would be no active content attribute anymore) because the operations are done in sequence and not atomically.
-        if (attr.type === "label") {
-            await setLabel(note.noteId, newName, attr.value);
-        } else {
-            await setRelation(note.noteId, newName, attr.value);
-        }
-        await removeAttributeById(note.noteId, attr.attributeId);
-    }
-}
-
-/**
- * Returns the name of an attribute without the `disabled:` prefix, or the same name if it's not disabled.
- * @param name the name of an attribute.
- * @returns the name without the `disabled:` prefix.
- */
-function getNameWithoutDangerousPrefix(name: string) {
-    return name.startsWith("disabled:") ? name.substring(9) : name;
-}
-
 export default {
    addLabel,
    setLabel,
@@ -220,7 +177,5 @@ export default {
    removeAttributeById,
    removeOwnedLabelByName,
    removeOwnedRelationByName,
-    isAffecting,
-    toggleDangerousAttribute,
-    getNameWithoutDangerousPrefix
+    isAffecting
 };
--- a/apps/client/src/services/bundle.ts
+++ b/apps/client/src/services/bundle.ts
@@ -2,6 +2,7 @@ import { h, VNode } from "preact";

 import BasicWidget, { ReactWrappedWidget } from "../widgets/basic_widget.js";
 import RightPanelWidget from "../widgets/right_panel_widget.js";
+import froca from "./froca.js";
 import type { Entity } from "./frontend_script_api.js";
 import { WidgetDefinitionWithType } from "./frontend_script_api_preact.js";
 import { t } from "./i18n.js";
@@ -37,18 +38,15 @@ async function getAndExecuteBundle(noteId: string, originEntity = null, script =

 export type ParentName = "left-pane" | "center-pane" | "note-detail-pane" | "right-pane";

-export async function executeBundleWithoutErrorHandling(bundle: Bundle, originEntity?: Entity | null, $container?: JQuery<HTMLElement>) {
-    const apiContext = await ScriptContext(bundle.noteId, bundle.allNoteIds, originEntity, $container);
-    return await function () {
-        return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
-    }.call(apiContext);
-}
-
 export async function executeBundle(bundle: Bundle, originEntity?: Entity | null, $container?: JQuery<HTMLElement>) {
+    const apiContext = await ScriptContext(bundle.noteId, bundle.allNoteIds, originEntity, $container);
+
    try {
-        return await executeBundleWithoutErrorHandling(bundle, originEntity, $container);
-    } catch (e: unknown) {
-        showErrorForScriptNote(bundle.noteId, t("toast.bundle-error.message", { message: getErrorMessage(e) }));
+        return await function () {
+            return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
+        }.call(apiContext);
+    } catch (e: any) {
+        showErrorForScriptNote(bundle.noteId, t("toast.bundle-error.message", { message: e.message }));
        logError("Widget initialization failed: ", e);
    }
 }
--- a/apps/client/src/services/content_renderer.css
+++ b/apps/client/src/services/content_renderer.css
@@ -1,9 +0,0 @@
-.rendered-content.no-preview > div {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-around;
-    align-items: center;
-    height: 100%;
-    font-size: 500%;
-    flex-grow: 1;
-}
--- a/apps/client/src/services/content_renderer.ts
+++ b/apps/client/src/services/content_renderer.ts
@@ -1,5 +1,3 @@
-import "./content_renderer.css";
-
 import { normalizeMimeTypeForCKEditor } from "@triliumnext/commons";
 import WheelZoom from 'vanilla-js-wheel-zoom';

@@ -15,7 +13,7 @@ import protectedSessionService from "./protected_session.js";
 import protectedSessionHolder from "./protected_session_holder.js";
 import renderService from "./render.js";
 import { applySingleBlockSyntaxHighlight } from "./syntax_highlight.js";
-import utils, { getErrorMessage } from "./utils.js";
+import utils from "./utils.js";

 let idCounter = 1;

@@ -62,10 +60,7 @@ export async function getRenderedContent(this: {} | { ctx: string }, entity: FNo
    } else if (type === "render" && entity instanceof FNote) {
        const $content = $("<div>");

-        await renderService.render(entity, $content, (e) => {
-            const $error = $("<div>").addClass("admonition caution").text(typeof e === "string" ? e : getErrorMessage(e));
-            $content.empty().append($error);
-        });
+        await renderService.render(entity, $content);

        $renderedContent.append($content);
    } else if (type === "doc" && "noteId" in entity) {
@@ -76,9 +71,18 @@ export async function getRenderedContent(this: {} | { ctx: string }, entity: FNo

        $renderedContent.append($("<div>").append("<div>This note is protected and to access it you need to enter password.</div>").append("<br/>").append($button));
    } else if (entity instanceof FNote) {
-        $renderedContent.addClass("no-preview");
+        $renderedContent
+            .css("display", "flex")
+            .css("flex-direction", "column");
        $renderedContent.append(
-            $("<div>").append($("<span>").addClass(entity.getIcon()))
+            $("<div>")
+                .css("display", "flex")
+                .css("justify-content", "space-around")
+                .css("align-items", "center")
+                .css("height", "100%")
+                .css("font-size", "500%")
+                .css("flex-grow", "1")
+                .append($("<span>").addClass(entity.getIcon()))
        );

        if (entity.type === "webView" && entity.hasLabel("webViewSrc")) {
@@ -288,11 +292,10 @@ function getRenderingType(entity: FNote | FAttachment) {
    }

    const mime = "mime" in entity && entity.mime;
-    const isIconPack = entity instanceof FNote && entity.hasLabel("iconPack");

    if (type === "file" && mime === "application/pdf") {
        type = "pdf";
-    } else if ((type === "file" || type === "viewConfig") && mime && CODE_MIME_TYPES.has(mime) && !isIconPack) {
+    } else if ((type === "file" || type === "viewConfig") && mime && CODE_MIME_TYPES.has(mime)) {
        type = "code";
    } else if (type === "file" && mime && mime.startsWith("audio/")) {
        type = "audio";
--- a/apps/client/src/services/experimental_features.ts
+++ b/apps/client/src/services/experimental_features.ts
@@ -1,6 +1,5 @@
 import { t } from "./i18n";
 import options from "./options";
-import { isMobile } from "./utils";

 export interface ExperimentalFeature {
    id: string;
@@ -22,7 +21,7 @@ let enabledFeatures: Set<ExperimentalFeatureId> | null = null;

 export function isExperimentalFeatureEnabled(featureId: ExperimentalFeatureId): boolean {
    if (featureId === "new-layout") {
-        return (isMobile() || options.is("newLayout"));
+        return options.is("newLayout");
    }

    return getEnabledFeatures().has(featureId);
@@ -30,7 +29,7 @@ export function isExperimentalFeatureEnabled(featureId: ExperimentalFeatureId):

 export function getEnabledExperimentalFeatureIds() {
    const values = [ ...getEnabledFeatures().values() ];
-    if (isMobile() || options.is("newLayout")) {
+    if (options.is("newLayout")) {
        values.push("new-layout");
    }
    return values;
--- a/apps/client/src/services/render.ts
+++ b/apps/client/src/services/render.ts
@@ -0,0 +1,54 @@
+import { h, VNode } from "preact";
+
+import type FNote from "../entities/fnote.js";
+import { renderReactWidgetAtElement } from "../widgets/react/react_utils.jsx";
+import bundleService, { type Bundle } from "./bundle.js";
+import froca from "./froca.js";
+import server from "./server.js";
+
+async function render(note: FNote, $el: JQuery<HTMLElement>) {
+    const relations = note.getRelations("renderNote");
+    const renderNoteIds = relations.map((rel) => rel.value).filter((noteId) => noteId);
+
+    $el.empty().toggle(renderNoteIds.length > 0);
+
+    for (const renderNoteId of renderNoteIds) {
+        const bundle = await server.post<Bundle>(`script/bundle/${renderNoteId}`);
+
+        const $scriptContainer = $("<div>");
+        $el.append($scriptContainer);
+
+        $scriptContainer.append(bundle.html);
+
+        // async so that scripts cannot block trilium execution
+        bundleService.executeBundle(bundle, note, $scriptContainer).then(result => {
+            // Render JSX
+            if (bundle.html === "") {
+                renderIfJsx(bundle, result, $el);
+            }
+        });
+    }
+
+    return renderNoteIds.length > 0;
+}
+
+async function renderIfJsx(bundle: Bundle, result: unknown, $el: JQuery<HTMLElement>) {
+    // Ensure the root script note is actually a JSX.
+    const rootScriptNoteId = await froca.getNote(bundle.noteId);
+    if (rootScriptNoteId?.mime !== "text/jsx") return;
+
+    // Ensure the output is a valid el.
+    if (typeof result !== "function") return;
+
+    // Obtain the parent component.
+    const closestComponent = glob.getComponentByEl($el.closest(".component")[0]);
+    if (!closestComponent) return;
+
+    // Render the element.
+    const el = h(result as () => VNode, {});
+    renderReactWidgetAtElement(closestComponent, el, $el[0]);
+}
+
+export default {
+    render
+};
--- a/apps/client/src/services/render.tsx
+++ b/apps/client/src/services/render.tsx
@@ -1,86 +0,0 @@
-import { Component, h, VNode } from "preact";
-
-import type FNote from "../entities/fnote.js";
-import { renderReactWidgetAtElement } from "../widgets/react/react_utils.jsx";
-import { type Bundle, executeBundleWithoutErrorHandling } from "./bundle.js";
-import froca from "./froca.js";
-import server from "./server.js";
-
-type ErrorHandler = (e: unknown) => void;
-
-async function render(note: FNote, $el: JQuery<HTMLElement>, onError?: ErrorHandler) {
-    const relations = note.getRelations("renderNote");
-    const renderNoteIds = relations.map((rel) => rel.value).filter((noteId) => noteId);
-
-    $el.empty().toggle(renderNoteIds.length > 0);
-
-    try {
-        for (const renderNoteId of renderNoteIds) {
-            const bundle = await server.postWithSilentInternalServerError<Bundle>(`script/bundle/${renderNoteId}`);
-
-            const $scriptContainer = $("<div>");
-            $el.append($scriptContainer);
-
-            $scriptContainer.append(bundle.html);
-
-            // async so that scripts cannot block trilium execution
-            executeBundleWithoutErrorHandling(bundle, note, $scriptContainer)
-                .catch(onError)
-                .then(result => {
-                    // Render JSX
-                    if (bundle.html === "") {
-                        renderIfJsx(bundle, result, $el, onError).catch(onError);
-                    }
-                });
-        }
-
-        return renderNoteIds.length > 0;
-    } catch (e) {
-        if (typeof e === "string" && e.startsWith("{") && e.endsWith("}")) {
-            try {
-                onError?.(JSON.parse(e));
-            } catch (e) {
-                onError?.(e);
-            }
-        } else {
-            onError?.(e);
-        }
-    }
-}
-
-async function renderIfJsx(bundle: Bundle, result: unknown, $el: JQuery<HTMLElement>, onError?: ErrorHandler) {
-    // Ensure the root script note is actually a JSX.
-    const rootScriptNoteId = await froca.getNote(bundle.noteId);
-    if (rootScriptNoteId?.mime !== "text/jsx") return;
-
-    // Ensure the output is a valid el.
-    if (typeof result !== "function") return;
-
-    // Obtain the parent component.
-    const closestComponent = glob.getComponentByEl($el.closest(".component")[0]);
-    if (!closestComponent) return;
-
-    // Render the element.
-    const UserErrorBoundary = class UserErrorBoundary extends Component {
-        constructor(props: object) {
-            super(props);
-            this.state = { error: null };
-        }
-
-        componentDidCatch(error: unknown) {
-            onError?.(error);
-            this.setState({ error });
-        }
-
-        render() {
-            if ("error" in this.state && this.state?.error) return null;
-            return this.props.children;
-        }
-    };
-    const el = h(UserErrorBoundary, {}, h(result as () => VNode, {}));
-    renderReactWidgetAtElement(closestComponent, el, $el[0]);
-}
-
-export default {
-    render
-};
--- a/apps/client/src/services/server.ts
+++ b/apps/client/src/services/server.ts
@@ -73,10 +73,6 @@ async function post<T>(url: string, data?: unknown, componentId?: string) {
    return await call<T>("POST", url, componentId, { data });
 }

-async function postWithSilentInternalServerError<T>(url: string, data?: unknown, componentId?: string) {
-    return await call<T>("POST", url, componentId, { data, silentInternalServerError: true });
-}
-
 async function put<T>(url: string, data?: unknown, componentId?: string) {
    return await call<T>("PUT", url, componentId, { data });
 }
@@ -115,7 +111,6 @@ let maxKnownEntityChangeId = 0;
 interface CallOptions {
    data?: unknown;
    silentNotFound?: boolean;
-    silentInternalServerError?: boolean;
    // If `true`, the value will be returned as a string instead of a JavaScript object if JSON, XMLDocument if XML, etc.
    raw?: boolean;
 }
@@ -148,7 +143,7 @@ async function call<T>(method: string, url: string, componentId?: string, option
            });
        })) as any;
    } else {
-        resp = await ajax(url, method, data, headers, options);
+        resp = await ajax(url, method, data, headers, !!options.silentNotFound, options.raw);
    }

    const maxEntityChangeIdStr = resp.headers["trilium-max-entity-change-id"];
@@ -160,7 +155,10 @@ async function call<T>(method: string, url: string, componentId?: string, option
    return resp.body as T;
 }

-function ajax(url: string, method: string, data: unknown, headers: Headers, opts: CallOptions): Promise<Response> {
+/**
+ * @param raw if `true`, the value will be returned as a string instead of a JavaScript object if JSON, XMLDocument if XML, etc.
+ */
+function ajax(url: string, method: string, data: unknown, headers: Headers, silentNotFound: boolean, raw?: boolean): Promise<Response> {
    return new Promise((res, rej) => {
        const options: JQueryAjaxSettings = {
            url: window.glob.baseApiUrl + url,
@@ -192,9 +190,7 @@ function ajax(url: string, method: string, data: unknown, headers: Headers, opts
                    // don't report requests that are rejected by the browser, usually when the user is refreshing or going to a different page.
                    rej("rejected by browser");
                    return;
-                } else if (opts.silentNotFound && jqXhr.status === 404) {
-                    // report nothing
-                } else if (opts.silentInternalServerError && jqXhr.status === 500) {
+                } else if (silentNotFound && jqXhr.status === 404) {
                    // report nothing
                } else {
                    await reportError(method, url, jqXhr.status, jqXhr.responseText);
@@ -204,7 +200,7 @@ function ajax(url: string, method: string, data: unknown, headers: Headers, opts
            }
        };

-        if (opts.raw) {
+        if (raw) {
            options.dataType = "text";
        }

@@ -303,7 +299,6 @@ export default {
    get,
    getWithSilentNotFound,
    post,
-    postWithSilentInternalServerError,
    put,
    patch,
    remove,
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -28,7 +28,7 @@
    --bs-body-color: var(--main-text-color) !important;
    --bs-body-bg: var(--main-background-color) !important;
    --ck-mention-list-max-height: 500px;
-    --tn-modal-max-height: 90svh;
+    --tn-modal-max-height: 90vh;

    --tree-item-light-theme-max-color-lightness: 50;
    --tree-item-dark-theme-min-color-lightness: 75;
@@ -111,7 +111,6 @@ body.mobile #root-widget.virtual-keyboard-opened #mobile-bottom-bar {
 }

 #mobile-bottom-bar {
-    border-top: 1px solid var(--main-border-color);
    padding-bottom: var(--mobile-bottom-offset);
 }

@@ -153,11 +152,6 @@ textarea,
    background: var(--input-background-color);
 }

-.form-control:disabled {
-    background-color: var(--input-background-color);
-    opacity: 0.6;
-}
-
 .form-control:focus {
    color: var(--input-text-color);
    background: var(--input-background-color);
@@ -415,7 +409,6 @@ body.desktop .tabulator-popup-container,

 .dropdown-menu.static {
    box-shadow: unset;
-    backdrop-filter: unset !important;
 }

 .dropend .dropdown-toggle::after {
@@ -461,7 +454,7 @@ body.desktop .tabulator-popup-container,
    visibility: hidden;
 }

-.dropdown-menu:not(#context-menu-container) .dropdown-item,
+body.desktop .dropdown-menu:not(#context-menu-container) .dropdown-item,
 body.desktop .dropdown-menu .dropdown-toggle,
 body #context-menu-container .dropdown-item > span,
 body.mobile .dropdown .dropdown-submenu > span {
@@ -469,15 +462,6 @@ body.mobile .dropdown .dropdown-submenu > span {
    align-items: center;
 }

-
-body.mobile .dropdown .dropdown-submenu {
-    flex-wrap: wrap;
-
-    & > span {
-        flex-grow: 1;
-    }
-}
-
 .dropdown-item span.keyboard-shortcut,
 .dropdown-item *:not(.keyboard-shortcut) > kbd {
    flex-grow: 1;
@@ -947,7 +931,6 @@ table.promoted-attributes-in-tooltip th {
    color: var(--muted-text-color);
    opacity: 0.6;
    line-height: 1;
-    word-wrap: break-word;
 }

 .aa-dropdown-menu .aa-suggestion p {
@@ -1342,12 +1325,15 @@ body.desktop .dropdown-submenu > .dropdown-menu {
    max-width: 300px;
 }

-.dropdown-submenu.dropstart > .dropdown-menu,
-body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
+.dropdown-submenu.dropstart > .dropdown-menu {
    inset-inline-start: auto;
    inset-inline-end: calc(100% - 2px);
 }

+body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
+    inset-inline-start: calc(-100% + 10px);
+}
+
 .right-dropdown-widget {
    flex-shrink: 0;
 }
@@ -1544,8 +1530,7 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {

@media (max-width: 991px) {
    body.mobile #launcher-pane .dropdown.global-menu > .dropdown-menu.show,
-    body.mobile #launcher-container .dropdown > .dropdown-menu.show,
-    body.mobile .dropdown-menu.mobile-bottom-menu.show {
+    body.mobile #launcher-container .dropdown > .dropdown-menu.show {
        --dropdown-bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size));
        position: fixed !important;
        bottom: var(--dropdown-bottom) !important;
@@ -1557,16 +1542,6 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
        max-height: calc(var(--tn-modal-max-height) - var(--dropdown-bottom));
    }

-    body.mobile #launcher-container .dropdown > .dropdown-menu.show {
-        border-bottom-left-radius: 0;
-        border-bottom-right-radius: 0;
-    }
-
-    body.mobile .dropdown-menu.mobile-bottom-menu.show {
-        --dropdown-bottom: 0px;
-        padding-bottom: calc(max(var(--menu-padding-size), env(safe-area-inset-bottom))) !important;
-    }
-
    #mobile-sidebar-container {
        position: fixed;
        top: 0;
@@ -1692,15 +1667,47 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
        background: var(--main-background-color);
    }

-    body.mobile {
-        .modal-dialog {
-            margin: var(--bs-modal-margin);
-            max-width: 80%;
-        }
+    .modal-dialog {
+        margin: var(--bs-modal-margin);
+        max-width: 80%;
+    }

-        .modal-content {
-            height: 100%;
-        }
+    .modal-content {
+        height: 100%;
+    }
+}
+
+@media (max-width: 991px) {
+    body.mobile.force-fixed-tree #mobile-sidebar-wrapper {
+        padding-top: 0;
+        position: static;
+        height: 40vh;
+        width: 100vw;
+        transform: none !important;
+        background-color: var(--left-pane-background-color) !important;
+        border-bottom: 0.5px solid var(--main-border-color);
+    }
+
+    body.mobile.force-fixed-tree #mobile-sidebar-container {
+        display: none !important;
+    }
+
+    body.mobile.force-fixed-tree #mobile-sidebar-wrapper .quick-search {
+        display: none;
+    }
+
+    body.mobile.force-fixed-tree .component > button.bx-sidebar {
+        visibility: hidden;
+        padding: 0;
+        width: 6px;
+    }
+
+    body.mobile.force-fixed-tree #mobile-rest-container {
+        flex-direction: column !important;
+    }
+
+    body.mobile.force-fixed-tree #detail-container {
+        flex-grow: 1;
    }
 }

@@ -2616,14 +2623,14 @@ iframe.print-iframe {
            }
        }

-        #root-widget.virtual-keyboard-opened .note-split:not(.active) {
+        #root-widget.virtual-keyboard-opened .note-split:not(:focus-within) {
            max-height: 80px;
            opacity: 0.4;
        }
    }
 }

-.title-row {
+body.desktop .title-row {
    height: 50px;
    min-height: 50px;
    align-items: center;
--- a/apps/client/src/stylesheets/theme-next-dark.css
+++ b/apps/client/src/stylesheets/theme-next-dark.css
@@ -134,7 +134,6 @@
    --left-pane-collapsed-border-color: #0009;
    --left-pane-background-color: #1f1f1f;
    --left-pane-text-color: #aaaaaa;
-    --left-pane-icon-color: #c5c5c5;
    --left-pane-item-hover-background: #ffffff0d;
    --left-pane-item-selected-background: #ffffff25;
    --left-pane-item-selected-color: #dfdfdf;
@@ -210,7 +209,6 @@
    --badge-share-background-color: #4d4d4d;
    --badge-clipped-note-background-color: #295773;
    --badge-execute-background-color: #604180;
-    --badge-active-content-background-color: rgb(12, 68, 70);

    --note-icon-background-color: #444444;
    --note-icon-color: #d4d4d4;
@@ -239,9 +237,9 @@

    --bottom-panel-background-color: #11111180;
    --bottom-panel-title-bar-background-color: #3F3F3F80;
-
+    
    --status-bar-border-color: var(--main-border-color);
-
+    
    --scrollbar-thumb-color: #fdfdfd5c;
    --scrollbar-thumb-hover-color: #ffffff7d;
    --scrollbar-background-color: transparent;
@@ -291,15 +289,6 @@
    --ck-editor-toolbar-button-on-shadow: 1px 1px 2px rgba(0, 0, 0, .75);
    --ck-editor-toolbar-dropdown-button-open-background: #ffffff14;

-    --note-list-view-icon-color: var(--left-pane-icon-color);
-    --note-list-view-large-icon-background: var(--note-icon-background-color);
-    --note-list-view-large-icon-color: var(--note-icon-color);
-    --note-list-view-search-result-highlight-background: transparent;
-    --note-list-view-search-result-highlight-color: var(--quick-search-result-highlight-color);
-    --note-list-view-content-background: rgba(0, 0, 0, .2);
-    --note-list-view-content-search-result-highlight-background: var(--quick-search-result-highlight-color);
-    --note-list-view-content-search-result-highlight-color: black;
-
    --calendar-coll-event-background-saturation: 25%;
    --calendar-coll-event-background-lightness: 20%;
    --calendar-coll-event-background-color: #3c3c3c;
@@ -313,8 +302,7 @@
 * Dark color scheme tweaks
 */

-#left-pane .fancytree-node.tinted,
-.nested-note-list-item.use-note-color {
+#left-pane .fancytree-node.tinted {
    --custom-color: var(--dark-theme-custom-color);

    /* The background color of the active item in the note tree.
@@ -348,24 +336,12 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
    --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 13.2%, 20.8%);
 }

-.modal.tab-bar-modal .tabs .tab-card.with-hue {
-    background-color: hsl(var(--bg-hue), 8.8%, 11.2%);
-    border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
-}
-
-.modal.tab-bar-modal .tabs .tab-card.active.with-hue {
-    background-color: hsl(var(--bg-hue), 8.8%, 16.2%);
-    border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
-}
-
-
 .use-note-color {
    --custom-color: var(--dark-theme-custom-color);
 }

 .note-split.with-hue,
-.quick-edit-dialog-wrapper.with-hue,
-.nested-note-list-item.with-hue {
+.quick-edit-dialog-wrapper.with-hue {
    --note-icon-custom-background-color: hsl(var(--custom-color-hue), 15.8%, 30.9%);
    --note-icon-custom-color: hsl(var(--custom-color-hue), 100%, 76.5%);
    --note-icon-hover-custom-background-color: hsl(var(--custom-color-hue), 28.3%, 36.7%);
@@ -374,4 +350,4 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 .note-split.with-hue *::selection,
 .quick-edit-dialog-wrapper.with-hue *::selection {
    --selection-background-color: hsl(var(--custom-color-hue), 49.2%, 35%);
-}
+}
--- a/apps/client/src/stylesheets/theme-next-light.css
+++ b/apps/client/src/stylesheets/theme-next-light.css
@@ -127,7 +127,6 @@
    --left-pane-collapsed-border-color: #0000000d;
    --left-pane-background-color: #f2f2f2;
    --left-pane-text-color: #383838;
-    --left-pane-icon-color: currentColor;
    --left-pane-item-hover-background: rgba(0, 0, 0, 0.032);
    --left-pane-item-selected-background: white;
    --left-pane-item-selected-color: black;
@@ -202,7 +201,6 @@
    --badge-share-background-color: #6b6b6b;
    --badge-clipped-note-background-color: #2284c0;
    --badge-execute-background-color: #7b47af;
-    --badge-active-content-background-color: rgb(27, 164, 168);

    --note-icon-background-color: #4f4f4f;
    --note-icon-color: white;
@@ -289,15 +287,6 @@
    --ck-editor-toolbar-button-on-shadow: none;
    --ck-editor-toolbar-dropdown-button-open-background: #0000000f;

-    --note-list-view-icon-color: var(--left-pane-icon-color);
-    --note-list-view-large-icon-background: var(--note-icon-background-color);
-    --note-list-view-large-icon-color: var(--note-icon-color);
-    --note-list-view-search-result-highlight-background: transparent;
-    --note-list-view-search-result-highlight-color: var(--quick-search-result-highlight-color);
-    --note-list-view-content-background: #b1b1b133;
-    --note-list-view-content-search-result-highlight-background: var(--quick-search-result-highlight-color);
-    --note-list-view-content-search-result-highlight-color: white;
-
    --calendar-coll-event-background-lightness: 95%;
    --calendar-coll-event-background-saturation: 80%;
    --calendar-coll-event-background-color: #eaeaea;
@@ -307,8 +296,7 @@
    --calendar-coll-today-background-color: #00000006;
 }

-#left-pane .fancytree-node.tinted,
-.nested-note-list-item.use-note-color {
+#left-pane .fancytree-node.tinted {
    --custom-color: var(--light-theme-custom-color);

    /* The background color of the active item in the note tree.
@@ -323,19 +311,8 @@
    --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 40%, 88%);
 }

-.modal.tab-bar-modal .tabs .tab-card.with-hue {
-    background-color: hsl(var(--bg-hue), 56%, 96%);
-    border-color: hsl(var(--bg-hue), 33%, 41%);
-}
-
-.modal.tab-bar-modal .tabs .tab-card.active.with-hue {
-    background-color: hsl(var(--bg-hue), 86%, 96%);
-    border-color: hsl(var(--bg-hue), 33%, 41%);
-}
-
 .note-split.with-hue,
-.quick-edit-dialog-wrapper.with-hue,
-.nested-note-list-item.with-hue {
+.quick-edit-dialog-wrapper.with-hue {
    --note-icon-custom-background-color: hsl(var(--custom-color-hue), 44.5%, 43.1%);
    --note-icon-custom-color: hsl(var(--custom-color-hue), 91.3%, 91%);
    --note-icon-hover-custom-background-color: hsl(var(--custom-color-hue), 55.1%, 50.2%);
@@ -344,4 +321,4 @@
 .note-split.with-hue *::selection,
 .quick-edit-dialog-wrapper.with-hue *::selection {
    --selection-background-color: hsl(var(--custom-color-hue), 60%, 90%);
-}
+}
--- a/apps/client/src/stylesheets/theme-next/base.css
+++ b/apps/client/src/stylesheets/theme-next/base.css
@@ -800,18 +800,3 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
    background: var(--hover-item-background-color);
    color: var(--hover-item-text-color);
 }
-
-/*
- * Alert bars
- */
-
-div.alert {
-    margin-bottom: 8px;
-    background: var(--alert-bar-background) !important;
-    border-radius: 8px;
-    font-size: .85em;
-}
-
-div.alert p + p {
-    margin-block: 1em 0;
-}
--- a/apps/client/src/stylesheets/theme-next/forms.css
+++ b/apps/client/src/stylesheets/theme-next/forms.css
@@ -84,22 +84,6 @@ button.btn.btn-success kbd {
    letter-spacing: 0.5pt;
 }

-/*
- * Low profile buttons
- */
-
-button.tn-low-profile {
-    appearance: none;
-    background: transparent;
-    border: 0;
-    border-radius: 8px;
-    color: inherit;
-}
-
-button.tn-low-profile:hover {
-    background-color: var(--icon-button-hover-background);
-}
-
 /*
 * Icon buttons
 */
@@ -145,10 +129,6 @@ button.tn-low-profile:hover {
    font-size: calc(var(--icon-button-size) * var(--icon-button-icon-ratio));
 }

-:root .icon-action.disabled::before {
-    opacity: .5;
-}
-
 :root .icon-action:not(.global-menu-button):hover,
 :root .icon-action:not(.global-menu-button).show,
 :root .tn-tool-button:hover,
@@ -814,35 +794,3 @@ input[type="range"] {
        scrollbar-width: unset;
    }
 }
-
-/*
- * Centered forms
- */
-
-.tn-centered-form {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin-bottom: 20vh;
-}
-
-.tn-centered-form .form-group {
-    text-align: center;
-    color: var(--muted-text-color);
-}
-
-.tn-centered-form .form-icon {
-    font-size: 140px;
-    color: var(--main-border-color);
-}
-
-.tn-centered-form .protected-session-password {
-    margin-inline: auto;
-    max-width: 350px;
-    text-align: center;
-}
-
-.tn-centered-form .input-group,
-.tn-centered-form button {
-    margin-top: 12px;
-}
--- a/apps/client/src/stylesheets/theme-next/notes/text.css
+++ b/apps/client/src/stylesheets/theme-next/notes/text.css
@@ -47,14 +47,9 @@
 }

 /* The toolbar show / hide button for the current text block */
-:root .ck.ck-block-toolbar-button {
-    --ck-color-block-toolbar-button: var(--muted-text-color);
+.ck.ck-block-toolbar-button {
    --ck-color-button-on-background: transparent;
-    --ck-color-button-on-color: var(--ck-editor-toolbar-button-on-color);
-    translate: -40% 0;
-    min-width: 0;
-    padding: 0;
-    z-index: 1600;
+    --ck-color-button-on-color: currentColor;
 }

 :root .ck.ck-toolbar .ck-button:not(.ck-disabled):active,
@@ -522,10 +517,6 @@ button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel).ck
 * EDITOR'S CONTENT
 */

-.note-detail-editable-text-editor > .ck-placeholder {
-    opacity: .5;
-}
-
 /*
 * Code Blocks
 */
--- a/apps/client/src/stylesheets/theme-next/pages.css
+++ b/apps/client/src/stylesheets/theme-next/pages.css
@@ -57,12 +57,12 @@
    height: 18px;
 }

-/*
+/* 
 * SEARCH PAGE
 */

 /* Button bar */
- .search-definition-widget .search-setting-table .search-actions-container {
+ .search-definition-widget .search-setting-table tbody:last-child div {
    justify-content: flex-end;
    gap: 8px;
 }
@@ -143,7 +143,7 @@
 /*
 * OPTIONS PAGES
 */
-
+ 
 :root {
    --options-card-min-width: 500px;
    --options-card-max-width: 900px;
@@ -156,10 +156,6 @@
    --preferred-max-content-width: var(--options-card-max-width);
 }

-.note-split.options .collection-properties {
-    visibility: hidden;
-}
-
 /* Create a gap at the top of the option pages */
 .note-detail-content-widget-content.options>*:first-child {
    margin-top: var(--options-first-item-top-margin, 1em);
@@ -265,6 +261,13 @@ body.desktop .options-section:not(.tn-no-card) {
    margin-bottom: 6px;
 }

+.options-section .alert {
+    margin-bottom: 8px;
+    background: var(--alert-bar-background) !important;
+    border-radius: 8px;
+    font-size: .85em;
+}
+
 nav.options-section-tabs {
    min-width: var(--options-card-min-width);
    max-width: var(--options-card-max-width);
@@ -328,4 +331,4 @@ nav.options-section-tabs + .options-section {

 .etapi-options-section div {
    height: auto !important;
-}
+}
--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@@ -739,35 +739,39 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
    transform: translateX(-25%);
 }

+body.mobile .fancytree-expander::before,
+body.mobile .fancytree-title,
+body.mobile .fancytree-node > span {
+    font-size: 1rem !important;
+}
+
@media (max-width: 991px) {
    body.mobile #mobile-sidebar-container {
        background-color: rgba(0, 0, 0, 0.5);
    }

-    body.mobile #mobile-sidebar-wrapper {
+    body.mobile:not(.force-fixed-tree) #mobile-sidebar-wrapper {
        border-top-right-radius: 12px;
        border-bottom-right-radius: 12px;
        border-inline-end: 1px solid var(--subtle-border-color);
    }
 }

-#left-pane .fancytree-expander,
-.nested-note-list-item .note-expander {
+#left-pane .fancytree-expander {
    opacity: 0.65;
    transition: opacity 150ms ease-in;
 }

-#left-pane .fancytree-expander:hover,
-.nested-note-list-item .note-expander:hover {
+#left-pane .fancytree-expander:hover {
    opacity: 1;
    transition: opacity 300ms ease-out;
 }

 #left-pane .fancytree-custom-icon {
    margin-top: 0; /* Use this to align the icon with the tree view item's caption */
-    color: var(--custom-color, var(--left-pane-icon-color));
 }

+
 #left-pane span.fancytree-active .fancytree-title {
    font-weight: normal;
 }
@@ -1268,7 +1272,7 @@ body.layout-horizontal #rest-pane > .classic-toolbar-widget {
 #center-pane .note-split {
    padding-top: 2px;
    background-color: var(--note-split-background-color, var(--main-background-color));
-    transition: border-color 150ms ease-out;
+    transition: border-color 250ms ease-in;
    border: 2px solid transparent;
 }

@@ -1318,7 +1322,7 @@ body.mobile .note-title {
    margin-inline-start: 0;
 }

-body.desktop .title-row {
+.title-row {
    /* Aligns the "Create new split" button with the note menu button (the three dots button) */
    padding-inline-end: 3px;
 }
--- a/apps/client/src/stylesheets/tree.css
+++ b/apps/client/src/stylesheets/tree.css
@@ -206,7 +206,6 @@ span.fancytree-selected .fancytree-title {
 }

 span.fancytree-selected .fancytree-custom-icon::before {
-    font-family: "boxicons";
    content: "\eb43";
    border: 1px solid var(--main-border-color);
    border-radius: 3px;
--- a/apps/client/src/translations/ar/translation.json
+++ b/apps/client/src/translations/ar/translation.json
@@ -29,9 +29,7 @@
    "widget-render-error": {
      "title": "فشل عرض عنصر واجهة مستخدم React مخصص"
    },
-    "widget-missing-parent": "لا تحتوي الأداة المخصصة على خاصية إلزامية '{{property}}'.\n\nإذا كان من المفترض تشغيل هذا البرنامج النصي بدون عنصر واجهة مستخدم، فاستخدم '#run=frontendStartup' بدلاً من ذلك.",
-    "open-script-note": "فتح ملاحظة برمجية",
-    "scripting-error": "خطأ في النص البرمجي المخصص: {{title}}"
+    "widget-missing-parent": "لا تحتوي الأداة المخصصة على خاصية إلزامية '{{property}}'.\n\nإذا كان من المفترض تشغيل هذا البرنامج النصي بدون عنصر واجهة مستخدم، فاستخدم '#run=frontendStartup' بدلاً من ذلك."
  },
  "add_link": {
    "add_link": "أضافة رابط",
@@ -39,19 +37,14 @@
    "search_note": "البحث عن الملاحظة بالاسم",
    "link_title": "عنوان الرابط",
    "button_add_link": "اضافة رابط",
-    "help_on_links": "مساعدة حول الارتباطات التشعبية",
-    "link_title_mirrors": "عنوان الرابط يعكس العنوان الحالي للملاحظة",
-    "link_title_arbitrary": "يمكن تغيير عنوان الرابط حسب الرغبة"
+    "help_on_links": "مساعدة حول الارتباطات التشعبية"
  },
  "branch_prefix": {
    "edit_branch_prefix": "تعديل بادئة الفرع",
    "prefix": "البادئة: ",
    "save": "حفظ",
    "help_on_tree_prefix": "مساعدة حول بادئة الشجرة",
-    "branch_prefix_saved": "تم حفظ بادئة الفرع.",
-    "edit_branch_prefix_multiple": "تعديل البادئة لـ {{count}} من تفرعات الملاحظات",
-    "branch_prefix_saved_multiple": "تم حفظ بادئة التفرع لـ {{count}} من التفرعات.",
-    "affected_branches": "الفروع المتأثرة ({{count}}):"
+    "branch_prefix_saved": "تم حفظ بادئة الفرع."
  },
  "bulk_actions": {
    "bulk_actions": "اجراءات جماعية",
@@ -1180,6 +1173,9 @@
    "note_not_found": "الملاحظة {{noteId}} غير موجودة!",
    "cannot_match_transform": "تعذر مطابقة التحويل: {{transform}}"
  },
+  "web_view": {
+    "web_view": "عرض الويب"
+  },
  "consistency_checks": {
    "title": "فحوصات التناسق"
  },
--- a/apps/client/src/translations/cn/translation.json
+++ b/apps/client/src/translations/cn/translation.json
@@ -662,8 +662,7 @@
    "show-cheatsheet": "显示快捷帮助",
    "toggle-zen-mode": "禅模式",
    "new-version-available": "新更新可用",
-    "download-update": "取得版本 {{latestVersion}}",
-    "search_notes": "搜索笔记"
+    "download-update": "取得版本 {{latestVersion}}"
  },
  "zen_mode": {
    "button_exit": "退出禅模式"
@@ -746,7 +745,7 @@
    "button_title": "导出SVG格式图片"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "创建子笔记并添加到图",
+    "create_child_note_title": "创建新的子笔记并添加到关系图",
    "reset_pan_zoom_title": "重置平移和缩放到初始坐标和放大倍率",
    "zoom_in_title": "放大",
    "zoom_out_title": "缩小"
@@ -760,9 +759,7 @@
    "delete_this_note": "删除此笔记",
    "error_cannot_get_branch_id": "无法获取 notePath '{{notePath}}' 的 branchId",
    "error_unrecognized_command": "无法识别的命令 {{command}}",
-    "note_revisions": "笔记历史版本",
-    "backlinks": "反链",
-    "content_language_switcher": "内容语言: {{language}}"
+    "note_revisions": "笔记历史版本"
  },
  "note_icon": {
    "change_note_icon": "更改笔记图标",
@@ -913,8 +910,7 @@
    "unknown_search_option": "未知的搜索选项 {{searchOptionName}}",
    "search_note_saved": "搜索笔记已保存到 {{- notePathTitle}}",
    "actions_executed": "操作已执行。",
-    "view_options": "查看选项：",
-    "option": "选项"
+    "view_options": "查看选项："
  },
  "similar_notes": {
    "title": "相似笔记",
@@ -1008,7 +1004,7 @@
    "no_attachments": "此笔记没有附件。"
  },
  "book": {
-    "no_children_help": "此集合没有任何子笔记，因此没有内容显示。",
+    "no_children_help": "此类型为书籍的笔记没有任何子笔记，因此没有内容显示。请参阅 <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> 了解详情。",
    "drag_locked_title": "锁定编辑",
    "drag_locked_message": "无法拖拽，因为集合已被锁定编辑。"
  },
@@ -1064,6 +1060,15 @@
    "default_new_note_title": "新笔记",
    "click_on_canvas_to_place_new_note": "点击画布以放置新笔记"
  },
+  "render": {
+    "note_detail_render_help_1": "之所以显示此帮助说明，是因为这个类型为渲染 HTML 的笔记没有正常工作所需的关系。",
+    "note_detail_render_help_2": "渲染 HTML 笔记类型用于<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">编写脚本</a>。简而言之，您有一份 HTML 代码笔记（可包含一些 JavaScript），然后这个笔记会把页面渲染出来。要使其正常工作，您需要定义一个名为 \"renderNote\" 的<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">关系</a>指向要渲染的 HTML 笔记。"
+  },
+  "web_view": {
+    "web_view": "网页视图",
+    "embed_websites": "网页视图类型的笔记允许您将网站嵌入到 Trilium 中。",
+    "create_label": "首先，请创建一个带有您要嵌入的 URL 地址的标签，例如 #webViewSrc=\"https://www.bing.com\""
+  },
  "backend_log": {
    "refresh": "刷新"
  },
@@ -1412,8 +1417,7 @@
    "description": "描述",
    "reload_app": "重载应用以应用更改",
    "set_all_to_default": "将所有快捷键重置为默认值",
-    "confirm_reset": "您确定要将所有键盘快捷键重置为默认值吗？",
-    "no_results": "未找到与“{{filter}}”匹配的快捷方式"
+    "confirm_reset": "您确定要将所有键盘快捷键重置为默认值吗？"
  },
  "spellcheck": {
    "title": "拼写检查",
@@ -1614,9 +1618,7 @@
    "print_report_title": "打印报告",
    "print_report_collection_content_other": "集合中的 {{count}} 篇笔记无法打印，因为它们不受支持或受到保护。",
    "print_report_collection_details_button": "查看详情",
-    "print_report_collection_details_ignored_notes": "忽略的笔记",
-    "print_report_error_title": "打印失败",
-    "print_report_stack_trace": "堆栈跟踪"
+    "print_report_collection_details_ignored_notes": "忽略的笔记"
  },
  "note_title": {
    "placeholder": "请输入笔记标题...",
@@ -1780,8 +1782,8 @@
    "desktop-application": "桌面应用程序",
    "native-title-bar": "原生标题栏",
    "native-title-bar-description": "对于 Windows 和 macOS，关闭原生标题栏可使应用程序看起来更紧凑。在 Linux 上，保留原生标题栏可以更好地与系统集成。",
-    "background-effects": "启用背景效果",
-    "background-effects-description": "为应用窗口添加模糊且时尚的背景，营造出深度感和现代外观。「原生标题栏」必須被禁用。",
+    "background-effects": "启用背景效果（仅适用于 Windows 11）",
+    "background-effects-description": "Mica 效果为应用窗口添加模糊且时尚的背景，营造出深度感和现代外观。「原生标题栏」必須被禁用。",
    "restart-app-button": "重启应用程序以查看更改",
    "zoom-factor": "缩放系数"
  },
@@ -1800,8 +1802,7 @@
  "geo-map": {
    "create-child-note-title": "创建一个新的子笔记并将其添加到地图中",
    "create-child-note-instruction": "单击地图以在该位置创建新笔记，或按 Escape 以取消。",
-    "unable-to-load-map": "无法加载地图。",
-    "create-child-note-text": "添加标记"
+    "unable-to-load-map": "无法加载地图。"
  },
  "geo-map-context": {
    "open-location": "打开位置",
@@ -2069,8 +2070,7 @@
    "raster": "栅格",
    "vector_light": "矢量（浅色）",
    "vector_dark": "矢量（深色）",
-    "show-scale": "显示比例尺",
-    "show-labels": "显示标记名称"
+    "show-scale": "显示比例尺"
  },
  "table_context_menu": {
    "delete_row": "删除行"
@@ -2117,7 +2117,7 @@
  },
  "call_to_action": {
    "background_effects_title": "背景效果现已推出稳定版本",
-    "background_effects_message": "在 Windows 和 macOS 设备上，背景效果现在已稳定。背景效果通过模糊背后的背景，为使用者界面增添一抹色彩。",
+    "background_effects_message": "在 Windows 装置上，背景效果现在已完全稳定。背景效果通过模糊背后的背景，为使用者界面增添一抹色彩。此技术也用于其他应用程序，例如 Windows 资源管理器。",
    "background_effects_button": "启用背景效果",
    "next_theme_title": "试用新 Trilium 主题",
    "next_theme_message": "当前使用旧版主题，要试用新主题吗？",
@@ -2149,6 +2149,7 @@
    "app-restart-required": "（需重启程序以应用更改）"
  },
  "pagination": {
+    "page_title": "第 {{startIndex}} 页 - 第 {{endIndex}} 页",
    "total_notes": "{{count}} 篇笔记"
  },
  "collections": {
@@ -2252,59 +2253,5 @@
    "pages_alt": "第{{pageNumber}}页",
    "pages_loading": "加载中...",
    "layers_other": "{{count}} 层"
-  },
-  "platform_indicator": {
-    "available_on": "在 {{platform}} 上可用"
-  },
-  "mobile_tab_switcher": {
-    "title_other": "{{count}} 选项卡",
-    "more_options": "更多选项"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "书签"
-  },
-  "web_view_setup": {
-    "title": "直接在 Trilium 中创建网页的实时视图",
-    "url_placeholder": "输入或粘贴网站地址，例如 https://triliumnotes.org",
-    "create_button": "创建网页视图",
-    "invalid_url_title": "无效的地址",
-    "invalid_url_message": "请输入有效的网址，例如 https://triliumnotes.org。",
-    "disabled_description": "此网页视图来自外部来源。为保护您免受网络钓鱼或恶意内容侵害，该视图不会自动加载。若您信任该来源，可手动启用加载功能。",
-    "disabled_button_enable": "启用网页视图"
-  },
-  "render": {
-    "setup_title": "在此笔记中显示自定义 HTML 或 Preact JSX",
-    "setup_create_sample_preact": "使用 Preact 建立范例笔记",
-    "setup_create_sample_html": "使用 HTML 建立范例笔记",
-    "setup_sample_created": "已建立一个范例笔记作为子笔记。",
-    "disabled_description": "此渲染笔记来自外部来源。为保护您免受恶意内容侵害，该功能默认处于禁用状态。启用前请确保您信任该来源。",
-    "disabled_button_enable": "启用渲染笔记"
-  },
-  "active_content_badges": {
-    "type_icon_pack": "图标包",
-    "type_backend_script": "后端脚本",
-    "type_frontend_script": "前端脚本",
-    "type_widget": "小部件",
-    "type_app_css": "自定义 CSS",
-    "type_render_note": "渲染笔记",
-    "type_web_view": "网页视图",
-    "type_app_theme": "自定义主题",
-    "toggle_tooltip_enable_tooltip": "点击以启用此 {{type}}。",
-    "toggle_tooltip_disable_tooltip": "点击以禁用此 {{type}}。",
-    "menu_docs": "打开文档",
-    "menu_execute_now": "立即执行脚本",
-    "menu_run": "自动执行",
-    "menu_run_disabled": "手动",
-    "menu_run_backend_startup": "当后端启动时",
-    "menu_run_hourly": "每小时",
-    "menu_run_daily": "每日",
-    "menu_run_frontend_startup": "当桌面前端启动时",
-    "menu_run_mobile_startup": "当移动前端启动时",
-    "menu_change_to_widget": "更改为小部件",
-    "menu_change_to_frontend_script": "更改为前端脚本",
-    "menu_theme_base": "主题基底"
-  },
-  "setup_form": {
-    "more_info": "了解更多"
  }
 }
--- a/apps/client/src/translations/de/translation.json
+++ b/apps/client/src/translations/de/translation.json
@@ -1,6 +1,6 @@
 {
  "about": {
-    "title": "Über Trilium Notes",
+    "title": "Über Trilium Notizen",
    "homepage": "Startseite:",
    "app_version": "App-Version:",
    "db_version": "DB-Version:",
@@ -662,8 +662,7 @@
    "show-cheatsheet": "Cheatsheet anzeigen",
    "toggle-zen-mode": "Zen Modus",
    "new-version-available": "Neues Update verfügbar",
-    "download-update": "Version {{latestVersion}} herunterladen",
-    "search_notes": "Notizen durchsuchen"
+    "download-update": "Version {{latestVersion}} herunterladen"
  },
  "sync_status": {
    "unknown": "<p>Der Synchronisations-Status wird bekannt, sobald der nächste Synchronisierungsversuch gestartet wird.</p><p>Klicke, um eine Synchronisierung jetzt auszulösen.</p>",
@@ -743,7 +742,7 @@
    "button_title": "Diagramm als SVG exportieren"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Erstelle eine untergeordnete Notiz und füge sie dieser Karte hinzu",
+    "create_child_note_title": "Erstelle eine neue untergeordnete Notiz und füge sie dieser Beziehungskarte hinzu",
    "reset_pan_zoom_title": "Schwenken und Zoomen auf die ursprünglichen Koordinaten und Vergrößerung zurücksetzen",
    "zoom_in_title": "Hineinzoom",
    "zoom_out_title": "Herauszoomen"
@@ -758,9 +757,7 @@
    "delete_this_note": "Diese Notiz löschen",
    "error_cannot_get_branch_id": "BranchId für notePath „{{notePath}}“ kann nicht abgerufen werden",
    "error_unrecognized_command": "Unbekannter Befehl {{command}}",
-    "note_revisions": "Notiz Revisionen",
-    "backlinks": "Rücklinks",
-    "content_language_switcher": "Inhaltssprache: {{language}}"
+    "note_revisions": "Notiz Revisionen"
  },
  "note_icon": {
    "change_note_icon": "Notiz-Icon ändern",
@@ -912,8 +909,7 @@
    "unknown_search_option": "Unbekannte Suchoption {{searchOptionName}}",
    "search_note_saved": "Suchnotiz wurde in {{-notePathTitle}} gespeichert",
    "actions_executed": "Aktionen wurden ausgeführt.",
-    "view_options": "Optionen anzeigen:",
-    "option": "Option"
+    "view_options": "Optionen anzeigen:"
  },
  "similar_notes": {
    "title": "Ähnliche Notizen",
@@ -1007,7 +1003,7 @@
    "no_attachments": "Diese Notiz enthält keine Anhänge."
  },
  "book": {
-    "no_children_help": "Diese Sammlung enthält keineUnternotizen, daher gibt es nichts anzuzeigen.",
+    "no_children_help": "Diese Notiz mit dem Notiztyp Buch besitzt keine Unternotizen, deshalb ist nichts zum Anzeigen vorhanden. Siehe <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">Wiki</a> für mehr Details.",
    "drag_locked_title": "Für Bearbeitung gesperrt",
    "drag_locked_message": "Das Ziehen ist nicht möglich, da die Sammlung für die Bearbeitung gesperrt ist."
  },
@@ -1063,6 +1059,15 @@
    "default_new_note_title": "neue Notiz",
    "click_on_canvas_to_place_new_note": "Klicke auf den Canvas, um eine neue Notiz zu platzieren"
  },
+  "render": {
+    "note_detail_render_help_1": "Diese Hilfesnotiz wird angezeigt, da diese Notiz vom Typ „HTML rendern“ nicht über die erforderliche Beziehung verfügt, um ordnungsgemäß zu funktionieren.",
+    "note_detail_render_help_2": "Render-HTML-Notiztyp wird benutzt für <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. Kurzgesagt, du hast ein HTML-Code-Notiz (optional mit JavaScript) und diese Notiz rendert es. Damit es funktioniert, musst du eine a <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">Beziehung</a> namens \"renderNote\" zeigend auf die HTML-Notiz zum rendern definieren."
+  },
+  "web_view": {
+    "web_view": "Webansicht",
+    "embed_websites": "Notiz vom Typ Web View ermöglicht das Einbetten von Websites in Trilium.",
+    "create_label": "Um zu beginnen, erstelle bitte ein Label mit einer URL-Adresse, die eingebettet werden soll, z. B. #webViewSrc=\"https://www.google.com\""
+  },
  "backend_log": {
    "refresh": "Aktualisieren"
  },
@@ -1378,8 +1383,7 @@
    "description": "Beschreibung",
    "reload_app": "Lade die App neu, um die Änderungen zu übernehmen",
    "set_all_to_default": "Setze alle Verknüpfungen auf die Standardeinstellungen",
-    "confirm_reset": "Möchtest du wirklich alle Tastaturkürzel auf die Standardeinstellungen zurücksetzen?",
-    "no_results": "Keine Tastenkürzel für '{{filter}}' gefunden"
+    "confirm_reset": "Möchtest du wirklich alle Tastaturkürzel auf die Standardeinstellungen zurücksetzen?"
  },
  "spellcheck": {
    "title": "Rechtschreibprüfung",
@@ -1583,9 +1587,7 @@
    "print_report_collection_details_button": "Details anzeigen",
    "print_report_collection_details_ignored_notes": "Ignorierte Notizen",
    "print_report_collection_content_one": "{{count}} Notiz in der Sammlung konnte nicht gedruckt werden, weil sie nicht unterstützt oder geschützt ist.",
-    "print_report_collection_content_other": "{{count}} Notizen in der Sammlung konnten nicht gedruckt werden, weil sie nicht unterstützt oder geschützt sind.",
-    "print_report_error_title": "Druck fehlgeschlagen",
-    "print_report_stack_trace": "Stapelzurückverfolgung"
+    "print_report_collection_content_other": "{{count}} Notizen in der Sammlung konnten nicht gedruckt werden, weil sie nicht unterstützt oder geschützt sind."
  },
  "note_title": {
    "placeholder": "Titel der Notiz hier eingeben…",
@@ -1769,8 +1771,7 @@
  "geo-map": {
    "create-child-note-title": "Neue Unternotiz anlegen und zur Karte hinzufügen",
    "create-child-note-instruction": "Auf die Karte klicken, um eine neue Notiz an der Stelle zu erstellen oder Escape drücken um abzubrechen.",
-    "unable-to-load-map": "Karte konnte nicht geladen werden.",
-    "create-child-note-text": "Marker hinzufügen"
+    "unable-to-load-map": "Karte konnte nicht geladen werden."
  },
  "geo-map-context": {
    "open-location": "Ort öffnen",
@@ -2086,8 +2087,7 @@
    "raster": "Raster",
    "vector_light": "Vektor (Hell)",
    "vector_dark": "Vektor (Dunkel)",
-    "show-scale": "Zeige Skalierung",
-    "show-labels": "Zeige Markierungsnamen"
+    "show-scale": "Zeige Skalierung"
  },
  "table_context_menu": {
    "delete_row": "Zeile entfernen"
@@ -2154,6 +2154,7 @@
    "percentage": "%"
  },
  "pagination": {
+    "page_title": "Seite {{startIndex}} von {{endIndex}}",
    "total_notes": "{{count}} Notizen"
  },
  "collections": {
@@ -2269,57 +2270,5 @@
  },
  "platform_indicator": {
    "available_on": "Verfügbar auf {{platform}}"
-  },
-  "mobile_tab_switcher": {
-    "title_one": "{{count}} Tab",
-    "title_other": "{{count}} Tabs",
-    "more_options": "Weitere Optionen"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "Lesezeichen"
-  },
-  "web_view_setup": {
-    "title": "Erstelle eine Live-Ansicht einer Webseite direkt in Trilium",
-    "url_placeholder": "Gib oder füge die Adresse der Webseite ein, zum Beispiel https://triliumnotes.org",
-    "create_button": "Erstelle Web Ansicht",
-    "invalid_url_title": "Ungültige Adresse",
-    "invalid_url_message": "Füge eine valide Webadresse ein, zum Beispiel https://triliumnotes.org.",
-    "disabled_description": "Diese Webansicht wurde von einer externen Quelle importiert. Um Sie vor Phishing oder schädlichen Inhalten zu schützen, wird sie nicht automatisch geladen. Sie können sie aktivieren, wenn Sie der Quelle vertrauen.",
-    "disabled_button_enable": "Webansicht aktivieren"
-  },
-  "render": {
-    "setup_create_sample_html": "Eine Beispielnotiz mit HTML erstellen",
-    "setup_create_sample_preact": "Eine Beispielnotiz mit Preact erstellen",
-    "setup_title": "Benutzerdefiniertes HTML oder Preact JSX in dieser Notiz anzeigen",
-    "setup_sample_created": "Eine Beispielnotiz wurde als untergeordnete Notiz erstellt.",
-    "disabled_description": "Diese Rendering-Notizen stammen aus einer externen Quelle. Um Sie vor schädlichen Inhalten zu schützen, ist diese Funktion standardmäßig deaktiviert. Stellen Sie sicher, dass Sie der Quelle vertrauen, bevor Sie sie aktivieren.",
-    "disabled_button_enable": "Rendering-Notiz aktivieren"
-  },
-  "active_content_badges": {
-    "type_icon_pack": "Icon-Paket",
-    "type_backend_script": "Backend-Skript",
-    "type_frontend_script": "Frontend-Skript",
-    "type_widget": "Widget",
-    "type_app_css": "Benutzerdefiniertes CSS",
-    "type_render_note": "Rendering-Notiz",
-    "type_web_view": "Webansicht",
-    "type_app_theme": "Benutzerdefiniertes Thema",
-    "toggle_tooltip_enable_tooltip": "Klicken, um diesen {{type}} zu aktivieren.",
-    "toggle_tooltip_disable_tooltip": "Klicken, um diesen {{type}} zu deaktivieren.",
-    "menu_docs": "Dokumentation öffnen",
-    "menu_execute_now": "Skript jetzt ausführen",
-    "menu_run": "Automatisch ausführen",
-    "menu_run_disabled": "Manuell",
-    "menu_run_backend_startup": "Wenn das Backend startet",
-    "menu_run_hourly": "Stündlich",
-    "menu_run_daily": "Täglich",
-    "menu_run_frontend_startup": "Wenn das Desktop-Frontend startet",
-    "menu_run_mobile_startup": "Wenn das mobile Frontend startet",
-    "menu_change_to_widget": "Zum Widget wechseln",
-    "menu_change_to_frontend_script": "Zum Frontend-Skript wechseln",
-    "menu_theme_base": "Themenbasis"
-  },
-  "setup_form": {
-    "more_info": "Mehr erfahren"
  }
 }
--- a/apps/client/src/translations/el/translation.json
+++ b/apps/client/src/translations/el/translation.json
@@ -13,61 +13,6 @@
    "critical-error": {
      "title": "Κρίσιμο σφάλμα",
      "message": "Συνέβη κάποιο κρίσιμο σφάλμα, το οποίο δεν επιτρέπει στην εφαρμογή χρήστη να ξεκινήσει:\n\n{{message}}\n\nΤο πιθανότερο είναι να προκλήθηκε από κάποιο script που απέτυχε απρόοπτα. Δοκιμάστε να ξεκινήσετε την εφαρμογή σε ασφαλή λειτουργία για να λύσετε το πρόβλημα."
-    },
-    "widget-error": {
-      "title": "Δεν ήταν δυνατή η αρχικοποίηση του widget",
-      "message-custom": "Προσαρμοσμένο widget της σημείωσης με ID \"{{id}}\", με τίτλο \"{{title}}\", δεν ήταν δυνατό να αρχικοποιηθεί λόγω:\n\n{{message}}",
-      "message-unknown": "Άγνωστο widget δεν ήταν δυνατό να αρχικοποιηθεί λόγω:\n\n{{message}}"
-    },
-    "bundle-error": {
-      "title": "Δεν ήταν δυνατή η φόρτωση προσαρμοσμένου script",
-      "message": "Το script δεν ήταν δυνατό να εκτελεστεί λόγω:\n\n{{message}}"
-    },
-    "widget-list-error": {
-      "title": "Δεν ήταν δυνατή η λήψη της λίστας των widgets από τον server"
-    },
-    "widget-render-error": {
-      "title": "Δεν ήταν δυνατή η απόδοση προσαρμοσμένου React widget"
-    },
-    "widget-missing-parent": "Το προσαρμοσμένο widget δεν έχει ορισμένη την υποχρεωτική ιδιότητα '{{property}}'.\n\nΕάν το script προορίζεται για εκτέλεση χωρίς UI element, χρησιμοποιήστε '#run=frontendStartup' αντί για αυτό.",
-    "open-script-note": "Άνοιγμα σημείωσης script",
-    "scripting-error": "Σφάλμα προσαρμοσμένου script: {{title}}"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "Σελιδοδείκτες"
-  },
-  "add_link": {
-    "add_link": "Προσθήκη συνδέσμου",
-    "help_on_links": "Βοήθεια για συνδέσμους",
-    "note": "Σημείωση",
-    "search_note": "Αναζήτηση σημείωσης με βάση το όνομά της",
-    "link_title_mirrors": "Ο τίτλος του συνδέσμου αντικατοπτρίζει τον τρέχοντα τίτλο της σημείωσης",
-    "link_title_arbitrary": "Ο τίτλος του συνδέσμου μπορεί να τροποποιηθεί ελεύθερα",
-    "link_title": "Τίτλος συνδέσμου",
-    "button_add_link": "Προσθήκη συνδέσμου"
-  },
-  "branch_prefix": {
-    "edit_branch_prefix": "Επεξεργασία προθέματος κλάδου",
-    "edit_branch_prefix_multiple": "Επεξεργασία προθέματος κλάδου για {{count}} κλάδους",
-    "help_on_tree_prefix": "Βοήθεια για πρόθεμα δέντρου",
-    "prefix": "Πρόθεμα: ",
-    "save": "Αποθήκευση",
-    "branch_prefix_saved": "Το πρόθεμα κλάδου αποθηκεύτηκε.",
-    "branch_prefix_saved_multiple": "Το πρόθεμα κλάδου αποθηκεύτηκε για {{count}} κλάδους.",
-    "affected_branches": "Επηρεαζόμενοι κλάδοι ({{count}}):"
-  },
-  "bulk_actions": {
-    "bulk_actions": "Μαζικές ενέργειες",
-    "affected_notes": "Επηρεαζόμενες σημειώσεις",
-    "include_descendants": "Συμπερίληψη απογόνων των επιλεγμένων σημειώσεων",
-    "available_actions": "Διαθέσιμες ενέργειες",
-    "chosen_actions": "Επιλεγμένες ενέργειες",
-    "execute_bulk_actions": "Εκτέλεση μαζικών ενεργειών",
-    "bulk_actions_executed": "Οι μαζικές ενέργειες εκτελέστηκαν επιτυχώς.",
-    "none_yet": "Καμία ακόμη… προσθέστε μια ενέργεια επιλέγοντας μία από τις διαθέσιμες παραπάνω.",
-    "labels": "Ετικέτες",
-    "relations": "Συσχετίσεις",
-    "notes": "Σημειώσεις",
-    "other": "Λοιπά"
+    }
  }
 }
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@ -662,8 +662,7 @@
    "show-cheatsheet": "Show Cheatsheet",
    "toggle-zen-mode": "Zen Mode",
    "new-version-available": "New Update Available",
-    "download-update": "Get Version {{latestVersion}}",
-    "search_notes": "Search notes"
+    "download-update": "Get Version {{latestVersion}}"
  },
  "zen_mode": {
    "button_exit": "Exit Zen Mode"
@@ -746,7 +745,7 @@
    "button_title": "Export diagram as SVG"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Create child note and add it to map",
+    "create_child_note_title": "Create new child note and add it into this relation map",
    "reset_pan_zoom_title": "Reset pan & zoom to initial coordinates and magnification",
    "zoom_in_title": "Zoom In",
    "zoom_out_title": "Zoom Out"
@@ -761,9 +760,7 @@
    "delete_this_note": "Delete this note",
    "note_revisions": "Note revisions",
    "error_cannot_get_branch_id": "Cannot get branchId for notePath '{{notePath}}'",
-    "error_unrecognized_command": "Unrecognized command {{command}}",
-    "backlinks": "Backlinks",
-    "content_language_switcher": "Content language: {{language}}"
+    "error_unrecognized_command": "Unrecognized command {{command}}"
  },
  "note_icon": {
    "change_note_icon": "Change note icon",
@@ -908,7 +905,6 @@
    "debug": "debug",
    "debug_description": "Debug will print extra debugging information into the console to aid in debugging complex queries",
    "action": "action",
-    "option": "option",
    "search_button": "Search",
    "search_execute": "Search & Execute actions",
    "save_to_note": "Save to note",
@@ -1010,7 +1006,7 @@
    "no_attachments": "This note has no attachments."
  },
  "book": {
-    "no_children_help": "This collection doesn't have any child notes so there's nothing to display.",
+    "no_children_help": "This collection doesn't have any child notes so there's nothing to display. See <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> for details.",
    "drag_locked_title": "Locked for editing",
    "drag_locked_message": "Dragging not allowed since the collection is locked for editing."
  },
@@ -1067,21 +1063,13 @@
    "click_on_canvas_to_place_new_note": "Click on canvas to place new note"
  },
  "render": {
-    "setup_title": "Display custom HTML or Preact JSX inside this note",
-    "setup_create_sample_preact": "Create sample note with Preact",
-    "setup_create_sample_html": "Create sample note with HTML",
-    "setup_sample_created": "A sample note was created as a child note.",
-    "disabled_description": "This render notes comes from an external source. To protect you from malicious content, it is not enabled by default. Make sure you trust the source before enabling it.",
-    "disabled_button_enable": "Enable render note"
+    "note_detail_render_help_1": "This help note is shown because this note of type Render HTML doesn't have required relation to function properly.",
+    "note_detail_render_help_2": "Render HTML note type is used for <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. In short, you have a HTML code note (optionally with some JavaScript) and this note will render it. To make it work, you need to define a <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relation</a> called \"renderNote\" pointing to the HTML note to render."
  },
-  "web_view_setup": {
-    "title": "Create a live view of a webpage directly into Trilium",
-    "url_placeholder": "Enter or paste the website address, for example https://triliumnotes.org",
-    "create_button": "Create Web View",
-    "invalid_url_title": "Invalid address",
-    "invalid_url_message": "Insert a valid web address, for example https://triliumnotes.org.",
-    "disabled_description": "This web view was imported from an external source. To help protect you from phishing or malicious content, it isn’t loading automatically. You can enable it if you trust the source.",
-    "disabled_button_enable": "Enable web view"
+  "web_view": {
+    "web_view": "Web View",
+    "embed_websites": "Note of type Web View allows you to embed websites into Trilium.",
+    "create_label": "To start, please create a label with a URL address you want to embed, e.g. #webViewSrc=\"https://www.google.com\""
  },
  "backend_log": {
    "refresh": "Refresh"
@@ -1597,8 +1585,7 @@
    "description": "Description",
    "reload_app": "Reload app to apply changes",
    "set_all_to_default": "Set all shortcuts to the default",
-    "confirm_reset": "Do you really want to reset all keyboard shortcuts to the default?",
-    "no_results": "No shortcuts found matching '{{filter}}'"
+    "confirm_reset": "Do you really want to reset all keyboard shortcuts to the default?"
  },
  "spellcheck": {
    "title": "Spell Check",
@@ -1804,8 +1791,6 @@
    "printing": "Printing in progress...",
    "printing_pdf": "Exporting to PDF in progress...",
    "print_report_title": "Print report",
-    "print_report_error_title": "Failed to print",
-    "print_report_stack_trace": "Stack trace",
    "print_report_collection_content_one": "{{count}} note in the collection could not be printed because they are not supported or they are protected.",
    "print_report_collection_content_other": "{{count}} notes in the collection could not be printed because they are not supported or they are protected.",
    "print_report_collection_details_button": "See details",
@@ -2110,8 +2095,7 @@
    "raster": "Raster",
    "vector_light": "Vector (Light)",
    "vector_dark": "Vector (Dark)",
-    "show-scale": "Show scale",
-    "show-labels": "Show marker names"
+    "show-scale": "Show scale"
  },
  "table_context_menu": {
    "delete_row": "Delete row"
@@ -2190,9 +2174,8 @@
    "percentage": "%"
  },
  "pagination": {
-    "total_notes": "{{count}} notes",
-    "prev_page": "Previous page",
-    "next_page": "Next page"
+    "page_title": "Page of {{startIndex}} - {{endIndex}}",
+    "total_notes": "{{count}} notes"
  },
  "collections": {
    "rendering_error": "Unable to show content due to an error."
@@ -2293,35 +2276,5 @@
    "title_one": "{{count}} tab",
    "title_other": "{{count}} tabs",
    "more_options": "More options"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "Bookmarks"
-  },
-  "active_content_badges": {
-    "type_icon_pack": "Icon pack",
-    "type_backend_script": "Backend script",
-    "type_frontend_script": "Frontend script",
-    "type_widget": "Widget",
-    "type_app_css": "Custom CSS",
-    "type_render_note": "Render note",
-    "type_web_view": "Web view",
-    "type_app_theme": "Custom theme",
-    "toggle_tooltip_enable_tooltip": "Click to enable this {{type}}.",
-    "toggle_tooltip_disable_tooltip": "Click to disable this {{type}}.",
-    "menu_docs": "Open documentation",
-    "menu_execute_now": "Execute script now",
-    "menu_run": "Run automatically",
-    "menu_run_disabled": "Manually",
-    "menu_run_backend_startup": "When the backend starts up",
-    "menu_run_hourly": "Hourly",
-    "menu_run_daily": "Daily",
-    "menu_run_frontend_startup": "When the desktop frontend starts up",
-    "menu_run_mobile_startup": "When the mobile frontend starts up",
-    "menu_change_to_widget": "Change to widget",
-    "menu_change_to_frontend_script": "Change to frontend script",
-    "menu_theme_base": "Theme base"
-  },
-  "setup_form": {
-    "more_info": "Learn more"
  }
 }
--- a/apps/client/src/translations/es/translation.json
+++ b/apps/client/src/translations/es/translation.json
@@ -662,8 +662,7 @@
    "show-cheatsheet": "Mostrar hoja de trucos",
    "toggle-zen-mode": "Modo Zen",
    "new-version-available": "Nueva actualización disponible",
-    "download-update": "Obtener versión {{latestVersion}}",
-    "search_notes": "Buscar notas"
+    "download-update": "Obtener versión {{latestVersion}}"
  },
  "zen_mode": {
    "button_exit": "Salir del modo Zen"
@@ -746,7 +745,7 @@
    "button_title": "Exportar diagrama como SVG"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Crear una subnota y agregarla al mapa",
+    "create_child_note_title": "Crear una nueva subnota y agregarla a este mapa de relaciones",
    "reset_pan_zoom_title": "Restablecer la panorámica y el zoom a las coordenadas y ampliación iniciales",
    "zoom_in_title": "Acercar",
    "zoom_out_title": "Alejar"
@@ -755,16 +754,14 @@
    "relation": "relación",
    "backlink_one": "{{count}} Vínculo de retroceso",
    "backlink_many": "{{count}} Vínculos de retroceso",
-    "backlink_other": "{{count}} Vínculos de retroceso"
+    "backlink_other": "{{count}} vínculos de retroceso"
  },
  "mobile_detail_menu": {
    "insert_child_note": "Insertar subnota",
    "delete_this_note": "Eliminar esta nota",
    "error_cannot_get_branch_id": "No se puede obtener el branchID del notePath '{{notePath}}'",
    "error_unrecognized_command": "Comando no reconocido {{command}}",
-    "note_revisions": "Revisiones de notas",
-    "backlinks": "Vínculos de retroceso",
-    "content_language_switcher": "Idioma de contenido: {{language}}"
+    "note_revisions": "Revisiones de notas"
  },
  "note_icon": {
    "change_note_icon": "Cambiar icono de nota",
@@ -917,8 +914,7 @@
    "unknown_search_option": "Opción de búsqueda desconocida {{searchOptionName}}",
    "search_note_saved": "La nota de búsqueda se ha guardado en {{- notePathTitle}}",
    "actions_executed": "Las acciones han sido ejecutadas.",
-    "view_options": "Ver opciones:",
-    "option": "opción"
+    "view_options": "Ver opciones:"
  },
  "similar_notes": {
    "title": "Notas similares",
@@ -1068,6 +1064,15 @@
    "default_new_note_title": "nueva nota",
    "click_on_canvas_to_place_new_note": "Haga clic en el lienzo para colocar una nueva nota"
  },
+  "render": {
+    "note_detail_render_help_1": "Esta nota de ayuda se muestra porque esta nota de tipo Renderizar HTML no tiene la relación requerida para funcionar correctamente.",
+    "note_detail_render_help_2": "El tipo de nota Render HTML es usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. De forma resumida, tiene una nota con código HTML (opcionalmente con algo de JavaScript) y esta nota la renderizará. Para que funcione, es necesario definir una <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relación</a> llamada \"renderNote\" apuntando a la nota HTML nota a renderizar."
+  },
+  "web_view": {
+    "web_view": "Vista web",
+    "embed_websites": "La nota de tipo Web View le permite insertar sitios web en Trilium.",
+    "create_label": "Para comenzar, por favor cree una etiqueta con una dirección URL que desee empotrar, e.g. #webViewSrc=\"https://www.google.com\""
+  },
  "backend_log": {
    "refresh": "Refrescar"
  },
@@ -1568,8 +1573,7 @@
    "description": "Descripción",
    "reload_app": "Vuelva a cargar la aplicación para aplicar los cambios",
    "set_all_to_default": "Establecer todos los accesos directos al valor predeterminado",
-    "confirm_reset": "¿Realmente desea restablecer todos los atajos de teclado a sus valores predeterminados?",
-    "no_results": "No se encontraron atajos que coincidan con '{{filter}} '"
+    "confirm_reset": "¿Realmente desea restablecer todos los atajos de teclado a sus valores predeterminados?"
  },
  "spellcheck": {
    "title": "Revisión ortográfica",
@@ -1776,9 +1780,7 @@
    "print_report_collection_content_other": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas.",
    "print_report_title": "Imprimir informe",
    "print_report_collection_details_button": "Ver detalles",
-    "print_report_collection_details_ignored_notes": "Notas ignoradas",
-    "print_report_stack_trace": "Rastreo de pila",
-    "print_report_error_title": "Fallo al imprimir"
+    "print_report_collection_details_ignored_notes": "Notas ignoradas"
  },
  "note_title": {
    "placeholder": "escriba el título de la nota aquí...",
@@ -2158,7 +2160,8 @@
    "percentage": "%"
  },
  "pagination": {
-    "total_notes": "{{count}} notas"
+    "total_notes": "{{count}} notas",
+    "page_title": "Página de {{startIndex}} - {{endIndex}}"
  },
  "presentation_view": {
    "edit-slide": "Editar este slide",
@@ -2282,58 +2285,5 @@
  },
  "platform_indicator": {
    "available_on": "Disponible en {{platform}}"
-  },
-  "mobile_tab_switcher": {
-    "title_one": "{{count}} pestaña",
-    "title_many": "{{count}} pestañas",
-    "title_other": "{{count}} pestañas",
-    "more_options": "Más opciones"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "Marcadores"
-  },
-  "web_view_setup": {
-    "title": "Crear una vista en vivo de una página web directamente en Trilium",
-    "url_placeholder": "Ingresar o pegar la dirección del sitio web, por ejemplo https://triliumnotes.org",
-    "create_button": "Crear Vista Web",
-    "invalid_url_title": "Dirección inválida",
-    "invalid_url_message": "Ingrese una dirección web válida, por ejemplo https://triliumnotes.org.",
-    "disabled_description": "Esta vista web fue importada de una fuente externa. Para ayudarlo a protegerse del phishing o el contenido malicioso, no se está cargando automáticamente. Puede activarlo si confía en la fuente.",
-    "disabled_button_enable": "Habilita vista web"
-  },
-  "render": {
-    "setup_title": "Mostrar HTML personalizado o Preact JSX dentro de esta nota",
-    "setup_create_sample_preact": "Crear nota de muestra con Preact",
-    "setup_create_sample_html": "Crear nota de muestra con HTML",
-    "setup_sample_created": "Se creó una nota de muestra como subnota.",
-    "disabled_description": "Esta nota de renderización proviene de una fuente externa. Para protegerlo de contenido malicioso, no está habilitado por defecto. Asegúrese de confiar en la fuente antes de habilitarla.",
-    "disabled_button_enable": "Habilitar nota de renderización"
-  },
-  "active_content_badges": {
-    "type_icon_pack": "Paquete de iconos",
-    "type_backend_script": "Script de backend",
-    "type_frontend_script": "Script de frontend",
-    "type_widget": "Widget",
-    "type_app_css": "CSS personalizado",
-    "type_render_note": "Nota de renderización",
-    "type_web_view": "Vista web",
-    "type_app_theme": "Tema personalizado",
-    "toggle_tooltip_enable_tooltip": "Haga clic para habilitar este {{type}}.",
-    "toggle_tooltip_disable_tooltip": "Haga clic para deshabilitar este {{type}}.",
-    "menu_docs": "Abrir documentación",
-    "menu_execute_now": "Ejecutar script ahora",
-    "menu_run": "Ejecutar automáticamente",
-    "menu_run_disabled": "Manualmente",
-    "menu_run_backend_startup": "Cuando el backend inicia",
-    "menu_run_hourly": "Cada hora",
-    "menu_run_daily": "Diariamente",
-    "menu_run_frontend_startup": "Cuando el frontend de escritorio inicia",
-    "menu_run_mobile_startup": "Cuando el frontend móvil inicia",
-    "menu_change_to_widget": "Cambiar a widget",
-    "menu_change_to_frontend_script": "Cambiar a script de frontend",
-    "menu_theme_base": "Tema base"
-  },
-  "setup_form": {
-    "more_info": "Para saber más"
  }
 }
--- a/apps/client/src/translations/fr/translation.json
+++ b/apps/client/src/translations/fr/translation.json
@@ -1053,6 +1053,15 @@
    "default_new_note_title": "nouvelle note",
    "click_on_canvas_to_place_new_note": "Cliquez sur le canevas pour placer une nouvelle note"
  },
+  "render": {
+    "note_detail_render_help_1": "Cette note d'aide s'affiche car cette note de type Rendu HTML n'a pas la relation requise pour fonctionner correctement.",
+    "note_detail_render_help_2": "Le type de note Rendu HTML est utilisé pour les <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripts</a>. En résumé, vous disposez d'une note de code HTML (éventuellement contenant JavaScript) et cette note affichera le rendu. Pour que cela fonctionne, vous devez définir une <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relation</a> appelée \"renderNote\" pointant vers la note HTML à rendre."
+  },
+  "web_view": {
+    "web_view": "Affichage Web",
+    "embed_websites": "Les notes de type Affichage Web vous permet d'intégrer des sites Web dans Trilium.",
+    "create_label": "Pour commencer, veuillez créer un label avec l'adresse URL que vous souhaitez intégrer, par ex. #webViewSrc=\"https://www.google.com\""
+  },
  "backend_log": {
    "refresh": "Rafraîchir"
  },
@@ -2049,6 +2058,7 @@
    "percentage": "%"
  },
  "pagination": {
+    "page_title": "Page de {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notes"
  },
  "collections": {
--- a/apps/client/src/translations/ga/translation.json
+++ b/apps/client/src/translations/ga/translation.json
--- a/apps/client/src/translations/id/translation.json
+++ b/apps/client/src/translations/id/translation.json
@@ -50,8 +50,7 @@
    "save": "Simpan",
    "branch_prefix_saved": "Prefiks cabang telah disimpan.",
    "branch_prefix_saved_multiple": "Prefix cabang telah disimpan pada {{count}} cabang.",
-    "affected_branches": "Cabang terdampak ({{count}}):",
-    "edit_branch_prefix": "Sunting awalan cabang"
+    "affected_branches": "Cabang terdampak ({{count}}):"
  },
  "bulk_actions": {
    "bulk_actions": "Aksi borongan",
@@ -62,18 +61,14 @@
    "execute_bulk_actions": "Eksekusi aksi borongan",
    "bulk_actions_executed": "Aksi borongan telah di eksekusi dengan sukses.",
    "none_yet": "Belum ada... tambahkan aksi dengan memilih salah satu dari aksi di atas.",
-    "labels": "Label-label",
-    "relations": "Hubungan",
-    "notes": "Catatan",
-    "other": "Lainnya"
+    "labels": "Label-label"
  },
  "confirm": {
    "cancel": "Batal",
    "ok": "Oke",
    "are_you_sure_remove_note": "Apakah anda yakin mau membuang catatan \"{{title}}\" dari peta relasi? ",
    "if_you_dont_check": "Jika Anda tidak mencentang ini, catatan hanya akan dihapus dari peta relasi.",
-    "also_delete_note": "Hapus juga catatannya",
-    "confirmation": "Konfirmasi"
+    "also_delete_note": "Hapus juga catatannya"
  },
  "delete_notes": {
    "delete_notes_preview": "Hapus pratinjau catatan",
@@ -82,19 +77,9 @@
    "erase_notes_description": "Penghapusan normal hanya menandai catatan sebagai dihapus dan dapat dipulihkan (melalui dialog versi revisi) dalam jangka waktu tertentu. Mencentang opsi ini akan menghapus catatan secara permanen seketika dan catatan tidak akan bisa dipulihkan kembali.",
    "erase_notes_warning": "Hapus catatan secara permanen (tidak bisa dikembalikan), termasuk semua duplikat. Aksi akan memaksa aplikasi untuk mengulang kembali.",
    "notes_to_be_deleted": "Catatan-catatan berikut akan dihapuskan ({{notesCount}})",
-    "no_note_to_delete": "Tidak ada Catatan yang akan dihapus (hanya duplikat).",
-    "broken_relations_to_be_deleted": "Hubungan berikut akan diputus dan dihapus ({{ relationCount}})"
+    "no_note_to_delete": "Tidak ada Catatan yang akan dihapus (hanya duplikat)."
  },
  "clone_to": {
-    "clone_notes_to": "Duplikat catatan ke…",
-    "help_on_links": "Bantuan pada tautan",
-    "notes_to_clone": "Catatan untuk kloning",
-    "target_parent_note": "Sasaran catatan utama",
-    "search_for_note_by_its_name": "cari catatan berdasarkan namanya",
-    "cloned_note_prefix_title": "Catatan yang dikloning akan ditampilkan diruntutan catatan dengan awalan yang diberikan",
-    "prefix_optional": "Awalan (opsional)",
-    "clone_to_selected_note": "Salin ke catatan yang dipilih",
-    "no_path_to_clone_to": "Tidak ada jalur untuk digandakan.",
-    "note_cloned": "Catatan \"{{clonedTitle}}\" telah digandakan ke dalam \"{{targetTitle}}\""
+    "clone_notes_to": "Duplikat catatan ke…"
  }
 }
--- a/apps/client/src/translations/it/translation.json
+++ b/apps/client/src/translations/it/translation.json
@@ -167,8 +167,8 @@
    "desktop-application": "Applicazione Desktop",
    "native-title-bar": "Barra del titolo nativa",
    "native-title-bar-description": "Su Windows e macOS, disattivare la barra del titolo nativa rende l'applicazione più compatta. Su Linux, attivarla si integra meglio con il resto del sistema.",
-    "background-effects": "Abilita effetti di sfondo",
-    "background-effects-description": "Aggiunge uno sfondo sfocato ed elegante alle finestre dell'app, creando profondità e un look moderno. La \"barra del titolo nativa\" deve essere disabilitata.",
+    "background-effects": "Abilita effetti di sfondo (solo Windows 11)",
+    "background-effects-description": "L'effetto Mica aggiunge uno sfondo sfocato ed elegante alle finestre delle app, creando profondità e un aspetto moderno. La \"Barra del titolo nativa\" deve essere disattivata.",
    "restart-app-button": "Riavviare l'applicazione per visualizzare le modifiche"
  },
  "note_autocomplete": {
@@ -186,8 +186,7 @@
  "geo-map": {
    "create-child-note-title": "Crea una nota figlia e aggiungila alla mappa",
    "create-child-note-instruction": "Clicca sulla mappa per creare una nuova nota qui o premi Escape per uscire.",
-    "unable-to-load-map": "Impossibile caricare la mappa.",
-    "create-child-note-text": "Aggiungi indicatore"
+    "unable-to-load-map": "Impossibile caricare la mappa."
  },
  "geo-map-context": {
    "open-location": "Apri la posizione",
@@ -369,8 +368,7 @@
    "description": "Descrizione",
    "reload_app": "Ricarica l'app per applicare le modifiche",
    "set_all_to_default": "Imposta tutte le scorciatoie sui valori predefiniti",
-    "confirm_reset": "Vuoi davvero ripristinare tutte le scorciatoie da tastiera ai valori predefiniti?",
-    "no_results": "Nessuna scorciatoia trovata corrispondente '{{filter}}'"
+    "confirm_reset": "Vuoi davvero ripristinare tutte le scorciatoie da tastiera ai valori predefiniti?"
  },
  "shared_switch": {
    "toggle-on-title": "Condividi la nota",
@@ -424,8 +422,7 @@
    "unknown_search_option": "Opzione di ricerca sconosciuta {{searchOptionName}}",
    "search_note_saved": "La nota di ricerca è stata salvata in {{- notePathTitle}}",
    "actions_executed": "Le azioni sono state eseguite.",
-    "view_options": "Opzioni di visualizzazione:",
-    "option": "opzione"
+    "view_options": "Opzioni di visualizzazione:"
  },
  "modal": {
    "close": "Chiudi",
@@ -1244,8 +1241,7 @@
    "show-cheatsheet": "Mostra il foglietto illustrativo",
    "toggle-zen-mode": "Modalità Zen",
    "new-version-available": "Nuovo aggiornamento disponibile",
-    "download-update": "Ottieni la versione {{latestVersion}}",
-    "search_notes": "Cerca note"
+    "download-update": "Ottieni la versione {{latestVersion}}"
  },
  "zen_mode": {
    "button_exit": "Esci dalla modalità Zen"
@@ -1328,7 +1324,7 @@
    "button_title": "Esporta diagramma come SVG"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Crea una nota secondaria e aggiungila alla mappa",
+    "create_child_note_title": "Crea una nuova nota secondaria e aggiungila a questa mappa delle relazioni",
    "reset_pan_zoom_title": "Ripristina panoramica e zoom alle coordinate e all'ingrandimento iniziali",
    "zoom_in_title": "Ingrandisci",
    "zoom_out_title": "Rimpicciolisci"
@@ -1344,9 +1340,7 @@
    "delete_this_note": "Elimina questa nota",
    "note_revisions": "Revisioni delle note",
    "error_cannot_get_branch_id": "Impossibile ottenere branchId per notePath '{{notePath}}'",
-    "error_unrecognized_command": "Comando non riconosciuto {{command}}",
-    "backlinks": "Backlinks",
-    "content_language_switcher": "Lingua dei contenuti: {{language}}"
+    "error_unrecognized_command": "Comando non riconosciuto {{command}}"
  },
  "note_icon": {
    "change_note_icon": "Cambia icona nota",
@@ -1527,7 +1521,7 @@
    "no_attachments": "Questa nota non ha allegati."
  },
  "book": {
-    "no_children_help": "Questa raccolta non ha note secondarie, quindi non c'è nulla da visualizzare.",
+    "no_children_help": "Questa raccolta non ha note secondarie, quindi non c'è nulla da visualizzare. Consulta la <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> per i dettagli.",
    "drag_locked_title": "Bloccato per la modifica",
    "drag_locked_message": "Trascinamento non consentito poiché la raccolta è bloccata per la modifica."
  },
@@ -1583,6 +1577,15 @@
    "default_new_note_title": "nuova nota",
    "click_on_canvas_to_place_new_note": "Clicca sulla tela per inserire una nuova nota"
  },
+  "render": {
+    "note_detail_render_help_1": "Questa nota di aiuto viene visualizzata perché questa nota di tipo Render HTML non ha la relazione richiesta per funzionare correttamente.",
+    "note_detail_render_help_2": "Il tipo di nota HTML Render viene utilizzato per lo <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. In breve, si ottiene una nota in codice HTML (opzionalmente con un po' di JavaScript) che verrà visualizzata. Per farla funzionare, è necessario definire una <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relazione</a> denominata \"renderNote\" che punti alla nota HTML da visualizzare."
+  },
+  "web_view": {
+    "web_view": "Visualizzazione Web",
+    "embed_websites": "La nota di tipo Web View consente di incorporare siti web in Trilium.",
+    "create_label": "Per iniziare, crea un'etichetta con l'indirizzo URL che desideri incorporare, ad esempio #webViewSrc=\"https://www.google.com\""
+  },
  "vacuum_database": {
    "title": "Pulizia del database",
    "description": "Questa operazione ricostruirà il database, generando in genere un file di dimensioni inferiori. In realtà, nessun dato verrà modificato.",
@@ -1920,9 +1923,7 @@
    "print_report_collection_content_many": "{{count}} le note nella raccolta non possono essere stampate perché non sono supportate o sono protette.",
    "print_report_collection_content_other": "{{count}} le note nella raccolta non possono essere stampate perché non sono supportate o sono protette.",
    "print_report_collection_details_button": "Vedi dettagli",
-    "print_report_collection_details_ignored_notes": "Note ignorate",
-    "print_report_error_title": "Impossibile stampare",
-    "print_report_stack_trace": "Traccia dello stack"
+    "print_report_collection_details_ignored_notes": "Note ignorate"
  },
  "note_title": {
    "placeholder": "scrivi qui il titolo della nota...",
@@ -2109,8 +2110,7 @@
    "raster": "Trama",
    "vector_light": "Vettore (Luce)",
    "vector_dark": "Vettore (scuro)",
-    "show-scale": "Mostra scala",
-    "show-labels": "Mostra nomi dei marcatori"
+    "show-scale": "Mostra scala"
  },
  "table_context_menu": {
    "delete_row": "Elimina riga"
@@ -2143,9 +2143,9 @@
    "next_theme_message": "Al momento stai utilizzando il tema legacy. Vuoi provare il nuovo tema?",
    "next_theme_button": "Prova il nuovo tema",
    "background_effects_title": "Gli effetti di sfondo sono ora stabili",
-    "background_effects_message": "Su dispositivi Windows e macOS, gli effetti di sfondo sono ora stabili. Gli effetti di sfondo aggiungono un tocco di colore all'interfaccia utente sfocando lo sfondo dietro di essa.",
+    "background_effects_message": "Sui dispositivi Windows, gli effetti di sfondo sono ora completamente stabili. Gli effetti di sfondo aggiungono un tocco di colore all'interfaccia utente sfocando lo sfondo retrostante. Questa tecnica è utilizzata anche in altre applicazioni come Esplora risorse di Windows.",
    "background_effects_button": "Abilita gli effetti di sfondo",
-    "dismiss": "Chiudi",
+    "dismiss": "Congedare",
    "new_layout_title": "Nuovo layout",
    "new_layout_message": "Abbiamo introdotto un layout modernizzato per Trilium. La barra multifunzione è stata rimossa e integrata perfettamente nell'interfaccia principale, con una nuova barra di stato e sezioni espandibili (come gli attributi promossi) che assumono le funzioni chiave.\n\nIl nuovo layout è abilitato di default e può essere temporaneamente disabilitato tramite Opzioni → Aspetto.",
    "new_layout_button": "Maggiori informazioni"
@@ -2164,6 +2164,7 @@
    "percentage": "%"
  },
  "pagination": {
+    "page_title": "Pagina di {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} note"
  },
  "collections": {
@@ -2280,61 +2281,5 @@
    "pages_other": "{{count}} pagine",
    "pages_alt": "Pagina {{pageNumber}}",
    "pages_loading": "Caricamento in corso..."
-  },
-  "web_view_setup": {
-    "title": "Crea una visualizzazione live di una pagina web direttamente in Trilium",
-    "url_placeholder": "Inserisci o incolla l'indirizzo del sito web, ad esempio https://triliumnotes.org",
-    "create_button": "Crea vista Web",
-    "invalid_url_title": "Indirizzo non valido",
-    "invalid_url_message": "Inserisci un indirizzo web valido, ad esempio https://triliumnotes.org.",
-    "disabled_description": "Questa visualizzazione web è stata importata da una fonte esterna. Per proteggerti dal phishing o da contenuti dannosi, non viene caricata automaticamente. Puoi abilitarla se ritieni che la fonte sia affidabile.",
-    "disabled_button_enable": "Abilita visualizzazione web"
-  },
-  "platform_indicator": {
-    "available_on": "Disponibile su {{platform}}"
-  },
-  "mobile_tab_switcher": {
-    "title_one": "Scheda {{count}}",
-    "title_many": "Schede {{count}}",
-    "title_other": "Schede {{count}}",
-    "more_options": "Altre opzioni"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "Segnalibri"
-  },
-  "render": {
-    "setup_title": "Visualizza HTML personalizzato o Preact JSX all'interno di questa nota",
-    "setup_create_sample_preact": "Crea una nota di esempio con Preact",
-    "setup_create_sample_html": "Crea una nota di esempio con HTML",
-    "setup_sample_created": "È stata creata una nota di esempio come nota secondaria.",
-    "disabled_description": "Queste note di rendering provengono da una fonte esterna. Per proteggerti da contenuti dannosi, non sono abilitate per impostazione predefinita. Assicurati di fidarti della fonte prima di abilitarle.",
-    "disabled_button_enable": "Abilita nota di rendering"
-  },
-  "active_content_badges": {
-    "type_icon_pack": "Pacchetto icone",
-    "type_backend_script": "Script di backend",
-    "type_frontend_script": "Script frontend",
-    "type_widget": "Widget",
-    "type_app_css": "CSS personalizzato",
-    "type_render_note": "Nota di rendering",
-    "type_web_view": "Visualizzazione web",
-    "type_app_theme": "Tema personalizzato",
-    "toggle_tooltip_enable_tooltip": "Clicca per abilitare questa funzione {{type}}.",
-    "toggle_tooltip_disable_tooltip": "Clicca per disattivare questa funzione {{type}}.",
-    "menu_docs": "Documentazione aperta",
-    "menu_execute_now": "Esegui lo script ora",
-    "menu_run": "Esegui automaticamente",
-    "menu_run_disabled": "Manualmente",
-    "menu_run_backend_startup": "Quando il backend si avvia",
-    "menu_run_hourly": "Ogni ora",
-    "menu_run_daily": "Giornaliero",
-    "menu_run_frontend_startup": "Quando si avvia il frontend desktop",
-    "menu_run_mobile_startup": "Quando si avvia il frontend mobile",
-    "menu_change_to_widget": "Passa al widget",
-    "menu_change_to_frontend_script": "Modifica allo script frontend",
-    "menu_theme_base": "Tema base"
-  },
-  "setup_form": {
-    "more_info": "Per saperne di più"
  }
 }
--- a/apps/client/src/translations/ja/translation.json
+++ b/apps/client/src/translations/ja/translation.json
@@ -81,8 +81,7 @@
    "configure_launchbar": "ランチャーバーの設定",
    "show_shared_notes_subtree": "共有ノートのサブツリーを表示",
    "new-version-available": "新しいアップデートが利用可能",
-    "download-update": "{{latestVersion}} をバージョンを入手",
-    "search_notes": "検索ノート"
+    "download-update": "{{latestVersion}} をバージョンを入手"
  },
  "left_pane_toggle": {
    "show_panel": "パネルを表示",
@@ -235,8 +234,7 @@
    "search_note_saved": "検索ノートが {{- notePathTitle}} に保存されました",
    "actions_executed": "アクションが実行されました。",
    "ancestor": "祖先:",
-    "view_options": "表示オプション:",
-    "option": "オプション"
+    "view_options": "表示オプション:"
  },
  "shortcuts": {
    "multiple_shortcuts": "同じアクションに対して複数のショートカットを設定する場合、カンマで区切ることができます。",
@@ -249,8 +247,7 @@
    "reload_app": "リロードして変更を適用する",
    "set_all_to_default": "すべてのショートカットをデフォルトに戻す",
    "confirm_reset": "キーボードショートカットをすべてデフォルトにリセットしますか？",
-    "keyboard_shortcuts": "キーボードショートカット",
-    "no_results": "'{{filter}}' に一致するショートカットが見つかりません"
+    "keyboard_shortcuts": "キーボードショートカット"
  },
  "confirm": {
    "confirmation": "確認",
@@ -410,7 +407,7 @@
  "relation_map_buttons": {
    "zoom_out_title": "ズームアウト",
    "zoom_in_title": "ズームイン",
-    "create_child_note_title": "子ノートを作成し、マップに追加",
+    "create_child_note_title": "新しい子ノートを作成し、関連マップに追加",
    "reset_pan_zoom_title": "パンとズームを初期座標と倍率にリセット"
  },
  "tree-context-menu": {
@@ -827,6 +824,11 @@
    "error_no_path": "移動するパスがありません。",
    "move_success_message": "選択したノートは以下に移動されました "
  },
+  "web_view": {
+    "web_view": "Web ビュー",
+    "embed_websites": "Web ビュータイプでは、web サイトを Trilium に埋め込むことができます。",
+    "create_label": "まず始めに、埋め込みたいURLアドレスのラベルを作成してください。例: #webViewSrc=\"https://www.google.com\""
+  },
  "backend_log": {
    "refresh": "リフレッシュ"
  },
@@ -1646,9 +1648,7 @@
    "error_unrecognized_command": "認識されないコマンド {{command}}",
    "insert_child_note": "子ノートを挿入",
    "error_cannot_get_branch_id": "ノートパス 「{{notePath}} のbranchIdを取得できません",
-    "note_revisions": "ノートの変更履歴",
-    "backlinks": "バックリンク",
-    "content_language_switcher": "コンテンツの言語: {{language}}"
+    "note_revisions": "ノートの変更履歴"
  },
  "inherited_attribute_list": {
    "title": "継承属性",
@@ -1860,6 +1860,10 @@
    "protecting-title": "保護の状態",
    "unprotecting-title": "保護解除の状態"
  },
+  "render": {
+    "note_detail_render_help_1": "このヘルプノートが表示されるのは、このノートの「HTML のレンダリング」タイプには、正常に機能するために必要なリレーションがないためです。",
+    "note_detail_render_help_2": "レンダリングHTMLノートタイプは、<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">スクリプティング</a>に使用されます。簡単に言うと、HTMLコードノート（オプションでJavaScriptを含む）があり、このノートがそれをレンダリングします。これを動作させるには、レンダリングするHTMLノートを指す「renderNote」という<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">リレーション</a>を定義する必要があります。"
+  },
  "consistency_checks": {
    "find_and_fix_button": "一貫性の問題を見つけて修正する",
    "finding_and_fixing_message": "一貫性の問題を見つけて修正中…",
@@ -1951,9 +1955,7 @@
    "print_report_title": "レポートを印刷",
    "print_report_collection_content_other": "コレクション内の {{count}} 件のノートは、サポートされていないか保護されているため、印刷できませんでした。",
    "print_report_collection_details_button": "詳細を見る",
-    "print_report_collection_details_ignored_notes": "無視されたノート",
-    "print_report_error_title": "印刷に失敗しました",
-    "print_report_stack_trace": "スタックトレース"
+    "print_report_collection_details_ignored_notes": "無視されたノート"
  },
  "watched_file_update_status": {
    "ignore_this_change": "この変更を無視する",
@@ -2006,8 +2008,7 @@
  "geo-map": {
    "create-child-note-title": "新しい子ノートを作成し、マップに追加する",
    "create-child-note-instruction": "地図をクリックしてその場所に新しいノートを作成するか、Esc キーを押して閉じます。",
-    "unable-to-load-map": "マップを読み込めません。",
-    "create-child-note-text": "マーカーを追加"
+    "unable-to-load-map": "マップを読み込めません。"
  },
  "geo-map-context": {
    "open-location": "現在位置を表示",
@@ -2036,8 +2037,7 @@
    "show-scale": "スケールを表示",
    "raster": "Raster",
    "vector_light": "Vector（ライト）",
-    "vector_dark": "Vector （ダーク）",
-    "show-labels": "マーカー名を表示"
+    "vector_dark": "Vector （ダーク）"
  },
  "call_to_action": {
    "next_theme_title": "新しいTriliumテーマをお試しください",
@@ -2065,6 +2065,7 @@
    "percentage": "%"
  },
  "pagination": {
+    "page_title": "{{startIndex}} - {{endIndex}} ページ",
    "total_notes": "{{count}} ノート"
  },
  "collections": {
@@ -2093,7 +2094,7 @@
    "no_attachments": "このノートには添付ファイルはありません。"
  },
  "book": {
-    "no_children_help": "このコレクションには子ノートがないため、表示するものがありません。",
+    "no_children_help": "このコレクションには子ノートがないため、表示するものがありません。詳細は<a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a>をご覧ください。",
    "drag_locked_title": "編集をロック中",
    "drag_locked_message": "コレクションは編集がロックされているため、ドラッグは許可されていません。"
  },
@@ -2255,56 +2256,5 @@
  },
  "platform_indicator": {
    "available_on": "{{platform}} で利用可能"
-  },
-  "mobile_tab_switcher": {
-    "title_other": "{{count}} タブ",
-    "more_options": "その他のオプション"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "ブックマーク"
-  },
-  "web_view_setup": {
-    "title": "Trilium に直接 Web ページのライブビューを作成",
-    "url_placeholder": "Web サイトのアドレスを入力または貼り付けて下さい。 例: https://triliumnotes.org",
-    "create_button": "Web ビューを作成",
-    "invalid_url_title": "無効なアドレス",
-    "invalid_url_message": "有効な Web アドレスを入力してください。 例: https://triliumnotes.org",
-    "disabled_description": "この Web ビューは外部ソースからインポートされました。フィッシングや悪意のあるコンテンツから保護するため、自動的には読み込まれません。ソースを信頼できる場合は、有効にすることができます。",
-    "disabled_button_enable": "Web ビューを有効"
-  },
-  "render": {
-    "setup_title": "このノート内にカスタム HTML または Preact JSX を表示",
-    "setup_create_sample_preact": "Preact でサンプルノートを作成",
-    "setup_create_sample_html": "HTML でサンプルノートを作成",
-    "setup_sample_created": "子ノートとしてサンプルノートが作成されました。",
-    "disabled_description": "このレンダリングノートは外部ソースから提供されています。悪意のあるコンテンツからユーザーを保護するため、デフォルトでは有効になっていません。有効にする前に、ソースが信頼できるかどうかをご確認ください。",
-    "disabled_button_enable": "レンダリングノートを有効"
-  },
-  "active_content_badges": {
-    "type_icon_pack": "アイコンパック",
-    "type_backend_script": "バックエンドスクリプト",
-    "type_frontend_script": "フロントエンドスクリプト",
-    "type_widget": "ウィジェット",
-    "type_app_css": "カスタム CSS",
-    "type_render_note": "レンダリングノート",
-    "type_web_view": "Web ビュー",
-    "type_app_theme": "カスタムテーマ",
-    "toggle_tooltip_enable_tooltip": "この {{type}} を有効にするにはクリックしてください。",
-    "toggle_tooltip_disable_tooltip": "この {{type}} を無効にするにはクリックしてください。",
-    "menu_docs": "ドキュメントを開く",
-    "menu_execute_now": "今すぐスクリプトを実行",
-    "menu_run": "自動で実行",
-    "menu_run_disabled": "手動で実行",
-    "menu_run_backend_startup": "バックエンドの起動時",
-    "menu_run_hourly": "毎時",
-    "menu_run_daily": "毎日",
-    "menu_run_frontend_startup": "デスクトップ フロントエンドの起動時",
-    "menu_run_mobile_startup": "モバイル フロントエンドの起動時",
-    "menu_change_to_widget": "ウィジェットの変更",
-    "menu_change_to_frontend_script": "フロントエンドスクリプトの変更",
-    "menu_theme_base": "テーマベース"
-  },
-  "setup_form": {
-    "more_info": "さらに詳しく"
  }
 }
--- a/apps/client/src/translations/pl/translation.json
+++ b/apps/client/src/translations/pl/translation.json
@@ -21,7 +21,7 @@
    },
    "bundle-error": {
      "title": "Nie udało się załadować niestandardowego skryptu",
-      "message": "Skrypt nie mógł zostać wykonany z powodu:\n\n{{message}}"
+      "message": "Skrypt z notatki o ID \"{{id}}\", zatytułowany \"{{title}}\", nie mógł zostać wykonany z powodu:\n\n{{message}}"
    },
    "widget-list-error": {
      "title": "Nie udało się pobrać listy widżetów z serwera"
@@ -29,9 +29,8 @@
    "widget-render-error": {
      "title": "Nie udało się wyrenderować niestandardowego widżetu React"
    },
-    "widget-missing-parent": "Niestandardowy widżet nie ma zdefiniowanej obowiązkowej właściwości „{{property}}”.\nJeśli skrypt ma działać bez interfejsu użytkownika (UI) wyłącz go:  '#run=frontendStartup'.",
-    "open-script-note": "Otwórz notatkę ze skryptem",
-    "scripting-error": "Błąd skryptu użytkownika: {{title}}"
+    "widget-missing-parent": "Niestandardowy widżet nie ma zdefiniowanej obowiązkowej właściwości „{{property}}”.",
+    "open-script-note": "Otwórz notatkę ze skryptem"
  },
  "add_link": {
    "add_link": "Dodaj link",
@@ -192,8 +191,7 @@
    "expand_tooltip": "Rozwija bezpośrednie elementy podrzędne tej kolekcji (o jeden poziom). Aby uzyskać więcej opcji, naciśnij strzałkę po prawej.",
    "expand_first_level": "Rozwiń bezpośrednie elementy podrzędne",
    "expand_nth_level": "Rozwiń {{depth}} poziomów",
-    "expand_all_levels": "Rozwiń wszystkie poziomy",
-    "hide_child_notes": "Ukryj notatki podrzędne w derzwie"
+    "expand_all_levels": "Rozwiń wszystkie poziomy"
  },
  "board_view": {
    "move-to": "Przenieś do",
@@ -242,7 +240,7 @@
    "background_effects_title": "Efekty tła są teraz stabilne",
    "dismiss": "Odrzuć",
    "background_effects_button": "Włącz efekty tła",
-    "background_effects_message": "Na urządzeniach z systemem Windows i macOS efekty tła są stabilne. Efekty tła dodają odrobinę koloru do interfejsu użytkownika poprzez rozmycie tła za nim.",
+    "background_effects_message": "Na urządzeniach z systemem Windows efekty tła są teraz w pełni stabilne. Efekty tła dodają odrobinę koloru do interfejsu użytkownika poprzez rozmycie tła za nim. Ta technika jest również stosowana w innych aplikacjach, takich jak Eksplorator Windows.",
    "new_layout_title": "Nowy układ",
    "new_layout_message": "Wprowadziliśmy zmodernizowany układ interfejsu dla Trilium. Wstążka została usunięta i płynnie zintegrowana z głównym interfejsem, a jej kluczowe funkcje przejęły nowy pasek stanu i rozwijane sekcje (takie jak promowane atrybuty).\n\nNowy układ jest domyślnie włączony i można go tymczasowo wyłączyć w Ustawienia → Wygląd.",
    "new_layout_button": "Szczegóły"
@@ -261,6 +259,7 @@
    "percentage": "%"
  },
  "pagination": {
+    "page_title": "Strona {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notatek"
  },
  "collections": {
@@ -521,8 +520,7 @@
    "action": "akcja",
    "search_button": "Szukaj",
    "search_execute": "Szukaj i wykonaj akcje",
-    "view_options": "Ustawienia widoku:",
-    "option": "opcja"
+    "view_options": "Ustawienia widoku:"
  },
  "similar_notes": {
    "title": "Podobne notatki",
@@ -604,8 +602,8 @@
    "desktop-application": "Aplikacja desktopowa",
    "native-title-bar": "Natywny pasek tytułu",
    "native-title-bar-description": "Dla Windows i macOS, wyłączenie natywnego paska tytułu sprawia, że aplikacja wygląda bardziej kompaktowo. Na Linuxie, włączenie natywnego paska tytułu lepiej integruje się z resztą systemu.",
-    "background-effects": "Włącz efekty tła",
-    "background-effects-description": "Dodaje rozmyte, stylowe tło do okien aplikacji, tworząc głębię i nowoczesny wygląd. \"Natywny pasek tytułu\" musi być wyłączony.",
+    "background-effects": "Włącz efekty tła (tylko Windows 11)",
+    "background-effects-description": "Efekt Mica dodaje rozmyte, stylowe tło do okien aplikacji, tworząc głębię i nowoczesny wygląd. \"Natywny pasek tytułu\" musi być wyłączony.",
    "restart-app-button": "Zrestartuj aplikację, aby zobaczyć zmiany",
    "zoom-factor": "Współczynnik powiększenia"
  },
@@ -1184,8 +1182,7 @@
    "show-cheatsheet": "Pokaż ściągawkę",
    "toggle-zen-mode": "Tryb Zen",
    "new-version-available": "Dostępna nowa aktualizacja",
-    "download-update": "Pobierz wersję {{latestVersion}}",
-    "search_notes": "Przeszukaj notatki"
+    "download-update": "Pobierz wersję {{latestVersion}}"
  },
  "zen_mode": {
    "button_exit": "Wyjdź z trybu Zen"
@@ -1268,7 +1265,7 @@
    "button_title": "Eksportuj diagram jako SVG"
  },
  "relation_map_buttons": {
-    "create_child_note_title": "Utwórz notatkę podrzędną i dodaj ją do mapy",
+    "create_child_note_title": "Utwórz nową notatkę podrzędną i dodaj ją do tej mapy relacji",
    "reset_pan_zoom_title": "Zresetuj przesunięcie i powiększenie do początkowych współrzędnych i powiększenia",
    "zoom_in_title": "Powiększ",
    "zoom_out_title": "Pomniejsz"
@@ -1284,23 +1281,12 @@
    "delete_this_note": "Usuń tę notatkę",
    "note_revisions": "Wersje notatki",
    "error_cannot_get_branch_id": "Nie można pobrać branchId dla ścieżki notatki '{{notePath}}'",
-    "error_unrecognized_command": "Nierozpoznane polecenie {{command}}",
-    "backlinks": "Linki zwrotne",
-    "content_language_switcher": "Język treści: {{language}}"
+    "error_unrecognized_command": "Nierozpoznane polecenie {{command}}"
  },
  "note_icon": {
    "change_note_icon": "Zmień ikonę notatki",
    "search": "Szukaj:",
-    "reset-default": "Przywróć domyślną ikonę",
-    "search_placeholder_one": "Znaleziono {{number}} ikonę w {{count}} pakietach",
-    "search_placeholder_few": "Znaleziono {{number}} ikon w {{count}} pakietach",
-    "search_placeholder_many": "Znaleziono {{number}} ikon w {{count}} pakietach",
-    "search_placeholder_filtered": "Wyszukaj {{number}} ikon w {{name}}",
-    "filter": "Filtr",
-    "filter-none": "Wszystkie ikony",
-    "filter-default": "Domyślne ikony",
-    "icon_tooltip": "{{name}}\npakiet ikon: {{iconPack}}",
-    "no_results": "Nie znaleziono ikon."
+    "reset-default": "Przywróć domyślną ikonę"
  },
  "basic_properties": {
    "note_type": "Typ notatki",
@@ -1431,6 +1417,15 @@
    "default_new_note_title": "nowa notatka",
    "click_on_canvas_to_place_new_note": "Kliknij na płótnie, aby umieścić nową notatkę"
  },
+  "render": {
+    "note_detail_render_help_1": "Ta notatka pomocy jest wyświetlana, ponieważ ta notatka typu Render HTML nie ma wymaganej relacji do poprawnego działania.",
+    "note_detail_render_help_2": "Typ notatki Render HTML jest używany do <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">skryptowania</a>. W skrócie, masz notatkę kodu HTML (opcjonalnie z JavaScript) i ta notatka ją wyrenderuje. Aby to zadziałało, musisz zdefiniować <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relację</a> o nazwie \"renderNote\" wskazującą na notatkę HTML do wyrenderowania."
+  },
+  "web_view": {
+    "web_view": "Widok WWW",
+    "embed_websites": "Notatka typu Widok WWW pozwala na osadzanie stron internetowych w Trilium.",
+    "create_label": "Aby rozpocząć, utwórz etykietę z adresem URL, który chcesz osadzić, np. #webViewSrc=\"https://www.google.com\""
+  },
  "backend_log": {
    "refresh": "Odśwież"
  },
@@ -1831,7 +1826,7 @@
    "will_be_deleted_in": "Ten załącznik zostanie automatycznie usunięty za {{time}}",
    "will_be_deleted_soon": "Ten załącznik zostanie wkrótce automatycznie usunięty",
    "deletion_reason": ", ponieważ załącznik nie jest podlinkowany w treści notatki. Aby zapobiec usunięciu, dodaj link do załącznika z powrotem do treści lub przekonwertuj załącznik na notatkę.",
-    "role_and_size": "Rola: {{role}}, Rozmiar: {{size}}, MIME: {{- mimeType}}",
+    "role_and_size": "Rola: {{role}}, Rozmiar: {{size}}",
    "link_copied": "Link do załącznika skopiowany do schowka.",
    "unrecognized_role": "Nierozpoznana rola załącznika '{{role}}'."
  },
@@ -1885,10 +1880,7 @@
    "apply-bulk-actions": "Zastosuj akcje masowe",
    "converted-to-attachments": "{{count}} notatek zostało przekonwertowanych na załączniki.",
    "convert-to-attachment-confirm": "Czy na pewno chcesz przekonwertować wybrane notatki na załączniki ich notatek nadrzędnych? Ta operacja dotyczy tylko notatek Obrazów, inne notatki zostaną pominięte.",
-    "open-in-popup": "Szybka edycja",
-    "open-in-a-new-window": "Otwórz w nowym oknie",
-    "hide-subtree": "Ukryj gałąź",
-    "show-subtree": "Rozwiń gałąź"
+    "open-in-popup": "Szybka edycja"
  },
  "shared_info": {
    "shared_publicly": "Ta notatka jest udostępniona publicznie pod adresem {{- link}}.",
@@ -1979,17 +1971,7 @@
    "create-child-note": "Utwórz notatkę podrzędną",
    "unhoist": "Cofnij zawężenie",
    "toggle-sidebar": "Przełącz pasek boczny",
-    "dropping-not-allowed": "Upuszczanie notatek w tej lokalizacji jest niedozwolone.",
-    "clone-indicator-tooltip": "Ta notatka ma {{- count}} notatek nadrzędnych: {{- parents}}",
-    "clone-indicator-tooltip-single": "Ta notatka jest sklonowana (1 dodatkowa notatka nadrzędna: {{- parent}})",
-    "shared-indicator-tooltip": "Ta notatka jest udostępniona publicznie",
-    "shared-indicator-tooltip-with-url": "Ta notatka jest udostępniana publicznie jako: {{- url}}",
-    "subtree-hidden-tooltip_one": "{{count}} notatka podrzędna ukryta w drzewie",
-    "subtree-hidden-tooltip_few": "{{count}} notatek podrzędnych ukrytych w drzewie",
-    "subtree-hidden-tooltip_many": "{{count}} notatek podrzędnych ukrytych w drzewie",
-    "subtree-hidden-moved-title": "Dodano do {{title}}",
-    "subtree-hidden-moved-description-collection": "Ta kolekcja ukrywa swoje notatki podrzędne w drzewie.",
-    "subtree-hidden-moved-description-other": "Notatki podrzędne są ukryte w drzewie tej notatki."
+    "dropping-not-allowed": "Upuszczanie notatek w tej lokalizacji jest niedozwolone."
  },
  "title_bar_buttons": {
    "window-on-top": "Utrzymuj okno na wierzchu"
@@ -1997,13 +1979,7 @@
  "note_detail": {
    "could_not_find_typewidget": "Nie można znaleźć widżetu typu dla typu '{{type}}'",
    "printing": "Drukowanie w toku...",
-    "printing_pdf": "Eksportowanie do PDF w toku...",
-    "print_report_title": "Wydrukuj raport",
-    "print_report_collection_content_one": "Nie można wydrukować {{count}} notatki w kolekcji, ponieważ nie jest ona obsługiwana lub jest chroniona.",
-    "print_report_collection_content_few": "Nie można wydrukować {{count}} notatek w kolekcji, ponieważ nie są one obsługiwane lub są chronione.",
-    "print_report_collection_content_many": "Nie można wydrukować {{count}} notatek w kolekcji, ponieważ nie są one obsługiwane lub są chronione.",
-    "print_report_collection_details_button": "Zobacz szczegóły",
-    "print_report_collection_details_ignored_notes": "Zignorowane notatki"
+    "printing_pdf": "Eksportowanie do PDF w toku..."
  },
  "note_title": {
    "placeholder": "wpisz tytuł notatki tutaj...",
@@ -2013,8 +1989,7 @@
    "note_type_switcher_others": "Inny typ notatki",
    "note_type_switcher_templates": "Szablon",
    "note_type_switcher_collection": "Kolekcja",
-    "edited_notes": "Notatki edytowane dzisiaj",
-    "promoted_attributes": "Sugerowane atrybuty"
+    "edited_notes": "Edytowane notatki"
  },
  "search_result": {
    "no_notes_found": "Nie znaleziono notatek dla podanych parametrów wyszukiwania.",
@@ -2024,11 +1999,7 @@
    "configure_launchbar": "Konfiguruj pasek szybkiego dostępu"
  },
  "sql_result": {
-    "no_rows": "Dla tego zapytania nie zwrócono żadnych wierszy",
-    "not_executed": "Zapytanie nie zostało jeszcze wykonane.",
-    "failed": "Wykonanie zapytania SQL nie powiodło się",
-    "statement_result": "Wynik wyrażenia",
-    "execute_now": "Wykonaj teraz"
+    "no_rows": "Dla tego zapytania nie zwrócono żadnych wierszy"
  },
  "sql_table_schemas": {
    "tables": "Tabele"
@@ -2145,8 +2116,7 @@
  "geo-map": {
    "create-child-note-title": "Utwórz nową notatkę podrzędną i dodaj ją do mapy",
    "create-child-note-instruction": "Kliknij na mapie, aby utworzyć nową notatkę w tej lokalizacji lub naciśnij Escape, aby anulować.",
-    "unable-to-load-map": "Nie można załadować mapy.",
-    "create-child-note-text": "Dodaj zaznaczenie"
+    "unable-to-load-map": "Nie można załadować mapy."
  },
  "geo-map-context": {
    "open-location": "Otwórz lokalizację",
@@ -2213,14 +2183,7 @@
    "execute_sql_description": "Ta notatka jest notatką SQL. Kliknij, aby wykonać zapytanie SQL.",
    "shared_copy_to_clipboard": "Kopiuj link do schowka",
    "shared_open_in_browser": "Otwórz link w przeglądarce",
-    "shared_unshare": "Usuń udostępnienie",
-    "save_status_saved": "Zapisane",
-    "save_status_saving": "Zapisywanie...",
-    "save_status_unsaved": "Niezapisane",
-    "save_status_error": "Zapis nie powiódł się",
-    "save_status_saving_tooltip": "Zmiany zostały zapisane.",
-    "save_status_unsaved_tooltip": "Są niezapisane zmiany. Zostaną one zapisane automatycznie za chwilę.",
-    "save_status_error_tooltip": "Wystąpił błąd podczas zapisywania notatki. Spróbuj skopiować treść notatki w inne miejsce i ponownie załadować aplikację."
+    "shared_unshare": "Usuń udostępnienie"
  },
  "status_bar": {
    "language_title": "Zmień język treści",
@@ -2263,30 +2226,5 @@
    "empty_button": "Ukryj panel",
    "toggle": "Pokaż/ukryj prawy panel",
    "custom_widget_go_to_source": "Przejdź do kodu źródłowego"
-  },
-  "pdf": {
-    "attachments_one": "{{count}} załącznik",
-    "attachments_few": "{{count}} załączniki",
-    "attachments_many": "{{count}} załączników",
-    "layers_one": "{{count}} warstwa",
-    "layers_few": "{{count}} warstw",
-    "layers_many": "{{count}} warstw",
-    "pages_one": "{{count}} strona",
-    "pages_few": "{{count}} stron",
-    "pages_many": "{{count}} stron",
-    "pages_alt": "Strona {{pageNumber}}",
-    "pages_loading": "Wczytuję..."
-  },
-  "platform_indicator": {
-    "available_on": "Dostępne na {{platform}}"
-  },
-  "mobile_tab_switcher": {
-    "title_one": "{{count}} zakładka",
-    "title_few": "{{count}} zakładki",
-    "title_many": "{{count}} zakładek",
-    "more_options": "Więcej opcji"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "Zakładki"
  }
 }
--- a/apps/client/src/translations/pt/translation.json
+++ b/apps/client/src/translations/pt/translation.json
@@ -1064,6 +1064,15 @@
    "default_new_note_title": "nova nota",
    "click_on_canvas_to_place_new_note": "Clique no quadro para incluir uma nova nota"
  },
+  "render": {
+    "note_detail_render_help_1": "Esta nota de ajuda é mostrada porque esta nota do tipo Renderizar HTML não possui a relação necessária para funcionar corretamente.",
+    "note_detail_render_help_2": "O tipo de nota Renderizar HTML é usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">automação</a>. Em suma, tem uma nota de código HTML (opcionalmente com algum JavaScript) e esta nota irá renderizá-la. Para fazê-lo funcionar, deve definir uma <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relação</a> chamada \"renderNote\" que aponta para a nota HTML a ser renderizada."
+  },
+  "web_view": {
+    "web_view": "Web View",
+    "embed_websites": "Nota do tipo Visualização Web permite que incorpore sites no Trilium.",
+    "create_label": "Para começar, crie uma etiqueta com um endereço URL que deseja incorporar, por exemplo, #webViewSrc=\"https://www.google.com\""
+  },
  "backend_log": {
    "refresh": "Recarregar"
  },
@@ -2165,6 +2174,7 @@
    "delete_note": "Apagar nota..."
  },
  "pagination": {
+    "page_title": "Página {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notas"
  },
  "collections": {
--- a/apps/client/src/translations/pt_br/translation.json
+++ b/apps/client/src/translations/pt_br/translation.json
@@ -1271,6 +1271,11 @@
    "start_dragging_relations": "Comece arrastando as relações daqui e solte-as em outra nota.",
    "cannot_match_transform": "Não foi possível combinar a transformação: {{transform}}"
  },
+  "web_view": {
+    "web_view": "Web View",
+    "embed_websites": "Nota do tipo Visualização Web permite que você incorpore sites dentro do Trilium.",
+    "create_label": "Para começar, crie uma etiqueta com um endereço URL que deseja incorporar, por exemplo, #webViewSrc=\"https://www.google.com\""
+  },
  "backend_log": {
    "refresh": "Recarregar"
  },
@@ -1991,6 +1996,10 @@
    "drag_locked_title": "Bloqueado para edição",
    "drag_locked_message": "Arrastar não é permitido pois a coleção está bloqueada para edição."
  },
+  "render": {
+    "note_detail_render_help_1": "Esta nota de ajuda é mostrada porque esta nota do tipo Renderizar HTML não possui a relação necessária para funcionar corretamente.",
+    "note_detail_render_help_2": "O tipo de nota Renderizar HTML é usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">automação</a>. Em suma, você tem uma nota de código HTML (opcionalmente com algum JavaScript) e esta nota irá renderizá-la. Para fazê-lo funcionar, você precisa definir uma <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relação</a> chamada \"renderNote\" apontando para a nota HTML a ser renderizada."
+  },
  "etapi": {
    "title": "ETAPI",
    "description": "ETAPI é uma API REST usada para acessar a instância do Trilium programaticamente, sem interface gráfica.",
@@ -2115,6 +2124,7 @@
    "shared_locally": "Esta nota é compartilhada localmente em {{- link}}."
  },
  "pagination": {
+    "page_title": "Página de {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notas"
  },
  "collections": {
--- a/apps/client/src/translations/ro/translation.json
+++ b/apps/client/src/translations/ro/translation.json
@@ -1094,6 +1094,10 @@
    "rename_relation_from": "Redenumește relația din",
    "to": "În"
  },
+  "render": {
+    "note_detail_render_help_1": "Această notă informativă este afișată deoarece această notiță de tip „Randare HTML” nu are relația necesară pentru a funcționa corespunzător.",
+    "note_detail_render_help_2": "Notița de tipul „Render HTML” este utilizată pentru <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scriptare</a>. Pe scurt, se folosește o notiță de tip cod HTML (opțional cu niște JavaScript) și această notiță o va randa. Pentru a funcționa, trebuie definită o <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relație</a> denumită „renderNote” ce indică notița HTML de randat."
+  },
  "revisions": {
    "confirm_delete": "Doriți ștergerea acestei revizii?",
    "confirm_delete_all": "Doriți ștergerea tuturor reviziilor acestei notițe?",
@@ -1372,6 +1376,11 @@
    "enable_vim_keybindings": "Permite utilizarea combinațiilor de taste în stil Vim pentru notițele de tip cod (fără modul ex)",
    "use_vim_keybindings_in_code_notes": "Combinații de taste Vim"
  },
+  "web_view": {
+    "create_label": "Pentru a începe, creați o etichetă cu adresa URL de încorporat, e.g. #webViewSrc=\"https://www.google.com\"",
+    "embed_websites": "Notițele de tip „Vizualizare web” permit încorporarea site-urilor web în Trilium.",
+    "web_view": "Vizualizare web"
+  },
  "wrap_lines": {
    "enable_line_wrap": "Activează trecerea automată pe rândul următor (poate necesita o reîncărcare a interfeței pentru a avea efect)",
    "wrap_lines_in_code_notes": "Trecerea automată pe rândul următor în notițe de cod"
@@ -1752,8 +1761,8 @@
    "show-recent-notes": "Afișează notițele recente"
  },
  "electron_integration": {
-    "background-effects": "Activează efectele de fundal",
-    "background-effects-description": "Adaugă un fundal estompat și elegant ferestrelor aplicațiilor, creând profunzime și un aspect modern. Opțiunea „Bară de titlu nativă” trebuie să fie dezactivată.",
+    "background-effects": "Activează efectele de fundal (doar pentru Windows 11)",
+    "background-effects-description": "Efectul Mica adaugă un fundal estompat și elegant ferestrelor aplicațiilor, creând profunzime și un aspect modern. Opțiunea „Bară de titlu nativă” trebuie să fie dezactivată.",
    "desktop-application": "Aplicația desktop",
    "native-title-bar": "Bară de titlu nativă",
    "native-title-bar-description": "Pentru Windows și macOS, dezactivarea bării de titlu native face aplicația să pară mai compactă. Pe Linux, păstrarea bării integrează mai bine aplicația cu restul sistemului de operare.",
@@ -1772,8 +1781,7 @@
  "geo-map": {
    "create-child-note-title": "Crează o notiță nouă și adaug-o pe hartă",
    "unable-to-load-map": "Nu s-a putut încărca harta.",
-    "create-child-note-instruction": "Click pe hartă pentru a crea o nouă notiță la acea poziție sau apăsați Escape pentru a anula.",
-    "create-child-note-text": "Adaugă marcaj"
+    "create-child-note-instruction": "Click pe hartă pentru a crea o nouă notiță la acea poziție sau apăsați Escape pentru a anula."
  },
  "duration": {
    "days": "zile",
@@ -2119,7 +2127,7 @@
  },
  "call_to_action": {
    "background_effects_title": "Efectele de fundal sunt acum stabile",
-    "background_effects_message": "Pe dispozitive cu Windows și macOS, efectele de fundal sunt stabile. Acestea adaugă un strop de culoare interfeței grafice prin estomparea fundalului din spatele ferestrei.",
+    "background_effects_message": "Pe dispozitive cu Windows, efectele de fundal sunt complet stabile. Acestea adaugă un strop de culoare interfeței grafice prin estomparea fundalului din spatele ferestrei. Această tehnică este folosită și în alte aplicații precum Windows Explorer.",
    "background_effects_button": "Activează efectele de fundal",
    "next_theme_title": "Încercați noua temă Trilium",
    "next_theme_message": "Utilizați tema clasică, doriți să încercați noua temă?",
@@ -2151,6 +2159,7 @@
    "percentage": "%"
  },
  "pagination": {
+    "page_title": "Pagina pentru {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} notițe"
  },
  "collections": {
@@ -2272,14 +2281,5 @@
    "pages_other": "{{count}} de pagini",
    "pages_alt": "Pagina {{pageNumber}}",
    "pages_loading": "Încărcare..."
-  },
-  "platform_indicator": {
-    "available_on": "Disponibil pe {{platform}}"
-  },
-  "mobile_tab_switcher": {
-    "title_one": "{{count}} tab",
-    "title_few": "{{count}} taburi",
-    "title_other": "{{count}} de taburi",
-    "more_options": "Mai multe opțiuni"
  }
 }
--- a/apps/client/src/translations/ru/translation.json
+++ b/apps/client/src/translations/ru/translation.json
@@ -668,8 +668,7 @@
  "geo-map": {
    "unable-to-load-map": "Не удалось загрузить карту.",
    "create-child-note-instruction": "Щелкните по карте, чтобы создать новую заметку в этом месте, или нажмите Escape, чтобы закрыть ее.",
-    "create-child-note-title": "Создать новую дочернюю заметку и добавить ее на карту",
-    "create-child-note-text": "Добавить маркер"
+    "create-child-note-title": "Создать новую дочернюю заметку и добавить ее на карту"
  },
  "note_tooltip": {
    "quick-edit": "Быстрое редактирование",
@@ -686,8 +685,8 @@
  "electron_integration": {
    "zoom-factor": "Коэффициент масштабирования",
    "restart-app-button": "Применить изменения и перезапустить приложение",
-    "background-effects-description": "Добавляет размытый, стильный фон окнам приложений, создавая глубину и современный вид. Опция \"Системная строка заголовка\" должна быть отключена.",
-    "background-effects": "Включить фоновые эффекты",
+    "background-effects-description": "Эффект Mica добавляет размытый, стильный фон окнам приложений, создавая глубину и современный вид. Опция \"Системная строка заголовка\" должна быть отключена.",
+    "background-effects": "Включить фоновые эффекты (только Windows 11)",
    "native-title-bar-description": "В Windows и macOS отключение системной строки заголовка делает приложение более компактным. В Linux включение системной строки заголовка улучшает интеграцию с остальной частью системы.",
    "native-title-bar": "Системная панель заголовка",
    "desktop-application": "Десктопное приложение"
@@ -777,11 +776,7 @@
    "refresh-saved-search-results": "Обновить сохраненные результаты поиска",
    "automatically-collapse-notes-title": "Заметки будут свернуты после определенного периода бездействия, чтобы навести порядок в дереве.",
    "toggle-sidebar": "Переключить боковую панель",
-    "dropping-not-allowed": "Перетаскивание заметок в эту область не разрешено.",
-    "shared-indicator-tooltip": "Эта заметка опубликована",
-    "shared-indicator-tooltip-with-url": "Эта заметка доступно публично по адресу: {{- url}}",
-    "subtree-hidden-moved-description-other": "В дереве, к которому относится эта заметка, скрыты дочерние заметки.",
-    "subtree-hidden-moved-description-collection": "Эта коллекция скрывает свои дочерние заметки в дереве."
+    "dropping-not-allowed": "Перетаскивание заметок в эту область не разрешено."
  },
  "quick-search": {
    "no-results": "Результаты не найдены",
@@ -861,10 +856,7 @@
    "convert-to-attachment-confirm": "Вы уверены, что хотите преобразовать выбранные заметки во вложения их родительских заметок? Эта операция применяется только к заметкам в виде изображений; другие заметки будут пропущены.",
    "converted-to-attachments": "{{count}} заметок были преобразованы во вложения.",
    "archive": "Архивировать",
-    "unarchive": "Разархивировать",
-    "open-in-a-new-window": "Открыть в новом окне",
-    "hide-subtree": "Скрыть поддерево",
-    "show-subtree": "Показать поддерево"
+    "unarchive": "Разархивировать"
  },
  "info": {
    "closeButton": "Закрыть",
@@ -1008,8 +1000,7 @@
    "switch_to_mobile_version": "Перейти на мобильную версию",
    "switch_to_desktop_version": "Переключиться на версию для ПК",
    "new-version-available": "Доступно обновление",
-    "download-update": "Обновить до {{latestVersion}}",
-    "search_notes": "Поиск заметок"
+    "download-update": "Обновить до {{latestVersion}}"
  },
  "zpetne_odkazy": {
    "relation": "отношение",
@@ -1056,8 +1047,7 @@
    "expand_all_levels": "Развернуть все вложенные уровни",
    "expand_nth_level": "Развернуть уровни: {{depth}} шт.",
    "expand_first_level": "Развернуть прямые дочерние уровни",
-    "expand_tooltip": "Разщвернуть дочерние элементы этой коллекции (на один уровень вложенности). Для получения дополнительных параметров нажмите стрелку справа.",
-    "hide_child_notes": "Скрыть дочерние заметки в дереве"
+    "expand_tooltip": "Разщвернуть дочерние элементы этой коллекции (на один уровень вложенности). Для получения дополнительных параметров нажмите стрелку справа."
  },
  "edited_notes": {
    "deleted": "(удалено)",
@@ -1702,7 +1692,7 @@
    "zoom_in_title": "Увеличить масштаб",
    "zoom_out_title": "Уменьшить масштаб",
    "reset_pan_zoom_title": "Сбросить панорамирование и масштабирование",
-    "create_child_note_title": "Создать дочернюю заметку и добавить ее в карту"
+    "create_child_note_title": "Создать новую дочернюю заметку и добавить ее в эту карту связей"
  },
  "code_auto_read_only_size": {
    "unit": "символов",
@@ -1855,8 +1845,7 @@
    "error_cannot_get_branch_id": "Невозможно получить branchId для notePath '{{notePath}}'",
    "delete_this_note": "Удалить эту заметку",
    "insert_child_note": "Вставить дочернюю заметку",
-    "note_revisions": "История изменений",
-    "content_language_switcher": "Язык содержимого: {{language}}"
+    "note_revisions": "История изменений"
  },
  "svg_export_button": {
    "button_title": "Экспортировать диаграмму как SVG"
@@ -1911,7 +1900,7 @@
    "dismiss": "Отклонить",
    "background_effects_button": "Включить эффекты фона",
    "next_theme_button": "Попробовать новую тему",
-    "background_effects_message": "На устройствах с ОС Windows или macOS, фоновые эффекты теперь полностью стабильны. Они добавляют цвета в пользовательский интерфейс, размывая фон за ним.",
+    "background_effects_message": "На устройствах Windows фоновые эффекты теперь полностью стабильны. Они добавляют цвет в пользовательский интерфейс, размывая фон за ним. Этот приём также используется в других приложениях, например, в проводнике Windows.",
    "background_effects_title": "Фоновые эффекты теперь стабильны",
    "next_theme_title": "Попробуйте новую тему Trilium",
    "new_layout_button": "Подробнее",
@@ -1999,6 +1988,11 @@
    "attachment_deleted": "Это вложение было удалено.",
    "you_can_also_open": ", вы также можете открыть "
  },
+  "web_view": {
+    "web_view": "Веб-страница",
+    "create_label": "Для начала создайте метку с URL-адресом, который вы хотите встроить, например, #webViewSrc=\"https://www.google.com\"",
+    "embed_websites": "Заметки типа \"Веб-страница\" позволяет встраивать веб-сайты в Trilium."
+  },
  "ribbon": {
    "widgets": "Виджеты ленты",
    "promoted_attributes_message": "Вкладка \"Продвигаемые атрибуты\" будет автоматически открыта, если таковые атрибуты установлены у заметки",
@@ -2081,6 +2075,10 @@
  "help-button": {
    "title": "Открыть соответствующую страницу справки"
  },
+  "render": {
+    "note_detail_render_help_2": "Тип заметки «Рендер HTML» используется для <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">скриптинга</a>. Если коротко, у вас есть заметка с HTML-кодом (возможно, с добавлением JavaScript), и эта заметка её отобразит. Для этого необходимо определить <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">отношение</a> с именем «renderNote», указывающее на HTML-заметку для отрисовки.",
+    "note_detail_render_help_1": "Эта справочная заметка отображается, поскольку эта справка типа Render HTML не имеет необходимой связи для правильной работы."
+  },
  "file": {
    "too_big": "В целях повышения производительности в режиме предварительного просмотра отображаются только первые {{maxNumChars}} символов файла. Загрузите файл и откройте его во внешнем браузере, чтобы увидеть всё содержимое.",
    "file_preview_not_available": "Предварительный просмотр файла недоступен для этого файла."
@@ -2096,11 +2094,7 @@
    "ui": "Пользовательский интерфейс"
  },
  "sql_result": {
-    "no_rows": "По этому запросу не возвращено ни одной строки",
-    "not_executed": "Запрос еще не выполнен.",
-    "failed": "Выполнение SQL-запроса завершилось с ошибкой",
-    "statement_result": "Результат заявления",
-    "execute_now": "Выполнить сейчас"
+    "no_rows": "По этому запросу не возвращено ни одной строки"
  },
  "editable_code": {
    "placeholder": "Введите содержимое для заметки с кодом..."
@@ -2150,7 +2144,8 @@
    "rendering_error": "Невозможно отобразить содержимое из-за ошибки."
  },
  "pagination": {
-    "total_notes": "{{count}} заметок"
+    "total_notes": "{{count}} заметок",
+    "page_title": "Страница {{startIndex}} - {{endIndex}}"
  },
  "status_bar": {
    "attributes_one": "{{count}} атрибут",
@@ -2194,14 +2189,7 @@
    "read_only_auto_description": "Эта заметка была автоматически переведена в режим только для чтения по соображениям производительности. Это автоматическое ограничение можно изменить в настройках.\n\nНажмите, чтобы временно отредактировать её.",
    "read_only_auto": "Автоматический режим \"только для чтения\"",
    "read_only_explicit_description": "Эта заметка была вручную установлена в режим «только для чтения».\nНажмите, чтобы временно отредактировать её.",
-    "read_only_explicit": "Только для чтения",
-    "save_status_saving": "Сохранение...",
-    "save_status_saved": "Сохранение",
-    "save_status_unsaved": "Не сохранено",
-    "save_status_error": "Ошибка сохранения",
-    "save_status_saving_tooltip": "Изменения сохраняются.",
-    "save_status_unsaved_tooltip": "Есть несохраненные изменения. Они будут сохранены автоматически через некоторое время.",
-    "save_status_error_tooltip": "Произошла ошибка при сохранении заметки. Если возможно, попробуйте скопировать содержимое заметки в другое место и перезагрузить приложение."
+    "read_only_explicit": "Только для чтения"
  },
  "breadcrumb": {
    "hoisted_badge_title": "Снять фокус",
@@ -2255,30 +2243,5 @@
  },
  "attributes_panel": {
    "title": "Атрибуты заметки"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "Закладки"
-  },
-  "mobile_tab_switcher": {
-    "more_options": "Показать больше",
-    "title_one": "{{count}} вкладка",
-    "title_few": "{{count}} вкладки",
-    "title_many": "{{count}} вкладок"
-  },
-  "pdf": {
-    "pages_loading": "Загрузка...",
-    "pages_alt": "Страница {{pageNumber}}",
-    "pages_one": "{{count}} страница",
-    "pages_few": "{{count}} страницы",
-    "pages_many": "{{count}} страниц",
-    "layers_one": "{{count}} слой",
-    "layers_few": "{{count}} слоя",
-    "layers_many": "{{count}} слоев",
-    "attachments_one": "{{count}} вложение",
-    "attachments_few": "{{count}} вложения",
-    "attachments_many": "{{count}} вложений"
-  },
-  "platform_indicator": {
-    "available_on": "Доступно для {{platform}}"
  }
 }
--- a/apps/client/src/translations/tw/translation.json
+++ b/apps/client/src/translations/tw/translation.json
@@ -662,8 +662,7 @@
    "show-cheatsheet": "顯示快捷鍵說明",
    "toggle-zen-mode": "禪模式",
    "new-version-available": "發現新更新",
-    "download-update": "取得版本 {{latestVersion}}",
-    "search_notes": "搜尋筆記"
+    "download-update": "取得版本 {{latestVersion}}"
  },
  "sync_status": {
    "unknown": "<p>同步狀態將在下一次同步嘗試開始後顯示。</p><p>點擊以立即觸發同步。</p>",
@@ -758,9 +757,7 @@
    "delete_this_note": "刪除此筆記",
    "error_cannot_get_branch_id": "無法獲取 notePath '{{notePath}}' 的 branchId",
    "error_unrecognized_command": "無法識別的命令 {{command}}",
-    "note_revisions": "筆記歷史版本",
-    "backlinks": "反向連結",
-    "content_language_switcher": "內文語言：{{language}}"
+    "note_revisions": "筆記歷史版本"
  },
  "note_icon": {
    "change_note_icon": "更改筆記圖標",
@@ -912,8 +909,7 @@
    "unknown_search_option": "未知的搜尋選項 {{searchOptionName}}",
    "search_note_saved": "搜尋筆記已儲存至 {{- notePathTitle}}",
    "actions_executed": "已執行操作。",
-    "view_options": "查看選項：",
-    "option": "選項"
+    "view_options": "查看選項："
  },
  "similar_notes": {
    "title": "相似筆記",
@@ -1007,7 +1003,7 @@
    "no_attachments": "此筆記沒有附件。"
  },
  "book": {
-    "no_children_help": "此集合沒有任何子筆記，因此沒有內容可顯示。",
+    "no_children_help": "此類型為書籍的筆記沒有任何子筆記，因此沒有內容可顯示。請參閱 <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> 以了解詳情。",
    "drag_locked_title": "鎖定編輯",
    "drag_locked_message": "無法拖曳，因為此集合已被鎖定編輯。"
  },
@@ -1063,6 +1059,15 @@
    "default_new_note_title": "新筆記",
    "click_on_canvas_to_place_new_note": "點擊畫布以放置新筆記"
  },
+  "render": {
+    "note_detail_render_help_1": "之所以顯示此說明筆記，是因為該類型的渲染 HTML 沒有設定好必須的關聯。",
+    "note_detail_render_help_2": "渲染筆記類型用於編寫 <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">腳本</a>。簡單說就是您可以寫HTML程式碼（或者加上一些JavaScript程式碼）， 然後這個筆記會把頁面渲染出來。要使其正常工作，您需要定義一個名為 \"renderNote\" 的 <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">關聯</a> 指向要呈現的 HTML 筆記。"
+  },
+  "web_view": {
+    "web_view": "網頁顯示",
+    "embed_websites": "網頁顯示類型的筆記允許您將網站嵌入至 Trilium 中。",
+    "create_label": "首先，請新增一個帶有您要嵌入的 URL 地址的標籤，例如 #webViewSrc=\"https://www.bing.com\""
+  },
  "backend_log": {
    "refresh": "重新整理"
  },
@@ -1373,8 +1378,7 @@
    "description": "描述",
    "reload_app": "重新載入應用以套用更改",
    "set_all_to_default": "將所有快捷鍵重設為預設值",
-    "confirm_reset": "您確定要將所有鍵盤快捷鍵重設為預設值嗎？",
-    "no_results": "未找到符合 '{{filter}}' 的捷徑"
+    "confirm_reset": "您確定要將所有鍵盤快捷鍵重設為預設值嗎？"
  },
  "spellcheck": {
    "title": "拼寫檢查",
@@ -1578,9 +1582,7 @@
    "print_report_collection_content_one": "集合中的 {{count}} 篇筆記無法列印，因為它們不被支援或受到保護。",
    "print_report_collection_content_other": "",
    "print_report_collection_details_button": "查看詳情",
-    "print_report_collection_details_ignored_notes": "忽略的筆記",
-    "print_report_error_title": "列印失敗",
-    "print_report_stack_trace": "堆棧追蹤"
+    "print_report_collection_details_ignored_notes": "忽略的筆記"
  },
  "note_title": {
    "placeholder": "請輸入筆記標題...",
@@ -1937,8 +1939,8 @@
    "desktop-application": "桌面版應用程式",
    "native-title-bar": "原生標題列",
    "native-title-bar-description": "對於 Windows 和 macOS，關閉原生標題列會讓應用程式看起來更緊湊。在 Linux 上，開啟原生標題列可以與系統的其他部分整合得更好。",
-    "background-effects": "啟用背景效果",
-    "background-effects-description": "為程式視窗新增模糊且時尚的背景，營造立體感和現代化外觀。「原生標題列」必須被禁用。",
+    "background-effects": "啟用背景效果（僅適用於 Windows 11）",
+    "background-effects-description": "Mica 效果為程式視窗新增模糊且時尚的背景，營造出深度感和現代化外觀。「原生標題列」必須被禁用。",
    "restart-app-button": "重新啟動應用程式以查看更改",
    "zoom-factor": "縮放係數"
  },
@@ -1957,8 +1959,7 @@
  "geo-map": {
    "create-child-note-title": "建立一個新的子筆記並將其加至地圖中",
    "create-child-note-instruction": "點擊地圖以在該位置建立新筆記，或按 Escape 以取消。",
-    "unable-to-load-map": "無法載入地圖。",
-    "create-child-note-text": "新增地圖標記"
+    "unable-to-load-map": "無法載入地圖。"
  },
  "geo-map-context": {
    "open-location": "打開位置",
@@ -2074,8 +2075,7 @@
    "raster": "柵格",
    "vector_light": "向量（淺色）",
    "vector_dark": "向量（深色）",
-    "show-scale": "顯示比例尺",
-    "show-labels": "顯示標記名稱"
+    "show-scale": "顯示比例尺"
  },
  "table_context_menu": {
    "delete_row": "刪除列"
@@ -2122,7 +2122,7 @@
  },
  "call_to_action": {
    "background_effects_title": "背景特效已推出穩定版本",
-    "background_effects_message": "在 Windows 和macOS裝置上，背景特效現在已穩定。背景特效透過模糊背後的背景，為使用者介面增添一抹色彩。",
+    "background_effects_message": "在 Windows 裝置上，背景特效現在已完全穩定。背景特效透過模糊背後的背景，為使用者介面增添一抹色彩。此技術也用於其他應用程式，例如 Windows 檔案總管。",
    "background_effects_button": "啟用背景特效",
    "next_theme_title": "試用新 Trilium 主題",
    "next_theme_message": "您正在使用舊版主題，要試用新主題嗎？",
@@ -2154,6 +2154,7 @@
    "app-restart-required": "（需要重啟程式以套用更改）"
  },
  "pagination": {
+    "page_title": "第 {{startIndex}} - {{endIndex}} 頁",
    "total_notes": "{{count}} 筆記"
  },
  "collections": {
@@ -2266,60 +2267,5 @@
    "pages_other": "",
    "pages_alt": "第 {{pageNumber}} 頁",
    "pages_loading": "正在載入…"
-  },
-  "mobile_tab_switcher": {
-    "more_options": "更多選項",
-    "title_one": "{{count}} 個分頁",
-    "title_other": ""
-  },
-  "platform_indicator": {
-    "available_on": "可於 {{platform}} 使用"
-  },
-  "bookmark_buttons": {
-    "bookmarks": "書籤"
-  },
-  "render": {
-    "setup_title": "在此筆記中顯示自訂 HTML 或 Preact JSX",
-    "setup_create_sample_preact": "使用 Preact 建立範例筆記",
-    "setup_create_sample_html": "使用 HTML 建立範例筆記",
-    "setup_sample_created": "已建立一個範例筆記作為子筆記。",
-    "disabled_description": "此渲染筆記來自外部來源。為保護您免受惡意內容侵害，此功能預設為停用狀態。啟用前請務必確認來源可信。",
-    "disabled_button_enable": "啟用渲染筆記"
-  },
-  "web_view_setup": {
-    "title": "將網頁直接匯入 Trilium 建立即時預覽",
-    "url_placeholder": "輸入或貼上網站網址，例如 https://triliumnotes.org",
-    "create_button": "建立網頁檢視",
-    "invalid_url_title": "無效地址",
-    "invalid_url_message": "請輸入有效的網址，例如 https://triliumnotes.org。",
-    "disabled_description": "此網頁檢視來自外部來源。為協助保護您免受網路釣魚或惡意內容侵害，內容不會自動載入。若您信任來源，可手動啟用此功能。",
-    "disabled_button_enable": "啟用網頁檢視"
-  },
-  "active_content_badges": {
-    "type_icon_pack": "圖示包",
-    "type_backend_script": "後端腳本",
-    "type_frontend_script": "前端腳本",
-    "type_widget": "元件",
-    "type_app_css": "自訂 CSS",
-    "type_render_note": "渲染筆記",
-    "type_web_view": "網頁顯示",
-    "type_app_theme": "自訂主題",
-    "toggle_tooltip_enable_tooltip": "點擊以啟用此 {{type}}。",
-    "toggle_tooltip_disable_tooltip": "點擊以停用此 {{type}}。",
-    "menu_docs": "打開文件",
-    "menu_execute_now": "立即執行腳本",
-    "menu_run": "自動執行",
-    "menu_run_disabled": "手動",
-    "menu_run_backend_startup": "當後端啟動時",
-    "menu_run_hourly": "每小時",
-    "menu_run_daily": "每日",
-    "menu_run_frontend_startup": "當桌面前端啟動時",
-    "menu_run_mobile_startup": "當移動前端啟動時",
-    "menu_change_to_widget": "更改為元件",
-    "menu_change_to_frontend_script": "更改為前端腳本",
-    "menu_theme_base": "主題基底"
-  },
-  "setup_form": {
-    "more_info": "了解更多"
  }
 }
--- a/apps/client/src/translations/uk/translation.json
+++ b/apps/client/src/translations/uk/translation.json
@@ -1130,6 +1130,15 @@
    "default_new_note_title": "нова нотатка",
    "click_on_canvas_to_place_new_note": "Натисніть на полотно, щоб розмістити нову нотатку"
  },
+  "render": {
+    "note_detail_render_help_1": "Ця довідка відображається, оскільки ця нотатка типу Render HTML не має необхідного зв'язку для належного функціонування.",
+    "note_detail_render_help_2": "Тип нотатки Render HTML використовується для <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">скриптів</a>. Коротше кажучи, у вас є нотатка з HTML-кодом (за бажанням з деяким JavaScript), і ця нотатка її відобразить. Щоб це запрацювало, вам потрібно визначити <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">відношення</a> під назвою \"renderNote\", яке вказує на нотатку HTML для відображення."
+  },
+  "web_view": {
+    "web_view": "Веб-перегляд",
+    "embed_websites": "Нотатка типу Веб-перегляд дозволяє вбудовувати веб-сайти в Trilium.",
+    "create_label": "Для початку створіть мітку з URL-адресою, яку ви хочете вбудувати, наприклад, #webViewSrc=\"https://www.google.com\""
+  },
  "backend_log": {
    "refresh": "Оновити"
  },
@@ -2063,6 +2072,7 @@
    "app-restart-required": "(щоб зміни набули чинності, потрібен перезапуск програми)"
  },
  "pagination": {
+    "page_title": "Сторінка {{startIndex}} - {{endIndex}}",
    "total_notes": "{{count}} нотаток"
  },
  "collections": {
--- a/apps/client/src/types-lib.d.ts
+++ b/apps/client/src/types-lib.d.ts
@@ -63,13 +63,11 @@ declare global {

 declare module "preact" {
    namespace JSX {
-        interface ElectronWebViewElement extends JSX.HTMLAttributes<HTMLElement> {
-            src: string;
-            class: string;
-        }
-
        interface IntrinsicElements {
-            webview: ElectronWebViewElement;
+            webview: {
+                src: string;
+                class: string;
+            }
        }
    }
 }
--- a/apps/client/src/types.d.ts
+++ b/apps/client/src/types.d.ts
@@ -119,7 +119,7 @@ declare global {
        setNote(noteId: string);
    }

-    var logError: (message: string, e?: unknown) => void;
+    var logError: (message: string, e?: Error | string) => void;
    var logInfo: (message: string) => void;
    var glob: CustomGlobals;
    //@ts-ignore
--- a/apps/client/src/widgets/Backlinks.css
+++ b/apps/client/src/widgets/Backlinks.css
@@ -1,83 +0,0 @@
-.tn-backlinks-widget .backlinks-items {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    position: static;
-    width: unset;
-
-    > li {
-        --border-radius: 8px;
-
-        max-width: 600px;
-        padding: 10px 20px;
-        background: var(--card-background-color);
-
-        & + li {
-            margin-top: 2px;
-        }
-
-        &:first-child {
-            border-radius: var(--border-radius) var(--border-radius) 0 0;
-        }
-
-        &:last-child {
-            border-radius: 0 0 var(--border-radius) var(--border-radius);
-        }
-
-        /* Card header */
-        & > span:first-child {
-            display: block;
-
-            > span {
-                display: flex;
-                flex-wrap: wrap;
-                align-items: center;
-
-                /* Note path */
-                > small {
-                    flex: 100%;
-                    order: -1;
-                    font-size: .65rem;
-
-                    .note-path {
-                        padding: 0;
-                    }
-                }
-
-                /* Note icon */
-                > .tn-icon {
-                    color: var(--menu-item-icon-color);
-                }
-
-                /* Note title */
-                > a {
-                    margin-inline-start: 4px;
-                    color: currentColor;
-                    font-weight: 500;
-                }
-            }
-        }
-
-        /* Card content - excerpt */
-        .backlink-excerpt {
-            all: unset; /* TODO: Remove after disposing the old style from FloatingButtons.css */
-            display: block;
-
-            margin: 8px 0;
-            border-radius: 4px;
-            background: var(--quick-search-result-content-background);
-            padding: 8px;
-            font-size: .75rem;
-
-            a {
-                background: transparent;
-                color: var(--quick-search-result-highlight-color);
-                text-decoration: underline;
-            }
-
-            p {
-                margin: 0;
-            }
-        }
-    }
-}
--- a/apps/client/src/widgets/FloatingButtonsDefinitions.tsx
+++ b/apps/client/src/widgets/FloatingButtonsDefinitions.tsx
@@ -1,5 +1,3 @@
-import "./Backlinks.css";
-
 import { BacklinkCountResponse, BacklinksResponse, SaveSqlConsoleResponse } from "@triliumnext/commons";
 import { VNode } from "preact";
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "preact/hooks";
@@ -62,6 +60,14 @@ export const DESKTOP_FLOATING_BUTTONS: FloatingButtonsList = [
    Backlinks
 ];

+export const MOBILE_FLOATING_BUTTONS: FloatingButtonsList = [
+    RefreshBackendLogButton,
+    EditButton,
+    RelationMapButtons,
+    ExportImageButtons,
+    Backlinks
+];
+
 /**
 * Floating buttons that should be hidden in popup editor (Quick edit).
 */
--- a/apps/client/src/widgets/NoteDetail.css
+++ b/apps/client/src/widgets/NoteDetail.css
@@ -3,30 +3,6 @@
    font-family: var(--detail-font-family);
    font-size: var(--detail-font-size);
    contain: none;
-
-    &.fixed-tree {
-        display: flex;
-        flex-direction: column;
-        height: 100%;
-
-        .fixed-note-tree-container {
-            height: 60%;
-            border-bottom: 1px solid var(--main-border-color);
-            overflow: auto;
-
-            .tree-wrapper {
-                padding: 0;
-            }
-
-            .tree {
-                padding: 0;
-            }
-
-            ul {
-                margin: 0;
-            }
-        }
-    }
 }

 body.prefers-centered-content .note-detail {
@@ -36,4 +12,4 @@ body.prefers-centered-content .note-detail {

 .note-detail > * {
    contain: none;
-}
+}
--- a/apps/client/src/widgets/NoteDetail.tsx
+++ b/apps/client/src/widgets/NoteDetail.tsx
@@ -1,7 +1,5 @@
 import "./NoteDetail.css";

-import clsx from "clsx";
-import { note } from "mermaid/dist/rendering-util/rendering-elements/shapes/note.js";
 import { isValidElement, VNode } from "preact";
 import { useEffect, useRef, useState } from "preact/hooks";

@@ -14,9 +12,8 @@ import { t } from "../services/i18n";
 import protected_session_holder from "../services/protected_session_holder";
 import toast from "../services/toast.js";
 import { dynamicRequire, isElectron, isMobile } from "../services/utils";
-import NoteTreeWidget from "./note_tree";
 import { ExtendedNoteType, TYPE_MAPPINGS, TypeWidget } from "./note_types";
-import { useLegacyWidget, useNoteContext, useTriliumEvent } from "./react/hooks";
+import { useNoteContext, useTriliumEvent } from "./react/hooks";
 import { NoteListWithLinks } from "./react/NoteList";
 import { TypeWidgetProps } from "./type_widgets/type_widget";

@@ -39,7 +36,6 @@ export default function NoteDetail() {
    const [ noteTypesToRender, setNoteTypesToRender ] = useState<{ [ key in ExtendedNoteType ]?: (props: TypeWidgetProps) => VNode }>({});
    const [ activeNoteType, setActiveNoteType ] = useState<ExtendedNoteType>();
    const widgetRequestId = useRef(0);
-    const hasFixedTree = note && noteContext?.hoistedNoteId === "_lbMobileRoot" && isMobile() && note.noteId.startsWith("_lbMobile");

    const props: TypeWidgetProps = {
        note: note!,
@@ -123,6 +119,13 @@ export default function NoteDetail() {
        }
    });

+    // Fixed tree for launch bar config on mobile.
+    useEffect(() => {
+        if (!isMobile) return;
+        const hasFixedTree = noteContext?.hoistedNoteId === "_lbMobileRoot";
+        document.body.classList.toggle("force-fixed-tree", hasFixedTree);
+    }, [ note ]);
+
    // Handle toast notifications.
    useEffect(() => {
        if (!isElectron()) return;
@@ -212,13 +215,8 @@ export default function NoteDetail() {
    return (
        <div
            ref={containerRef}
-            class={clsx("component note-detail", {
-                "full-height": isFullHeight,
-                "fixed-tree": hasFixedTree
-            })}
+            class={`component note-detail ${isFullHeight ? "full-height" : ""}`}
        >
-            {hasFixedTree && <FixedTree noteContext={noteContext} />}
-
            {Object.entries(noteTypesToRender).map(([ itemType, Element ]) => {
                return <NoteDetailWrapper
                    Element={Element}
@@ -233,11 +231,6 @@ export default function NoteDetail() {
    );
 }

-function FixedTree({ noteContext }: { noteContext: NoteContext }) {
-    const [ treeEl ] = useLegacyWidget(() => new NoteTreeWidget(), { noteContext });
-    return <div class="fixed-note-tree-container">{treeEl}</div>;
-}
-
 /**
 * Wraps a single note type widget, in order to keep it in the DOM even after the user has switched away to another note type. This allows faster loading of the same note type again. The properties are cached, so that they are updated only
 * while the widget is visible, to avoid rendering in the background. When not visible, the DOM element is simply hidden.
@@ -356,14 +349,6 @@ export function checkFullHeight(noteContext: NoteContext | undefined, type: Exte
    // https://github.com/zadam/trilium/issues/2522
    const isBackendNote = noteContext?.noteId === "_backendLog";
    const isFullHeightNoteType = type && TYPE_MAPPINGS[type].isFullHeight;
-
-    // Allow vertical centering when there are no results.
-    if (type === "book" &&
-        [ "grid", "list" ].includes(noteContext.note?.getLabelValue("viewType") ?? "grid") &&
-        !noteContext.note?.hasChildren()) {
-        return true;
-    }
-
    return (!noteContext?.hasNoteList() && isFullHeightNoteType)
        || noteContext?.viewScope?.viewMode === "attachments"
        || isBackendNote;
@@ -379,33 +364,7 @@ function showToast(type: "printing" | "exporting_pdf", progress: number = 0) {
 }

 function handlePrintReport(printReport?: PrintReport) {
-    if (!printReport) return;
-
-    if (printReport.type === "error") {
-        toast.showPersistent({
-            id: "print-error",
-            icon: "bx bx-error-circle",
-            title: t("note_detail.print_report_error_title"),
-            message: printReport.message,
-            buttons: printReport.stack ? [
-                {
-                    text: t("note_detail.print_report_collection_details_button"),
-                    onClick(api) {
-                        api.dismissToast();
-                        dialog.info(<>
-                            <p>{printReport.message}</p>
-                            <details>
-                                <summary>{t("note_detail.print_report_stack_trace")}</summary>
-                                <pre style="font-size: 0.85em; overflow-x: auto;">{printReport.stack}</pre>
-                            </details>
-                        </>, {
-                            title: t("note_detail.print_report_error_title")
-                        });
-                    }
-                }
-            ] : undefined
-        });
-    } else if (printReport.type === "collection" && printReport.ignoredNoteIds.length > 0) {
+    if (printReport?.type === "collection" && printReport.ignoredNoteIds.length > 0) {
        toast.showPersistent({
            id: "print-report",
            icon: "bx bx-collection",
--- a/apps/client/src/widgets/PromotedAttributes.css
+++ b/apps/client/src/widgets/PromotedAttributes.css
@@ -16,10 +16,6 @@ body.mobile .promoted-attributes-widget {
    display: table;
 }

-body.experimental-feature-new-layout .promoted-attributes-container {
-    max-height: unset;
-}
-
 .promoted-attribute-cell {
    display: flex;
    align-items: center;
@@ -98,4 +94,4 @@ body.experimental-feature-new-layout .promoted-attributes-container {
    background: rgba(0, 0, 0, 0.5);
    transform: rotate(45deg);
    pointer-events: none;
-}
+}
--- a/apps/client/src/widgets/PromotedAttributes.tsx
+++ b/apps/client/src/widgets/PromotedAttributes.tsx
@@ -5,7 +5,6 @@ import clsx from "clsx";
 import { ComponentChild, HTMLInputTypeAttribute, InputHTMLAttributes, MouseEventHandler, TargetedEvent, TargetedInputEvent } from "preact";
 import { Dispatch, StateUpdater, useEffect, useRef, useState } from "preact/hooks";

-import NoteContext from "../components/note_context";
 import FAttribute from "../entities/fattribute";
 import FNote from "../entities/fnote";
 import { Attribute } from "../services/attribute_parser";
@@ -41,8 +40,8 @@ type OnChangeEventData = TargetedEvent<HTMLInputElement, Event> | InputEvent | J
 type OnChangeListener = (e: OnChangeEventData) => Promise<void>;

 export default function PromotedAttributes() {
-    const { note, componentId, noteContext } = useNoteContext();
-    const [ cells, setCells ] = usePromotedAttributeData(note, componentId, noteContext);
+    const { note, componentId } = useNoteContext();
+    const [ cells, setCells ] = usePromotedAttributeData(note, componentId);
    return <PromotedAttributesContent note={note} componentId={componentId} cells={cells} setCells={setCells} />;
 }

@@ -75,12 +74,12 @@ export function PromotedAttributesContent({ note, componentId, cells, setCells }
 *
 * The cells are returned as a state since they can also be altered internally if needed, for example to add a new empty cell.
 */
-export function usePromotedAttributeData(note: FNote | null | undefined, componentId: string, noteContext: NoteContext | undefined): [ Cell[] | undefined, Dispatch<StateUpdater<Cell[] | undefined>> ] {
+export function usePromotedAttributeData(note: FNote | null | undefined, componentId: string): [ Cell[] | undefined, Dispatch<StateUpdater<Cell[] | undefined>> ] {
    const [ viewType ] = useNoteLabel(note, "viewType");
    const [ cells, setCells ] = useState<Cell[]>();

    function refresh() {
-        if (!note || viewType === "table" || noteContext?.viewScope?.viewMode !== "default") {
+        if (!note || viewType === "table") {
            setCells([]);
            return;
        }
@@ -125,7 +124,7 @@ export function usePromotedAttributeData(note: FNote | null | undefined, compone
        setCells(cells);
    }

-    useEffect(refresh, [ note, viewType, noteContext ]);
+    useEffect(refresh, [ note, viewType ]);
    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
        if (loadResults.getAttributeRows(componentId).find((attr) => attributes.isAffecting(attr, note))) {
            refresh();
--- a/apps/client/src/widgets/buttons/global_menu.tsx
+++ b/apps/client/src/widgets/buttons/global_menu.tsx
@@ -29,6 +29,7 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
    const isVerticalLayout = !isHorizontalLayout;
    const parentComponent = useContext(ParentComponent);
    const { isUpdateAvailable, latestVersion } = useTriliumUpdateStatus();
+    const isMobileLocal = isMobile();
    const logoRef = useRef<SVGSVGElement>(null);
    useStaticTooltip(logoRef);

@@ -43,12 +44,9 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
                </div>}
            </>}
            noDropdownListStyle
-            mobileBackdrop
+            onShown={isMobileLocal ? () => document.getElementById("context-menu-cover")?.classList.add("show", "global-menu-cover") : undefined}
+            onHidden={isMobileLocal ? () => document.getElementById("context-menu-cover")?.classList.remove("show", "global-menu-cover") : undefined}
        >
-            {isMobile() && <>
-                <MenuItem command="searchNotes" icon="bx bx-search" text={t("global_menu.search_notes")} />
-                <FormDropdownDivider />
-            </>}

            <MenuItem command="openNewWindow" icon="bx bx-window-open" text={t("global_menu.open_new_window")} />
            <MenuItem command="showShareSubtree" icon="bx bx-share-alt" text={t("global_menu.show_shared_notes_subtree")} />
@@ -109,7 +107,8 @@ function BrowserOnlyOptions() {

 function DevelopmentOptions({ dropStart }: { dropStart: boolean }) {
    return <>
-        <FormListHeader text="Development Options" />
+        <FormDropdownDivider />
+        <FormListItem disabled>Development Options</FormListItem>
        <FormDropdownSubmenu icon="bx bx-test-tube" title="Experimental features" dropStart={dropStart}>
            {experimentalFeatures.map((feature) => (
                <ExperimentalFeatureToggle key={feature.id} experimentalFeature={feature as ExperimentalFeature} />
--- a/apps/client/src/widgets/collections/NoteList.css
+++ b/apps/client/src/widgets/collections/NoteList.css
@@ -2,12 +2,8 @@
    min-height: 0;
    max-width: var(--max-content-width); /* Inherited from .note-split */

-    overflow: visible;
+    overflow: auto;
    contain: none !important;
-
-    &.full-height {
-        overflow: auto;
-    }
 }

 body.prefers-centered-content .note-list-widget:not(.full-height) {
@@ -23,3 +19,14 @@ body.prefers-centered-content .note-list-widget:not(.full-height) {
 .note-list-widget video {
    height: 100%;
 }
+
+/* #region Pagination */
+.note-list-pager {
+    font-size: 1rem;
+
+    span.current-page {
+        text-decoration: underline;
+        font-weight: bold;
+    }
+}
+/* #endregion */
--- a/apps/client/src/widgets/collections/Pagination.css
+++ b/apps/client/src/widgets/collections/Pagination.css
@@ -1,88 +0,0 @@
-:where(.note-list-pager) {
-    --note-list-pager-page-button-width: 40px;
-    --note-list-pager-page-button-gap: 3px;
-    --note-list-pager-ellipsis-width: 20px;
-    --note-list-pager-justify-content: flex-end;
-
-    --note-list-pager-current-page-button-background-color: var(--button-group-active-button-background);
-    --note-list-pager-current-page-button-text-color: var(--button-group-active-button-text-color);
-}
-
-.note-list-pager-container {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    container: note-list-pager / inline-size;
-}
-
-.note-list-pager {
-    display: flex;
-    align-items: center;
-    font-size: .8rem;
-    align-self: var(--note-list-pager-justify-content);
-
-    .note-list-pager-nav-button {
-        --icon-button-icon-ratio: .75;
-    }
-
-    .note-list-pager-page-button-container {
-        display: flex;
-        align-items: baseline;
-        justify-content: space-around;
-        gap: var(--note-list-pager-page-button-gap);
-
-        &.note-list-pager-ellipsis-present {
-            /* Prevent the prev/next buttons from shifting when ellipses appear or disappear */
-            --_gap-max-width: calc((var(--note-list-pager-page-button-count) + 2) * var(--note-list-pager-page-button-gap));
-            
-            min-width: calc(var(--note-list-pager-page-button-count) * var(--note-list-pager-page-button-width)
-                        + (var(--note-list-pager-ellipsis-width) * 2)
-                        + var(--_gap-max-width));
-        }
-
-        .note-list-pager-page-button {
-            min-width: var(--note-list-pager-page-button-width);
-            padding-inline: 0;
-            padding-block: 4px;
-
-            &.note-list-pager-page-button-current {
-                background: var(--note-list-pager-current-page-button-background-color);
-                color: var(--note-list-pager-current-page-button-text-color);
-                font-weight: bold;
-                opacity: unset;
-            }
-        }
-
-        .note-list-pager-ellipsis {
-            display: inline-block;
-            width: var(--note-list-pager-ellipsis-width);
-            text-align: center;
-            opacity: .5;
-        }
-    }
-
-    .note-list-pager-narrow-counter {
-        display: none;
-        min-width: 60px;
-        text-align: center;
-        white-space: nowrap;
-    }
-
-    .note-list-pager-total-count {
-        margin-inline-start: 8px;
-        opacity: .5;
-        white-space: nowrap;
-    }
-
-    @container note-list-pager (max-width: 550px) {
-        .note-list-pager-page-button-container,
-        .note-list-pager-total-count {
-            display: none;
-        }
-
-        .note-list-pager-narrow-counter {
-            display: block;
-        }
-    }
-}
-
--- a/apps/client/src/widgets/collections/Pagination.tsx
+++ b/apps/client/src/widgets/collections/Pagination.tsx
@@ -4,10 +4,6 @@ import FNote from "../../entities/fnote";
 import froca from "../../services/froca";
 import { useNoteLabelInt } from "../react/hooks";
 import { t } from "../../services/i18n";
-import ActionButton from "../react/ActionButton";
-import Button from "../react/Button";
-import "./Pagination.css";
-import clsx from "clsx";

 interface PaginationContext {
    page: number;
@@ -21,106 +17,46 @@ interface PaginationContext {
 export function Pager({ page, pageSize, setPage, pageCount, totalNotes }: Omit<PaginationContext, "pageNotes">) {
    if (pageCount < 2) return;

+    let lastPrinted = false;
+    let children: ComponentChildren[] = [];
+    for (let i = 1; i <= pageCount; i++) {
+        if (pageCount < 20 || i <= 5 || pageCount - i <= 5 || Math.abs(page - i) <= 2) {
+            lastPrinted = true;
+
+            const startIndex = (i - 1) * pageSize + 1;
+            const endIndex = Math.min(totalNotes, i * pageSize);
+
+            if (i !== page) {
+                children.push((
+                    <a
+                        href="javascript:"
+                        title={t("pagination.page_title", { startIndex, endIndex })}
+                        onClick={() => setPage(i)}
+                    >
+                    {i}
+                    </a>
+                ))
+            } else {
+                // Current page
+                children.push(<span className="current-page">{i}</span>)
+            }
+
+            children.push(<>{" "}&nbsp;{" "}</>);
+        } else if (lastPrinted) {
+            children.push(<>{"... "}&nbsp;{" "}</>);
+            lastPrinted = false;
+        }
+    }
+
    return (
-        <div className="note-list-pager-container">
-            <div className="note-list-pager">
-                <ActionButton
-                    icon="bx bx-chevron-left"
-                    className="note-list-pager-nav-button"
-                    disabled={(page === 1)}
-                    text={t("pagination.prev_page")}
-                    onClick={() => setPage(page - 1)}
-                />
+        <div class="note-list-pager">
+            {children}

-                <PageButtons page={page} setPage={setPage} pageCount={pageCount} />
-                <div className="note-list-pager-narrow-counter">
-                    <strong>{page}</strong> / <strong>{pageCount}</strong>
-                </div>
-                            
-                <ActionButton
-                    icon="bx bx-chevron-right"
-                    className="note-list-pager-nav-button"
-                    disabled={(page === pageCount)}
-                    text={t("pagination.next_page")}
-                    onClick={() => setPage(page + 1)}
-                />
-
-                <div className="note-list-pager-total-count">
-                    {t("pagination.total_notes", { count: totalNotes })}
-                </div>
-            </div>
+            <span className="note-list-pager-total-count">({t("pagination.total_notes", { count: totalNotes })})</span>
        </div>
    )
 }

-interface PageButtonsProps {
-    page: number;
-    setPage: Dispatch<StateUpdater<number>>;
-    pageCount: number;
-}
-
-function PageButtons(props: PageButtonsProps) {
-    const maxButtonCount = 9;
-    const maxLeftRightSegmentLength = 2;
-    
-    // The left-side segment
-    const leftLength = Math.min(props.pageCount, maxLeftRightSegmentLength);
-    const leftStart = 1;
-
-    // The middle segment
-    const middleMaxLength = maxButtonCount - maxLeftRightSegmentLength * 2;
-    const middleLength = Math.min(props.pageCount - leftLength, middleMaxLength);
-    let middleStart = props.page - Math.floor(middleLength / 2);
-    middleStart = Math.max(middleStart, leftLength + 1);
-
-    // The right-side segment
-    const rightLength = Math.min(props.pageCount - (middleLength + leftLength), maxLeftRightSegmentLength);
-    const rightStart = props.pageCount - rightLength + 1;
-    middleStart = Math.min(middleStart, rightStart - middleLength);
-
-    const totalButtonCount = leftLength + middleLength + rightLength;
-    const hasLeadingEllipsis =  (middleStart - leftLength > 1);
-    const hasTrailingEllipsis = (rightStart - (middleStart + middleLength - 1) > 1);
-
-    return <div className={clsx("note-list-pager-page-button-container", {
-                    "note-list-pager-ellipsis-present": (totalButtonCount === maxButtonCount)
-                })}
-                style={{"--note-list-pager-page-button-count": totalButtonCount}}>
-        {[
-            ...createSegment(leftStart, leftLength, props.page, props.setPage, false),
-            ...createSegment(middleStart, middleLength, props.page, props.setPage, hasLeadingEllipsis),
-            ...createSegment(rightStart, rightLength, props.page, props.setPage, hasTrailingEllipsis),
-        ]}
-    </div>;
-}
-
-function createSegment(start: number, length: number, currentPage: number, setPage: Dispatch<StateUpdater<number>>, prependEllipsis: boolean): ComponentChildren[] {
-    const children: ComponentChildren[] = [];
-    
-    if (prependEllipsis) {
-        children.push(<span className="note-list-pager-ellipsis">...</span>);
-    }
-
-    for (let i = 0; i < length; i++) {
-        const pageNum = start + i;
-        const isCurrent = (pageNum === currentPage);
-        children.push((
-            <Button
-                text={pageNum.toString()}
-                kind="lowProfile"
-                className={clsx(
-                    "note-list-pager-page-button",
-                    {"note-list-pager-page-button-current": isCurrent}
-                )}
-                disabled={isCurrent}
-                onClick={() => setPage(pageNum)}
-            />
-        ));
-    }
-
-    return children;
-}
-
 export function usePagination(note: FNote, noteIds: string[]): PaginationContext {
    const [ page, setPage ] = useState(1);
    const [ pageNotes, setPageNotes ] = useState<FNote[]>();
--- a/apps/client/src/widgets/collections/board/index.css
+++ b/apps/client/src/widgets/collections/board/index.css
@@ -10,6 +10,12 @@
  --card-padding: 0.6em;
 }

+body.mobile .board-view {
+  scroll-snap-type: x mandatory;
+  -webkit-overflow-scrolling: touch;
+  scroll-behavior: smooth;
+}
+
 .board-view-container {
  height: 100%;
  display: flex;
@@ -20,12 +26,6 @@
  overflow-x: auto;
 }

-body.mobile .board-view-container {
-  scroll-snap-type: x mandatory;
-  -webkit-overflow-scrolling: touch;
-  scroll-behavior: smooth;
-}
-
 .board-view-container .board-column {
  width: 250px;
  flex-shrink: 0;
--- a/apps/client/src/widgets/collections/calendar/index.tsx
+++ b/apps/client/src/widgets/collections/calendar/index.tsx
@@ -79,7 +79,6 @@ export const LOCALE_MAPPINGS: Record<DISPLAYABLE_LOCALE_IDS, (() => Promise<{ de
    es: () => import("@fullcalendar/core/locales/es"),
    fr: () => import("@fullcalendar/core/locales/fr"),
    it: () => import("@fullcalendar/core/locales/it"),
-    ga: null,
    cn: () => import("@fullcalendar/core/locales/zh-cn"),
    tw: () => import("@fullcalendar/core/locales/zh-tw"),
    ro: () => import("@fullcalendar/core/locales/ro"),
--- a/apps/client/src/widgets/collections/geomap/index.css
+++ b/apps/client/src/widgets/collections/geomap/index.css
@@ -7,21 +7,13 @@

  > .collection-properties {
    position: relative;
-    z-index: 998;
+    z-index: 2000;
  }
 }

-body.mobile .geo-view > .collection-properties {
-    z-index: 2500;
-}
-
 .geo-map-container {
  height: 100%;
  overflow: hidden;
-
-  .maplibregl-canvas-container {
-    position: relative;
-  }
 }

 .leaflet-pane {
@@ -30,7 +22,7 @@ body.mobile .geo-view > .collection-properties {

 .leaflet-top,
 .leaflet-bottom {
-  z-index: 997 !important;
+  z-index: 997;
 }

 .geo-view.placing-note .geo-map-container {
--- a/apps/client/src/widgets/collections/geomap/index.tsx
+++ b/apps/client/src/widgets/collections/geomap/index.tsx
@@ -22,7 +22,7 @@ import { ViewModeProps } from "../interface";
 import { createNewNote, moveMarker } from "./api";
 import openContextMenu, { openMapContextMenu } from "./context_menu";
 import Map from "./map";
-import { DEFAULT_MAP_LAYER_NAME, MAP_LAYERS, MapLayer } from "./map_layer";
+import { DEFAULT_MAP_LAYER_NAME } from "./map_layer";
 import Marker, { GpxTrack } from "./marker";

 const DEFAULT_COORDINATES: [number, number] = [3.878638227135724, 446.6630455551659];
@@ -45,11 +45,10 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
    const [ state, setState ] = useState(State.Normal);
    const [ coordinates, setCoordinates ] = useState(viewConfig?.view?.center);
    const [ zoom, setZoom ] = useState(viewConfig?.view?.zoom);
+    const [ layerName ] = useNoteLabel(note, "map:style");
    const [ hasScale ] = useNoteLabelBoolean(note, "map:scale");
-    const [ hideLabels ] = useNoteLabelBoolean(note, "map:hideLabels");
    const [ isReadOnly ] = useNoteLabelBoolean(note, "readOnly");
    const [ notes, setNotes ] = useState<FNote[]>([]);
-    const layerData = useLayerData(note);
    const spacedUpdate = useSpacedUpdate(() => {
        if (viewConfig) {
            saveConfig(viewConfig);
@@ -153,7 +152,7 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
                apiRef={apiRef} containerRef={containerRef}
                coordinates={coordinates}
                zoom={zoom}
-                layerData={layerData}
+                layerName={layerName ?? DEFAULT_MAP_LAYER_NAME}
                viewportChanged={(coordinates, zoom) => {
                    if (!viewConfig) viewConfig = {};
                    viewConfig.view = { center: coordinates, zoom };
@@ -163,35 +162,13 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
                onContextMenu={onContextMenu}
                scale={hasScale}
            >
-                {notes.map(note => <NoteWrapper note={note} isReadOnly={isReadOnly} hideLabels={hideLabels} />)}
+                {notes.map(note => <NoteWrapper note={note} isReadOnly={isReadOnly} />)}
            </Map>}
            <GeoMapTouchBar state={state} map={apiRef.current} />
        </div>
    );
 }

-function useLayerData(note: FNote) {
-    const [ layerName ] = useNoteLabel(note, "map:style");
-    // Memo is needed because it would generate unnecessary reloads due to layer change.
-    const layerData = useMemo(() => {
-        // Custom layers.
-        if (layerName?.startsWith("http")) {
-            return {
-                name: "Custom",
-                type: "raster",
-                url: layerName,
-                attribution: ""
-            } satisfies MapLayer;
-        }
-
-        // Built-in layers.
-        const layerData = MAP_LAYERS[layerName ?? ""] ?? MAP_LAYERS[DEFAULT_MAP_LAYER_NAME];
-        return layerData;
-    }, [ layerName ]);
-
-    return layerData;
-}
-
 function ToggleReadOnlyButton({ note }: { note: FNote }) {
    const [ isReadOnly, setReadOnly ] = useNoteLabelBoolean(note, "readOnly");

@@ -202,26 +179,22 @@ function ToggleReadOnlyButton({ note }: { note: FNote }) {
    />;
 }

-function NoteWrapper({ note, isReadOnly, hideLabels }: {
-    note: FNote,
-    isReadOnly: boolean,
-    hideLabels: boolean
-}) {
+function NoteWrapper({ note, isReadOnly }: { note: FNote, isReadOnly: boolean }) {
    const mime = useNoteProperty(note, "mime");
    const [ location ] = useNoteLabel(note, LOCATION_ATTRIBUTE);

    if (mime === "application/gpx+xml") {
-        return <NoteGpxTrack note={note} hideLabels={hideLabels} />;
+        return <NoteGpxTrack note={note} />;
    }

    if (location) {
        const latLng = location?.split(",", 2).map((el) => parseFloat(el)) as [ number, number ] | undefined;
        if (!latLng) return;
-        return <NoteMarker note={note} editable={!isReadOnly} latLng={latLng} hideLabels={hideLabels} />;
+        return <NoteMarker note={note} editable={!isReadOnly} latLng={latLng} />;
    }
 }

-function NoteMarker({ note, editable, latLng, hideLabels }: { note: FNote, editable: boolean, latLng: [number, number], hideLabels: boolean }) {
+function NoteMarker({ note, editable, latLng }: { note: FNote, editable: boolean, latLng: [number, number] }) {
    // React to changes
    const [ color ] = useNoteLabel(note, "color");
    const [ iconClass ] = useNoteLabel(note, "iconClass");
@@ -229,9 +202,8 @@ function NoteMarker({ note, editable, latLng, hideLabels }: { note: FNote, edita

    const title = useNoteProperty(note, "title");
    const icon = useMemo(() => {
-        const titleOrNone = hideLabels ? undefined : title;
-        return buildIcon(note.getIcon(), note.getColorClass() ?? undefined, titleOrNone, note.noteId, archived);
-    }, [ iconClass, color, title, note.noteId, archived, hideLabels ]);
+        return buildIcon(note.getIcon(), note.getColorClass() ?? undefined, title, note.noteId, archived);
+    }, [ iconClass, color, title, note.noteId, archived]);

    const onClick = useCallback(() => {
        appContext.triggerCommand("openInPopup", { noteIdOrPath: note.noteId });
@@ -263,7 +235,7 @@ function NoteMarker({ note, editable, latLng, hideLabels }: { note: FNote, edita
    />;
 }

-function NoteGpxTrack({ note, hideLabels }: { note: FNote, hideLabels?: boolean }) {
+function NoteGpxTrack({ note }: { note: FNote }) {
    const [ xmlString, setXmlString ] = useState<string>();
    const blob = useNoteBlob(note);

@@ -284,7 +256,7 @@ function NoteGpxTrack({ note, hideLabels }: { note: FNote, hideLabels?: boolean

    const options = useMemo<GPXOptions>(() => ({
        markers: {
-            startIcon: buildIcon(note.getIcon(), note.getColorClass(), hideLabels ? undefined : note.title),
+            startIcon: buildIcon(note.getIcon(), note.getColorClass(), note.title),
            endIcon: buildIcon("bxs-flag-checkered"),
            wptIcons: {
                "": buildIcon("bx bx-pin")
@@ -293,7 +265,7 @@ function NoteGpxTrack({ note, hideLabels }: { note: FNote, hideLabels?: boolean
        polyline_options: {
            color: note.getLabelValue("color") ?? "blue"
        }
-    }), [ color, iconClass, hideLabels ]);
+    }), [ color, iconClass ]);
    return xmlString && <GpxTrack gpxXmlString={xmlString} options={options} />;
 }

--- a/apps/client/src/widgets/collections/geomap/map.tsx
+++ b/apps/client/src/widgets/collections/geomap/map.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useImperativeHandle, useRef, useState } from "preact/hooks";
 import L, { control, LatLng, Layer, LeafletMouseEvent } from "leaflet";
 import "leaflet/dist/leaflet.css";
-import { MAP_LAYERS, type MapLayer } from "./map_layer";
+import { MAP_LAYERS } from "./map_layer";
 import { ComponentChildren, createContext, RefObject } from "preact";
 import { useElementSize, useSyncedRef } from "../../react/hooks";

@@ -12,7 +12,7 @@ interface MapProps {
    containerRef?: RefObject<HTMLDivElement>;
    coordinates: LatLng | [number, number];
    zoom: number;
-    layerData: MapLayer;
+    layerName: string;
    viewportChanged: (coordinates: LatLng, zoom: number) => void;
    children: ComponentChildren;
    onClick?: (e: LeafletMouseEvent) => void;
@@ -21,7 +21,7 @@ interface MapProps {
    scale: boolean;
 }

-export default function Map({ coordinates, zoom, layerData, viewportChanged, children, onClick, onContextMenu, scale, apiRef, containerRef: _containerRef, onZoom }: MapProps) {
+export default function Map({ coordinates, zoom, layerName, viewportChanged, children, onClick, onContextMenu, scale, apiRef, containerRef: _containerRef, onZoom }: MapProps) {
    const mapRef = useRef<L.Map>(null);
    const containerRef = useSyncedRef<HTMLDivElement>(_containerRef);

@@ -49,6 +49,8 @@ export default function Map({ coordinates, zoom, layerData, viewportChanged, chi
    const [ layer, setLayer ] = useState<Layer>();
    useEffect(() => {
        async function load() {
+            const layerData = MAP_LAYERS[layerName];
+
            if (layerData.type === "vector") {
                const style = (typeof layerData.style === "string" ? layerData.style : await layerData.style());
                await import("@maplibre/maplibre-gl-leaflet");
@@ -66,7 +68,7 @@ export default function Map({ coordinates, zoom, layerData, viewportChanged, chi
        }

        load();
-    }, [ layerData ]);
+    }, [ layerName ]);

    // Attach layer to the map.
    useEffect(() => {
@@ -137,7 +139,7 @@ export default function Map({ coordinates, zoom, layerData, viewportChanged, chi
    return (
        <div
            ref={containerRef}
-            className={`geo-map-container ${layerData.isDarkTheme ? "dark" : ""}`}
+            className={`geo-map-container ${MAP_LAYERS[layerName].isDarkTheme ? "dark" : ""}`}
        >
            <ParentMap.Provider value={mapRef.current}>
                {children}
--- a/apps/client/src/widgets/collections/geomap/map_layer.ts
+++ b/apps/client/src/widgets/collections/geomap/map_layer.ts
@@ -1,17 +1,20 @@
-export type MapLayer = ({
+export interface MapLayer {
+    name: string;
+    isDarkTheme?: boolean;
+}
+
+interface VectorLayer extends MapLayer {
    type: "vector";
    style: string | (() => Promise<{}>)
-} | {
+}
+
+interface RasterLayer extends MapLayer {
    type: "raster";
    url: string;
    attribution: string;
-}) & {
-    // Common properties
-    name: string;
-    isDarkTheme?: boolean;
-};
+}

-export const MAP_LAYERS: Record<string, MapLayer> = {
+export const MAP_LAYERS: Record<string, VectorLayer | RasterLayer> = {
    "openstreetmap": {
        name: "OpenStreetMap",
        type: "raster",
--- a/apps/client/src/widgets/collections/legacy/ListOrGridView.css
+++ b/apps/client/src/widgets/collections/legacy/ListOrGridView.css
@@ -1,5 +1,5 @@
 .note-list {
-    overflow: visible;
+    overflow: hidden;
    position: relative;
    height: 100%;
 }
@@ -100,206 +100,23 @@
    overflow: auto;
 }

-/* #region List view */
-
-@keyframes note-preview-show {
-    from {
-        opacity: 0;
-    } to {
-        opacity: 1;
-    }
+.note-expander {
+    font-size: x-large;
+    position: relative;
+    top: 3px;
+    cursor: pointer;
 }

-.nested-note-list {
-    --card-nested-section-indent: 25px;
-
-    &.search-results {
-        --card-nested-section-indent: 32px;
-    }
+.note-list-pager {
+    text-align: center;
 }

-/* List item */
-.nested-note-list-item {
-    h5 {
-        display: flex;
-        align-items: center;
-        font-size: 1em;
-        font-weight: normal;
-        margin: 0;
-    }
-
-    .note-expander {
-        margin-inline-end: 4px;
-        font-size: x-large;
-        cursor: pointer;
-    }
-
-    .tn-icon {
-        margin-inline-end: 8px;
-        color: var(--note-list-view-icon-color);
-        font-size: 1.2em;
-    }
-
-    .note-book-title {
-        --link-hover-background: transparent;
-        --link-hover-color: currentColor;
-        color: inherit;
-        font-weight: normal;
-    }
-
-    .note-path {
-        margin-left: 0.5em;
-        vertical-align: middle;
-        opacity: 0.5;
-    }
-
-    .note-list-attributes {
-        flex-grow: 1;
-        margin-inline-start: 1em;
-        text-align: right;
-        font-size: .75em;
-        opacity: .75;
-    }
-
-    .nested-note-list-item-menu {
-        margin-inline-start: 8px;
-        flex-shrink: 0;
-    }
-
-    &.archived {
-        span.tn-icon + span,
-        .tn-icon {
-            opacity: .6;
-        }
-    }
-
-    &.use-note-color {
-        span.tn-icon + span,
-        .nested-note-list:not(.search-results) & .tn-icon,
-        .rendered-note-attributes {
-            color: var(--custom-color);
-        }
-    }
+.note-list.list-view .note-path {
+    margin-left: 0.5em;
+    vertical-align: middle;
+    opacity: 0.5;
 }

-.nested-note-list:not(.search-results) h5 {
-    span.tn-icon + span,
-    .note-list-attributes {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-}
-
-/* List item (search results view) */
-.nested-note-list.search-results .nested-note-list-item {
-    span.tn-icon + span > span {
-        display: flex;
-        flex-direction: column-reverse;
-        align-items: flex-start;
-    }
-
-    small {
-        line-height: .85em;
-    }
-
-    .note-path {
-        margin-left: 0;
-        font-size: .85em;
-        line-height: .85em;
-        font-weight: 500;
-        letter-spacing: .5pt;
-    }
-
-    .tn-icon {
-        display: flex;
-        flex-shrink: 0;
-        justify-content: center;
-        align-items: center;
-        width: 1.75em;
-        height: 1.75em;
-        margin-inline-end: 12px;
-        border-radius: 50%;
-        background: var(--note-icon-custom-background-color, var(--note-list-view-large-icon-background));
-        font-size: 1.2em;
-        color: var(--note-icon-custom-color, var(--note-list-view-large-icon-color));
-    }
-
-    h5 .ck-find-result {
-        background: var(--note-list-view-search-result-highlight-background);
-        color: var(--note-list-view-search-result-highlight-color);
-        font-weight: 600;
-        text-decoration: underline;
-    }
-}
-
-/* Note content preview */
-.nested-note-list .note-book-content {
-    display: none;
-    outline: 1px solid var(--note-list-view-content-background);
-    border-radius: 8px;
-    background-color: var(--note-list-view-content-background);
-    overflow: hidden;
-    user-select: text;
-    font-size: .85rem;
-    animation: note-preview-show .25s ease-out;
-    will-change: opacity;
-
-    &.note-book-content-ready {
-        display: block;
-    }
-
-    > .rendered-content > *:last-child {
-        margin-bottom: 0;
-    }
-
-    &.type-text {
-        padding: 8px 24px;
-
-        .ck-content > *:last-child {
-            margin-bottom: 0;
-        }
-    }
-
-    &.type-protectedSession {
-        padding: 20px;
-    }
-
-    &.type-image {
-        padding: 0;
-    }
-
-    &.type-pdf {
-        iframe {
-            height: 50vh;
-        }
-
-        .file-footer {
-            padding: 8px;
-        }
-    }
-
-    &.type-webView {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        min-height: 50vh;
-    }
-
-    .ck-find-result {
-        outline: 2px solid var(--note-list-view-content-search-result-highlight-background);
-        border-radius: 4px;
-        background: var(--note-list-view-content-search-result-highlight-background);
-        color: var(--note-list-view-content-search-result-highlight-color);
-    }
-}
-
-.note-content-preview:has(.note-book-content:empty) {
-    display: none;
-}
-
-/* #endregion */
-
 /* #region Grid view */
 .note-list.grid-view .note-list-container {
    display: flex;
@@ -311,10 +128,6 @@
    border: 1px solid transparent;
 }

-body.mobile .note-list.grid-view .note-book-card {
-    flex-basis: 150px;
-}
-
 .note-list.grid-view .note-book-card {
    max-height: 300px;
 }
--- a/apps/client/src/widgets/collections/legacy/ListOrGridView.tsx
+++ b/apps/client/src/widgets/collections/legacy/ListOrGridView.tsx
@@ -1,5 +1,4 @@
 import "./ListOrGridView.css";
-import { Card, CardSection } from "../../react/Card";

 import { useEffect, useRef, useState } from "preact/hooks";

@@ -15,11 +14,6 @@ import NoteLink from "../../react/NoteLink";
 import { ViewModeProps } from "../interface";
 import { Pager, usePagination } from "../Pagination";
 import { filterChildNotes, useFilteredNoteIds } from "./utils";
-import { JSX } from "preact/jsx-runtime";
-import { clsx } from "clsx";
-import ActionButton from "../../react/ActionButton";
-import linkContextMenuService from "../../../menus/link_context_menu";
-import { TargetedMouseEvent } from "preact";

 export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }: ViewModeProps<{}>) {
    const expandDepth = useExpansionDepth(note);
@@ -39,7 +33,7 @@ export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
            { noteIds.length > 0 && <div class="note-list-wrapper">
                {!hasCollectionProperties && <Pager {...pagination} />}

-                <Card className={clsx("nested-note-list", {"search-results": (noteType === "search")})}>
+                <div class="note-list-container use-tn-links">
                    {pageNotes?.map(childNote => (
                        <ListNoteCard
                            key={childNote.noteId}
@@ -47,7 +41,7 @@ export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
                            expandDepth={expandDepth} highlightedTokens={highlightedTokens}
                            currentLevel={1} includeArchived={includeArchived} />
                    ))}
-                </Card>
+                </div>

                <Pager {...pagination} />
            </div>}
@@ -99,52 +93,27 @@ function ListNoteCard({ note, parentNote, highlightedTokens, currentLevel, expan
    // Reset expand state if switching to another note, or if user manually toggled expansion state.
    useEffect(() => setExpanded(currentLevel <= expandDepth), [ note, currentLevel, expandDepth ]);

-    let subSections: JSX.Element | undefined = undefined;
-    if (isExpanded) {
-        subSections = <>
-            <CardSection className="note-content-preview">
-                <NoteContent note={note}
-                             highlightedTokens={highlightedTokens}
-                             noChildrenList
-                             includeArchivedNotes={includeArchived} />
-            </CardSection>
-
-            <NoteChildren note={note}
-                          parentNote={parentNote}
-                          highlightedTokens={highlightedTokens}
-                          currentLevel={currentLevel}
-                          expandDepth={expandDepth}
-                          includeArchived={includeArchived} />
-        </>
-    }
-    
    return (
-        <CardSection
-            className={clsx("nested-note-list-item", "no-tooltip-preview", note.getColorClass(), {
-                "expanded": isExpanded,
-                "archived": note.isArchived
-            })}
-            subSections={subSections}
-            subSectionsVisible={isExpanded}
-            highlightOnHover
+        <div
+            className={`note-book-card no-tooltip-preview ${isExpanded ? "expanded" : ""} ${note.isArchived ? "archived" : ""}`}
            data-note-id={note.noteId}
        >
-            <h5>
-                <span className={`note-expander ${isExpanded ? "bx bx-chevron-down" : "bx bx-chevron-right"}`} 
-                      onClick={() => setExpanded(!isExpanded)}/>
-                <Icon className="note-icon" icon={note.getIcon()} />
-                <NoteLink className="note-book-title"
-                          notePath={notePath}
-                          noPreview
-                          showNotePath={parentNote.type === "search"}
-                          highlightedTokens={highlightedTokens} />
-                <NoteAttributes note={note} />
-                <ActionButton className="nested-note-list-item-menu"
-                              icon="bx bx-dots-vertical-rounded" text=""
-                              onClick={(e) => openNoteMenu(notePath, e)} 
+            <h5 className="note-book-header">
+                <span
+                    className={`note-expander ${isExpanded ? "bx bx-chevron-down" : "bx bx-chevron-right"}`}
+                    onClick={() => setExpanded(!isExpanded)}
                />
+
+                <Icon className="note-icon" icon={note.getIcon()} />
+                <NoteLink className="note-book-title" notePath={notePath} noPreview showNotePath={parentNote.type === "search"} highlightedTokens={highlightedTokens} />
+                <NoteAttributes note={note} />
            </h5>
-        </CardSection>
+
+            {isExpanded && <>
+                <NoteContent note={note} highlightedTokens={highlightedTokens} noChildrenList includeArchivedNotes={includeArchived} />
+                <NoteChildren note={note} parentNote={parentNote} highlightedTokens={highlightedTokens} currentLevel={currentLevel} expandDepth={expandDepth} includeArchived={includeArchived} />
+            </>}
+        </div>
    );
 }

@@ -196,9 +165,6 @@ export function NoteContent({ note, trim, noChildrenList, highlightedTokens, inc
    const contentRef = useRef<HTMLDivElement>(null);
    const highlightSearch = useImperativeSearchHighlighlighting(highlightedTokens);

-    const [ready, setReady] = useState(false);
-    const [noteType, setNoteType] = useState<string>("none");
-
    useEffect(() => {
        content_renderer.getRenderedContent(note, {
            trim,
@@ -213,19 +179,17 @@ export function NoteContent({ note, trim, noChildrenList, highlightedTokens, inc
                } else {
                    contentRef.current.replaceChildren();
                }
+                contentRef.current.classList.add(`type-${type}`);
                highlightSearch(contentRef.current);
-                setNoteType(type);
-                setReady(true);
            })
            .catch(e => {
                console.warn(`Caught error while rendering note '${note.noteId}' of type '${note.type}'`);
                console.error(e);
                contentRef.current?.replaceChildren(t("collections.rendering_error"));
-                setReady(true);
            });
    }, [ note, highlightedTokens ]);

-    return <div ref={contentRef} className={clsx("note-book-content", `type-${noteType}`, {"note-book-content-ready": ready})} />;
+    return <div ref={contentRef} className="note-book-content" />;
 }

 function NoteChildren({ note, parentNote, highlightedTokens, currentLevel, expandDepth, includeArchived }: {
@@ -274,8 +238,3 @@ function useExpansionDepth(note: FNote) {
    return parseInt(expandDepth, 10);

 }
-
-function openNoteMenu(notePath, e: TargetedMouseEvent<HTMLElement>) {
-    linkContextMenuService.openContextMenu(notePath, e);
-    e.stopPropagation()
-}
--- a/apps/client/src/widgets/containers/root_container.ts
+++ b/apps/client/src/widgets/containers/root_container.ts
@@ -1,12 +1,11 @@
-import { LOCALES } from "@triliumnext/commons";
-
 import { EventData } from "../../components/app_context.js";
-import { getEnabledExperimentalFeatureIds } from "../../services/experimental_features.js";
-import options from "../../services/options.js";
-import utils, { isMobile } from "../../services/utils.js";
+import { LOCALES } from "@triliumnext/commons";
 import { readCssVar } from "../../utils/css-var.js";
-import type BasicWidget from "../basic_widget.js";
 import FlexContainer from "./flex_container.js";
+import options from "../../services/options.js";
+import type BasicWidget from "../basic_widget.js";
+import utils from "../../services/utils.js";
+import { getEnabledExperimentalFeatureIds } from "../../services/experimental_features.js";

 /**
 * The root container is the top-most widget/container, from which the entire layout derives.
@@ -18,12 +17,14 @@ import FlexContainer from "./flex_container.js";
 * - `#root-container.vertical-layout`, if the current layout is horizontal.
 */
 export default class RootContainer extends FlexContainer<BasicWidget> {
+    private originalViewportHeight: number;

    constructor(isHorizontalLayout: boolean) {
        super(isHorizontalLayout ? "column" : "row");

        this.id("root-widget");
        this.css("height", "100dvh");
+        this.originalViewportHeight = getViewportHeight();
    }

    render(): JQuery<HTMLElement> {
@@ -38,7 +39,6 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
        this.#setThemeCapabilities();
        this.#setLocaleAndDirection(options.get("locale"));
        this.#setExperimentalFeatures();
-        this.#initPWATopbarColor();

        return super.render();
    }
@@ -64,12 +64,8 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
    }

    #onMobileResize() {
-        const viewportHeight = window.visualViewport?.height ?? window.innerHeight;
-        const windowHeight = window.innerHeight;
-
-        // If viewport is significantly smaller, keyboard is likely open
-        const isKeyboardOpened = windowHeight - viewportHeight > 150;
-
+        const currentViewportHeight = getViewportHeight();
+        const isKeyboardOpened = (currentViewportHeight < this.originalViewportHeight);
        this.$widget.toggleClass("virtual-keyboard-opened", isKeyboardOpened);
    }

@@ -92,7 +88,7 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
    }

    #setBackdropEffects() {
-        const enabled = options.is("backdropEffectsEnabled") && !isMobile();
+        const enabled = options.is("backdropEffectsEnabled");
        document.body.classList.toggle("backdrop-effects-disabled", !enabled);
    }

@@ -100,7 +96,7 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
        // Supports background effects

        const useBgfx = readCssVar(document.documentElement, "allow-background-effects")
-            .asBoolean(false);
+                        .asBoolean(false);

        document.body.classList.toggle("theme-supports-background-effects", useBgfx);
    }
@@ -116,23 +112,8 @@ export default class RootContainer extends FlexContainer<BasicWidget> {
        document.body.lang = locale;
        document.body.dir = correspondingLocale?.rtl ? "rtl" : "ltr";
    }
-
-    #initPWATopbarColor() {
-        if (!utils.isPWA()) return;
-        const tracker = $("#background-color-tracker");
-
-        if (tracker.length) {
-            const applyThemeColor = () => {
-                let meta = $("meta[name='theme-color']");
-                if (!meta.length) {
-                    meta = $(`<meta name="theme-color">`).appendTo($("head"));
-                }
-                meta.attr("content", tracker.css("color"));
-            };
-
-            tracker.on("transitionend", applyThemeColor);
-            applyThemeColor();
-        }
-    }
 }

+function getViewportHeight() {
+    return window.visualViewport?.height ?? window.innerHeight;
+}
--- a/apps/client/src/widgets/containers/scrolling_container.css
+++ b/apps/client/src/widgets/containers/scrolling_container.css
@@ -1,26 +1,14 @@
 .scrolling-container {
-    --content-margin-inline: 24px;
-
    overflow: auto;
    scroll-behavior: smooth;
    position: relative;

-    > .note-detail > .note-detail-editable-text > .note-detail-editable-text-editor,
+    > .inline-title,
+    > .note-detail > .note-detail-editable-text,
    > .note-list-widget:not(.full-height) .note-list-wrapper {
-        margin-inline: var(--content-margin-inline);
+        padding-inline: 24px;
    }

-    > .inline-title {
-        padding-inline: var(--content-margin-inline);
-    }
-
-    > .note-detail > .note-detail-editable-text > .note-detail-editable-text-editor {
-        overflow: unset;
-    }
-}
-
-body.mobile .scrolling-container {
-    --content-margin-inline: 8px;
 }

 .note-split.type-code:not(.mime-text-x-sqlite) {
--- a/apps/client/src/widgets/dialogs/PopupEditor.css
+++ b/apps/client/src/widgets/dialogs/PopupEditor.css
@@ -32,12 +32,6 @@ body.mobile .modal.popup-editor-dialog .modal-dialog {
    display: flex;
    align-items: center;
    margin-block: 0;
-
-    .note-icon-widget {
-        display: flex;
-        align-items: center;
-        margin-inline-start: 0;
-    }
 }

 .modal.popup-editor-dialog .modal-header .note-title-widget {
@@ -97,9 +91,8 @@ body.mobile .modal.popup-editor-dialog .modal-dialog {
    height: 100%;
 }

-.modal.popup-editor-dialog .note-detail-editable-text-editor {
-    margin: 0 28px;
-    overflow: visible; /* Allow selection rectangle to go outside of the editor area */
+.modal.popup-editor-dialog .note-detail-editable-text {
+    padding: 0 1em;
 }

 .modal.popup-editor-dialog .note-detail-file {
--- a/apps/client/src/widgets/dialogs/PopupEditor.tsx
+++ b/apps/client/src/widgets/dialogs/PopupEditor.tsx
@@ -5,15 +5,13 @@ import { useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";

 import appContext from "../../components/app_context";
 import NoteContext from "../../components/note_context";
-import { isExperimentalFeatureEnabled } from "../../services/experimental_features";
 import froca from "../../services/froca";
 import { t } from "../../services/i18n";
 import tree from "../../services/tree";
 import utils from "../../services/utils";
 import NoteList from "../collections/NoteList";
 import FloatingButtons from "../FloatingButtons";
-import { DESKTOP_FLOATING_BUTTONS, POPUP_HIDDEN_FLOATING_BUTTONS } from "../FloatingButtonsDefinitions";
-import NoteBadges from "../layout/NoteBadges";
+import { DESKTOP_FLOATING_BUTTONS, MOBILE_FLOATING_BUTTONS, POPUP_HIDDEN_FLOATING_BUTTONS } from "../FloatingButtonsDefinitions";
 import NoteIcon from "../note_icon";
 import NoteTitleWidget from "../note_title";
 import NoteDetail from "../NoteDetail";
@@ -25,6 +23,8 @@ import ReadOnlyNoteInfoBar from "../ReadOnlyNoteInfoBar";
 import StandaloneRibbonAdapter from "../ribbon/components/StandaloneRibbonAdapter";
 import FormattingToolbar from "../ribbon/FormattingToolbar";
 import MobileEditorToolbar from "../type_widgets/text/mobile_editor_toolbar";
+import NoteBadges from "../layout/NoteBadges";
+import { isExperimentalFeatureEnabled } from "../../services/experimental_features";

 const isNewLayout = isExperimentalFeatureEnabled("new-layout");

@@ -34,7 +34,7 @@ export default function PopupEditor() {
    const [ noteContext, setNoteContext ] = useState(new NoteContext("_popup-editor"));
    const isMobile = utils.isMobile();
    const items = useMemo(() => {
-        const baseItems = isMobile ? [] : DESKTOP_FLOATING_BUTTONS;
+        const baseItems = isMobile ? MOBILE_FLOATING_BUTTONS : DESKTOP_FLOATING_BUTTONS;
        return baseItems.filter(item => !POPUP_HIDDEN_FLOATING_BUTTONS.includes(item));
    }, [ isMobile ]);

@@ -67,7 +67,10 @@ export default function PopupEditor() {
        <NoteContextContext.Provider value={noteContext}>
            <DialogWrapper>
                <Modal
-                    title={<TitleRow />}
+                    title={<>
+                        <TitleRow />
+                        {isNewLayout && <NoteBadges />}
+                    </>}
                    customTitleBarButtons={[{
                        iconClassName: "bx-expand-alt",
                        title: t("popup-editor.maximize"),
@@ -120,7 +123,6 @@ export function TitleRow() {
        <div className="title-row">
            <NoteIcon />
            <NoteTitleWidget />
-            {isNewLayout && <NoteBadges />}
        </div>
    );
 }
--- a/apps/client/src/widgets/dialogs/bulk_actions.tsx
+++ b/apps/client/src/widgets/dialogs/bulk_actions.tsx
@@ -57,7 +57,7 @@ export default function BulkActionsDialog() {
            className="bulk-actions-dialog"
            size="xl"
            title={t("bulk_actions.bulk_actions")}
-            footer={<Button text={t("bulk_actions.execute_bulk_actions")} kind="primary" />}
+            footer={<Button text={t("bulk_actions.execute_bulk_actions")} primary />}
            show={shown}
            onSubmit={async () => {
                await server.post("bulk-action/execute", {
--- a/apps/client/src/widgets/dialogs/delete_notes.tsx
+++ b/apps/client/src/widgets/dialogs/delete_notes.tsx
@@ -72,7 +72,7 @@ export default function DeleteNotesDialog() {
            footer={<>
                <Button text={t("delete_notes.cancel")}
                    onClick={() => setShown(false)} />
-                <Button text={t("delete_notes.ok")} kind="primary"
+                <Button text={t("delete_notes.ok")} primary
                    buttonRef={okButtonRef}
                    onClick={() => {
                        opts.callback?.({ proceed: true, deleteAllClones, eraseNotes });
--- a/apps/client/src/widgets/dialogs/export.tsx
+++ b/apps/client/src/widgets/dialogs/export.tsx
@@ -58,7 +58,7 @@ export default function ExportDialog() {
                setShown(false);
            }}
            onHidden={() => setShown(false)}
-            footer={<Button className="export-button" text={t("export.export")} kind="primary" />}
+            footer={<Button className="export-button" text={t("export.export")} primary />}
            show={shown}
        >

--- a/apps/client/src/widgets/dialogs/import.tsx
+++ b/apps/client/src/widgets/dialogs/import.tsx
@@ -55,7 +55,7 @@ export default function ImportDialog() {
                setShown(false);
                setFiles(null);
            }}
-            footer={<Button text={t("import.import")} kind="primary" disabled={!files} />}
+            footer={<Button text={t("import.import")} primary disabled={!files} />}
            show={shown}
        >
            <FormGroup name="files" label={t("import.chooseImportFile")} description={
--- a/apps/client/src/widgets/dialogs/prompt.tsx
+++ b/apps/client/src/widgets/dialogs/prompt.tsx
@@ -69,7 +69,7 @@ export default function PromptDialog() {
                submitValue.current = null;
                opts.current = undefined;
            }}
-            footer={<Button text={t("prompt.ok")} keyboardShortcut="Enter" kind="primary" />}
+            footer={<Button text={t("prompt.ok")} keyboardShortcut="Enter" primary />}
            show={shown}
            stackable
        >
--- a/apps/client/src/widgets/dialogs/revisions.tsx
+++ b/apps/client/src/widgets/dialogs/revisions.tsx
@@ -203,7 +203,7 @@ function RevisionPreview({noteContent, revisionItem, showDiff, setShown, onRevis
                                }} />
                            &nbsp;
                            <Button
-                                kind="primary"
+                                primary
                                icon="bx bx-download"
                                text={t("revisions.download_button")}
                                onClick={() => {
--- a/apps/client/src/widgets/dialogs/upload_attachments.tsx
+++ b/apps/client/src/widgets/dialogs/upload_attachments.tsx
@@ -35,7 +35,7 @@ export default function UploadAttachmentsDialog() {
            className="upload-attachments-dialog"
            size="lg"
            title={t("upload_attachments.upload_attachments_to_note")}
-            footer={<Button text={t("upload_attachments.upload")} kind="primary" disabled={!files || isUploading} />}
+            footer={<Button text={t("upload_attachments.upload")} primary disabled={!files || isUploading} />}
            onSubmit={async () => {
                if (!files || !parentNoteId) {
                    return;
--- a/apps/client/src/widgets/launch_bar/BookmarkButtons.tsx
+++ b/apps/client/src/widgets/launch_bar/BookmarkButtons.tsx
@@ -1,16 +1,11 @@
-import "./BookmarkButtons.css";
-
-import { CSSProperties } from "preact";
 import { useContext, useMemo } from "preact/hooks";
-
-import type FNote from "../../entities/fnote";
-import { t } from "../../services/i18n";
-import { FormDropdownSubmenu, FormListItem } from "../react/FormList";
-import { useChildNotes, useNote, useNoteIcon, useNoteLabelBoolean } from "../react/hooks";
-import NoteLink from "../react/NoteLink";
-import ResponsiveContainer from "../react/ResponsiveContainer";
-import { CustomNoteLauncher, launchCustomNoteLauncher } from "./GenericButtons";
 import { LaunchBarContext, LaunchBarDropdownButton, useLauncherIconAndTitle } from "./launch_bar_widgets";
+import { CSSProperties } from "preact";
+import type FNote from "../../entities/fnote";
+import { useChildNotes, useNoteLabelBoolean } from "../react/hooks";
+import "./BookmarkButtons.css";
+import NoteLink from "../react/NoteLink";
+import { CustomNoteLauncher } from "./GenericButtons";

 const PARENT_NOTE_ID = "_lbBookmarks";

@@ -24,64 +19,17 @@ export default function BookmarkButtons() {
    const childNotes = useChildNotes(PARENT_NOTE_ID);

    return (
-        <ResponsiveContainer
-            desktop={
-                <div style={style}>
-                    {childNotes?.map(childNote => <SingleBookmark key={childNote.noteId} note={childNote} />)}
-                </div>
-            }
-            mobile={
-                <LaunchBarDropdownButton
-                    icon="bx bx-bookmark"
-                    title={t("bookmark_buttons.bookmarks")}
-                >
-                    {childNotes?.map(childNote => <SingleBookmark key={childNote.noteId} note={childNote} />)}
-                </LaunchBarDropdownButton>
-            }
-        />
-    );
+        <div style={style}>
+            {childNotes?.map(childNote => <SingleBookmark key={childNote.noteId} note={childNote} />)}
+        </div>
+    )
 }

 function SingleBookmark({ note }: { note: FNote }) {
    const [ bookmarkFolder ] = useNoteLabelBoolean(note, "bookmarkFolder");
-    return <ResponsiveContainer
-        desktop={
-            bookmarkFolder
-                ? <BookmarkFolder note={note} />
-                : <CustomNoteLauncher launcherNote={note} getTargetNoteId={() => note.noteId} />
-        }
-        mobile={<MobileBookmarkItem noteId={note.noteId} bookmarkFolder={bookmarkFolder} />}
-    />;
-}
-
-function MobileBookmarkItem({ noteId, bookmarkFolder }: { noteId: string, bookmarkFolder: boolean }) {
-    const note = useNote(noteId);
-    const noteIcon = useNoteIcon(note);
-    if (!note) return null;
-
-    return (
-        !bookmarkFolder
-            ? <FormListItem icon={noteIcon} onClick={(e) => launchCustomNoteLauncher(e, { launcherNote: note, getTargetNoteId: () => note.noteId })}>{note.title}</FormListItem>
-            : <MobileBookmarkFolder note={note} />
-    );
-}
-
-function MobileBookmarkFolder({ note }: { note: FNote }) {
-    const childNotes = useChildNotes(note.noteId);
-
-    return (
-        <FormDropdownSubmenu icon="bx bx-folder" title={note.title}>
-            {childNotes.map(childNote => (
-                <FormListItem
-                    key={childNote.noteId}
-                    icon={childNote.getIcon()}
-                    onClick={(e) => launchCustomNoteLauncher(e, { launcherNote: childNote, getTargetNoteId: () => childNote.noteId })}
-                >
-                    {childNote.title}
-                </FormListItem>
-            ))}
-        </FormDropdownSubmenu>
-    );
+    return bookmarkFolder
+        ? <BookmarkFolder note={note} />
+        : <CustomNoteLauncher launcherNote={note} getTargetNoteId={() => note.noteId} />
 }

 function BookmarkFolder({ note }: { note: FNote }) {
@@ -107,5 +55,5 @@ function BookmarkFolder({ note }: { note: FNote }) {
                </ul>
            </div>
        </LaunchBarDropdownButton>
-    );
+    )
 }
--- a/apps/client/src/widgets/launch_bar/Calendar.tsx
+++ b/apps/client/src/widgets/launch_bar/Calendar.tsx
@@ -3,7 +3,7 @@ import clsx from "clsx";
 import server from "../../services/server";
 import { TargetedMouseEvent, VNode } from "preact";
 import { useEffect, useState } from "preact/hooks";
-import { Dayjs } from "@triliumnext/commons";
+import { Dayjs, getWeekInfo, WeekSettings } from "@triliumnext/commons";
 import { t } from "../../services/i18n";

 interface DateNotesForMonth {
@@ -22,6 +22,7 @@ const DAYS_OF_WEEK = [

 interface DateRangeInfo {
    weekNumbers: number[];
+    weekYears: number[];
    dates: Dayjs[];
 }

@@ -36,19 +37,27 @@ export interface CalendarArgs {

 export default function Calendar(args: CalendarArgs) {
    const [ rawFirstDayOfWeek ] = useTriliumOptionInt("firstDayOfWeek");
+    const [ firstWeekOfYear ] = useTriliumOptionInt("firstWeekOfYear");
+    const [ minDaysInFirstWeek ] = useTriliumOptionInt("minDaysInFirstWeek");
    const firstDayOfWeekISO = (rawFirstDayOfWeek === 0 ? 7 : rawFirstDayOfWeek);

+    const weekSettings = {
+        firstDayOfWeek: firstDayOfWeekISO,
+        firstWeekOfYear: firstWeekOfYear ?? 0,
+        minDaysInFirstWeek: minDaysInFirstWeek ?? 4
+    };
+
    const date = args.date;
    const firstDay = date.startOf('month');
    const firstDayISO = firstDay.isoWeekday();
-    const monthInfo = getMonthInformation(date, firstDayISO, firstDayOfWeekISO);
+    const monthInfo = getMonthInformation(date, firstDayISO, weekSettings);

    return (
        <>
            <CalendarWeekHeader rawFirstDayOfWeek={rawFirstDayOfWeek} />
            <div className="calendar-body" data-calendar-area="month">
-                {firstDayISO !== firstDayOfWeekISO && <PreviousMonthDays info={monthInfo.prevMonth} {...args} />}
-                <CurrentMonthDays firstDayOfWeekISO={firstDayOfWeekISO} {...args} />
+                {firstDayISO !== firstDayOfWeekISO && <PreviousMonthDays info={monthInfo.prevMonth} weekSettings={weekSettings} {...args} />}
+                <CurrentMonthDays weekSettings={weekSettings} {...args} />
                <NextMonthDays dates={monthInfo.nextMonth.dates} {...args} />
            </div>
        </>
@@ -67,7 +76,7 @@ function CalendarWeekHeader({ rawFirstDayOfWeek }: { rawFirstDayOfWeek: number }
    )
 }

-function PreviousMonthDays({ date, info: { dates, weekNumbers }, ...args }: { date: Dayjs, info: DateRangeInfo } & CalendarArgs) {
+function PreviousMonthDays({ date, info: { dates, weekNumbers, weekYears }, weekSettings, ...args }: { date: Dayjs, info: DateRangeInfo, weekSettings: WeekSettings } & CalendarArgs) {
    const prevMonth = date.subtract(1, 'month').format('YYYY-MM');
    const [ dateNotesForPrevMonth, setDateNotesForPrevMonth ] = useState<DateNotesForMonth>();

@@ -77,27 +86,28 @@ function PreviousMonthDays({ date, info: { dates, weekNumbers }, ...args }: { da

    return (
        <>
-            <CalendarWeek date={date} weekNumber={weekNumbers[0]} {...args} />
+            <CalendarWeek date={date} weekNumber={weekNumbers[0]} weekYear={weekYears[0]} {...args} />
            {dates.map(date => <CalendarDay key={date.toISOString()} date={date} dateNotesForMonth={dateNotesForPrevMonth} className="calendar-date-prev-month" {...args} />)}
        </>
    )
 }

-function CurrentMonthDays({ date, firstDayOfWeekISO, ...args }: { date: Dayjs, firstDayOfWeekISO: number } & CalendarArgs) {
+function CurrentMonthDays({ date, weekSettings, ...args }: { date: Dayjs, weekSettings: WeekSettings } & CalendarArgs) {
    let dateCursor = date;
    const currentMonth = date.month();
    const items: VNode[] = [];
    const curMonthString = date.format('YYYY-MM');
    const [ dateNotesForCurMonth, setDateNotesForCurMonth ] = useState<DateNotesForMonth>();
+    const { firstDayOfWeek, firstWeekOfYear, minDaysInFirstWeek } = weekSettings;

    useEffect(() => {
        server.get<DateNotesForMonth>(`special-notes/notes-for-month/${curMonthString}`).then(setDateNotesForCurMonth);
    }, [ date ]);

    while (dateCursor.month() === currentMonth) {
-        const weekNumber = getWeekNumber(dateCursor, firstDayOfWeekISO);
-        if (dateCursor.isoWeekday() === firstDayOfWeekISO) {
-            items.push(<CalendarWeek key={`${dateCursor.year()}-W${weekNumber}`} date={dateCursor} weekNumber={weekNumber} {...args}/>)
+        const { weekYear, weekNumber } = getWeekInfo(dateCursor, weekSettings);
+        if (dateCursor.isoWeekday() === firstDayOfWeek) {
+            items.push(<CalendarWeek key={`${weekYear}-W${weekNumber}`} date={dateCursor} weekNumber={weekNumber} weekYear={weekYear} {...args}/>)
        }

        items.push(<CalendarDay key={dateCursor.toISOString()} date={dateCursor} dateNotesForMonth={dateNotesForCurMonth} {...args} />)
@@ -141,14 +151,8 @@ function CalendarDay({ date, dateNotesForMonth, className, activeDate, todaysDat
    );
 }

-function CalendarWeek({ date, weekNumber, weekNotes, onWeekClicked }: { weekNumber: number, weekNotes: string[] } & Pick<CalendarArgs, "date" | "onWeekClicked">) {
-    const localDate = date.local();
-
-    // Handle case where week is in between years.
-    let year = localDate.year();
-    if (localDate.month() === 11 && weekNumber === 1) year++;
-
-    const weekString = `${year}-W${String(weekNumber).padStart(2, '0')}`;
+function CalendarWeek({ date, weekNumber, weekYear, weekNotes, onWeekClicked }: { weekNumber: number, weekYear: number, weekNotes: string[] } & Pick<CalendarArgs, "date" | "onWeekClicked">) {
+    const weekString = `${weekYear}-W${String(weekNumber).padStart(2, '0')}`;

    if (onWeekClicked) {
        return (
@@ -169,33 +173,33 @@ function CalendarWeek({ date, weekNumber, weekNotes, onWeekClicked }: { weekNumb
        >{weekNumber}</span>);
 }

-export function getMonthInformation(date: Dayjs, firstDayISO: number, firstDayOfWeekISO: number) {
+export function getMonthInformation(date: Dayjs, firstDayISO: number, weekSettings: WeekSettings) {
    return {
-        prevMonth: getPrevMonthDays(date, firstDayISO, firstDayOfWeekISO),
-        nextMonth: getNextMonthDays(date, firstDayOfWeekISO)
+        prevMonth: getPrevMonthDays(date, firstDayISO, weekSettings),
+        nextMonth: getNextMonthDays(date, weekSettings.firstDayOfWeek)
    }
 }

-function getPrevMonthDays(date: Dayjs, firstDayISO: number, firstDayOfWeekISO: number): DateRangeInfo {
+function getPrevMonthDays(date: Dayjs, firstDayISO: number, weekSettings: WeekSettings): DateRangeInfo {
    const prevMonthLastDay = date.subtract(1, 'month').endOf('month');
-    const daysToAdd = (firstDayISO - firstDayOfWeekISO + 7) % 7;
+    const daysToAdd = (firstDayISO - weekSettings.firstDayOfWeek + 7) % 7;
    const dates: Dayjs[] = [];

    const firstDay = date.startOf('month');
-    const weekNumber = getWeekNumber(firstDay, firstDayOfWeekISO);
+    const { weekYear, weekNumber } = getWeekInfo(firstDay, weekSettings);

    // Get dates from previous month
    for (let i = daysToAdd - 1; i >= 0; i--) {
        dates.push(prevMonthLastDay.subtract(i, 'day'));
    }

-    return { weekNumbers: [ weekNumber ], dates };
+    return { weekNumbers: [ weekNumber ], weekYears: [ weekYear ], dates };
 }

-function getNextMonthDays(date: Dayjs, firstDayOfWeekISO: number): DateRangeInfo {
+function getNextMonthDays(date: Dayjs, firstDayOfWeek: number): DateRangeInfo {
    const lastDayOfMonth = date.endOf('month');
    const lastDayISO = lastDayOfMonth.isoWeekday();
-    const lastDayOfUserWeek = ((firstDayOfWeekISO + 6 - 1) % 7) + 1;
+    const lastDayOfUserWeek = ((firstDayOfWeek + 6 - 1) % 7) + 1;
    const nextMonthFirstDay = date.add(1, 'month').startOf('month');
    const dates: Dayjs[] = [];

@@ -206,16 +210,5 @@ function getNextMonthDays(date: Dayjs, firstDayOfWeekISO: number): DateRangeInfo
            dates.push(nextMonthFirstDay.add(i, 'day'));
        }
    }
-    return { weekNumbers: [], dates };
-}
-
-export function getWeekNumber(date: Dayjs, firstDayOfWeekISO: number): number {
-    const weekStart = getWeekStartDate(date, firstDayOfWeekISO);
-    return weekStart.isoWeek();
-}
-
-function getWeekStartDate(date: Dayjs, firstDayOfWeekISO: number): Dayjs {
-    const currentISO = date.isoWeekday();
-    const diff = (currentISO - firstDayOfWeekISO + 7) % 7;
-    return date.clone().subtract(diff, "day").startOf("day");
+    return { weekNumbers: [], weekYears: [], dates };
 }
--- a/apps/client/src/widgets/launch_bar/GenericButtons.tsx
+++ b/apps/client/src/widgets/launch_bar/GenericButtons.tsx
@@ -7,18 +7,32 @@ import { isCtrlKey } from "../../services/utils";
 import { useGlobalShortcut, useNoteLabel } from "../react/hooks";
 import { LaunchBarActionButton, useLauncherIconAndTitle } from "./launch_bar_widgets";

-export function CustomNoteLauncher(props: {
+export function CustomNoteLauncher({ launcherNote, getTargetNoteId, getHoistedNoteId }: {
    launcherNote: FNote;
    getTargetNoteId: (launcherNote: FNote) => string | null | Promise<string | null>;
    getHoistedNoteId?: (launcherNote: FNote) => string | null;
    keyboardShortcut?: string;
 }) {
-    const { launcherNote, getTargetNoteId } = props;
    const { icon, title } = useLauncherIconAndTitle(launcherNote);

    const launch = useCallback(async (evt: MouseEvent | KeyboardEvent) => {
-        await launchCustomNoteLauncher(evt, props);
-    }, [ props ]);
+        if (evt.which === 3) {
+            return;
+        }
+
+        const targetNoteId = await getTargetNoteId(launcherNote);
+        if (!targetNoteId) return;
+
+        const hoistedNoteIdWithDefault = getHoistedNoteId?.(launcherNote) || appContext.tabManager.getActiveContext()?.hoistedNoteId;
+        const ctrlKey = isCtrlKey(evt);
+
+        if ((evt.which === 1 && ctrlKey) || evt.which === 2) {
+            const activate = !!evt.shiftKey;
+            await appContext.tabManager.openInNewTab(targetNoteId, hoistedNoteIdWithDefault, activate);
+        } else {
+            await appContext.tabManager.openInSameTab(targetNoteId, hoistedNoteIdWithDefault);
+        }
+    }, [ launcherNote, getTargetNoteId, getHoistedNoteId ]);

    // Keyboard shortcut.
    const [ shortcut ] = useNoteLabel(launcherNote, "keyboardShortcut");
@@ -40,24 +54,3 @@ export function CustomNoteLauncher(props: {
        />
    );
 }
-
-export async function launchCustomNoteLauncher(evt: MouseEvent | KeyboardEvent, { launcherNote, getTargetNoteId, getHoistedNoteId }: {
-    launcherNote: FNote;
-    getTargetNoteId: (launcherNote: FNote) => string | null | Promise<string | null>;
-    getHoistedNoteId?: (launcherNote: FNote) => string | null;
-}) {
-    if (evt.which === 3) return;
-
-    const targetNoteId = await getTargetNoteId(launcherNote);
-    if (!targetNoteId) return;
-
-    const hoistedNoteIdWithDefault = getHoistedNoteId?.(launcherNote) || appContext.tabManager.getActiveContext()?.hoistedNoteId;
-    const ctrlKey = isCtrlKey(evt);
-
-    if ((evt.which === 1 && ctrlKey) || evt.which === 2) {
-        const activate = !!evt.shiftKey;
-        await appContext.tabManager.openInNewTab(targetNoteId, hoistedNoteIdWithDefault, activate);
-    } else {
-        await appContext.tabManager.openInSameTab(targetNoteId, hoistedNoteIdWithDefault);
-    }
-}
--- a/apps/client/src/widgets/launch_bar/SyncStatus.tsx
+++ b/apps/client/src/widgets/launch_bar/SyncStatus.tsx
@@ -1,14 +1,12 @@
-import "./SyncStatus.css";
-
-import { WebSocketMessage } from "@triliumnext/commons";
-import clsx from "clsx";
 import { useEffect, useRef, useState } from "preact/hooks";
-
+import "./SyncStatus.css";
 import { t } from "../../services/i18n";
-import sync from "../../services/sync";
+import clsx from "clsx";
 import { escapeQuotes } from "../../services/utils";
-import ws, { subscribeToMessages, unsubscribeToMessage } from "../../services/ws";
 import { useStaticTooltip, useTriliumOption } from "../react/hooks";
+import sync from "../../services/sync";
+import ws, { subscribeToMessages, unsubscribeToMessage } from "../../services/ws";
+import { WebSocketMessage } from "@triliumnext/commons";

 type SyncState = "unknown" | "in-progress"
    | "connected-with-changes" | "connected-no-changes"
@@ -55,29 +53,29 @@ export default function SyncStatus() {
    const spanRef = useRef<HTMLSpanElement>(null);
    const [ syncServerHost ] = useTriliumOption("syncServerHost");
    useStaticTooltip(spanRef, {
-        html: true,
-        title: escapeQuotes(title)
+        html: true
+        // TODO: Placement
    });

    return (syncServerHost &&
        <div class="sync-status-widget launcher-button">
            <div class="sync-status">
                <span
-                    key={syncState} // Force re-render when state changes to update tooltip content.
                    ref={spanRef}
                    className={clsx("sync-status-icon", `sync-status-${syncState}`, icon)}
+                    title={escapeQuotes(title)}
                    onClick={() => {
                        if (syncState === "in-progress") return;
                        sync.syncNow();
                    }}
                >
                    {hasChanges && (
-                        <span class="bx bxs-star sync-status-sub-icon" />
+                        <span class="bx bxs-star sync-status-sub-icon"></span>
                    )}
                </span>
            </div>
        </div>
-    );
+    )
 }

 function useSyncStatus() {
--- a/apps/client/src/widgets/launch_bar/launch_bar_widgets.tsx
+++ b/apps/client/src/widgets/launch_bar/launch_bar_widgets.tsx
@@ -49,7 +49,6 @@ export function LaunchBarDropdownButton({ children, icon, dropdownOptions, ...pr
                    placement: isHorizontalLayout ? "bottom" : "right"
                }
            }}
-            mobileBackdrop
            {...props}
        >{children}</Dropdown>
    );
--- a/apps/client/src/widgets/layout/ActiveContentBadges.tsx
+++ b/apps/client/src/widgets/layout/ActiveContentBadges.tsx
@@ -1,284 +0,0 @@
-import { BUILTIN_ATTRIBUTES } from "@triliumnext/commons";
-import clsx from "clsx";
-import { useEffect, useState } from "preact/hooks";
-
-import FNote from "../../entities/fnote";
-import attributes from "../../services/attributes";
-import { t } from "../../services/i18n";
-import { openInAppHelpFromUrl } from "../../services/utils";
-import { BadgeWithDropdown } from "../react/Badge";
-import { FormDropdownDivider, FormListItem } from "../react/FormList";
-import FormToggle from "../react/FormToggle";
-import { useNoteContext, useNoteProperty, useTriliumEvent } from "../react/hooks";
-import { BookProperty, ViewProperty } from "../react/NotePropertyMenu";
-
-const NON_DANGEROUS_ACTIVE_CONTENT = [ "appCss", "appTheme" ];
-const DANGEROUS_ATTRIBUTES = BUILTIN_ATTRIBUTES.filter(a => a.isDangerous || NON_DANGEROUS_ACTIVE_CONTENT.includes(a.name));
-const activeContentLabels = [ "iconPack", "widget", "appCss", "appTheme" ] as const;
-
-interface ActiveContentInfo {
-    type: "iconPack" | "backendScript" | "frontendScript" | "widget" | "appCss" | "renderNote" | "webView" | "appTheme";
-    isEnabled: boolean;
-    canToggleEnabled: boolean;
-}
-
-const executeOption: BookProperty = {
-    type: "button",
-    icon: "bx bx-play",
-    label: t("active_content_badges.menu_execute_now"),
-    onClick: context => context.triggerCommand("runActiveNote")
-};
-
-const typeMappings: Record<ActiveContentInfo["type"], {
-    title: string;
-    icon: string;
-    helpPage: string;
-    apiDocsPage?: string;
-    isExecutable?: boolean;
-    additionalOptions?: BookProperty[];
-}> = {
-    iconPack: {
-        title: t("active_content_badges.type_icon_pack"),
-        icon: "bx bx-package",
-        helpPage: "g1mlRoU8CsqC",
-    },
-    backendScript: {
-        title: t("active_content_badges.type_backend_script"),
-        icon: "bx bx-server",
-        helpPage: "SPirpZypehBG",
-        apiDocsPage: "MEtfsqa5VwNi",
-        isExecutable: true,
-        additionalOptions: [
-            executeOption,
-            {
-                type: "combobox",
-                bindToLabel: "run",
-                label: t("active_content_badges.menu_run"),
-                icon: "bx bx-rss",
-                dropStart: true,
-                options: [
-                    { value: null, label: t("active_content_badges.menu_run_disabled") },
-                    { value: "backendStartup", label: t("active_content_badges.menu_run_backend_startup") },
-                    { value: "daily", label: t("active_content_badges.menu_run_daily") },
-                    { value: "hourly", label: t("active_content_badges.menu_run_hourly") }
-                ]
-            }
-        ]
-    },
-    frontendScript: {
-        title: t("active_content_badges.type_frontend_script"),
-        icon: "bx bx-window",
-        helpPage: "yIhgI5H7A2Sm",
-        apiDocsPage: "Q2z6av6JZVWm",
-        isExecutable: true,
-        additionalOptions: [
-            executeOption,
-            {
-                type: "combobox",
-                bindToLabel: "run",
-                label: t("active_content_badges.menu_run"),
-                icon: "bx bx-rss",
-                dropStart: true,
-                options: [
-                    { value: null, label: t("active_content_badges.menu_run_disabled") },
-                    { value: "frontendStartup", label: t("active_content_badges.menu_run_frontend_startup") },
-                    { value: "mobileStartup", label: t("active_content_badges.menu_run_mobile_startup") },
-                ]
-            },
-            { type: "separator" },
-            {
-                type: "button",
-                label: t("active_content_badges.menu_change_to_widget"),
-                icon: "bx bxs-widget",
-                onClick: ({ note }) => attributes.setLabel(note.noteId, "widget")
-            }
-        ]
-    },
-    widget: {
-        title: t("active_content_badges.type_widget"),
-        icon: "bx bxs-widget",
-        helpPage: "MgibgPcfeuGz",
-        additionalOptions: [
-            {
-                type: "button",
-                label: t("active_content_badges.menu_change_to_frontend_script"),
-                icon: "bx bx-window",
-                onClick: ({ note }) => {
-                    attributes.removeOwnedLabelByName(note, "widget");
-                    attributes.removeOwnedLabelByName(note, "disabled:widget");
-                }
-            }
-        ]
-    },
-    appCss: {
-        title: t("active_content_badges.type_app_css"),
-        icon: "bx bxs-file-css",
-        helpPage: "AlhDUqhENtH7"
-    },
-    renderNote: {
-        title: t("active_content_badges.type_render_note"),
-        icon: "bx bx-extension",
-        helpPage: "HcABDtFCkbFN"
-    },
-    webView: {
-        title: t("active_content_badges.type_web_view"),
-        icon: "bx bx-globe",
-        helpPage: "1vHRoWCEjj0L"
-    },
-    appTheme: {
-        title :t("active_content_badges.type_app_theme"),
-        icon: "bx bx-palette",
-        helpPage: "7NfNr5pZpVKV",
-        additionalOptions: [
-            {
-                type: "combobox",
-                bindToLabel: "appThemeBase",
-                label: t("active_content_badges.menu_theme_base"),
-                icon: "bx bx-layer",
-                dropStart: true,
-                options: [
-                    { label: t("theme.auto_theme"), value: null },
-                    { type: "separator" },
-                    { label: t("theme.triliumnext"), value: "next" },
-                    { label: t("theme.triliumnext-light"), value: "next-light" },
-                    { label: t("theme.triliumnext-dark"), value: "next-dark" }
-                ]
-            }
-        ]
-    }
-};
-
-export function ActiveContentBadges() {
-    const { note } = useNoteContext();
-    const info = useActiveContentInfo(note);
-
-    return (note && info &&
-        <>
-            {info.canToggleEnabled && <ActiveContentToggle info={info} note={note} />}
-            <ActiveContentBadge info={info} note={note} />
-        </>
-    );
-}
-
-function ActiveContentBadge({ info, note }: { note: FNote, info: ActiveContentInfo }) {
-    const { title, icon, helpPage, apiDocsPage, additionalOptions } = typeMappings[info.type];
-    return (
-        <BadgeWithDropdown
-            className={clsx("active-content-badge", info.canToggleEnabled && !info.isEnabled && "disabled")}
-            icon={icon}
-            text={title}
-            dropdownOptions={{
-                dropdownContainerClassName: "mobile-bottom-menu",
-                mobileBackdrop: true
-            }}
-        >
-            {additionalOptions?.length && (
-                <>
-                    {additionalOptions?.map((property, i) => (
-                        <ViewProperty key={i} note={note} property={property} />
-                    ))}
-                    <FormDropdownDivider />
-                </>
-            )}
-
-            <FormListItem
-                icon="bx bx-help-circle"
-                onClick={() => openInAppHelpFromUrl(helpPage)}
-            >{t("active_content_badges.menu_docs")}</FormListItem>
-
-            {apiDocsPage && <FormListItem
-                icon="bx bx-book-content"
-                onClick={() => openInAppHelpFromUrl(apiDocsPage)}
-            >{t("code_buttons.trilium_api_docs_button_title")}</FormListItem>}
-        </BadgeWithDropdown>
-    );
-}
-
-function ActiveContentToggle({ note, info }: { note: FNote, info: ActiveContentInfo }) {
-    const { title } = typeMappings[info.type];
-
-    return info && <FormToggle
-        switchOnName="" switchOffName=""
-        currentValue={info.isEnabled}
-        switchOffTooltip={t("active_content_badges.toggle_tooltip_disable_tooltip", { type: title })}
-        switchOnTooltip={t("active_content_badges.toggle_tooltip_enable_tooltip", { type: title })}
-        onChange={async (willEnable) => {
-            await Promise.all(note.getOwnedAttributes()
-                .map(attr => ({ name: attributes.getNameWithoutDangerousPrefix(attr.name), type: attr.type }))
-                .filter(({ name, type }) => DANGEROUS_ATTRIBUTES.some(item => item.name === name && item.type === type))
-                .map(({ name, type }) => attributes.toggleDangerousAttribute(note, type, name, willEnable)));
-        }}
-    />;
-}
-
-function useActiveContentInfo(note: FNote | null | undefined) {
-    const [ info, setInfo ] = useState<ActiveContentInfo | null>(null);
-    const noteType = useNoteProperty(note, "type");
-    const noteMime = useNoteProperty(note, "mime");
-
-    function refresh() {
-        let type: ActiveContentInfo["type"] | null = null;
-        let isEnabled = false;
-        let canToggleEnabled = false;
-
-        if (!note) {
-            setInfo(null);
-            return;
-        }
-
-        if (noteType === "render") {
-            type = "renderNote";
-            isEnabled = note.hasRelation("renderNote");
-        } else if (noteType === "webView") {
-            type = "webView";
-            isEnabled = note.hasLabel("webViewSrc");
-        } else if (noteType === "code" && noteMime === "application/javascript;env=backend") {
-            type = "backendScript";
-            for (const backendLabel of [ "run", "customRequestHandler", "customResourceProvider" ]) {
-                isEnabled ||= note.hasLabel(backendLabel);
-
-                if (!canToggleEnabled && note.hasLabelOrDisabled(backendLabel)) {
-                    canToggleEnabled = true;
-                }
-            }
-        } else if (noteType === "code" && noteMime === "application/javascript;env=frontend") {
-            type = "frontendScript";
-            isEnabled = note.hasLabel("widget") || note.hasLabel("run");
-            canToggleEnabled = note.hasLabelOrDisabled("widget") || note.hasLabelOrDisabled("run");
-        } else if (noteType === "code" && note.hasLabelOrDisabled("appTheme")) {
-            isEnabled = note.hasLabel("appTheme");
-            canToggleEnabled = true;
-        }
-
-        for (const labelToCheck of activeContentLabels) {
-            if (note.hasLabel(labelToCheck)) {
-                type = labelToCheck;
-                isEnabled = true;
-                canToggleEnabled = true;
-                break;
-            } else if (note.hasLabel(`disabled:${labelToCheck}`)) {
-                type = labelToCheck;
-                isEnabled = false;
-                canToggleEnabled = true;
-                break;
-            }
-        }
-
-        if (type) {
-            setInfo({ type, isEnabled, canToggleEnabled });
-        } else {
-            setInfo(null);
-        }
-    }
-
-    // Refresh on note change.
-    useEffect(refresh, [ note, noteType, noteMime ]);
-
-    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
-        if (loadResults.getAttributeRows().some(attr => attributes.isAffecting(attr, note))) {
-            refresh();
-        }
-    });
-
-    return info;
-}
--- a/apps/client/src/widgets/layout/Breadcrumb.css
+++ b/apps/client/src/widgets/layout/Breadcrumb.css
@@ -19,9 +19,6 @@
        --link-hover-background: var(--icon-button-hover-background);

        color: var(--custom-color, inherit);
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;

        &:hover {
            color: var(--custom-color, inherit);
--- a/apps/client/src/widgets/layout/NoteBadges.css
+++ b/apps/client/src/widgets/layout/NoteBadges.css
@@ -37,10 +37,6 @@
                pointer-events: none;
            }
        }
-        &.active-content-badge { --color: var(--badge-active-content-background-color); }
-        &.active-content-badge.disabled {
-            opacity: 0.5;
-        }

        min-width: 0;

@@ -49,11 +45,6 @@
            text-overflow: ellipsis;
            min-width: 0;
        }
-
-        .switch-button {
-            --switch-track-height: 8px;
-            --switch-track-width: 30px;
-        }
    }

    .dropdown-badge {
--- a/apps/client/src/widgets/layout/NoteBadges.tsx
+++ b/apps/client/src/widgets/layout/NoteBadges.tsx
@@ -10,7 +10,6 @@ import { FormDropdownDivider, FormListItem } from "../react/FormList";
 import { useGetContextData, useIsNoteReadOnly, useNoteContext, useNoteLabel, useNoteLabelBoolean } from "../react/hooks";
 import { useShareState } from "../ribbon/BasicPropertiesTab";
 import { useShareInfo } from "../shared_info";
-import { ActiveContentBadges } from "./ActiveContentBadges";

 export default function NoteBadges() {
    return (
@@ -20,7 +19,6 @@ export default function NoteBadges() {
            <ShareBadge />
            <ClippedNoteBadge />
            <ExecuteBadge />
-            <ActiveContentBadges />
        </div>
    );
 }
--- a/apps/client/src/widgets/layout/NoteTitleActions.css
+++ b/apps/client/src/widgets/layout/NoteTitleActions.css
@@ -50,9 +50,6 @@ body.experimental-feature-new-layout {
            }
        }

-    }
-
-    body.desktop .title-actions {
        > .collapsible,
        > .note-type-switcher {
            padding-inline-start: calc(24px - var(--title-actions-padding-start));
@@ -60,4 +57,3 @@ body.experimental-feature-new-layout {
        }
    }
 }
-
--- a/apps/client/src/widgets/layout/NoteTitleActions.tsx
+++ b/apps/client/src/widgets/layout/NoteTitleActions.tsx
@@ -1,21 +1,25 @@
 import "./NoteTitleActions.css";

+import clsx from "clsx";
 import { useEffect, useState } from "preact/hooks";

 import NoteContext from "../../components/note_context";
 import FNote from "../../entities/fnote";
 import { t } from "../../services/i18n";
+import CollectionProperties from "../note_bars/CollectionProperties";
 import { checkFullHeight, getExtendedWidgetType } from "../NoteDetail";
 import { PromotedAttributesContent, usePromotedAttributeData } from "../PromotedAttributes";
+import SimpleBadge from "../react/Badge";
 import Collapsible, { ExternallyControlledCollapsible } from "../react/Collapsible";
 import { useNoteContext, useNoteLabel, useNoteProperty, useTriliumEvent, useTriliumOptionBool } from "../react/hooks";
-import { NewNoteLink } from "../react/NoteLink";
+import NoteLink, { NewNoteLink } from "../react/NoteLink";
 import { useEditedNotes } from "../ribbon/EditedNotesTab";
 import SearchDefinitionTab from "../ribbon/SearchDefinitionTab";
 import NoteTypeSwitcher from "./NoteTypeSwitcher";

 export default function NoteTitleActions() {
-    const { note, ntxId, componentId, noteContext, viewScope } = useNoteContext();
+    const { note, ntxId, componentId, noteContext } = useNoteContext();
+    const isHiddenNote = note && note.noteId !== "_search" && note.noteId.startsWith("_");
    const noteType = useNoteProperty(note, "type");

    return (
@@ -23,7 +27,7 @@ export default function NoteTitleActions() {
            <PromotedAttributes note={note} componentId={componentId} noteContext={noteContext} />
            {noteType === "search" && <SearchProperties note={note} ntxId={ntxId} />}
            <EditedNotes />
-            {(!viewScope?.viewMode || viewScope.viewMode === "default") && <NoteTypeSwitcher />}
+            <NoteTypeSwitcher />
        </div>
    );
 }
@@ -44,7 +48,7 @@ function PromotedAttributes({ note, componentId, noteContext }: {
    componentId: string,
    noteContext: NoteContext | undefined
 }) {
-    const [ cells, setCells ] = usePromotedAttributeData(note, componentId, noteContext);
+    const [ cells, setCells ] = usePromotedAttributeData(note, componentId);
    const [ expanded, setExpanded ] = useState(false);

    useEffect(() => {
--- a/apps/client/src/widgets/layout/StatusBar.css
+++ b/apps/client/src/widgets/layout/StatusBar.css
@@ -37,10 +37,6 @@
                &:hover {
                    background: var(--input-background-color);
                }
-
-                .text {
-                    white-space: nowrap;
-                }
            }

            .status-bar-dropdown-button {
@@ -62,12 +58,101 @@

        .dropdown-note-info {
            padding: 1em !important;
+
+            ul {
+                --row-block-margin: .2em;
+
+                list-style-type: none;
+                padding: 0;
+                margin: 0;
+                margin-top: calc(0px - var(--row-block-margin));
+                margin-bottom: 12px;
+                display: table;
+
+                li {
+                    display: table-row;
+
+                    > strong {
+                        display: table-cell;
+                        padding: var(--row-block-margin) 0;
+                        opacity: .5;
+                    }
+
+                    > span {
+                        display: table-cell;
+                        user-select: text;
+                        padding-left: 2em;
+                    }
+                }
+            }
        }

        .dropdown-note-paths {
            .note-paths-widget {
                padding: 0.5em;
            }
+
+            .note-path-intro {
+                color: var(--muted-text-color);
+            }
+
+            .note-path-list {
+                margin: 12px 0;
+                padding: 0;
+                list-style: none;
+
+                /* Note path card */
+                li {
+                    --border-radius: 6px;
+
+                    position: relative;
+                    background: var(--card-background-color);
+                    padding: 8px 20px 8px 25px;
+
+                    &:first-child {
+                        border-radius: var(--border-radius) var(--border-radius) 0 0;
+                    }
+
+                    &:last-child {
+                        border-radius: 0 0 var(--border-radius) var(--border-radius);
+                    }
+
+                    & + li {
+                        margin-top: 2px;
+                    }
+
+                    /* Current path arrow */
+                    &.path-current::before {
+                        position: absolute;
+                        display: flex;
+                        justify-content: flex-end;
+                        align-items: center;
+                        content: "\ee8f";
+                        top: 0;
+                        left: 0;
+                        width: 20px;
+                        bottom: 0;
+                        font-family: "boxicons";
+                        font-size: .75em;
+                        color: var(--menu-item-icon-color);
+                    }
+                }
+
+                /* Note path segment */
+                a {
+                    margin-inline: 2px;
+                    padding-inline: 2px;
+                    color: currentColor;
+                    font-weight: normal;
+                    text-decoration: none;
+
+                    /* The last segment of the note path */
+                    &.basename {
+                        color: var(--muted-text-color);
+                    }
+                }
+
+            }
        }

        .backlinks-widget > .dropdown-menu {
@@ -75,6 +160,84 @@

            max-height: 60vh;
            overflow-y: scroll;
+
+            /* Backlink card */
+            li {
+                --border-radius: 8px;
+
+                max-width: 600px;
+                padding: 10px 20px;
+                background: var(--card-background-color);
+
+                & + li {
+                    margin-top: 2px;
+                }
+
+                &:first-child {
+                    border-radius: var(--border-radius) var(--border-radius) 0 0;
+                }
+
+                &:last-child {
+                    border-radius: 0 0 var(--border-radius) var(--border-radius);
+                }
+
+                /* Card header */
+                & > span:first-child {
+                    display: block;
+
+                    > span {
+                        display: flex;
+                        flex-wrap: wrap;
+                        align-items: center;
+
+                        /* Note path */
+                        > small {
+                            flex: 100%;
+                            order: -1;
+                            font-size: .65rem;
+
+                            .note-path {
+                                padding: 0;
+                            }
+                        }
+
+                        /* Note icon */
+                        > .tn-icon {
+                            color: var(--menu-item-icon-color);
+                        }
+
+                        /* Note title */
+                        > a {
+                            margin-inline-start: 4px;
+                            color: currentColor;
+                            font-weight: 500;
+                        }
+                    }
+                }
+
+                /* Card content - excerpt */
+                & > span:nth-child(2) > div {
+                    all: unset; /* TODO: Remove after disposing the old style from FloatingButtons.css */
+                    display: block;
+
+                    margin: 8px 0;
+                    border-radius: 4px;
+                    background: var(--quick-search-result-content-background);
+                    padding: 8px;
+                    font-size: .75rem;
+
+                    a {
+                        background: transparent;
+                        color: var(--quick-search-result-highlight-color);
+                        text-decoration: underline;
+                    }
+
+                    p {
+                       margin: 0;
+                    }
+                }
+
+            }
        }
    }

@@ -121,50 +284,16 @@

    }

+    div.similar-notes-widget div.similar-notes-wrapper {
+        max-height: unset;
+    }
+
    button.select-button:not(:focus-visible) {
        outline: none;
    }

 }

-body.experimental-feature-new-layout .note-info-content {
-    ul {
-                --row-block-margin: .2em;
-
-                list-style-type: none;
-                padding: 0;
-                margin: 0;
-                margin-top: calc(0px - var(--row-block-margin));
-                margin-bottom: 12px;
-                display: table;
-
-                li {
-                    display: table-row;
-
-                    > strong {
-                        display: table-cell;
-                        padding: var(--row-block-margin) 0;
-                        opacity: .5;
-                    }
-
-                    > span {
-                        display: table-cell;
-                        user-select: text;
-                        padding-left: 2em;
-                    }
-                }
-            }
-}
-
-body.experimental-feature-new-layout div.similar-notes-widget div.similar-notes-wrapper {
-    max-height: unset;
-}
-
-body.experimental-feature-new-layout.mobile div.similar-notes-widget div.similar-notes-wrapper {
-    max-height: unset;
-    padding: 0;
-}
-
 .bottom-panel {
    margin: 0 !important;
    padding: 0;
--- a/apps/client/src/widgets/layout/StatusBar.tsx
+++ b/apps/client/src/widgets/layout/StatusBar.tsx
@@ -56,7 +56,7 @@ export default function StatusBar() {
        similarNotesShown: activePane === "similar-notes",
        setSimilarNotesShown: (shown) => setActivePane(shown && "similar-notes")
    };
-    const isHiddenNote = note?.isHiddenCompletely();
+    const isHiddenNote = note?.isInHiddenSubtree();

    return (
        <div className="status-bar">
@@ -212,8 +212,8 @@ export function getLocaleName(locale: Locale | null | undefined) {

 //#region Note info & Similar
 interface NoteInfoContext extends StatusBarContext {
-    similarNotesShown?: boolean;
-    setSimilarNotesShown?: (value: boolean) => void;
+    similarNotesShown: boolean;
+    setSimilarNotesShown: (value: boolean) => void;
 }

 export function NoteInfoBadge(context: NoteInfoContext) {
@@ -225,7 +225,7 @@ export function NoteInfoBadge(context: NoteInfoContext) {

    // Keyboard shortcut.
    useTriliumEvent("toggleRibbonTabNoteInfo", () => enabled && dropdownRef.current?.show());
-    useTriliumEvent("toggleRibbonTabSimilarNotes", () => setSimilarNotesShown && setSimilarNotesShown(!similarNotesShown));
+    useTriliumEvent("toggleRibbonTabSimilarNotes", () => setSimilarNotesShown(!similarNotesShown));

    return (enabled &&
        <StatusBarDropdown
@@ -242,8 +242,8 @@ export function NoteInfoBadge(context: NoteInfoContext) {
    );
 }

-export function NoteInfoContent({ note, setSimilarNotesShown, noteType, dropdownRef }: Pick<NoteInfoContext, "note" | "setSimilarNotesShown"> & {
-    dropdownRef?: RefObject<BootstrapDropdown>;
+function NoteInfoContent({ note, setSimilarNotesShown, noteType, dropdownRef }: NoteInfoContext & {
+    dropdownRef: RefObject<BootstrapDropdown>;
    noteType: NoteType;
 }) {
    const { metadata, ...sizeProps } = useNoteMetadata(note);
@@ -251,7 +251,7 @@ export function NoteInfoContent({ note, setSimilarNotesShown, noteType, dropdown
    const noteTypeMapping = useMemo(() => NOTE_TYPES.find(t => t.type === noteType), [ noteType ]);

    return (
-        <div className="note-info-content">
+        <>
            <ul>
                {originalFileName && <NoteInfoValue text={t("file_properties.original_file_name")} value={originalFileName} />}
                <NoteInfoValue text={t("note_info_widget.created")} value={formatDateTime(metadata?.dateCreated)} />
@@ -262,14 +262,14 @@ export function NoteInfoContent({ note, setSimilarNotesShown, noteType, dropdown
                <NoteInfoValue text={t("note_info_widget.note_size")} title={t("note_info_widget.note_size_info")} value={<NoteSizeWidget {...sizeProps} />} />
            </ul>

-            {setSimilarNotesShown && <LinkButton
+            <LinkButton
                text={t("note_info_widget.show_similar_notes")}
                onClick={() => {
-                    dropdownRef?.current?.hide();
+                    dropdownRef.current?.hide();
                    setSimilarNotesShown(true);
                }}
-            />}
-        </div>
+            />
+        </>
    );
 }

@@ -300,7 +300,7 @@ function BacklinksBadge({ note, viewScope }: StatusBarContext) {
    const count = useBacklinkCount(note, viewScope?.viewMode === "default");
    return (note && count > 0 &&
        <StatusBarDropdown
-            className="backlinks-badge backlinks-widget tn-backlinks-widget"
+            className="backlinks-badge backlinks-widget"
            icon="bx bx-link"
            text={t("status_bar.backlinks", { count })}
            title={t("status_bar.backlinks_title", { count })}
--- a/apps/client/src/widgets/mobile_widgets/TabSwitcher.css
+++ b/apps/client/src/widgets/mobile_widgets/TabSwitcher.css
@@ -35,6 +35,11 @@
            display: flex;
            flex-direction: column;

+            &.with-hue {
+                background-color: hsl(var(--bg-hue), 8.8%, 11.2%);
+                border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
+            }
+
            &.active {
                outline: 4px solid var(--more-accented-background-color);
                background: var(--card-background-hover-color);
@@ -84,25 +89,12 @@

                &.type-text {
                    padding: 10px;
-                    --ck-content-todo-list-checkmark-size: 8px;
-
-                    p { margin-bottom: 0.2em;}
-                    hr { margin-block: 0.1em; height: 1px; }
-                    h2 { font-size: 1.20em; }
-                    h3 { font-size: 1.15em; }
-                    h4 { font-size: 1.10em; }
-                    h5 { font-size: 1.05em}
-                    h6 { font-size: 1em; }
-                    ul, ol { margin: 0 }
                }

                &.type-book,
                &.type-contentWidget,
                &.type-search,
-                &.type-empty,
-                &.type-relationMap,
-                &.type-launcher,
-                &.tab-preview-placeholder {
+                &.type-empty {
                    display: flex;
                    align-items: center;
                    justify-content: center;
@@ -113,6 +105,13 @@
                .preview-placeholder {
                    font-size: 500%;
                }
+
+                p { margin-bottom: 0.2em;}
+                h2 { font-size: 1.20em; }
+                h3 { font-size: 1.15em; }
+                h4 { font-size: 1.10em; }
+                h5 { font-size: 1.05em}
+                h6 { font-size: 1em; }
            }

            &.with-split {
--- a/apps/client/src/widgets/mobile_widgets/TabSwitcher.tsx
+++ b/apps/client/src/widgets/mobile_widgets/TabSwitcher.tsx
@@ -1,7 +1,6 @@
 import "./TabSwitcher.css";

 import clsx from "clsx";
-import { ComponentChild } from "preact";
 import { createPortal, Fragment } from "preact/compat";
 import { useCallback, useEffect, useRef, useState } from "preact/hooks";

@@ -12,7 +11,6 @@ import contextMenu from "../../menus/context_menu";
 import { getHue, parseColor } from "../../services/css_class_manager";
 import froca from "../../services/froca";
 import { t } from "../../services/i18n";
-import type { ViewMode, ViewScope } from "../../services/link";
 import { NoteContent } from "../collections/legacy/ListOrGridView";
 import { LaunchBarActionButton } from "../launch_bar/launch_bar_widgets";
 import { ICON_MAPPINGS } from "../note_bars/CollectionProperties";
@@ -22,13 +20,6 @@ import Icon from "../react/Icon";
 import LinkButton from "../react/LinkButton";
 import Modal from "../react/Modal";

-const VIEW_MODE_ICON_MAPPINGS: Record<Exclude<ViewMode, "default">, string> = {
-    source: "bx bx-code",
-    "contextual-help": "bx bx-help-circle",
-    "note-map": "bx bxs-network-chart",
-    attachments: "bx bx-paperclip",
-};
-
 export default function TabSwitcher() {
    const [ shown, setShown ] = useState(false);
    const mainNoteContexts = useMainNoteContexts();
@@ -147,6 +138,7 @@ function Tab({ noteContext, containerRef, selectTab, activeNtxId }: {
    activeNtxId: string | null | undefined;
 }) {
    const { note } = noteContext;
+    const iconClass = useNoteIcon(note);
    const colorClass = note?.getColorClass() || '';
    const workspaceTabBackgroundColorHue = getWorkspaceTabBackgroundColorHue(noteContext);
    const subContexts = noteContext.getSubContexts();
@@ -166,65 +158,46 @@ function Tab({ noteContext, containerRef, selectTab, activeNtxId }: {
        >
            {subContexts.map(subContext => (
                <Fragment key={subContext.ntxId}>
-                    <TabHeader noteContext={subContext} colorClass={colorClass} />
-                    <TabPreviewContent note={subContext.note} viewScope={subContext.viewScope} />
+                    <header className={colorClass}>
+                        {subContext.note && <Icon icon={iconClass} />}
+                        <span className="title">{subContext.note?.title ?? t("tab_row.new_tab")}</span>
+                        {subContext.isMainContext() && <ActionButton
+                            icon="bx bx-x"
+                            text={t("tab_row.close_tab")}
+                            onClick={(e) => {
+                                // We are closing a tab, so we need to prevent propagation for click (activate tab).
+                                e.stopPropagation();
+                                appContext.tabManager.removeNoteContext(subContext.ntxId);
+                            }}
+                        />}
+                    </header>
+                    <div className={clsx("tab-preview", `type-${subContext.note?.type ?? "empty"}`)}>
+                        <TabPreviewContent note={subContext.note} />
+                    </div>
                </Fragment>
            ))}
        </div>
    );
 }

-function TabHeader({ noteContext, colorClass }: { noteContext: NoteContext, colorClass: string }) {
-    const iconClass = useNoteIcon(noteContext.note);
-    const [ navigationTitle, setNavigationTitle ] = useState<string | null>(null);
+function TabPreviewContent({ note }: {
+    note: FNote | null
+}) {
+    if (!note) {
+        return <PreviewPlaceholder icon="bx bx-plus" />;
+    }

-    // Manage the title for read-only notes
-    useEffect(() => {
-        noteContext?.getNavigationTitle().then(setNavigationTitle);
-    }, [noteContext]);
+    if (note.type === "book") {
+        return <PreviewPlaceholder icon={ICON_MAPPINGS[note.getLabelValue("viewType") ?? ""] ?? "bx bx-book"} />;
+    }

    return (
-        <header className={colorClass}>
-            {noteContext.note && <Icon icon={iconClass} />}
-            <span className="title">{navigationTitle ?? noteContext.note?.title ?? t("tab_row.new_tab")}</span>
-            {noteContext.isMainContext() && <ActionButton
-                icon="bx bx-x"
-                text={t("tab_row.close_tab")}
-                onClick={(e) => {
-                    // We are closing a tab, so we need to prevent propagation for click (activate tab).
-                    e.stopPropagation();
-                    appContext.tabManager.removeNoteContext(noteContext.ntxId);
-                }}
-            />}
-        </header>
-    );
-}
-
-function TabPreviewContent({ note, viewScope }: {
-    note: FNote | null,
-    viewScope: ViewScope | undefined
-}) {
-    let el: ComponentChild;
-    let isPlaceholder = true;
-
-    if (!note) {
-        el = <PreviewPlaceholder icon="bx bx-plus" />;
-    } else if (note.type === "book") {
-        el = <PreviewPlaceholder icon={ICON_MAPPINGS[note.getLabelValue("viewType") ?? ""] ?? "bx bx-book"} />;
-    } else if (viewScope?.viewMode && viewScope.viewMode !== "default") {
-        el = <PreviewPlaceholder icon={VIEW_MODE_ICON_MAPPINGS[viewScope?.viewMode ?? ""] ?? "bx bx-empty"} />;
-    } else {
-        el = <NoteContent
+        <NoteContent
            note={note}
            highlightedTokens={undefined}
            trim
            includeArchivedNotes={false}
-        />;
-        isPlaceholder = false;
-    }
-
-    return (
-        <div className={clsx("tab-preview", `type-${note?.type ?? "empty"}`, { "tab-preview-placeholder": isPlaceholder })}>{el}</div>
+        />
    );
 }

--- a/apps/client/src/widgets/mobile_widgets/mobile_detail_menu.css
+++ b/apps/client/src/widgets/mobile_widgets/mobile_detail_menu.css
@@ -1,3 +0,0 @@
-.code-note-switcher-modal .dropdown-menu {
-    background: none !important;
-}
--- a/apps/client/src/widgets/mobile_widgets/mobile_detail_menu.tsx
+++ b/apps/client/src/widgets/mobile_widgets/mobile_detail_menu.tsx
@@ -1,240 +1,84 @@
-import "./mobile_detail_menu.css";
+import { useContext } from "preact/hooks";

-import { Dropdown as BootstrapDropdown } from "bootstrap";
-import { createPortal, useRef, useState } from "preact/compat";
-
-import FNote, { NotePathRecord } from "../../entities/fnote";
+import appContext, { CommandMappings } from "../../components/app_context";
+import contextMenu, { MenuItem } from "../../menus/context_menu";
+import branches from "../../services/branches";
 import { t } from "../../services/i18n";
+import { getHelpUrlForNote } from "../../services/in_app_help";
 import note_create from "../../services/note_create";
-import server from "../../services/server";
-import { BacklinksList, useBacklinkCount } from "../FloatingButtonsDefinitions";
-import { getLocaleName, NoteInfoContent } from "../layout/StatusBar";
+import tree from "../../services/tree";
+import { openInAppHelpFromUrl } from "../../services/utils";
+import BasicWidget from "../basic_widget";
 import ActionButton from "../react/ActionButton";
-import { FormDropdownDivider, FormDropdownSubmenu, FormListItem } from "../react/FormList";
-import { useNoteContext, useNoteProperty } from "../react/hooks";
-import Modal from "../react/Modal";
-import { NoteTypeCodeNoteList, useLanguageSwitcher, useMimeTypes } from "../ribbon/BasicPropertiesTab";
-import { NoteContextMenu } from "../ribbon/NoteActions";
-import NoteActionsCustom from "../ribbon/NoteActionsCustom";
-import { NotePathsWidget, useSortedNotePaths } from "../ribbon/NotePathsTab";
-import SimilarNotesTab from "../ribbon/SimilarNotesTab";
-import { useProcessedLocales } from "../type_widgets/options/components/LocaleSelector";
+import { ParentComponent } from "../react/react_utils";

 export default function MobileDetailMenu() {
-    const dropdownRef = useRef<BootstrapDropdown | null>(null);
-    const { note, noteContext, parentComponent, ntxId, viewScope, hoistedNoteId } = useNoteContext();
-    const subContexts = noteContext?.getMainContext().getSubContexts() ?? [];
-    const isMainContext = noteContext?.isMainContext();
-    const [ backlinksModalShown, setBacklinksModalShown ] = useState(false);
-    const [ notePathsModalShown, setNotePathsModalShown ] = useState(false);
-    const [ noteInfoModalShown, setNoteInfoModalShown ] = useState(false);
-    const [ similarNotesModalShown, setSimilarNotesModalShown ] = useState(false);
-    const [ codeNoteSwitcherModalShown, setCodeNoteSwitcherModalShown ] = useState(false);
-    const sortedNotePaths = useSortedNotePaths(note, hoistedNoteId);
-    const backlinksCount = useBacklinkCount(note, viewScope?.viewMode === "default");
-
-    function closePane() {
-        // Wait first for the context menu to be dismissed, otherwise the backdrop stays on.
-        requestAnimationFrame(() => {
-            parentComponent.triggerCommand("closeThisNoteSplit", { ntxId });
-        });
-    }
+    const parentComponent = useContext(ParentComponent);

    return (
-        <div style={{ contain: "none" }}>
-            {note ? (
-                <NoteContextMenu
-                    dropdownRef={dropdownRef}
-                    note={note} noteContext={noteContext}
-                    itemsAtStart={<>
-                        <div className="form-list-row">
-                            <div className="form-list-col">
-                                <FormListItem
-                                    icon="bx bx-link"
-                                    onClick={() => setBacklinksModalShown(true)}
-                                    disabled={backlinksCount === 0}
-                                >{t("status_bar.backlinks", { count: backlinksCount })}</FormListItem>
-                            </div>
-                            <div className="form-list-col">
-                                <FormListItem
-                                    icon="bx bx-directions"
-                                    onClick={() => setNotePathsModalShown(true)}
-                                    disabled={(sortedNotePaths?.length ?? 0) <= 1}
-                                >{t("status_bar.note_paths", { count: sortedNotePaths?.length })}</FormListItem>
-                            </div>
-                        </div>
-                        <FormDropdownDivider />
+        <ActionButton
+            icon="bx bx-dots-vertical-rounded"
+            text=""
+            onClick={(e) => {
+                const ntxId = (parentComponent as BasicWidget | null)?.getClosestNtxId();
+                if (!ntxId) return;

-                        {noteContext && ntxId && <NoteActionsCustom note={note} noteContext={noteContext} ntxId={ntxId} />}
-                        <FormListItem
-                            onClick={() => noteContext?.notePath && note_create.createNote(noteContext.notePath)}
-                            icon="bx bx-plus"
-                        >{t("mobile_detail_menu.insert_child_note")}</FormListItem>
-                        {subContexts.length < 2 && <>
-                            <FormDropdownDivider />
-                            <FormListItem
-                                onClick={(e) => {
-                                    // We have to manually manage the hide because otherwise the old note context gets activated.
-                                    e.stopPropagation();
-                                    dropdownRef.current?.hide();
-                                    parentComponent.triggerCommand("openNewNoteSplit", { ntxId });
-                                }}
-                                icon="bx bx-dock-right"
-                            >{t("create_pane_button.create_new_split")}</FormListItem>
-                        </>}
-                        {!isMainContext && <>
-                            <FormDropdownDivider />
-                            <FormListItem
-                                icon="bx bx-x"
-                                onClick={closePane}
-                            >{t("close_pane_button.close_this_pane")}</FormListItem>
-                        </>}
-                        <FormDropdownDivider />
-                    </>}
-                    itemsNearNoteSettings={<>
-                        {note.type === "text" && <ContentLanguageSelector note={note} />}
-                        {note.type === "code" && <FormListItem icon={"bx bx-code"} onClick={() => setCodeNoteSwitcherModalShown(true)}>{t("status_bar.code_note_switcher")}</FormListItem>}
-                        <FormListItem icon="bx bx-info-circle" onClick={() => setNoteInfoModalShown(true)}>{t("note_info_widget.title")}</FormListItem>
-                        <FormListItem icon="bx bx-bar-chart" onClick={() => setSimilarNotesModalShown(true)}>{t("similar_notes.title")}</FormListItem>
-                        <FormDropdownDivider />
-                    </>}
-                />
-            ) : (
-                <ActionButton
-                    icon="bx bx-x"
-                    onClick={closePane}
-                    text={t("close_pane_button.close_this_pane")}
-                />
-            )}
+                const noteContext = appContext.tabManager.getNoteContextById(ntxId);
+                const subContexts = noteContext.getMainContext().getSubContexts();
+                const isMainContext = noteContext?.isMainContext();
+                const note = noteContext.note;
+                const helpUrl = getHelpUrlForNote(note);

-            {createPortal((
-                <>
-                    <BacklinksModal note={note} modalShown={backlinksModalShown} setModalShown={setBacklinksModalShown} />
-                    <NotePathsModal note={note} modalShown={notePathsModalShown} notePath={noteContext?.notePath} sortedNotePaths={sortedNotePaths} setModalShown={setNotePathsModalShown} />
-                    <NoteInfoModal note={note}  modalShown={noteInfoModalShown} setModalShown={setNoteInfoModalShown} />
-                    <SimilarNotesModal note={note} modalShown={similarNotesModalShown} setModalShown={setSimilarNotesModalShown} />
-                    <CodeNoteSwitcherModal note={note} modalShown={codeNoteSwitcherModalShown} setModalShown={setCodeNoteSwitcherModalShown} />
-                </>
-            ), document.body)}
-        </div>
-    );
-}
-
-function ContentLanguageSelector({ note }: { note: FNote | null | undefined }) {
-    const { locales, DEFAULT_LOCALE, currentNoteLanguage, setCurrentNoteLanguage } = useLanguageSwitcher(note);
-    const { activeLocale, processedLocales } = useProcessedLocales(locales, DEFAULT_LOCALE, currentNoteLanguage ?? DEFAULT_LOCALE.id);
-
-    return (
-        <FormDropdownSubmenu
-            icon="bx bx-globe"
-            title={t("mobile_detail_menu.content_language_switcher", { language: getLocaleName(activeLocale ?? DEFAULT_LOCALE) })}
-        >
-            {processedLocales.map((locale, index) =>
-                (typeof locale === "object") ? (
-                    <FormListItem
-                        key={locale.id}
-                        rtl={locale.rtl}
-                        checked={locale.id === currentNoteLanguage}
-                        onClick={() => setCurrentNoteLanguage(locale.id)}
-                    >{locale.name}</FormListItem>
-                ) : (
-                    <FormDropdownDivider key={`divider-${index}`} />
-                )
-            )}
-        </FormDropdownSubmenu>
-    );
-}
-
-interface WithModal {
-    modalShown: boolean;
-    setModalShown: (shown: boolean) => void;
-}
-
-function BacklinksModal({ note, modalShown, setModalShown }: { note: FNote | null | undefined } & WithModal) {
-    return (
-        <Modal
-            className="backlinks-modal tn-backlinks-widget"
-            size="md"
-            title={t("mobile_detail_menu.backlinks")}
-            show={modalShown}
-            onHidden={() => setModalShown(false)}
-        >
-            <ul className="backlinks-items">
-                {note && <BacklinksList note={note} />}
-            </ul>
-        </Modal>
-    );
-}
-
-function NotePathsModal({ note, modalShown, notePath, sortedNotePaths, setModalShown }: { note: FNote | null | undefined, sortedNotePaths: NotePathRecord[] | undefined, notePath: string | null | undefined } & WithModal) {
-    return (
-        <Modal
-            className="note-paths-modal"
-            size="md"
-            title={t("note_paths.title")}
-            show={modalShown}
-            onHidden={() => setModalShown(false)}
-        >
-            {note && (
-                <NotePathsWidget
-                    sortedNotePaths={sortedNotePaths}
-                    currentNotePath={notePath}
-                />
-            )}
-        </Modal>
-    );
-}
-
-function NoteInfoModal({ note, modalShown, setModalShown }: { note: FNote | null | undefined } & WithModal) {
-    return (
-        <Modal
-            className="note-info-modal"
-            size="md"
-            title={t("note_info_widget.title")}
-            show={modalShown}
-            onHidden={() => setModalShown(false)}
-        >
-            {note && <NoteInfoContent note={note} noteType={note.type} />}
-        </Modal>
-    );
-}
-
-function SimilarNotesModal({ note, modalShown, setModalShown }: { note: FNote | null | undefined } & WithModal) {
-    return (
-        <Modal
-            className="similar-notes-modal"
-            size="md"
-            title={t("similar_notes.title")}
-            show={modalShown}
-            onHidden={() => setModalShown(false)}
-        >
-            <SimilarNotesTab note={note} />
-        </Modal>
-    );
-}
-
-function CodeNoteSwitcherModal({ note, modalShown, setModalShown }: { note: FNote | null | undefined } & WithModal) {
-    const currentNoteMime = useNoteProperty(note, "mime");
-    const mimeTypes = useMimeTypes();
-
-    return (
-        <Modal
-            className="code-note-switcher-modal"
-            size="md"
-            title={t("status_bar.code_note_switcher")}
-            show={modalShown}
-            onHidden={() => setModalShown(false)}
-        >
-            <div className="dropdown-menu static show">
-                {note && <NoteTypeCodeNoteList
-                    currentMimeType={currentNoteMime}
-                    mimeTypes={mimeTypes}
-                    changeNoteType={(type, mime) => {
-                        server.put(`notes/${note.noteId}/type`, { type, mime });
-                        setModalShown(false);
-                    }}
-                />}
-            </div>
-        </Modal>
+                const items: (MenuItem<keyof CommandMappings>)[] = [
+                    { title: t("mobile_detail_menu.insert_child_note"), command: "insertChildNote", uiIcon: "bx bx-plus", enabled: note?.type !== "search" },
+                    { title: t("mobile_detail_menu.delete_this_note"), command: "delete", uiIcon: "bx bx-trash", enabled: note?.noteId !== "root" },
+                    { kind: "separator" },
+                    { title: t("mobile_detail_menu.note_revisions"), command: "showRevisions", uiIcon: "bx bx-history" },
+                    { kind: "separator" },
+                    helpUrl && {
+                        title: t("help-button.title"),
+                        uiIcon: "bx bx-help-circle",
+                        handler: () => openInAppHelpFromUrl(helpUrl)
+                    },
+                    { kind: "separator" },
+                    subContexts.length < 2 && { title: t("create_pane_button.create_new_split"), command: "openNewNoteSplit", uiIcon: "bx bx-dock-right" },
+                    !isMainContext && { title: t("close_pane_button.close_this_pane"), command: "closeThisNoteSplit", uiIcon: "bx bx-x" }
+                ].filter(i => !!i) as MenuItem<keyof CommandMappings>[];
+
+                const lastItem = items.at(-1);
+                if (lastItem && "kind" in lastItem && lastItem.kind === "separator") {
+                    items.pop();
+                }
+
+                contextMenu.show<keyof CommandMappings>({
+                    x: e.pageX,
+                    y: e.pageY,
+                    items,
+                    selectMenuItemHandler: async ({ command }) => {
+                        if (command === "insertChildNote") {
+                            note_create.createNote(appContext.tabManager.getActiveContextNotePath() ?? undefined);
+                        } else if (command === "delete") {
+                            const notePath = appContext.tabManager.getActiveContextNotePath();
+                            if (!notePath) {
+                                throw new Error("Cannot get note path to delete.");
+                            }
+
+                            const branchId = await tree.getBranchIdFromUrl(notePath);
+
+                            if (!branchId) {
+                                throw new Error(t("mobile_detail_menu.error_cannot_get_branch_id", { notePath }));
+                            }
+
+                            if (await branches.deleteNotes([branchId]) && parentComponent) {
+                                parentComponent.triggerCommand("setActiveScreen", { screen: "tree" });
+                            }
+                        } else if (command && parentComponent) {
+                            parentComponent.triggerCommand(command, { ntxId });
+                        }
+                    },
+                    forcePositionOnMobile: true
+                });
+            }}
+        />
    );
 }
--- a/apps/client/src/widgets/note_bars/CollectionProperties.css
+++ b/apps/client/src/widgets/note_bars/CollectionProperties.css
@@ -5,7 +5,7 @@
    align-items: center;
    width: 100%;
    max-width: unset;
-    font-size: 0.8rem;
+    font-size: 0.8em;

    .dropdown-menu {
        input.form-control {
--- a/apps/client/src/widgets/note_bars/CollectionProperties.tsx
+++ b/apps/client/src/widgets/note_bars/CollectionProperties.tsx
@@ -2,16 +2,18 @@ import "./CollectionProperties.css";

 import { t } from "i18next";
 import { ComponentChildren } from "preact";
-import { useRef } from "preact/hooks";
+import { useContext, useRef } from "preact/hooks";
+import { Fragment } from "preact/jsx-runtime";

 import FNote from "../../entities/fnote";
 import { ViewTypeOptions } from "../collections/interface";
 import Dropdown from "../react/Dropdown";
-import { FormDropdownDivider, FormListItem } from "../react/FormList";
-import { useNoteProperty, useTriliumEvent } from "../react/hooks";
+import { FormDropdownDivider, FormDropdownSubmenu, FormListItem, FormListToggleableItem } from "../react/FormList";
+import FormTextBox from "../react/FormTextBox";
+import { useNoteLabel, useNoteLabelBoolean, useNoteLabelWithDefault, useNoteProperty, useTriliumEvent } from "../react/hooks";
 import Icon from "../react/Icon";
-import { CheckBoxProperty, ViewProperty } from "../react/NotePropertyMenu";
-import { bookPropertiesConfig } from "../ribbon/collection-properties-config";
+import { ParentComponent } from "../react/react_utils";
+import { bookPropertiesConfig, BookProperty, ButtonProperty, CheckBoxProperty, ComboBoxItem, ComboBoxProperty, NumberProperty, SplitButtonProperty } from "../ribbon/collection-properties-config";
 import { useViewType, VIEW_TYPE_MAPPINGS } from "../ribbon/CollectionPropertiesTab";

 export const ICON_MAPPINGS: Record<ViewTypeOptions, string> = {
@@ -83,11 +85,9 @@ function ViewOptions({ note, viewType }: { note: FNote, viewType: ViewTypeOption
        <Dropdown
            buttonClassName="bx bx-cog icon-action"
            hideToggleArrow
-            dropdownContainerClassName="mobile-bottom-menu"
-            mobileBackdrop
        >
-            {properties.map((property, index) => (
-                <ViewProperty key={index} note={note} property={property} />
+            {properties.map(property => (
+                <ViewProperty key={property.label} note={note} property={property} />
            ))}
            {properties.length > 0 && <FormDropdownDivider />}

@@ -107,3 +107,127 @@ function ViewOptions({ note, viewType }: { note: FNote, viewType: ViewTypeOption
        </Dropdown>
    );
 }
+
+function ViewProperty({ note, property }: { note: FNote, property: BookProperty }) {
+    switch (property.type) {
+        case "button":
+            return <ButtonPropertyView note={note} property={property} />;
+        case "split-button":
+            return <SplitButtonPropertyView note={note} property={property} />;
+        case "checkbox":
+            return <CheckBoxPropertyView note={note} property={property} />;
+        case "number":
+            return <NumberPropertyView note={note} property={property} />;
+        case "combobox":
+            return <ComboBoxPropertyView note={note} property={property} />;
+    }
+}
+
+function ButtonPropertyView({ note, property }: { note: FNote, property: ButtonProperty }) {
+    const parentComponent = useContext(ParentComponent);
+
+    return (
+        <FormListItem
+            icon={property.icon}
+            title={property.title}
+            onClick={() => {
+                if (!parentComponent) return;
+                property.onClick({
+                    note,
+                    triggerCommand: parentComponent.triggerCommand.bind(parentComponent)
+                });
+            }}
+        >{property.label}</FormListItem>
+    );
+}
+
+function SplitButtonPropertyView({ note, property }: { note: FNote, property: SplitButtonProperty }) {
+    const parentComponent = useContext(ParentComponent);
+    const ItemsComponent = property.items;
+    const clickContext = parentComponent && {
+        note,
+        triggerCommand: parentComponent.triggerCommand.bind(parentComponent)
+    };
+
+    return (parentComponent &&
+        <FormDropdownSubmenu
+            icon={property.icon ?? "bx bx-empty"}
+            title={property.label}
+            onDropdownToggleClicked={() => clickContext && property.onClick(clickContext)}
+        >
+            <ItemsComponent note={note} parentComponent={parentComponent} />
+        </FormDropdownSubmenu>
+    );
+}
+
+function NumberPropertyView({ note, property }: { note: FNote, property: NumberProperty }) {
+    //@ts-expect-error Interop with text box which takes in string values even for numbers.
+    const [ value, setValue ] = useNoteLabel(note, property.bindToLabel);
+    const disabled = property.disabled?.(note);
+
+    return (
+        <FormListItem
+            icon={property.icon}
+            disabled={disabled}
+            onClick={(e) => e.stopPropagation()}
+        >
+            {property.label}
+            <FormTextBox
+                type="number"
+                currentValue={value ?? ""} onChange={setValue}
+                style={{ width: (property.width ?? 100) }}
+                min={property.min ?? 0}
+                disabled={disabled}
+            />
+        </FormListItem>
+    );
+}
+
+function ComboBoxPropertyView({ note, property }: { note: FNote, property: ComboBoxProperty }) {
+    const [ value, setValue ] = useNoteLabelWithDefault(note, property.bindToLabel, property.defaultValue ?? "");
+
+    function renderItem(option: ComboBoxItem) {
+        return (
+            <FormListItem
+                key={option.value}
+                checked={value === option.value}
+                onClick={() => setValue(option.value)}
+            >
+                {option.label}
+            </FormListItem>
+        );
+    }
+
+    return (
+        <FormDropdownSubmenu
+            title={property.label}
+            icon={property.icon ?? "bx bx-empty"}
+        >
+            {(property.options).map((option, index) => {
+                if ("items" in option) {
+                    return (
+                        <Fragment key={option.title}>
+                            <FormListItem key={option.title} disabled>{option.title}</FormListItem>
+                            {option.items.map(renderItem)}
+                            {index < property.options.length - 1 && <FormDropdownDivider />}
+                        </Fragment>
+                    );
+                }
+                return renderItem(option);
+
+            })}
+        </FormDropdownSubmenu>
+    );
+}
+
+function CheckBoxPropertyView({ note, property }: { note: FNote, property: CheckBoxProperty }) {
+    const [ value, setValue ] = useNoteLabelBoolean(note, property.bindToLabel);
+    return (
+        <FormListToggleableItem
+            icon={property.icon}
+            title={property.label}
+            currentValue={value}
+            onChange={setValue}
+        />
+    );
+}
--- a/apps/client/src/widgets/note_icon.css
+++ b/apps/client/src/widgets/note_icon.css
@@ -117,35 +117,3 @@ body.experimental-feature-new-layout {
        }
    }
 }
-
-body.mobile .modal.icon-switcher {
-    .modal-dialog {
-        left: 0;
-        right: 0;
-        margin: unset;
-        transform: unset;
-        max-width: 100%;
-        height: 100%;
-    }
-
-    .modal-body {
-        padding: 0;
-        display: flex;
-        flex-direction: column;
-
-        > .filter-row {
-            padding: 0.25em var(--bs-modal-padding) 0.5em var(--bs-modal-padding);
-            border-bottom: 1px solid var(--main-border-color);
-        }
-    }
-
-    .icon-list {
-        margin: auto;
-        flex-grow: 1;
-        height: 100%;
-
-        span {
-            padding: 12px;
-        }
-    }
-}
--- a/apps/client/src/widgets/note_icon.tsx
+++ b/apps/client/src/widgets/note_icon.tsx
@@ -4,8 +4,7 @@ import { IconRegistry } from "@triliumnext/commons";
 import { Dropdown as BootstrapDropdown } from "bootstrap";
 import clsx from "clsx";
 import { t } from "i18next";
-import { CSSProperties } from "preact";
-import { createPortal } from "preact/compat";
+import { CSSProperties, RefObject } from "preact";
 import { useEffect, useMemo, useRef, useState } from "preact/hooks";
 import type React from "react";
 import { CellComponentProps, Grid } from "react-window";
@@ -13,15 +12,11 @@ import { CellComponentProps, Grid } from "react-window";
 import FNote from "../entities/fnote";
 import attributes from "../services/attributes";
 import server from "../services/server";
-import { isDesktop, isMobile } from "../services/utils";
 import ActionButton from "./react/ActionButton";
 import Dropdown from "./react/Dropdown";
 import { FormDropdownDivider, FormListItem } from "./react/FormList";
 import FormTextBox from "./react/FormTextBox";
-import { useNoteContext, useNoteLabel, useStaticTooltip, useWindowSize } from "./react/hooks";
-import Modal from "./react/Modal";
-
-const ICON_SIZE = isMobile() ? 56 : 48;
+import { useNoteContext, useNoteLabel, useStaticTooltip } from "./react/hooks";

 interface IconToCountCache {
    iconClassToCountMap: Record<string, number>;
@@ -42,10 +37,6 @@ export default function NoteIcon() {
        setIcon(note?.getIcon());
    }, [ note, iconClass, workspaceIconClass ]);

-    if (isMobile()) {
-        return <MobileNoteIconSwitcher note={note} icon={icon} />;
-    }
-
    return (
        <Dropdown
            className="note-icon-widget"
@@ -57,47 +48,16 @@ export default function NoteIcon() {
            hideToggleArrow
            disabled={viewScope?.viewMode !== "default"}
        >
-            { note && <NoteIconList note={note} onHide={() => dropdownRef?.current?.hide()} columnCount={12} /> }
+            { note && <NoteIconList note={note} dropdownRef={dropdownRef} /> }
        </Dropdown>
    );
 }

-function MobileNoteIconSwitcher({ note, icon }: {
-    note: FNote | null | undefined;
-    icon: string | null | undefined;
-}) {
-    const [ modalShown, setModalShown ] = useState(false);
-    const { windowWidth } = useWindowSize();
-
-    return (note &&
-        <div className="note-icon-widget">
-            <ActionButton
-                className="note-icon"
-                icon={icon ?? "bx bx-empty"}
-                text={t("note_icon.change_note_icon")}
-                onClick={() => setModalShown(true)}
-            />
-
-            {createPortal((
-                <Modal
-                    title={t("note_icon.change_note_icon")}
-                    size="xl"
-                    show={modalShown} onHidden={() => setModalShown(false)}
-                    className="icon-switcher note-icon-widget"
-                    scrollable
-                >
-                    <NoteIconList note={note} onHide={() => setModalShown(false)} columnCount={Math.max(1, Math.floor(windowWidth / ICON_SIZE))} />
-                </Modal>
-            ), document.body)}
-        </div>
-    );
-}
-
-function NoteIconList({ note, onHide, columnCount }: {
-    note: FNote;
-    onHide: () => void;
-    columnCount: number;
+function NoteIconList({ note, dropdownRef }: {
+    note: FNote,
+    dropdownRef: RefObject<BootstrapDropdown>;
 }) {
+    const searchBoxRef = useRef<HTMLInputElement>(null);
    const iconListRef = useRef<HTMLDivElement>(null);
    const [ search, setSearch ] = useState<string>();
    const [ filterByPrefix, setFilterByPrefix ] = useState<string | null>(null);
@@ -113,22 +73,53 @@ function NoteIconList({ note, onHide, columnCount }: {

    return (
        <>
-            <FilterRow
-                note={note}
-                filterByPrefix={filterByPrefix}
-                search={search}
-                setSearch={setSearch}
-                setFilterByPrefix={setFilterByPrefix}
-                filteredIcons={filteredIcons}
-                onHide={onHide}
-            />
+            <div class="filter-row">
+                <span>{t("note_icon.search")}</span>
+                <FormTextBox
+                    inputRef={searchBoxRef}
+                    type="text"
+                    name="icon-search"
+                    placeholder={ filterByPrefix
+                        ? t("note_icon.search_placeholder_filtered", {
+                            number: filteredIcons.length ?? 0,
+                            name: glob.iconRegistry.sources.find(s => s.prefix === filterByPrefix)?.name ?? ""
+                        })
+                        : t("note_icon.search_placeholder", { number: filteredIcons.length ?? 0, count: glob.iconRegistry.sources.length })}
+                    currentValue={search} onChange={setSearch}
+                    autoFocus
+                />
+
+                {getIconLabels(note).length > 0 && (
+                    <div style={{ textAlign: "center" }}>
+                        <ActionButton
+                            icon="bx bx-reset"
+                            text={t("note_icon.reset-default")}
+                            onClick={() => {
+                                if (!note) return;
+                                for (const label of getIconLabels(note)) {
+                                    attributes.removeAttributeById(note.noteId, label.attributeId);
+                                }
+                                dropdownRef?.current?.hide();
+                            }}
+                        />
+                    </div>
+                )}
+
+                {glob.iconRegistry.sources.length > 0 && <Dropdown
+                    buttonClassName="bx bx-filter-alt"
+                    hideToggleArrow
+                    noSelectButtonStyle
+                    noDropdownListStyle
+                    iconAction
+                    title={t("note_icon.filter")}
+                >
+                    <IconFilterContent filterByPrefix={filterByPrefix} setFilterByPrefix={setFilterByPrefix} />
+                </Dropdown>}
+            </div>

            <div
                class="icon-list"
                ref={iconListRef}
-                style={{
-                    width: (columnCount * ICON_SIZE + 10),
-                }}
                onClick={(e) => {
                    // Make sure we are not clicking on something else than a button.
                    const clickedTarget = e.target as HTMLElement;
@@ -139,19 +130,18 @@ function NoteIconList({ note, onHide, columnCount }: {
                        const attributeToSet = note.hasOwnedLabel("workspace") ? "workspaceIconClass" : "iconClass";
                        attributes.setLabel(note.noteId, attributeToSet, iconClass);
                    }
-                    onHide();
+                    dropdownRef?.current?.hide();
                }}
            >
                {filteredIcons.length ? (
                    <Grid
-                        columnCount={columnCount}
-                        columnWidth={ICON_SIZE}
-                        rowCount={Math.ceil(filteredIcons.length / columnCount)}
-                        rowHeight={ICON_SIZE}
+                        columnCount={12}
+                        columnWidth={48}
+                        rowCount={Math.ceil(filteredIcons.length / 12)}
+                        rowHeight={48}
                        cellComponent={IconItemCell}
                        cellProps={{
-                            filteredIcons,
-                            columnCount
+                            filteredIcons
                        }}
                    />
                ) : (
@@ -162,95 +152,10 @@ function NoteIconList({ note, onHide, columnCount }: {
    );
 }

-function FilterRow({ note, filterByPrefix, search, setSearch, setFilterByPrefix, filteredIcons, onHide }: {
-    note: FNote;
-    filterByPrefix: string | null;
-    search: string | undefined;
-    setSearch: (value: string | undefined) => void;
-    setFilterByPrefix: (value: string | null) => void;
+function IconItemCell({ rowIndex, columnIndex, style, filteredIcons }: CellComponentProps<{
    filteredIcons: IconWithName[];
-    onHide: () => void;
-}) {
-    const searchBoxRef = useRef<HTMLInputElement>(null);
-    const hasCustomIcon = getIconLabels(note).length > 0;
-
-    function resetToDefaultIcon() {
-        if (!note) return;
-        for (const label of getIconLabels(note)) {
-            attributes.removeAttributeById(note.noteId, label.attributeId);
-        }
-        onHide();
-    }
-
-    return (
-        <div class="filter-row">
-            <span>{t("note_icon.search")}</span>
-            <FormTextBox
-                inputRef={searchBoxRef}
-                type="text"
-                name="icon-search"
-                placeholder={ filterByPrefix
-                    ? t("note_icon.search_placeholder_filtered", {
-                        number: filteredIcons.length ?? 0,
-                        name: glob.iconRegistry.sources.find(s => s.prefix === filterByPrefix)?.name ?? ""
-                    })
-                    : t("note_icon.search_placeholder", { number: filteredIcons.length ?? 0, count: glob.iconRegistry.sources.length })}
-                currentValue={search} onChange={setSearch}
-                autoFocus
-            />
-
-            {isDesktop()
-                ? <>
-                    {hasCustomIcon && (
-                        <div style={{ textAlign: "center" }}>
-                            <ActionButton
-                                icon="bx bx-reset"
-                                text={t("note_icon.reset-default")}
-                                onClick={resetToDefaultIcon}
-                            />
-                        </div>
-                    )}
-
-                    {<Dropdown
-                        buttonClassName="bx bx-filter-alt"
-                        hideToggleArrow
-                        noSelectButtonStyle
-                        noDropdownListStyle
-                        iconAction
-                        title={t("note_icon.filter")}
-                    >
-                        <IconFilterContent filterByPrefix={filterByPrefix} setFilterByPrefix={setFilterByPrefix} />
-                    </Dropdown>}
-                </> : (
-                    <Dropdown
-                        buttonClassName="bx bx-dots-vertical-rounded"
-                        hideToggleArrow
-                        noSelectButtonStyle
-                        noDropdownListStyle
-                        iconAction
-                        dropdownContainerClassName="mobile-bottom-menu"
-                    >
-                        {hasCustomIcon && <>
-                            <FormListItem
-                                icon="bx bx-reset"
-                                onClick={resetToDefaultIcon}
-                                disabled={!hasCustomIcon}
-                            >{t("note_icon.reset-default")}</FormListItem>
-                            <FormDropdownDivider />
-                        </>}
-
-                        <IconFilterContent filterByPrefix={filterByPrefix} setFilterByPrefix={setFilterByPrefix} />
-                    </Dropdown>
-                )}
-        </div>
-    );
-}
-
-function IconItemCell({ rowIndex, columnIndex, style, filteredIcons, columnCount }: CellComponentProps<{
-    filteredIcons: IconWithName[];
-    columnCount: number;
 }>) {
-    const iconIndex = rowIndex * columnCount + columnIndex;
+    const iconIndex = rowIndex * 12 + columnIndex;
    const iconData = filteredIcons[iconIndex] as IconWithName | undefined;
    if (!iconData) return <></> as React.ReactElement;

@@ -279,7 +184,7 @@ function IconFilterContent({ filterByPrefix, setFilterByPrefix }: {
                checked={filterByPrefix === "bx"}
                onClick={() => setFilterByPrefix("bx")}
            >{t("note_icon.filter-default")}</FormListItem>
-            {glob.iconRegistry.sources.length > 1 && <FormDropdownDivider />}
+            <FormDropdownDivider />

            {glob.iconRegistry.sources.map(({ prefix, name, icon }) => (
                prefix !== "bx" && <FormListItem
--- a/apps/client/src/widgets/note_title.css
+++ b/apps/client/src/widgets/note_title.css
@@ -109,29 +109,4 @@ body.experimental-feature-new-layout {
            --input-focus-color: initial;
        }
    }
-
-    &.mobile .title-row {
-        .icon-action:not(.note-icon) {
-            --icon-button-size: 45px;
-            --icon-button-icon-ratio: 0.5;
-            flex-shrink: 0;
-        }
-
-        .note-actions {
-            width: auto;
-        }
-
-        .note-badges {
-            margin-inline: 0.5em;
-            flex-shrink: 0;
-        }
-
-        .note-icon-widget {
-            margin-inline: 0.5em;
-
-            .note-icon {
-                --icon-button-size: 24px;
-            }
-        }
-    }
 }
--- a/apps/client/src/widgets/note_tree.css
+++ b/apps/client/src/widgets/note_tree.css
@@ -1,4 +1,4 @@
-.tree-wrapper {
+#left-pane .tree-wrapper {
    .note-indicator-icon.subtree-hidden-badge {
        font-family: inherit !important;
        margin-inline: 0.5em;
@@ -9,6 +9,7 @@
        border-radius: 0.5em;
        font-size: 0.7rem;
        font-weight: normal;
+        float: right;
        vertical-align: middle;
    }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jin	19781bb14c	Merge branch 'main' into week-note	2026-02-01 14:29:45 +00:00
Jin	7fd2bc30cc	test: add test for week number with different first day of week setting	2026-02-01 14:26:11 +00:00
Jin	bd7e47d8f0	refactor: clear calendar code	2026-01-19 21:15:18 +00:00
Jin	457a7a03fb	test: add test for week notes utils	2026-01-19 21:01:07 +00:00
Jin	6e486c64f1	fix: move calendar to use common week note utils	2026-01-19 20:59:15 +00:00
Jin	4f3575d765	fix: move date_notes to use common week note utils	2026-01-19 20:56:52 +00:00
Jin	f5f1b27754	fix: add common week note utils	2026-01-19 20:56:12 +00:00
@@ -1 +1 @@
 .13.1
 .13.0