diff --git a/docs/frontend_api/entities_fnote.js.html b/docs/frontend_api/entities_fnote.js.html
index 617d42f10..655101712 100644
--- a/docs/frontend_api/entities_fnote.js.html
+++ b/docs/frontend_api/entities_fnote.js.html
@@ -42,9 +42,9 @@ const NOTE_TYPE_ICONS = {
     "code": "bx bx-code",
     "render": "bx bx-extension",
     "search": "bx bx-file-find",
-    "relationMap": "bx bx-map-alt",
+    "relationMap": "bx bxs-network-chart",
     "book": "bx bx-book",
-    "noteMap": "bx bx-map-alt",
+    "noteMap": "bx bxs-network-chart",
     "mermaid": "bx bx-selection",
     "canvas": "bx bx-pen",
     "webView": "bx bx-globe-alt",
@@ -570,7 +570,7 @@ class FNote {
             return workspaceIconClass;
         }
         else if (this.noteId === 'root') {
-            return "bx bx-chevrons-right";
+            return "bx bx-home-alt-2";
         }
         if (this.noteId === '_share') {
             return "bx bx-share-alt";
diff --git a/src/public/app/entities/fnote.js b/src/public/app/entities/fnote.js
index 60acdbf29..b33b63cfd 100644
--- a/src/public/app/entities/fnote.js
+++ b/src/public/app/entities/fnote.js
@@ -14,9 +14,9 @@ const NOTE_TYPE_ICONS = {
     "code": "bx bx-code",
     "render": "bx bx-extension",
     "search": "bx bx-file-find",
-    "relationMap": "bx bx-map-alt",
+    "relationMap": "bx bxs-network-chart",
     "book": "bx bx-book",
-    "noteMap": "bx bx-map-alt",
+    "noteMap": "bx bxs-network-chart",
     "mermaid": "bx bx-selection",
     "canvas": "bx bx-pen",
     "webView": "bx bx-globe-alt",
@@ -543,7 +543,7 @@ class FNote {
             return workspaceIconClass;
         }
         else if (this.noteId === 'root') {
-            return "bx bx-chevrons-right";
+            return "bx bx-home-alt-2";
         }
         if (this.noteId === '_share') {
             return "bx bx-share-alt";
diff --git a/src/public/app/services/note_types.js b/src/public/app/services/note_types.js
index 242df1a54..8bc30af6b 100644
--- a/src/public/app/services/note_types.js
+++ b/src/public/app/services/note_types.js
@@ -7,8 +7,8 @@ async function getNoteTypeItems(command) {
         { title: t("note_types.text"), command: command, type: "text", uiIcon: "bx bx-note" },
         { title: t("note_types.code"), command: command, type: "code", uiIcon: "bx bx-code" },
         { title: t("note_types.saved-search"), command: command, type: "search", uiIcon: "bx bx-file-find" },
-        { title: t("note_types.relation-map"), command: command, type: "relationMap", uiIcon: "bx bx-map-alt" },
-        { title: t("note_types.note-map"), command: command, type: "noteMap", uiIcon: "bx bx-map-alt" },
+        { title: t("note_types.relation-map"), command: command, type: "relationMap", uiIcon: "bx bxs-network-chart" },
+        { title: t("note_types.note-map"), command: command, type: "noteMap", uiIcon: "bx bxs-network-chart" },
         { title: t("note_types.render-note"), command: command, type: "render", uiIcon: "bx bx-extension" },
         { title: t("note_types.book"), command: command, type: "book", uiIcon: "bx bx-book" },
         { title: t("note_types.mermaid-diagram"), command: command, type: "mermaid", uiIcon: "bx bx-selection" },
diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js
index e4aed7ba7..de8c618f2 100644
--- a/src/public/app/widgets/buttons/global_menu.js
+++ b/src/public/app/widgets/buttons/global_menu.js
@@ -126,7 +126,7 @@ const TPL = `
 
     <ul class="dropdown-menu dropdown-menu-right">
         <li class="dropdown-item" data-trigger-command="showOptions">
-            <span class="bx bx-slider"></span>
+            <span class="bx bx-cog"></span>
             ${t('global_menu.options')}
         </li>
 
@@ -177,7 +177,7 @@ const TPL = `
         
         <li class="dropdown-item dropdown-submenu">
             <span class="dropdown-toggle">
-                <span class="bx bx-empty"></span>
+                <span class="bx bx-chip"></span>
                 ${t('global_menu.advanced')}
             </span>
             
@@ -195,43 +195,43 @@ const TPL = `
                 </li>
                 
                 <li class="dropdown-item" data-trigger-command="showSQLConsoleHistory">
-                    <span class="bx bx-empty"></span>
+                    <span class="bx bx-data"></span>
                     ${t('global_menu.open_sql_console_history')}
                 </li>
                 
                 <li class="dropdown-item" data-trigger-command="showSearchHistory">
-                    <span class="bx bx-empty"></span>
+                    <span class="bx bx-search-alt"></span>
                     ${t('global_menu.open_search_history')}
                 </li>
         
                 <li class="dropdown-item" data-trigger-command="showBackendLog">
-                    <span class="bx bx-empty"></span>
+                    <span class="bx bx-detail"></span>
                     ${t('global_menu.show_backend_log')}
                     <kbd data-command="showBackendLog"></kbd>
                 </li>
                 
                 <li class="dropdown-item" data-trigger-command="reloadFrontendApp" 
                     title="${t('global_menu.reload_hint')}">
-                    <span class="bx bx-empty"></span>
+                    <span class="bx bx-refresh"></span>
                     ${t('global_menu.reload_frontend')}
                     <kbd data-command="reloadFrontendApp"></kbd>
                 </li>
                 
                 <li class="dropdown-item" data-trigger-command="showHiddenSubtree">
-                    <span class="bx bx-empty"></span>
+                    <span class="bx bx-hide"></span>
                     ${t('global_menu.show_hidden_subtree')}
                 </li>
             </ul>
         </li>
 
         <li class="dropdown-item show-help-button" data-trigger-command="showHelp">
-            <span class="bx bx-info-circle"></span>
+            <span class="bx bx-help-circle"></span>
             ${t('global_menu.show_help')}
             <kbd data-command="showHelp"></kbd>
         </li>
 
         <li class="dropdown-item show-about-dialog-button">
-            <span class="bx bx-empty"></span>
+            <span class="bx bx-info-circle"></span>
             ${t('global_menu.about')}
         </li>
 
diff --git a/src/public/app/widgets/highlights_list.js b/src/public/app/widgets/highlights_list.js
index 032ae36ce..671352131 100644
--- a/src/public/app/widgets/highlights_list.js
+++ b/src/public/app/widgets/highlights_list.js
@@ -49,7 +49,7 @@ export default class HighlightsListWidget extends RightPanelWidget {
     get widgetButtons() {
         return [
             new OnClickButtonWidget()
-                .icon("bx-slider")
+                .icon("bx-cog")
                 .title("Options")
                 .titlePlacement("left")
                 .onClick(() => appContext.tabManager.openContextWithNote('_optionsTextNotes', {activate: true}))
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 389e6f5cb..0869a03f6 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -106,7 +106,7 @@ const TPL = `
                 title="Scroll to active note" 
                 data-trigger-command="scrollToActiveNote"></button>
         
-        <button class="tree-floating-button bx bx-cog tree-settings-button" 
+        <button class="tree-floating-button bx bxs-tree tree-settings-button" 
                 title="Tree settings"></button>
     </div>
     
diff --git a/src/public/app/widgets/ribbon_widgets/note_map.js b/src/public/app/widgets/ribbon_widgets/note_map.js
index b180190b9..63dafca87 100644
--- a/src/public/app/widgets/ribbon_widgets/note_map.js
+++ b/src/public/app/widgets/ribbon_widgets/note_map.js
@@ -52,7 +52,7 @@ export default class NoteMapRibbonWidget extends NoteContextAwareWidget {
         return {
             show: this.isEnabled(),
             title: t("note_map.title"),
-            icon: 'bx bx-map-alt'
+            icon: 'bx bxs-network-chart'
         };
     }
 
diff --git a/src/public/app/widgets/toc.js b/src/public/app/widgets/toc.js
index aaad8bc82..65d2dbe19 100644
--- a/src/public/app/widgets/toc.js
+++ b/src/public/app/widgets/toc.js
@@ -61,7 +61,7 @@ export default class TocWidget extends RightPanelWidget {
     get widgetButtons() {
         return [
             new OnClickButtonWidget()
-                .icon("bx-slider")
+                .icon("bx-cog")
                 .title("Options")
                 .titlePlacement("left")
                 .onClick(() => appContext.tabManager.openContextWithNote('_optionsTextNotes', {activate: true}))
diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts
index 563da456f..d7ef45a8b 100644
--- a/src/services/hidden_subtree.ts
+++ b/src/services/hidden_subtree.ts
@@ -48,7 +48,7 @@ const HIDDEN_SUBTREE_DEFINITION: Item = {
     id: '_hidden',
     title: 'Hidden Notes',
     type: 'doc',
-    icon: 'bx bx-chip',
+    icon: 'bx bx-hide',
     // we want to keep the hidden subtree always last, otherwise there will be problems with e.g., keyboard navigation
     // over tree when it's in the middle
     notePosition: 999_999_999,
@@ -222,7 +222,7 @@ const HIDDEN_SUBTREE_DEFINITION: Item = {
                         { id: '_lbJumpTo', title: 'Jump to Note', type: 'launcher', command: 'jumpToNote', icon: 'bx bx-send', attributes: [
                                 { type: 'label', name: 'desktopOnly' }
                             ] },
-                        { id: '_lbNoteMap', title: 'Note Map', type: 'launcher', targetNoteId: '_globalNoteMap', icon: 'bx bx-map-alt' },
+                        { id: '_lbNoteMap', title: 'Note Map', type: 'launcher', targetNoteId: '_globalNoteMap', icon: 'bx bxs-network-chart' },
                         { id: '_lbCalendar', title: 'Calendar', type: 'launcher', builtinWidget: 'calendar', icon: 'bx bx-calendar' },
                         { id: '_lbRecentChanges', title: 'Recent Changes', type: 'launcher', command: 'showRecentChanges', icon: 'bx bx-history', attributes: [
                                 { type: 'label', name: 'desktopOnly' }
@@ -241,6 +241,7 @@ const HIDDEN_SUBTREE_DEFINITION: Item = {
             id: '_options',
             title: 'Options',
             type: 'book',
+            icon: 'bx-cog',
             children: [
                 { id: '_optionsAppearance', title: 'Appearance', type: 'contentWidget', icon: 'bx-layout' },
                 { id: '_optionsShortcuts', title: 'Shortcuts', type: 'contentWidget', icon: 'bxs-keyboard' },