diff --git a/common/component/src/main/ets/components/NoteContentComp.ets b/common/component/src/main/ets/components/NoteContentComp.ets
index c00cfec5dfd43189bdc0c59fa198d7780df3340e..0acc11b90314f8d0655499a08a5cc5d81b8b9be0 100644
--- a/common/component/src/main/ets/components/NoteContentComp.ets
+++ b/common/component/src/main/ets/components/NoteContentComp.ets
@@ -149,7 +149,7 @@ export struct NoteContentComp {
             .height('70%')
             .width('100%')
         }
-        .margin({ left: 12, right: 24 })
+        .margin({ left: 24, right: 24 })
         .width(StyleConstants.PERCENTAGE_100)
         .enabled(this.selectedNoteData && this.selectedNoteData.is_deleted == Delete.Yes ? false : true)
         .onClick(() => {
diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets
index a3bef8299f850a2a75890248f95622a471fcf8f1..f01e225494b9109e711deca16d524ac49c14e439 100644
--- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets
+++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets
@@ -115,7 +115,7 @@ export struct NoteContentCompPortrait {
               })
             })
             .zoomAccess(false)
-            .height('70%')
+            .height('100%')
             .width('100%')
         }
         .flexShrink(1)
@@ -127,7 +127,7 @@ export struct NoteContentCompPortrait {
           LogUtil.info(TAG, "setInterval time_id : " + time_id)
           this.editModel = true
         })
-        .margin({ top: 16 })
+        .margin({ top: 0 })
         .width(StyleConstants.PERCENTAGE_100)
       }
       .flexShrink(1)
diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets
index b7a5b18172342802baa76fb09ba6a750fe171566..f8a159edec897907a268cf55be4976a8cda2cfac 100644
--- a/common/component/src/main/ets/components/NoteListComp.ets
+++ b/common/component/src/main/ets/components/NoteListComp.ets
@@ -668,7 +668,7 @@ export struct SearchComp {
         })
 
       Flex({ justifyContent: FlexAlign.Start }) {
-        Image($r('app.media.search')).width(18).height(18)
+        Image($r('app.media.search')).width(20).height(20)
         TextInput({ placeholder: $r('app.string.searchNote') })
           .backgroundColor(this.longpress ? $r("app.color.search_longpress_bgcolor_f7f8f9") : $r("app.color.color_ffffff"))
           .caretColor($r("app.color.search_note_caret_color"))
diff --git a/common/resources/src/main/resources/rawfile/editor_style.css b/common/resources/src/main/resources/rawfile/editor_style.css
index 06b9eb899100d8037967d7d5550e3be165f6830f..f4491c8e387e1c605241aeb12e8cd739e207c0a2 100644
--- a/common/resources/src/main/resources/rawfile/editor_style.css
+++ b/common/resources/src/main/resources/rawfile/editor_style.css
@@ -30,7 +30,7 @@ body {
 }
 
 #editorjs {
-  padding-left: 24px;
+  padding-left: 0px;
   padding-right: 24px;
   width: 100%;
   display: table-cell;
@@ -38,7 +38,8 @@ body {
   background-repeat: no-repeat;
   background-position: center;
   background-size: cover;
-  color: #333333;
+  color: #182431;
+  opacity: 0.9;
   font-size: 16px;
 }
 
diff --git a/common/resources/src/main/resources/rawfile/rich_editor.js b/common/resources/src/main/resources/rawfile/rich_editor.js
index 5789247ed00f8654af38072717a5ae915006c820..012da17debd23bd32847e6bd991086b15a238efe 100644
--- a/common/resources/src/main/resources/rawfile/rich_editor.js
+++ b/common/resources/src/main/resources/rawfile/rich_editor.js
@@ -356,6 +356,7 @@ function saveHtmlContent() {
 function scheduledSaveContent() {
     console.info('scheduledSaveContent');
     var htmlString = RICH_EDITOR.getHtml();
+    htmlString = window.btoa(unescape(encodeURIComponent(htmlString)));
     var str = callBackToApp.callbackScheduledSave(htmlString);
     console.info('scheduledSaveContent end');
 }
diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets
index 8d78324c9c4d08659cace81bbd6ae81f256d2849..68c24f6df32157f72b9c6beda0cf897b1a349597 100644
--- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets
+++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+import {atob} from 'js-base64'
 import ohosDataRdb from '@ohos.data.rdb'
 import fileio from '@ohos.fileio'
 import {LogUtil} from './LogUtil'
@@ -292,7 +293,7 @@ export default {
   getImgNameFromHtml(noteData: NoteData): any{
     let newModuleName = "file://" + globalThis.noteContext.filesDir
     let imgNameArray = []
-    let html = noteData.content_text
+    let html =  atob(noteData.content_text)
     if (html == undefined || html == null || html == "") {
       return imgNameArray
     }
diff --git a/package-lock.json b/package-lock.json
index 9e5cc8aa01ca6eda158b8578b762b3f8536d9a06..5248f38f62077d87d64f3dc0207e50a5b51af7cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -849,6 +849,11 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
+    "js-base64": {
+      "version": "3.7.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/js-base64/-/js-base64-3.7.2.tgz",
+      "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
+    },
     "json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
diff --git a/package.json b/package.json
index af7a3cdb1d3ec1b5010cec49d12cd91023d5788f..6c265697a69e361cb362c719609ff36b90757ac3 100644
--- a/package.json
+++ b/package.json
@@ -1,18 +1,19 @@
 {
-	"license":"ISC",
-	"devDependencies":{},
-	"name":"ohos_note",
-	"ohos":{
-		"org":"huawei",
-		"directoryLevel":"project",
-		"buildTool":"hvigor"
+	"license": "ISC",
+	"devDependencies": {},
+	"name": "ohos_note",
+	"ohos": {
+		"org": "huawei",
+		"directoryLevel": "project",
+		"buildTool": "hvigor"
 	},
-	"description":"example description",
-	"repository":{},
-	"version":"1.0.0",
-	"dependencies":{
-		"@ohos/hvigor-ohos-plugin":"1.0.6",
-		"hypium":"^1.0.0",
-		"@ohos/hvigor":"1.0.6"
+	"description": "example description",
+	"repository": {},
+	"version": "1.0.0",
+	"dependencies": {
+		"@ohos/hvigor": "1.0.6",
+		"@ohos/hvigor-ohos-plugin": "1.0.6",
+		"hypium": "^1.0.0",
+		"js-base64": "^3.7.2"
 	}
-}
\ No newline at end of file
+}