diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php
index 983e208bef..acaaadd12c 100644
--- a/pandora_console/extensions/dbmanager.php
+++ b/pandora_console/extensions/dbmanager.php
@@ -90,7 +90,7 @@ function dbmgr_extension_main()
 
     // Header.
     ui_print_standard_header(
-        __('Database interface'),
+        __('DB interface'),
         'images/gm_db.png',
         false,
         '',
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 7e17f9fe4c..e6ae8d7bab 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -93,7 +93,7 @@ $buttons['general'] = [
         'images/setup.png',
         true,
         [
-            'title' => __('General'),
+            'title' => __('General setup'),
             'class' => 'invert_filter',
 
         ]
@@ -265,7 +265,7 @@ if (enterprise_installed()) {
 switch ($section) {
     case 'general':
         $buttons['general']['active'] = true;
-        $subpage = __('General');
+        $subpage = __('General setup');
         $help_header = 'setup_general_tab';
     break;
 
@@ -377,7 +377,7 @@ switch ($section) {
 
 // Header.
 ui_print_standard_header(
-    $subpage,
+    __('Setup').' » '.$subpage,
     '',
     false,
     $help_header,
@@ -388,6 +388,10 @@ ui_print_standard_header(
             'link'  => '',
             'label' => __('Setup'),
         ],
+        [
+            'link'  => '',
+            'label' => $subpage,
+        ],
     ]
 );