diff --git a/main/glossary/index.php b/main/glossary/index.php
index 30f02edb8f..e3d40667ea 100755
--- a/main/glossary/index.php
+++ b/main/glossary/index.php
@@ -98,7 +98,16 @@ switch ($action) {
             $token = Security::get_token();
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(['sec_token' => $token]);
-            $content = $form->returnForm();
+            $content = Display::toolbarAction(
+                'add_glossary',
+                [
+                    Display::url(
+                        Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+                        api_get_self().'?'.api_get_cidreq()
+                    )
+                ]
+            );
+            $content .= $form->returnForm();
         }
         break;
     case 'edit_glossary':
@@ -176,7 +185,16 @@ switch ($action) {
                 $token = Security::get_token();
                 $form->addElement('hidden', 'sec_token');
                 $form->setConstants(['sec_token' => $token]);
-                $content = $form->returnForm();
+                $content = Display::toolbarAction(
+                    'edit_glossary',
+                    [
+                        Display::url(
+                            Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+                            api_get_self().'?'.api_get_cidreq()
+                        )
+                    ]
+                );
+                $content .= $form->returnForm();
             }
         }
         break;
diff --git a/main/notebook/index.php b/main/notebook/index.php
index f3806486d7..3eef530832 100755
--- a/main/notebook/index.php
+++ b/main/notebook/index.php
@@ -107,16 +107,15 @@ if ($action === 'addnote') {
         Security::clear_token();
         NotebookManager::display_notes();
     } else {
-        echo '<div class="actions">';
-        echo '<a href="index.php">'.
-            Display::return_icon(
-                'back.png',
-                get_lang('BackToNotesList'),
-                '',
-                ICON_SIZE_MEDIUM
-            ).
-            '</a>';
-        echo '</div>';
+        echo Display::toolbarAction(
+            'add_glossary',
+            [
+                Display::url(
+                    Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+                    api_get_self().'?'.api_get_cidreq()
+                )
+            ]
+        );
         $token = Security::get_token();
         $form->addElement('hidden', 'sec_token');
         $form->setConstants(['sec_token' => $token]);
@@ -171,16 +170,15 @@ if ($action === 'addnote') {
         Security::clear_token();
         NotebookManager::display_notes();
     } else {
-        echo '<div class="actions">';
-        echo '<a href="index.php">'.
-            Display::return_icon(
-                'back.png',
-                get_lang('BackToNotesList'),
-                '',
-                ICON_SIZE_MEDIUM
-            ).
-            '</a>';
-        echo '</div>';
+        echo Display::toolbarAction(
+            'add_glossary',
+            [
+                Display::url(
+                    Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+                    api_get_self().'?'.api_get_cidreq()
+                )
+            ]
+        );
         $token = Security::get_token();
         $form->addElement('hidden', 'sec_token');
         $form->setConstants(['sec_token' => $token]);