diff --git a/src/public/app/layouts/desktop_layout.js b/src/public/app/layouts/desktop_layout.js
index 2314a5686..89f1eb864 100644
--- a/src/public/app/layouts/desktop_layout.js
+++ b/src/public/app/layouts/desktop_layout.js
@@ -109,6 +109,14 @@ export default class DesktopLayout {
                                 .section(new OwnedAttributeListWidget())
                                 .section(new InheritedAttributesWidget())
                                 .section(new NoteInfoWidget())
+                                .button(new ButtonWidget()
+                                    .icon('bx bx-history')
+                                    .title("Note Revisions")
+                                    .command("showNoteRevisions"))
+                                .button(new ButtonWidget() // FIXME should be displayed only when applicable
+                                    .icon('bx bx-code')
+                                    .title("Show Note Source")
+                                    .command("showNoteSource"))
                                 .button(new NoteActionsWidget())
                         )
                             .child(new NoteUpdateStatusWidget())
diff --git a/src/public/app/widgets/buttons/note_actions.js b/src/public/app/widgets/buttons/note_actions.js
index 6b1ae9bb8..d50cc359c 100644
--- a/src/public/app/widgets/buttons/note_actions.js
+++ b/src/public/app/widgets/buttons/note_actions.js
@@ -29,14 +29,11 @@ const TPL = `
     <div class="dropdown-menu dropdown-menu-right">
         <a data-trigger-command="renderActiveNote" class="dropdown-item render-note-button"><kbd data-command="renderActiveNote"></kbd> Re-render note</a>
         <a data-trigger-command="findInText" class="dropdown-item">Search in note <kbd data-command="findInText"></a>
-        <a data-trigger-command="showNoteRevisions" class="dropdown-item show-note-revisions-button">Revisions</a>
         <a data-trigger-command="showLinkMap" class="dropdown-item show-link-map-button"><kbd data-command="showLinkMap"></kbd> Link map</a>
-        <a data-trigger-command="showNoteSource" class="dropdown-item show-source-button"><kbd data-command="showNoteSource"></kbd> Note source</a>
         <a data-trigger-command="openNoteExternally" class="dropdown-item open-note-externally-button"><kbd data-command="openNoteExternally"></kbd> Open note externally</a>
         <a class="dropdown-item import-files-button">Import files</a>
         <a class="dropdown-item export-note-button">Export note</a>
         <a data-trigger-command="printActiveNote" class="dropdown-item print-note-button"><kbd data-command="printActiveNote"></kbd> Print note</a>
-        <a data-trigger-command="showNoteInfo" class="dropdown-item show-note-info-button"><kbd data-command="showNoteInfo"></kbd> Note info</a>
     </div>
 </div>`;
 
diff --git a/src/public/app/widgets/containers/collapsible_section_container.js b/src/public/app/widgets/containers/collapsible_section_container.js
index ed4ee591b..f4ff66820 100644
--- a/src/public/app/widgets/containers/collapsible_section_container.js
+++ b/src/public/app/widgets/containers/collapsible_section_container.js
@@ -55,10 +55,15 @@ const TPL = `
     }
     
     .section-button-container {
+        display: flex;
         border-bottom: 1px solid var(--main-border-color); 
         margin-right: 10px;
     }
     
+    .section-button-container .bx {
+        padding: 5px;
+    }
+    
     .section-body {
         display: none;
         border-bottom: 1px solid var(--main-border-color);