diff --git a/src/main/resources/i18n/en.properties b/src/main/resources/i18n/en.properties
index 2d1a7a59..e77b755c 100644
--- a/src/main/resources/i18n/en.properties
+++ b/src/main/resources/i18n/en.properties
@@ -31,6 +31,8 @@ toolbar.previous_entry=Previous entry
 toolbar.next_entry=Next entry
 toolbar.refresh=Refresh
 toolbar.sort_by_asc_desc=Sort by date asc/desc
+toolbar.titles_only=Titles only
+toolbar.expanded_view=Expanded view
 toolbar.mark_all_as_read=Mark all as read
 toolbar.mark_all_older_day=Items older than a day
 toolbar.mark_all_older_week=Items older than a week
diff --git a/src/main/resources/i18n/fr.properties b/src/main/resources/i18n/fr.properties
index 19d04e40..16b811f8 100644
--- a/src/main/resources/i18n/fr.properties
+++ b/src/main/resources/i18n/fr.properties
@@ -10,7 +10,7 @@ tree.subscribe=S'abonner
 tree.import=Importer
 tree.new_category=Nouvelle catégorie
 tree.all=Tous
-tree.starred=Etoiles
+tree.starred=Favoris
 
 subscribe.feed_url=URL du flux
 subscribe.feed_name=Nom du flux
diff --git a/src/main/webapp/js/directives.js b/src/main/webapp/js/directives.js
index 56c2b736..5cd578d2 100644
--- a/src/main/webapp/js/directives.js
+++ b/src/main/webapp/js/directives.js
@@ -243,22 +243,26 @@ module.directive('category', [ function() {
 							return 'indent' + level;
 						}
 					};
+					
+					$scope.categoryLabel = function(category) {
+						return $scope.showLabel !== true ? $scope.showLabel : category.name;
+					}
 
-					$scope.formatCategoryName = function(category) {
+					$scope.categoryCountLabel = function(category) {
 						var count = $scope.unreadCount({
 							category : category
 						});
-						var label = category.name;
+						var label = '';
 						if (count > 0) {
-							label = label + ' (' + count + ')';
+							label = '(' + count + ')';
 						}
 						return label;
 					};
 
-					$scope.formatFeedName = function(feed) {
-						var label = feed.name;
+					$scope.feedCountLabel = function(feed) {
+						var label = '';
 						if (feed.unread > 0) {
-							label = label + ' (' + feed.unread + ')';
+							label = '(' + feed.unread + ')';
 						}
 						return label;
 					};
diff --git a/src/main/webapp/templates/_category.html b/src/main/webapp/templates/_category.html
index e0d5a885..d0a18cc0 100644
--- a/src/main/webapp/templates/_category.html
+++ b/src/main/webapp/templates/_category.html
@@ -10,7 +10,8 @@
 				<i ng-class="{'icon-caret-right': !node.expanded, 'icon-caret-down': node.expanded}" ng-click="toggleCategory(node, $event)" ng-show="showChildren"></i>
 				<i ng-class="{'icon-star' : node.id == 'starred', 'icon-inbox': node.id == 'all'}" ng-show="!showChildren"></i>
 			</span>
-			<span ng-class="{selected: (node.id == selectedId && selectedType == 'category'), unread: unreadCount({category:node})}">{{formatCategoryName(node)}}
+			<span ng-class="{selected: (node.id == selectedId && selectedType == 'category'), unread: unreadCount({category:node})}">
+			{{categoryLabel(node)}} {{categoryCountLabel(node)}}
 			</span>
 		</div>
 	</div>
@@ -30,7 +31,7 @@
 			<a ng-click="feedClicked(feed.id)" class="feed-link"
 				ng-class="{error: feed.message && feed.errorCount > 10, selected: (feed.id == selectedId && selectedType == 'feed'), unread: feed.unread }">
 				<favicon url="feed.feedLink" />
-				{{formatFeedName(feed)}}
+				{{feed.name}} {{feedCountLabel(feed)}}
 			</a>
 		</li>
 	</ul>
diff --git a/src/main/webapp/templates/_toolbar.html b/src/main/webapp/templates/_toolbar.html
index 2e587e1c..4ab22e21 100644
--- a/src/main/webapp/templates/_toolbar.html
+++ b/src/main/webapp/templates/_toolbar.html
@@ -11,8 +11,8 @@
 			</a>
 			
 			<div class="btn-group" data-toggle="buttons-radio">
-				<a type="button" class="btn" ng-model="settingsService.settings.viewMode" btn-radio="'title'" title="Titles only"><i class="icon-list"></i></a>
-				<a type="button" class="btn" ng-model="settingsService.settings.viewMode" btn-radio="'expanded'" title="Expanded view"><i class="icon-th-list"></i></a>
+				<a type="button" class="btn" ng-model="settingsService.settings.viewMode" btn-radio="'title'" title="${toolbar.titles_only}"><i class="icon-list"></i></a>
+				<a type="button" class="btn" ng-model="settingsService.settings.viewMode" btn-radio="'expanded'" title="${toolbar.expanded_view}"><i class="icon-th-list"></i></a>
 			</div>
 			
 			<div class="btn-group">
diff --git a/src/main/webapp/templates/_tree.html b/src/main/webapp/templates/_tree.html
index a9b105ba..1bf0aee9 100644
--- a/src/main/webapp/templates/_tree.html
+++ b/src/main/webapp/templates/_tree.html
@@ -1,9 +1,9 @@
 <div class="css-treeview" ng-controller="CategoryTreeCtrl">
 	<ul>
-		<category node="CategoryService.subscriptions" show-label="true" show-children="false"
+		<category node="CategoryService.subscriptions" show-label="'${tree.all}'" show-children="false"
 			level="0" selected-type="selectedType" selected-id="selectedId"
 			unread-count="unreadCount(category)"> </category>
-		<category node="starred" show-label="true" show-children="false"
+		<category node="starred" show-label="'${tree.starred}'" show-children="false"
 			level="0" selected-type="selectedType" selected-id="selectedId"
 			unread-count="unreadCount(category)"> </category>
 		<category node="CategoryService.subscriptions" show-label="false" show-children="true"
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index 3df51222..3b55845b 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -48,7 +48,7 @@
 					</span>
 					<label class="checkbox inline">
 						<input type="checkbox" ng-checked="!entry.read" ng-click="mark(entry, !entry.read)"></input>
-						Keep unread
+						${view.keep_unread}
 					</label>
 					
 					<span class="share-buttons" ui-if="settingsService.settings.socialButtons">
diff --git a/src/main/webapp/templates/settings.html b/src/main/webapp/templates/settings.html
index c099bf1f..9e62d0f2 100644
--- a/src/main/webapp/templates/settings.html
+++ b/src/main/webapp/templates/settings.html
@@ -1,6 +1,6 @@
 <div class="container-fluid settings">
 	<div class="page-header">
-		<h1>Settings</h1>
+		<h1>${toolbar.settings}</h1>
 	</div>
 	<form name="settingsForm" ng-submit="save()">
 		<div class="row">