diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index bd386f6a0..3bc2c5ac6 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -1,6 +1,12 @@
 <?php
 
 return array(
+	'action' => array(
+		'disable' => 'Disable',
+		'enable' => 'Enable',
+		'manage' => 'Manage',
+		'remove' => 'Remove',
+	),
 	'auth' => array(
 		'login' => 'Login',
 		'logout' => 'Logout',
@@ -43,11 +49,9 @@ return array(
 	'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
 	'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
 	'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
-	'about_freshrss' => 'About FreshRSS',
 	'access_denied' => 'You don’t have permission to access this page',
 	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
 	'activate_sharing' => 'Activate sharing',
-	'actualize' => 'Actualize',
 	'add_category' => 'Add a category',
 	'add_query' => 'Add a query',
 	'add_rss_feed' => 'Add a RSS feed',
@@ -179,7 +183,6 @@ return array(
 	'export_starred' => 'Export your favourites',
 	'facebook' => 'Facebook',
 	'favicons_is_ok' => 'Permissions on favicons directory are good',
-	'favorite_feeds' => 'Favourites (%s)',
 	'feb' => 'feb',
 	'february' => 'Feb',
 	'feed' => 'Feed',
@@ -204,7 +207,6 @@ return array(
 	'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 	'file_to_import' => 'File to import<br />(OPML, Json or Zip)',
 	'file_to_import_no_zip' => 'File to import<br />(OPML or Json)',
-	'filter' => 'Filter',
 	'finish_installation' => 'Complete installation',
 	'first' => 'First',
 	'first_article' => 'Skip to the first article',
@@ -272,14 +274,12 @@ return array(
 	'login_required' => 'Login required:',
 	'login_with_persona' => 'Login with Persona',
 	'logs_empty' => 'Log file is empty',
-	'main_stream' => 'Main stream',
 	'mar' => 'mar',
 	'march' => 'Mar',
 	'mark_all_read' => 'Mark all as read',
 	'mark_cat_read' => 'Mark category as read',
 	'mark_favorite' => 'Mark as favourite',
 	'mark_feed_read' => 'Mark feed as read',
-	'mark_read' => 'Mark as read',
 	'may' => 'May',
 	'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
 	'minz_is_ok' => 'You have the Minz framework',
@@ -391,7 +391,6 @@ return array(
 	'search_short' => 'Search',
 	'seconds_(0_means_no_timeout)' => 'seconds (0 means no timeout)',
 	'see_on_website' => 'See on original website',
-	'see_website' => 'See website',
 	'sep' => 'sep',
 	'september' => 'Sep',
 	'shaarli' => 'Shaarli',
@@ -435,7 +434,6 @@ return array(
 	'steps' => 'Steps',
 	'sticky_post' => 'Stick the article to the top when opened',
 	'submit' => 'Submit',
-	'subscription_management' => 'Subscriptions management',
 	'sun' => 'Sun',
 	'theme' => 'Theme',
 	'think_to_add' => 'You may add some feeds.',
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index afca37ed3..ca15bcc25 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -1,5 +1,16 @@
 <?php
 
 return array(
-
+	'menu' => array(
+		'about' => 'About FreshRSS',
+		'actualize' => 'Actualize',
+		'favorites' => 'Favourites (%s)',
+		'filter' => 'Filter',
+		'main_stream' => 'Main stream',
+		'manage' => 'Manage',
+		'mark_read' => 'Mark as read',
+		'see_website' => 'See website',
+		'stats' => 'Statistics',
+		'subscription' => 'Subscriptions management',
+	),
 );
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index b33dc49bc..9d9624cc8 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -1,6 +1,12 @@
 <?php
 
 return array(
+	'action' => array(
+		'disable' => 'Désactiver',
+		'enable' => 'Activer',
+		'manage' => 'Gérer',
+		'remove' => 'Supprimer',
+	),
 	'auth' => array(
 		'login' => 'Connexion',
 		'logout' => 'Déconnexion',
@@ -43,11 +49,9 @@ return array(
 	'Nov' => '\\n\\o\\v\\e\\m\\b\\r\\e',
 	'Oct' => '\\o\\c\\t\\o\\b\\r\\e',
 	'Sep' => '\\s\\e\\p\\t\\e\\m\\b\\r\\e',
-	'about_freshrss' => 'À propos de FreshRSS',
 	'access_denied' => 'Vous n’avez pas le droit d’accéder à cette page !',
 	'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
 	'activate_sharing' => 'Activer le partage',
-	'actualize' => 'Actualiser',
 	'add_category' => 'Ajouter une catégorie',
 	'add_query' => 'Créer un filtre',
 	'add_rss_feed' => 'Ajouter un flux RSS',
@@ -179,7 +183,6 @@ return array(
 	'export_starred' => 'Exporter les favoris',
 	'facebook' => 'Facebook',
 	'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons',
-	'favorite_feeds' => 'Favoris (%s)',
 	'feb' => 'fév.',
 	'february' => 'février',
 	'feed' => 'Flux',
@@ -204,7 +207,6 @@ return array(
 	'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans',
 	'file_to_import' => 'Fichier à importer<br />(OPML, Json ou Zip)',
 	'file_to_import_no_zip' => 'Fichier à importer<br />(OPML ou Json)',
-	'filter' => 'Filtrer',
 	'finish_installation' => 'Terminer l’installation',
 	'first' => 'Début',
 	'first_article' => 'Passer au premier article',
@@ -272,14 +274,12 @@ return array(
 	'login_required' => 'Accès protégé par mot de passe :',
 	'login_with_persona' => 'Connexion avec Persona',
 	'logs_empty' => 'Les logs sont vides.',
-	'main_stream' => 'Flux principal',
 	'mar' => 'mar.',
 	'march' => 'mars',
 	'mark_all_read' => 'Tout marquer comme lu',
 	'mark_cat_read' => 'Marquer la catégorie comme lue',
 	'mark_favorite' => 'Mettre en favori',
 	'mark_feed_read' => 'Marquer le flux comme lu',
-	'mark_read' => 'Marquer comme lu',
 	'may' => 'mai.',
 	'minz_is_nok' => 'Vous ne disposez pas de la librairie Minz. Vous devriez exécuter le script <em>build.sh</em> ou bien <a href="https://github.com/marienfressinaud/MINZ">la télécharger sur Github</a> et installer dans le répertoire <em>%s</em> le contenu de son répertoire <em>/lib</em>.',
 	'minz_is_ok' => 'Vous disposez du framework Minz',
@@ -391,7 +391,6 @@ return array(
 	'search_short' => 'Rechercher',
 	'seconds_(0_means_no_timeout)' => 'secondes (0 signifie aucun timeout ) ',
 	'see_on_website' => 'Voir sur le site d’origine',
-	'see_website' => 'Voir le site',
 	'sep' => 'sep.',
 	'september' => 'septembre',
 	'shaarli' => 'Shaarli',
@@ -435,7 +434,6 @@ return array(
 	'steps' => 'Étapes',
 	'sticky_post' => 'Aligner l’article en haut quand il est ouvert',
 	'submit' => 'Valider',
-	'subscription_management' => 'Gestion des abonnements',
 	'sun' => 'dim.',
 	'theme' => 'Thème',
 	'think_to_add' => 'Vous pouvez ajouter des flux.',
diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php
index afca37ed3..408d7ee4a 100644
--- a/app/i18n/fr/index.php
+++ b/app/i18n/fr/index.php
@@ -1,5 +1,16 @@
 <?php
 
 return array(
-
+	'menu' => array(
+		'about' => 'À propos de FreshRSS',
+		'actualize' => 'Actualiser',
+		'favorites' => 'Favoris (%s)',
+		'filter' => 'Filtrer',
+		'main_stream' => 'Flux principal',
+		'manage' => 'Gérer',
+		'mark_read' => 'Marquer comme lu',
+		'see_website' => 'Voir le site',
+		'stats' => 'Statistiques',
+		'subscription' => 'Gestion des abonnements',
+	),
 );
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 3c23e0178..ca220dcd4 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -12,11 +12,11 @@
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
 	<div class="stick configure-feeds no-mobile">
-		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('index.menu.subscription'); ?></a>
 		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
 	</div>
 	<?php } elseif (Minz_Configuration::needsLogin()) { ?>
-	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a>
+	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a>
 	<?php } ?>
 
 	<form id="mark-read-aside" method="post" style="display: none"></form>
@@ -24,13 +24,13 @@
 	<ul class="tree">
 		<li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('all'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
+				<?php echo _i('all'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('index.menu.main_stream'); ?></a>
 			</div>
 		</li>
 
 		<li class="tree-folder category favorites<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
 			<div class="tree-folder-title">
-				<?php echo _i('bookmark'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+				<?php echo _i('bookmark'); ?> <a class="title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('index.menu.favorites', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
 			</div>
 		</li>
 
@@ -74,21 +74,21 @@
 <script id="feed_config_template" type="text/html">
 	<ul class="dropdown-menu">
 		<li class="dropdown-close"><a href="#close">❌</a></li>
-		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('filter'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('index.menu.filter'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('stats'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.stats'); ?></a></li>
 		<?php } ?>
-		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
+		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('index.menu.see_website'); ?></a></li>
 		<?php if (FreshRSS_Auth::hasAccess()) { ?>
 		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
-		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.manage'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.actualize'); ?></a></li>
 		<li class="item">
 			<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
 			<button class="read_all as-link <?php echo $confirm; ?>"
 			        form="mark-read-aside"
 			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
-			        type="submit"><?php echo _t('mark_read'); ?></button>
+			        type="submit"><?php echo _t('index.menu.mark_read'); ?></button>
 		</li>
 		<?php } ?>
 	</ul>