diff --git a/src/public/images/icons/trash-16.png b/src/public/images/icons/trash-16.png
new file mode 100644
index 000000000..748ece6cc
Binary files /dev/null and b/src/public/images/icons/trash-16.png differ
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 2842eb0c7..d94acd41f 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -575,3 +575,12 @@ table.promoted-attributes-in-tooltip td, table.promoted-attributes-in-tooltip th
 .algolia-autocomplete .aa-dropdown-menu .aa-suggestion.aa-cursor {
     background-color: #B2D7FF;
 }
+
+.help-button {
+    float: right;
+    background: none;
+    font-weight: 900;
+    color: orange;
+    border: 0;
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/src/views/details/search.ejs b/src/views/details/search.ejs
index 77cdc044c..a741a0c99 100644
--- a/src/views/details/search.ejs
+++ b/src/views/details/search.ejs
@@ -32,8 +32,6 @@
             <code>@abc @def some search string</code> - same combination</li>
     </ul>
 
-    <button class="btn btn-sm" type="button" data-help-page="Search">
-        <i class="glyphicon glyphicon-info-sign"></i> Complete help on search
-    </button>
+    <button class="btn btn-sm" type="button" data-help-page="Search">Complete help on search</button>
     </p>
 </div>
\ No newline at end of file
diff --git a/src/views/dialogs/add_link.ejs b/src/views/dialogs/add_link.ejs
index 08902ee9d..08bc9477e 100644
--- a/src/views/dialogs/add_link.ejs
+++ b/src/views/dialogs/add_link.ejs
@@ -2,8 +2,11 @@
   <div class="modal-dialog modal-lg" style="max-width: 1000px" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">Add note link</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <h5 class="modal-title mr-auto">Add note link</h5>
+
+        <button type="button" class="help-button" title="Help on links" data-help-page="Links">?</button>
+
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0 !important;">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
@@ -43,10 +46,6 @@
         </div>
         <div class="modal-footer" style="display: flex; justify-content: space-between;">
           <button type="submit" class="btn btn-primary">Add note link <kbd>enter</kbd></button>
-
-          <button class="btn btn-sm" type="button" data-help-page="Links">
-            <i class="glyphicon glyphicon-info-sign"></i> Help
-          </button>
         </div>
       </form>
     </div>
diff --git a/src/views/dialogs/attributes.ejs b/src/views/dialogs/attributes.ejs
index b332bd451..d8423b952 100644
--- a/src/views/dialogs/attributes.ejs
+++ b/src/views/dialogs/attributes.ejs
@@ -2,8 +2,11 @@
   <div class="modal-dialog modal-lg" style="max-width: 1000px" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">Note attributes</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <h5 class="modal-title mr-auto">Note attributes</h5>
+
+        <button class="help-button" type="button" data-help-page="Attributes" title="Help on Attributes">?</button>
+
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
@@ -70,8 +73,9 @@
                 <td title="Inheritable relations are automatically inherited to the child notes">
                   <input type="checkbox" value="1" data-bind="checked: isInheritable"/>
 
-                  <span title="Delete" style="padding: 13px; cursor: pointer;"
-                      class="glyphicon glyphicon-trash"
+                  &nbsp;
+
+                  <span title="Delete" style="padding: 13px; cursor: pointer; background: url('/images/icons/trash-16.png') center no-repeat;"
                       data-bind="click: $parent.deleteAttribute"></span>
                 </td>
               </tr>
@@ -118,13 +122,9 @@
             </div>
           </div>
         </div>
-        <div class="modal-footer" style="display: flex; justify-content: space-between;">
+        <div class="modal-footer">
           <button class="btn btn-primary btn-large" style="width: 200px;" id="save-attributes-button" type="submit">
             Save changes <kbd>enter</kbd></button>
-
-          <button class="btn btn-sm" type="button" data-help-page="Attributes">
-            <i class="glyphicon glyphicon-info-sign"></i> Help
-          </button>
         </div>
       </form>
     </div>
diff --git a/src/views/dialogs/branch_prefix.ejs b/src/views/dialogs/branch_prefix.ejs
index 47d285e98..366e05298 100644
--- a/src/views/dialogs/branch_prefix.ejs
+++ b/src/views/dialogs/branch_prefix.ejs
@@ -2,8 +2,11 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">Edit branch prefix</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <h5 class="modal-title mr-auto">Edit branch prefix</h5>
+
+        <button class="help-button" type="button" data-help-page="Tree-concepts#prefix" title="Help on Tree prefix">?</button>
+
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
@@ -13,12 +16,8 @@
           <input id="branch-prefix-input" style="width: 20em;"> - <span id="branch-prefix-note-title"></span>
         </div>
       </div>
-      <div class="modal-footer" style="display: flex; justify-content: space-between;">
+      <div class="modal-footer">
         <button class="btn btn-p`rimary btn-sm">Save</button>
-
-        <button class="btn btn-sm" type="button" data-help-page="Tree-concepts#prefix">
-          <i class="glyphicon glyphicon-info-sign"></i> Help
-        </button>
       </div>
     </div>
   </div>
diff --git a/src/views/dialogs/note_revisions.ejs b/src/views/dialogs/note_revisions.ejs
index 8aca58468..086b14681 100644
--- a/src/views/dialogs/note_revisions.ejs
+++ b/src/views/dialogs/note_revisions.ejs
@@ -2,8 +2,11 @@
   <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">Note revisions</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <h5 class="modal-title mr-auto">Note revisions</h5>
+
+        <button class="help-button" type="button" data-help-page="Note-revisions" title="Help on Note revisions">?</button>
+
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0 !important;">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
@@ -14,12 +17,6 @@
         <div id="note-revision-content-wrapper" style="flex-grow: 1; margin-left: 20px;">
           <div style="display: flex">
             <h3 id="note-revision-title" style="margin: 3px; flex-grow: 100;"></h3>
-
-            <div>
-              <button class="btn btn-sm" type="button" data-help-page="Note-revisions">
-                <i class="glyphicon glyphicon-info-sign"></i> Help
-              </button>
-            </div>
           </div>
 
           <div id="note-revision-content" style="height: 600px; width: 600px; overflow: auto;"></div>
diff --git a/src/views/dialogs/options.ejs b/src/views/dialogs/options.ejs
index d930bdbaa..65ebde7d9 100644
--- a/src/views/dialogs/options.ejs
+++ b/src/views/dialogs/options.ejs
@@ -90,9 +90,7 @@
               <div style="display: flex; justify-content: space-between;">
                 <button class="btn btn-sm">Save</button>
 
-                <button class="btn btn-sm" type="button" data-help-page="Protected-notes">
-                  <i class="glyphicon glyphicon-info-sign"></i> Help
-                </button>
+                <button class="btn btn-sm" type="button" data-help-page="Protected-notes">Help</button>
               </div>
             </form>
           </div>
@@ -108,9 +106,7 @@
               <div style="display: flex; justify-content: space-between;">
                 <button class="btn btn-sm">Save</button>
 
-                <button class="btn btn-sm" type="button" data-help-page="Note-revisions">
-                  <i class="glyphicon glyphicon-info-sign"></i> Help
-                </button>
+                <button class="btn btn-sm" type="button" data-help-page="Note-revisions">Help</button>
               </div>
             </form>
           </div>
@@ -136,9 +132,7 @@
               <div style="display: flex; justify-content: space-between;">
                 <button class="btn btn-sm">Save</button>
 
-                <button class="btn btn-sm" type="button" data-help-page="Synchronization">
-                  <i class="glyphicon glyphicon-info-sign"></i> Help
-                </button>
+                <button class="btn btn-sm" type="button" data-help-page="Synchronization">Help</button>
               </div>
             </form>
 
diff --git a/src/views/dialogs/protected_session_password.ejs b/src/views/dialogs/protected_session_password.ejs
index 77b43e565..65a6101cd 100644
--- a/src/views/dialogs/protected_session_password.ejs
+++ b/src/views/dialogs/protected_session_password.ejs
@@ -2,8 +2,11 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">Protected session</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <h5 class="modal-title mr-auto">Protected session</h5>
+
+        <button class="help-button" type="button" data-help-page="Protected-notes" title="Help on Protected notes">?</button>
+
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
@@ -15,11 +18,7 @@
           </div>
         </div>
         <div class="modal-footer">
-          <button class="btn btn-primary btn-sm">Start protected session <kbd>enter</kbd></button>
-
-          <button class="btn btn-sm" type="button" data-help-page="Protected-notes">
-            <i class="glyphicon glyphicon-info-sign"></i> Help
-          </button>
+          <button class="btn btn-primary">Start protected session <kbd>enter</kbd></button>
         </div>
       </form>
     </div>
diff --git a/src/views/index.ejs b/src/views/index.ejs
index ebe6fe0d7..14f3b384b 100644
--- a/src/views/index.ejs
+++ b/src/views/index.ejs
@@ -52,7 +52,7 @@
       <div id="left-pane" class="hide-toggle">
         <div id="global-buttons">
           <a id="create-top-level-note-button" title="Create new top level note" class="icon-action"
-             style="background: url('/images/icons/file-plus-24.png')"></a>
+             data-feather="file-plus"></a>
 
           <a id="collapse-tree-button" title="Collapse note tree. Shortcut ALT+C" class="icon-action"
              style="background: url('/images/icons/list-24.png')"></a>
@@ -227,6 +227,8 @@
 
     <script src="/libraries/autocomplete.jquery.min.js"></script>
 
+    <script src="/libraries/feather.min.js"></script>
+
     <link href="/stylesheets/style.css" rel="stylesheet">
 
     <script src="/javascripts/services/bootstrap.js" type="module"></script>