diff --git a/admin/cat_options.php b/admin/cat_options.php
index dbd12fb9b..4d5a22f62 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -242,6 +242,7 @@ SELECT DISTINCT id,name,uppercats,global_rank
 display_select_cat_wrapper($query_true,array(),'category_option_true');
 display_select_cat_wrapper($query_false,array(),'category_option_false');
 $template->assign('PWG_TOKEN',get_pwg_token());
+$template->assign('ADMIN_PAGE_TITLE', l10n('Properties'));
 
 // +-----------------------------------------------------------------------+
 // |                           sending html code                           |
diff --git a/admin/cat_search.php b/admin/cat_search.php
index 3bc4bc514..3a0e211c6 100644
--- a/admin/cat_search.php
+++ b/admin/cat_search.php
@@ -87,7 +87,7 @@ $template->set_filename('cat_search', 'cat_search.tpl');
 $template->assign(
   array(
     'data_cat' => $categories,
-    'ADMIN_PAGE_TITLE' => l10n('Album search tool'),
+    'ADMIN_PAGE_TITLE' => l10n('Albums'),
     'placeholder' => $placeholder,
   )
 );
diff --git a/admin/include/albums_tab.inc.php b/admin/include/albums_tab.inc.php
index 1d82eb229..46c949f5b 100644
--- a/admin/include/albums_tab.inc.php
+++ b/admin/include/albums_tab.inc.php
@@ -15,4 +15,16 @@ $tabsheet->set_id('albums');
 $tabsheet->select($page['tab']);
 $tabsheet->assign();
 
+$query = '
+SELECT COUNT(*)
+  FROM '.CATEGORIES_TABLE.'
+;';
+
+list($nb_cats) = pwg_db_fetch_row(pwg_query($query));
+$template->assign(
+  array(
+    'nb_cats' => $nb_cats,
+  )
+);
+
 ?>
