diff --git a/pkg/server/templates/usage.templ b/pkg/server/templates/usage.templ
index 7b0599f..f40c9f2 100644
--- a/pkg/server/templates/usage.templ
+++ b/pkg/server/templates/usage.templ
@@ -173,19 +173,27 @@ templ Usage(access models.ConvergeAccess) {
             hx-on::after-request="saveFormToCookieEvent(event)">
           <table class="table table-responsive">
                <tr>
-                 <td class="minimal-width"><label
+                 <td class="minimal-width">
+                   <label
                      for="rendez-vous-id"
                      data-toggle="tooltip"
-                     title="this allows the remote agent and client to find each other">rendez-vous id</label></td>
+                     title="this allows the remote agent and client to find each other">
+                     rendez-vous id<sup><i class="bi bi-info-circle small"></i></sup>
+                   </label>
+                 </td>
                  <td>
                    <input id="rendez-vous-id" class="form-control" name="rendez-vous-id" type="text" maxlength="40"></input>
                  </td>
                </tr>
                <tr>
-                 <td class="minimal-width"><label
+                 <td class="minimal-width">
+                   <label
                      for="ssh-keys"
                      data-toggle="tooltip"
-                     title="public SSH public keys define which users are allowed to connect">public ssh keys</label></td>
+                     title="public SSH public keys define which users are allowed to connect">
+                     public ssh keys<sup><i class="bi bi-info-circle small"></i></sup>
+                   </label>
+                 </td>
                  <td>
                    <textarea id="ssh-keys" class="form-control autogrow" name="ssh-keys" rows="5"></textarea>
                  </td>
@@ -194,7 +202,9 @@ templ Usage(access models.ConvergeAccess) {
                   <td class="minimal-width"><label
                       for="remote-shell"
                       data-toggle="tooltip"
-                      title="is the agent running on linux (sh-like shell) or windows?">agent environment</label></td>
+                      title="is the agent running on linux (sh-like shell) or windows?">
+                      agent environment<sup><i class="bi bi-info-circle small"></i></sup></label>
+                  </td>
                   <td>
                       <input checked id="remote-shell-0" name="remote-shell" type="radio" value={BASH}> <label for="remote-shell-0">bash, sh, zsh, ...</label>
                       <input id="remote-shell-1" name="remote-shell" type="radio" value={CMD}> <label for="remote-shell-1">command prompt</label>
@@ -202,20 +212,28 @@ templ Usage(access models.ConvergeAccess) {
                   </td>
               </tr>
               <tr>
-                  <td class="minimal-width"><label
+                  <td class="minimal-width">
+                    <label
                       for="download-command"
                       data-toggle="tooltip"
-                      title="how is the agent downloaded to the remote environment?">download method</label></td>
+                      title="how is the agent downloaded to the remote environment?">
+                      download method<sup><i class="bi bi-info-circle small"></i></sup>
+                    </label>
+                  </td>
                   <td>
                       <input checked id="download-command-0" name="download-command" type="radio" value={CURL}> <label for="download-command-0">curl</label>
                       <input id="download-command-1" name="download-command" type="radio" value={WGET}> <label for="download-command-1">wget</label>
                   </td>
               </tr>
               <tr>
-                  <td class="minimal-width"><label
+                  <td class="minimal-width">
+                    <label
                       for="certificate-validation"
                       data-toggle="tooltip"
-                      title="turn off certificate validation if the converge certificate is untrusted by the remote system">certificate validation</label></td>
+                      title="turn off certificate validation if the converge certificate is untrusted by the remote system">
+                      certificate validation<sup><i class="bi bi-info-circle small"></i></sup>
+                    </label>
+                  </td>
                   <td>
                       <input checked id="certificate-validation-0" name="certificate-validation" type="checkbox" checked> <label for="certificate-validation-0"></label>
                   </td>