diff --git a/src/main/webapp/sass/components/_subscription-list.scss b/src/main/webapp/sass/components/_subscription-list.scss
index df149f6e..000c5b19 100644
--- a/src/main/webapp/sass/components/_subscription-list.scss
+++ b/src/main/webapp/sass/components/_subscription-list.scss
@@ -15,10 +15,6 @@
 	white-space: nowrap;
 }
 
-.css-treeview .config {
-	padding-top: 3px;
-}
-
 .css-treeview ul {
 	list-style: none;
 	margin-left: 0px;
@@ -81,6 +77,17 @@
 	text-decoration: none;
 }
 
+.css-treeview .config {
+	display: none;
+}
+
+.css-treeview .tree-item:hover .config {
+	display: block;
+	padding-top: 3px;
+	width: 16px;
+	height: 16px;
+}
+
 .css-treeview .indent1 {
 	padding-left: 22px;
 }
diff --git a/src/main/webapp/templates/_category.html b/src/main/webapp/templates/_category.html
index 051a02fe..5915d939 100644
--- a/src/main/webapp/templates/_category.html
+++ b/src/main/webapp/templates/_category.html
@@ -1,8 +1,8 @@
 <li>
-	<div ng-mouseenter="hovered=node" ng-mouseleave="hovered=null" class="pointer tree-item" ui-if="showLabel" ng-class="getClass(level - 1)">
+	<div class="pointer tree-item" ui-if="showLabel" ng-class="getClass(level - 1)">
 		<div class="dropdown pull-right">
 			<div class="pull-right" ng-click="showCategoryDetails(node)">
-				<i ng-class="{'icon-wrench': hovered==node}" class="config"></i>
+				<i class="icon-wrench config pointer"></i>
 			</div>
 		</div>
 		<div ng-click="categoryClicked(node.id)">
@@ -23,10 +23,10 @@
 				unread-count="unreadCount({category:category})"> 
 			</category> 
 		</recursive>
-		<li ng-repeat="feed in node.feeds" ng-mouseenter="hovered=feed" ng-class="getClass(level)" class="tree-item"
-			ng-mouseleave="hovered=null" ng-show="settingsService.settings.showRead == true || feed.unread > 0">
+		<li ng-repeat="feed in node.feeds" ng-class="getClass(level)" class="tree-item"
+			ng-show="settingsService.settings.showRead == true || feed.unread > 0">
 			<div class="pull-right" ng-click="showFeedDetails(feed)">
-				<i ng-class="{'icon-wrench': hovered==feed}" class="config pointer"></i>
+				<i class="icon-wrench config pointer"></i>
 			</div>
 			<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 }">