\ No newline at end of file
diff --git a/admin/themes/default/js/group_list.js b/admin/themes/default/js/group_list.js
index 7eabcdece..3dc1cfccb 100644
--- a/admin/themes/default/js/group_list.js
+++ b/admin/themes/default/js/group_list.js
@@ -93,6 +93,7 @@ jQuery(document).ready(function () {
         success: function (raw_data) {
           loadState.reverse();
           data = jQuery.parseJSON(raw_data);
+          console.log(data);
           if (data.stat === "ok") {
             $(".addGroupFormLabelAndInput input").val('');
             group = data.result.groups[0];
diff --git a/admin/themes/default/template/cat_options.tpl b/admin/themes/default/template/cat_options.tpl
index ef66cbe13..39d2b2563 100644
--- a/admin/themes/default/template/cat_options.tpl
+++ b/admin/themes/default/template/cat_options.tpl
@@ -1,7 +1,3 @@
-<div class="titrePage">
-  <h2>{'Properties'|@translate} {$TABSHEET_TITLE}</h2>
-</div>
-
 <form method="post" action="{$F_ACTION}" id="cat_options">
   <fieldset>
     <legend>{$L_SECTION}</legend>
diff --git a/admin/themes/default/template/cat_search.tpl b/admin/themes/default/template/cat_search.tpl
index 8ebbeea2e..0edf7088e 100644
--- a/admin/themes/default/template/cat_search.tpl
+++ b/admin/themes/default/template/cat_search.tpl
@@ -1,6 +1,9 @@
 {combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}
 
 {footer_script}
+$(document).ready(() => {
+  $("h1").append("<span class='badge-number'>"+{$nb_cats}+"</span>");
+});
 var data = {json_encode($data_cat)};
 /* 
   Here data is an associative array id => category under this form 
diff --git a/admin/themes/default/template/configuration_comments.tpl b/admin/themes/default/template/configuration_comments.tpl
index f23de3241..d69020b0d 100644
--- a/admin/themes/default/template/configuration_comments.tpl
+++ b/admin/themes/default/template/configuration_comments.tpl
@@ -30,7 +30,7 @@
 }());
 {/footer_script}
 
-<h2>{'Piwigo configuration'|translate} {$TABSHEET_TITLE}</h2>
+<h2>{'Piwigo configuration'|translate}</h2>
 
 <form method="post" action="{$F_ACTION}" class="properties">
 
diff --git a/admin/themes/default/template/configuration_default.tpl b/admin/themes/default/template/configuration_default.tpl
index 38eb627e9..93d1473cf 100644
--- a/admin/themes/default/template/configuration_default.tpl
+++ b/admin/themes/default/template/configuration_default.tpl
@@ -1,6 +1,6 @@
 {combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}
 
-<h2>{'Piwigo configuration'|translate} {$TABSHEET_TITLE}</h2>
+<h2>{'Piwigo configuration'|translate}</h2>
 
 <form method="post" name="profile" action="{$GUEST_F_ACTION}" id="profile" class="properties">
 
diff --git a/admin/themes/default/template/configuration_display.tpl b/admin/themes/default/template/configuration_display.tpl
index 70a01693c..784baf3ef 100644
--- a/admin/themes/default/template/configuration_display.tpl
+++ b/admin/themes/default/template/configuration_display.tpl
@@ -17,7 +17,7 @@
 }
 {/html_style}
 
-<h2>{'Piwigo configuration'|translate} {$TABSHEET_TITLE}</h2>
+<h2>{'Piwigo configuration'|translate}</h2>
 
 <form method="post" action="{$F_ACTION}" class="properties">
 
diff --git a/admin/themes/default/template/configuration_main.tpl b/admin/themes/default/template/configuration_main.tpl
index 02d96fc7e..7463b6d59 100644
--- a/admin/themes/default/template/configuration_main.tpl
+++ b/admin/themes/default/template/configuration_main.tpl
@@ -69,7 +69,7 @@ jQuery("input[name='mail_theme']").change(function() {
 });
 {/footer_script}
 
-<h2>{'Piwigo configuration'|translate} {$TABSHEET_TITLE}</h2>
+<h2>{'Piwigo configuration'|translate}</h2>
 
 <form method="post" action="{$F_ACTION}" class="properties">
 
diff --git a/admin/themes/default/template/configuration_sizes.tpl b/admin/themes/default/template/configuration_sizes.tpl
index db12adde1..4fd326b36 100644
--- a/admin/themes/default/template/configuration_sizes.tpl
+++ b/admin/themes/default/template/configuration_sizes.tpl
@@ -79,7 +79,7 @@ $(".restore-settings-button").each(function() {
 .sizeEditOpen { margin-left:10px; }
 {/html_style}
 
-<h2>{'Piwigo configuration'|translate} {$TABSHEET_TITLE}</h2>
+<h2>{'Piwigo configuration'|translate}</h2>
 
 <form method="post" action="{$F_ACTION}" class="properties">
 
diff --git a/admin/themes/default/template/configuration_watermark.tpl b/admin/themes/default/template/configuration_watermark.tpl
index 5170587b8..877a2bb36 100644
--- a/admin/themes/default/template/configuration_watermark.tpl
+++ b/admin/themes/default/template/configuration_watermark.tpl
@@ -36,7 +36,7 @@
 }());
 {/footer_script}
 
-<h2>{'Piwigo configuration'|translate} {$TABSHEET_TITLE}</h2>
+<h2>{'Piwigo configuration'|translate}</h2>
 
 <form method="post" action="{$F_ACTION}" class="properties" enctype="multipart/form-data">
 
diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl
index 3f019f9b3..862999858 100644
--- a/admin/themes/default/template/history.tpl
+++ b/admin/themes/default/template/history.tpl
@@ -52,7 +52,7 @@ const guest_id = {$guest_id};
 {combine_script id='jquery.confirm' load='footer' require='jquery' path='themes/default/js/plugins/jquery-confirm.min.js'}
 {combine_css path="admin/themes/default/fontello/css/animation.css" order=10} {* order 10 is required, see issue 1080 *}
 
-<h2>{'History'|@translate} {$TABSHEET_TITLE}</h2>
+<h2>{'History'|@translate}</h2>
 
 <form class="filter" method="post" name="filter" action="">
 <fieldset class="history-filter">
diff --git a/admin/themes/default/template/languages_installed.tpl b/admin/themes/default/template/languages_installed.tpl
index 49f2bb644..33d7a2945 100644
--- a/admin/themes/default/template/languages_installed.tpl
+++ b/admin/themes/default/template/languages_installed.tpl
@@ -16,7 +16,7 @@ $(".delete-lang-button").each(function() {
 {/footer_script}
 
 <div class="titrePage">
-  <h2>{'Installed Languages'|@translate}</h2>
+  <h2>{'Languages'|@translate}</h2>
 </div>
 
 {foreach from=$language_states item=language_state}
diff --git a/admin/themes/default/template/languages_new.tpl b/admin/themes/default/template/languages_new.tpl
index 90b8f2946..8bf7de753 100644
--- a/admin/themes/default/template/languages_new.tpl
+++ b/admin/themes/default/template/languages_new.tpl
@@ -10,7 +10,7 @@ jQuery().ready(function(){ldelim}
 {/footer_script}
 
 <div class="titrePage">
-  <h2>{'Add New Language'|@translate}</h2>
+  <h2>{'Languages'|@translate}</h2>
 </div>
 
 {if $isWebmaster == 1}
diff --git a/admin/themes/default/template/notification_by_mail.tpl b/admin/themes/default/template/notification_by_mail.tpl
index c9c905fc8..1d8d65f1c 100644
--- a/admin/themes/default/template/notification_by_mail.tpl
+++ b/admin/themes/default/template/notification_by_mail.tpl
@@ -17,7 +17,7 @@ jQuery(document).ready(function(){
 {/literal}{/footer_script}
 
 <div class="titrePage">
-  <h2>{'Send mail to users'|@translate} {$TABSHEET_TITLE}</h2>
+  <h2>{'Send mail to users'|@translate}</h2>
 </div>
 
 <form method="post" name="notification_by_mail" id="notification_by_mail" action="{$F_ACTION}">
diff --git a/admin/themes/default/template/permalinks.tpl b/admin/themes/default/template/permalinks.tpl
index a7e9f6a31..a0a527396 100644
--- a/admin/themes/default/template/permalinks.tpl
+++ b/admin/themes/default/template/permalinks.tpl
@@ -28,7 +28,7 @@ form fieldset p.actionButtons {margin-bottom:0}
 {/html_style}
 
 <div class="titrePage">
-  <h2>{'Permalinks'|@translate}</h2>
+  <h2>{'Albums'|@translate}<span class='badge-number'>{$nb_cats}</span></h2>
 </div>
 
 <p id="showAddPermalink"><a href="#" id="addPermalinkOpen">{'Add/delete a permalink'|@translate}</a></p>
diff --git a/admin/themes/default/template/photos_add_applications.tpl b/admin/themes/default/template/photos_add_applications.tpl
index 448c95824..891507f53 100644
--- a/admin/themes/default/template/photos_add_applications.tpl
+++ b/admin/themes/default/template/photos_add_applications.tpl
@@ -69,7 +69,7 @@ jQuery().ready(function(){
 {/literal}{/html_head}
 
 <div class="titrePage">
-  <h2>{'Upload Photos'|@translate} {$TABSHEET_TITLE}</h2>
+  <h2>{'Upload Photos'|@translate}</h2>
 </div>
 
 <div class="applicationContainer">
diff --git a/admin/themes/default/template/photos_add_ftp.tpl b/admin/themes/default/template/photos_add_ftp.tpl
index f3473a448..ac09ae488 100644
--- a/admin/themes/default/template/photos_add_ftp.tpl
+++ b/admin/themes/default/template/photos_add_ftp.tpl
@@ -1,5 +1,5 @@
 <div class="titrePage">
-  <h2>{'Upload Photos'|@translate} {$TABSHEET_TITLE}</h2>
+  <h2>{'Upload Photos'|@translate}</h2>
 </div>
 
 <div id="ftpPage">
diff --git a/admin/themes/default/template/rating.tpl b/admin/themes/default/template/rating.tpl
index f78e06319..243a84417 100644
--- a/admin/themes/default/template/rating.tpl
+++ b/admin/themes/default/template/rating.tpl
@@ -34,7 +34,7 @@ jQuery("select[name=cat]").change(function(){
 });
 {/footer_script}
 
-<h2>{$NB_ELEMENTS} {'Photos'|@translate}</h2>
+<h2>{'Rating'|@translate}<span class='badge-number'>{$NB_ELEMENTS}</span></h2>
 
 <form action="{$F_ACTION}" method="GET" class="filter">
   <fieldset>
diff --git a/admin/themes/default/template/rating_user.tpl b/admin/themes/default/template/rating_user.tpl
index 873882a68..084470299 100644
--- a/admin/themes/default/template/rating_user.tpl
+++ b/admin/themes/default/template/rating_user.tpl
@@ -37,7 +37,7 @@ body .ui-tooltip {
 
 {/html_style}
 
-<h2>{$ratings|@count} {'Users'|@translate}</h2>
+<h2>{'Rating'|@translate}<span class='badge-number'>{$ratings|@count}</span></h2>
 
 <form action="{$F_ACTION}" method="GET">
 <fieldset>
diff --git a/admin/themes/default/template/themes_installed.tpl b/admin/themes/default/template/themes_installed.tpl
index 410c95a0b..a1aee1826 100644
--- a/admin/themes/default/template/themes_installed.tpl
+++ b/admin/themes/default/template/themes_installed.tpl
@@ -63,7 +63,7 @@ $(window).bind("load", function() {
 {/literal}{/footer_script}
 
 <div class="titrePage">
-  <h2>{'Installed Themes'|@translate}</h2>
+  <h2>{'Themes'|@translate}</h2>
 </div>
 
 <div id="themesContent">
diff --git a/admin/themes/default/template/themes_new.tpl b/admin/themes/default/template/themes_new.tpl
index b15df45ab..1e1acdcdc 100644
--- a/admin/themes/default/template/themes_new.tpl
+++ b/admin/themes/default/template/themes_new.tpl
@@ -20,7 +20,7 @@ $(window).bind("load", function() {
 })
 {/literal}{/footer_script}
 <div class="titrePage">
-  <h2>{'Add New Theme'|@translate}</h2>
+  <h2>{'Themes'|@translate}</h2>
 </div>
 
 {if not empty($new_themes)}
diff --git a/admin/themes/default/template/updates_ext.tpl b/admin/themes/default/template/updates_ext.tpl
index 8702c7af4..dd2a18566 100644
--- a/admin/themes/default/template/updates_ext.tpl
+++ b/admin/themes/default/template/updates_ext.tpl
@@ -209,4 +209,5 @@ $("#update_all").click(function() {
     {/foreach}
     </fieldset>
   {/if}
-{/foreach}
\ No newline at end of file
+{/foreach}
+{/if}
\ No newline at end of file
diff --git a/admin/themes/default/template/user_activity.tpl b/admin/themes/default/template/user_activity.tpl
index daff6e0cd..6aff19038 100644
--- a/admin/themes/default/template/user_activity.tpl
+++ b/admin/themes/default/template/user_activity.tpl
@@ -669,6 +669,8 @@ function append_pagination_item(page = null) {
 
 
 $(document).ready(function () {
+    $("h1").append(`<span class='badge-number'>`+{$nb_users - 1}+`</span>`);
+
     $('select').on('change', function (user) {
         if ($(".selectize-input").hasClass("full")) {
           {* call ajax sur activity list avec uid en param *}
diff --git a/admin/user_activity.php b/admin/user_activity.php
index 7e81c62ca..3faef4f53 100644
--- a/admin/user_activity.php
+++ b/admin/user_activity.php
@@ -87,7 +87,7 @@ SELECT
 // |                       template initialization                         |
 // +-----------------------------------------------------------------------+
 $template->set_filename('user_activity', 'user_activity.tpl');
-$template->assign('ADMIN_PAGE_TITLE', l10n('User Activity logs'));
+$template->assign('ADMIN_PAGE_TITLE', l10n('Users'));
 
 // +-----------------------------------------------------------------------+
 // |                          sending html code                            |
@@ -131,10 +131,16 @@ foreach ($nb_lines_for_user as $id => $nb_line) {
     )
   );
 }
-
-
 $template->assign('ulist', $filterable_users);
 
+$query = '
+SELECT COUNT(*)
+  FROM '.USER_INFOS_TABLE.'
+;';
+
+list($nb_users) = pwg_db_fetch_row(pwg_query($query));
+$template->assign('nb_users', $nb_users);
+
 $template->assign_var_from_handle('ADMIN_CONTENT', 'user_activity');
 
 ?>
\ No newline at end of file