diff --git a/frontend/apps/filemanager/filemanagerutil.lua b/frontend/apps/filemanager/filemanagerutil.lua
index b960d6acb..bee6b8f49 100644
--- a/frontend/apps/filemanager/filemanagerutil.lua
+++ b/frontend/apps/filemanager/filemanagerutil.lua
@@ -63,7 +63,6 @@ end
 function filemanagerutil.resetDocumentSettings(file)
     local settings_to_keep = {
         bookmarks = true,
-        bookmarks_sorted = true,
         bookmarks_sorted_20220106 = true,
         bookmarks_version = true,
         cre_dom_version = true,
diff --git a/frontend/apps/reader/modules/readerbookmark.lua b/frontend/apps/reader/modules/readerbookmark.lua
index 97ecee1a9..2f9f8650f 100644
--- a/frontend/apps/reader/modules/readerbookmark.lua
+++ b/frontend/apps/reader/modules/readerbookmark.lua
@@ -378,7 +378,6 @@ end
 function ReaderBookmark:onSaveSettings()
     self.ui.doc_settings:saveSetting("bookmarks", self.bookmarks)
     self.ui.doc_settings:saveSetting("bookmarks_version", 20200615)
-    self.ui.doc_settings:makeTrue("bookmarks_sorted")
     self.ui.doc_settings:makeTrue("bookmarks_sorted_20220106")
     self.ui.doc_settings:makeTrue("highlights_imported")
 end
@@ -386,7 +385,7 @@ end
 function ReaderBookmark:onToggleBookmark()
     self:toggleBookmark()
     self.view.footer:onUpdateFooter(self.view.footer_visible)
-    self.ui:handleEvent(Event:new("SetDogearVisibility", not self.view.dogear_visible))
+    self.view.dogear:onSetDogearVisibility(not self.view.dogear_visible)
     UIManager:setDirty(self.view.dialog, "ui")
     return true
 end
@@ -397,7 +396,7 @@ function ReaderBookmark:isPageBookmarked(pn_or_xp)
 end
 
 function ReaderBookmark:setDogearVisibility(pn_or_xp)
-    self.ui:handleEvent(Event:new("SetDogearVisibility", self:isPageBookmarked(pn_or_xp)))
+    self.view.dogear:onSetDogearVisibility(self:isPageBookmarked(pn_or_xp))
 end
 
 function ReaderBookmark:onPageUpdate(pageno)
@@ -1002,7 +1001,6 @@ function ReaderBookmark:setBookmarkNote(item, from_highlight, is_new_note, new_t
         bookmark.type = self:getBookmarkType(bookmark)
         bookmark.text_orig = bm.text or bm.notes
         bookmark.mandatory = self:getBookmarkPageString(bm.page)
-        self.ui:handleEvent(Event:new("BookmarkEdited", bm))
     else
         bookmark = item
     end
diff --git a/frontend/apps/reader/modules/readerthumbnail.lua b/frontend/apps/reader/modules/readerthumbnail.lua
index 10db5a33b..333526ad6 100644
--- a/frontend/apps/reader/modules/readerthumbnail.lua
+++ b/frontend/apps/reader/modules/readerthumbnail.lua
@@ -510,5 +510,6 @@ ReaderThumbnail.onDocumentPartiallyRerendered = ReaderThumbnail.resetCache
 ReaderThumbnail.onBookmarkAdded = ReaderThumbnail.resetCachedPagesForBookmarks
 ReaderThumbnail.onBookmarkRemoved = ReaderThumbnail.resetCachedPagesForBookmarks
 ReaderThumbnail.onBookmarkUpdated = ReaderThumbnail.resetCachedPagesForBookmarks
+ReaderThumbnail.onBookmarkEdited = ReaderThumbnail.resetCachedPagesForBookmarks
 
 return ReaderThumbnail