diff --git a/src/main/java/com/commafeed/frontend/model/Entry.java b/src/main/java/com/commafeed/frontend/model/Entry.java
index 814f0a96..75808597 100644
--- a/src/main/java/com/commafeed/frontend/model/Entry.java
+++ b/src/main/java/com/commafeed/frontend/model/Entry.java
@@ -37,6 +37,7 @@ public class Entry implements Serializable {
 		entry.setUrl(feedEntry.getUrl());
 
 		entry.setRead(status.isRead());
+		entry.setStarred(status.isStarred());
 
 		entry.setFeedName(status.getSubscription().getTitle());
 		entry.setFeedId(String.valueOf(status.getSubscription().getId()));
diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css
index f085564b..5de147e8 100644
--- a/src/main/webapp/css/app.css
+++ b/src/main/webapp/css/app.css
@@ -212,6 +212,19 @@
 	font-size: 12px;
 }
 
+#feed-accordion .star {
+	text-decoration: none;
+	padding: 0px 5px;
+}
+
+#feed-accordion .icon-star-yellow {
+	color: gold;
+}
+
+#feed-accordion .icon-star-empty {
+	color: #555;
+}
+
 /* admin */
 .admin .users-table {
 	height: 400px;
diff --git a/src/main/webapp/directives/category.html b/src/main/webapp/directives/category.html
index 18765bcd..3e1fe6a9 100644
--- a/src/main/webapp/directives/category.html
+++ b/src/main/webapp/directives/category.html
@@ -1,5 +1,5 @@
 <li>
-	<div ng-mouseenter="hovered=node" ng-mouseleave="hovered=null" class="pointer">
+	<div ng-mouseenter="hovered=node" ng-mouseleave="hovered=null" class="pointer" ui-if="showLabel">
 		<div class="dropdown pull-right">
 			<a data-toggle="dropdown" class="pull-right">
 				<i ng-class="{'icon-chevron-down': hovered==node && node.id != 'all'}" class="icon"></i>
@@ -13,19 +13,19 @@
 				</li>
 			</ul>
 		</div>
-		<span class="fldr" ng-click="toggleCategory(node)">
-			<i ng-class="{'icon-caret-right': !node.expanded, 'icon-caret-down': node.expanded}"></i>
+		<span class="fldr">
+			<i ng-class="{'icon-caret-right': !node.expanded, 'icon-caret-down': node.expanded}" ng-click="toggleCategory(node)" ng-show="showChildren"></i>
 		</span>
 		<span ng-click="categoryClicked(node.id)">
 			<span ng-class="{selected: (node.id == selectedId && selectedType == 'category'), unread: unreadCount({category:node})}">{{formatCategoryName(node)}}
 			</span>
 		</span>
 	</div>
-	<ul ng-show="node.expanded" class="indent">
+	<ul ng-show="node.expanded && showChildren" ng-class="{indent: showLabel}">
 		<recursive>
 			<category ng-repeat="child in node.children" ng-show="settingsService.settings.showRead == true || unreadCount({category:node}) > 0"
 				node="child" selected-type="selectedType"
-				selected-id="selectedId"
+				selected-id="selectedId" show-label="true" show-children="true"
 				unread-count="unreadCount({category:category})"> 
 			</category> 
 		</recursive>
diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index 404e65b0..4bb48ffa 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -99,6 +99,11 @@ function($scope, $timeout, $stateParams, $window, $location, $state, $route, Cat
 	$scope.selectedType = $stateParams._type;
 	$scope.selectedId = $stateParams._id;
 
+	$scope.starred = {
+		id: 'starred',
+		name: 'Starred'
+	};
+	
 	$scope.$on('$stateChangeSuccess', function() {
 		$scope.selectedType = $stateParams._type;
 		$scope.selectedId = $stateParams._id;
@@ -339,6 +344,18 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
 			});
 		}
 	};
+	
+	$scope.star = function(entry, star, event) {
+		event.preventDefault();
+		event.stopPropagation();
+		if (entry.starred != star) {
+			entry.starred = star;
+			EntryService.star({
+				id : entry.id,
+				starred : star
+			});
+		}
+	};
 
 	$scope.isOpen = false;
 	$scope.entryClicked = function(entry, event) {
diff --git a/src/main/webapp/js/directives.js b/src/main/webapp/js/directives.js
index f3c3de32..ad3e8f86 100644
--- a/src/main/webapp/js/directives.js
+++ b/src/main/webapp/js/directives.js
@@ -95,6 +95,8 @@ module.directive('category', [ function() {
 			node : '=',
 			selectedType : '=',
 			selectedId : '=',
+			showLabel : '=',
+			showChildren : '=',
 			unreadCount : '&'
 		},
 		restrict : 'E',
diff --git a/src/main/webapp/js/services.js b/src/main/webapp/js/services.js
index 243de1f5..1ec25b5b 100644
--- a/src/main/webapp/js/services.js
+++ b/src/main/webapp/js/services.js
@@ -186,6 +186,12 @@ function($resource, $http) {
 			params : {
 				_method : 'mark'
 			}
+		},
+		star : {
+			method : 'POST',
+			params : {
+				_method : 'star'
+			}
 		}
 	};
 	var res = $resource('rest/entry/:_method', {}, actions);
diff --git a/src/main/webapp/templates/_tree.html b/src/main/webapp/templates/_tree.html
index 0f9721ec..0ada8788 100644
--- a/src/main/webapp/templates/_tree.html
+++ b/src/main/webapp/templates/_tree.html
@@ -1,6 +1,12 @@
 <div class="css-treeview" ng-controller="CategoryTreeCtrl">
 	<ul>
-		<category node="CategoryService.subscriptions"
+		<category node="CategoryService.subscriptions" show-label="true" show-children="false"
+			selected-type="selectedType" selected-id="selectedId"
+			unread-count="unreadCount(category)"> </category>
+		<category node="starred" show-label="true" show-children="false"
+			selected-type="selectedType" selected-id="selectedId"
+			unread-count="unreadCount(category)"> </category>
+		<category node="CategoryService.subscriptions" show-label="false" show-children="true"
 			selected-type="selectedType" selected-id="selectedId"
 			unread-count="unreadCount(category)"> </category>
 	</ul>
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index 0ef010a7..113725f8 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -9,6 +9,10 @@
 			<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="noop($event)" ng-mouseup="entryClicked(entry, $event)"
 				ng-class="{open: current == entry, closed: current != entry}">
 				<span class="feed-name">
+					<span class="star" ng-mouseup="star(entry, !entry.starred, $event)">
+						<i ng-class="{'icon-star icon-star-yellow': entry.starred, 'icon-star-empty': !entry.starred}"
+							class="pointer"></i>
+					</span>
 					<favicon url="entry.feedUrl" />
 					{{entry.feedName}}
 				</span>