diff --git a/app/src/assets/scss/business/_block.scss b/app/src/assets/scss/business/_block.scss
index da053ff6a..07e40ca3c 100644
--- a/app/src/assets/scss/business/_block.scss
+++ b/app/src/assets/scss/business/_block.scss
@@ -137,8 +137,8 @@
     height: 42px;
     flex-shrink: 0;
 
-    &--border {
-      background-color: var(--b3-theme-surface);
+    &--menu {
+      background-color: var(--b3-menu-background);
     }
 
     &:hover .block__icon:not([disabled]) {
diff --git a/app/src/assets/scss/business/_search.scss b/app/src/assets/scss/business/_search.scss
index 650c8a1fa..f64e5e6c9 100644
--- a/app/src/assets/scss/business/_search.scss
+++ b/app/src/assets/scss/business/_search.scss
@@ -7,6 +7,8 @@
 
     &--row {
       flex-direction: row;
+      border-top: 1px solid var(--b3-theme-surface-lighter);
+      border-bottom: 1px solid var(--b3-theme-surface-lighter);
 
       .search__preview {
         border-top: 0;
@@ -98,12 +100,6 @@
     border-top: 1px solid var(--b3-theme-surface-lighter);
   }
 
-  &__result {
-    white-space: nowrap;
-    margin-left: 5px;
-    line-height: 24px;
-  }
-
   &__drag {
     cursor: row-resize;
     width: 100%;
diff --git a/app/src/assets/scss/component/_button.scss b/app/src/assets/scss/component/_button.scss
index 217b78fa8..9c84b2553 100644
--- a/app/src/assets/scss/component/_button.scss
+++ b/app/src/assets/scss/component/_button.scss
@@ -54,6 +54,10 @@
     font-size: 12px;
   }
 
+  &--mid {
+    padding: 2px 8px;
+  }
+
   &--text,
   &--cancel {
     color: var(--b3-theme-primary);
diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss
index c0d1006fb..b54190a17 100644
--- a/app/src/assets/scss/component/_typography.scss
+++ b/app/src/assets/scss/component/_typography.scss
@@ -628,7 +628,7 @@
   border-radius: 4px;
   box-shadow: var(--b3-dialog-shadow);
   border: 1px solid var(--b3-theme-surface-lighter);
-  background-color: var(--b3-menu-background);
+  background-color: var(--b3-theme-surface);
   z-index: 304;
   padding: 4px;
 }
diff --git a/app/src/assets/scss/pdf/_pdf.scss b/app/src/assets/scss/pdf/_pdf.scss
index 14a540d20..e0c1161bc 100644
--- a/app/src/assets/scss/pdf/_pdf.scss
+++ b/app/src/assets/scss/pdf/_pdf.scss
@@ -624,7 +624,7 @@ a:focus > .thumbnail > .thumbnailSelectionRing,
   padding: 8px;
   box-shadow: var(--b3-dialog-shadow);
   border: 1px solid var(--b3-theme-surface-lighter);
-  background-color: var(--b3-menu-background);
+  background-color: var(--b3-theme-surface);
   border-radius: 4px;
   width: 520px;
   position: absolute;
diff --git a/app/src/block/Panel.ts b/app/src/block/Panel.ts
index c1ef3973c..be404c280 100644
--- a/app/src/block/Panel.ts
+++ b/app/src/block/Panel.ts
@@ -318,7 +318,7 @@ export class BlockPanel {
 <span class="fn__space"></span>`;
         }
         /// #endif
-        let html = `<div class="block__icons block__icons--border">
+        let html = `<div class="block__icons block__icons--menu">
     <span class="fn__space fn__flex-1"></span>${openHTML}
     <span data-type="pin" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.pin}"><svg><use xlink:href="#iconPin"></use></svg></span>
     <span class="fn__space"></span>
diff --git a/app/src/dialog/processSystem.ts b/app/src/dialog/processSystem.ts
index fa4326396..ddd8750af 100644
--- a/app/src/dialog/processSystem.ts
+++ b/app/src/dialog/processSystem.ts
@@ -14,7 +14,7 @@ import {confirmDialog} from "./confirmDialog";
 import {escapeHtml} from "../util/escape";
 import {getWorkspaceName} from "../util/noRelyPCFunction";
 import {needSubscribe} from "../util/needSubscribe";
-import { redirectToCheckAuth } from "../util/pathName";
+import {redirectToCheckAuth} from "../util/pathName";
 
 export const lockScreen = () => {
     if (window.siyuan.config.readonly) {
@@ -34,28 +34,23 @@ export const kernelError = () => {
     if (window.siyuan.config.system.container === "ios" && window.webkit?.messageHandlers) {
         iosReStart = `<div class="fn__hr"></div><div class="fn__flex"><div class="fn__flex-1"></div><button class="b3-button">${window.siyuan.languages.retry}</button></div>`;
     }
-    const html = `<div class="b3-dialog__scrim"></div>
-<div class="b3-dialog__container" style="width: ${isMobile() ? "80vw" : "520px"}">
-    <div class="b3-dialog__header" onselectstart="return false;">💔 ${window.siyuan.languages.kernelFault0} <small>v${Constants.SIYUAN_VERSION}</small></div>
-    <div class="b3-dialog__content">
-        <p>${window.siyuan.languages.kernelFault1}</p>
-        <div class="fn__hr"></div>
-        <p>${window.siyuan.languages.kernelFault2}</p>
-        ${iosReStart}
-    </div>
-</div>`;
-    let logElement = document.getElementById("errorLog");
-    if (logElement) {
-        logElement.innerHTML = html;
-    } else {
-        document.body.insertAdjacentHTML("beforeend", `<div id="errorLog" class="b3-dialog b3-dialog--open">${html}</div>`);
-        logElement = document.getElementById("errorLog");
-    }
-
-    const restartElement = logElement.querySelector(".b3-button");
-    if (restartElement && window.webkit?.messageHandlers) {
+    const dialog = new Dialog({
+        disableClose: true,
+        title: `💔 ${window.siyuan.languages.kernelFault0} <small>v${Constants.SIYUAN_VERSION}</small>`,
+        width: isMobile() ? "92vw" : "520px",
+        content: `<div id="errorLog" class="b3-dialog__content">
+<div class="ft__breakword">
+    <div>${window.siyuan.languages.kernelFault1}</div>
+    <div class="fn__hr"></div>
+    <div>${window.siyuan.languages.kernelFault2}</div>
+    ${iosReStart}
+</div>
+</div>`
+    });
+    const restartElement = dialog.element.querySelector(".b3-button");
+    if (restartElement) {
         restartElement.addEventListener("click", () => {
-            logElement.remove();
+            dialog.destroy();
             window.webkit.messageHandlers.startKernelFast.postMessage("startKernelFast");
         });
     }
diff --git a/app/src/protyle/toolbar/index.ts b/app/src/protyle/toolbar/index.ts
index ffcef1e4d..f3fb30a49 100644
--- a/app/src/protyle/toolbar/index.ts
+++ b/app/src/protyle/toolbar/index.ts
@@ -874,7 +874,7 @@ export class Toolbar {
             this.subElement.style.width = "";
             this.subElement.style.padding = "0";
         }
-        this.subElement.innerHTML = `<div ${(isPin && this.subElement.firstElementChild.getAttribute("data-drag") === "true") ? 'data-drag="true"' : ""} class="block__popover--move"><div class="block__icons block__icons--border fn__flex">
+        this.subElement.innerHTML = `<div ${(isPin && this.subElement.firstElementChild.getAttribute("data-drag") === "true") ? 'data-drag="true"' : ""} class="block__popover--move"><div class="block__icons block__icons--menu fn__flex">
     ${title}
     <span class="fn__flex-1"></span>
     <button data-type="refresh" class="block__icon b3-tooltips b3-tooltips__nw${(isPin && !this.subElement.querySelector('[data-type="refresh"]').classList.contains("block__icon--active")) ? "" : " block__icon--active"}${types.includes("NodeBlockQueryEmbed") ? " fn__none" : ""}" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href="#iconRefresh"></use></svg></button>
diff --git a/app/src/search/util.ts b/app/src/search/util.ts
index 550853381..8f5ed8545 100644
--- a/app/src/search/util.ts
+++ b/app/src/search/util.ts
@@ -147,8 +147,12 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
         <div id="replaceHistoryList" data-close="false" class="fn__none b3-menu b3-list b3-list--background"></div>
     </div>
     <div id="criteria" class="b3-chips" style="background-color: var(--b3-theme-background)"></div>
-    <div class="search__header" style="padding: 4px 8px;">
-        <span id="searchResult" class="search__result"></span>
+    <div class="block__icons">
+        <span data-type="previous" class="block__icon block__icon--show b3-tooltips b3-tooltips__se" disabled="disabled" aria-label="${window.siyuan.languages.previousLabel}"><svg><use xlink:href='#iconLeft'></use></svg></span>
+        <span class="fn__space"></span>
+        <span data-type="next" class="block__icon block__icon--show b3-tooltips b3-tooltips__se" disabled="disabled" aria-label="${window.siyuan.languages.nextLabel}"><svg><use xlink:href='#iconRight'></use></svg></span>
+        <span class="fn__space"></span>
+        <span id="searchResult"></span>
         <span class="fn__space"></span>
         <span class="fn__flex-1"></span>
         <span id="searchPathInput" class="search__path ft__on-surface fn__flex-center ft__smaller fn__ellipsis" title="${escapeAttr(config.hPath)}">
@@ -156,18 +160,18 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
             <svg class="search__rmpath${config.hPath ? "" : " fn__none"}"><use xlink:href="#iconCloseRound"></use></svg>
         </span>
         <span class="fn__space"></span>
-        <button ${enableIncludeChild ? "" : "disabled"} id="searchInclude" class="b3-button b3-button--small${includeChild ? "" : " b3-button--cancel"}">${window.siyuan.languages.includeChildDoc}</button>
+        <button ${enableIncludeChild ? "" : "disabled"} id="searchInclude" class="b3-button b3-button--mid${includeChild ? "" : " b3-button--cancel"}">${window.siyuan.languages.includeChildDoc}</button>
         <span class="fn__space"></span>
-        <span id="searchPath" aria-label="${window.siyuan.languages.specifyPath}" class="block__icon b3-tooltips b3-tooltips__w">
+        <span id="searchPath" aria-label="${window.siyuan.languages.specifyPath}" class="block__icon block__icon--show b3-tooltips b3-tooltips__w">
             <svg><use xlink:href="#iconFolder"></use></svg>
         </span>
         <div class="fn__flex${config.group === 0 ? " fn__none" : ""}">
             <span class="fn__space"></span>
-            <span id="searchExpand" class="block__icon b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.expand}">
+            <span id="searchExpand" class="block__icon block__icon--show b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.expand}">
                 <svg><use xlink:href="#iconExpand"></use></svg>
             </span>
             <span class="fn__space"></span>
-            <span id="searchCollapse" class="block__icon b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.collapse}">
+            <span id="searchCollapse" class="block__icon block__icon--show b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.collapse}">
                 <svg><use xlink:href="#iconContract"></use></svg>
             </span>
         </div>